Update .po files.

svn path=/trunk/; revision=17317

1 files changed, 4307 insertions, 3612 deletions

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8c430b34f7..0ed542d24a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0.4\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-04-04 08:35-0300\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -34,7 +34,7 @@ msgstr "Importa arquivos VCard no Evolution."
 msgid "File As"
 msgstr "Arquivar como"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome"
@@ -45,7 +45,7 @@ msgid "Email"
 msgstr "E-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Principal"
 
@@ -55,7 +55,7 @@ msgstr "Princ"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistente"
@@ -63,8 +63,8 @@ msgstr "Assistente"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Comercial"
 
@@ -74,12 +74,12 @@ msgid "Bus"
 msgstr "Com"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Callback"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Empresa"
 
@@ -90,8 +90,8 @@ msgstr "Empr"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Residencial"
 
@@ -106,18 +106,18 @@ msgstr "Empr"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Celular"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Carro"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax comercial"
@@ -127,13 +127,13 @@ msgid "Bus Fax"
 msgstr "Fax com"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax residencial"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Comercial 2"
 
@@ -142,43 +142,43 @@ msgid "Bus 2"
 msgstr "Com 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Residencial 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Outro"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Outro fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Rádio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -190,14 +190,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-mail 3"
@@ -335,7 +335,7 @@ msgstr "VCard para %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Não foi possível iniciar Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Buscando..."
 
@@ -356,32 +356,32 @@ msgstr "Carregando..."
 msgid "Error in search expression."
 msgstr "Erro na expressão de busca."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Adicionando cartão ao servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Removendo cartão do servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Modificando cartão do servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Reiniciando busca."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Recebendo resultados da busca LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Erro ao remover cartão"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Não foi possível analisar URL `%s'"
@@ -430,106 +430,143 @@ msgstr "Um controle Bonobo exemplo que exibe um catálogo de endereços."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
-msgid "Addressbook Settings"
-msgstr "Fontes de catálogos de endereços"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "Fábrica para o redator do Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 "Controle que exibe um mini-cartão do catálogo de endereços do Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visualizador de mini-cartão do catálogo de endereços do Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Componente do Evolution para manipular contatos."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fábrica para o controle Mini-cartão do Catálogo de Endereços"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Fábrica para o exibidor de endereços do Catálogo de Endereços"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Fábrica para o popup de endereços do Catálogo de Endereços"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr "Fábrica para o redator do Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Fábrica para o controle do Catálogo de Endereços exemplo"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contatos"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Pasta contendo informação sobre contatos"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "Servidor LDAP contendo informação sobre contatos"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Nova lista de contatos"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "Lista de _contatos"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Novo contato"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Contato"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Nova lista de contatos"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Não é possível conectar ao servidor LDAP."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "Lista de _contatos"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Não é possível autenticar com o servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+#, fuzzy
+msgid "Could not perform query on Root DSE"
+msgstr "Não foi possível analisar URL `%s'"
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Resposta do servidor IMAP não contém informação de %s"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Erro ao carregar inforação do filtro:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Resposta do servidor IMAP não contém informação de %s"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL não é suportado nesta cópia do Evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Não foi possível iniciar gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Outros contatos"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Não é possível abrir o catálogo de endereços"
@@ -565,48 +602,57 @@ msgstr ""
 "Por favor, verifique se o arquivo existe e que você\n"
 "possui as permissões para acessá-lo."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Entre senha para %s (usuário %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 msgid "Name begins with"
 msgstr "Nome começa com"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 msgid "Email is"
 msgstr "E-mail é"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categoria é"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualquer campo contém"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Avançado..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Qualquer categoria"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "A URI que o navegador de pastas vai exibir"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(nenhum)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "E-mail principal"
 
@@ -652,107 +698,59 @@ msgstr "Desativar consultas"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Ativar consultas (Perigoso!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Não é possível conectar ao servidor LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Não é possível autenticar com o servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-#, fuzzy
-msgid "Could not perform query on Root DSE"
-msgstr "Não foi possível analisar URL `%s'"
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Informação de rastreio opaca inválida:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "Resposta do servidor IMAP não contém informação de %s"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL não é suportado nesta cópia do Evolution)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Data de conclusão"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr " _Verificar tipos suportados "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Opções"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "Remover"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Remover"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opções"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -761,8 +759,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Fontes de catálogos de endereços"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Albany"
@@ -858,8 +856,8 @@ msgstr "Configuração"
 msgid "Mappings"
 msgstr "Margens"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "a _cada"
@@ -1042,14 +1040,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1074,8 +1072,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1108,7 +1106,7 @@ msgid "Using email address"
 msgstr "Endereço de e-mail"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1116,7 +1114,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Adicionar"
 
@@ -1164,7 +1162,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1282,10 +1280,12 @@ msgstr "Interface para seleção de nomes do catálogo de endereços do Evolution"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fábrica para interface para seleção de nomes do catálogo de endereços"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Remover"
 
@@ -1329,8 +1329,8 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 "O Evolution não pôde obter o repositório local de catálogo de endereços.\n"
-"Isto pode ter sido causado por uma falha no componente "
-"evolution-addressbook.\n"
+"Isto pode ter sido causado por uma falha no componente evolution-"
+"addressbook.\n"
 "Para nos ajudar a entender melhor este problema e finalmente resolvê-lo,\n"
 "por favor envie um e-mail para Jon Trowbridge <trow@ximian.com> com uma\n"
 "descrição detalhada das circunstâncias sob as quais este erro ocorreu.\n"
@@ -1417,7 +1417,7 @@ msgstr "Colaboração"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Editor de contatos"
 
@@ -1426,7 +1426,7 @@ msgid "D_epartment:"
 msgstr "_Departamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Detalhes"
 
@@ -1486,11 +1486,12 @@ msgstr "Deseja receber correio _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Excluir"
 
@@ -1519,7 +1520,7 @@ msgid "_Web page address:"
 msgstr "Endereço de página _web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Estados Unidos"
 
@@ -2025,12 +2026,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Látvia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Líbano"
 
@@ -2039,7 +2039,7 @@ msgid "Lesotho"
 msgstr "Lesoto"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Libéria"
 
@@ -2048,12 +2048,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lituânia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
@@ -2086,7 +2086,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2111,7 +2111,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "México"
 
@@ -2137,7 +2137,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marrocos"
 
@@ -2162,7 +2162,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Holanda"
 
@@ -2175,12 +2175,12 @@ msgid "New Caledonia"
 msgstr "Nova Caledônia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nova Zelândia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicarágua"
 
@@ -2197,7 +2197,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Ilhas Norfolk"
 
@@ -2206,17 +2206,17 @@ msgid "Northern Mariana Islands"
 msgstr "Ilhas Marianas do Norte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Noruega"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Omã"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Paquistão"
 
@@ -2229,7 +2229,7 @@ msgid "Palestinian Territory"
 msgstr "Território palestino"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panamá"
 
@@ -2238,12 +2238,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Nova Guiné"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguai"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2256,22 +2256,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polônia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
@@ -2280,7 +2280,7 @@ msgid "Reunion"
 msgstr "Reunião"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Romênia"
 
@@ -2317,7 +2317,7 @@ msgid "Sao Tome And Principe"
 msgstr "São Tome e Príncipe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Arábia Saudita"
 
@@ -2334,17 +2334,17 @@ msgid "Sierra Leone"
 msgstr "Serra Leoa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapura"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Eslováquia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Eslovênia"
 
@@ -2357,7 +2357,7 @@ msgid "Somalia"
 msgstr "Somália"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "África do Sul"
 
@@ -2366,7 +2366,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Ilhas Georgia do Sul e Sandwich do Sul"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Espanha"
 
@@ -2387,7 +2387,7 @@ msgid "Sudan"
 msgstr "Sudão"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Suriname"
 
@@ -2400,17 +2400,17 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Suécia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Suíça"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Formosa"
 
@@ -2448,7 +2448,7 @@ msgid "Tunisia"
 msgstr "Tunísia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turquia"
 
@@ -2469,7 +2469,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ucrânia"
 
@@ -2478,7 +2478,7 @@ msgid "United Arab Emirates"
 msgstr "Emirados Árabes Unidos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
@@ -2487,7 +2487,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "Ilhas ao Largo dos Estados Unidos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguai"
 
@@ -2500,12 +2500,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnã"
 
@@ -2528,12 +2528,12 @@ msgid "Western Sahara"
 msgstr "Sahara Ocidental"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Yugoslávia"
 
@@ -2546,26 +2546,34 @@ msgid "Zimbabwe"
 msgstr "Zimbábue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Você tem certeza que deseja\n"
+"excluir este contato?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Excluir contato?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Editor de categorias não disponível."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Este contato pertence a estas categorias:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Salvar contato como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Não foi possível encontrar widget para um campo: `%s'"
@@ -2592,11 +2600,11 @@ msgstr "E-mail"
 msgid "card.vcf"
 msgstr "cartao.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2731,11 +2739,11 @@ msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Editor de lista de contatos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Salvar lista como VCard"
 
@@ -2812,21 +2820,21 @@ msgid "Error getting book view"
 msgstr "Erro ao obter visão de livro"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Erro ao modificar cartão"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Sucesso"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -2835,7 +2843,7 @@ msgid "Repository offline"
 msgstr "Repositório off-line"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Permissão negada"
 
@@ -2853,55 +2861,70 @@ msgstr "Protocolo não suportado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Cancelada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Falhou a autenticação."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autenticação exigida"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Você deseja salvar as modificações?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Erro ao adicionar lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Erro ao adicionar cartão"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Erro ao modificar lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Erro ao remover lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Erro ao remover cartão"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Exibição"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Exibição"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2909,22 +2932,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Copiar tarefa selecionada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Sem cartões"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Sem cartões"
@@ -2989,102 +3012,108 @@ msgstr "Outro telefone"
 msgid "Other Address"
 msgstr "Outro endereço"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Catálogo de endereços"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Salvar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Novo contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nova lista de contatos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ir para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Buscar contatos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Fontes de catálogos de endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Configurações do _pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Encaminhar contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Enviar mensagem ao contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Imprimir envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Copiar para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Mover para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Recortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Excluir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3094,7 +3123,7 @@ msgstr "_Visão atual"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3102,7 +3131,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3254,7 +3283,7 @@ msgstr "Margens"
 msgid "Number of columns:"
 msgstr "Número de colunas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opções"
 
@@ -3264,7 +3293,7 @@ msgid "Orientation"
 msgstr "Orientação"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Página"
 
@@ -3338,29 +3367,33 @@ msgstr "Largura:"
 msgid "_Font..."
 msgstr "_Fonte..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Compromisso sem nome"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Indefinido"
 
@@ -3403,42 +3436,34 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Fábrica para o redator do Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Componente resumo executivo de agenda do Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Visualizador iTip/iMip da agenda do Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Componente do Evolution para manipular a agenda."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Fábrica para o componente resumo da agenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Fábrica para o controle de tarefas do Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Fábrica para o controle de visualização iTip da agenda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Fábrica para o controle de agenda exemplo."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Fábrica para centralizar os diálogos do editor do componente de agenda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Fábrica para criar uma fábrica de editores de componentes"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3450,10 +3475,23 @@ msgstr "Serviço de notificação de alarme"
 msgid "Factory for the alarm notification service"
 msgstr "Fábrica para o serviço de notificação de alarme"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Iniciando:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Terminando:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "hora inválida"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3493,7 +3531,7 @@ msgstr ""
 "no lugar uma caixa de diálogo de lembrete normal."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Alerta"
@@ -3520,15 +3558,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Não me pergunte novamente."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Não foi possível iniciar Gnome"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Não foi possível criar o serviço de notificação de alarme"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "Não foi possível criar a fábrica de serviço de notificação de alarme"
 
@@ -3544,7 +3582,7 @@ msgstr "Descrição contém"
 msgid "Comment contains"
 msgstr "Comentário contém"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Não casadas"
 
@@ -3585,14 +3623,16 @@ msgstr ""
 "do seu ORBit e OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Particular"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Público"
 
@@ -3613,27 +3653,32 @@ msgid "W"
 msgstr "O"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Livre"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Ocupado"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Não iniciada"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Em progresso"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Concluída"
 
@@ -3648,11 +3693,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3667,12 +3713,14 @@ msgstr "Repetindo"
 msgid "Assigned"
 msgstr "Atribuido"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Sim"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Não"
 
@@ -3692,62 +3740,64 @@ msgstr "Visão de semana"
 msgid "Month View"
 msgstr "Visão de mês"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Pasta contendo compromissos e eventos"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Pasta contendo itens de tarefa"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Configurações de fontes de notícias"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "Reunião"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Novo _compromisso"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "Compromisso"
@@ -3958,7 +4008,7 @@ msgstr "Lembretes"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -3987,7 +4037,7 @@ msgstr "fim do compromisso"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4015,79 +4065,81 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Configurações de agenda e tarefas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Cor para tarefas atrasadas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Cor das tarefas com prazo para hoje"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Dias"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "_Dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Sábado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Exibir _números de semana no navegador de datas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "I_nício do dia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "_Dom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domigo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Tarefas com prazo para _hoje:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "Qu_i"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "_Ter"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4116,81 +4168,96 @@ msgid "Tuesday"
 msgstr "Terça-feira"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Semana útil"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pedir confirmação ao apagar itens"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fins de semana na visão de mês"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Tarefa começa: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Exibição"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "Tér_mino do dia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "Se_x"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Geral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "E_sconder tarefas concluídas após"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Seg"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Tarefas _atrasadas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "Sá_b"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Exibir _hora de término de compromissos nas visões de semana e mês"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "_Unidades de tempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_Ter"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "Qu_a"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "antes do início do compromisso"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4274,40 +4341,61 @@ msgstr " (Prazo "
 msgid "Due "
 msgstr "Prazo "
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Não foi possível atualizar objeto!"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
 msgstr "Não foi possível atualizar objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Item de diário - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Não foi possível obter a versão atual!"
 
@@ -4365,27 +4453,27 @@ msgstr "Delegar para:"
 msgid "Enter Delegate"
 msgstr "Entrar delegado"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Lembrete"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Repetição"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Agendamento"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Reunião"
 
@@ -4432,7 +4520,7 @@ msgid "Pu_blic"
 msgstr "_Público"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Exibir como tempo"
 
@@ -4454,19 +4542,19 @@ msgstr "Hora de tér_mino:"
 msgid "_Start time:"
 msgstr "Hora de _início:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Um organizador é exigido."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Pelo menos um participante é necessário."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Esta pessoa já participa da reunião!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Delegar para..."
 
@@ -4477,49 +4565,55 @@ msgstr "Participante"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Nome comum"
+msgid "Click here to add an attendee"
+msgstr "Clique aqui para adicionar um participante"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegado por"
+msgid "Common Name"
+msgstr "Nome comum"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegado para"
+msgid "Delegated From"
+msgstr "Delegado por"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Língua"
+msgid "Delegated To"
+msgstr "Delegado para"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Membro"
+msgid "Language"
+msgstr "Língua"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
@@ -4534,14 +4628,10 @@ msgid "_Change Organizer"
 msgstr "_Alterar organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Convidar outros..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Outro organizador"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4730,7 +4820,7 @@ msgid "Progress"
 msgstr "Progresso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4742,19 +4832,19 @@ msgstr "_Prioridade:"
 msgid "_Status:"
 msgstr "_Estado:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Básico"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Atribuição"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Descrição:"
 
@@ -4766,23 +4856,78 @@ msgstr "_Data de início:"
 msgid "_Due Date:"
 msgstr "Pra_zo de conclusão:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Salvar como..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4790,20 +4935,20 @@ msgstr "Salvar como..."
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Recor_tar"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4811,35 +4956,36 @@ msgstr "_Copiar"
 msgid "_Paste"
 msgstr "C_olar"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Atribuir tarefa"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Encaminar como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Marcar como concluída"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tarefas como concluídas"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir tarefas selecionadas"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Clique para adicionar uma tarefa"
 
@@ -4847,47 +4993,48 @@ msgstr "Clique para adicionar uma tarefa"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Concluída"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Data de conclusão"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Prazo de conclusão"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Data de término"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Posição geográfica"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Data de início"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Ordenação de tarefas"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4935,11 +5082,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -4979,7 +5128,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Publicar informação de livre/ocupado"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configuração"
@@ -4990,7 +5139,7 @@ msgid "_Configure Pilot..."
 msgstr "Configuração"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "Salvar _como..."
 
@@ -5017,77 +5166,392 @@ msgid "Delete _All Occurrences"
 msgstr "Excluir _todas as ocorrências"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "As ferramentas do GNOME Pilot não aparentam estar instaladas no seu sistema."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar %s."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "Reunião começa: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "Tarefa começa: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "Informação de livre/ocupado começa: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Começa: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "Reunião termina: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "Informação de livre/ocupado termina: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Termina: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "Tarefa concluída: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "Tarefa para: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "Informação de iCalendar"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "Erro de iCalendar"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "Uma razão desconhecida"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Por favor veja a seguinte informação e então selecione uma ação do menu "
+"abaixo."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Nenhum</i>"
+
+#: calendar/gui/e-itip-control.c:903
+msgid "Status:"
+msgstr "Estado:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Aceito"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr "Aceito preliminarmente"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Recusado"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "O arquivo de agenda não pôde ser atualizado!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Escolher uma ação:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Atualizar"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Aceitar"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "Aceitar preliminarmente"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Recusar"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Enviar informação de livre/ocupado"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Atualizar estado do respondente"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Enviar informação mais recente"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> publicou informação de reunião."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Informação de reunião"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> requisita a sua presença em uma reunião."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Proposta de reunião"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> deseja adicioná-lo a uma reunião existente."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Atualização de reunião"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> deseja receber a informação de reunião mais recente."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "_Pedido de atualização de reunião"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> respondeu a um pedido de reunião."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Resposta a reunião"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> cancelou a reunião."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Cancelamento de reunião"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> enviou uma mensagem incompreensível."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Mensagem de reunião inválida"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> publicou informação de tarefa."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Informação de tarefa"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> requisita que você execute uma tarefa."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Proposta de tarefa"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> deseja acrescentá-lo a uma tarefa existente."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Atualização de tarefa"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> deseja receber a informação de tarefa mais recente."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Pedido de atualização de tarefa"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> respondeu a uma atribuição de tarefa."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Resposta a tarefa"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> cancelou uma tarefa."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Cancelamento de tarefa"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Mensagem de tarefa inválida"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> publicou informação de livre/ocupado."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Informação de livre/ocupado"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> requisita sua informação de livre/ocupado."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Pedido de livre/ocupado"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Resposta de livre/ocupado"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Mensagem de livre/ocupado inválida"
+
+#: calendar/gui/e-itip-control.c:1354
+msgid "The message does not appear to be properly formed"
+msgstr "A mensagem não aparenta estar formada corretamente."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "A mensagem contém apenas pedidos não suportados."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "O anexo não contém uma mensagem de agenda válida"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "O anexo não contém itens visualizáveis de agenda"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "O item não pôde ser enviado!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Atualização concluída\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "O arquivo de agenda não pôde ser atualizado!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Estado do participante não pôde ser atualizado pois o item não existe mais"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 #, fuzzy
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta não é de um participante atual. Adicioná-lo como participante?"
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Estado do participante não pôde ser atualizado devido a um estado inválido!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "Estado do participante não pôde ser atualizado!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Estado do participante atualizado\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Estado do participante não pôde ser atualizado!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Remoção concluída"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "O item não pôde ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Selecionar pasta"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Selecionar pasta"
@@ -5129,93 +5593,92 @@ msgstr "data-fim"
 msgid "date-start"
 msgstr "data-inicio"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Moderadores"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Participantes obrigatórios"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Participantes opcionais"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Não participantes"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Indivíduo"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Sala"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Moderador"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Participante obrigatório"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Não participante"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Necessita ação"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Aceito"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Recusado"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Preliminar"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegado"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "Em andamento"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5227,63 +5690,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Fora do escritório"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Sem informação"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Opções"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Exibir apenas _horas do expediente"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Exibir com _menos ampliação"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Atualizar livre/ocupado"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Autoescolher"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Todas as pessoas e recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Todas as _pessoas e um recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Pessoas _necessárias"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Pessoas necessárias e _um recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Hora de _início da reunião:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Hora de _término da reunião:"
 
@@ -5302,17 +5765,22 @@ msgstr "Não foi possível carregar as tarefas em `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "O método necessário para carregar `%s' não é suportado"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Não foi possível abrir pasta em `%s'"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data de conclusão"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Excluindo objetos selecionados"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "Excluindo permanentemente pasta"
@@ -5325,17 +5793,17 @@ msgstr "Novo _compromisso..."
 msgid "_Delete this Appointment"
 msgstr "_Excluir este compromisso"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Não foi possível abrir pasta em `%s'"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O método necessário para abrir `%s' não é suportado"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrindo agenda em %s"
@@ -5396,19 +5864,51 @@ msgstr "Outubro"
 msgid "September"
 msgstr "Setembro"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Pelo menos um participante é necessário"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Um organizador deve ser configurado."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "Informação de evento"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "Informação de tarefa"
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr "Informação de diário"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "Informação de livre/ocupado"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "Informação de agenda"
+
+#: calendar/gui/itip-utils.c:398
+msgid "Updated"
+msgstr "Atualizado"
+
+#: calendar/gui/itip-utils.c:406
+msgid "Refresh"
+msgstr "Atualizar"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr "Contra proposta"
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Você deve ser um participante do evento."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "Não foi possível criar a fábrica de editor de componentes"
 
@@ -5597,12 +6097,45 @@ msgstr "Mês selecionado (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Ano selecionado (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "Tarefa"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Estado: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioridade:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Percentagem concluída: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Categorias: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Contatos: "
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Imprimir agenda"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5641,8 +6174,8 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Não me pergunte novamente."
 
@@ -5708,6 +6241,11 @@ msgstr "Importa arquivos VCard no Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importa arquivos VCard no Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Lembrete"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5801,8 +6339,8 @@ msgstr "contains? espera que o argument 2 seja uma string"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 "contains? espera que o argument 1 seja um de \"any\", \"summary\", "
 "\"description\""
@@ -6733,638 +7271,654 @@ msgid "Asia/Macao"
 msgstr "Ásia/Macau"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Ásia/Macau"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Ásia/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Ásia/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Ásia/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Ásia/Mascate"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Ásia/Nicósia"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Ásia/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Ásia/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Ásia/Cabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Ásia/Phnom Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Ásia/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Ásia/Pyongyang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Ásia/Catar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Ásia/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Ásia/Yangun"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Ásia/Riad"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Ásia/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Ásia/Sakhalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Ásia/Samarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Ásia/Seul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Ásia/Xangai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Ásia/Cingapura"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Ásia/Taipé"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Ásia/Tashkent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Ásia/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Ásia/Teerã"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Ásia/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Ásia/Tóquio"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Ásia/Ujung Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Ásia/Ulaanbaatar"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Ásia/Urumqi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Ásia/Vientiane"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Ásia/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Ásia/Yakutsk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Ásia/Yekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Ásia/Yerevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlântico/Açores"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlântico/Bermuda"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlântico/Canárias"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlântico/Cabo Verde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlântico/Faroe"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlântico/Jan Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlântico/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlântico/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlântico/Geórgia do Sul"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlântico/Santa Helena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlântico/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Austrália/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Austrália/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Austrália/Broken Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Austrália/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Austrália/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Austrália/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Austrália/Lord Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Austrália/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Austrália/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Austrália/Sidnei"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdã"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europa/Atenas"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europa/Berlim"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europa/Bruxelas"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucareste"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europa/Budapeste"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhague"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinque"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europa/Instanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europa/Liubliana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europa/Londres"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxenburgo"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europa/Madri"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europa/Mônaco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europa/Moscou"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europa/São Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europa/Sófia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europa/Estocolmo"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticano"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europa/Viena"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europa/Varsóvia"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europa/Zurique"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Índico/Antananarivo"
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Índico/Chagos"
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Índico/Christmas"
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Índico/Cocos"
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Índico/Comores"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Índico/Kerguelen"
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Índico/Mahe"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Índico/Maldivas"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Índico/Maurício"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Índico/Mayote"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Índico/Reunião"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Pacífico/Ápia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Pacífico/Auckland"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Pacífico/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Pacífico/Ilha de Páscoa"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Pacífico/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Pacífico/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Pacífico/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pacífico/Fiji"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Pacífico/Funafati"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pacífico/Galápagos"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Pacífico/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Pacífico/Guadalcanal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pacífico/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pacífico/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Pacífico/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Pacífico/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Pacífico/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Pacífico/Kwajalein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Pacífico/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Pacífico/Marquesas"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pacífico/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Pacífico/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Pacífico/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pacífico/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Pacífico/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Pacífico/Pago Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Pacífico/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pacífico/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Pacífico/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Pacífico/Port Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Pacífico/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pacífico/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pacífico/Taiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Pacífico/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Pacífico/Tongatapu"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Pacífico/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Pacífico/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Pacífico/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Assinaturas não são suportadas por esta cifra"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Assinaturas em claro não são suportadas por esta cifra"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Verificação não é suportada por esta cifra"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Cifragem não é suportada por esta cifra"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Decifragem não é suportada por esta cifra"
 
@@ -7375,12 +7929,12 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Não foi possível abrir o diretório cache: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7391,7 +7945,7 @@ msgstr ""
 "Operações subsequentes neste servidor não serão reexecutas quando\n"
 "você reconectar a rede."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7402,11 +7956,16 @@ msgstr ""
 "%s\n"
 "Alterações feitas a esta pasta não serão re-sincronizadas."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Re-sincronizando com servidor"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Armazenando pasta '%s'"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Você deve estar trabalhando conectado para completar esta operação"
 
@@ -7414,57 +7973,68 @@ msgstr "Você deve estar trabalhando conectado para completar esta operação"
 msgid "Syncing folders"
 msgstr "Sincronizando pastas"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analisar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Não é possível abrir a pasta de fila"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Não é possível processar a pasta de fila"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obtendo mensagem %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Não é possível abrir mensagem"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Falhou na mensagem %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Sincronizando pasta"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falhou na mensagem %d de %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Falhou a decodificação da mensagem."
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Falhou a criação de cache para mensagem %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Falhou a criação de cache para mensagem %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar busca por filtro: %s: %s"
@@ -7496,25 +8066,104 @@ msgstr "(match-all) requer um simples resultado booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "Executando consulta por cabeçalho desconhecido: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Operação não suportada: anexar mensagem: para %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Operação não suportada: busca por expressão: para %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Operação não suportada: busca por uids: para %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Movendo mensagens"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Copiando mensagens para %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Cancelada."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Resposta inesperada do servidor POP: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Não foi fornecido um nome de arquivo."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Não é possível cifrar esta mensagem: não foram definidos destinatários"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Falhou a criação de cache para mensagem %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Falhou a criação de cache para mensagem %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Falhou a decodificação da mensagem."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"Não é possível verificar esta mensagem: não foi possível criar arquivo "
+"temporário: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7612,97 +8261,23 @@ msgstr "Erro ao escrever arquivo de correio temporário: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Erro ao copiar arquivo de correio temporário: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Por favor, entre a sua frase-senha de %s para %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Por favor, entre a sua frase-senha de %s"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Não é possível assinar esta mensagem: não existe texto claro para assinar"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Não é possível assinar esta mensagem: não foi fornecida uma senha"
 
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
-"Não é possível assinar esta mensagem: não foi possível criar pipe para "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr ""
-"Não é possível assinar esta mensagem: não existe texto claro para assinar em "
-"claro"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr ""
-"Não é possível verificar esta mensagem: não existe texto claro para verificar"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Não é possível verificar esta mensagem: não foi possível criar pipe para "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-"Não é possível verificar esta mensagem: não foi possível criar arquivo "
-"temporário: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr ""
-"Não é possível cifrar esta mensagem: não existe texto claro para cifrar"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Não é possível cifrar esta mensagem: não foi fornecida uma senha"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Não é possível cifrar esta mensagem: não foi possível criar pipe para "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Não é possível cifrar esta mensagem: não foram definidos destinatários"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-"Não é possível decifrar esta mensagem: não existe texto cifrado para decifrar"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Não é possível decifrar esta mensagem: não foi fornecida uma senha"
 
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Não é possível decifrar esta mensagem: não foi possível criar pipe para "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Esta é uma parte de mensagem assinada digitalmente"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Outro erro"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7720,43 +8295,6 @@ msgstr "Não foi possível carregar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Não foi possível carregar %s: Sem código de inicialização no módulo."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s servidor %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s serviço para %s em %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Conexão cancelada"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Não foi possível conectar à %s (porta %d): %s."
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(máquina desconhecida)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operação cancelada"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "O servidor desconectou inesperadamente: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anônimo"
@@ -7863,7 +8401,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Resposta de autenticação inválida do servidor."
 
@@ -7891,11 +8429,9 @@ msgid ""
 "Password Authentication."
 msgstr "Esta opção conectará ao servidor usando autenticação Kerberos 4."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Senha"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7922,52 +8458,52 @@ msgstr "Autenticação POP antes de SMTP usando uma fonte não POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Falha ao compilar expressão regular: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "A URL '%s' precisa de um componente nome do usuário"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "A URL '%s' precisa de um componente máquina"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "A URL '%s' precisa de um componente caminho"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Falha na consulta de nome: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Falhou a consulta de máquina: %s: máquina não encontrada"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Falhou a consulta de máquina: %s: razão desconhecida"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Falhou a consulta de máquina: %s: máquina não encontrada"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Falhou a consulta de máquina: %s: razão desconhecida"
@@ -8031,11 +8567,11 @@ msgstr "Falhou a decodificação da mensagem."
 msgid "Failed to verify certificates."
 msgstr "Falhou a verificação dos certificados."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Não é possível obter pasta: Operação inválida neste repositório"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Não é possível criar pasta: Operação inválida neste repositório"
 
@@ -8063,7 +8599,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8072,16 +8608,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8101,15 +8637,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Não foi possível analisar URL `%s'"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Não existe tal mensagem %s em %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Não existe tal mensagem: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Verificar novas mensagem em todas as pastas"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8131,68 +8667,77 @@ msgstr "Não é possível renomear pasta: %s: Operação inválida"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Não é possível renomear pasta: %s: Não existe tal pasta"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Você não pode copiar mensagens desta pasta de lixeira."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Operação cancelada"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "O servidor desconectou inesperadamente: %s"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Falhou o comando IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Resposta do servidor terminou cedo demais."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Resposta do servidor IMAP não contém informação de %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta OK inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Não foi possível criar o diretório %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Não foi possível carregar resumo para %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "A pasta foi destruída e recriada no servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Procurando mensagens alteradas"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Esta mensagem não está disponível no momento"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Pegando informação de resumo para novas mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Procurando novas mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Não foi possível localizar corpo da mensagem na resposta FETCH."
 
@@ -8245,32 +8790,83 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e armazenar correio em servidores IMAP."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Senha"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Esta opção conectará ao servidor IMAP usando uma senha em texto claro."
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Servidor SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s serviço para %s em %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Conexão cancelada"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Não foi possível conectar à %s (porta %d): %s."
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Não é possível conectar ao servidor POP.\n"
+"Erro ao enviar nome do usuário: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operação não suportada"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Falhou a autenticação."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s não suporta o tipo de autenticação pedido %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Sem suporte para o tipo de autenticação %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPor favor entre a senha IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Você não entrou uma senha."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8281,68 +8877,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Não existe a pasta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A pasta pai não pode conter sub-pastas"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Não é possível abrir mbox: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Diretórios de correio no formato MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Para armazenar correio local em diretórios de correio do tipo MH."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Entrega local"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Para recuperar correio local de filas no formato padrão mbox."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Aplicar filtros às novas mensagens em INBOX"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Diretórios de correio no formato maildir"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Para armazenar correio local em diretórios maildir."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Filas mbox padrão do Unix"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "Para ler e armazenar correio local em arquivos de fila mbox padrão."
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Filas mbox padrão do Unix"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "Para ler e armazenar correio local em arquivos de fila mbox padrão."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Raiz de armazenagem %s não é um caminho absoluto"
@@ -8368,7 +8983,7 @@ msgstr "Repositórios locais não possuem uma caixa de entrada"
 msgid "Local mail file %s"
 msgstr "Arquivo de correio local %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Não foi possível renomear pasta %s para %s: %s"
@@ -8388,33 +9003,31 @@ msgstr "Não foi possível excluir arquivo de resumo de pasta `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Não foi possível excluir arquivo de índice de pasta `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Não foi possível salvar resumo: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Não é possível adicionar mensagem ao resumo: razão desconhecida"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Cancelado o acréscimo de mensagem maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Não é possível acrescentar mensagem à pasta maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8423,20 +9036,19 @@ msgstr ""
 "Não é possível obter mensagem: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Não existe tal mensagem"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Conteúdo de mensagem inválido"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8447,13 +9059,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Pasta `%s' não existe."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8469,7 +9081,7 @@ msgstr "`%s' não é um diretório maildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Não foi possível excluir a pasta `%s': %s"
@@ -8478,8 +9090,8 @@ msgstr "Não foi possível excluir a pasta `%s': %s"
 msgid "not a maildir directory"
 msgstr "não é um diretório maildir"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Não foi possível varrer pasta `%s': %s"
@@ -8500,45 +9112,37 @@ msgstr "Verificando novas mensagens"
 msgid "Checking for new messages"
 msgstr "Procurando novas mensagens"
 
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Armazenando pasta"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Não é possível criar bloqueio de pasta em %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Não é possível abrir mbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Acréscimo de correio cancelado"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Não é possível acrescentar mensagem ao arquivo mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8547,13 +9151,11 @@ msgstr ""
 "Não é possível obter mensagem: %s da pasta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A pasta aparenta estar corrompida de modo irrecuperável."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Falha ao construir a mensagem: mbox corrompida?"
 
@@ -8596,149 +9198,149 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Pasta `%s' não está vazia. Ela não foi excluída."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Não foi possível abrir pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Erro fatal do analisador de correio próximo à posição %ld na pasta %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Não é possível checar pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Não foi possível abrir arquivo: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Não é possível abrir mbox temporário: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "O resumo e a pasta não casam, mesmo após uma sincronização"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Erro ao escrever para o mbox temporário: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Falha ao escrever para o mbox temporário: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Não foi possível fechar pasta fonte %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Não foi possível fechar pasta temporária: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Não foi possível renomear pasta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "O resumo e a pasta não casam, mesmo após uma sincronização"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desconhecido: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Não foi possível renomear pasta: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Erro ao escrever para o mbox temporário: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Falha ao escrever para o mbox temporário: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Cancelado o acréscimo de mensagem MH"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Não é possível acrescentar mensagem a pasta MH: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' não é um diretório."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Não é possível abrir diretório MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Não é possível acrescentar mensagem ao arquivo de fila: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Pastas de fila não podem ser renomeadas"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Fila `%s' não existe ou não é um arquivo comum"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Raiz de armazenagem %s não é um diretório comum"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Pasta `%s/%s' não existe."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Arquivo de fila de correio %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Pastas de fila não podem ser renomeadas"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Pastas de fila não podem ser renomeadas"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Pastas de fila não podem ser excluídas"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Não foi possível sincronizar pasta temporária %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Não foi possível sincronizar pasta de fila %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8747,25 +9349,6 @@ msgstr ""
 "Não foi possível sincronizar pasta de fila %s: %s\n"
 "A pasta pode estar corrompida, cópia salva em `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Não foi possível arquivar: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Fila `%s' não existe ou não é um arquivo comum"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Correio para %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Notícias USENET"
@@ -8775,12 +9358,22 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Este é um provedor para ler e publicar em grupos de notícias da USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Não foi possível criar o diretório %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Notícias USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8884,7 +9477,7 @@ msgstr "Deixar mensagens no servidor"
 msgid "Delete after %s day(s)"
 msgstr "Excluir após %s dia(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8910,32 +9503,22 @@ msgstr ""
 "protocolo APOP. Isto pode não funcionar para todos os usuários mesmo em "
 "servidores que alegam suportar o protocolo."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Não é possível conectar ao servidor POP.\n"
 "Erro ao enviar nome do usuário: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Operação não suportada"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Falhou a autenticação."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Não foi possível conectar ao servidor POP em %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8943,27 +9526,27 @@ msgstr ""
 "Não é possível conectar ao servidor POP.\n"
 "Não existe suporte para o mecanismo de autenticação pedido."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "Falhou o comando IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "Erro de E/S"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPor favor entre a senha POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8972,13 +9555,13 @@ msgstr ""
 "Não é possível conectar ao servidor POP.\n"
 "Erro ao enviar senha: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Não existe a pasta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9144,45 +9727,45 @@ msgstr "Falha de autenticação temporária"
 msgid "Authentication required"
 msgstr "Autenticação exigida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erro na resposta de boas-vindas: %s: possivelmente não-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Não é possível conectar ao servidor POP.\n"
 "Erro ao enviar nome do usuário: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "A mensagem não aparenta estar formada corretamente."
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "O servidor SMTP %s não suporta o mecanismo de autenticação pedido %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPor favor entre a senha SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9193,90 +9776,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correio SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "Não é possível enviar mensagem: endereço do remetente não é válido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Não é possível enviar mensagem: não foram definidos destinatários."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Não é possível enviar mensagem: não foram definidos destinatários."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "Saudação SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tempo excedido no pedido HELO: %s: não-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erro na resposta de HELO: %s: não-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "Autenticação SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao criar objeto de autenticação SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tempo excedido no pedido AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "Falhou o pedido AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta de autenticação inválida do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido MAIL FROM: %s: a mensagem não foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Erro na resposta de MAIL FROM: %s: a mensagem não foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido RCPT TO: %s: a mensagem não foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido DATA: %s: a mensagem não foi enviada"
@@ -9284,40 +9867,40 @@ msgstr "Tempo excedido no pedido DATA: %s: a mensagem não foi enviada"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Tempo excedido no envio de DATA: terminação de mensagem: %s: a mensagem não "
 "foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Resposta de autenticação inválida do servidor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tempo excedido no pedido QUIT: %s: não-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Erro na resposta de RSET: %s"
@@ -9391,52 +9974,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir exibição automática de anexo"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Clique aqui para o catálogo de endereços"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Responder-a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Entre os destinatários da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 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:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9449,7 +10032,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Anexar um arquivo"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Não foi possível criar um contexto de assinatura PGP."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9458,34 +10046,34 @@ msgstr ""
 "Erro ao ler arquivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Alerta!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Arquivo existe, sobrescrever?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acessar arquivo: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Não foi possível recuperar mensagem do editor"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9494,7 +10082,7 @@ msgstr ""
 "Não é possível buscar no arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9503,7 +10091,7 @@ msgstr ""
 "Não é possível truncar arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9512,7 +10100,7 @@ msgstr ""
 "Erro ao salvar automaticamente mensagem: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9520,7 +10108,7 @@ msgstr ""
 "O Ximian Evolution encontrou arquivos não salvos de uma sessão anterior.\n"
 "Você gostaria de tentar recuperá-los?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9530,23 +10118,43 @@ msgstr ""
 "\n"
 "Você deseja salvar as suas modificações?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Alerta: Mensagem modificada"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Inserir arquivo"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Salvar assinatura"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (padrão)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Redigir uma mensagem"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9554,7 +10162,7 @@ msgstr ""
 "Não foi possível criar janela de redator:\n"
 "Não é possível ativar o controle seletor de endereços."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9562,6 +10170,14 @@ msgstr ""
 "Não foi possível criar janela de redator:\n"
 "Não é possível ativar o componente editor de HTML."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+"<b>(O redator contém um corpo de mensagem não texto, o qual não pode ser "
+"editado.)<b>"
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9622,7 +10238,7 @@ msgstr "Assunto contém"
 msgid "Subject does not contain"
 msgstr "Assunto não contém"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9767,7 +10383,7 @@ msgstr "hora"
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "segundos"
 
@@ -9842,7 +10458,7 @@ msgstr " atrás"
 msgid "ago"
 msgstr "atrás"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
@@ -9854,6 +10470,21 @@ msgstr "<clique aqui para selecionar uma data>"
 msgid "Filter Rules"
 msgstr "Regras de filtro"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Nome do estilo:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Fila `%s' não existe ou não é um arquivo comum"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Escolher uma ação:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9872,7 +10503,7 @@ msgstr ""
 "Por favor volte e especifique uma pasta válida para onde entregar correio."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Selecionar pasta"
 
@@ -9885,7 +10516,11 @@ msgstr ""
 "Erro na expressão regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Teste"
 
@@ -9915,7 +10550,7 @@ msgstr "se todos os critérios forem atendidos"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "se algum critério for atendido"
 
 #: filter/filter-rule.c:780
@@ -9994,194 +10629,204 @@ msgid "Beep"
 msgstr "Belém"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Empresa"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "contém"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Copiar para pasta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Data de recebimento"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Data de envio"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Excluída"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "não contém"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "não termina com"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "não existe"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "não soa como"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "não começa com"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Não existe"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Rascunho"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "termina com"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Expressão"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "é"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "foi após"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "foi antes"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "é maior que"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "é menor que"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "não é"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Lista de discussão"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Corpo da mensagem"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Cabeçalho da mensagem"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Mover para pasta"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Tocar um som:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Lida"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinatários"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Casamento com expressão regular"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Em resposta a"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Pontuação"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Remetente"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Atribuir estado"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Tamanho (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "soa como"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Conta fonte"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Cabeçalho específico"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "começa com"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Parar o processamento"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Assunto"
 
@@ -10236,7 +10881,8 @@ msgid "Scanning %s"
 msgstr "Varrendo %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Correio"
 
@@ -10252,10 +10898,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Catálogo de endereços"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10305,7 +10947,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "O Evolution está importando seus dados antigos do Netscape"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Lixeira"
 
@@ -10441,31 +11085,31 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Pasta contendo correio"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Lixeira virtual"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Pasta lixeira virtual"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Esta pasta não pode conter mensagens."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Modificar as propriedades desta pasta"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10473,239 +11117,247 @@ msgstr ""
 "Algumas de suas configurações de correio aparentam estar corrompidas, por "
 "favor verifique se tudo está em ordem."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Você não estabeleceu um método de transporte de correio"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Alerta: Mensagem modificada"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Nova mensagem de correio"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Não é possível iniciar o componente de correio do Evolution."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "Não é possível iniciar o componente de configuração de correio do Evolution."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Não é possível iniciar o componente de informação de pasta do Evolution."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando ao servidor..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Não é possível registrar repositório com a shell."
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades para \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Propriedades"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Não foi possível criar diretório temporário: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d novas"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d escondidas"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d selecionadas"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d não enviadas"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d enviadas"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Criar pasta _virtual a partir da mensagem"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "Pasta virtual por _busca"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "Pasta virtual por _remetente"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "Pasta virtual por _destinatários"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "Pasta virtual por _lista de discussão"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filtro por _assunto"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filtro por _remetente"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filtro por _destinatários"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filtro por _lista de discussão"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Res_ponder ao remetente"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Responder a _lista"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Encaminhar"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Concluída"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _não lida"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar como _sem importância"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Des_fazer exclusão"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover para pasta..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copiar para pasta..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "Laurel"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adicionar remetente ao catálogo de endereços"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar filtros"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Criar _regra a partir da mensagem"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Pasta virtual por lista de discussão"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtro por lista de discussão (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Pasta virtual por lista de discussão (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Padrão"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Obtendo informação de pasta"
 
@@ -10760,7 +11412,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Você não preencheu toda a informação exigida."
 
@@ -10770,83 +11422,111 @@ msgid "Evolution News Editor"
 msgstr "Editor de notícias do Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Editor de contas do Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Máquina:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome do _usuário:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Caminho:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Rádio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Você não pode criar duas contas com o mesmo nome."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Você tem certeza que deseja excluir esta conta?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Não excluir"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Excluir conta mesmo?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Desativar"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Ativar"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Você tem certeza que deseja excluir esta conta de notícias?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Ativado"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Nome da _conta:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Rico"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, c-format
+msgid "Mail to %s"
+msgstr "Correio para %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Assunto é %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Correio de %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "Lista de discussão %s"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Adicionar regra de filtro"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"A(s) seguinte(s) pasta(s) virtual(is):\n"
+"%sUsava(m) a pasta removida:\n"
+"    '%s'\n"
+"e foi(foram) atualizada(s)."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10858,7 +11538,7 @@ msgstr ""
 "receber ou redigir mensagens.\n"
 "Você desejaria configurá-lo agora?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10866,7 +11546,7 @@ msgstr ""
 "Você deve configurar uma identidade\n"
 "antes de poder redigir uma mensagem."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10875,7 +11555,7 @@ msgstr ""
 "antes de poder redigir uma mensagem."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10883,11 +11563,11 @@ msgstr ""
 "Você está enviando uma mensagem em formato HTML, mas os seguintes "
 "destinatários não desejam correio em formato HTML:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10895,7 +11575,7 @@ msgstr ""
 "Esta mensagem não possui um assunto.\n"
 "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10904,11 +11584,11 @@ msgstr ""
 "está configurada para esconder os endereços da lista, esta mensagem conterá "
 "apenas destinatários Bcc."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensagem contém apenas destinatários Bcc."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10918,15 +11598,15 @@ msgstr ""
 "cabeçalho Apparently-To.\n"
 "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Você deve especificar destinatários para poder enviar esta mensagem."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Você deve configurar uma conta antes de poder enviar esta mensagem."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10934,28 +11614,28 @@ msgstr ""
 "Não é possível abrir a pasta de rascunhos para esta conta.\n"
 "Você gostaria de usar a pasta de rascunhos padrão?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Em %a, %Y-%m-%d às %H:%M, %%s escreveu:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copiar mensagem(ns) para"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Você tem certeza que deseja editar todas as %d mensagens?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10963,7 +11643,7 @@ msgstr ""
 "Você pode apenas editar mensagens salvas\n"
 "na pasta Rascunho."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10971,39 +11651,39 @@ msgstr ""
 "Você pode apenas reenviar mensagens\n"
 "na pasta Enviada."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Você tem certeza que deseja reenviar todas as %d mensagens?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Não existe mensagem selecionada"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Sobrescrever arquivo?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Salvar mensagem como..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Salvar mensagens como..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Exibir a próxima mensagem não lida"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11016,7 +11696,7 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11025,33 +11705,69 @@ msgstr ""
 "Erro ao carregar inforação do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "Carta-US"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Falhou a impressão da mensagem"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Você tem certeza que deseja abrir todas as %d mensagens em janela separadas?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "_Segurança"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Contato sem nome"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Enviada"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Salvar assinatura"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Salvar assinatura"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11105,195 +11821,177 @@ msgstr ""
 "Este nome será usado apenas para propósitos de exibição."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Assistente de contas do Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "após"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"Não foi possível obter caixa de entrada para novo repositório de correio:\n"
-"%s\n"
-"Não será criado nenhum atalho."
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Conta"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Verificando serviço"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Contato sem nome"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "_Editar"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Novo"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Verificar tipos suportados "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL não é suportado nesta cópia do Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL não é suportado nesta cópia do Evolution)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Sempre ci_frar para mim mesmo ao enviar correio cifrado"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Conta %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Informação de conta"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gerência de conta"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Cancelar operação"
+msgid "Add Sc_ript"
+msgstr "_Segurança"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+msgid "Add new signature..."
+msgstr "Salvar assinatura"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Sempre ci_frar para mim mesmo ao enviar correio cifrado"
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Sempre _assinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Arica"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexar um arquivo à mensagem"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Verificar automaticamente novas mensagens"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Codificação de caracteres"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "Comoros"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Verificando novas mensagens"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Cor das tarefas com prazo para hoje"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "Redigir uma mensagem"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Configuração"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11309,57 +12007,47 @@ msgstr ""
 "\n"
 "Pressione \"Concluir\" para salvar suas configurações."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Bari"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Padrão"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Codificação de caracteres padrão: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Pegando correio"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "IDs digitais..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Não é possível abrir mensagem"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Pasta de _rascunhos:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "A_tivar"
 
-#: mail/mail-config.glade.h:48
-#, fuzzy
-msgid "E_nable advanced options"
-msgstr "Cancelar operação"
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11380,40 +12068,35 @@ msgstr "_Endereço de e-mail:"
 msgid "Empty _trash folders on exit"
 msgstr "_Esvaziar lixeiras ao sair"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executar ações"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "termina com"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propriedades"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Obter ID digital..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Realçar citações com"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Hurlburt"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11467,70 +12150,66 @@ msgstr "Micronésia"
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuração de correio"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "_Fontes de notícias"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informação opcional"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Empresa:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da chave _PGP:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Perguntar ao enviar mensagens com apenas destinatários _Bcc"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimir contatos selecionados"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Não é possível abrir mensagem"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Lembrar esta senha"
@@ -11565,117 +12244,120 @@ msgstr "Segurança"
 
 #: mail/mail-config.glade.h:104
 #, fuzzy
-msgid "Same as text"
-msgstr "Somerset"
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Selecionar executável PGP"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Arquivo de assinatura:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Excluir tudo exceto a assinatura"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando mensagem"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Pasta de mensagens _enviadas:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Mensagens enviadas e rascunhos"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Servidor requer _autenticação"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Configuração do servidor"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Tipo do _servidor: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Atalhos"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Salvar assinatura"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Salvar assinatura"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Fonte"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Informação da fonte"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Mbox padrão do Unix"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "Assinatura _HTML:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variável"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11685,145 +12367,138 @@ msgstr ""
 "\n"
 "Pressione \"Próximo\" para começar. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Leste"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_Arquivo de assinatura:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_Sempre carregar imagens da rede"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Sempre a_ssinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Tipo de autenticação: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Tipo de autenticação: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_Verificar automaticamente novas mensagens"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_Verificar automaticamente novas mensagens"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_ID do certificado:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Confirmar ao excluir permanentemente uma pasta"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Assinatura _HTML:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Padrão"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Nome do arquivo:"
+msgid "_Enable"
+msgstr "Ativar"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Estilo de encaminhamento padrão é: "
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nome _completo:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Em correio HTML"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "Assinatura _HTML:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Língua"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_Carregar imagens se o remetente está no catálogo de endereços"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Torne esta a minha conta _padrão"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas após"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Nunca carregar imagens da rede"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "Arquivo executável _PGP:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Perguntar ao enviar mensagens HTML para contatos que não as querem"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Perguntar ao enviar mensagens com um assunto _vazio"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Rádio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11865,69 +12540,52 @@ msgstr "_Arquivo de assinatura:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "Assinatura _HTML:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Usar conexão se_gura (SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variável"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "a _cada"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " cor"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "descrição"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Não foi possível criar um contexto de assinatura PGP."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Não foi possível criar um contexto de verificação PGP."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Não foi possível criar um contexto de cifragem PGP."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Não foi possível criar um contexto de decifragem PGP."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Não foi possível criar um contexto de assinatura S/MIME."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Não foi possível criar um contexto certsonly S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Não foi possível criar um contexto de cifragem S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Não foi possível criar um contexto de envelope S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Não foi possível criar um contexto de decodificação S/MIME."
 
@@ -11970,98 +12628,135 @@ msgstr "Visualizador externo"
 msgid "Loading message content"
 msgstr "Carregando conteúdo da mensagem"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Tarefas _atrasadas:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Abrir vínculo no navegador"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Copiar local do vínculo"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Salvar vínculo como (FIXME)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Não foi possível analisar mensagem MIME. Exibindo como fonte."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Endereço inválido"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Responder-a"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "Correio"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Salvar mensagem como..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Esta mensagem está assinada digitalmente. Clique no cadeado para mais "
+"informações."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Não foi possível criar um contexto de verificação PGP."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Esta mensagem está assinada digitalmente e é autêntica."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Esta mensagem está assinada digitalmente mas não é possível estabelecer sua "
+"autenticidade."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Apontador para site FTP (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Apontador para arquivo local (%s) válido no site \"%s\""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Apontador para arquivo local (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Apontador para dados remotos (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Pastas locais"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando pasta"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12070,27 +12765,27 @@ msgstr ""
 "Não é possível salvar metainfo; você provavelmente descobrirá que\n"
 "não pode mais abrir esta pasta: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Não é possível salvar metainfo de pasta para %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Não é possível excluir metainfo de pasta %s: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Alterando pasta \"%s\" para o formato \"%s\""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s não pode ser reconfigurada pois não é uma pasta local"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12098,11 +12793,11 @@ msgstr ""
 "Se você não pode mais abrir esta caixa postal\n"
 "então você precisar repará-la manualmente."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Você não pode alterar o formato de pastas remotas."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
@@ -12160,81 +12855,73 @@ msgstr "Falha na mensagem %d de %d"
 msgid "Complete."
 msgstr "Concluída."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Salvando mensagem na pasta"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensagens para %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensagens para %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Movendo"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Copiando"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo repositório %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removendo pasta %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Armazenando pasta '%s'"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Atualizando pasta"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Excluindo permanentemente pasta"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperando mensagem %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recuperando %d mensagem(ns)"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvando %d mensagem(ns)"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12243,7 +12930,7 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12252,11 +12939,11 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Salvando anexo"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12265,27 +12952,27 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Não foi possível escrever dados: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -12356,10 +13043,6 @@ msgstr "Atualizando..."
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Cancelada."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "O usuário cancelou a operação."
@@ -12373,16 +13056,16 @@ msgstr "Entre senha para %s"
 msgid "Enter Password"
 msgstr "Entre senha"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Não foi possível salvar arquivo de assinatura."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Salvar assinatura"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12392,10 +13075,30 @@ msgstr ""
 "\n"
 "Você deseja salvar as suas modificações?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Nome:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Arquivo de assinatura:"
+msgid "Signature hint"
+msgstr "Salvar assinatura"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "Arquivo de assinatura HTML:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12410,17 +13113,17 @@ msgstr "Mensagem encaminhada"
 msgid "Forwarded Message"
 msgstr "Mensagem encaminhada"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Preparando pasta virtual: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Atualizando pastas virtuais para URI: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12433,89 +13136,94 @@ msgstr ""
 "    '%s'\n"
 "e foi(foram) atualizada(s)."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "Pastas virtuais"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Editar pasta virtual"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tentando editar uma pasta virtual '%s' que não existe."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Nova pasta virtual"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Sem assunto)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensagem"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Não vista"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Várias mensagens não vistas"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Várias mensagens"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Mínima"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Mais baixa"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Mais alta"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Máxima"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
@@ -12538,10 +13246,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Contato original:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Recebida"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Tamanho"
 
@@ -17253,5232 +17966,5229 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds and Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Líbia"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisboa"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "Londres"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "Londres/Cidade"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "Londres/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "Londres/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "Londres/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Lousiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "Látvia"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapá"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceió"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malmo/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Londres"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Marabá"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Airport"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Aeroporto de Matsuyama"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Oriente Médio"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Aeroporto de Miyakejima"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Aeroporto de Miyazaki"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Aeroporto de Mombetsu"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moscou Domodedovo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moscou Sheremetyevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Aeroporto de Nagasaki"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Aeroporto de Nagoya"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Aeroporto de Naha"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Aeroporto de Nakashibetsu"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Aeroporto de Nankishirahama"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Nápoles"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "Novo Aeroporto Internacional de Tokyo"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Aeroporto de Niigata"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Aeroporto de Obihiro"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Odesa"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Aeroporto de Oita"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Aeroporto de Okayama"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Aeroporto de Oki"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Aeroporto Internacional de Osaka"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Aeroporto de Oshima"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "People's Republic of China"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Poços de Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Arpt Porto Alegre"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio de Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepaguá"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Russia"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "São José dos Campos"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "São Luís"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "São Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Aeroporto de Sendai"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O International Airport"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 #, fuzzy
 msgid "Sympheropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Aeroporto de Takamatsu"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Aeroporto de Tanegashima"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Heliporto de Tokyo"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Aeroporto Internacional de Tokyo"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Novo Aeroporto Internacional de Tokyo"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori Airport"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama Airport"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Aeroporto de Tsushima"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucuruí"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Emirados Árabes Unidos"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 #, fuzzy
 msgid "Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech Airport"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Airport"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Airport"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Aeroporto de Yamagata"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Aeroporto de Yamaguchi Ube"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Aeroporto de Yao"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Zurich"
 
@@ -22506,17 +23216,12 @@ msgstr "%l:%M %d de %B"
 msgid "No description"
 msgstr "Sem descrição"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Resumo das mensagens"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "Pastas virtuais"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Pastas locais"
 
@@ -22525,57 +23230,47 @@ msgstr "Pastas locais"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "SBFN"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "\"Word of the Day\" do Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Citações do dia"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Adicionar uma fonte de notícias"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Entre a URL da fonte notícias que você deseja adicionar"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Nome:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Erro ao baixar RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Fonte de notícias"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
+msgid "Add"
 msgstr "_Adicionar"
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "Remover"
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shelton"
@@ -22616,11 +23311,43 @@ msgstr "Imprimir resumo"
 msgid "Printing of Summary failed"
 msgstr "Falhou a impressão do resumo"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 "O componente Resumo executivo do Evolution não pôde iniciar o Bonobo.\n"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr "° F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr "° C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "nós"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "milhas"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "quilômetros"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Céu claro"
@@ -23772,101 +24499,106 @@ msgid "C_elsius"
 msgstr "Ce_lcius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Todas as fontes de _notícias:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Quantos dias a agenda deve exibir de uma vez?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Número _máximo de itens exibidos:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Configurações de fontes de notícias"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Um _mês"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Uma _semana"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Tem_po de atualização (segundos):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "Tem_po de atualização (segundos):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "E_xibir caminho completo para pastas"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "_Exibir todas as tarefas"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Exibir as tarefas de _hoje"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Exibir temperaturas em:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Tarefas "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Configurações de tempo"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "Fa_hrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "Ci_nco dias"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Correio"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Fontes de notícias"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Um dia"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "A_genda"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Tempo"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 #, fuzzy
-msgid "Configuration control for Evolution default folders."
+msgid "Configuration control for Evolution folder settings."
 msgstr "Fábrica para o redator do Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Pastas especiais"
+msgid "Folder Settings"
+msgstr "Configurações de correio"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "A shell do Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -23877,6 +24609,37 @@ msgstr "Exibir detalhes"
 msgid "Cancel Operation"
 msgstr "Cancelar operação"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Não é possível transferir pasta:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Selecionar pasta"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Rascunho"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Caixa de entrada"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Caixa de saída"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Enviada"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instalação do Evolution"
@@ -23991,6 +24754,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Feito para você por"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Data de conclusão"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Pastas especiais"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Pastas especiais"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Pastas especiais"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Data de conclusão"
+
 #: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
@@ -24018,20 +24806,20 @@ msgstr "Não é possível mover uma pasta em um dos seus descendentes."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Especifique uma pasta para onde copiar a pasta \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Copiar pasta"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Especifique uma pasta para onde mover a pasta \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Mover pasta"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24040,18 +24828,19 @@ msgstr ""
 "Não é possível excluir pasta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Excluir \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Você tem certeza que deseja remover a pasta \"%s\"?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Não é possível excluir pasta:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24060,16 +24849,16 @@ msgstr ""
 "Não é possível renomear pasta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24088,7 +24877,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Criar nova pasta"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -24096,7 +24885,7 @@ msgstr ""
 "O tipo da pasta selecionada não é válido para\n"
 "a operação desejada."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Novo..."
 
@@ -24148,21 +24937,26 @@ msgstr ""
 "Importando %s\n"
 "Importando item %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Selecionar pasta"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Arquivo %s não existe"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Erro do Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Você só pode importar pastas locais"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24171,11 +24965,11 @@ msgstr ""
 "Não existe importador capaz de tratar\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24184,17 +24978,17 @@ msgstr ""
 "Importando %s.\n"
 "Iniciando %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao carregar %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24203,31 +24997,31 @@ msgstr ""
 "Importando %s\n"
 "Importando item 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Selecionar um arquivo"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Tipo do arquivo:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Importar dados e configurações de programas antigos"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Importar um único arquivo"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24235,31 +25029,78 @@ msgstr ""
 "Por favor aguarde...\n"
 "Procurando configurações existentes"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando importadores inteligentes"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Selecionar pasta"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Selecionar uma pasta destino para onde importar estes dados"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Fechando conexões..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Erro enquanto '%s':\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Sincronizando pasta"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Abrindo pasta %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Abrindo pasta %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Abrir em %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Não é possível criar a pasta especificada:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24274,8 +25115,8 @@ msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "Não foi possível iniciar a interface do Assistente de correio do Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Novo"
@@ -24296,43 +25137,43 @@ msgstr "O nome da pasta não pode conter barras."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' são nomes de pastas reservados."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy não foi encontrado em seu $PATH."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy não pôde ser executado."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Sobre o Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Ir para a pasta..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Selecione a pasta que você quer abrir"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Criar um novo atalho"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Selecione a pasta para a qual você quer que o atalho aponte:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "_Trabalhar conectado"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "_Trabalhar desconectado"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Trabalhar desconectado"
 
@@ -24367,7 +25208,7 @@ msgstr ""
 "O Ximian Evolution está atualmente desconectado. Clique neste botão para "
 "trabalhar conectado."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24379,12 +25220,12 @@ msgstr ""
 "O erro do sistema de ativação é:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Não é possível preparar repositório local -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24395,23 +25236,19 @@ msgstr ""
 "terminou inesperadamente. Você terá que sair do Evolution e reiniciá-lo\n"
 "para poder acessar os seus dados novamente."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Não é possível registrar no OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Não foi localizado o banco de dados de configuração"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -24436,95 +25273,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Não remover"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Renomear grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Renomear grupo de atalhos selecionado para:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "Ícones _pequenos"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Exibe os atalhos como ícones pequenos"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "Ícones _grandes"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Exibe os atalhos como ícones grandes"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Novo group..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Criar um novo grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_Remover este grupo..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "Re_nomear este grupo..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Renomear este grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "Es_conder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Esconder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Renomear atalho"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Renomear atalho selecionado para:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir a pasta vinculada a este atalho"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Abrir em nova _janela"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Abrir a pasta vinculada a este atalho em uma nova janela"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Renomear este atalho"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "Re_mover"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remove este atalho da barra de atalhos"
 
@@ -24536,10 +25373,6 @@ msgstr "Erro ao salvar atalhos."
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Caixa de entrada"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -24604,10 +25437,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% cumprida)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para selecionar uma pasta>"
 
@@ -24648,67 +25482,67 @@ msgstr ""
 "O erro do sistema de ativação é:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "Erro CORBA"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Interrompido"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Argumento inválido"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Já possui um dono"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Sem dono"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Não encontrado"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Tipo não suportado"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Schema não suportado"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Operação não suportada"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "URI inválida"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Possui sub-pastas"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Sem espaço remanescente"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "O dono anterior morreu"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Tipo do arquivo:"
@@ -24838,49 +25672,81 @@ msgstr "Não pergunte-me novamente"
 msgid "Evolution can import data from the following files:"
 msgstr "O Evolution pode importar dados dos seguintes arquivos:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "O Evolution está saindo agora ..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Não pergunte-me novamente"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Não é possível acessar a shell do Ximian Evolution."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Não é possível iniciar a shell do Ximian Evolution: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Desativar tela de abertura"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Iniciando a importação"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando importadores inteligentes"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saída de depuração de todos os componentes para um arquivo."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Não é possível iniciar o sistema de componentes Bonobo."
 
@@ -24994,11 +25860,11 @@ msgstr "o instante atual"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Ações"
 
@@ -25120,8 +25986,8 @@ msgstr "Fechar este item"
 msgid "Delete this item"
 msgstr "Excluir este item"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Barra de tarefas principal"
 
@@ -25161,7 +26027,7 @@ msgstr "Salvar este item para disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Arquivo"
 
@@ -25226,19 +26092,19 @@ msgstr "Encaminar como i_Calendar"
 msgid "Forward this item via email"
 msgstr "Encaminhar este item por e-mail"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Obter a informação de reunião mais recente"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "A_tualizar reunião"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Agendar _reunião"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Agendar uma reunião para este item"
 
@@ -25246,10 +26112,6 @@ msgstr "Agendar uma reunião para este item"
 msgid "Customise My Evolution"
 msgstr "Personalizar Meu Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a operação de correio atual"
@@ -25409,7 +26271,7 @@ msgstr "Lista de mensagens encadeadas"
 msgid "_Expunge"
 msgstr "E_xcluir permanentemente"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Pasta"
 
@@ -25825,7 +26687,7 @@ msgstr "Mensagem anterior"
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Ferramentas"
 
@@ -25840,12 +26702,12 @@ msgstr "Fechar esta janela"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Fechar"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Ver"
 
@@ -26032,7 +26894,7 @@ msgstr "_Abrir..."
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-a"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Aj_uda"
 
@@ -26181,111 +27043,120 @@ msgid "Move this folder to another place"
 msgstr "Mover esta pasta para outro lugar"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Criar _nova pasta..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Abrir em nova janela"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Abrir esta pasta em uma outra janela"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Enviar / receber"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar mensagens na fila de saída e recuperar novas mensagens"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Exibir informação sobre o Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Enviar relatório de erro"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "Enviar relatório de _erro"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar relatório de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Alternar"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Alternar a exibição da barra de pastas"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Alternar a exibição da barra de atalhos"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Alternar se estamos trabalhando desconectados."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Ver a pasta selecionada"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ do Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_Sobre o Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Barra de pastas"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Ir para pasta..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Nova pasta"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "Configurações do _pilot..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Enviar / receber"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Atalho"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_Barra de atalhos"
 
@@ -26370,21 +27241,21 @@ msgstr ""
 "um fuso horário.\n"
 "Use o botão direito do mouse para distanciar o mapa."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Visão atual"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "_Visão atual"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Definir visões"
 
@@ -26506,16 +27377,21 @@ msgstr "Editor de buscas"
 msgid "Save Search"
 msgstr "Salvar busca"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Salvar busca"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Adicionar às busca salvas"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Avançado..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informação"
@@ -26537,21 +27413,21 @@ msgstr "Mensagem"
 msgid "Don't show this message again."
 msgstr "Não exibir esta mensagem novamente."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Localizar agora"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Localizar agora"
 
@@ -26577,376 +27453,305 @@ msgstr "init_corba(): não foi possível iniciar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Editar catálogo de endereços"
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Fontes de catálogos de endereços"
 
-#~ msgid "A_uthenticate with server using:"
-#~ msgstr "A_utenticar com servidor usando:"
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "Informação de rastreio opaca inválida:\n"
+#~ "%s"
 
-#~ msgid "Account Name"
-#~ msgstr "Nome da conta"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Componente resumo executivo de agenda do Evolution."
 
-#~ msgid "Add Addressbook"
-#~ msgstr "Adicionar catálogo de endereços"
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Fábrica para o componente resumo da agenda."
 
-#~ msgid "Advanced"
-#~ msgstr "Avançado"
+#~ msgid "Sta_rt of day:"
+#~ msgstr "I_nício do dia:"
 
-#~ msgid "Base"
-#~ msgstr "Base"
+#~ msgid "_End of day:"
+#~ msgstr "Tér_mino do dia:"
 
-#~ msgid "Check this if the server requires you to authenticate."
-#~ msgstr "Marque aqui se o servidor exige que você se autentique."
+#~ msgid "_Other Organizer"
+#~ msgstr "_Outro organizador"
 
-#~ msgid ""
-#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
-#~ "server"
-#~ msgstr ""
-#~ "O Evolution usará este Distinquished Name (DN) para autenticá-lo com o "
-#~ "servidor"
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Assinaturas em claro não são suportadas por esta cifra"
 
-#~ msgid "Server Name"
-#~ msgstr "Nome do servidor"
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Por favor, entre a sua frase-senha de %s para %s"
 
-#~ msgid "The information below is required in order to add an addressbook.  "
-#~ msgstr ""
-#~ "A informação abaixo é necessária para poder adicionar um catálogo de "
-#~ "endereços.  "
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Por favor, entre a sua frase-senha de %s"
 
-#~ msgid "This information is not required for most ldap servers. "
+#~ msgid "Cannot sign this message: no plaintext to sign"
 #~ msgstr ""
-#~ "Esta informação não é necessária para a maioria dos servidores ldap. "
+#~ "Não é possível assinar esta mensagem: não existe texto claro para assinar"
 
-#~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
-#~ msgstr ""
-#~ "Esta informação é usada pelo seu servidor ldap para especificar quais nós "
-#~ "são usados em uma busca. Procure o administrador de seu servidor para mais "
-#~ "informações."
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Não é possível assinar esta mensagem: não foi fornecida uma senha"
 
-#~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 #~ msgstr ""
-#~ "Este é o nó base para todas as suas buscas no servidor ldap. Procure o "
-#~ "administrador de seu servidor para mais informações."
+#~ "Não é possível assinar esta mensagem: não foi possível criar pipe para "
+#~ "GPG/PGP: %s"
 
-#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
 #~ msgstr ""
-#~ "Este é o nome do servidor onde o seu catálogo de endereços está localizado."
-
-#~ msgid "This is the port that your ldap server uses."
-#~ msgstr "Esta é a porta que o seu servidor ldap usa."
-
-#~ msgid "_Account name:"
-#~ msgstr "Nome da _conta:"
-
-#~ msgid "Other Contacts"
-#~ msgstr "Outros contatos"
+#~ "Não é possível assinar esta mensagem: não existe texto claro para assinar "
+#~ "em claro"
 
-#~ msgid "(none)"
-#~ msgstr "(nenhum)"
-
-#~ msgid "C_ontaining:"
-#~ msgstr "C_ontendo:"
-
-#~ msgid "Show contacts matching the following criteria:"
-#~ msgstr "Exibir contatos casando com os seguintes critérios:"
-
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ msgid "Cannot verify this message: no plaintext to verify"
 #~ msgstr ""
-#~ "Você tem certeza que deseja\n"
-#~ "excluir este contato?"
-
-#~ msgid "Starting:"
-#~ msgstr "Iniciando:"
+#~ "Não é possível verificar esta mensagem: não existe texto claro para "
+#~ "verificar"
 
-#~ msgid "Ending:"
-#~ msgstr "Terminando:"
-
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "_Criar novos compromissos com um lembrete padrão"
-
-#~ msgid "First day of wee_k:"
-#~ msgstr "P_rimeiro dia da semana:"
-
-#~ msgid "_Other"
-#~ msgstr "_Outros"
-
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Clique aqui para adicionar um participante"
-
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Não é possível verificar esta mensagem: não foi possível criar pipe para "
+#~ "GPG/PGP: %s"
 
-#~ msgid "80%"
-#~ msgstr "80%"
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr ""
+#~ "Não é possível cifrar esta mensagem: não existe texto claro para cifrar"
 
-#~ msgid "90%"
-#~ msgstr "90%"
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Não é possível cifrar esta mensagem: não foi fornecida uma senha"
 
-#~ msgid "100%"
-#~ msgstr "100%"
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Não é possível cifrar esta mensagem: não foi possível criar pipe para GPG/"
+#~ "PGP: %s"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "Reunião começa: <b>"
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "Não é possível decifrar esta mensagem: não existe texto cifrado para "
+#~ "decifrar"
 
-#~ msgid "Task begins: <b>"
-#~ msgstr "Tarefa começa: <b>"
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Não é possível decifrar esta mensagem: não foi fornecida uma senha"
 
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Informação de livre/ocupado começa: <b>"
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Não é possível decifrar esta mensagem: não foi possível criar pipe para "
+#~ "GPG/PGP: %s"
 
-#~ msgid "Begins: <b>"
-#~ msgstr "Começa: <b>"
+#~ msgid "%s server %s"
+#~ msgstr "%s servidor %s"
 
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Reunião termina: <b>"
+#~ msgid "(unknown host)"
+#~ msgstr "(máquina desconhecida)"
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Informação de livre/ocupado termina: <b>"
+#~ msgid "No such message: %s"
+#~ msgstr "Não existe tal mensagem: %s"
 
-#~ msgid "Ends: <b>"
-#~ msgstr "Termina: <b>"
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Você não pode copiar mensagens desta pasta de lixeira."
 
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Tarefa concluída: <b>"
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Não é possível acrescentar mensagem ao arquivo de fila: %s: %s"
 
-#~ msgid "Task Due: <b>"
-#~ msgstr "Tarefa para: <b>"
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Não foi possível arquivar: %s: %s"
 
-#~ msgid "iCalendar Information"
-#~ msgstr "Informação de iCalendar"
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Fila `%s' não existe ou não é um arquivo comum"
 
-#~ msgid "iCalendar Error"
-#~ msgstr "Erro de iCalendar"
+#, fuzzy
+#~ msgid "Mail tree %s"
+#~ msgstr "Correio para %s"
 
-#~ msgid "An unknown person"
-#~ msgstr "Uma razão desconhecida"
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Rádio"
 
 #~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
 #~ msgstr ""
-#~ "<br> Por favor veja a seguinte informação e então selecione uma ação do menu "
-#~ "abaixo."
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Nenhum</i>"
-
-#~ msgid "Status:"
-#~ msgstr "Estado:"
-
-#~ msgid "Tentatively Accepted"
-#~ msgstr "Aceito preliminarmente"
-
-#~ msgid "Choose an action:"
-#~ msgstr "Escolher uma ação:"
-
-#~ msgid "Update"
-#~ msgstr "Atualizar"
-
-#~ msgid "Accept"
-#~ msgstr "Aceitar"
-
-#~ msgid "Tentatively accept"
-#~ msgstr "Aceitar preliminarmente"
-
-#~ msgid "Decline"
-#~ msgstr "Recusar"
-
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Enviar informação de livre/ocupado"
-
-#~ msgid "Update respondent status"
-#~ msgstr "Atualizar estado do respondente"
-
-#~ msgid "Send Latest Information"
-#~ msgstr "Enviar informação mais recente"
+#~ "Não foi possível obter caixa de entrada para novo repositório de "
+#~ "correio:\n"
+#~ "%s\n"
+#~ "Não será criado nenhum atalho."
 
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> publicou informação de reunião."
-
-#~ msgid "Meeting Information"
-#~ msgstr "Informação de reunião"
-
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> requisita a sua presença em uma reunião."
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "Proposta de reunião"
-
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> deseja adicioná-lo a uma reunião existente."
-
-#~ msgid "Meeting Update"
-#~ msgstr "Atualização de reunião"
-
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> deseja receber a informação de reunião mais recente."
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "_Pedido de atualização de reunião"
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "_Editar"
 
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> respondeu a um pedido de reunião."
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Novo"
 
-#~ msgid "Meeting Reply"
-#~ msgstr "Resposta a reunião"
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Cancelar operação"
 
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> cancelou a reunião."
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Arkansas"
 
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Cancelamento de reunião"
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Arica"
 
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> enviou uma mensagem incompreensível."
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Bari"
 
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Mensagem de reunião inválida"
+#, fuzzy
+#~ msgid "E_nable advanced options"
+#~ msgstr "Cancelar operação"
 
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> publicou informação de tarefa."
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Hurlburt"
 
-#~ msgid "Task Information"
-#~ msgstr "Informação de tarefa"
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Somerset"
 
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> requisita que você execute uma tarefa."
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Arquivo de assinatura:"
 
-#~ msgid "Task Proposal"
-#~ msgstr "Proposta de tarefa"
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Excluir tudo exceto a assinatura"
 
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> deseja acrescentá-lo a uma tarefa existente."
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "Assinatura _HTML:"
 
-#~ msgid "Task Update"
-#~ msgstr "Atualização de tarefa"
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Nome do arquivo:"
 
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> deseja receber a informação de tarefa mais recente."
+#~ msgid "_HTML Signature:"
+#~ msgstr "Assinatura _HTML:"
 
-#~ msgid "Task Update Request"
-#~ msgstr "Pedido de atualização de tarefa"
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Língua"
 
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> respondeu a uma atribuição de tarefa."
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Rádio"
 
-#~ msgid "Task Reply"
-#~ msgstr "Resposta a tarefa"
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Não foi possível criar um contexto de cifragem PGP."
 
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> cancelou uma tarefa."
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Não foi possível criar um contexto de decifragem PGP."
 
-#~ msgid "Task Cancellation"
-#~ msgstr "Cancelamento de tarefa"
+#~ msgid "Moving"
+#~ msgstr "Movendo"
 
-#~ msgid "Bad Task Message"
-#~ msgstr "Mensagem de tarefa inválida"
+#~ msgid "Copying"
+#~ msgstr "Copiando"
 
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> publicou informação de livre/ocupado."
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Arquivo de assinatura:"
 
-#~ msgid "Free/Busy Information"
-#~ msgstr "Informação de livre/ocupado"
+#~ msgid "Riga"
+#~ msgstr "Riga"
 
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> requisita sua informação de livre/ocupado."
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Adicionar"
 
-#~ msgid "Free/Busy Request"
-#~ msgstr "Pedido de livre/ocupado"
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "Remover"
 
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Você tem certeza que deseja remover a pasta \"%s\"?"
 
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Resposta de livre/ocupado"
+#~ msgid "Edit Addressbook"
+#~ msgstr "Editar catálogo de endereços"
 
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Mensagem de livre/ocupado inválida"
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "A_utenticar com servidor usando:"
 
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "A mensagem não aparenta estar formada corretamente."
+#~ msgid "Account Name"
+#~ msgstr "Nome da conta"
 
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "A mensagem contém apenas pedidos não suportados."
+#~ msgid "Add Addressbook"
+#~ msgstr "Adicionar catálogo de endereços"
 
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "O anexo não contém uma mensagem de agenda válida"
+#~ msgid "Advanced"
+#~ msgstr "Avançado"
 
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "O anexo não contém itens visualizáveis de agenda"
+#~ msgid "Base"
+#~ msgstr "Base"
 
-#~ msgid "Event information"
-#~ msgstr "Informação de evento"
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Marque aqui se o servidor exige que você se autentique."
 
-#~ msgid "Task information"
-#~ msgstr "Informação de tarefa"
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with "
+#~ "the server"
+#~ msgstr ""
+#~ "O Evolution usará este Distinquished Name (DN) para autenticá-lo com o "
+#~ "servidor"
 
-#~ msgid "Journal information"
-#~ msgstr "Informação de diário"
+#~ msgid "Server Name"
+#~ msgstr "Nome do servidor"
 
-#~ msgid "Free/Busy information"
-#~ msgstr "Informação de livre/ocupado"
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr ""
+#~ "A informação abaixo é necessária para poder adicionar um catálogo de "
+#~ "endereços.  "
 
-#~ msgid "Calendar information"
-#~ msgstr "Informação de agenda"
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr ""
+#~ "Esta informação não é necessária para a maioria dos servidores ldap. "
 
-#~ msgid "Updated"
-#~ msgstr "Atualizado"
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "Esta informação é usada pelo seu servidor ldap para especificar quais nós "
+#~ "são usados em uma busca. Procure o administrador de seu servidor para "
+#~ "mais informações."
 
-#~ msgid "Refresh"
-#~ msgstr "Atualizar"
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "Este é o nó base para todas as suas buscas no servidor ldap. Procure o "
+#~ "administrador de seu servidor para mais informações."
 
-#~ msgid "Counter-proposal"
-#~ msgstr "Contra proposta"
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr ""
+#~ "Este é o nome do servidor onde o seu catálogo de endereços está "
+#~ "localizado."
 
-#~ msgid "Task"
-#~ msgstr "Tarefa"
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Esta é a porta que o seu servidor ldap usa."
 
-#~ msgid "Status: %s"
-#~ msgstr "Estado: %s"
+#~ msgid "_Account name:"
+#~ msgstr "Nome da _conta:"
 
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Percentagem concluída: %i"
+#~ msgid "C_ontaining:"
+#~ msgstr "C_ontendo:"
 
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Exibir contatos casando com os seguintes critérios:"
 
-#~ msgid "Categories: %s"
-#~ msgstr "Categorias: %s"
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "_Criar novos compromissos com um lembrete padrão"
 
-#~ msgid "Contacts: "
-#~ msgstr "Contatos: "
+#~ msgid "First day of wee_k:"
+#~ msgstr "P_rimeiro dia da semana:"
 
-#, fuzzy
-#~ msgid "Reminder!!"
-#~ msgstr "Lembrete"
+#~ msgid "_Other"
+#~ msgstr "_Outros"
 
 #, fuzzy
 #~ msgid "Error hashing password."
@@ -26997,13 +27802,6 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgid "Unable to save grouplist file for %s: %s"
 #~ msgstr "Não é possível salvar o arquivo de lista de grupos para %s: %s"
 
-#~ msgid ""
-#~ "<b>(The composer contains a non-text message body, which cannot be "
-#~ "editted.)<b>"
-#~ msgstr ""
-#~ "<b>(O redator contém um corpo de mensagem não texto, o qual não pode ser "
-#~ "editado.)<b>"
-
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "O componente do Evolution para o resumo executivo."
 
@@ -27088,30 +27886,12 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgid "Enter folder URI"
 #~ msgstr "Entre URI da pasta"
 
-#~ msgid "Default"
-#~ msgstr "Padrão"
-
-#~ msgid "Mail to %s"
-#~ msgstr "Correio para %s"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Assunto é %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Correio de %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "Lista de discussão %s"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Inbox"
 
 #~ msgid " color"
 #~ msgstr " cor"
 
-#~ msgid "Account"
-#~ msgstr "Conta"
-
 #~ msgid "Accounts"
 #~ msgstr "Contas"
 
@@ -27119,17 +27899,9 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgid "Ad_vanced &gt;&gt;"
 #~ msgstr "Avançado"
 
-#, fuzzy
-#~ msgid "Add new signature"
-#~ msgstr "Salvar assinatura"
-
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr "Sempre _cifrar para mim mesmo ao enviar correio cifrado"
 
-#, fuzzy
-#~ msgid "Command"
-#~ msgstr "Empresa"
-
 #~ msgid "Composer"
 #~ msgstr "Redator"
 
@@ -27149,9 +27921,6 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgid "Display"
 #~ msgstr "Exibição"
 
-#~ msgid "Drafts"
-#~ msgstr "Rascunho"
-
 #, fuzzy
 #~ msgid "E_mail address:"
 #~ msgstr "_Endereço de e-mail:"
@@ -27187,9 +27956,6 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgid "List of signatures"
 #~ msgstr "Salvar assinatura"
 
-#~ msgid "Mail Settings"
-#~ msgstr "Configurações de correio"
-
 #, fuzzy
 #~ msgid "N_ew..."
 #~ msgstr "Novo..."
@@ -27214,9 +27980,6 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgid "Select PGP binary"
 #~ msgstr "Selecionar executável PGP"
 
-#~ msgid "Sent"
-#~ msgstr "Enviada"
-
 #, fuzzy
 #~ msgid "Shortcut"
 #~ msgstr "_Atalho"
@@ -27259,10 +28022,6 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgid "_Remember this password"
 #~ msgstr "_Lembrar esta senha"
 
-#, fuzzy
-#~ msgid "_Script"
-#~ msgstr "_Segurança"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_Enviar mensagens em formato HTML por padrão."
 
@@ -27284,56 +28043,13 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgid "use _HTML for this signature"
 #~ msgstr "Assinatura _HTML:"
 
-#, fuzzy
-#~ msgid "View messages..."
-#~ msgstr "Salvar mensagem como..."
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "Esta mensagem está assinada digitalmente. Clique no cadeado para mais "
-#~ "informações."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "O Evolution não reconhece este tipo de mensagem assinada."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Esta mensagem está assinada digitalmente e é autêntica."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Esta mensagem está assinada digitalmente mas não é possível estabelecer sua "
-#~ "autenticidade."
-
 #, fuzzy
 #~ msgid "Mail Summary"
 #~ msgstr "Resumo das mensagens"
 
-#~ msgid " F"
-#~ msgstr "° F"
-
-#~ msgid " C"
-#~ msgstr "° C"
-
-#~ msgid "knots"
-#~ msgstr "nós"
-
-#~ msgid "kph"
-#~ msgstr "kph"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "milhas"
-
-#~ msgid "kilometers"
-#~ msgstr "quilômetros"
-
 #, fuzzy
 #~ msgid "Factory for the Evolution notes component."
 #~ msgstr "Fábrica para o redator do Evolution."
@@ -27342,16 +28058,6 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgid "Factory for the Notes control"
 #~ msgstr "Fábrica para o controle de tarefas do Evolution."
 
-#~ msgid "Outbox"
-#~ msgstr "Caixa de saída"
-
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Não é possível transferir pasta:\n"
-#~ "%s"
-
 #, fuzzy
 #~ msgid "_Advanced Search..."
 #~ msgstr "Busca avançada"
@@ -27688,7 +28394,8 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgstr "Não foi possível recuperar mensagem do servidor POP %s: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
 #~ msgstr ""
 #~ "Esta opção conectará ao servidor POP usando Kerberos 4 para autenticação."
 
@@ -27698,9 +28405,6 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(Desconhecido)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Resposta inesperada do servidor POP: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Não foi possível localizar endereço 'De' na mensagem"
 
@@ -27761,9 +28465,6 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Esta mensagem contém destinatários inválidos:"
 
-#~ msgid "HTML signature file:"
-#~ msgstr "Arquivo de assinatura HTML:"
-
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>O servidor de tempo não pôde ser contactado</b></dd>"
 
@@ -27779,9 +28480,6 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgid "All _folders:"
 #~ msgstr "Todas as _pastas:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "Todas as fontes de _notícias:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "Pastas a _exibir:"
 
@@ -27791,9 +28489,6 @@ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
 #~ msgid "_Displayed feeds:"
 #~ msgstr "Fontes de notícias a _exibir:"
 
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."