Updated Brazilian Portuguese translation done by Gustavo Maciel Dias

2003-03-29 Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br> * pt_BR.po: Updated Brazilian Portuguese translation done by Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>. svn path=/trunk/; revision=20578
author: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br> 2003-03-30 01:44:26 +0800
committer: Gustavo M. D. Vieira <gdvieira@src.gnome.org> 2003-03-30 01:44:26 +0800
commit: e72c115df8321539521d1e1e793e27082c4d94b1 (patch)
tree: 4d51c607a5689fa5917c67665a75db901cd718dd /po
parent: b8fb6512c8f582e56869a152ae4bbb334eea66d0 (diff)
download: gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.tar
gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.tar.gz
gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.tar.bz2
gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.tar.lz
gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.tar.xz
gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.tar.zst
gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.zip
2 files changed, 4832 insertions, 4904 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index e5a6c460d6..b491d11dea 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-29  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation done by
+	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>.
+
 2003-03-29  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated Swedish translation.
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5d39dc6a8f..8b6c4fe754 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,39 +1,57 @@
 # Brazilian Portuguese translation of Evolution.
-# Copyright (C) 2000-2002 Free Software Foundation, Inc.
-# Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>, 2000-2002.
+# Copyright (C) 2000-2003 Free Software Foundation, Inc.
+# Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>, 2000-2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 1.2\n"
-"POT-Creation-Date: 2002-12-01 12:32-0200\n"
-"PO-Revision-Date: 2002-11-30 18:38-0200\n"
+"Project-Id-Version: evolution 1.3.2\n"
+"POT-Creation-Date: 2003-03-29 11:33-0300\n"
+"PO-Revision-Date: 2003-03-29 13:52-0300\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Fábrica para importar arquivos LDIF no Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr "Importa arquivos LDIF no Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Fábrica para importar arquivos VCard no Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Importa arquivos VCard no Evolution."
+
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/backend/ebook/e-card.c:1297
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Arquivar como"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/backend/ebook/e-card.c:1311
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:72 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/backend/ebook/e-card.c:1338
+#: addressbook/backend/ebook/e-card.c:1342
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1850
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Principal"
 
@@ -43,17 +61,17 @@ msgstr "Princ"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1400
-#: addressbook/gui/contact-editor/e-contact-editor.c:1835
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 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:1836
-#: addressbook/gui/contact-editor/e-contact-editor.c:1907
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Comercial"
 
@@ -63,12 +81,12 @@ msgid "Bus"
 msgstr "Com"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1839
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Callback"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1841
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Empresa"
 
@@ -79,13 +97,13 @@ 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:1842
-#: addressbook/gui/contact-editor/e-contact-editor.c:1908
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Residencial"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1358
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Empresa"
@@ -96,18 +114,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:1846
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Celular"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1840
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 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:1838
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax comercial"
@@ -117,13 +135,13 @@ msgid "Bus Fax"
 msgstr "Fax com"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1844
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax residencial"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1837
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Comercial 2"
 
@@ -132,43 +150,43 @@ msgid "Bus 2"
 msgstr "Com 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1843
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Residencial 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1845
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 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:1847
-#: addressbook/gui/contact-editor/e-contact-editor.c:1909
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Outro"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1848
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Outro fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1849
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1851
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Rádio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1852
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
@@ -179,15 +197,15 @@ msgid "TTY"
 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:1880
+#: addressbook/gui/component/e-address-popup.c:482
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 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:1881
+#: addressbook/gui/component/e-address-popup.c:492
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-mail 3"
@@ -211,7 +229,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1372
+#: addressbook/backend/ebook/e-card.c:1376
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Escritório"
@@ -221,7 +239,7 @@ msgid "Off"
 msgstr "Escr"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1379
+#: addressbook/backend/ebook/e-card.c:1383
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Tratamento"
@@ -236,7 +254,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1393
+#: addressbook/backend/ebook/e-card.c:1397
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Gerente"
@@ -250,7 +268,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1407
+#: addressbook/backend/ebook/e-card.c:1411
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Apelido"
@@ -260,19 +278,19 @@ msgid "Nick"
 msgstr "Apelido"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1414
+#: addressbook/backend/ebook/e-card.c:1418
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Cônjuge"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1448
+#: addressbook/backend/ebook/e-card.c:1459
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Nota"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1434
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "URI de agenda"
 
@@ -290,287 +308,319 @@ msgid "FBUrl"
 msgstr "URLlo"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
-#: addressbook/backend/ebook/e-card.c:1421
+msgid "Default server calendar"
+msgstr "Servidor de agenda padrão"
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+msgid "icsCalendar"
+msgstr "icsCalendar"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Bodas"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Bodas"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Data de nascimento"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
-#: addressbook/backend/ebook/e-card.c:1462
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Categorias"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Sobrenome"
 
-#: addressbook/backend/ebook/e-card-simple.c:334
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:335
 msgid "ECard"
-msgstr "Carro"
+msgstr "ECard"
 
-#: addressbook/backend/ebook/e-card-simple.c:829
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:890
-#: addressbook/backend/ebook/e-destination.c:704
+#: addressbook/backend/ebook/e-card-simple.c:893
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Lista sem nome"
 
-#: addressbook/backend/ebook/e-card.c:1304
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:330
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: addressbook/backend/ebook/e-card.c:1317
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:94
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 msgid "Address"
-msgstr "_Endereço:"
+msgstr "Endereço"
 
-#: addressbook/backend/ebook/e-card.c:1324
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1328
 msgid "Address Label"
-msgstr "Endereço _2:"
+msgstr "Rótulo do endereço"
 
-#: addressbook/backend/ebook/e-card.c:1331
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1335
 msgid "Phone"
-msgstr "Ponce"
+msgstr "Fone"
 
-#: addressbook/backend/ebook/e-card.c:1345
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1349
 msgid "Birth date"
 msgstr "Data de nascimento"
 
-#: addressbook/backend/ebook/e-card.c:1351
+#: addressbook/backend/ebook/e-card.c:1355
 #: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
-#: addressbook/backend/ebook/e-card.c:1365
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1369
 msgid "Organizational Unit"
-msgstr "Empresa"
+msgstr "Unidade organizacional"
 
-#: addressbook/backend/ebook/e-card.c:1386
+#: addressbook/backend/ebook/e-card.c:1390
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
 
-#: addressbook/backend/ebook/e-card.c:1427 mail/mail-format.c:945
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
 msgid "Mailer"
 msgstr "Programa de correio"
 
-#: addressbook/backend/ebook/e-card.c:1441
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1445
 msgid "Free/Busy URL"
-msgstr "URL _livre-ocupado:"
+msgstr "URL livre/ocupado"
+
+#: addressbook/backend/ebook/e-card.c:1452
+msgid "ICS Calendar"
+msgstr "Agenda ICS"
 
-#: addressbook/backend/ebook/e-card.c:1455
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1466
 msgid "Related Contacts"
-msgstr "Contatos selcionados:"
+msgstr "Contatos relacionados"
 
-#: addressbook/backend/ebook/e-card.c:1469
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1480
 msgid "Category List"
-msgstr "Categoria é"
+msgstr "Lista de categorias"
 
-#: addressbook/backend/ebook/e-card.c:1476
+#: addressbook/backend/ebook/e-card.c:1487
 msgid "Wants HTML"
-msgstr ""
+msgstr "Quer HTML"
 
-#: addressbook/backend/ebook/e-card.c:1483
+#: addressbook/backend/ebook/e-card.c:1494
 msgid "Wants HTML set"
-msgstr ""
+msgstr "Quer HTML configurado"
 
-#: addressbook/backend/ebook/e-card.c:1490
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1501
 msgid "List"
 msgstr "Lista"
 
-#: addressbook/backend/ebook/e-card.c:1497
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1508
 msgid "List Show Addresses"
-msgstr "Outro endereço"
+msgstr "Listar endereços de exibição"
 
-#: addressbook/backend/ebook/e-card.c:1504
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1515
 msgid "Arbitrary"
-msgstr "Amritsar"
+msgstr "Arbitrário"
 
-#: addressbook/backend/ebook/e-card.c:1511
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1522
 msgid "ID"
-msgstr "ISDN"
+msgstr "ID"
 
-#: addressbook/backend/ebook/e-card.c:1518
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1529
 msgid "Last Use"
-msgstr "Colar"
+msgstr "Último uso"
 
-#: addressbook/backend/ebook/e-card.c:1529
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1540
 msgid "Use Score"
-msgstr "Pontuação"
+msgstr "Usar pontuação"
 
-#: addressbook/backend/ebook/e-card.c:2870
-msgid "Multiple VCards"
-msgstr "Vários VCards"
-
-#: addressbook/backend/ebook/e-card.c:2878
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard para %s"
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:17
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:31
-#: addressbook/conduit/address-conduit.c:1860
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:65
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "Não foi possível iniciar Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:361
-#: addressbook/backend/pas/pas-backend-ldap.c:2996
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Buscando..."
 
-#: addressbook/backend/pas/pas-backend-file.c:363
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Carregando..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:705
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+msgid "Using Distinguished Name (DN)"
+msgstr "Usando distinguished name (DN)"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+msgid "Using Email Address"
+msgstr "Usando endereço de e-mail"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr "Reconectando ao servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1248
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Adicionando cartão ao servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1354
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Removendo cartão do servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1590
-#: addressbook/backend/pas/pas-backend-ldap.c:1593
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "Modificando cartão do servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2907
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Recebendo resultados da busca LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3016
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "Erro ao executar busca"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:296
 msgid "Default Sync Address:"
 msgstr "Endereço padrão de sincronização:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:539
 msgid "Cursor could not be loaded\n"
 msgstr "Não foi possível carregar cursor\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:552
 msgid "EBook not loaded\n"
 msgstr "EBook não foi carregado\n"
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1373
+#: calendar/conduits/calendar/calendar-conduit.c:1344
+#: calendar/conduits/todo/todo-conduit.c:886
 msgid "Could not start wombat server"
 msgstr "Não foi possível iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1374
+#: calendar/conduits/calendar/calendar-conduit.c:1345
+#: calendar/conduits/todo/todo-conduit.c:887
 msgid "Could not start wombat"
 msgstr "Não foi possível iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1404
+#: addressbook/conduit/address-conduit.c:1407
 msgid "Could not read pilot's Address application block"
 msgstr "Não foi possível ler os dados do aplicativo de endereços do pilot"
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:608
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Um controle Bonobo para um popup de endereços."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Um controle Bonobo para exibir um endereço."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Um controle Bonobo exemplo que exibe um catálogo de endereços."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configuration control for the Evolution Addressbook Storages."
+msgstr ""
+"Controle de configuração para os Repositórios de Catálogo de endereços do "
+"Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure access to LDAP directory servers here"
+msgstr "Configure o acesso a servidores de diretório LDAP aqui"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+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.server.in.in.h:7
+msgid "Directory Servers"
+msgstr "Servidores de diretório"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+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.server.in.in.h:9
+msgid "Evolution component for handling contacts."
+msgstr "Componente do Evolution para manipular contatos."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Factory for the controls exported by the Evolution Addressbook"
+msgstr ""
+"Fábrica para os controles exportados pelo Catálogo de endereços do Evolution"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
 #: calendar/gui/dialogs/comp-editor-util.c:309
 #: calendar/gui/dialogs/comp-editor-util.c:365
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:179
-#: shell/e-shortcuts.c:1087
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr "Contatos"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Pasta contendo informação sobre contatos"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "Servidor LDAP contendo informação sobre contatos"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public Contacts"
 msgstr "Contatos públicos"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public folder containing contact information"
 msgstr "Pasta pública contendo informação sobre contatos"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Novo contato"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Contato"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "Criar um novo contato"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nova lista de contatos"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Lista de _contatos"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr "Criar uma nova lista de contatos"
 
-#: addressbook/gui/component/addressbook-config.c:207
+#: addressbook/gui/component/addressbook-config.c:206
 msgid "Failed to connect to LDAP server"
 msgstr "Falha ao conectar ao servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:232
+#: addressbook/gui/component/addressbook-config.c:231
 msgid "Failed to authenticate with LDAP server"
 msgstr "Falha ao se autenticar com o servidor LDAP"
 
@@ -578,39 +628,39 @@ msgstr "Falha ao se autenticar com o servidor LDAP"
 msgid "Could not perform query on Root DSE"
 msgstr "Não foi possível realizar consulta na DSE Raiz"
 
-#: addressbook/gui/component/addressbook-config.c:670
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr "O servidor respondeu com sem bases de busca suportadas"
 
-#: addressbook/gui/component/addressbook-config.c:1177
+#: addressbook/gui/component/addressbook-config.c:1193
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Este servidor não suporta informação de schema LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1199
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr "Erro ao recuperar informação de schema"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr "O servidor não respondeu com informação de schema válida"
 
-#: addressbook/gui/component/addressbook-config.c:1655
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP não está ativado nesta cópia do Evolution"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Nome da conta"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Nome do servidor"
 
-#: addressbook/gui/component/addressbook-storage.c:166
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP não está ativado nesta cópia do Evolution"
+
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Outros contatos"
 
-#: addressbook/gui/component/addressbook.c:484
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -619,7 +669,7 @@ msgstr ""
 "Por favor, verifique se o arquivo existe e que você\n"
 "possui as permissões para acessá-lo."
 
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -629,7 +679,7 @@ msgstr ""
 "significa que você forneceu uma URI incorreta ou que o\n"
 "servidor LDAP está fora do ar."
 
-#: addressbook/gui/component/addressbook.c:499
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -641,7 +691,7 @@ msgstr ""
 "você deve recompilar o programa dos fontes em CVS após\n"
 "obter o OpenLDAP a partir do link abaixo.\n"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:537
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -651,49 +701,48 @@ msgstr ""
 "significa que você forneceu uma URI incorreta ou que o\n"
 "servidor está fora do ar."
 
-#: addressbook/gui/component/addressbook.c:529
+#: addressbook/gui/component/addressbook.c:557
 msgid "Unable to open addressbook"
 msgstr "Não é possível abrir o catálogo de endereços"
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:587
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr "Acessando servidor LDAP anonimamente"
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr "Falhou a autenticação.\n"
 
-#: addressbook/gui/component/addressbook.c:638
-#: addressbook/gui/component/addressbook.c:641
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sEntre senha para %s (usuário %s)"
 
-#: addressbook/gui/component/addressbook.c:787
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr "Nome começa com"
 
-#: addressbook/gui/component/addressbook.c:788
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr "E-mail começa com"
 
-#: addressbook/gui/component/addressbook.c:789
-#: calendar/gui/cal-search-bar.c:52
+#: addressbook/gui/component/addressbook.c:815
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categoria é"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:790
-#: calendar/gui/cal-search-bar.c:48
+#: addressbook/gui/component/addressbook.c:816
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualquer campo contém"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Avançado..."
 
-#: addressbook/gui/component/addressbook.c:965
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -706,7 +755,7 @@ msgstr ""
 "resultados nas preferências do servidor de diretório para este\n"
 "catálogo de endereços."
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -718,28 +767,28 @@ msgstr ""
 "torne a sua busca mais específica ou aumente o limite de tempo nas\n"
 "preferências do servidor de diretório para este catálogo de endereços."
 
-#: addressbook/gui/component/addressbook.c:977
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "O backend para este catálogo de endereços não pôde analisar esta consulta."
 
-#: addressbook/gui/component/addressbook.c:980
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "O backend para este catálogo de endereços recusou-se a processar esta "
 "consulta."
 
-#: addressbook/gui/component/addressbook.c:984
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr "Esta consulta não terminou com sucesso."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1059
-#: calendar/gui/cal-search-bar.c:379
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:352
 msgid "Any Category"
 msgstr "Qualquer categoria"
 
-#: addressbook/gui/component/addressbook.c:1139
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "A URI que o navegador de pastas vai exibir"
 
@@ -752,128 +801,117 @@ msgstr "A URI que o navegador de pastas vai exibir"
 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:1879
+#: addressbook/gui/component/e-address-popup.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "E-mail principal"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:608
 msgid "Select an Action"
 msgstr "Selecionar uma ação"
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:615
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Criar um novo contato \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:631
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Adicionar endereço a um contato existente \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:889
+#: addressbook/gui/component/e-address-popup.c:913
 msgid "Querying Addressbook..."
 msgstr "Consultando catálogo de endereços..."
 
-#: addressbook/gui/component/e-address-popup.c:971
-#: addressbook/gui/component/e-address-widget.c:391
-#: addressbook/gui/component/select-names/e-select-names-popup.c:305
+#: addressbook/gui/component/e-address-popup.c:997
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Editar informação do contato"
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:427
-#: addressbook/gui/component/select-names/e-select-names-popup.c:484
+#: addressbook/gui/component/e-address-popup.c:1027
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:479
 msgid "Add to Contacts"
 msgstr "Adicionar a contatos"
 
-#: addressbook/gui/component/e-address-popup.c:1044
+#: addressbook/gui/component/e-address-popup.c:1051
 msgid "Merge E-Mail Address"
 msgstr "Mesclar endereço de e-mail:"
 
-#: addressbook/gui/component/e-address-widget.c:368
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Desativar consultas"
 
-#: addressbook/gui/component/e-address-widget.c:368
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Ativar consultas (Perigoso!)"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
+msgstr "\n"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr "  E_xibir bases suportadas "
 
-#: addressbook/gui/component/ldap-config.glade.h:2
-msgid "1234"
-msgstr "1234"
+#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
+msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "380"
-msgstr "380"
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
-msgstr "666"
-
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "<- _Remove"
-msgstr "<- _Remover"
+msgid "Add LDAP Server"
+msgstr "Adicionar servidor LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "<< Fewer Options"
-msgstr "<< Menos opções"
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add (or Edit) Attribute Mappings"
-msgstr "Adicionar (ou editar) mapeamentos de atributo"
-
-#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "Fontes de catálogo de endereços"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Sempre"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Anonimamente"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr "Atributo LDAP associado"
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr "Atributo"
-
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -887,71 +925,55 @@ msgstr ""
 "Por favor, clique no botão \"Concluir\" para salvar as configurações que\n"
 "foram feitas aqui."
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Conectando"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr "Atributo do Evolution correspondente"
-
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "DN Customization"
-msgstr "Personalização do DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "E_xcluir"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "_Distinguished name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
+msgid "Edit LDAP Server"
+msgstr "Editar servidor LDAP"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "Endereço eletrônico:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
-msgid "Evolution Attribute"
-msgstr "Atributo do Evolution"
-
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "O Evolution usará este DN para autenticá-lo com o servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "O Evolution usará este endereço de e-mail para autenticá-lo com o servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Concluído"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "Geral"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "LDAP Attribute"
-msgstr "Atributo LDAP"
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "Assistente de configuração LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Mappings"
-msgstr "Mapeamentos"
-
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nunca"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -967,66 +989,26 @@ msgstr ""
 "a sua conexão. Pergunte ao seu administrador de sistema se o seu servidor "
 "LDAP usa estes protocolos."
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses"
-msgstr "Objectclasses"
-
-#: addressbook/gui/component/ldap-config.glade.h:42
-msgid "Objectclasses Used in Evolution:"
-msgstr "Objectclasses usados no Evolution:"
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr "Objectclasses usados no servidor:"
-
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Um"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-"Por favor, selecione um atributo do Evolution e um\n"
-"atributo LDAP ao qual associá-lo."
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-"Por favor, selecione um atributo do Evolution e um\n"
-"atributo LDAP ao qual associá-lo."
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "R_estore Defaults"
-msgstr "R_estaurar padrões"
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Re_store Defaults"
-msgstr "_Restaurar padrões"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "_Escopo de busca: "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1684
-#: calendar/gui/e-week-view.c:1207
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1975 calendar/gui/e-day-view.c:1670
+#: calendar/gui/e-week-view.c:1223
 msgid "Searching"
 msgstr "Buscando"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-msgid "Select"
-msgstr "Selecionar"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Selecionada:"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -1036,7 +1018,7 @@ msgstr ""
 "servidor LDAP se\n"
 "o seu servidor LDAP suportar SSL ou TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -1054,7 +1036,7 @@ msgstr ""
 "conexão já é\n"
 "segura."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1068,7 +1050,7 @@ msgstr ""
 "falhas de\n"
 "segurança."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
@@ -1078,17 +1060,7 @@ msgstr ""
 "Evolution para\n"
 "buscas LDAP e para a criação e edição de contatos. "
 
-#: addressbook/gui/component/ldap-config.glade.h:66
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-"Selecionar esta opção permitirá que você altere as configurações padrão do "
-"Evolution para\n"
-"buscas LDAP e para a criação e edição de contatos. "
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
@@ -1096,31 +1068,31 @@ msgstr ""
 "Especificar um nome para exibição é o último passo necessário para "
 "configurar um servidor LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "Passo 1: Informação do servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr "Passo 2: Conectando ao servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr "Passo 3: Buscando o diretório"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr "Passo 4: Nome para exibição"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr "Bases de busca suportadas"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1132,7 +1104,7 @@ msgstr ""
 "login. Por favor, pergunte ao seu administrador de sistemas se você não "
 "souber esta informação."
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1146,7 +1118,7 @@ msgstr ""
 "sistemas s se você\n"
 "precisa mudar estas opções."
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1158,23 +1130,23 @@ msgstr ""
 "começarão. Se você deixar este campo vazio as buscas começarão na raiz da "
 "árvore do diretório."
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
 "directory tree. A search scope of \"sub\" will include all entries below "
 "your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
 "O escopo de busca define a profundidade que você gostaria que as buscas se "
 "estendessem \n"
 "pela árvore do diretório. Um escopo de busca de \"sub\" incluirá todas as "
 "entradas sob a sua base de busca.\n"
 "Um escopo de busca de \"um\" incluirá apenas as entradas um nível abaixo da "
-"sua base."
+"sua base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1190,7 +1162,7 @@ msgstr ""
 "sobre o servidor. Por favor, entre em contato com o seu administrador de\n"
 "sistemas caso você precise de ajuda para descobrir esta informação."
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1198,7 +1170,7 @@ msgstr ""
 "Este é o nome completo do seu servidor LDAP. Por exemplo, \"ldap."
 "minhaempresa.com.br\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -1208,7 +1180,7 @@ msgstr ""
 "grande \n"
 "a este número diminuirá a velocidade de seu catálogo de endereços."
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1217,7 +1189,7 @@ msgstr ""
 "Este é o método que o Evolution usará para autenticá-lo. Note que a opção "
 "\"Endereço de e-mail\" requer acesso anônimo ao seu servidor LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -1226,7 +1198,7 @@ msgstr ""
 "Este é o nome deste servidor que aparecerá na lista de pastas do Evolution.\n"
 "Ele é usado apenas para exibição. "
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1238,87 +1210,45 @@ msgstr ""
 "de portas padrão foi fornecida. Pergunte ao seu administrador de sistemas\n"
 "qual porta você deve escolher."
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr "Esta opção controla por quanto tempo a busca executará."
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-"Para adicionar um atributo ao DN, selecione-o da lista e clique no botão "
-"\"Adicionar atributo\".\n"
-"Quaisquer valores que você adicionar ao DN se tornarão valores obrigatórios "
-"para quaisquer\n"
-"novos contatos que você adicionar ao diretório no servidor LDAP."
-
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr "_Usar SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "Usando distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr "Usando endereço de e-mail"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Quando possível"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-#: 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:14
-#: mail/mail-config.glade.h:133 shell/glade/e-folder-list.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Add ->"
-msgstr "_Adicionar ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Add Mapping"
-msgstr "_Adicionar mapeamento"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-msgid "_Add to DN"
-msgstr "_Adicionar a DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_Always"
-msgstr "_Sempre"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Delete Mapping"
-msgstr "E_xcluir mapeamento"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "_Nome para exibição:"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Distinguished Name (DN):"
-msgstr "_Distinguished name (DN):"
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_Don't use SSL/TLS"
-msgstr "Não us_ar SSL/TLS"
-
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "_Limite de transferência:"
 
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: 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:41
@@ -1327,99 +1257,55 @@ msgstr "_Limite de transferência:"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_Edit Mapping"
-msgstr "_Editar mapeamento"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-msgid "_Evolution attribute:"
-msgstr "Atributo do _Evolution:"
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_If necessary "
-msgstr "_Caso necessário "
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attribute:"
-msgstr "Atributo _LDAP:"
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_LDAP attributes:"
-msgstr "Atributos _LDAP:"
-
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr "Método de _login:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "_More Options >>"
-msgstr "_Mais opções >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "Número da _porta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
-msgid "_Restore Defaults"
-msgstr "_Restaurar padrões"
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "_Base de busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "Nome do _servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "_Tempo limite (minutos):"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
-msgid "account-druid"
-msgstr "account-druid"
-
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "account-editor"
-msgstr "account-editor"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "cartões"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "dn-customization-tab"
-msgstr "dn-customization-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:136
-msgid "edit_server_window_simple"
-msgstr "edit_server_window_simple"
-
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "mappings-tab"
-msgstr "mappings-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:139
-msgid "objectclasses-tab"
-msgstr "objectclasses-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "searching-tab"
 msgstr "searching-tab"
 
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Interface para seleção de nomes do catálogo de endereços do Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
+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:162
-#: addressbook/gui/component/select-names/e-select-names.c:689
-#: composer/e-msg-composer-attachment-bar.c:501
-#: my-evolution/e-summary-shown.c:539 shell/e-shortcuts-view.c:182
+#: addressbook/gui/component/select-names/e-select-names.c:698
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Remover"
 
@@ -1431,38 +1317,40 @@ msgstr "Remover todos"
 msgid "Send HTML Mail?"
 msgstr "Enviar correio HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:404
-msgid "Edit Contact List"
-msgstr "Editar lista de contatos"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:300
+msgid "View Contact Info"
+msgstr "Ver informação do contato"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:399
+msgid "View Contact List"
+msgstr "Ver lista de contatos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:422
+#: addressbook/gui/component/select-names/e-select-names-popup.c:417
 msgid "Unnamed Contact List"
 msgstr "Lista de contatos sem nome"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:439
+#: addressbook/gui/component/select-names/e-select-names-popup.c:434
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d não exibidos)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:505
+#: addressbook/gui/component/select-names/e-select-names-popup.c:500
 msgid "Unnamed Contact"
 msgstr "Contato sem nome"
 
-#: addressbook/gui/component/select-names/e-select-names.c:496
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
+msgstr "Fonte"
+
+#: addressbook/gui/component/select-names/e-select-names.c:514
 msgid "Select Contacts from Addressbook"
 msgstr "Selecionar contatos do catálago de endereços"
 
-#: addressbook/gui/component/select-names/e-select-names.c:556
+#: addressbook/gui/component/select-names/e-select-names.c:578
 msgid "Find contact in"
 msgstr "Localizar contato em"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/fullname.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "*"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Localizar"
@@ -1473,7 +1361,7 @@ msgstr "Selecionar nomes"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Selected Contacts:"
-msgstr "Contatos selcionados:"
+msgstr "Contatos selecionados:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show Contacts"
@@ -1495,28 +1383,24 @@ msgstr "_Categoria:"
 msgid "_Folder:"
 msgstr "_Pasta:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr "Nome do a_ssistente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr "E_ndereço..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "_Bodas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr "Ani_versário:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "C_ontatos..."
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorias..."
@@ -1527,7 +1411,7 @@ msgstr "Colaboração"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1424
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Editor de contatos"
 
@@ -1536,13 +1420,13 @@ msgid "D_epartment:"
 msgstr "_Departamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Detalhes"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "F_ree/Busy URL:"
-msgstr "URL _livre-ocupado:"
+msgstr "URL _livre/ocupado:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File A_s:"
@@ -1578,1143 +1462,1138 @@ msgstr "_Empresa:"
 msgid "P_rofession:"
 msgstr "_Profissão:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Tipos de telefone"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "S_pouse:"
 msgstr "_Cônjuge:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "This is the _mailing address"
 msgstr "Este é o endereço de _correspondência"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
 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:673 calendar/gui/e-calendar-table.c:992
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3522
-#: filter/filter.glade.h:15 mail/folder-browser.c:1762
-#: mail/mail-config.glade.h:146 shell/glade/e-folder-list.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3710 calendar/gui/e-week-view.c:3557
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
 #: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
 #: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "E_xcluir"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "_Função:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "Nome do _gerente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "Ape_lido:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Escritório:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "URL da agenda _pública:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "Endereço de página _web:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:100
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
-#: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:373
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:151
+#: addressbook/gui/widgets/e-minicard-view-widget.c:118
 #: addressbook/gui/widgets/e-minicard-view.c:473
-#: addressbook/gui/widgets/e-minicard.c:175
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard.c:179
 msgid "Editable"
-msgstr "Ativar"
+msgstr "Editável"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr "Afeganistão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albânia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Algéria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
 msgstr "Antártica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr "Antigua e Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr "Armênia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Austrália"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Áustria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "Azerbaijão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr "Belarus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr "Bermudas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr "Butão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolívia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr "Bósnia e Herzegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr "Ilhas Bouvet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brasil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr "Território do Oceano Índico Britânico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgária"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr "Camboja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr "Camarões"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Canadá"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Ilhas Cayman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr "República Centro-Africana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "Chade"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "China"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Ilhas Christmas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr "Ilhas Cocos (Keeling)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Colômbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "Comoros"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Congo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr "Ilhas Cook"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr "Costa do Marfim"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Croácia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Cuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Republica Dominicana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Timor Leste"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Equador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egito"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Guiné Equatorial"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estônia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiópia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Ilhas Falkland (Malvinas)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Ilhas Faroe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finlândia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "França"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Guiana Francesa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Polinésia Francesa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Territórios Franceses do Sul"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gâmbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Geórgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Alemanha"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Gana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Grécia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Groenlândia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Granada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "Guiné"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "Guiné-Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "Guiana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr "Ilhas Heard e McDonald"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "Holy See"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Hungria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Islândia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "Índia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "Indonésia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Itália"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Japão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordânia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazaquistão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Quênia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Republic Of"
 msgstr "Coréia, República da"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr "Kirgiquistão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "Látvia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Líbano"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Libéria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lituânia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr "Macau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr "Macedônia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr "Malásia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr "Ilhas Marshall"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr "Martinica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr "Mauritânia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "Maurício"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr "México"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr "Micronésia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
 msgstr "Moldova, República da"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr "Mônaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr "Mongólia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr "Marrocos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "Moçambique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr "Namíbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "Holanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "Antilhas Holandesas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "Nova Caledônia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr "Nova Zelândia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "Nicarágua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "Nigéria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr "Ilhas Norfolk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr "Ilhas Marianas do Norte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr "Noruega"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr "Omã"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr "Paquistão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr "Território palestino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr "Panamá"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr "Papua Nova Guiné"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr "Polônia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr "Reunião"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr "Romênia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "Federação Russa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts e Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent e The Grena-dines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr "São Tome e Príncipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr "Arábia Saudita"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr "Serra Leoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr "Singapura"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr "Eslováquia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr "Eslovênia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr "Ilhas Salomão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr "Somália"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr "África do Sul"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 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:326
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr "Espanha"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre e Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr "Sudão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr "Suriname"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Ilhas Svalbard e Jan Mayen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr "Suécia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "Suíça"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr "Formosa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr "Tajiquistão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzânia, República Unida da"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "Tailândia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr "Trinidad e Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "Tunísia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr "Turquia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr "Turcomenistão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr "Ilhas Turks e Caicos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr "Ucrânia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr "Emirados Árabes Unidos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr "Ilhas ao Largo dos Estados Unidos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr "Uzbequistão"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr "Vietnã"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Virgin Islands, British"
 msgstr "Ilhas Virgens, Inglaterra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Virgin Islands, U.S."
 msgstr "Ilhas Virgens, EUA"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr "Ilhas Wallis e Futuna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "Sahara Ocidental"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr "Yemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "Yugoslávia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr "Zâmbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr "Zimbábue"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:155
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
-#: addressbook/gui/widgets/e-addressbook-model.c:297
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:359
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:104
 #: addressbook/gui/widgets/e-minicard-view.c:459
-#, fuzzy
 msgid "Book"
-msgstr "Bodo"
+msgstr "Livro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:162
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:182
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:186
 msgid "Card"
-msgstr "Carro"
+msgstr "Cartão"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:169
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
 msgid "Is New Card"
-msgstr ""
+msgstr "É um novo cartão"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:176
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 msgid "Writable Fields"
-msgstr "Merril Field"
+msgstr "Campos editáveis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:190
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
 msgid "Changed"
-msgstr "Chade"
+msgstr "Alterado"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:869
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Editor de categorias não disponível."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:877
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Este contato pertence a estas categorias:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1091
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Salvar contato como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1137
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 "Você tem certeza que deseja\n"
-"excluir este contato?"
+"excluir estes contatos?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1140
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2722,51 +2601,42 @@ msgstr ""
 "Você tem certeza que deseja\n"
 "excluir este contato?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1144
-#: addressbook/gui/widgets/e-addressbook-view.c:847 filter/libfilter-i18n.h:10
-#: mail/mail-accounts.c:227 mail/mail-accounts.c:239
-#: shell/e-shell-folder-commands.c:412 ui/evolution-addressbook.xml.h:8
-#: 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/contact-editor/e-contact-editor.c:1853
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2468
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Não foi possível encontrar widget para um campo: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Adicionar rápido de contato"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:306
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Editar completo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:336
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:67
-#, fuzzy, c-format
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, c-format
 msgid "Error saving %s: %s"
-msgstr "Erro ao salvar arquivo: %s"
+msgstr "Erro ao salvar %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr "cartao.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:217
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2775,7 +2645,7 @@ msgstr ""
 "%s já existe\n"
 "Você deseja sobrescrevê-lo?"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:220
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
@@ -2879,34 +2749,34 @@ msgstr "S_ufixo:"
 msgid "_Title:"
 msgstr "_Tratamento:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr "Membros"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Type an email address or drag a contact into the list below:"
 msgstr "Digite um e-mail ou arraste um contato para a lista abaixo:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Esconder endereços ao enviar correio a esta lista"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Remover"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 msgid "Is New List"
-msgstr ""
+msgstr "É nova lista"
 
 #. Construct the app
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
@@ -2966,146 +2836,144 @@ msgstr ""
 "O nome ou e-mail alterado deste contato já existe nesta\n"
 "pasta. Você deseja adicioná-lo mesmo assim?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:143
-#: widgets/misc/e-filter-bar.c:150
+#. FIXME: get the toplevel window...
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Busca avançada"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:149
-#: mail/mail-search.c:298
-msgid "Search"
-msgstr "Buscar"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:155
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Sem cartões"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:158
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 cartão"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:161
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d cartões"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:366
-#: addressbook/gui/widgets/e-addressbook-view.c:179
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:111
 #: addressbook/gui/widgets/e-minicard-view.c:466
-#, fuzzy
 msgid "Query"
-msgstr "Quimper"
+msgstr "Consulta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:441
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 msgid "Error getting book view"
 msgstr "Erro ao obter visão de livro"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:380
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 msgid "Model"
-msgstr "Molde"
+msgstr "Modelo"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:99
-#: addressbook/gui/widgets/e-minicard.c:514
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:515
 msgid "Error modifying card"
 msgstr "Erro ao modificar cartão"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1153
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1163
 msgid "Success"
 msgstr "Sucesso"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:519 shell/e-shell.c:2093
-#: shell/e-storage.c:602 shell/evolution-shell-component.c:1192
+#: camel/providers/pop3/camel-pop3-store.c:522 shell/e-shell.c:2077
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1202
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Repositório desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:588
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1193
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Cartão não encontrado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "O ID do cartão já existe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protocolo não suportado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1176
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/print.c:2298
-#: camel/camel-service.c:739 camel/camel-service.c:781
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:779
 #: camel/camel-service.c:849 camel/camel-service.c:892
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr "Cancelada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Falhou a autenticação"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Autenticação exigida"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS não disponível"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Catálogo de endereços não existe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:69
-#: calendar/gui/dialogs/save-comp.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: 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:90
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+msgid "_Discard"
+msgstr "_Descartar"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Erro ao adicionar lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
-#: addressbook/gui/widgets/e-addressbook-util.c:266
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Erro ao adicionar cartão"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:99
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Erro ao modificar lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:109
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Erro ao remover lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:109
-#: addressbook/gui/widgets/e-addressbook-util.c:224
-#: addressbook/gui/widgets/e-addressbook-view.c:1612
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Erro ao remover cartão"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:191
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -3114,116 +2982,132 @@ msgstr ""
 "Abrir %d cartões também abrirá %d novas janelas.\n"
 "Você realmente deseja exibir todos estes cartões?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:322
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Mover cartão para"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:324
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Copiar cartão para"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:327
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Mover cartões para"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Copiar cartões para"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:186
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Vários VCards"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard para %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
 #: 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"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Catálogo de endereços"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
-#: addressbook/gui/widgets/e-addressbook-view.c:831
-#: addressbook/gui/widgets/e-addressbook-view.c:1740
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salvar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr "Novo contato..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:819
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr "Nova lista de contatos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr "Ir para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr "Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:825
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr "Buscar contatos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
 msgstr "Fontes de catálogos de endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Pilot Settings..."
 msgstr "Configurações do pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:832
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Encaminhar contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Enviar mensagem ao contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:834
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:836
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Imprimir envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:840
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Copy to folder..."
 msgstr "Copiar para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:841
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr "Mover para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:844
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Recortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:845
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: 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:846
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:851
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3487
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
+#: 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:904
+#: calendar/gui/e-day-view.c:3670 calendar/gui/e-week-view.c:3522
 msgid "Current View"
 msgstr "Visão atual"
 
@@ -3231,7 +3115,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:885
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 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"
 
@@ -3239,11 +3123,11 @@ 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:890
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 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"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1300
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3314,19 +3198,54 @@ msgstr "Outro telefone"
 msgid "Primary Phone"
 msgstr "Telefone principal"
 
-#: addressbook/gui/widgets/e-minicard-control.c:189
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr "e %d outros cartões."
 
-#: addressbook/gui/widgets/e-minicard-control.c:191
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "e um outro cartão."
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Salvar no catálogo de endereços"
 
+#: addressbook/gui/widgets/e-minicard-label.c:102
+#: addressbook/gui/widgets/e-minicard.c:142
+msgid "Width"
+msgstr "Largura"
+
+#: addressbook/gui/widgets/e-minicard-label.c:109
+#: addressbook/gui/widgets/e-minicard.c:149
+msgid "Height"
+msgstr "Altura"
+
+#: addressbook/gui/widgets/e-minicard-label.c:116
+#: addressbook/gui/widgets/e-minicard.c:157
+msgid "Has Focus"
+msgstr "Possui foco"
+
+#: addressbook/gui/widgets/e-minicard-label.c:123
+msgid "Field"
+msgstr "Campo"
+
+#: addressbook/gui/widgets/e-minicard-label.c:130
+msgid "Field Name"
+msgstr "Nome do campo"
+
+#: addressbook/gui/widgets/e-minicard-label.c:137
+msgid "Text Model"
+msgstr "Modelo de texto"
+
+#: addressbook/gui/widgets/e-minicard-label.c:144
+msgid "Max field name length"
+msgstr "Comprimento máximo de nome de campo"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+msgid "Column Width"
+msgstr "Largura da coluna"
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3352,49 +3271,36 @@ msgstr ""
 "Não há itens neste modo de exibição."
 
 #: addressbook/gui/widgets/e-minicard-view.c:452
-#, fuzzy
 msgid "Adapter"
-msgstr "Papel"
-
-#: addressbook/gui/widgets/e-minicard.c:138
-#, fuzzy
-msgid "Width"
-msgstr "Largura:"
-
-#: addressbook/gui/widgets/e-minicard.c:145
-#, fuzzy
-msgid "Height"
-msgstr "Altura:"
-
-#: addressbook/gui/widgets/e-minicard.c:153
-msgid "Has Focus"
-msgstr ""
+msgstr "Adaptador"
 
-#: addressbook/gui/widgets/e-minicard.c:161
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard.c:165
 msgid "Selected"
-msgstr "Selecionada:"
+msgstr "Selecionado"
 
-#: addressbook/gui/widgets/e-minicard.c:168
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard.c:172
 msgid "Has Cursor"
-msgstr "Ordenação de tarefas"
+msgstr "Possui cursor"
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:23
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Visão de cartão"
 
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+msgid "GTK Tree View"
+msgstr "Visão de árvore GTK"
+
 #: addressbook/printing/e-contact-print-envelope.c:216
 #: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Imprimir envelope"
 
-#: addressbook/printing/e-contact-print.c:1118
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Imprimir cartões"
 
-#: addressbook/printing/e-contact-print.c:1180
-#: addressbook/printing/e-contact-print.c:1202
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
 msgid "Print card"
 msgstr "Imprimir cartão"
 
@@ -3467,7 +3373,6 @@ msgid "Include:"
 msgstr "Incluir:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:638
 msgid "Landscape"
 msgstr "Paisagem"
 
@@ -3487,17 +3392,16 @@ msgstr "Margens"
 msgid "Number of columns:"
 msgstr "Número de colunas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:79
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Opções"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:625
 msgid "Orientation"
 msgstr "Orientação"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Página"
 
@@ -3513,9 +3417,7 @@ msgstr "Papel"
 msgid "Paper source:"
 msgstr "Fonte de papel:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:631
 msgid "Portrait"
 msgstr "Retrato"
 
@@ -3571,59 +3473,227 @@ msgstr "Largura:"
 msgid "_Font..."
 msgstr "_Fonte..."
 
-#: calendar/cal-util/cal-component.c:1216
+#: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Compromisso sem nome"
 
-#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr "1º de"
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "2 de"
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "3 de"
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "4 de"
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "5 de"
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "6 de"
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "7 de"
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "8 de"
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "9 de"
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "10 de"
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "11 de"
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "12 de"
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "13 de"
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "14 de"
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "15 de"
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "16 de"
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "17 de"
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "18 de"
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "19 de"
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "20 de"
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "21 de"
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "22 de"
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "23 de"
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "24 de"
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "25 de"
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "26 de"
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "27 de"
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "28 de"
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "29 de"
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "30 de"
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "31 de"
+
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:417 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "Alta"
 
-#: calendar/cal-util/cal-util.c:501 calendar/cal-util/cal-util.c:523
-#: calendar/gui/calendar-model.c:1721
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:503 calendar/cal-util/cal-util.c:525
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:519
-#: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:208
 msgid "Split Multi-Day Events:"
 msgstr "Eventos de vários dias partidos:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1291
+#: calendar/conduits/todo/todo-conduit.c:832
 msgid "Error while communicating with calendar server"
 msgstr "Erro ao comunicar com o servidor de agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1442
+#: calendar/conduits/calendar/calendar-conduit.c:1445
 msgid "Could not read pilot's Calendar application block"
 msgstr "Não foi possível ler os dados do aplicativo de agenda do pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:208
 msgid "Default Priority:"
 msgstr "Prioridade padrão:"
 
-#: calendar/conduits/todo/todo-conduit.c:951
-#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:956
+#: calendar/conduits/todo/todo-conduit.c:959
 msgid "Could not read pilot's ToDo application block"
 msgstr "Não foi possível ler os dados do aplicativo de tarefas do pilot"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "A Bonobo control which displays a task list."
+msgstr "Um controle Bonobo que exibe uma lista de tarefas."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Um controle Bonobo exemplo que exibe uma agenda."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Agenda e tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Configuration control for the Evolution Calendar."
+msgstr "Controle de configuração para a agenda do Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure o seu fuso horário, agenda e lista de tarefas aqui "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Visualizador iTip/iMip da agenda do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution component for handling the calendar."
+msgstr "Componente do Evolution para manipular a agenda."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Factory for the Evolution Calendar objects"
+msgstr "Fábrica para os objetos da Agenda do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Fábrica para centralizar os diálogos do editor do componente de agenda"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Alarm notification service"
+msgstr "Serviço de notificação de alarme"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:2
+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:214
 msgid "Starting:"
 msgstr "Iniciando:"
@@ -3662,18 +3732,17 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar compromisso"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:679
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Sem descrição disponível."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
-#: calendar/gui/alarm-notify/alarm-queue.c:765
-#: calendar/gui/tasks-control.c:455 mail/mail-callbacks.c:2809
-#: widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Alerta"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:745
+#: calendar/gui/alarm-notify/alarm-queue.c:849
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3685,7 +3754,7 @@ msgstr ""
 "com notificações por e-mail. O Evolution exibirá\n"
 "no lugar uma caixa de diálogo de lembrete normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:771
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3702,31 +3771,31 @@ msgstr ""
 "\n"
 "Você tem certeza que deseja executar este programa?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:785
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 msgid "Do not ask me about this program again."
 msgstr "Não me pergunte sobre este programa novamente."
 
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:157
+#: calendar/gui/alarm-notify/notify-main.c:173
 msgid "Could not initialize gnome-vfs"
 msgstr "Não foi possível iniciar gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:180
 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"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Resumo contém"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Descrição contém"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Comentário contém"
 
-#: calendar/gui/cal-search-bar.c:383 mail/mail-ops.c:1108
+#: calendar/gui/cal-search-bar.c:356 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr "Não casadas"
 
@@ -3736,8 +3805,8 @@ msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:287
-#: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:332
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:312
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3755,7 +3824,7 @@ msgstr "%d de %B de %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:432
-#: calendar/gui/e-week-view-main-item.c:340 calendar/gui/print.c:1490
+#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3766,67 +3835,155 @@ msgstr ""
 "Não foi possível criar a visão da agenda. Por favor verifique a configuração "
 "do seu ORBit e OAF."
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
+msgid "Calendar"
+msgstr "Agenda"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Pasta contendo compromissos e eventos"
+
+#: calendar/gui/calendar-component.c:75
+msgid "Public Calendar"
+msgstr "Agenda pública"
+
+#: calendar/gui/calendar-component.c:76
+msgid "Public folder containing appointments and events"
+msgstr "Pasta pública contendo compromissos e eventos"
+
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:595
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "Pasta contendo itens de tarefa"
+
+#: calendar/gui/calendar-component.c:85
+msgid "Public Tasks"
+msgstr "Tarefas públicas"
+
+#: calendar/gui/calendar-component.c:86
+msgid "Public folder containing to-do items"
+msgstr "Pasta pública contendo itens de tarefa"
+
+#: calendar/gui/calendar-component.c:730
+msgid "New appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/calendar-component.c:730
+msgid "_Appointment"
+msgstr "_Compromisso"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Criar um novo compromisso"
+
+#: calendar/gui/calendar-component.c:735
+msgid "New meeting"
+msgstr "Nova reunião"
+
+#: calendar/gui/calendar-component.c:735
+msgid "_Meeting"
+msgstr "_Reunião"
+
+#: calendar/gui/calendar-component.c:736
+msgid "Create a new meeting request"
+msgstr "Criar um novo pedido de reunião"
+
+#: calendar/gui/calendar-component.c:740
+msgid "New task"
+msgstr "Nova tarefa"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_Tarefa"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Criar uma nova tarefa"
+
+#: calendar/gui/calendar-component.c:745
+msgid "New All Day Appointment"
+msgstr "Novo compromisso de dia inteiro"
+
+#: calendar/gui/calendar-component.c:745
+msgid "All _Day Appointment"
+msgstr "Compromisso de _dia inteiro"
+
+#: calendar/gui/calendar-component.c:746
+msgid "Create a new all-day appointment"
+msgstr "Criar um novo compromisso de dia inteiro"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:956
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Particular"
 
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:958
+#: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:395
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:469
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1126
+#: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "Livre"
 
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:470
-#: calendar/gui/e-meeting-time-sel.c:428
-#: shell/evolution-shell-component.c:1177
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:408
+#: shell/evolution-shell-component.c:1187
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:490 calendar/gui/print.c:2289
+#: calendar/gui/calendar-model.c:742 calendar/gui/calendar-model.c:1170
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Não iniciada"
 
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1172
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2292
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "Em progresso"
 
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1174
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/e-meeting-model.c:327
-#: calendar/gui/e-meeting-model.c:350 calendar/gui/print.c:2295
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "Concluída"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1028
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3837,331 +3994,145 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:308
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1971
-#: mail/folder-browser.c:1724 mail/mail-account-gui.c:1225
-#: mail/mail-account-gui.c:1639 mail/mail-accounts.c:465
-#: mail/mail-accounts.c:479 mail/mail-config.glade.h:75
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:196
-#: widgets/misc/e-cell-date-edit.c:254 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1471 widgets/misc/e-dateedit.c:1586
+#: calendar/gui/calendar-model.c:1168 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1982
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:78
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "Nenhum"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1703
 msgid "Recurring"
 msgstr "Repetindo"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1705
 msgid "Assigned"
 msgstr "Atribuido"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:299
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:565
-#: calendar/gui/e-meeting-model.c:859
+#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
+#: calendar/gui/e-meeting-model.c:838
 msgid "Yes"
 msgstr "Sim"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:311
-#: calendar/gui/e-meeting-model.c:860
+#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Não"
 
-#: calendar/gui/calendar-view-factory.c:147
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Visão de dia"
 
-#: calendar/gui/calendar-view-factory.c:150
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "Visão de semana útil"
 
-#: calendar/gui/calendar-view-factory.c:153
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "Visão de semana"
 
-#: calendar/gui/calendar-view-factory.c:156
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "Visão de mês"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/gnome-cal.c:1357
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1079
-msgid "Calendar"
-msgstr "Agenda"
+#: calendar/gui/comp-editor-factory.c:456
+msgid "Error while opening the calendar"
+msgstr "Erro ao abrir a agenda"
 
-#: calendar/gui/component-factory.c:73
-msgid "Folder containing appointments and events"
-msgstr "Pasta contendo compromissos e eventos"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr "Método não suportado ao abrir a agenda"
 
-#: calendar/gui/component-factory.c:77
-msgid "Public Calendar"
-msgstr "Agenda pública"
-
-#: calendar/gui/component-factory.c:78
-msgid "Public folder containing appointments and events"
-msgstr "Pasta pública contendo compromissos e eventos"
-
-#: calendar/gui/component-factory.c:82 calendar/gui/e-tasks.c:716
-#: calendar/gui/print.c:1776 calendar/gui/tasks-control.c:509
-#: calendar/importers/icalendar-importer.c:702
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:326
-#: my-evolution/e-summary-tasks.c:344 shell/e-local-storage.c:184
-#: shell/e-shortcuts.c:1083
-msgid "Tasks"
-msgstr "Tarefas"
-
-#: calendar/gui/component-factory.c:83
-msgid "Folder containing to-do items"
-msgstr "Pasta contendo itens de tarefa"
-
-#: calendar/gui/component-factory.c:87
-msgid "Public Tasks"
-msgstr "Tarefas públicas"
-
-#: calendar/gui/component-factory.c:88
-msgid "Public folder containing to-do items"
-msgstr "Pasta pública contendo itens de tarefa"
-
-#: calendar/gui/component-factory.c:749
-msgid "New appointment"
-msgstr "Novo compromisso"
+#: calendar/gui/comp-editor-factory.c:473
+msgid "Permission denied to open the calendar"
+msgstr "Permissão negada para abrir a agenda"
 
-#: calendar/gui/component-factory.c:749
-msgid "_Appointment"
-msgstr "_Compromisso"
-
-#: calendar/gui/component-factory.c:750
-msgid "Create a new appointment"
-msgstr "Criar um novo compromisso"
-
-#: calendar/gui/component-factory.c:754
-msgid "New meeting"
-msgstr "Nova reunião"
-
-#: calendar/gui/component-factory.c:754
-msgid "_Meeting"
-msgstr "_Reunião"
-
-#: calendar/gui/component-factory.c:755
-msgid "Create a new meeting request"
-msgstr "Criar um novo pedido de reunião"
-
-#: calendar/gui/component-factory.c:759
-msgid "New task"
-msgstr "Nova tarefa"
-
-#: calendar/gui/component-factory.c:759
-msgid "_Task"
-msgstr "_Tarefa"
-
-#: calendar/gui/component-factory.c:760
-msgid "Create a new task"
-msgstr "Criar uma nova tarefa"
-
-#: calendar/gui/component-factory.c:764
-msgid "New All Day Appointment"
-msgstr "Novo compromisso de dia inteiro"
-
-#: calendar/gui/component-factory.c:764
-msgid "All _Day Appointment"
-msgstr "Compromisso de _dia inteiro"
-
-#: calendar/gui/component-factory.c:765
-msgid "Create a new all-day appointment"
-msgstr "Criar um novo compromisso de dia inteiro"
-
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Não foi possível abrir pasta em '%s'"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:163
 msgid "The URI that the calendar will display"
 msgstr "A URI que a agenda vai exibir"
 
-#: calendar/gui/control-factory.c:174
+#: calendar/gui/control-factory.c:170
 msgid "The type of view to show"
 msgstr "O tipo de visão a exibir"
 
-#: calendar/gui/dialogs/alarm-options.c:358
+#: calendar/gui/dialogs/alarm-options.c:473
 msgid "Audio Alarm Options"
 msgstr "Opções do alarme audível"
 
-#: calendar/gui/dialogs/alarm-options.c:367
+#: calendar/gui/dialogs/alarm-options.c:482
 msgid "Message Alarm Options"
 msgstr "Opções do alarme de mensagem"
 
-#: calendar/gui/dialogs/alarm-options.c:376
-msgid "Mail Alarm Options"
-msgstr "Opções do alarme de correio"
+#: calendar/gui/dialogs/alarm-options.c:491
+msgid "Email Alarm Options"
+msgstr "Opções do alarme de e-mail"
 
-#: calendar/gui/dialogs/alarm-options.c:385
+#: calendar/gui/dialogs/alarm-options.c:500
 msgid "Program Alarm Options"
 msgstr "Opções do alarme de programa"
 
-#: calendar/gui/dialogs/alarm-options.c:394
+#: calendar/gui/dialogs/alarm-options.c:509
 msgid "Unknown Alarm Options"
 msgstr "Opções do alarme desconhecido"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Repetição do alarme"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
-msgstr ""
-"O Evolution ainda não suporta notificação por e-mail de lembretes. Você não "
-"será capaz de editar as opções deste lembrete."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Mensagem a exibir"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Message to Send"
+msgstr "Mensagem a enviar"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Tocar um som:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Repetir o alarme"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Executar um programa:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+msgid "Send To:"
+msgstr "Enviar para:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Com estes argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:68
-#: filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
 msgid "days"
 msgstr "dias"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "extra times every"
 msgstr "vezes extra a cada"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:67
-#: filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:12 filter/filter.glade.h:21
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:66
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:318
-#, c-format
-msgid "%d days"
-msgstr "%d dias"
-
-#: calendar/gui/dialogs/alarm-page.c:321
-msgid "1 day"
-msgstr "1 dia"
-
-#: calendar/gui/dialogs/alarm-page.c:326
-#, c-format
-msgid "%d weeks"
-msgstr "%d semanas"
-
-#: calendar/gui/dialogs/alarm-page.c:329
-msgid "1 week"
-msgstr "1 semana"
-
-#: calendar/gui/dialogs/alarm-page.c:334
-#, c-format
-msgid "%d hours"
-msgstr "%d horas"
-
-#: calendar/gui/dialogs/alarm-page.c:337
-msgid "1 hour"
-msgstr "1 hora"
-
-#: calendar/gui/dialogs/alarm-page.c:342
-#, c-format
-msgid "%d minutes"
-msgstr "%d minutos"
-
-#: calendar/gui/dialogs/alarm-page.c:345
-msgid "1 minute"
-msgstr "1 minuto"
-
-#: calendar/gui/dialogs/alarm-page.c:350
-#, c-format
-msgid "%d seconds"
-msgstr "%d segundos"
-
-#: calendar/gui/dialogs/alarm-page.c:353
-msgid "1 second"
-msgstr "1 segundo"
-
-#: calendar/gui/dialogs/alarm-page.c:382
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Tocar um som"
-
-#: calendar/gui/dialogs/alarm-page.c:386
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Exibir uma mensagem"
-
-#: calendar/gui/dialogs/alarm-page.c:390
-msgid "Send an email"
-msgstr "Enviar um e-mail"
-
-#: calendar/gui/dialogs/alarm-page.c:394
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Executar um programa"
-
-#: calendar/gui/dialogs/alarm-page.c:400
-msgid "Unknown action to be performed"
-msgstr "Ação desconhecida a ser executada"
-
-#: calendar/gui/dialogs/alarm-page.c:412
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s antes do início do compromisso"
-
-#: calendar/gui/dialogs/alarm-page.c:415
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s após o início do compromisso"
-
-#: calendar/gui/dialogs/alarm-page.c:420
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s no início do compromisso"
-
-#: calendar/gui/dialogs/alarm-page.c:429
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s antes do término do compromisso"
-
-#: calendar/gui/dialogs/alarm-page.c:432
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s após o término do compromisso"
-
-#: calendar/gui/dialogs/alarm-page.c:437
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s no término do compromisso"
-
-#: calendar/gui/dialogs/alarm-page.c:461
-#, c-format
-msgid "%s at %s"
-msgstr "%s em %s"
-
-#: calendar/gui/dialogs/alarm-page.c:467
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s para um tipo de gatilho desconhecido"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4172,46 +4143,62 @@ msgstr "Básico"
 msgid "Date/Time:"
 msgstr "Data/hora:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Exibir uma mensagem"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Tocar um som"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Lembretes"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Executar um programa"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an Email"
+msgstr "Enviar um e-mail"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:826 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Opções..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "após"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "antes"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "dia(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "fim do compromisso"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:178
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "início do compromisso"
 
@@ -4235,7 +4222,7 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 msgid "Alerts"
 msgstr "Alertas"
 
@@ -4260,7 +4247,8 @@ msgid "Days"
 msgstr "Dias"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Sexta-feira"
 
@@ -4273,7 +4261,8 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Segunda-feira"
 
@@ -4282,7 +4271,8 @@ msgid "S_un"
 msgstr "D_om"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -4295,7 +4285,8 @@ 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:20
-#: calendar/gui/dialogs/recurrence-page.c:1138
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Domigo"
 
@@ -4312,7 +4303,8 @@ msgid "Task List"
 msgstr "Lista de tarefas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Quinta-feira"
 
@@ -4329,7 +4321,8 @@ msgid "Time format:"
 msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Terça-feira"
 
@@ -4338,7 +4331,8 @@ msgid "W_eek starts:"
 msgstr "Se_mana começa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
@@ -4380,7 +4374,7 @@ msgid "_Fri"
 msgstr "Se_x"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Geral"
 
@@ -4420,7 +4414,7 @@ msgstr "Qu_a"
 msgid "before every appointment"
 msgstr "antes de cada compromisso"
 
-#: calendar/gui/dialogs/cancel-comp.c:55
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -4428,11 +4422,11 @@ msgstr ""
 "O evento sendo apagado é uma reunião. Você gostaria de enviar um aviso de "
 "cancelamento?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Você tem certeza que deseja cancelar e excluir esta reunião?"
 
-#: calendar/gui/dialogs/cancel-comp.c:64
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -4440,19 +4434,17 @@ msgstr ""
 "A tarefa sendo apagada está atribuída. Você gostaria de enviar um aviso de "
 "cancelamento?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Você tem certeza que deseja cancelar e excluir esta tarefa?"
 
-#: calendar/gui/dialogs/cancel-comp.c:73
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
-msgstr ""
-"A entrada de diário sendo apagada está publicada. Você gostaria de enviar um "
-"aviso de cancelamento?"
+msgstr "O item de diário sendo apagado está publicado. Você gostaria de enviar um aviso de cancelamento?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Você tem certeza que deseja cancelar e excluir este item de diário?"
 
@@ -4501,81 +4493,84 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Você não fez alterações, atualizar o editor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2207
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Erro de validação: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " para "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2211
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr " (Concluída "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2213
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr "Concluída "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2218
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr " (Prazo "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2220
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr "Prazo "
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "Could not update invalid object"
 msgstr "Não foi possível atualizar objeto inválido"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr "Objeto não encontrado, não foi atualizado"
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr "Você não possui as permissões para atualizar este objeto"
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 msgid "Could not update object"
 msgstr "Não foi possível atualizar objeto"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Item de diário - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1059 calendar/gui/e-day-view.c:3955
-#: calendar/gui/e-week-view.c:3720 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3928
+#: calendar/gui/e-week-view.c:3758 composer/e-msg-composer.c:1159
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1331
+#: calendar/gui/dialogs/comp-editor.c:1355
+#: calendar/gui/dialogs/comp-editor.c:1379
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
-"Mudanças feitas a este item podem ser descartadas se um atualização chegar "
-"por e-mail"
+"Mudanças feitas a este item podem ser descartadas se um atualização chegar"
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "Não foi possível obter a versão atual!"
 
@@ -4633,108 +4628,128 @@ msgstr "Delegar para:"
 msgid "Enter Delegate"
 msgstr "Entrar delegado"
 
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2246
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Lembrete"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Repetição"
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "Agendamento"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Reunião"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.c:654 calendar/gui/dialogs/task-page.c:554
+msgid "Start date is wrong"
+msgstr "A data de início está errada"
+
+#: calendar/gui/dialogs/event-page.c:664
+msgid "End date is wrong"
+msgstr "A data de término está errada"
+
+#: calendar/gui/dialogs/event-page.c:687
+msgid "Start time is wrong"
+msgstr "A hora de início está errada"
+
+#: calendar/gui/dialogs/event-page.c:694
+msgid "End time is wrong"
+msgstr "A hora de término está errada"
+
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "_Dia inteiro"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "_Ocupado"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Classificação"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "_Confidencial"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Data & hora"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "Li_vre"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "_Local:"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Partic_ular"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "_Público"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Exibir como tempo"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "_Resumo:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:14
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "Co_ntatos..."
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "Hora de tér_mino:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Start time:"
 msgstr "Hora de _início:"
 
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr "O organizador selecionada não possui mais uma conta."
+
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr "Um organizador é exigido."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "Pelo menos um participante é necessário."
 
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Esta pessoa já participa da reunião!"
 
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Delegar para..."
 
@@ -4774,14 +4789,14 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:1176
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: 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:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4796,98 +4811,85 @@ msgid "_Change Organizer"
 msgstr "_Alterar organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:446
+#: calendar/gui/e-meeting-time-sel.c:426
 msgid "_Invite Others..."
 msgstr "_Convidar outros..."
 
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-#: calendar/gui/dialogs/recurrence-page.c:157
-msgid "st"
-msgstr "º"
-
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-msgid "nd"
-msgstr "º"
-
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:149
-msgid "rd"
-msgstr "º"
-
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-#: calendar/gui/dialogs/recurrence-page.c:156
-msgid "th"
-msgstr "º"
-
-#: calendar/gui/dialogs/recurrence-page.c:630
+#: calendar/gui/dialogs/recur-comp.c:52
+msgid "You are modifying a recurring event, what would you like to modify?"
+msgstr ""
+"Você está modificando um evento recorrente, o que você gostaria de modificar?"
+
+#: calendar/gui/dialogs/recur-comp.c:56
+msgid "You are modifying a recurring task, what would you like to modify?"
+msgstr ""
+"Você está modificando uma tarefa recorrente, o que você gostaria de "
+"modificar?"
+
+#: calendar/gui/dialogs/recur-comp.c:60
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+"Você está modificando um item de diário recorrente, o que você gostaria de "
+"modificar?"
+
+#: calendar/gui/dialogs/recur-comp.c:77
+msgid "This Instance Only"
+msgstr "Esta instância apenas"
+
+#: calendar/gui/dialogs/recur-comp.c:80
+msgid "This and Future Instances"
+msgstr "Esta e futuras instâncias"
+
+#: calendar/gui/dialogs/recur-comp.c:82
+msgid "All Instances"
+msgstr "Todas as instâncias"
+
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Este compromisso possui repetições que o Evolution não pode editar."
 
-#: calendar/gui/dialogs/recurrence-page.c:899
-msgid "Recurrent date is wrong"
-msgstr "A data recorrente está errada"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
+msgstr "A data recorrente é inválida"
 
-#: calendar/gui/dialogs/recurrence-page.c:1008
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr "primeiro"
 
-#: calendar/gui/dialogs/recurrence-page.c:1074 filter/filter-datespec.c:65
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "segundo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "terceiro"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr "quarto"
 
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr "último"
 
-#: calendar/gui/dialogs/recurrence-page.c:1103
+#: calendar/gui/dialogs/recurrence-page.c:1004
 msgid "Other Date"
 msgstr "Outra data"
 
-#: calendar/gui/dialogs/recurrence-page.c:1131 filter/filter-datespec.c:68
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "dia"
 
-#: calendar/gui/dialogs/recurrence-page.c:1271
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1456
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "ocorrências"
 
@@ -4951,22 +4953,26 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr "A informação da reunião foi criada. Enviá-la?"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "A informação da reunião mudou. Enviar uma versão atualizada?"
 
-#: calendar/gui/dialogs/send-comp.c:65
+#: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
 msgstr "A informação de atribuição de tarefa foi criada. Enviá-la?"
 
-#: calendar/gui/dialogs/send-comp.c:69
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr "A informação da tarefa mudou. Enviar uma versão atualizada?"
 
+#: calendar/gui/dialogs/task-details-page.c:397
+msgid "Completed date is wrong"
+msgstr "A data de conclusão está errada"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -4977,42 +4983,40 @@ msgstr "% Concluída"
 msgid "Date Completed:"
 msgstr "Concluída em:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-meeting-model.c:340
-#: calendar/gui/e-meeting-model.c:571 calendar/gui/e-meeting-model.c:872
-msgid "Needs Action"
-msgstr "Necessita ação"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Progresso"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:629
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Estado:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Básico"
 
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "Atribuição"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:880
+#: calendar/gui/dialogs/task-page.c:527
+msgid "Due date is wrong"
+msgstr "O prazo de conclusão está errado"
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1104
 #: 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:44
 msgid "Description:"
 msgstr "Descrição:"
 
@@ -5024,120 +5028,213 @@ msgstr "_Data de início:"
 msgid "_Due Date:"
 msgstr "Pra_zo de conclusão:"
 
-#: calendar/gui/e-calendar-table.c:439
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d dias"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 dia"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d semanas"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 semana"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d horas"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 hora"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutos"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 minuto"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d segundos"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 segundo"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Enviar um e-mail"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Ação desconhecida a ser executada"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s antes do início do compromisso"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s após o início do compromisso"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s no início do compromisso"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s antes do término do compromisso"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s após o término do compromisso"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s no término do compromisso"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s em %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s para um tipo de gatilho desconhecido"
+
+#: calendar/gui/e-calendar-table.c:415
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-calendar-table.c:416
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:417
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:418
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:419
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:420
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:421
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:422
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:423
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:424
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-calendar-table.c:425
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:739 calendar/gui/e-day-view.c:2839
-#: calendar/gui/e-week-view.c:1884
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2825
+#: calendar/gui/e-week-view.c:1900
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: calendar/gui/e-calendar-table.c:973 calendar/gui/e-day-view.c:3722
-#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1735
-#: shell/e-shortcuts-view.c:412 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3692
+#: calendar/gui/e-week-view.c:3539 mail/folder-browser.c:1756
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "A_brir"
 
-#: calendar/gui/e-calendar-table.c:974
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr "_Salvar como..."
 
-#: calendar/gui/e-calendar-table.c:975 calendar/gui/e-day-view.c:3724
-#: calendar/gui/e-week-view.c:3479 calendar/gui/e-week-view.c:3506
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3694
+#: calendar/gui/e-week-view.c:3514 calendar/gui/e-week-view.c:3541
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3729
-#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3699
+#: calendar/gui/e-week-view.c:3546 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:980 calendar/gui/e-day-view.c:3730
-#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-week-view.c:3547 ui/evolution-addressbook.xml.h:30
 #: 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:981 calendar/gui/e-day-view.c:3695
-#: calendar/gui/e-day-view.c:3731 calendar/gui/e-week-view.c:3483
-#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3665
+#: calendar/gui/e-day-view.c:3701 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-week-view.c:3548 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "C_olar"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr "_Atribuir tarefa"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr "_Encaminar como iCalendar"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "_Marcar como concluída"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:965
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tarefas selecionadas como concluídas"
 
-#: calendar/gui/e-calendar-table.c:993
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir tarefas selecionadas"
 
-#: calendar/gui/e-calendar-table.c:1263 calendar/gui/e-day-view.c:7554
-#: calendar/gui/e-week-view.c:4198
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7630
+#: calendar/gui/e-week-view.c:4247
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1346
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Clique para adicionar uma tarefa"
@@ -5146,8 +5243,8 @@ msgstr "Clique para adicionar uma tarefa"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1000
-#: camel/camel-filter-driver.c:1095
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Concluída"
 
@@ -5176,8 +5273,8 @@ msgid "Start Date"
 msgstr "Data de início"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:763
-#: shell/e-shortcuts.c:1071
+#: my-evolution/component-factory.c:56 shell/e-shell.c:747
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Resumo"
 
@@ -5208,133 +5305,205 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:520
+#: calendar/gui/e-day-view-time-item.c:531
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i frações de minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:283 calendar/gui/e-day-view.c:1389
-#: calendar/gui/e-week-view-main-item.c:323 calendar/gui/print.c:1506
+#: calendar/gui/e-day-view-top-item.c:262 calendar/gui/e-day-view.c:1374
+#: calendar/gui/e-week-view-main-item.c:303 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:291 calendar/gui/e-day-view.c:1416
-#: calendar/gui/e-week-view-main-item.c:346
+#: calendar/gui/e-day-view-top-item.c:270 calendar/gui/e-day-view.c:1401
+#: calendar/gui/e-week-view-main-item.c:326
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:370
-#: calendar/gui/print.c:790
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:373
-#: calendar/gui/print.c:792
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3679
+#: calendar/gui/e-day-view.c:3649
 msgid "New _Appointment"
 msgstr "Novo _compromisso"
 
-#: calendar/gui/e-day-view.c:3681 calendar/gui/e-week-view.c:3473
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3508
 msgid "New All Day _Event"
 msgstr "Novo _evento de dia inteiro"
 
-#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3474
+#: calendar/gui/e-day-view.c:3653 calendar/gui/e-week-view.c:3509
 msgid "New Meeting"
 msgstr "Nova reunião"
 
-#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3475
+#: calendar/gui/e-day-view.c:3655 calendar/gui/e-week-view.c:3510
 msgid "New Task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/e-day-view.c:3690 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3660 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3489
+#: calendar/gui/e-day-view.c:3672 calendar/gui/e-week-view.c:3524
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ir para _hoje"
 
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3525
 msgid "_Go to Date..."
 msgstr "Ir para _data..."
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3494
+#: calendar/gui/e-day-view.c:3679 calendar/gui/e-week-view.c:3529
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar informação de livre/ocupado"
 
-#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3498
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3684 calendar/gui/e-week-view.c:3533
+#: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Configurações..."
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3505
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3693 calendar/gui/e-week-view.c:3540
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Salvar como..."
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3705 calendar/gui/e-week-view.c:3552
 msgid "_Schedule Meeting..."
 msgstr "Agendar _reunião..."
 
-#: calendar/gui/e-day-view.c:3736 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3553
 msgid "_Forward as iCalendar..."
 msgstr "_Encaminar como iCalendar..."
 
-#: calendar/gui/e-day-view.c:3741 calendar/gui/e-week-view.c:3523
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3558
 msgid "Make this Occurrence _Movable"
 msgstr "Tornar esta ocorrência _móvel"
 
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-day-view.c:3712 calendar/gui/e-week-view.c:3559
 msgid "Delete this _Occurrence"
 msgstr "Excluir esta _ocorrência"
 
-#: calendar/gui/e-day-view.c:3743 calendar/gui/e-week-view.c:3525
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3560
 msgid "Delete _All Occurrences"
 msgstr "Excluir _todas as ocorrências"
 
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:704
+msgid "Yes. (Complex Recurrence)"
+msgstr "Sim. (Repetição complexa)"
+
+#: calendar/gui/e-itip-control.c:716
+msgid "Every day"
+msgstr "Todo dia"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "Every %d days"
+msgstr "A cada %d dias"
+
+#: calendar/gui/e-itip-control.c:724
+msgid "Every week"
+msgstr "Toda semana"
+
+#: calendar/gui/e-itip-control.c:726
+#, c-format
+msgid "Every %d weeks"
+msgstr "A cada %d semanas"
+
+#: calendar/gui/e-itip-control.c:729
+msgid "Every week on "
+msgstr "Toda semana em "
+
+#: calendar/gui/e-itip-control.c:731
+#, c-format
+msgid "Every %d weeks on "
+msgstr "A cada %d semanas em "
+
+#: calendar/gui/e-itip-control.c:739
+msgid " and "
+msgstr " e "
+
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr "O %s dia de "
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr "O %s %s de "
+
+#: calendar/gui/e-itip-control.c:764
+msgid "every month"
+msgstr "todo mês"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr "a cada %d meses"
+
+#: calendar/gui/e-itip-control.c:775
+msgid "Every year"
+msgstr "Todo ano"
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr "A cada %d anos"
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr " um total de %d vezes"
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ", terminando em "
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr "<b>Inicia:</b> "
 
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>Termina:</b> "
 
-#: calendar/gui/e-itip-control.c:630
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>Concluída:</b> "
 
-#: calendar/gui/e-itip-control.c:640
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr "<b>Prazo:</b> "
 
-#: calendar/gui/e-itip-control.c:677 calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "Informação de iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: calendar/gui/e-itip-control.c:758 calendar/gui/e-itip-control.c:774
-#: calendar/gui/e-itip-control.c:785 calendar/gui/e-itip-control.c:802
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr "Uma razão desconhecida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:809
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5342,339 +5511,339 @@ 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:824
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Nenhum</i>"
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:1058
 msgid "Location:"
 msgstr "Local:"
 
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:1072
 msgid "Status:"
 msgstr "Estado:"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:342 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:486
+#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:413
 msgid "Accepted"
 msgstr "Aceito"
 
-#: calendar/gui/e-itip-control.c:857 calendar/gui/itip-utils.c:489
+#: calendar/gui/e-itip-control.c:1081 calendar/gui/itip-utils.c:416
 msgid "Tentatively Accepted"
 msgstr "Aceito preliminarmente"
 
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:321
-#: calendar/gui/e-meeting-model.c:344 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:492 calendar/gui/itip-utils.c:518
+#: calendar/gui/e-itip-control.c:1085 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:419 calendar/gui/itip-utils.c:445
 msgid "Declined"
 msgstr "Recusado"
 
-#: calendar/gui/e-itip-control.c:865 calendar/gui/e-itip-control.c:1071
-#: calendar/gui/e-meeting-model.c:255 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:355 calendar/gui/e-meeting-model.c:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-gpg-context.c:1531
-#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:331
-#: mail/mail-display.c:895 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:445
+#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: calendar/gui/e-itip-control.c:918 calendar/gui/e-itip-control.c:946
-#: calendar/gui/e-itip-control.c:972 calendar/gui/e-itip-control.c:985
-#: calendar/gui/e-itip-control.c:998 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1144 calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1198 calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224 calendar/gui/e-itip-control.c:1237
 msgid "Choose an action:"
 msgstr "Escolher uma ação:"
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:1145
 msgid "Update"
 msgstr "Atualizar"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:951
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-itip-control.c:987
-#: calendar/gui/e-itip-control.c:1000 calendar/gui/e-itip-control.c:1013
-#: shell/e-shell.c:2083 widgets/misc/e-cell-date-edit.c:262
+#: calendar/gui/e-itip-control.c:1146 calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1200 calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1226 calendar/gui/e-itip-control.c:1239
+#: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:1173
 msgid "Accept"
 msgstr "Aceitar"
 
-#: calendar/gui/e-itip-control.c:948
+#: calendar/gui/e-itip-control.c:1174
 msgid "Tentatively accept"
 msgstr "Aceitar preliminarmente"
 
-#: calendar/gui/e-itip-control.c:949
+#: calendar/gui/e-itip-control.c:1175
 msgid "Decline"
 msgstr "Recusar"
 
-#: calendar/gui/e-itip-control.c:973
+#: calendar/gui/e-itip-control.c:1199
 msgid "Send Free/Busy Information"
 msgstr "Enviar informação de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:986
+#: calendar/gui/e-itip-control.c:1212
 msgid "Update respondent status"
 msgstr "Atualizar estado do respondente"
 
-#: calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1225
 msgid "Send Latest Information"
 msgstr "Enviar informação mais recente"
 
-#: calendar/gui/e-itip-control.c:1012 calendar/gui/itip-utils.c:506
-#: shell/evolution-shell-component.c:1155 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1238 calendar/gui/itip-utils.c:433
+#: shell/evolution-shell-component.c:1165 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1093
+#: calendar/gui/e-itip-control.c:1319
 #, 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:1094
+#: calendar/gui/e-itip-control.c:1320
 msgid "Meeting Information"
 msgstr "Informação de reunião"
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> requisita a presença de %s em uma reunião."
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1327
 #, 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:1102
+#: calendar/gui/e-itip-control.c:1328
 msgid "Meeting Proposal"
 msgstr "Proposta de reunião"
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1332
 #, 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:1107
+#: calendar/gui/e-itip-control.c:1333
 msgid "Meeting Update"
 msgstr "Atualização de reunião"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1337
 #, 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:1112
+#: calendar/gui/e-itip-control.c:1338
 msgid "Meeting Update Request"
 msgstr "_Pedido de atualização de reunião"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1345
 #, 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:1120
+#: calendar/gui/e-itip-control.c:1346
 msgid "Meeting Reply"
 msgstr "Resposta a reunião"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou a reunião."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1354
 msgid "Meeting Cancellation"
 msgstr "Cancelamento de reunião"
 
-#: calendar/gui/e-itip-control.c:1135 calendar/gui/e-itip-control.c:1202
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1428
+#: calendar/gui/e-itip-control.c:1463
 #, 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:1136
+#: calendar/gui/e-itip-control.c:1362
 msgid "Bad Meeting Message"
 msgstr "Mensagem de reunião inválida"
 
-#: calendar/gui/e-itip-control.c:1160
+#: calendar/gui/e-itip-control.c:1386
 #, 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:1161
+#: calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Informação de tarefa"
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requisita que %s execute uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1394
 #, 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:1169
+#: calendar/gui/e-itip-control.c:1395
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1399
 #, 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:1174
+#: calendar/gui/e-itip-control.c:1400
 msgid "Task Update"
 msgstr "Atualização de tarefa"
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1404
 #, 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:1179
+#: calendar/gui/e-itip-control.c:1405
 msgid "Task Update Request"
 msgstr "Pedido de atualização de tarefa"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1412
 #, 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:1187
+#: calendar/gui/e-itip-control.c:1413
 msgid "Task Reply"
 msgstr "Resposta a tarefa"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1420
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1421
 msgid "Task Cancellation"
 msgstr "Cancelamento de tarefa"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1429
 msgid "Bad Task Message"
 msgstr "Mensagem de tarefa inválida"
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1448
 #, 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:1223
+#: calendar/gui/e-itip-control.c:1449
 msgid "Free/Busy Information"
 msgstr "Informação de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1453
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1454
 msgid "Free/Busy Request"
 msgstr "Pedido de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1232
+#: calendar/gui/e-itip-control.c:1458
 #, 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:1233
+#: calendar/gui/e-itip-control.c:1459
 msgid "Free/Busy Reply"
 msgstr "Resposta de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1464
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de livre/ocupado inválida"
 
-#: calendar/gui/e-itip-control.c:1312
+#: calendar/gui/e-itip-control.c:1540
 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:1374
+#: calendar/gui/e-itip-control.c:1603
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem contém apenas pedidos não suportados."
 
-#: calendar/gui/e-itip-control.c:1402 calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1634 calendar/gui/e-itip-control.c:1640
 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:1433
+#: calendar/gui/e-itip-control.c:1665
 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:1654 calendar/gui/e-itip-control.c:1746
+#: calendar/gui/e-itip-control.c:1906 calendar/gui/e-itip-control.c:1998
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objeto é inválido e não pode ser atualizado\n"
 
-#: calendar/gui/e-itip-control.c:1657 calendar/gui/e-itip-control.c:1749
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "There was an error on the CORBA system\n"
 msgstr "Ocorreu um erro no sistema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1660 calendar/gui/e-itip-control.c:1752
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 msgid "Object could not be found\n"
 msgstr "Objeto não pôde ser encontrado\n"
 
-#: calendar/gui/e-itip-control.c:1663
+#: calendar/gui/e-itip-control.c:1915
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Você não possui as permissões corretas para atualizar a agenda\n"
 
-#: calendar/gui/e-itip-control.c:1666
+#: calendar/gui/e-itip-control.c:1918
 msgid "Update complete\n"
 msgstr "Atualização concluída\n"
 
-#: calendar/gui/e-itip-control.c:1669
+#: calendar/gui/e-itip-control.c:1921
 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:1698 calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1950 calendar/gui/e-itip-control.c:2016
 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:1719
+#: calendar/gui/e-itip-control.c:1971
 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:1731
+#: calendar/gui/e-itip-control.c:1983
 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:1755
+#: calendar/gui/e-itip-control.c:2007
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Você não possui as permissões corretas para atualizar a agenda\n"
 
-#: calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:2010
 msgid "Attendee status updated\n"
 msgstr "Estado do participante atualizado\n"
 
-#: calendar/gui/e-itip-control.c:1761
+#: calendar/gui/e-itip-control.c:2013
 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:1796
+#: calendar/gui/e-itip-control.c:2048
 msgid "Removal Complete"
 msgstr "Remoção concluída"
 
-#: calendar/gui/e-itip-control.c:1826 calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:2078 calendar/gui/e-itip-control.c:2128
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1828 calendar/gui/e-itip-control.c:1880
+#: calendar/gui/e-itip-control.c:2080 calendar/gui/e-itip-control.c:2132
 msgid "The item could not be sent!\n"
 msgstr "O item não pôde ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1953
+#: calendar/gui/e-itip-control.c:2205
 msgid "Select Calendar Folder"
 msgstr "Selecionar pasta de agenda"
 
-#: calendar/gui/e-itip-control.c:1960
+#: calendar/gui/e-itip-control.c:2212
 msgid "Select Tasks Folder"
 msgstr "Selecionar pasta de tarefas"
 
@@ -5715,180 +5884,185 @@ msgstr "data-fim"
 msgid "date-start"
 msgstr "data-inicio"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Moderadores"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1757
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "Participantes obrigatórios"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Participantes opcionais"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr "Recursos"
 
-#: calendar/gui/e-meeting-model.c:230 calendar/gui/e-meeting-model.c:247
-#: calendar/gui/e-meeting-model.c:561 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr "Indivíduo"
 
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "Sala"
 
-#: calendar/gui/e-meeting-model.c:265 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr "Moderador"
 
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:563 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr "Participante obrigatório"
 
-#: calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr "Não participante"
 
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:427
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+msgid "Needs Action"
+msgstr "Necessita ação"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:407
 msgid "Tentative"
 msgstr "Preliminar"
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr "Delegado"
 
-#: calendar/gui/e-meeting-model.c:329 calendar/gui/e-meeting-model.c:352
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 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:474
-#: calendar/gui/e-meeting-time-sel.c:2092
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2077
 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:478
-#: calendar/gui/e-meeting-time-sel.c:2122 e-util/e-time-utils.c:189
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2107 e-util/e-time-utils.c:189
 #: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:482 e-util/e-time-utils.c:224
-#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1595
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:409 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fora do escritório"
 
-#: calendar/gui/e-meeting-time-sel.c:430
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "No Information"
 msgstr "Sem informação"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:448
 msgid "_Options"
 msgstr "_Opções"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:468
 msgid "Show _Only Working Hours"
 msgstr "Exibir apenas _horas do expediente"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:482
 msgid "Show _Zoomed Out"
 msgstr "Exibir com _menos ampliação"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:500
 msgid "_Update Free/Busy"
 msgstr "_Atualizar livre/ocupado"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:518
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:535
 msgid "_Autopick"
 msgstr "_Autoescolher"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:549
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:586
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "_All People and Resources"
 msgstr "_Todas as pessoas e recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:599
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "All _People and One Resource"
 msgstr "Todas as _pessoas e um recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:612
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Required People"
 msgstr "Pessoas _necessárias"
 
-#: calendar/gui/e-meeting-time-sel.c:625
+#: calendar/gui/e-meeting-time-sel.c:607
 msgid "Required People and _One Resource"
 msgstr "Pessoas necessárias e _um recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:648
+#: calendar/gui/e-meeting-time-sel.c:630
 msgid "Meeting _start time:"
 msgstr "Hora de _início da reunião:"
 
-#: calendar/gui/e-meeting-time-sel.c:667
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _end time:"
 msgstr "Hora de _término da reunião:"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:2005
-#: calendar/gui/gnome-cal.c:2016
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas em %s"
 
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:197
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Não foi possível carregar as tarefas em `%s'"
 
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:401
 #, c-format
 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:401 calendar/gui/gnome-cal.c:1538
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Você não possui as permissões para abrir a pasta em `%s'"
 
-#: calendar/gui/e-tasks.c:466 calendar/gui/gnome-cal.c:1736
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5897,39 +6071,38 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:537
+#: calendar/gui/e-tasks.c:554
 msgid "Completing tasks..."
 msgstr "Concluindo tarefas..."
 
-#: calendar/gui/e-tasks.c:560
+#: calendar/gui/e-tasks.c:577
 msgid "Deleting selected objects..."
 msgstr "Excluindo objetos selecionados..."
 
-#: calendar/gui/e-tasks.c:653
+#: calendar/gui/e-tasks.c:672
 msgid "Expunging"
 msgstr "Excluindo permanentemente"
 
-#: calendar/gui/e-week-view.c:3472
+#: calendar/gui/e-week-view.c:3507
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
-#: calendar/gui/gnome-cal.c:1516
+#: calendar/gui/gnome-cal.c:1503
 #, 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:1527
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O método necessário para abrir `%s' não é suportado"
 
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1567
+#: calendar/gui/gnome-cal.c:1563
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Adicionando alarmes para %s"
 
-#: calendar/gui/gnome-cal.c:1753
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5940,7 +6113,7 @@ msgstr ""
 "%s\n"
 " capotou. Você tera que reiniciar o Evolution para poder usá-lo novamente"
 
-#: calendar/gui/gnome-cal.c:1762
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5951,12 +6124,12 @@ msgstr ""
 "%s\n"
 " capotou. Você tera que reiniciar o Evolution para poder usá-lo novamente"
 
-#: calendar/gui/gnome-cal.c:1988
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrindo agenda em %s"
 
-#: calendar/gui/gnome-cal.c:2027
+#: calendar/gui/gnome-cal.c:2035
 msgid "Opening default tasks folder"
 msgstr "Abrindo pasta de tarefas padrão"
 
@@ -6016,315 +6189,173 @@ msgstr "Outubro"
 msgid "September"
 msgstr "Setembro"
 
-#: calendar/gui/itip-utils.c:344 calendar/gui/itip-utils.c:415
+#: calendar/gui/itip-utils.c:262 calendar/gui/itip-utils.c:310
+#: calendar/gui/itip-utils.c:342
 msgid "An organizer must be set."
 msgstr "Um organizador deve ser configurado."
 
-#: calendar/gui/itip-utils.c:379
+#: calendar/gui/itip-utils.c:297
 msgid "At least one attendee is necessary"
 msgstr "Pelo menos um participante é necessário"
 
-#: calendar/gui/itip-utils.c:458 calendar/gui/itip-utils.c:567
+#: calendar/gui/itip-utils.c:385 calendar/gui/itip-utils.c:494
 msgid "Event information"
 msgstr "Informação de evento"
 
-#: calendar/gui/itip-utils.c:460 calendar/gui/itip-utils.c:569
+#: calendar/gui/itip-utils.c:387 calendar/gui/itip-utils.c:496
 msgid "Task information"
 msgstr "Informação de tarefa"
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:389 calendar/gui/itip-utils.c:498
 msgid "Journal information"
 msgstr "Informação de diário"
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:588
+#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:518
 msgid "Free/Busy information"
 msgstr "Informação de livre/ocupado"
 
-#: calendar/gui/itip-utils.c:466
+#: calendar/gui/itip-utils.c:393
 msgid "Calendar information"
 msgstr "Informação de agenda"
 
-#: calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:429
 msgid "Updated"
 msgstr "Atualizado"
 
-#: calendar/gui/itip-utils.c:510
+#: calendar/gui/itip-utils.c:437
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:441
 msgid "Counter-proposal"
 msgstr "Contra proposta"
 
-#: calendar/gui/itip-utils.c:582
+#: calendar/gui/itip-utils.c:512
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informação de livre/ocupado (%s para %s)"
 
-#: calendar/gui/itip-utils.c:594
+#: calendar/gui/itip-utils.c:524
 msgid "iCalendar information"
 msgstr "Informação iCalendar"
 
-#: calendar/gui/itip-utils.c:752
+#: calendar/gui/itip-utils.c:672
 msgid "You must be an attendee of the event."
 msgstr "Você deve ser um participante do evento."
 
-#: calendar/gui/main.c:60
-msgid "Could not initialize GNOME"
-msgstr "Não foi possível iniciar Gnome"
-
-#: calendar/gui/main.c:68
-msgid "Could not activate Bonobo"
-msgstr "Não foi possível ativar Bonobo"
-
-#: calendar/gui/main.c:97
-msgid "Could not create the component editor factory"
-msgstr "Não foi possível criar a fábrica de editor de componentes"
-
-#: calendar/gui/print.c:455
-msgid "1st"
-msgstr "1º de"
-
-#: calendar/gui/print.c:455
-msgid "2nd"
-msgstr "2 de"
-
-#: calendar/gui/print.c:455
-msgid "3rd"
-msgstr "3 de"
-
-#: calendar/gui/print.c:455
-msgid "4th"
-msgstr "4 de"
-
-#: calendar/gui/print.c:455
-msgid "5th"
-msgstr "5 de"
-
-#: calendar/gui/print.c:456
-msgid "6th"
-msgstr "6 de"
-
-#: calendar/gui/print.c:456
-msgid "7th"
-msgstr "7 de"
-
-#: calendar/gui/print.c:456
-msgid "8th"
-msgstr "8 de"
-
-#: calendar/gui/print.c:456
-msgid "9th"
-msgstr "9 de"
-
-#: calendar/gui/print.c:456
-msgid "10th"
-msgstr "10 de"
-
-#: calendar/gui/print.c:457
-msgid "11th"
-msgstr "11 de"
-
-#: calendar/gui/print.c:457
-msgid "12th"
-msgstr "12 de"
-
-#: calendar/gui/print.c:457
-msgid "13th"
-msgstr "13 de"
-
-#: calendar/gui/print.c:457
-msgid "14th"
-msgstr "14 de"
-
-#: calendar/gui/print.c:457
-msgid "15th"
-msgstr "15 de"
-
-#: calendar/gui/print.c:458
-msgid "16th"
-msgstr "16 de"
-
-#: calendar/gui/print.c:458
-msgid "17th"
-msgstr "17 de"
-
-#: calendar/gui/print.c:458
-msgid "18th"
-msgstr "18 de"
-
-#: calendar/gui/print.c:458
-msgid "19th"
-msgstr "19 de"
-
-#: calendar/gui/print.c:458
-msgid "20th"
-msgstr "20 de"
-
-#: calendar/gui/print.c:459
-msgid "21st"
-msgstr "21 de"
-
-#: calendar/gui/print.c:459
-msgid "22nd"
-msgstr "22 de"
-
-#: calendar/gui/print.c:459
-msgid "23rd"
-msgstr "23 de"
-
-#: calendar/gui/print.c:459
-msgid "24th"
-msgstr "24 de"
-
-#: calendar/gui/print.c:459
-msgid "25th"
-msgstr "25 de"
-
-#: calendar/gui/print.c:460
-msgid "26th"
-msgstr "26 de"
-
-#: calendar/gui/print.c:460
-msgid "27th"
-msgstr "27 de"
-
-#: calendar/gui/print.c:460
-msgid "28th"
-msgstr "28 de"
-
-#: calendar/gui/print.c:460
-msgid "29th"
-msgstr "29 de"
-
-#: calendar/gui/print.c:460
-msgid "30th"
-msgstr "30 de"
-
-#: calendar/gui/print.c:461
-msgid "31st"
-msgstr "31 de"
-
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Se"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Te"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Qu"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Qu"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Se"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Sá"
 
 #. Day
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Dia selecionado (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1887 calendar/gui/print.c:1891
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1888
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1892 calendar/gui/print.c:1894
-#: calendar/gui/print.c:1895
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1899
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana selecionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1907
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Mês selecionado (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1914
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Ano selecionado (%Y)"
 
-#: calendar/gui/print.c:2248
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Tarefa"
 
-#: calendar/gui/print.c:2305
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: calendar/gui/print.c:2323
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: calendar/gui/print.c:2337
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentagem concluída: %i"
 
-#: calendar/gui/print.c:2349
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2363
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorias: %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Contatos: "
 
-#: calendar/gui/print.c:2519 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:591 mail/mail-callbacks.c:3086
-#: my-evolution/e-summary.c:619
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:617
 msgid "Print Preview"
 msgstr "Visualizar impressão"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Imprimir item"
 
-#: calendar/gui/print.c:2633
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Configurar impressão..."
 
-#: calendar/gui/tasks-control-factory.c:74
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Não foi possível criar a visão de tarefas. Por favor verifique a "
-"configuração do seu ORBit e OAF."
-
-#: calendar/gui/tasks-control.c:148
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "A URI da pasta de tarefas a ser exibida"
 
-#: calendar/gui/tasks-control.c:463
+#: calendar/gui/tasks-control.c:472
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6337,76 +6368,39 @@ msgstr ""
 "\n"
 "Apagar estas tarefas mesmo assim?"
 
-#: calendar/gui/tasks-control.c:470 mail/mail-callbacks.c:2581
-#: mail/mail-callbacks.c:2823
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Não me pergunte novamente."
 
-#: calendar/gui/tasks-control.c:622
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
-#: calendar/gui/tasks-migrate.c:104
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-"O Evolution pegou as tarefas que estavam na sua pasta de agenda e as migrou "
-"automaticamente para a nova pasta de tarefas."
-
-#: calendar/gui/tasks-migrate.c:107
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-"O Evolution tentou pegar as tarefas que estavam na sua pasta de agenda e "
-"migra-las automaticamente para a nova pasta de tarefas.\n"
-"Algumas das tarefas não puderam ser migradas, então este processo pode ser "
-"tentando no futuro."
-
-#: calendar/gui/tasks-migrate.c:119
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-"Não foi possível abrir `%s'; nenhum item da pasta de agenda será migrado "
-"para a pasta de tarefas."
-
-#: calendar/gui/tasks-migrate.c:132
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-"O método necessário para abrir `%s' não é suportado; nenhum item da pasta de "
-"agenda será migrado para a pasta de tarefas."
-
-#: calendar/gui/weekday-picker.c:307 calendar/gui/weekday-picker.c:404
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:379
 msgid "SMTWTFS"
 msgstr "DSTQQSS"
 
-#: calendar/importers/icalendar-importer.c:166
-#, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr "Não é possível obter lista de repositórios a partir do registro: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "Fábrica para importar arquivos iCalendar no Evolution"
 
-#: calendar/importers/icalendar-importer.c:178
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Não é possível chamar getFolderAtPath no repositório: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+msgid "Imports iCalendar files into Evolution"
+msgstr "Importa arquivos iCalendar no Evolution"
 
-#: calendar/importers/icalendar-importer.c:481
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+msgid "Imports vCalendar files into Evolution"
+msgstr "Importa arquivos vCalendar no Evolution"
+
+#: calendar/importers/icalendar-importer.c:380
 msgid "Reminder!!"
 msgstr "Lembrete!!"
 
-#: calendar/importers/icalendar-importer.c:695
+#: calendar/importers/icalendar-importer.c:588
 msgid "Calendar Events"
 msgstr "Eventos de agenda"
 
-#: calendar/importers/icalendar-importer.c:720
+#: calendar/importers/icalendar-importer.c:613
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6414,10 +6408,14 @@ msgstr ""
 "O Evolution achou arquivos da Agenda Gnome.\n"
 "Você gostaria de importá-los no Evolution?"
 
-#: calendar/importers/icalendar-importer.c:727
+#: calendar/importers/icalendar-importer.c:620
 msgid "Gnome Calendar"
 msgstr "Agenda Gnome"
 
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr "Não é possível salvar dados da agenda: URI malformada."
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now espera 0 argumentos"
@@ -8076,20 +8074,18 @@ msgid "Decryption is not supported by this cipher"
 msgstr "Decifragem não é suportada por esta cifra"
 
 #: camel/camel-cipher-context.c:342
-#, fuzzy
 msgid "You may not import keys with this cipher"
-msgstr "Cifragem não é suportada por esta cifra"
+msgstr "Você não pode importar chaves com esta cifra"
 
 #: camel/camel-cipher-context.c:374
-#, fuzzy
 msgid "You may not export keys with this cipher"
-msgstr "Cifragem não é suportada por esta cifra"
+msgstr "Você não pode exportar chaves com esta cifra"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "Não é possível criar caminho do cache"
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Não foi possível remover item no cache: %s: %s"
@@ -8129,84 +8125,91 @@ msgstr "Preparando pasta '%s' para desconexão"
 msgid "You must be working online to complete this operation"
 msgstr "Você deve estar trabalhando conectado para completar esta operação"
 
-#: camel/camel-filter-driver.c:767 camel/camel-filter-driver.c:776
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Falhou a criação do pipe para '%s': %s"
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Falhou a criação do processo filho '%s': %s"
+
+#: camel/camel-filter-driver.c:744
+#, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Stream de mensagem inválida recebida de %s: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Sincronizando pastas"
 
-#: camel/camel-filter-driver.c:865 camel/camel-filter-driver.c:1238
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analisar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:874 camel/camel-filter-driver.c:1244
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:941
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Não é possível abrir a pasta de fila"
 
-#: camel/camel-filter-driver.c:950
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Não é possível processar a pasta de fila"
 
-#: camel/camel-filter-driver.c:965
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obtendo mensagem %d (%d%%)"
 
-#: camel/camel-filter-driver.c:969
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Não é possível abrir mensagem"
 
-#: camel/camel-filter-driver.c:970 camel/camel-filter-driver.c:982
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Falhou na mensagem %d"
 
-#: camel/camel-filter-driver.c:996 camel/camel-filter-driver.c:1090
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Sincronizando pasta"
 
-#: camel/camel-filter-driver.c:1057
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: camel/camel-filter-driver.c:1072
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falhou na mensagem %d de %d"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr "Falhou a recuperação da mensagem"
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumentos inválidos para (system-flag)"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentos inválidos para (user-tag)"
 
-#: camel/camel-filter-search.c:514
-#, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Falhou a criação do pipe para '%s': %s"
-
-#: camel/camel-filter-search.c:550
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Falhou a criação do processo filho '%s': %s"
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar busca por filtro: %s: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8215,7 +8218,7 @@ msgstr ""
 "Não é possível analisar expressão de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8224,11 +8227,11 @@ msgstr ""
 "Erro ao executar expressão de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) requer um simples resultado booleano"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Executando consulta por cabeçalho desconhecido: %s"
@@ -8284,9 +8287,9 @@ msgstr ""
 "Você precisa de uma frase senha para destravar a chave\n"
 "para o usuário: \"%s\""
 
-#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1246
-#: camel/camel-gpg-context.c:1353 camel/camel-gpg-context.c:1428
-#: camel/camel-gpg-context.c:1485 mail/mail-send-recv.c:544
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr "Cancelada."
 
@@ -8308,35 +8311,35 @@ msgstr "Não foram fornecidos dados"
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Falhou a cifragem: Não foram especificados destinatários válidos."
 
-#: camel/camel-gpg-context.c:1122
-#, fuzzy, c-format
+#: camel/camel-gpg-context.c:1125
+#, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
 "\n"
 "%.*s"
 msgstr ""
-"Falhou a execução de GPG %s na mensagem: %s\n"
+"Falhou a execução de GPG %s: %s\n"
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1128
-#, fuzzy, c-format
+#: camel/camel-gpg-context.c:1131
+#, c-format
 msgid "Failed to GPG %s: %s\n"
-msgstr "Falhou a execução de GPG %s na mensagem: %s\n"
+msgstr "Falhou a execução de GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1237 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1580
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Falhou a execução do gpg: %s"
 
-#: camel/camel-gpg-context.c:1267 camel/camel-gpg-context.c:1345
-#: camel/camel-gpg-context.c:1419 camel/camel-gpg-context.c:1449
-#: camel/camel-gpg-context.c:1476 camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
 msgid "Failed to execute gpg."
 msgstr "Falhou a execução do gpg."
 
-#: camel/camel-gpg-context.c:1330
+#: camel/camel-gpg-context.c:1333
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8451,11 +8454,11 @@ msgstr "Falhou a decifragem da parte MIME: estrutura inválida"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Falhou a decifragem da parte MIME: erro de análise"
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr "Esta é uma parte de mensagem assinada digitalmente"
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 msgid "parse error"
 msgstr "erro de análise"
 
@@ -8527,11 +8530,11 @@ msgstr ""
 "Esta opção conectará ao servidor usando uma senha segura CRAM-MD5 se o "
 "servidor suportá-la."
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8539,40 +8542,124 @@ msgstr ""
 "Esta opção conectará ao servidor usando uma senha segura DIGEST-MD5 se o "
 "servidor suportá-la."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "O desafio do servidor é longo demais (>2048 octetos)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "O desafio do servidor é inválido\n"
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 "O desafio do servidor continha token de \"Quality of Protection\" inválido\n"
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr "A resposta do servidor não continha dados de autorização\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "A resposta do servidor continha dados de autorização incompletos\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "A resposta do servidor não casa\n"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-gssapi.c:48
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: camel/camel-sasl-gssapi.c:50
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr "Esta opção conectará ao servidor usando autenticação Kerberos 5."
+
+#: camel/camel-sasl-gssapi.c:148
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+"O mecanismo especificado não é suportado pela credencial fornecida ou não é "
+"reconhecido pela implementação."
+
+#: camel/camel-sasl-gssapi.c:153
+msgid "The provided target_name parameter was ill-formed."
+msgstr "O parâmetro target_name fornecido foi mal-formado."
+
+#: camel/camel-sasl-gssapi.c:156
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"O parâmetro target_name fornecido continha um tipo de nome inválido ou não "
+"suportado."
+
+#: camel/camel-sasl-gssapi.c:160
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"O input_token contém associações de canal diferentes daquelas especificadas "
+"pelo parâmetro input_chan_bindings."
+
+#: camel/camel-sasl-gssapi.c:165
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"O input_token contém uma assinatura inválida ou uma assinatura que não pode "
+"ser verificada."
+
+#: camel/camel-sasl-gssapi.c:169
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+"As credenciais fornecidas não foram válidas para início de contexto ou o "
+"tratador de credencial não fazia referência a nenhuma credencial."
+
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
+msgstr "O tratador de contexto fornecido não se referia a um contexto válido."
+
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
+msgstr "Os testes de consistência executados no input_token falharam."
+
+#: camel/camel-sasl-gssapi.c:180
+msgid "The consistency checks performed on the credential failed."
+msgstr "Os testes de consistência executados na credencial falharam."
+
+#: camel/camel-sasl-gssapi.c:183
+msgid "The referenced credentials have expired."
+msgstr "As credenciais de referência expiraram."
+
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:272 camel/camel-sasl-gssapi.c:287
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr "Resposta de autenticação inválida do servidor."
+
+#: camel/camel-sasl-gssapi.c:213
+#, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Falhou a resolução da máquina `%s': %s"
+
+#: camel/camel-sasl-gssapi.c:295
+msgid "Unsupported security layer."
+msgstr "Camada de segurança não suportada."
+
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "Esta opção conectará ao servidor usando autenticação Kerberos 4."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8581,11 +8668,6 @@ msgstr ""
 "Não foi possível obter ticket do Kerberos:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "Resposta de autenticação inválida do servidor."
-
 #: camel/camel-sasl-login.c:32
 msgid "Login"
 msgstr "Login"
@@ -8634,7 +8716,7 @@ msgstr "Autenticação POP antes de SMTP usando um transporte desconhecido"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "Autenticação POP antes de SMTP usando uma fonte não POP"
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Falha ao compilar expressão regular: %s: %s"
@@ -8654,17 +8736,17 @@ msgstr "A URL '%s' precisa de um componente máquina"
 msgid "URL '%s' needs a path component"
 msgstr "A URL '%s' precisa de um componente caminho"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:775 camel/camel-service.c:887
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Falha na consulta de nome: %s"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Falhou a consulta de máquina: %s: máquina não encontrada"
@@ -8694,12 +8776,12 @@ msgstr "Provedor de correio em pastas virtuais"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler correio como uma consulta a um outro conjunto de pastas"
 
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Não existe provedor disponível para o protocolo `%s'"
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8745,132 +8827,132 @@ msgstr "Falhou a decodificação da mensagem."
 msgid "Failed to verify certificates."
 msgstr "Falhou a verificação dos certificados."
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 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:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Não é possível criar pasta: Operação inválida neste repositório"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr "Não é possível obter certificado do emissor"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr "Não é possível obter lista de revogação de certificado"
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr "Não é possível decifrar assinatura do certificado"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 "Não é possível decifrar assinatura da lista de revogação de certificado"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr "Não é possível decodificar chave pública do emissor"
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr "Falha da assinatura do certificado"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr "Falha da lista de revogação de certificado"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr "Certificado ainda não é válido"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Certificado expirou"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "CRL ainda não é válido"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "CRL expirou"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "Erro no CRL"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Sem memória"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr "Certificado auto-assinado com profundidade zero"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr "Certificado auto-assinado na cadeia"
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr "Não é possível obter o certificado do emissor localmente"
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr "Não é possível verificar a assinatura folha"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr "Cadeia de certificados longa demais"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr "Certificado revogado"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Autoridade de certificação (CA) inválida"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr "Comprimento do caminho excedido"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "Propósito inválido"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr "Certificado não-confiável"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Certificado rejeitado"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr "Assunto/emissor não casam"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr "AKID/SKID não casam"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/serial do emissor não casam"
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr "O uso da chave não suporta assinatura de certificados"
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr "Erro na verificação de aplicativo"
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:806
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8883,15 +8965,15 @@ msgstr ""
 "Impressão digital: %s\n"
 "Assinatura:        %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "BOM"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "MAU"
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8911,7 +8993,7 @@ msgstr ""
 "Você deseja aceitá-lo mesmo assim?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:816
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8926,7 +9008,7 @@ msgstr ""
 "\n"
 "Você deseja aceitá-lo?"
 
-#: camel/camel-tcp-stream-ssl.c:860
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -8935,7 +9017,7 @@ msgstr ""
 "Problema do certificado: %s\n"
 "Emissor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:912
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -8944,7 +9026,7 @@ msgstr ""
 "Domínio do certificado inválido: %s\n"
 "Emissor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:930
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -8953,7 +9035,7 @@ msgstr ""
 "Certificado expirou: %s\n"
 "Emissor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -8962,7 +9044,7 @@ msgstr ""
 "Lista de revogação do certificado expirou: %s\n"
 "Emissor: %s"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Não foi possível analisar URL `%s'"
@@ -8977,39 +9059,39 @@ msgstr "Erro ao armazenar `%s': %s"
 msgid "No such message %s in %s"
 msgstr "Não existe tal mensagem %s em %s"
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Não é possível copiar ou mover mensagem para uma pasta virtual"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Não é possível excluir pasta: %s: Operação inválida"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Não é possível excluir pasta: %s: Não existe tal pasta"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Não é possível renomear pasta: %s: Operação inválida"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Não é possível renomear pasta: %s: Não existe tal pasta"
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:452
-#: camel/providers/imap/camel-imap-store.c:2656
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Operação cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2659
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente: %s"
@@ -9034,45 +9116,45 @@ msgstr "Resposta inesperada do servidor IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "Falhou o comando IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:462
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "Resposta do servidor terminou cedo demais."
 
-#: camel/providers/imap/camel-imap-command.c:654
+#: camel/providers/imap/camel-imap-command.c:655
 #, 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:690
+#: camel/providers/imap/camel-imap-command.c:691
 #, 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:221
+#: camel/providers/imap/camel-imap-folder.c:222
 #, 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:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, 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:306
+#: camel/providers/imap/camel-imap-folder.c:307
 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:548
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Varrendo a procura de mensagens alteradas"
 
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Não foi possível recuperar a mensagem: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:225
 #: camel/providers/local/camel-maildir-folder.c:234
@@ -9088,24 +9170,24 @@ msgstr ""
 "Não é possível obter mensagem: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Não existe tal mensagem"
 
-#: camel/providers/imap/camel-imap-folder.c:1932
-#: camel/providers/imap/camel-imap-folder.c:2528
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 msgid "This message is not currently available"
 msgstr "Esta mensagem não está disponível no momento"
 
-#: camel/providers/imap/camel-imap-folder.c:2192
-#: camel/providers/imap/camel-imap-folder.c:2262
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
 msgstr "Pegando informação de resumo para novas mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:2566
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
 msgstr "Não foi possível localizar corpo da mensagem na resposta FETCH."
 
@@ -9135,7 +9217,7 @@ msgstr "Verificando novas mensagens"
 msgid "Check for new messages in all folders"
 msgstr "Verificar novas mensagem em todas as pastas"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1156
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1185
 msgid "Folders"
 msgstr "Pastas"
 
@@ -9165,7 +9247,7 @@ 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:83
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Senha"
 
@@ -9183,58 +9265,57 @@ msgstr "Servidor IMAP %s"
 msgid "IMAP service for %s on %s"
 msgstr "Serviço IMAP para %s em %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr "Conexão cancelada"
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, 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:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Falhou a conexão ao servidor IMAP %s em modo seguro: %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 msgid "SSL/TLS extension not supported."
 msgstr "Extensão SSL/TLS não suportada."
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 msgid "SSL negotiations failed"
 msgstr "Falharam as negociações SSL"
 
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1075
 #, 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:1092
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, 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:1116
+#: camel/providers/imap/camel-imap-store.c:1108
 #, 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:1131
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Você não entrou uma senha."
 
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9245,24 +9326,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1505
-#: camel/providers/imap/camel-imap-store.c:1647
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr "Não existe a pasta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1848
+#: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "O nome de pasta \"%s\" é inválido pois contém o caractere \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1860
+#: camel/providers/imap/camel-imap-store.c:1851
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Pasta pai desconhecida: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1896
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A pasta pai não pode conter sub-pastas"
 
@@ -9341,7 +9422,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Raiz de armazenagem %s não é um caminho absoluto"
@@ -9367,7 +9448,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:308 mail/mail-local.c:907
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Não foi possível renomear pasta %s para %s: %s"
@@ -9377,12 +9458,12 @@ msgstr "Não foi possível renomear pasta %s para %s: %s"
 msgid "Could not rename '%s': %s"
 msgstr "Não foi possível renomear '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:386
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Não foi possível excluir arquivo de resumo de pasta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:396
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Não foi possível excluir arquivo de índice de pasta `%s': %s"
@@ -9392,7 +9473,7 @@ msgstr "Não foi possível excluir arquivo de índice de pasta `%s': %s"
 msgid "Could not save summary: %s: %s"
 msgstr "Não foi possível salvar resumo: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:456
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Não é possível adicionar mensagem ao resumo: razão desconhecida"
 
@@ -9412,7 +9493,7 @@ msgstr "Conteúdo de mensagem inválido"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9424,14 +9505,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
 #, 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:216
-#: camel/providers/local/camel-spool-store.c:169
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9456,9 +9537,9 @@ 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:336
-#: camel/providers/local/camel-spool-store.c:283
-#: camel/providers/local/camel-spool-store.c:313
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Não foi possível varrer pasta `%s': %s"
@@ -9478,10 +9559,10 @@ msgid "Checking for new messages"
 msgstr "Verificando novas mensagens"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:586
-#: camel/providers/local/camel-mbox-summary.c:677
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Armazenando pasta"
 
@@ -9563,75 +9644,75 @@ 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:351
+#: camel/providers/local/camel-mbox-summary.c:343
 #, 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:399
+#: camel/providers/local/camel-mbox-summary.c:391
 #, 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:455
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Não é possível checar pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:591
-#: camel/providers/local/camel-mbox-summary.c:682
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
 #, 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:603
-#: camel/providers/local/camel-spool-summary.c:170
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
 #, 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:616
-#: camel/providers/local/camel-mbox-summary.c:778
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
 #, 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:625
+#: camel/providers/local/camel-mbox-summary.c:549
 #, 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:636
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Não foi possível renomear pasta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:720
-#: camel/providers/local/camel-mbox-summary.c:728
-#: camel/providers/local/camel-mbox-summary.c:919
-#: camel/providers/local/camel-mbox-summary.c:927
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 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:853
-#: camel/providers/local/camel-spool-summary.c:342
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desconhecido: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:888
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Não foi possível armazenar pasta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:982
-#: camel/providers/local/camel-mbox-summary.c:1008
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, 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:999
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Falha ao escrever para o mbox temporário: %s: %s"
@@ -9655,63 +9736,63 @@ msgstr "`%s' não é um diretório."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Não é possível abrir diretório MH: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Fila `%s' não pode ser aberta: %s"
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Fila `%s' não é um arquivo comum ou um diretório"
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Pasta `%s/%s' não existe."
 
-#: camel/providers/local/camel-spool-store.c:177
+#: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' não é um arquivo mbox."
 
-#: camel/providers/local/camel-spool-store.c:194
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr "Repositório não suporta uma INBOX"
 
-#: camel/providers/local/camel-spool-store.c:206
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Arquivo de fila de correio %s"
 
-#: camel/providers/local/camel-spool-store.c:206
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Árvore de pastas de fila %s"
 
-#: camel/providers/local/camel-spool-store.c:214
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Pastas de fila não podem ser renomeadas"
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Pastas de fila não podem ser excluídas"
 
-#: camel/providers/local/camel-spool-summary.c:183
-#: camel/providers/local/camel-spool-summary.c:193
-#: camel/providers/local/camel-spool-summary.c:203
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, 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:219
+#: camel/providers/local/camel-spool-summary.c:211
 #, 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:250
-#: camel/providers/local/camel-spool-summary.c:269
-#: camel/providers/local/camel-spool-summary.c:282
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -9843,7 +9924,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:82
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -9869,25 +9950,25 @@ 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:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Não foi possível conectar ao servidor POP %s (porta %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Falhou a conexão ao servidor POP %s em modo seguro: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Não foi possível conectar ao servidor POP %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9896,28 +9977,28 @@ msgstr ""
 "Não é possível conectar ao servidor POP %s: Não existe suporte para o "
 "mecanismo de autenticação pedido."
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "O login SASL `%s' falhou para o servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Não é possível conectar ao servidor POP %s: Erro do protocolo SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Falhou a autenticação com o servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPor favor entre a senha POP para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:523
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9926,13 +10007,13 @@ msgstr ""
 "Não é possível conectar ao servidor POP %s.\n"
 "Erro ao enviar senha: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:615
+#: camel/providers/pop3/camel-pop3-store.c:623
 #, 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:107
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9944,52 +10025,52 @@ msgstr ""
 "Para entregar correio passando-o para o programa \"sendmail\" no sistema "
 "local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Não foi possível analisar lista de destinatários"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Não foi possível criar pipe para o sendmail: %s: a mensagem não foi enviada"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 "Não foi possível executar fork para o sendmail: %s: a mensagem não foi "
 "enviada"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Não foi possível enviar a mensagem: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail terminou com sinal %s: a mensagem não foi enviada."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Não foi possível executar %s: a mensagem não foi enviada"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail terminou com estado %d: a mensagem não foi enviada."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correio usando o programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:99
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9997,135 +10078,135 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Para entregar correio conectando à um servidor remoto usando SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Erro de sintaxe, comando não reconhecido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Erro de sintaxe nos parâmetros ou argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Comando não implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Parâmetro de comando não implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Estado do sistema ou resposta de ajuda do sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Mensagem de ajuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Serviço pronto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Serviço fechando canal de transmissão"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Serviço indisponível, fechando canal de transmissão"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Ação de correio pedida OK, concluída"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr "O usuário não é local; irei encaminhar para <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Ação de correio pedida não executada: caixa postal indisponível"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Ação pedida não executada: caixa postal indisponível"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Ação pedida abortada: erro no processamento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr "O usuário não é local; por favor tente <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Ação pedida não executada: espaço no sistema insuficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Ação de correio pedida abortada: espaço alocado excedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Ação pedida não executada: nome da caixa postal não permitido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Inicie entrada da mensagem; termine com <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "A transação falhou"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "É necessária uma transição de senha"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "O mecanismo de autenticação é fraco demais"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Cifragem exigida pelo mecanismo de autenticação pedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Falha de autenticação temporária"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Autenticação exigida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr "Erro na resposta de boas vindas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Falhou a conexão ao servidor SMTP %s em modo seguro: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
 msgid "server does not appear to support SSL"
 msgstr "servidor não aparenta suportar SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Tempo excedido no pedido STARTTLS: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr "Erro na resposta de STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, 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:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPor favor entre a senha SMTP para %s@%s"
@@ -10155,11 +10236,11 @@ msgstr "Entrega de correio SMTP via %s"
 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:689 mail/mail-ops.c:615
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Não é possível enviar mensagem: não foram definidos destinatários."
 
@@ -10167,61 +10248,61 @@ msgstr "Não é possível enviar mensagem: não foram definidos destinatários."
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Não é possível enviar mensagem: um ou mais destinatários inválidos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "Saudação SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Tempo excedido no pedido HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "HELO response error"
 msgstr "Erro na resposta de HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "Autenticação SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao criar objeto de autenticação SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tempo excedido no pedido AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "Falhou o pedido AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta de autenticação inválida do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, 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:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr "Erro na resposta de MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, 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:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Falhou RCPT TO <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido DATA: %s: a mensagem não foi enviada"
@@ -10229,79 +10310,79 @@ 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:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 msgid "DATA response error"
 msgstr "Erro na resposta de DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
 #, 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:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr "Erro na resposta de terminação de DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "Erro na resposta de RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Tempo excedido no pedido QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "Erro na resposta de QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:219
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:502
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "Remover itens selecionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:533
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Anexar um arquivo à mensagem"
 
-#: composer/e-msg-composer-attachment.c:167
-#: composer/e-msg-composer-attachment.c:183
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Não é possível anexar arquivo %s: %s"
 
-#: composer/e-msg-composer-attachment.c:175
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Não é possível anexar arquivo %s: não é um arquivo comum"
@@ -10319,11 +10400,15 @@ msgid "MIME type:"
 msgstr "Tipo MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:67
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir exibição automática de anexo"
 
-#: composer/e-msg-composer-hdrs.c:361
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr "Ei, mano. Você precisa de uma conta para enviar correio, tá ligado."
+
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr "Clique aqui para o catálogo de endereços"
 
@@ -10334,45 +10419,45 @@ msgstr "Clique aqui para o catálogo de endereços"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Responder-a:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:404
+#: composer/e-msg-composer-hdrs.c:521
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:527
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:424
+#: composer/e-msg-composer-hdrs.c:536
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:425
+#: composer/e-msg-composer-hdrs.c:537
 msgid "Enter the recipients of the message"
 msgstr "Entre os destinatários da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:428
+#: composer/e-msg-composer-hdrs.c:540
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:541
 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:432
+#: composer/e-msg-composer-hdrs.c:544
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:433
+#: composer/e-msg-composer-hdrs.c:545
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10383,25 +10468,24 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:440
+#: composer/e-msg-composer-hdrs.c:552
 msgid "Post To:"
 msgstr "Publicar para:"
 
-#: composer/e-msg-composer-hdrs.c:442
+#: composer/e-msg-composer-hdrs.c:554
 msgid "Posting destination"
 msgstr "Publicando destino"
 
-#: composer/e-msg-composer-select-file.c:103
-#: composer/e-msg-composer-select-file.c:120
-#, fuzzy
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
-msgstr "Anexar um arquivo"
+msgstr "Anexar arquivo(s)"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:530
 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:785
+#: composer/e-msg-composer.c:809
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10410,30 +10494,30 @@ msgstr ""
 "Erro ao ler arquivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1172
 msgid "File exists, overwrite?"
 msgstr "Arquivo existe, sobrescrever?"
 
-#: composer/e-msg-composer.c:1183
+#: composer/e-msg-composer.c:1190
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1213
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1248
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acessar arquivo: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1256
 msgid "Unable to retrieve message from editor"
 msgstr "Não foi possível recuperar mensagem do editor"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1263
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10442,7 +10526,7 @@ msgstr ""
 "Não é possível buscar no arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1270
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10451,16 +10535,16 @@ msgstr ""
 "Não é possível truncar arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
-#, fuzzy, c-format
+#: composer/e-msg-composer.c:1279
+#, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
-"Não é possível buscar no arquivo: %s\n"
+"Não é possível copiar descritor de arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10469,7 +10553,7 @@ msgstr ""
 "Erro ao salvar automaticamente mensagem: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1376
+#: composer/e-msg-composer.c:1382
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10477,7 +10561,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:1537
+#: composer/e-msg-composer.c:1544
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10488,27 +10572,32 @@ msgstr ""
 "\n"
 "Você deseja salvar as suas modificações?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1549
+msgid "_Discard Changes"
+msgstr "_Descartar mudanças"
+
+#: composer/e-msg-composer.c:1553
 msgid "Warning: Modified Message"
 msgstr "Alerta: Mensagem modificada"
 
-#: composer/e-msg-composer.c:1573
+#: composer/e-msg-composer.c:1585
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:1943
 msgid "Signature:"
 msgstr "Assinatura:"
 
-#: composer/e-msg-composer.c:1972 mail/mail-account-gui.c:1226
+#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr "Auto-gerado"
 
-#: composer/e-msg-composer.c:2156 composer/e-msg-composer.c:2776
+#: composer/e-msg-composer.c:2162 composer/e-msg-composer.c:2758
+#: composer/e-msg-composer.c:2759
 msgid "Compose a message"
 msgstr "Redigir uma mensagem"
 
-#: composer/e-msg-composer.c:2807
+#: composer/e-msg-composer.c:2790
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10516,7 +10605,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:2833
+#: composer/e-msg-composer.c:2816
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10528,7 +10617,7 @@ msgstr ""
 "Por favor, verifique se você possui as versões\n"
 "corretas de gtkhtml e libgtkhtml instaladas.\n"
 
-#: composer/e-msg-composer.c:2893
+#: composer/e-msg-composer.c:2876
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10536,7 +10625,7 @@ 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:3874
+#: composer/e-msg-composer.c:3889
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10544,18 +10633,6 @@ 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:407
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"Não foi possível criar janela de redator porque você ainda não\n"
-"configurou nunhuma identidade no componente de correio."
-
-#: composer/evolution-composer.c:422
-msgid "Cannot initialize the Evolution composer."
-msgstr "Não é possível iniciar o redator do Evolution."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "O conjunto de aplicativos de groupware Evolution"
@@ -10604,7 +10681,120 @@ msgstr "Assunto contém"
 msgid "Subject does not contain"
 msgstr "Assunto não contém"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2446
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+"<b>Atualmente o seu estado é \"Fora do escritório\". </b>\n"
+"\n"
+"Você gostaria de alterar o seu estado para \"No escritório\"? "
+
+#: designs/OOA/ooa.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>Mensagem de Fora do escritório:</b>"
+
+#: designs/OOA/ooa.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>Estado:</b> "
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+"<small>A mensagem especificada abaixo será enviada automaticamente para cada "
+"pessoa que enviar\n"
+"correio para você enquanto você estiver fora do escritório.</small>"
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr "Eu estou atualmente no escritório"
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr "Eu estou atualmente fora do escritório"
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "Não, não mude o estado"
+
+#: designs/OOA/ooa.glade.h:12
+msgid "Out of Office Assistant"
+msgstr "Assistente de Fora do escritório"
+
+#: designs/OOA/ooa.glade.h:13
+msgid "Yes, Change Status"
+msgstr "Sim, mude o estado"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: designs/read_receipts/read.glade.h:2
+msgid "<b>Receiving Email</b>"
+msgstr "<b>Recebendo e-mail</b>"
+
+#: designs/read_receipts/read.glade.h:3
+msgid "<b>Sending Email:</b>"
+msgstr "<b>Enviando e-mail:</b>"
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+"<small>Esta página permite que você escolha se você quer ser notificado "
+"através de um recibo de leitura quando uma\n"
+"mensagem que você enviou é lida, e para especificar o que o Evolution deve "
+"fazer caso alguém peça um recibo a você.</small>"
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr "Sempre enviar um recibo de leitura"
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr "Pergunte-me se eu quero enviar um recibo de leitura"
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr "Nunca enviar um recibo de leitura"
+
+#: designs/read_receipts/read.glade.h:9
+msgid "Read Receipts"
+msgstr "Recibos de leitura"
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr "Pedir um recibo de leitura para todas as mensgens que eu enviar"
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+"A não ser que a mensagem tenha sido enviada a uma lista de discussão e não "
+"para mim pessoalmente"
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+"Quando você receber uma mensagem com um pedido de recibo de leitura, o que o "
+"Evolution deve fazer?"
+
+#: e-util/e-component-listener.c:128
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+"ping_timeout_callback: não foi possível determinar se objeto CORBA é nil ou "
+"não"
+
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10612,19 +10802,23 @@ msgstr ""
 "Já existe um arquivo com este nome.\n"
 "Sobrescrevê-lo?"
 
-#: e-util/e-passwords.c:331
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Sobrescrever arquivo?"
+
+#: e-util/e-passwords.c:345
 msgid "Remember this password"
 msgstr "Lembrar esta senha"
 
-#: e-util/e-passwords.c:333
+#: e-util/e-passwords.c:347
 msgid "Remember this password for the remainder of this session"
 msgstr "Lembrar esta senha pelo restante desta sessão"
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr "Sincronizar registros particulares:"
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 msgid "Sync Categories:"
 msgstr "Categorias de sincronização:"
 
@@ -10699,13 +10893,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1630
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1627
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10714,42 +10908,68 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:65 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:179
-msgid "seconds"
-msgstr "segundos"
+#: filter/filter-datespec.c:65
+msgid "1 second ago"
+msgstr "1 segundo atrás"
+
+#: filter/filter-datespec.c:65
+#, c-format
+msgid "%d seconds ago"
+msgstr "%d segundos atrás"
 
 #: filter/filter-datespec.c:66
-msgid "minute"
-msgstr "minuto"
+msgid "1 minute ago"
+msgstr "1 minuto atrás"
+
+#: filter/filter-datespec.c:66
+#, c-format
+msgid "%d minutes ago"
+msgstr "%d minutos atrás"
 
 #: filter/filter-datespec.c:67
-msgid "hour"
-msgstr "hora"
+msgid "1 hour ago"
+msgstr "1 hora atrás"
+
+#: filter/filter-datespec.c:67
+#, c-format
+msgid "%d hours ago"
+msgstr "%d horas atrás"
+
+#: filter/filter-datespec.c:68
+msgid "1 day ago"
+msgstr "1 dia atrás"
+
+#: filter/filter-datespec.c:68
+#, c-format
+msgid "%d days ago"
+msgstr "%d dias atrás"
 
 #: filter/filter-datespec.c:69
-msgid "week"
-msgstr "semana"
+msgid "1 week ago"
+msgstr "1 semana atrás"
 
-#: filter/filter-datespec.c:69 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "semanas"
+#: filter/filter-datespec.c:69
+#, c-format
+msgid "%d weeks ago"
+msgstr "%d semanas atrás"
 
 #: filter/filter-datespec.c:70
-msgid "month"
-msgstr "mês"
+msgid "1 month ago"
+msgstr "1 mês atrás"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:23
-msgid "months"
-msgstr "meses"
+#: filter/filter-datespec.c:70
+#, c-format
+msgid "%d months ago"
+msgstr "%d meses atrás"
 
 #: filter/filter-datespec.c:71
-msgid "year"
-msgstr "ano"
+msgid "1 year ago"
+msgstr "1 ano atrás"
 
-#: filter/filter-datespec.c:71 filter/filter.glade.h:33
-msgid "years"
-msgstr "anos"
+#: filter/filter-datespec.c:71
+#, c-format
+msgid "%d years ago"
+msgstr "%d anos atrás"
 
 #: filter/filter-datespec.c:176
 msgid "You must choose a date."
@@ -10768,13 +10988,7 @@ msgstr "agora"
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:298 filter/filter-datespec.c:301
-#, c-format
-msgid "%d %s ago"
-msgstr "%d %s atrás"
-
-#: filter/filter-datespec.c:417
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Selecionar um instante em relação ao qual comparar"
 
@@ -10783,16 +10997,15 @@ msgid "Filter Rules"
 msgstr "Regras de filtro"
 
 #: filter/filter-file.c:166
-#, fuzzy
 msgid "You must specify a file name."
-msgstr "Você deve especificar um nome de arquivo"
+msgstr "Você deve especificar um nome de arquivo."
 
 #: filter/filter-file.c:184
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Arquivo '%s' não existe ou não é um arquivo comum."
 
-#: filter/filter-file.c:293
+#: filter/filter-file.c:298
 msgid "Choose a file"
 msgstr "Escolher um arquivo"
 
@@ -10801,13 +11014,12 @@ msgstr "Escolher um arquivo"
 msgid "Then"
 msgstr "Então"
 
-#: filter/filter-folder.c:153
-#, fuzzy
+#: filter/filter-folder.c:155
 msgid "You must specify a folder."
-msgstr "Você deve especificar uma pasta.\n"
+msgstr "Você deve especificar uma pasta."
 
-#: filter/filter-folder.c:241 filter/vfolder-rule.c:406
-#: mail/mail-account-gui.c:1459 mail/mail-account-gui.c:1473
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "Selecionar pasta"
 
@@ -10820,70 +11032,72 @@ msgstr ""
 "Erro na expressão regular '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:64
-#: mail/mail-config.glade.h:61
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1275
 msgid "Important"
 msgstr "Importante"
 
 #. red
-#: filter/filter-label.c:122 mail/mail-config.c:65
-#: mail/mail-config.glade.h:131
+#: filter/filter-label.c:122 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1276
 msgid "Work"
 msgstr "Trabalho"
 
 #. orange
-#: filter/filter-label.c:123 mail/mail-config.c:66 mail/mail-config.glade.h:84
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1277
 msgid "Personal"
 msgstr "Pessoal"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:67
-#: mail/mail-config.glade.h:122
+#: filter/filter-label.c:124 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1278
 msgid "To Do"
 msgstr "A fazer"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:68 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1279
 msgid "Later"
 msgstr "Mais tarde"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:62
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr "Teste"
 
-#: filter/filter-rule.c:218
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr "Você deve nomear este filtro."
 
-#: filter/filter-rule.c:750
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:754
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "Sem título"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:789
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "Executar ações"
 
-#: filter/filter-rule.c:793
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "se todos os critérios forem atendidos"
 
-#: filter/filter-rule.c:798
+#: filter/filter-rule.c:799
 msgid "if any criteria are met"
 msgstr "se algum critério for atendido"
 
-#: filter/filter-rule.c:893
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "de entrada"
 
-#: filter/filter-rule.c:893
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "de saída"
 
@@ -10943,6 +11157,14 @@ msgstr "um instante relativo ao instante atual"
 msgid "ago"
 msgstr "atrás"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "meses"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:181
+msgid "seconds"
+msgstr "segundos"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "apenas pastas específicas"
@@ -10959,6 +11181,10 @@ msgstr "um instante especificado por você"
 msgid "vFolder Sources"
 msgstr "Fontes de pastas virtuais"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "semanas"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "com todas as pastas remotas ativas"
@@ -10971,6 +11197,10 @@ msgstr "com todas as pastas locais e remotas ativas"
 msgid "with all local folders"
 msgstr "com todas as pastas locais"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "anos"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -10993,287 +11223,292 @@ msgid "Beep"
 msgstr "Bip"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contém"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar para pasta"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recebimento"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data de envio"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Excluída"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr "Não existe"
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "Rascunho"
+msgid "does not contain"
+msgstr "não contém"
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr "Existe"
+msgid "does not end with"
+msgstr "não termina com"
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr "Expressão"
+msgid "does not exist"
+msgstr "não existe"
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr "Continuar"
+msgid "does not return"
+msgstr "não retorna"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1772
-msgid "Label"
-msgstr "Rótulo"
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "não soa como"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "não começa com"
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
-msgstr "Lista de discussão"
+msgid "Do Not Exist"
+msgstr "Não existe"
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr "Corpo da mensagem"
+msgid "Draft"
+msgstr "Rascunho"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "Cabeçalho da mensagem"
+msgid "ends with"
+msgstr "termina com"
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "Mover para pasta"
+msgid "Exist"
+msgstr "Existe"
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
-msgstr "Enviar (pipe) mensagem a comando da shell"
+msgid "exists"
+msgstr "existe"
 
 #: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr "Tocar som"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:57
-msgid "Read"
-msgstr "Lida"
+msgid "Expression"
+msgstr "Expressão"
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "Destinatários"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr "Continuar"
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr "Casamento com expressão regular"
+msgid "is"
+msgstr "é"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr "Em resposta a"
+msgid "is after"
+msgstr "é após"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Pontuação"
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "é antes"
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1768
-msgid "Sender"
-msgstr "Remetente"
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr "está Marcada"
 
 #: filter/libfilter-i18n.h:31
-msgid "Set Status"
-msgstr "Atribuir estado"
+msgid "is greater than"
+msgstr "é maior que"
 
 #: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "Comando da shell"
+msgid "is less than"
+msgstr "é menor que"
 
 #: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "Tamanho (kB)"
+msgid "is not"
+msgstr "não é"
 
 #: filter/libfilter-i18n.h:34
-msgid "Source Account"
-msgstr "Conta fonte"
+msgid "is not Flagged"
+msgstr "não está Marcada"
 
-#: filter/libfilter-i18n.h:35
-msgid "Specific header"
-msgstr "Cabeçalho específico"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
+msgid "Label"
+msgstr "Rótulo"
+
+#: filter/libfilter-i18n.h:36
+msgid "Mailing list"
+msgstr "Lista de discussão"
 
 #: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
-msgstr "Parar o processamento"
+msgid "Message Body"
+msgstr "Corpo da mensagem"
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:917
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
-msgid "Subject"
-msgstr "Assunto"
+#: filter/libfilter-i18n.h:38
+msgid "Message Header"
+msgstr "Cabeçalho da mensagem"
 
 #: filter/libfilter-i18n.h:39
-msgid "Unset Status"
-msgstr "Desconfigurar estado"
+msgid "Move to Folder"
+msgstr "Mover para pasta"
 
 #: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "contém"
+msgid "Pipe Message to Shell Command"
+msgstr "Enviar (pipe) mensagem a comando da shell"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "não contém"
+msgid "Play Sound"
+msgstr "Tocar som"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "não termina com"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Lida"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "não existe"
+msgid "Recipients"
+msgstr "Destinatários"
 
 #: filter/libfilter-i18n.h:44
-msgid "does not return"
-msgstr "não retorna"
+msgid "Regex Match"
+msgstr "Casamento com expressão regular"
 
 #: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "não soa como"
+msgid "Replied to"
+msgstr "Em resposta a"
 
 #: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "não começa com"
+msgid "returns"
+msgstr "retorna"
 
 #: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "termina com"
+msgid "returns greater than"
+msgstr "retorna maior que"
 
 #: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "existe"
+msgid "returns less than"
+msgstr "retorna menor que"
 
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "está Marcada"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Pontuação"
 
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "é após"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
+msgid "Sender"
+msgstr "Remetente"
 
 #: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "é antes"
+msgid "Set Status"
+msgstr "Atribuir estado"
 
 #: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "é maior que"
+msgid "Shell Command"
+msgstr "Comando da shell"
 
 #: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "é menor que"
+msgid "Size (kB)"
+msgstr "Tamanho (kB)"
 
 #: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "não está Marcada"
+msgid "sounds like"
+msgstr "soa como"
 
 #: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "não é"
+msgid "Source Account"
+msgstr "Conta fonte"
 
 #: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "é"
+msgid "Specific header"
+msgstr "Cabeçalho específico"
 
 #: filter/libfilter-i18n.h:57
-msgid "returns greater than"
-msgstr "retorna maior que"
-
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
-msgstr "retorna menor que"
+msgid "starts with"
+msgstr "começa com"
 
 #: filter/libfilter-i18n.h:59
-msgid "returns"
-msgstr "retorna"
+msgid "Stop Processing"
+msgstr "Parar o processamento"
 
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "soa como"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
+msgid "Subject"
+msgstr "Assunto"
 
 #: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "começa com"
+msgid "Unset Status"
+msgstr "Desconfigurar estado"
 
-#: filter/rule-editor.c:169
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
+#, c-format
+msgid "Rule name '%s' is not unique, choose another."
+msgstr "O nome de regra '%s' não é único, escolha outro."
+
+#: filter/rule-editor.c:170
 msgid "Rules"
 msgstr "Regras"
 
-#: filter/rule-editor.c:240 filter/rule-editor.c:316
-#, fuzzy, c-format
-msgid "Rule name '%s' is not unique, choose another."
-msgstr "O nome de regra '%s' não é único, escolha outro"
-
-#: filter/rule-editor.c:283
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Adicionar regra"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Editar regra"
 
-#: filter/rule-editor.c:663
-#, fuzzy
-msgid "Rule(s)"
-msgstr "Regras"
+#: filter/rule-editor.c:689
+msgid "Rule name"
+msgstr "Nome da regra"
 
-#: filter/score-editor.c:113
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr "Regras de pontuação"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "Você deve nomear esta pasta virtual."
 
-#: filter/vfolder-rule.c:220
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr "Você precisa especificar pelo menos uma pasta como uma fonte."
 
-#: filter/vfolder-rule.c:520
-#, fuzzy
-msgid "Folder(s)"
-msgstr "Pastas"
+#: filter/vfolder-rule.c:499
+msgid "VFolder source"
+msgstr "Fonte de pastas virtuais"
 
-#: importers/elm-importer.c:95
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "O Evolution está importando seu correio antigo Elm"
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
 msgid "Importing..."
 msgstr "Importando..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
 msgstr "Por favor aguarde"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importando %s como %s"
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
 #, c-format
 msgid "Scanning %s"
 msgstr "Varrendo %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:104
-#: mail/folder-browser-ui.c:354
+#: importers/pine-importer.c:637 mail/component-factory.c:114
+#: mail/folder-browser-ui.c:357 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 msgid "Mail"
 msgstr "Correio"
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11281,7 +11516,7 @@ msgstr ""
 "O Evolution achou arquivos de correio Elm\n"
 "Você gostaria de importá-los no Evolution?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11293,12 +11528,12 @@ msgstr ""
 "O Evolution achou arquivos do GnomeCard.\n"
 "Você gostaria que eles fossem importados no Evolution?"
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Filtro de prioridade \"%s\""
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11324,7 +11559,7 @@ msgstr ""
 "pontuações no lugar de prioridades. Verifique os filtros importados\n"
 "para garantir que tudo ainda funciona como esperado."
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11336,7 +11571,7 @@ msgstr ""
 "encadeamento\" que não são suportadas pelo Evolution.\n"
 "Estes filtros serão removidos."
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11350,37 +11585,39 @@ msgstr ""
 "filtros foram modificados para testar se essa cadeia\n"
 "está ou não contida no corpo da mensagem."
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "O Evolution está importando seus dados antigos do Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1094
-#: shell/e-local-storage.c:185
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Lixeira"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Varrendo filtros de correio"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "Varrendo diretório"
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Iniciando a importação"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Configurações"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr "Filtros de correio"
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11388,11 +11625,11 @@ msgstr ""
 "O Evolution achou arquivos de correio do Netscape.\n"
 "Você gostaria que eles fossem importados no Evolution?"
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr "O Evolution está importando seus dados antigos do Pine"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11400,128 +11637,120 @@ msgstr ""
 "O Evolution achou arquivos de correio do Pine.\n"
 "Você gostaria de importá-los no Evolution?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr "Preferências do redator"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Configuration control for the Evolution Display Fonts."
 msgstr "Controle de configuração para as Fontes de exibição do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configuration control for the Evolution Mail Accounts."
 msgstr "Controle de configuração para as Contas de correio do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configuration control for the Evolution Mailer."
 msgstr "Controle de configuração para o Correio do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configuration control for the Evolution Message Composer."
 msgstr "Controle de configuração para o Redator de mensagens do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure preferências de correio, incluindo segurança e exibição de "
 "mensagens, aqui"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 "Configure a verificação ortográfica, assinaturas e o redator de mensagens "
 "aqui"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Configure the fonts used by Evolution here"
 msgstr "Configure as fontes usadas pelo Evolution aqui"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Configure your email accounts here"
 msgstr "Configure as suas contas de correio aqui"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution component for handling mail."
 msgstr "O componente do Evolution para manipular correio."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution mail composer."
 msgstr "Redator de correio do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Evolution mail executive summary component."
 msgstr "Componente resumo executivo de correio do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 msgid "Evolution mail folder display component."
 msgstr "Componente de exibição de pastas de correio do Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Componente fábrica de pastas de correio do Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "Factory for the controls exported by the Evolution Mailer"
+msgstr "Fábrica para os controles exportados pelo Correio do Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Fábrica para o redator do Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "Fábrica para o componente resumo executivo."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
 msgstr "Preferências de fontes"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 msgid "Mail Accounts"
 msgstr "Contas de correio"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr "Preferências de correio"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
+#: mail/GNOME_Evolution_Mail.server.in.in.h:18
 msgid "Mail configuration interface"
 msgstr "Interface de configuração de correio"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:114
 msgid "Folder containing mail"
 msgstr "Pasta contendo correio"
 
-#: mail/component-factory.c:105
+#: mail/component-factory.c:115
 msgid "Public Mail"
 msgstr "Correio público"
 
-#: mail/component-factory.c:105
+#: mail/component-factory.c:115
 msgid "Public folder containing mail"
 msgstr "Pasta pública contendo correio"
 
-#: mail/component-factory.c:106
+#: mail/component-factory.c:116
 msgid "Virtual Trash"
 msgstr "Lixeira virtual"
 
-#: mail/component-factory.c:106
+#: mail/component-factory.c:116
 msgid "Virtual Trash folder"
 msgstr "Pasta lixeira virtual"
 
-#: mail/component-factory.c:134
+#: mail/component-factory.c:144
 msgid "This folder cannot contain messages."
 msgstr "Esta pasta não pode conter mensagens."
 
-#: mail/component-factory.c:428
+#: mail/component-factory.c:438
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#: mail/component-factory.c:428
+#: mail/component-factory.c:438
 msgid "Change this folder's properties"
 msgstr "Modificar as propriedades desta pasta"
 
-#: mail/component-factory.c:808
+#: mail/component-factory.c:816
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11529,242 +11758,228 @@ msgstr ""
 "Algumas de suas configurações de correio aparentam estar corrompidas, por "
 "favor verifique se tudo está em ordem."
 
-#: mail/component-factory.c:973
+#: mail/component-factory.c:992
 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:997
+#: mail/component-factory.c:1016
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Você possui mensagens não enviadas, deseja sair mesmo assim?"
 
-#: mail/component-factory.c:1039
+#: mail/component-factory.c:1056
 msgid "New Mail Message"
 msgstr "Nova mensagem de correio"
 
-#: mail/component-factory.c:1039
+#: mail/component-factory.c:1056
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1057
 msgid "Compose a new mail message"
 msgstr "Redigir uma nova mensagem de correio"
 
-#: mail/component-factory.c:1048
+#: mail/component-factory.c:1065
 msgid "New Message Post"
 msgstr "Publicar nova mensagem"
 
-#: mail/component-factory.c:1048
+#: mail/component-factory.c:1065
 msgid "_Post Message"
 msgstr "_Publicar mensagem"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1066
 msgid "Post a new mail message"
 msgstr "Publicar uma nova mensagem de correio"
 
-#: mail/component-factory.c:1077
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Não é possível iniciar o componente de correio do Evolution."
-
-#: mail/component-factory.c:1086
-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:1092
-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:1333 mail/component-factory.c:1363
+#: mail/component-factory.c:1349
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: mail/component-factory.c:1374
+#: mail/component-factory.c:1360
 msgid "Cannot register storage with shell"
 msgstr "Não é possível registrar repositório com a shell."
 
-#: mail/folder-browser-ui.c:481
+#: mail/folder-browser-ui.c:483
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades para \"%s\""
 
-#: mail/folder-browser-ui.c:483
+#: mail/folder-browser-ui.c:485
 msgid "Properties"
 msgstr "Propriedades"
 
-#: mail/folder-browser.c:313 mail/mail-display.c:378 mail/mail-display.c:885
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
 #, 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:768
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d novas"
 
-#: mail/folder-browser.c:771 mail/folder-browser.c:779
-#: mail/folder-browser.c:782
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr "%d escondidas"
 
-#: mail/folder-browser.c:775
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr "%d visíveis"
 
-#: mail/folder-browser.c:780
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr "%d selecionadas"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d não enviadas"
 
-#: mail/folder-browser.c:787
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d enviadas"
 
-#: mail/folder-browser.c:789
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1128
+#: mail/folder-browser.c:1182
 msgid "Create _Virtual Folder From Search..."
 msgstr "Criar pasta _virtual a partir da busca..."
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "Pasta virtual por _assunto"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "Pasta virtual por _remetente"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "Pasta virtual por _destinatários"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "Pasta virtual por _lista de discussão"
 
-#: mail/folder-browser.c:1715
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filtro por a_ssunto"
 
-#: mail/folder-browser.c:1716
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filtro por r_emetente"
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Filtro por des_tinatários"
 
-#: mail/folder-browser.c:1718 mail/folder-browser.c:2041
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr "Filtro por l_ista de discussão"
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1742 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Responder ao remetente"
 
-#: mail/folder-browser.c:1743 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Responder a _lista"
 
-#: mail/folder-browser.c:1744 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "Encamin_har"
 
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr "_Continuar..."
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1771
 msgid "Fla_g Completed"
 msgstr "Marcar como concl_uída"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1772
 msgid "Cl_ear Flag"
 msgstr "Lim_par marca"
 
 #. separator here?
-#: mail/folder-browser.c:1755 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcar como li_da"
 
-#: mail/folder-browser.c:1756
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr "Marcar como _não lida"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Marcar como i_mportante"
 
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr "Marcar como sem imp_ortância"
 
-#: mail/folder-browser.c:1763
+#: mail/folder-browser.c:1784
 msgid "U_ndelete"
 msgstr "Des_fazer exclusão"
 
-#: mail/folder-browser.c:1767
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver para pasta..."
 
-#: mail/folder-browser.c:1768 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Copiar para p_asta..."
 
-#: mail/folder-browser.c:1776
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr "Adicionar remetente ao catálo_go de endereços"
 
-#: mail/folder-browser.c:1780
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr "Aplicar _filtros"
 
-#: mail/folder-browser.c:1784
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr "Criar _regra a partir da mensagem"
 
-#: mail/folder-browser.c:2042
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr "Pasta virtual por _lista de discussão"
 
-#: mail/folder-browser.c:2044
+#: mail/folder-browser.c:2066
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtro por l_ista de discussão (%s)"
 
-#: mail/folder-browser.c:2045
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Pasta virtual por _lista de discussão (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Padrão"
 
@@ -11772,19 +11987,19 @@ msgstr "Padrão"
 msgid "Getting Folder Information"
 msgstr "Obtendo informação de pasta"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Fábrica para importar mbox no Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
 msgid "Imports mbox files into Evolution"
 msgstr "Importa arquivos mbox no Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
 msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr "Fábrica para importar correio do Outlook Express 4 no Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importa arquivos do Outlook Express 4 no Evolution"
 
@@ -11822,69 +12037,64 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:103
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr "Você não preencheu toda a informação exigida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:147
+#: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr "Editor de contas do Evolution"
 
-#: mail/mail-account-gui.c:739 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Máquina:"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:125
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Nome do _usuário:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:162
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Caminho:"
 
-#: mail/mail-account-gui.c:1834
+#: mail/mail-account-gui.c:1880
 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:225 mail/mail-accounts.c:236
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Você tem certeza que deseja excluir esta conta?"
 
-#: mail/mail-accounts.c:230 mail/mail-accounts.c:240
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Não excluir"
 
-#: mail/mail-accounts.c:243
-msgid "Really delete account?"
-msgstr "Excluir conta mesmo?"
-
-#: mail/mail-accounts.c:379 mail/mail-accounts.c:413
-#: mail/mail-composer-prefs.c:632 mail/mail-composer-prefs.c:661
-#: mail/mail-composer-prefs.c:691
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
 msgid "Disable"
 msgstr "Desativar"
 
-#: mail/mail-accounts.c:381 mail/mail-accounts.c:415
-#: mail/mail-composer-prefs.c:634 mail/mail-composer-prefs.c:659
-#: mail/mail-composer-prefs.c:691
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
 msgid "Enable"
 msgstr "Ativar"
 
-#: mail/mail-accounts.c:478
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
 msgid "[Default]"
 msgstr "[Padrão]"
 
-#: mail/mail-accounts.c:548 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:680 mail/mail-composer-prefs.c:836
 msgid "Enabled"
 msgstr "Ativado"
 
-#: mail/mail-accounts.c:549 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Nome da conta"
 
-#: mail/mail-accounts.c:550 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -11927,7 +12137,12 @@ msgstr ""
 "    '%s'\n"
 "e foi(foram) atualizada(s)."
 
-#: mail/mail-callbacks.c:156
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Não exibir esta mensagem novamente."
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11939,7 +12154,15 @@ msgstr ""
 "receber ou redigir mensagens.\n"
 "Você desejaria configurá-lo agora?"
 
-#: mail/mail-callbacks.c:199
+#: mail/mail-callbacks.c:211
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Você deve configurar uma conta\n"
+"antes de poder redigir uma mensagem."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11947,7 +12170,7 @@ msgstr ""
 "Você deve configurar uma identidade\n"
 "antes de poder redigir uma mensagem."
 
-#: mail/mail-callbacks.c:212
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11956,7 +12179,7 @@ msgstr ""
 "antes de poder redigir uma mensagem."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:254
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
@@ -11965,17 +12188,11 @@ msgstr ""
 "seguintes destinatários desejam e são capazes de receber correio neste "
 "formato:\n"
 
-#: mail/mail-callbacks.c:250
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Enviar mesmo assim?"
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:255 mail/mail-callbacks.c:283
-#: mail/mail-callbacks.c:326 widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr "Não exibir esta mensagem novamente."
-
-#: mail/mail-callbacks.c:282
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11983,7 +12200,7 @@ msgstr ""
 "Esta mensagem não possui um assunto.\n"
 "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:314
+#: mail/mail-callbacks.c:313
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11992,11 +12209,11 @@ msgstr ""
 "está configurada para esconder os endereços da lista, esta mensagem conterá "
 "apenas destinatários Bcc."
 
-#: mail/mail-callbacks.c:318
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensagem contém apenas destinatários Bcc."
 
-#: mail/mail-callbacks.c:324
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -12006,11 +12223,11 @@ msgstr ""
 "cabeçalho Apparently-To.\n"
 "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:462
+#: mail/mail-callbacks.c:470
 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:723
+#: mail/mail-callbacks.c:722
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -12018,28 +12235,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:1154
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
-#: mail/mail-callbacks.c:1158
+#: mail/mail-callbacks.c:1191
 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:1648 mail/message-browser.c:137
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-callbacks.c:1650 mail/message-browser.c:139
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Copiar mensagem(ns) para"
 
-#: mail/mail-callbacks.c:2291
+#: mail/mail-callbacks.c:2344
 #, 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:2316
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12047,7 +12264,7 @@ msgstr ""
 "Você pode apenas editar mensagens salvas\n"
 "na pasta Rascunho."
 
-#: mail/mail-callbacks.c:2355
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12055,53 +12272,54 @@ msgstr ""
 "Você pode apenas reenviar mensagens\n"
 "na pasta Enviada."
 
-#: mail/mail-callbacks.c:2369
+#: mail/mail-callbacks.c:2403
 #, 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:2395
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Não existe mensagem selecionada"
 
-#: mail/mail-callbacks.c:2440 mail/mail-display.c:189
-msgid "Overwrite file?"
-msgstr "Sobrescrever arquivo?"
+#: mail/mail-callbacks.c:2465
+#, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Não é possível salvar para `%s'\n"
+" %s"
+
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"`%s' já existe.\n"
+"Sobrescrevê-lo?"
 
-#: mail/mail-callbacks.c:2495
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Salvar mensagem como..."
 
-#: mail/mail-callbacks.c:2497
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Salvar mensagens como..."
 
-#: mail/mail-callbacks.c:2566
-msgid "Go to next folder with unread messages?"
-msgstr "Ir para a próxima pasta com mensagens não lidas?"
-
-#: mail/mail-callbacks.c:2573
+#: mail/mail-callbacks.c:2687
 msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-"Não há mais mensagens não lidas nesta pasta.\n"
-"Você gostaria de ir para a próxima pasta?"
-
-#: mail/mail-callbacks.c:2816
-msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"Esta operação apagará permanentemente todas as mensagens marcadas para "
-"exclusão. Se você continuar você não será capaz de recuperar estas "
-"mensagens.\n"
+"Esta operação apagará permanentemente todas as mensagens marcadas para\n"
+"exclusão. Se você continuar você não será capaz de recuperar estas mensagens.\n"
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: mail/mail-callbacks.c:2923
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12110,57 +12328,59 @@ msgstr ""
 "Erro ao carregar informação do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2936
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2978
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: mail/mail-callbacks.c:3032
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/mail-callbacks.c:3093
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Falhou a impressão da mensagem"
 
-#: mail/mail-callbacks.c:3285
+#: mail/mail-callbacks.c:3146
 #, 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:217
-msgid ""
-"Please specify signature filename\n"
-"in Advanced section of signature settings."
-msgstr ""
-"Por favor especifique o nome do arquivo de assinatura\n"
-"na seção Avançado das configurações de assinatura."
-
-#: mail/mail-composer-prefs.c:231 mail/mail-composer-prefs.c:233
-#: mail/mail-composer-prefs.c:357 mail/mail-composer-prefs.c:404
-#, fuzzy
-msgid "[script]"
-msgstr " [script]"
+#: mail/mail-composer-prefs.c:225 mail/mail-composer-prefs.c:328
+#: mail/mail-config.c:1220
+msgid "Unnamed"
+msgstr "Sem nome"
 
-#: mail/mail-composer-prefs.c:302
-#, fuzzy
+#: mail/mail-composer-prefs.c:313
 msgid "You must specify a valid script name."
-msgstr "Por favor especifique um nome de script válido"
+msgstr "Você deve especificar um nome de script válido."
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2572
-msgid "Unnamed"
-msgstr "Sem nome"
+#: mail/mail-composer-prefs.c:369 mail/mail-composer-prefs.c:431
+msgid "[script]"
+msgstr "[script]"
+
+#: mail/mail-composer-prefs.c:840
+msgid "Language(s)"
+msgstr "Língua(s)"
 
-#: mail/mail-composer-prefs.c:871
+#: mail/mail-composer-prefs.c:882
 msgid "Add script signature"
 msgstr "Adicionar script de assinatura"
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-composer-prefs.c:902
+msgid "Signature(s)"
+msgstr "Assinatura(s)"
+
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Identidade"
+
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12170,7 +12390,11 @@ msgstr ""
 "abaixo não precisam ser preenchidos, a não ser que você deseje incluir esta "
 "informação mas mensagens enviadas."
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+msgid "Receiving Mail"
+msgstr "Recebendo correio"
+
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12179,11 +12403,15 @@ msgstr ""
 "correio. Se você não tiver certeza, pergunte ao seu administrador de sistema "
 "ou a seu provedor de Internet."
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Por favor selecione entre as seguintes opções"
 
-#: mail/mail-config-druid.c:156
+#: mail/mail-config-druid.c:400
+msgid "Sending Mail"
+msgstr "Enviando correio"
+
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12192,7 +12420,11 @@ msgstr ""
 "tiver certeza, pergunte ao seu administrador de sistema ou a seu provedor de "
 "Internet."
 
-#: mail/mail-config-druid.c:158
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Gerência de conta"
+
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12206,273 +12438,263 @@ msgstr ""
 "Evolution. Por favor entre um nome para esta conta no espaço abaixo. Este "
 "nome será usado apenas para propósitos de exibição."
 
-#. set window title
-#: mail/mail-config-druid.c:643
-msgid "Evolution Account Assistant"
-msgstr "Assistente de contas do Evolution"
-
-#: mail/mail-config.c:599
-#, c-format
-msgid "Account %d"
-msgstr "Conta %d"
-
-#: mail/mail-config.c:2263
+#: mail/mail-config.c:924
 msgid "Checking Service"
 msgstr "Verificando serviço"
 
-#: mail/mail-config.c:2341 mail/mail-config.c:2344
+#: mail/mail-config.c:1002 mail/mail-config.c:1006
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr " _Verificar tipos suportados "
 
-#: mail/mail-config.glade.h:2
+#: 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:3
+#: mail/mail-config.glade.h:5
 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:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Sempre cifrar para mim mesmo ao en_viar correio cifrado"
 
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Informação de conta"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Gerência de conta"
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
 msgstr "Adicionar s_cript"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Add new signature..."
 msgstr "Adicionar nova assinatura..."
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Sempre _cifrar para mim mesmo ao enviar correio cifrado"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Se_mpre assinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Sempre enviar uma cópia oc_ulta (Bcc) para:"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Sempre enviar uma _cópia (Cc) para:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Sempre con_fiar nas chaves em meu chaveiro ao cifrar"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Anexar mensagem original"
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "Automatically _detect links"
 msgstr "_Detectar vínculos automaticamente"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "C_haracter set:"
 msgstr "Con_junto de caracteres:"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "C_olors"
 msgstr "_Cores"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Verificar a ortografia enquanto eu _digito"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Verificando novas mensagens"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Cor das palavras _erradas:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Redigindo mensagens"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Configuração"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 "Parabéns, sua configuração de correio está concluída.\n"
 "\n"
-"Você está pronto agora para enviar e receber correio\n"
+"Você está pronto agora para enviar e receber correio \n"
 "eletrônico usando o Evolution. \n"
 "\n"
-"Pressione \"Concluir\" para salvar suas configurações."
+"Pressione \"Aplicar\" para salvar suas configurações."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Padrão"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Comportamento padrão"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Co_dificação de caracteres padrão:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Excluindo correio"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "IDs digitais..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Não citar a mensagem original"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Não assinar pedidos de reunião (para compatibilidade com o Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "P_asta de rascunhos:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "A_tivar"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Contas de correio"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Endereço de e-_mail:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "_Esvaziar lixeiras ao sair"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Assistente de contas do Evolution"
+
+#: mail/mail-config.glade.h:56
+msgid "Execute Command..."
+msgstr "Executar comando..."
+
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Largura fi_xa:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:58
 msgid "Font Properties"
 msgstr "Propriedades da fonte"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:59
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Obter ID digital..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "_Realçar citações com"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:60 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Identidade"
-
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Embutido"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Rótulos e cores"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Carregando imagens"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configuração de correio"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
+msgid "Mailbox location"
+msgstr "Localização da caixa de correio"
+
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Redator de mensagens"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Exibição de mensagens"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:75
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Notificação de nova mensagem"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12480,147 +12702,143 @@ msgstr ""
 "Nota: não será pedido que você forneça uma senha até que você faça a "
 "primeira conexão"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "On Screen fonts"
 msgstr "Fontes de tela"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Informação opcional"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr "Empres_a:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da c_have PGP/GPG:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 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:87
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Printed Fonts"
 msgstr "Fontes de impressão"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quote original message"
 msgstr "Citar mensagem original"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "_Lembrar esta senha"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr "Respon_der-a:"
 
-#: mail/mail-config.glade.h:94 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Receiving _Options"
 msgstr "_Opções de recepção"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "_Lembrar esta senha"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Informação exigida"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Restore Defaults"
 msgstr "Restaurar padrões"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "_Segurança"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "Selecionar fonte HTML de largura fixa"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecionar fonte HTML de largura fixa para impressão"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "Selecionar fonte HTML de largura variável"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr "Selecionar fonte HTML de largura variável para impressão"
 
-#: mail/mail-config.glade.h:106 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "Enviando mensagem"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Pasta de _mensagens enviadas:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Mensagens enviadas e rascunhos"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Servi_dor requer autenticação"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Configuração do servidor"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "_Tipo do servidor: "
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "_Tipo dos atalhos:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "Nome do _arquivo:"
 
-#: mail/mail-config.glade.h:115
-msgid "Spell Checking Language"
-msgstr "Língua da verificação ortográfica"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "_Verificação ortográfica"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Mbox padrão do Unix"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12630,7 +12848,7 @@ msgstr ""
 "assinatura. O nome que você especificar será\n"
 "usado apenas para propósitos de exibição. "
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:123
 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 "
@@ -12640,7 +12858,7 @@ msgstr ""
 "correção ortográfica. A lista de línguas aqui reflete apenas as línguas para "
 "as quais você possui um dicionário instalado."
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12648,177 +12866,177 @@ msgstr ""
 "Digite o nome pelo qual você gostaria de chamar esta conta.\n"
 "Por exemplo: \"Trabalho\" ou \"Pessoal\""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Largura v_ariável:"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 "Bem-vindo ao assistente de configuração de correio do Evolution.\n"
 "\n"
 "Pressione \"Próximo\" para começar. "
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Adicionar assinatura"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Sempre carregar imagens da rede"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Sempre _assinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Tipo de _autenticação: "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Tipo de _autenticação: "
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Verificar automaticamente novas mensagens"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Inserir automaticamente imagens de _carinhas"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Soe um bip quando uma nova mensagem chegar"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "I_D do certificado:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "C_onfirmar ao excluir permanentemente uma pasta"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr "Assinat_ura padrão:"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "_Padrões"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Não me notifique quando uma nova mensagem chegar"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "_Ativar"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr "Largura _fixa:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "Estilo de _encaminhamento:"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "Nome _completo:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:156
 msgid "_HTML Mail"
 msgstr "Correio _HTML"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr "_Identidade"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "C_arregar imagens se o remetente está no catálogo de endereços"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Torne esta a minha conta padrão"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas após"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nunca carregar imagens da rede"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Toque um arquivo de som quando uma nova mensagem chegar"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 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:165
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Perguntar ao enviar mensagens com um assunto vazio"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Recebendo correio"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Estilo de _resposta:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Restaurar padrões"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:172
 msgid "_Sending Mail"
 msgstr "_Enviando correio"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:173
 msgid "_Show animated images"
 msgstr "_Exibir imagens animadas"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:174
 msgid "_Signatures"
 msgstr "A_ssinaturas"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:175
 msgid "_Use secure connection (SSL):"
 msgstr "Usar conexão se_gura (SSL)"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:176
 msgid "_Variable-width:"
 msgstr "Largura _variável:"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "a _cada"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:178
 msgid "color"
 msgstr "cor"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "descrição"
 
@@ -12842,7 +13060,7 @@ msgstr "Não foi possível criar um contexto de envelope S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Não foi possível criar um contexto de decodificação S/MIME."
 
-#: mail/mail-display.c:186
+#: mail/mail-display.c:193
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -12851,70 +13069,70 @@ msgstr ""
 "Arquivo `%s' já existe.\n"
 "Sobrescrevê-lo?"
 
-#: mail/mail-display.c:318
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Salvar anexo"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:406
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Não foi possível criar arquivo temporário '%s': %s"
 
-#: mail/mail-display.c:439
+#: mail/mail-display.c:454
 msgid "Save Attachment..."
 msgstr "Salvar anexo..."
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Ver embutido"
 
-#: mail/mail-display.c:441
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
 
-#: mail/mail-display.c:496
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver embutido (via %s)"
 
-#: mail/mail-display.c:500
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Esconder"
 
-#: mail/mail-display.c:520
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Visualizador externo"
 
-#: mail/mail-display.c:1299
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr "Baixando imagens"
 
-#: mail/mail-display.c:1476
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Carregando conteúdo da mensagem"
 
-#: mail/mail-display.c:1777
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1883
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "até %d de %B, %Y, %H:%M"
 
-#: mail/mail-display.c:2123
+#: mail/mail-display.c:2234
 msgid "Open Link in Browser"
 msgstr "Abrir vínculo no navegador"
 
-#: mail/mail-display.c:2124
+#: mail/mail-display.c:2235
 msgid "Copy Link Location"
 msgstr "Copiar local do vínculo"
 
-#: mail/mail-display.c:2126
+#: mail/mail-display.c:2237
 msgid "Save Link as (FIXME)"
 msgstr "Salvar vínculo como (FIXME)"
 
-#: mail/mail-display.c:2128
+#: mail/mail-display.c:2239
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
@@ -12923,92 +13141,92 @@ msgstr "Salvar imagem como..."
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: mail/mail-format.c:648
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: mail/mail-format.c:691 mail/mail-format.c:1709 mail/mail-format.c:1778
-#: mail/mail-format.c:1898 mail/mail-format.c:2023 mail/mail-format.c:2048
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
 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:769 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:854
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Endereço inválido"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Responder-a"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1821
+#: mail/mail-format.c:1451
 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:1848
+#: mail/mail-format.c:1479
 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:1857
+#: mail/mail-format.c:1487
 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:1865
+#: mail/mail-format.c:1494
 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:2129
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Apontador para site FTP (%s)"
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:1769
 #, 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:2144
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Apontador para arquivo local (%s)"
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Apontador para dados remotos (%s)"
 
-#: mail/mail-format.c:2177
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2179
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
@@ -13017,11 +13235,11 @@ msgstr "Parte external-body malformada."
 msgid "Local folders/%s"
 msgstr "Pastas locais/%s"
 
-#: mail/mail-local.c:669
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando pasta"
 
-#: mail/mail-local.c:750
+#: mail/mail-local.c:748
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13030,22 +13248,22 @@ msgstr ""
 "Não é possível salvar metainfo da pasta; você provavelmente descobrirá\n"
 "que não pode mais abrir esta pasta: %s: %s"
 
-#: mail/mail-local.c:806
+#: mail/mail-local.c:804
 #, 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:858
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Não é possível excluir metainfo de pasta %s: %s"
 
-#: mail/mail-local.c:1328
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Alterando pasta \"%s\" para o formato \"%s\""
 
-#: mail/mail-local.c:1350
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13053,16 +13271,16 @@ msgstr ""
 "Se você não pode mais abrir esta caixa postal\n"
 "então você precisar repará-la manualmente."
 
-#: mail/mail-local.c:1449
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
 
-#: mail/mail-local.c:1513
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "Você não pode alterar o formato de pastas remotas."
 
-#: mail/mail-mt.c:255
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13071,7 +13289,7 @@ msgstr ""
 "Erro enquanto '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:258
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13080,108 +13298,108 @@ msgstr ""
 "Erro ao executar operação:\n"
 "%s"
 
-#: mail/mail-mt.c:900
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Trabalhando"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtrando pasta"
 
-#: mail/mail-ops.c:266
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Pegando correio"
 
-#: mail/mail-ops.c:552 mail/mail-ops.c:581
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr "No entanto, a mensagem foi enviada com sucesso."
 
-#: mail/mail-ops.c:613
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensagem %d de %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Falha na mensagem %d de %d"
 
-#: mail/mail-ops.c:752 mail/mail-send-recv.c:548
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 msgid "Complete."
 msgstr "Concluída."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Salvando mensagem na pasta"
 
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensagens para %s"
 
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensagens para %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
-#: mail/mail-ops.c:1227
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-ops.c:1270
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1342
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo repositório %s"
 
-#: mail/mail-ops.c:1415
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removendo pasta %s"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Armazenando pasta '%s'"
 
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Atualizando pasta"
 
-#: mail/mail-ops.c:1596
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "Excluindo permanentemente pasta"
 
-#: mail/mail-ops.c:1645
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperando mensagem %s"
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recuperando %d mensagem(ns)"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvando %d mensagem(ns)"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13190,7 +13408,7 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13199,11 +13417,11 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Salvando anexo"
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13212,54 +13430,54 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Não foi possível escrever dados: %s"
 
-#: mail/mail-ops.c:2212
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2212
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
 
-#: mail/mail-search-dialogue.c:120 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Buscar"
-
-#: mail/mail-search.c:139
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Mensagem sem nome)"
 
-#: mail/mail-search.c:242
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Mensagem sem nome"
 
-#: mail/mail-search.c:246
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Mensagem vazia"
 
-#: mail/mail-search.c:295
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Localizar na mensagem"
 
-#: mail/mail-search.c:328
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Buscar"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Diferenciar maiúsculas de minúsculas"
 
-#: mail/mail-search.c:330
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Buscar a frente"
 
-#: mail/mail-search.c:350
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Localizar:"
 
-#: mail/mail-search.c:353
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Casa:"
 
@@ -13267,64 +13485,64 @@ msgstr "Casa:"
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Caminho: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:298
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "Receber e enviar correio"
 
-#: mail/mail-send-recv.c:300
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "Cancelar todos"
 
-#: mail/mail-send-recv.c:359
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: mail/mail-send-recv.c:360 mail/mail-send-recv.c:413
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-session.c:212
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "O usuário cancelou a operação."
 
-#: mail/mail-session.c:245 mail/mail-session.c:339
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Entre senha para %s"
 
-#: mail/mail-session.c:247 mail/mail-session.c:342
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Entre senha"
 
-#: mail/mail-session.c:260 mail/mail-session.c:281
+#: mail/mail-session.c:280
 msgid "_Remember this password"
 msgstr "_Lembrar esta senha"
 
-#: mail/mail-session.c:261 mail/mail-session.c:282
+#: mail/mail-session.c:281
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Lembrar esta senha pelo restante desta sessão"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-signature-editor.c:80
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Não foi possível salvar arquivo de assinatura: %s"
 
-#: mail/mail-signature-editor.c:176
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13334,46 +13552,50 @@ msgstr ""
 "\n"
 "Você deseja salvar as suas modificações?"
 
-#: mail/mail-signature-editor.c:179
+#: mail/mail-signature-editor.c:229
+msgid "_Discard changes"
+msgstr "_Descartar mudanças"
+
+#: mail/mail-signature-editor.c:233
 msgid "Save signature"
 msgstr "Salvar assinatura"
 
-#: mail/mail-signature-editor.c:324
+#: mail/mail-signature-editor.c:389
 msgid "Edit signature"
 msgstr "Editar assinatura"
 
-#: mail/mail-signature-editor.c:360
+#: mail/mail-signature-editor.c:429
 msgid "Enter a name for this signature."
 msgstr "Entre um nome para esta assinatura."
 
-#: mail/mail-signature-editor.c:363 my-evolution/e-summary-preferences.c:621
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Nome:"
 
-#: mail/mail-tools.c:261
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensagem encaminhada - %s"
 
-#: mail/mail-tools.c:263
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Mensagem encaminhada"
 
-#: mail/mail-tools.c:412
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Mensagem encaminhada"
 
-#: mail/mail-vfolder.c:79
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Preparando pasta virtual: %s"
 
-#: mail/mail-vfolder.c:197
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Atualizando pastas virtuais para URI: %s"
 
-#: mail/mail-vfolder.c:444
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13386,97 +13608,97 @@ msgstr ""
 "    '%s'\n"
 "e foi(foram) atualizada(s)."
 
-#: mail/mail-vfolder.c:753 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:810
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:850
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Editar pasta virtual"
 
-#: mail/mail-vfolder.c:868
+#: mail/mail-vfolder.c:892
 #, 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:921
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nova pasta virtual"
 
-#: mail/message-browser.c:213
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Sem assunto)"
 
-#: mail/message-browser.c:215
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensagem"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "Não vista"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "Várias mensagens não vistas"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "Várias mensagens"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "Mínima"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "Mais baixa"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "Mais alta"
 
-#: mail/message-list.c:751
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "Máxima"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1076
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1083
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1092
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1104
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1103
+#: mail/message-list.c:1112
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1114
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2578
+#: mail/message-list.c:2610
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
@@ -13508,43 +13730,43 @@ msgstr "Recebida"
 msgid "Size"
 msgstr "Tamanho"
 
-#: mail/message-tag-followup.c:51
+#: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Ligar"
 
-#: mail/message-tag-followup.c:52
+#: mail/message-tag-followup.c:63
 msgid "Do Not Forward"
 msgstr "Não encaminhar"
 
-#: mail/message-tag-followup.c:53
+#: mail/message-tag-followup.c:64
 msgid "Follow-Up"
 msgstr "Continuar"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:65
 msgid "For Your Information"
 msgstr "Para conhecimento"
 
-#: mail/message-tag-followup.c:55 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr "Não é necessário resposta"
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:59 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:71
 msgid "Review"
 msgstr "Revisar"
 
-#: mail/message-tag-followup.c:241 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr "Marcar para continuar"
 
@@ -13572,51 +13794,43 @@ msgstr "_Prazo até:"
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:231
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Varrendo pastas sob %s em \"%s\""
 
-#: mail/subscribe-dialog.c:235
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Varrendo pastas no nível raiz em \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:331
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Assinando a pasta \"%s\""
 
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:333
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Cancelando assinatura da pasta \"%s\""
 
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1246 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Pasta"
 
-#: mail/subscribe-dialog.c:1440
+#: mail/subscribe-dialog.c:1356
 msgid "Scanning folders..."
 msgstr "Varrendo pastas..."
 
-#: mail/subscribe-dialog.c:1547
+#: mail/subscribe-dialog.c:1470
 msgid "No server has been selected"
 msgstr "Não foi selecionado um servidor"
 
-#: mail/subscribe-dialog.c:1622
+#: mail/subscribe-dialog.c:1545
 msgid "Please select a server."
 msgstr "Por favor selecione um servidor."
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr "Todas as pastas"
-
-#: mail/subscribe-dialog.glade.h:2
-msgid "Apri file"
-msgstr "Apri file"
-
 #: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -13627,37 +13841,41 @@ msgid "Close"
 msgstr "Fechar"
 
 #: mail/subscribe-dialog.glade.h:4
-msgid "Display Options"
-msgstr "Opções de exibição"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr "Pastas com nomes que começam com:"
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr "Gerenciar assinaturas"
 
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Atualizar lista"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr "_Selecionar servidor: "
 
-#: mail/subscribe-dialog.glade.h:9
-msgid "Salve file"
-msgstr "Salve file"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Assinar"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "_Cancelar assinatura"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
+msgid "Configuration control for the Evolution Summary."
+msgstr "Controle de configuração para o Resumo do Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+msgid "Configure the appearance of the Evolution Summary here"
+msgstr "Configure a aparência do Resumo do Evolution aqui"
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
+msgid "Evolution Summary component."
+msgstr "Componente Resumo do Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+msgid "Summary Preferences"
+msgstr "Preferências do resumo"
+
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr "Aarhus"
@@ -18748,4780 +18966,4775 @@ msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
 #: my-evolution/Locations.h:1325
-msgid "Marquette"
-msgstr "Marquette"
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Airport"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr "Aeroporto de Matsuyama"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Middle East"
 msgstr "Oriente Médio"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr "Aeroporto de Miyakejima"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
 msgstr "Aeroporto de Miyazaki"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr "Aeroporto de Mombetsu"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr "Moscou Domodedovo"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr "Moscou Sheremetyevo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr "Aeroporto de Nagasaki"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr "Aeroporto de Nagoya"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr "Aeroporto de Naha"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr "Aeroporto de Nakashibetsu"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr "Aeroporto de Nankishirahama"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr "Nantes Atlantique"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Naples"
 msgstr "Nápoles"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr "Novo Aeroporto Internacional de Tokyo"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr "Aeroporto de Niigata"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr "Aeroporto de Obihiro"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odesa"
 msgstr "Odessa"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr "Aeroporto de Oita"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr "Aeroporto de Okayama"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr "Aeroporto de Oki"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr "Aeroporto Internacional de Osaka"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr "Aeroporto de Oshima"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr "People's Republic of China"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr "Poços de Caldas"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr "Arpt Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr "Rio de Janeiro"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepaguá"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 msgid "Russia"
 msgstr "Russia"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr "São José dos Campos"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 msgid "Sao Luiz"
 msgstr "São Luís"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr "São Paulo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 msgid "Sendai Airport"
 msgstr "Aeroporto de Sendai"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O International Airport"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 msgid "Sympheropol"
 msgstr "Sympheropol"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr "Aeroporto de Takamatsu"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 msgid "Tallinn"
 msgstr "Tallinn"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr "Aeroporto de Tanegashima"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr "Heliporto de Tokyo"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr "Aeroporto Internacional de Tokyo"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr "Novo Aeroporto Internacional de Tokyo"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 msgid "Tottori Airport"
 msgstr "Tottori Airport"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr "Toyama Airport"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr "Aeroporto de Tsushima"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr "Tucuruí"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 msgid "United Arab Emirates "
 msgstr "Emirados Árabes Unidos"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech Airport"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Airport"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Airport"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr "Aeroporto de Yamagata"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr "Aeroporto de Yamaguchi Ube"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 msgid "Yao Airport"
 msgstr "Aeroporto de Yao"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr "Pasta contendo o resumo do Evolution"
 
-#: my-evolution/e-summary-calendar.c:377 my-evolution/e-summary-calendar.c:397
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "Compromissos"
 
-#: my-evolution/e-summary-calendar.c:378
-msgid "No appointments"
-msgstr "Sem compromissos"
+#: my-evolution/e-summary-calendar.c:388
+msgid "No appointments."
+msgstr "Sem compromissos."
 
-#: my-evolution/e-summary-calendar.c:414
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d de %B"
 
-#: my-evolution/e-summary-calendar.c:416
-msgid "%l:%M %d %B"
-msgstr "%l:%M %d de %B"
+#: my-evolution/e-summary-calendar.c:407
+msgid "%l:%M%P %d %B"
+msgstr "%l:%M%P %d de %B"
 
-#: my-evolution/e-summary-calendar.c:434
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr "Sem descrição"
 
-#: my-evolution/e-summary-mail.c:156
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Resumo das mensagens"
 
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1113
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Pastas locais"
 
-#: my-evolution/e-summary-preferences.c:355
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr "\"Word of the Day\" do Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:373
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "Citações do dia"
 
-#: my-evolution/e-summary-preferences.c:611
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Adicionar uma fonte de notícias"
 
-#: my-evolution/e-summary-preferences.c:617
+#: my-evolution/e-summary-preferences.c:621
 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-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "Erro ao baixar RDF"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Fonte de notícias"
 
-#: my-evolution/e-summary-shown.c:521
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr "Todos"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:533
+#: my-evolution/e-summary-shown.c:530
 msgid "Add"
 msgstr "Adicionar"
 
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Exibido"
 
-#: my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Sem tarefas"
 
-#: my-evolution/e-summary-tasks.c:371
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Sem descrição)"
 
@@ -23529,11 +23742,11 @@ msgstr "(Sem descrição)"
 msgid "My Weather"
 msgstr "Meu tempo"
 
-#: my-evolution/e-summary-weather.c:269
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr "Ocorreu um erro ao baixar dados para"
 
-#: my-evolution/e-summary-weather.c:490
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Tempo"
 
@@ -23541,31 +23754,26 @@ msgstr "Tempo"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:592
+#: my-evolution/e-summary-weather.c:584
 msgid "KBOS"
 msgstr "SBFN"
 
-#: my-evolution/e-summary.c:199
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A, %e de %B, %Y"
 
-#: my-evolution/e-summary.c:514
+#: my-evolution/e-summary.c:524
 msgid "Please wait..."
 msgstr "Por favor aguarde..."
 
-#: my-evolution/e-summary.c:592 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:590 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimir resumo"
 
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:624
 msgid "Printing of Summary failed"
 msgstr "Falhou a impressão do resumo"
 
-#: my-evolution/main.c:63
-#, fuzzy
-msgid "Evolution Summary"
-msgstr "Alarme do Evolution"
-
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr "° F"
@@ -24832,19 +25040,19 @@ msgstr "A_genda"
 msgid "_Weather"
 msgstr "_Tempo"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Configuration control for Evolution folder settings."
 msgstr "Controle de configuração para as configurações de pasta do Evolution."
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr "Configure pastas especiais e comportamento desconectado de pastas aqui"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
 msgid "Folder Settings"
 msgstr "Configurações de pastas"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 msgid "The Evolution shell."
 msgstr "A shell do Evolution."
 
@@ -24865,54 +25073,37 @@ msgstr ""
 "Não é possível transferir pasta:\n"
 "%s"
 
-#: shell/e-folder-list.c:123 shell/evolution-folder-selector-button.c:129
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "\"%s\" em \"%s\""
 
-#: shell/e-folder-list.c:325
+#: shell/e-folder-list.c:338
 msgid "Add a Folder"
 msgstr "Adicionar uma pasta"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr "Rascunho"
 
-#: shell/e-local-storage.c:181 shell/e-shell-view.c:488
-#: shell/e-shell-view.c:492 shell/e-shortcuts.c:1075
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:495
+#: shell/e-shell-view.c:499 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: shell/e-local-storage.c:182
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Caixa de saída"
 
-#: shell/e-local-storage.c:183
+#: shell/e-local-storage.c:182
 msgid "Sent"
 msgstr "Enviada"
 
-#: shell/e-setup.c:128
-msgid "Evolution installation"
-msgstr "Instalação do Evolution"
-
-#: shell/e-setup.c:132
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Esta nova versão do Evolution precisa instalar arquivos adicionais\n"
-"no seu diretório pessoal do Evolution"
-
-#: shell/e-setup.c:133
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Por favor clique \"OK\" para instalar os arquivos ou \"Cancelar\" para sair."
-
-#: shell/e-setup.c:173
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Não foi possível atualizar os arquivos corretamente"
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24923,7 +25114,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:211
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -24932,7 +25123,7 @@ msgstr ""
 "Um erro ocorreu ao copiar arquivos em\n"
 "`%s'."
 
-#: shell/e-setup.c:284
+#: shell/e-setup.c:243
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -24943,7 +25134,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:302
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -24954,7 +25145,7 @@ msgstr ""
 "não possui as permissões corretas. Por favor torne-o\n"
 "legível e executável e reinicie o Evolution."
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "File %s\n"
@@ -24965,7 +25156,7 @@ msgstr ""
 "deve ser removido para permitir a execução correta do Evolution.\n"
 "Por favor remova este arquivo e reinicie o Evolution."
 
-#: shell/e-setup.c:331
+#: shell/e-setup.c:290
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -24976,21 +25167,7 @@ msgstr ""
 "Por favor o mova para permitir a instalação\n"
 "dos arquivos de usuário do Evolution."
 
-#: shell/e-setup.c:345
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-"O Evolution detectou um diretório\n"
-"antigo de resumo executivo.\n"
-"Este precisa ser removido antes\n"
-"que o Evolution execute.\n"
-"Você deseja remover este diretório?"
-
-#: shell/e-setup.c:370
+#: shell/e-setup.c:299
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25005,7 +25182,7 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Feito para você por"
 
-#: shell/e-shell-config-autocompletion.c:112
+#: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr "Pastas para completar extra"
 
@@ -25025,47 +25202,47 @@ msgstr "Pastas desconectadas"
 msgid "Autocompletion Folders"
 msgstr "Pastas autocompletar"
 
-#: shell/e-shell-folder-commands.c:141
+#: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
 msgstr "Não é possível copiar pasta: %s"
 
-#: shell/e-shell-folder-commands.c:144
+#: shell/e-shell-folder-commands.c:142
 #, c-format
 msgid "Cannot move folder: %s"
 msgstr "Não é possível mover pasta: %s"
 
-#: shell/e-shell-folder-commands.c:191
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Não é possível mover uma pasta sobre ela mesma."
 
-#: shell/e-shell-folder-commands.c:193
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Não é possível copiar uma pasta sobre ela mesma."
 
-#: shell/e-shell-folder-commands.c:207
+#: shell/e-shell-folder-commands.c:204
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Não é possível mover uma pasta em um dos seus descendentes."
 
-#: shell/e-shell-folder-commands.c:322
+#: shell/e-shell-folder-commands.c:319
 #, c-format
 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:323
 msgid "Copy folder"
 msgstr "Copiar pasta"
 
-#: shell/e-shell-folder-commands.c:366
+#: shell/e-shell-folder-commands.c:363
 #, 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:370
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Mover pasta"
 
-#: shell/e-shell-folder-commands.c:394
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25074,17 +25251,17 @@ msgstr ""
 "Não é possível excluir pasta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:407
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Excluir \"%s\""
-
-#: shell/e-shell-folder-commands.c:408
+#: shell/e-shell-folder-commands.c:405
 #, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Excluir mesmo pasta \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Excluir \"%s\""
+
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25093,26 +25270,26 @@ msgstr ""
 "Não é possível renomear pasta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: shell/e-shell-folder-commands.c:543
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: shell/e-shell-folder-commands.c:553
-#: shell/e-shell-folder-creation-dialog.c:169
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "O nome de pasta especificado não é válido: %s"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:583
 msgid "Selected folder does not belong to another user"
 msgstr "A pasta selecionada não pertence a outro usuário"
 
-#: shell/e-shell-folder-commands.c:590
+#: shell/e-shell-folder-commands.c:586
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25121,7 +25298,7 @@ msgstr ""
 "Não é possível remover pasta:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
+#: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25130,19 +25307,19 @@ msgstr ""
 "Não é possível criar a pasta especificada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:292
+#: shell/e-shell-folder-creation-dialog.c:308
 msgid "Create New Folder"
 msgstr "Criar nova pasta"
 
-#: shell/e-shell-folder-title-bar.c:648 shell/e-shell-folder-title-bar.c:649
+#: shell/e-shell-folder-title-bar.c:593 shell/e-shell-folder-title-bar.c:594
 msgid "(Untitled)"
 msgstr "(Sem nome)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr "Escolha o tipo de importador a executar:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -25156,11 +25333,11 @@ msgstr ""
 "Você pode selecionar \"Automático\" se você não sabe e o Evolution tentará "
 "descobrir sozinho."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:816
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Por favor selecione a informação que você gostaria de importar:"
 
-#: shell/e-shell-importer.c:245 shell/e-shell-importer.c:276
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25169,21 +25346,21 @@ msgstr ""
 "Importando %s\n"
 "Importando item %d."
 
-#: shell/e-shell-importer.c:350
+#: shell/e-shell-importer.c:351
 msgid "Select importer"
 msgstr "Selecionar importador"
 
-#: shell/e-shell-importer.c:488
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid "File %s does not exist"
 msgstr "Arquivo %s não existe"
 
-#: shell/e-shell-importer.c:489 shell/e-shell-importer.c:506
-#: shell/e-shell-importer.c:552
+#: shell/e-shell-importer.c:492 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:551
 msgid "Evolution Error"
 msgstr "Erro do Evolution"
 
-#: shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25192,11 +25369,11 @@ msgstr ""
 "Não existe importador capaz de tratar\n"
 "%s"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:517
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:520
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25205,17 +25382,17 @@ msgstr ""
 "Importando %s.\n"
 "Iniciando %s"
 
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:536
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:551
+#: shell/e-shell-importer.c:550
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao carregar %s"
 
-#: shell/e-shell-importer.c:568
+#: shell/e-shell-importer.c:567
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25224,31 +25401,31 @@ msgstr ""
 "Importando %s\n"
 "Importando item 1."
 
-#: shell/e-shell-importer.c:622
+#: shell/e-shell-importer.c:621
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:671
+#: shell/e-shell-importer.c:670
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:675
 msgid "Select a file"
 msgstr "Selecionar um arquivo"
 
-#: shell/e-shell-importer.c:685
+#: shell/e-shell-importer.c:684
 msgid "File type:"
 msgstr "Tipo do arquivo:"
 
-#: shell/e-shell-importer.c:710
+#: shell/e-shell-importer.c:709
 msgid "Import data and settings from older programs"
 msgstr "Importar dados e configurações de programas antigos"
 
-#: shell/e-shell-importer.c:714
+#: shell/e-shell-importer.c:713
 msgid "Import a single file"
 msgstr "Importar um único arquivo"
 
-#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:642
+#: shell/e-shell-importer.c:779 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25256,32 +25433,32 @@ msgstr ""
 "Por favor aguarde...\n"
 "Varrendo a procura de configurações existentes"
 
-#: shell/e-shell-importer.c:783 shell/e-shell-startup-wizard.c:645
+#: shell/e-shell-importer.c:782
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando importadores inteligentes"
 
-#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:770
+#: shell/e-shell-importer.c:906 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1077
+#: shell/e-shell-importer.c:1080
 msgid "Select folder"
 msgstr "Selecionar pasta"
 
-#: shell/e-shell-importer.c:1078
+#: shell/e-shell-importer.c:1081
 msgid "Select a destination folder for importing this data"
 msgstr "Selecionar uma pasta destino para onde importar estes dados"
 
-#: shell/e-shell-importer.c:1190 shell/importer/intelligent.c:191
+#: shell/e-shell-importer.c:1211 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:584
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Fechando conexões..."
 
-#: shell/e-shell-offline-sync.c:160
+#: shell/e-shell-offline-sync.c:163
 #, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -25290,92 +25467,89 @@ msgstr ""
 "Erro sincronizando \"%s\":\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:238
+#: shell/e-shell-offline-sync.c:232
 msgid "Syncing Folder"
 msgstr "Sincronizando pasta"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:316
+#: shell/e-shell-offline-sync.c:311
 #, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Sincronizando \"%s\" (%d of %d) ..."
 
-#: shell/e-shell-settings-dialog.c:333
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr "Configurações do Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+msgid "Please select a user."
+msgstr "Por favor selecione um usuário."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 msgid "Opening Folder"
 msgstr "Abrindo pasta"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:363
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Abrindo pasta \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:368
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, c-format
 msgid "in \"%s\" ..."
 msgstr "em \"%s\" ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:450
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Não foi possível abrir pasta compartilhada: %s."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:503
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 msgid "Cannot find the specified shared folder."
 msgstr "Não é possível localizar a pasta compartilhada especificada."
 
-#: shell/e-shell-startup-wizard.c:156
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Não foi possível iniciar a interface do Assistente de correio do Evolution\n"
-"(%s)"
-
-#: shell/e-shell-startup-wizard.c:167
-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:581
-#: shell/e-shell-user-creatable-items-handler.c:635
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "Novo"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Não foi especificado um nome de pasta."
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "O nome da pasta não pode conter o caractere Return."
 
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
-msgstr "O nome da pasta não pode conter barras."
+#: shell/e-shell-utils.c:129
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "O nome da pasta não pode conter o caractere \"/\"."
+
+#: shell/e-shell-utils.c:135
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "O nome da pasta não pode conter o caractere \"#\"."
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' são nomes de pastas reservados."
 
-#: shell/e-shell-view-menu.c:91
+#: shell/e-shell-view-menu.c:89
 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."
 
-#: shell/e-shell-view-menu.c:99
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar %s."
 
 #: shell/e-shell-view-menu.c:193
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy não foi encontrado em seu $PATH."
+msgid "Bug buddy is not installed."
+msgstr "Bug buddy não está instalado."
 
 #: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
@@ -25401,50 +25575,50 @@ msgstr "Criar novo atalho"
 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:776
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "_Trabalhar conectado"
 
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr "_Trabalhar desconectado"
 
-#: shell/e-shell-view-menu.c:802 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr "Trabalhar desconectado"
 
-#: shell/e-shell-view.c:236
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta exibida)"
 
-#: shell/e-shell-view.c:2001
+#: shell/e-shell-view.c:2054
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:2003
+#: shell/e-shell-view.c:2056
 msgid "(None)"
 msgstr "(Nenhum)"
 
-#: shell/e-shell-view.c:2050
+#: shell/e-shell-view.c:2100
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "O Ximian Evolution está atualmente conectado. Clique neste botão para "
 "trabalhar desconectado."
 
-#: shell/e-shell-view.c:2057
+#: shell/e-shell-view.c:2107
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "O Ximian Evolution está em preocesso de se desconectar."
 
-#: shell/e-shell-view.c:2063
+#: shell/e-shell-view.c:2113
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "O Ximian Evolution está atualmente desconectado. Clique neste botão para "
 "trabalhar conectado."
 
-#: shell/e-shell.c:174
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25455,12 +25629,12 @@ msgstr ""
 "O erro do sistema de ativação é:\n"
 "%s"
 
-#: shell/e-shell.c:754
+#: shell/e-shell.c:738
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Não é possível preparar repositório local -- %s"
 
-#: shell/e-shell.c:1820
+#: shell/e-shell.c:1804
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25471,19 +25645,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:2085
+#: shell/e-shell.c:2069
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:2087
+#: shell/e-shell.c:2071
 msgid "Cannot register on OAF"
 msgstr "Não é possível registrar no OAF"
 
-#: shell/e-shell.c:2089
+#: shell/e-shell.c:2073
 msgid "Configuration Database not found"
 msgstr "Não foi localizado o banco de dados de configuração"
 
-#: shell/e-shell.c:2091 shell/e-storage.c:572
+#: shell/e-shell.c:2075 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -25495,124 +25669,116 @@ msgstr "Criar um novo grupo de atalhos"
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:177
+#: shell/e-shortcuts-view.c:179
 #, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Você deseja realmente excluir o grupo\n"
-"`%s' da barra de atalhos?"
-
-#: shell/e-shortcuts-view.c:182
-msgid "Don't remove"
-msgstr "Não remover"
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+msgstr "Você deseja realmente excluir o grupo \"%s\" da barra de atalhos?"
 
-#: shell/e-shortcuts-view.c:212
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Renomear grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:213
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Renomear grupo de atalhos selecionado para:"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "Ícones _pequenos"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Exibe os atalhos como ícones pequenos"
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "Ícones _grandes"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Exibe os atalhos como ícones grandes"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Novo group..."
 
-#: shell/e-shortcuts-view.c:261
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Criar um novo grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "_Remover este grupo..."
 
-#: shell/e-shortcuts-view.c:264
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "Re_nomear este grupo..."
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Renomear este grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "Es_conder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:273
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Esconder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:278
+#: shell/e-shortcuts-view.c:281
 msgid "Create _Default Shortcuts"
 msgstr "Criar atalhos _padrão"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:282
 msgid "Create Default Shortcuts"
 msgstr "Criar atalhos padrão"
 
-#: shell/e-shortcuts-view.c:398
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Renomear atalho"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Renomear atalho selecionado para:"
 
-#: shell/e-shortcuts-view.c:412
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir a pasta vinculada a este atalho"
 
-#: shell/e-shortcuts-view.c:414 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Abrir em nova _janela"
 
-#: shell/e-shortcuts-view.c:414
+#: shell/e-shortcuts-view.c:417
 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:417
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: shell/e-shortcuts-view.c:417
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Renomear este atalho"
 
-#: shell/e-shortcuts-view.c:419
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "Re_mover"
 
-#: shell/e-shortcuts-view.c:419
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remove este atalho da barra de atalhos"
 
-#: shell/e-shortcuts.c:643
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Erro ao salvar atalhos."
 
-#: shell/e-shortcuts.c:1100
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Atalhos"
 
@@ -25687,11 +25853,11 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% cumprida)"
 
-#: shell/evolution-folder-selector-button.c:102
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para selecionar uma pasta>"
 
-#: shell/evolution-shell-component-utils.c:123
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -25702,7 +25868,7 @@ msgstr ""
 "\n"
 "Erro desconhecido."
 
-#: shell/evolution-shell-component-utils.c:126
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -25715,7 +25881,7 @@ msgstr ""
 "O erro do sistema de componentes é:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:133
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -25728,91 +25894,86 @@ msgstr ""
 "O erro do sistema de ativação é:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1167
 msgid "CORBA error"
 msgstr "Erro CORBA"
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1169
 msgid "Interrupted"
 msgstr "Interrompido"
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1171
 msgid "Invalid argument"
 msgstr "Argumento inválido"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1173
 msgid "Already has an owner"
 msgstr "Já possui um dono"
 
-#: shell/evolution-shell-component.c:1165
+#: shell/evolution-shell-component.c:1175
 msgid "No owner"
 msgstr "Sem dono"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1177
 msgid "Not found"
 msgstr "Não encontrado"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1179
 msgid "Unsupported type"
 msgstr "Tipo não suportado"
 
-#: shell/evolution-shell-component.c:1171
+#: shell/evolution-shell-component.c:1181
 msgid "Unsupported schema"
 msgstr "Schema não suportado"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1183
 msgid "Unsupported operation"
 msgstr "Operação não suportada"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1185
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: shell/evolution-shell-component.c:1179
+#: shell/evolution-shell-component.c:1189
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1181
+#: shell/evolution-shell-component.c:1191
 msgid "Invalid URI"
 msgstr "URI inválida"
 
-#: shell/evolution-shell-component.c:1185
+#: shell/evolution-shell-component.c:1195
 msgid "Has subfolders"
 msgstr "Possui sub-pastas"
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component.c:1197
 msgid "No space left"
 msgstr "Sem espaço remanescente"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1199
 msgid "Old owner has died"
 msgstr "O dono anterior morreu"
 
-#: shell/evolution-test-component.c:62
+#: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Tipo teste"
 
 #: shell/evolution-test-component.c:703
-#, fuzzy
 msgid "Evolution Test Component"
-msgstr "Redator de correio do Evolution."
+msgstr "Componente de teste do Evolution"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Conexões ativas"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
 msgstr "Clique em OK para fechar estas conexões e desconectar"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Máquina"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr "As seguintes conexões estão ativas atualmente:"
 
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr "dialog1"
+
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
 msgstr "_Agenda:"
@@ -25857,29 +26018,29 @@ msgstr "_Nome da pasta:"
 msgid "_User:"
 msgstr "_Usuário:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Assistente de configuração do Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importando arquivos"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Fuso horário "
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Bem-vindo"
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 "Bem-vindo ao Evolution. As próximas telas permitirão\n"
 "ao Evolution conectar às suas contas de correio e importar\n"
@@ -25887,17 +26048,17 @@ msgstr ""
 "\n"
 "Por favor clique o botão \"Próximo\" para continuar. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 "Você entrou com sucesso toda a informação necessária\n"
 "para configurar o Evolution. \n"
 "\n"
-"Clique no botão \"Concluir\" para salvar as suas configurações. "
+"Clique no botão \"Aplicar\" para salvar as suas configurações. "
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -25950,25 +26111,26 @@ 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:102 shell/main.c:468
+#: shell/main.c:110 shell/main.c:556
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:108
+#: shell/main.c:116
 msgid "Evolution is now exiting ..."
 msgstr "O Evolution está saindo agora ..."
 
-#: shell/main.c:207
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:264
 #, 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"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not 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.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -25977,49 +26139,64 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
+"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 is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"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"
 
-#: shell/main.c:228
-#, fuzzy
+#: shell/main.c:288
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
-msgstr "Ximian Evolution"
+msgstr ""
+"Obrigado\n"
+"O time do Ximian Evolution\n"
 
-#: shell/main.c:236
-#, fuzzy
+#: shell/main.c:296
 msgid "Don't tell me again"
-msgstr "Não pergunte-me novamente"
+msgstr "Não me diga novamente"
 
-#: shell/main.c:359
+#: shell/main.c:385
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Não é possível acessar a shell do Ximian Evolution."
 
-#: shell/main.c:368
+#: shell/main.c:394
 #, 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:448
+#: shell/main.c:526
 msgid "Disable splash screen"
 msgstr "Desativar tela de abertura"
 
-#: shell/main.c:450
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Iniciar no modo desconectado"
 
-#: shell/main.c:452
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Iniciar no modo conectado"
 
-#: shell/main.c:454
+#: shell/main.c:532
 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:456
+#: shell/main.c:535
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Forçar a atualização dos arquivos de configuração do Evolution 1.0.x"
 
-#: shell/main.c:472
+#: shell/main.c:560
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26028,25 +26205,49 @@ msgstr ""
 "%s: --online e --offline não podem ser usados juntos.\n"
 "  Use %s --help para mais informações.\n"
 
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-abuse.c:81
+#: tools/evolution-addressbook-export.c:41
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Erro ao carregar catálogo de endereços padrão."
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Arquivo de entrada"
 
-#: tools/evolution-addressbook-export.c:46
+#: tools/evolution-addressbook-export.c:51
 msgid "Output File"
 msgstr "Arquivo de saída"
 
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Não foi fornecido um nome de arquivo."
 
+#: tools/evolution-launch-composer.c:324
+msgid "An attachment to add."
+msgstr "Um anexo a adicionar."
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr "\"Content type\" do anexo."
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr "O nome de arquivo a exibir na mensagem."
+
+#: tools/evolution-launch-composer.c:327
+msgid "Description of the attachment."
+msgstr "Descrição do anexo."
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr "Marcar anexo para exibição embutida por padrão."
+
+#: tools/evolution-launch-composer.c:329
+msgid "Default subject for the message."
+msgstr "Assunto padrão para a mensagem."
+
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Copiar contato(s) para outra pasta..."
@@ -26135,7 +26336,7 @@ msgstr "Ver o contato atual"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr "_Ações"
 
@@ -26253,7 +26454,7 @@ msgid "Print this item"
 msgstr "Imprime este item"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:152
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Salvar"
 
@@ -26280,7 +26481,7 @@ msgstr "Salvar este item para disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Arquivo"
 
@@ -26532,7 +26733,7 @@ msgstr "Lista de mensagens encadeadas"
 msgid "_Expunge"
 msgstr "E_xcluir permanentemente"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Pasta"
 
@@ -26781,8 +26982,7 @@ msgid "Post a Reply"
 msgstr "Publicar uma resposta"
 
 #: ui/evolution-mail-message.xml.h:63
-#, fuzzy
-msgid "Post a reply to a message message in a Public folder"
+msgid "Post a reply to a message in a Public folder"
 msgstr "Publicar uma resposta a uma mensagem em uma pasta pública"
 
 #: ui/evolution-mail-message.xml.h:64
@@ -26937,7 +27137,7 @@ msgstr "_Citado"
 msgid "_Resend..."
 msgstr "Reen_viar..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Ferramentas"
 
@@ -26952,12 +27152,12 @@ msgstr "Fechar esta janela"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Close"
 msgstr "_Fechar"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "_Ver"
 
@@ -27136,7 +27336,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Salvar o arquivo atual e fechar esta janela"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "Aj_uda"
 
@@ -27313,122 +27513,114 @@ msgid "Pi_lot Settings..."
 msgstr "Configurações do _pilot..."
 
 #: ui/evolution.xml.h:27
-msgid "Pilot Con_duit Settings..."
-msgstr "Configurações dos _canais do pilot..."
-
-#: ui/evolution.xml.h:28
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Remover uma pasta adicionada com \"Abrir uma pasta de outro usuário\""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Enviar / receber"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Send queued items and retrieve new items"
-msgstr "Enviar ítens na fila de saída e recuperar novos ítens"
-
-#: ui/evolution.xml.h:31
-msgid "Set up Pilot conduit configuration"
-msgstr "Configurar os canais do pilot"
+msgstr "Enviar itens na fila de saída e recuperar novos itens"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Set up Pilot configuration"
 msgstr "Configurar o pilot"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Exibir informação sobre o Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Enviar relatório de erro"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Enviar relatório de _erro"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar relatório de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Alternar"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Alternar a exibição da barra de pastas"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Alternar a exibição da barra de atalhos"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Alternar se estamos trabalhando desconectados."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Ver a pasta selecionada"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ do Ximian Evolution"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "_Sobre o Ximian Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Barra de pastas"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Folder..."
 msgstr "_Pasta..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_Ir para pasta..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "_Nova pasta"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 msgid "_Remove Other User's Folder"
 msgstr "_Remover uma pasta de outro usuário"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Enviar / receber"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "_Barra de atalhos"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr "_Atalho..."
 
@@ -27504,9 +27696,8 @@ msgstr "Com _categoria"
 msgid "_Tasks"
 msgstr "_Tarefas"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:201
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:688
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr "UTC"
 
@@ -27532,43 +27723,43 @@ msgstr ""
 "um fuso horário.\n"
 "Use o botão direito do mouse para distanciar o mapa."
 
-#: widgets/menus/gal-view-menus.c:287
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "_Visão atual"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:349
+#: widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Visão personalizada"
 
-#: widgets/menus/gal-view-menus.c:358
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr "Salvar visão personalizada"
 
-#: widgets/menus/gal-view-menus.c:371
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Definir visões"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:423
+#: widgets/misc/e-calendar-item.c:434
 msgid "MTWTFSS"
 msgstr "STQQSSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1069
+#: widgets/misc/e-calendar-item.c:1107
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "Agora"
 
-#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "Hoje"
 
-#: widgets/misc/e-cell-date-edit.c:802
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A hora deve estar no formato: %s"
@@ -27577,92 +27768,93 @@ msgstr "A hora deve estar no formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "O valor percentual deve estar entre 0 e 100, inclusive"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Báltico"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Centro europeu"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Chinês"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Grego"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Japonês"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Coreano"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Turco"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "Oeste europeu"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr "Simplificado"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 msgid "Visual"
 msgstr "Visual"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Conjunto de caracteres desconhecido: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Entre o conjunto de caracteres a ser usado"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Outro..."
 
-#: widgets/misc/e-charset-picker.c:401
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Codificação de caracteres"
 
-#: widgets/misc/e-clipped-label.c:110
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:187
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Editor de buscas"
 
-#: widgets/misc/e-filter-bar.c:209
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Salvar busca"
 
@@ -27694,318 +27886,49 @@ msgstr "Pergunta"
 msgid "Message"
 msgstr "Mensagem"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Buscar"
+
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr "_Localizar agora"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: widgets/misc/e-search-bar.c:819
+#: widgets/misc/e-search-bar.c:839
 msgid "Item ID"
-msgstr ""
+msgstr "ID do item"
 
-#: widgets/misc/e-search-bar.c:826
+#: widgets/misc/e-search-bar.c:846
 msgid "Subitem ID"
-msgstr ""
+msgstr "ID do subitem"
 
-#: widgets/misc/e-search-bar.c:833
-#, fuzzy
+#: widgets/misc/e-search-bar.c:853
 msgid "Text"
-msgstr "Teste"
+msgstr "Texto"
 
-#: widgets/misc/e-search-bar.c:911
+#: widgets/misc/e-search-bar.c:931
 msgid "Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:913
+#: widgets/misc/e-search-bar.c:933
 msgid "Find Now"
 msgstr "Localizar agora"
 
-#~ msgid "Factory to import LDIF files into Evolution."
-#~ msgstr "Fábrica para importar arquivos LDIF no Evolution."
-
-#~ msgid "Imports LDIF files into Evolution."
-#~ msgstr "Importa arquivos LDIF no Evolution."
-
-#~ msgid "Factory to import VCard files into Evolution."
-#~ msgstr "Fábrica para importar arquivos VCard no Evolution."
-
-#~ msgid "Imports VCard files into Evolution."
-#~ msgstr "Importa arquivos VCard no Evolution."
-
-#~ msgid "A Bonobo control for an address popup."
-#~ msgstr "Um controle Bonobo para um popup de endereços."
-
-#~ msgid "A Bonobo control for displaying an address."
-#~ msgstr "Um controle Bonobo para exibir um endereço."
-
-#~ msgid "A sample Bonobo control which displays an addressbook."
-#~ msgstr "Um controle Bonobo exemplo que exibe um catálogo de endereços."
-
-#~ msgid "Configuration control for the Evolution Addressbook Storages."
-#~ msgstr ""
-#~ "Controle de configuração para os Repositórios de Catálogo de endereços do "
-#~ "Evolution."
-
-#~ msgid "Configure access to LDAP directory servers here"
-#~ msgstr "Configure o acesso a servidores de diretório LDAP aqui"
-
-#~ msgid "Control that displays an Evolution addressbook minicard."
-#~ msgstr ""
-#~ "Controle que exibe um mini-cartão do catálogo de endereços do Evolution."
-
-#~ msgid "Directory Servers"
-#~ msgstr "Servidores de diretório"
-
-#~ msgid "Evolution Addressbook minicard viewer"
-#~ msgstr "Visualizador de mini-cartão do catálogo de endereços do Evolution"
-
-#~ msgid "Evolution component for handling contacts."
-#~ msgstr "Componente do Evolution para manipular contatos."
-
-#~ msgid "Factory for the Addressbook Minicard control"
-#~ msgstr "Fábrica para o controle Mini-cartão do Catálogo de Endereços"
-
-#~ msgid "Factory for the Addressbook's address displayer"
-#~ msgstr "Fábrica para o exibidor de endereços do Catálogo de Endereços"
-
-#~ msgid "Factory for the Addressbook's address popup"
-#~ msgstr "Fábrica para o popup de endereços do Catálogo de Endereços"
-
-#~ msgid ""
-#~ "Factory for the configuration controls for the Evolution Addressbook."
-#~ msgstr ""
-#~ "Fábrica para os controles de configuração para o Catálogo de Endereços do "
-#~ "Evolution."
-
-#~ msgid "Factory for the sample Addressbook control"
-#~ msgstr "Fábrica para o controle do Catálogo de Endereços exemplo"
-
-#~ msgid "Evolution's addressbook name selection interface."
-#~ 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"
-
-#~ msgid "Delete Contact?"
-#~ msgstr "Excluir contato?"
-
-#~ msgid "Confirm Overwrite"
-#~ msgstr "Confirmar sobrescrever"
-
-#~ msgid "Don't bother translating this string.  It's not used."
-#~ msgstr "Don't bother translating this string.  It's not used."
-
-#~ msgid "Display Cards?"
-#~ msgstr "Exibir cartões?"
-
-#~ msgid "Display Cards"
-#~ msgstr "Exibir cartões"
-
-#~ msgid "A Bonobo control which displays a task list."
-#~ msgstr "Um controle Bonobo que exibe uma lista de tarefas."
-
-#~ msgid "A sample Bonobo control which displays an calendar."
-#~ msgstr "Um controle Bonobo exemplo que exibe uma agenda."
-
-#~ msgid "Calendar and Tasks"
-#~ msgstr "Agenda e tarefas"
-
-#~ msgid "Configuration control for the Evolution Calendar."
-#~ msgstr "Controle de configuração para a agenda do Evolution."
-
-#~ msgid "Configure your timezone, Calendar and Task List here "
-#~ msgstr "Configure o seu fuso horário, agenda e lista de tarefas aqui "
-
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Visualizador iTip/iMip da agenda do Evolution"
-
-#~ msgid "Evolution component for handling the calendar."
-#~ msgstr "Componente do Evolution para manipular a agenda."
-
-#~ msgid "Factory for the Evolution Tasks control"
-#~ msgstr "Fábrica para o controle de tarefas do Evolution."
-
-#~ msgid "Factory for the calendar iTip view control"
-#~ msgstr "Fábrica para o controle de visualização iTip da agenda"
-
-#~ msgid "Factory for the sample Calendar control"
-#~ msgstr "Fábrica para o controle de agenda exemplo."
-
-#~ msgid "Factory to centralize calendar component editor dialogs"
-#~ msgstr ""
-#~ "Fábrica para centralizar os diálogos do editor do componente de agenda"
-
-#~ msgid "Factory to create a component editor factory"
-#~ msgstr "Fábrica para criar uma fábrica de editores de componentes"
-
-#~ msgid "Alarm notification service"
-#~ 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"
-
-#~ msgid "Validation error: %s"
-#~ msgstr "Erro de validação: %s"
-
-#~ msgid "Start date is wrong"
-#~ msgstr "A data de início está errada"
-
-#~ msgid "End date is wrong"
-#~ msgstr "A data de término está errada"
-
-#~ msgid "Start time is wrong"
-#~ msgstr "A hora de início está errada"
-
-#~ msgid "End time is wrong"
-#~ msgstr "A hora de término está errada"
-
-#~ msgid "Completed date is wrong"
-#~ msgstr "A data de conclusão está errada"
-
-#~ msgid "Due date is wrong"
-#~ msgstr "O prazo de conclusão está errado"
-
-#~ msgid "Print Calendar"
-#~ msgstr "Imprimir agenda"
-
-#~ msgid "Factory to import iCalendar files into Evolution"
-#~ msgstr "Fábrica para importar arquivos iCalendar no Evolution"
-
-#~ msgid "Imports iCalendar files into Evolution"
-#~ msgstr "Importa arquivos iCalendar no Evolution"
-
-#~ msgid "Imports vCalendar files into Evolution"
-#~ msgstr "Importa arquivos vCalendar no Evolution"
-
-#~ msgid "Warning!"
-#~ msgstr "Alerta!"
-
-#~ msgid ""
-#~ "ping_timeout_callback: could not determine if the CORBA object is nil or "
-#~ "not"
-#~ msgstr ""
-#~ "ping_timeout_callback: não foi possível determinar se objeto CORBA é nil "
-#~ "ou não"
-
-#~ msgid "Add action"
-#~ msgstr "Adicionar ação"
-
-#~ msgid "Add criterion"
-#~ msgstr "Adicionar critério"
-
-#~ msgid "Warning: Unsent Messages"
-#~ msgstr "Alerta: Mensagens não enviadas"
-
-#~ msgid "US-Letter"
-#~ msgstr "Carta-US"
-
-#~ msgid "Add Signature"
-#~ msgstr "Adicionar assinatura"
-
-#~ msgid "Execute Command..."
-#~ msgstr "Executar comando..."
-
-#~ msgid "Mailbox location"
-#~ msgstr "Localização da caixa de correio"
-
-#~ msgid "Executive summary component could not initialize Bonobo.\n"
-#~ msgstr ""
-#~ "O componente Resumo executivo do Evolution não pôde iniciar o Bonobo.\n"
-
-#~ msgid "New..."
-#~ msgstr "Novo..."
-
-#~ msgid "Cannot initialize the Bonobo component system."
-#~ msgstr "Não é possível iniciar o sistema de componentes Bonobo."
-
-#~ msgid "_Print Contacts..."
-#~ msgstr "_Imprimir contatos..."
-
-#~ msgid "As _Table"
-#~ msgstr "Como _tabela"
-
-#~ msgid "_New Contact"
-#~ msgstr "_Novo contato"
-
-#~ msgid "_Search for contacts"
-#~ msgstr "_Buscar contatos"
-
-#~ msgid "Find a contact"
-#~ msgstr "Localizar um contato"
-
-#~ msgid "Print contacts"
-#~ msgstr "Imprimir contatos"
-
-#~ msgid "Delete a contact"
-#~ msgstr "Excluir um contato"
-
-#~ msgid "View All"
-#~ msgstr "Ver todos"
-
-#~ msgid "View all contacts"
-#~ msgstr "Ver todos os contatos"
-
-#~ msgid "Insert text file..."
-#~ msgstr "Inserir arquivo texto..."
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Inserir um arquivo como texto na mensagem"
-
-#~ msgid "Send the message now"
-#~ msgstr "Enviar a mensagem agora"
-
-#~ msgid "Send _later"
-#~ msgstr "Enviar mais _tarde"
-
-#~ msgid "Send the message later"
-#~ msgstr "Enviar a mensagem mais tarde"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Salvar na _pasta... (FIXME)"
-
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "_Inserir arquivo texto... (FIXME)"
-
-#~ msgid "Send _Later"
-#~ msgstr "Enviar mais _tarde"
-
-#~ msgid "F_ormat"
-#~ msgstr "_Formato"
-
-#~ msgid "_About..."
-#~ msgstr "_Sobre..."
-
-#~ msgid "_Debug"
-#~ msgstr "_Depurar"
-
-#~ msgid "Send this message now"
-#~ msgstr "Enviar esta mensagem agora"
-
-#~ msgid "Bold"
-#~ msgstr "Negrito"
-
-#~ msgid "Sets something as bold"
-#~ msgstr "Configura algo como negrito"
-
-#~ msgid "The Personal Addressbook Server"
-#~ msgstr "O servidor pessoal de catálogo de endereços"
-
-#~ msgid "The Personal Calendar Server; calendar factory"
-#~ msgstr "O servidor pessoal de agenda; fábrica de agenda"
-
-#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
-#~ msgstr "setup_vfs(): não foi possível iniciar GNOME-VFS"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+msgid "The Personal Addressbook Server"
+msgstr "O servidor pessoal de catálogo de endereços"
 
-#~ msgid "init_corba(): could not initialize GNOME"
-#~ msgstr "init_corba(): não foi possível iniciar GNOME"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr "O servidor pessoal de agenda; fábrica de agenda"
 
-#~ msgid "init_bonobo(): could not initialize Bonobo"
-#~ msgstr "init_bonobo(): não foi possível iniciar Bonobo"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:3
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:3
+msgid "Wombat InterfaceCheck interface"
+msgstr "Inteface Wombat InterfaceCheck"
author	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>	2003-03-30 01:44:26 +0800
committer	Gustavo M. D. Vieira <gdvieira@src.gnome.org>	2003-03-30 01:44:26 +0800
commit	e72c115df8321539521d1e1e793e27082c4d94b1 (patch)
tree	4d51c607a5689fa5917c67665a75db901cd718dd /po
parent	b8fb6512c8f582e56869a152ae4bbb334eea66d0 (diff)
download	gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.tar gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.tar.gz gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.tar.bz2 gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.tar.lz gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.tar.xz gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.tar.zst gsoc2013-evolution-e72c115df8321539521d1e1e793e27082c4d94b1.zip