[balsa/wip/gmime3: 5/197] Revert 73b768c7094105e57bfcffc8b1b4dbe7cc0b11f2



commit 7f799a46ffa6d6259acc8102717a5e9da6ed9574
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Mon Jun 26 15:31:48 2017 -0400

    Revert 73b768c7094105e57bfcffc8b1b4dbe7cc0b11f2

 po/TRANSLATORS |    2 +-
 po/pl.po       |  602 ++++++++++++-------------
 po/pt_BR.po    | 1362 +++++++++++++++++++++++++++-----------------------------
 3 files changed, 950 insertions(+), 1016 deletions(-)
---
diff --git a/po/TRANSLATORS b/po/TRANSLATORS
index 43d5196..5922556 100644
--- a/po/TRANSLATORS
+++ b/po/TRANSLATORS
@@ -21,7 +21,7 @@ lt: Gediminas Paulauskas <menesis delfi lt>
 nl: Vincent van Adrighem <V vanAdrighem dirck mine nu>
 nn: Roy-Magne Mo <rmo sunnmore net>
 no: Kjartan Maraas <kmaraas gnome org>
-pl: Piotr Drąg <piotrdrag gmail com>, Aviary.pl <community-poland mozilla org>
+pl: GNOME PL Team <translators gnome pl>
 pt_BR: Ariel Bressan da Silva <ariel conectiva com br>
 pt: Carlos Morgado <chbm chbm nu>
 ro: Miºu Moldovan <dumol go ro> 
diff --git a/po/pl.po b/po/pl.po
index aa44390..046de21 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: balsa\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
 "product=balsa&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-06-25 19:42+0200\n"
-"PO-Revision-Date: 2017-06-25 19:44+0200\n"
+"POT-Creation-Date: 2017-06-18 21:07+0200\n"
+"PO-Revision-Date: 2017-06-18 21:08+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag gmail com>\n"
 "Language-Team: Polish <community-poland mozilla org>\n"
 "Language: pl\n"
@@ -70,7 +70,7 @@ msgid "Cannot find address in address book"
 msgstr "Nie można odnaleźć adresu w książce adresowej"
 
 #: ../libbalsa/address-book.c:321 ../src/main-window.c:2921
-#: ../src/main-window.c:4221 ../src/sendmsg-window.c:3821
+#: ../src/main-window.c:4307 ../src/sendmsg-window.c:3821
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
@@ -229,7 +229,7 @@ msgid "From"
 msgstr "Od"
 
 #: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:367
-#: ../src/pref-manager.c:218
+#: ../src/pref-manager.c:215
 msgid "Subject"
 msgstr "Temat"
 
@@ -375,7 +375,7 @@ msgid "_Download images"
 msgstr "_Pobierz obrazy"
 
 #: ../libbalsa/html.c:419 ../libbalsa/html.c:1089 ../libbalsa/identity.c:1702
-#: ../src/ab-window.c:148 ../src/mailbox-node.c:1113 ../src/main-window.c:3906
+#: ../src/ab-window.c:148 ../src/mailbox-node.c:1113 ../src/main-window.c:3992
 #: ../src/toolbar-prefs.c:140
 msgid "_Close"
 msgstr "Za_mknij"
@@ -412,10 +412,10 @@ msgid "Signature in %s is not a UTF-8 text."
 msgstr "Podpis w %s nie jest tekstem zakodowanym w UTF-8."
 
 #: ../libbalsa/identity.c:468 ../libbalsa/libbalsa-gpgme-cb.c:157
-#: ../libbalsa/libbalsa-gpgme-cb.c:369 ../libbalsa/smtp-server.c:472
+#: ../libbalsa/libbalsa-gpgme-cb.c:369 ../libbalsa/smtp-server.c:446
 #: ../src/ab-main.c:858 ../src/ab-window.c:141 ../src/address-book-config.c:237
 #: ../src/address-book-config.c:342 ../src/address-book-config.c:388
-#: ../src/balsa-app.c:89 ../src/balsa-index.c:2654 ../src/balsa-mblist.c:1896
+#: ../src/balsa-app.c:88 ../src/balsa-index.c:2654 ../src/balsa-mblist.c:1896
 #: ../src/balsa-message.c:1766 ../src/balsa-mime-widget-callbacks.c:85
 #: ../src/filter-edit-callbacks.c:1247 ../src/filter-edit-dialog.c:402
 #: ../src/filter-edit-dialog.c:571 ../src/filter-export-dialog.c:79
@@ -423,7 +423,7 @@ msgstr "Podpis w %s nie jest tekstem zakodowanym w UTF-8."
 #: ../src/folder-conf.c:573 ../src/folder-conf.c:806 ../src/mailbox-conf.c:462
 #: ../src/mailbox-conf.c:483 ../src/mailbox-conf.c:499
 #: ../src/mailbox-conf.c:1222 ../src/mailbox-conf.c:1259
-#: ../src/pref-manager.c:3298 ../src/sendmsg-window.c:532
+#: ../src/pref-manager.c:3260 ../src/sendmsg-window.c:532
 #: ../src/sendmsg-window.c:1557 ../src/sendmsg-window.c:2009
 #: ../src/sendmsg-window.c:3335 ../src/sendmsg-window.c:4698
 #: ../src/sendmsg-window.c:4995 ../src/sendmsg-window.c:5152
@@ -432,12 +432,12 @@ msgid "_Cancel"
 msgstr "_Anuluj"
 
 #: ../libbalsa/identity.c:469 ../libbalsa/libbalsa-gpgme-cb.c:156
-#: ../libbalsa/libbalsa-gpgme-cb.c:368 ../libbalsa/smtp-server.c:471
-#: ../src/ab-window.c:140 ../src/balsa-app.c:88 ../src/balsa-message.c:1767
+#: ../libbalsa/libbalsa-gpgme-cb.c:368 ../libbalsa/smtp-server.c:445
+#: ../src/ab-window.c:140 ../src/balsa-app.c:87 ../src/balsa-message.c:1767
 #: ../src/balsa-mime-widget-callbacks.c:86 ../src/filter-edit-callbacks.c:1246
 #: ../src/filter-edit-dialog.c:570 ../src/filter-export-dialog.c:78
-#: ../src/filter-run-dialog.c:315 ../src/main-window.c:4001
-#: ../src/pref-manager.c:3296 ../src/sendmsg-window.c:1556
+#: ../src/filter-run-dialog.c:315 ../src/main-window.c:4087
+#: ../src/pref-manager.c:3258 ../src/sendmsg-window.c:1556
 #: ../src/sendmsg-window.c:2010 ../src/sendmsg-window.c:3334
 #: ../src/sendmsg-window.c:4699 ../src/store-address.c:209
 msgid "_OK"
@@ -447,7 +447,7 @@ msgstr "_OK"
 msgid "Current"
 msgstr "Bieżąca"
 
-#: ../libbalsa/identity.c:731 ../libbalsa/smtp-server.c:179
+#: ../libbalsa/identity.c:731 ../libbalsa/smtp-server.c:177
 msgid "Default"
 msgstr "Domyślna"
 
@@ -636,13 +636,13 @@ msgstr "Błąd podczas wyświetlania pomocy o tożsamościach: %s\n"
 msgid "Manage Identities"
 msgstr "Zarządzanie tożsamościami"
 
-#: ../libbalsa/identity.c:1699 ../libbalsa/smtp-server.c:473
+#: ../libbalsa/identity.c:1699 ../libbalsa/smtp-server.c:447
 #: ../src/address-book-config.c:238 ../src/address-book-config.c:340
 #: ../src/address-book-config.c:386 ../src/filter-edit-callbacks.c:1248
 #: ../src/filter-edit-dialog.c:572 ../src/filter-export-dialog.c:80
 #: ../src/filter-run-dialog.c:317 ../src/folder-conf.c:312
-#: ../src/folder-conf.c:574 ../src/folder-conf.c:807 ../src/main-window.c:3905
-#: ../src/pref-manager.c:3299 ../src/toolbar-prefs.c:141
+#: ../src/folder-conf.c:574 ../src/folder-conf.c:807 ../src/main-window.c:3991
+#: ../src/pref-manager.c:3261 ../src/toolbar-prefs.c:141
 msgid "_Help"
 msgstr "Pomo_c"
 
@@ -726,8 +726,8 @@ msgstr "Przekroczono liczbę połączeń na serwer %s"
 msgid "Invalid date"
 msgstr "Nieprawidłowa data"
 
-#: ../libbalsa/libbalsa.c:386 ../src/pref-manager.c:934
-#: ../src/pref-manager.c:3600
+#: ../libbalsa/libbalsa.c:386 ../src/pref-manager.c:918
+#: ../src/pref-manager.c:3558
 msgid "Unknown"
 msgstr "Nieznane"
 
@@ -1000,10 +1000,6 @@ msgstr ""
 "\n"
 "Klucz: %s"
 
-#: ../libbalsa/libbalsa-progress.c:65 ../src/main-window.c:3272
-msgid "_Hide"
-msgstr "_Ukryj"
-
 #: ../libbalsa/libbalsa-vfs.c:557 ../src/sendmsg-window.c:4493
 #, c-format
 msgid "not a regular file"
@@ -1368,7 +1364,7 @@ msgstr "%lu. wiadomość z %lu (%s z %s)"
 msgid "Error appending message %d from %s to %s: %s"
 msgstr "Błąd podczas dołączania wiadomości %d od %s do %s: %s"
 
-#: ../libbalsa/mailbox_pop3.c:495 ../libbalsa/send.c:787
+#: ../libbalsa/mailbox_pop3.c:495 ../libbalsa/send.c:681
 #, c-format
 msgid "Cannot load certificate file %s: %s"
 msgstr "Nie można wczytać pliku certyfikatu %s: %s"
@@ -1407,8 +1403,7 @@ msgid "POP3 error: %s"
 msgstr "Błąd POP3: %s"
 
 #. done - clean up
-#: ../libbalsa/mailbox_pop3.c:694 ../libbalsa/send.c:1085
-#, c-format
+#: ../libbalsa/mailbox_pop3.c:694
 msgid "Finished"
 msgstr "Ukończono"
 
@@ -1888,38 +1883,32 @@ msgstr "błędnie sformatowany wiersz „%s”, brak „:”"
 msgid "malformed line “%s”, empty name or value"
 msgstr "błędnie sformatowany wiersz „%s”, brak nazwy lub wartości"
 
-#: ../libbalsa/send.c:206
-#, c-format
-msgid "SMTP server %s"
-msgstr "Serwer SMTP %s"
+#: ../libbalsa/send.c:236 ../libbalsa/send.c:243
+msgid "Sending Mail…"
+msgstr "Wysyłanie poczty…"
 
-#: ../libbalsa/send.c:627
-#, c-format
-msgid "Message %u of %u"
-msgstr "%u. wiadomość z %u"
+#: ../libbalsa/send.c:240 ../src/main-window.c:3272
+msgid "_Hide"
+msgstr "_Ukryj"
 
-#: ../libbalsa/send.c:650
+#: ../libbalsa/send.c:617
 #, c-format
 msgid "Cannot reach SMTP server %s (%s), any queued message will remain in %s."
 msgstr ""
 "Nie można połączyć się z serwerem SMTP %s (%s), wszystkie wiadomości "
 "w kolejce pozostaną w %s."
 
-#: ../libbalsa/send.c:840
-msgid "Sending Mail"
-msgstr "Wysyłanie poczty"
-
-#: ../libbalsa/send.c:946
+#: ../libbalsa/send.c:854
 #, c-format
-msgid "Save message in %s…"
-msgstr "Zapisz wiadomość w %s…"
+msgid "Connected to SMTP server %s: %s"
+msgstr "Połączono z serwerem SMTP %s: %s"
 
-#: ../libbalsa/send.c:954
+#: ../libbalsa/send.c:894
 #, c-format
 msgid "Saving sent message to %s failed: %s"
 msgstr "Zapisanie wysłanej wiadomości do %s się nie powiodło: %s"
 
-#: ../libbalsa/send.c:985
+#: ../libbalsa/send.c:931
 #, c-format
 msgid ""
 "Sending message failed: %s\n"
@@ -1928,40 +1917,22 @@ msgstr ""
 "Wysłanie wiadomości się nie powiodło: %s\n"
 "Wiadomość pozostała w skrzynce wychodzącej."
 
-#: ../libbalsa/send.c:1006
-#, c-format
-msgid "Sending queued messages to %s"
-msgstr "Wysyłanie wiadomości z kolejki do %s"
-
-#: ../libbalsa/send.c:1014
-#, c-format
-msgid "Connected to %s"
-msgstr "Połączono z %s"
-
-#: ../libbalsa/send.c:1068
+#: ../libbalsa/send.c:958
 #, c-format
 msgid "Connecting SMTP server %s (%s) failed: %s"
 msgstr "Połączenie z serwerem SMTP %s (%s) się nie powiodło: %s"
 
-#: ../libbalsa/send.c:1091
-#, c-format
-msgid "Transmitted %u message to %s"
-msgid_plural "Transmitted %u messages to %s"
-msgstr[0] "Przesłano %u wiadomość do %s"
-msgstr[1] "Przesłano %u wiadomości do %s"
-msgstr[2] "Przesłano %u wiadomości do %s"
-
-#: ../libbalsa/send.c:1263 ../libbalsa/send.c:1329
+#: ../libbalsa/send.c:1137 ../libbalsa/send.c:1203
 #, c-format
 msgid "Cannot read %s: %s"
 msgstr "Nie można odczytać %s: %s"
 
-#: ../libbalsa/send.c:1266 ../libbalsa/send.c:1332
+#: ../libbalsa/send.c:1140 ../libbalsa/send.c:1206
 #, c-format
 msgid "Cannot read %s"
 msgstr "Nie można odczytać %s"
 
-#: ../libbalsa/send.c:1296
+#: ../libbalsa/send.c:1170
 #, c-format
 msgid ""
 "Cannot determine character set for text file “%s”; sending as MIME type “%s”"
@@ -1969,14 +1940,14 @@ msgstr ""
 "Nie można ustalić zestawu znaków dla pliku tekstowego „%s”, wysyłanie jako "
 "typ MIME „%s”"
 
-#: ../libbalsa/send.c:1731
+#: ../libbalsa/send.c:1605
 msgid "This message will not be encrypted for the BCC: recipient."
 msgid_plural "This message will not be encrypted for the BCC: recipients."
 msgstr[0] "Ta wiadomość nie zostanie zaszyfrowana dla odbiorcy z pola „UDW:”."
 msgstr[1] "Ta wiadomość nie zostanie zaszyfrowana dla odbiorców z pola „UDW:”."
 msgstr[2] "Ta wiadomość nie zostanie zaszyfrowana dla odbiorców z pola „UDW:”."
 
-#: ../libbalsa/send.c:1831
+#: ../libbalsa/send.c:1705
 msgid "This message will not be encrypted for the BCC: recipient(s)."
 msgstr "Ta wiadomość nie zostanie zaszyfrowana dla odbiorców z pola „UDW:”."
 
@@ -1986,105 +1957,105 @@ msgstr "Ta wiadomość nie zostanie zaszyfrowana dla odbiorców z pola „UDW:
 msgid "Logging in to %s using %s"
 msgstr "Logowanie do %s za pomocą %s"
 
-#: ../libbalsa/smtp-server.c:298
+#: ../libbalsa/smtp-server.c:272
 msgid "SMTP over SSL (SMTPS)"
 msgstr "SMTP przez SSL (SMTPS)"
 
-#: ../libbalsa/smtp-server.c:299 ../libinit_balsa/assistant_page_user.c:69
+#: ../libbalsa/smtp-server.c:273 ../libinit_balsa/assistant_page_user.c:69
 #: ../src/mailbox-conf.c:1295
 msgid "TLS required"
 msgstr "Wymaganie TLS"
 
-#: ../libbalsa/smtp-server.c:300 ../libinit_balsa/assistant_page_user.c:70
+#: ../libbalsa/smtp-server.c:274 ../libinit_balsa/assistant_page_user.c:70
 #: ../src/mailbox-conf.c:1296
 msgid "TLS if possible (not recommended)"
 msgstr "TLS, jeśli to możliwe (niezalecane)"
 
-#: ../libbalsa/smtp-server.c:301 ../libinit_balsa/assistant_page_user.c:71
+#: ../libbalsa/smtp-server.c:275 ../libinit_balsa/assistant_page_user.c:71
 #: ../src/mailbox-conf.c:1297
 msgid "None (not recommended)"
 msgstr "Brak (niezalecane)"
 
-#: ../libbalsa/smtp-server.c:332
+#: ../libbalsa/smtp-server.c:306
 #, c-format
 msgid "Error displaying server help: %s\n"
 msgstr "Błąd podczas wyświetlania pomocy serwera: %s\n"
 
-#: ../libbalsa/smtp-server.c:467
+#: ../libbalsa/smtp-server.c:441
 msgid "SMTP Server"
 msgstr "Serwer SMTP"
 
-#: ../libbalsa/smtp-server.c:497 ../src/folder-conf.c:336
+#: ../libbalsa/smtp-server.c:471 ../src/folder-conf.c:336
 #: ../src/mailbox-conf.c:1278 ../src/mailbox-conf.c:1391
 msgid "_Basic"
 msgstr "_Podstawowe"
 
-#: ../libbalsa/smtp-server.c:502
+#: ../libbalsa/smtp-server.c:476
 msgid "_Descriptive Name:"
 msgstr "_Nazwa opisowa:"
 
 #. pop server
 #. imap server
-#: ../libbalsa/smtp-server.c:510 ../src/folder-conf.c:384
+#: ../libbalsa/smtp-server.c:484 ../src/folder-conf.c:384
 #: ../src/mailbox-conf.c:1285 ../src/mailbox-conf.c:1400
 msgid "_Server:"
 msgstr "_Serwer:"
 
 #. security
-#: ../libbalsa/smtp-server.c:518 ../src/mailbox-conf.c:1290
+#: ../libbalsa/smtp-server.c:492 ../src/mailbox-conf.c:1290
 msgid "Se_curity:"
 msgstr "Zabezpie_czanie:"
 
 #. authentication or anonymous access
-#: ../libbalsa/smtp-server.c:522
+#: ../libbalsa/smtp-server.c:496
 msgid "Server requires authentication"
 msgstr "Serwer wymaga uwierzytelnienia"
 
-#: ../libbalsa/smtp-server.c:523
+#: ../libbalsa/smtp-server.c:497
 msgid "_Authentication:"
 msgstr "_Uwierzytelnienie:"
 
-#: ../libbalsa/smtp-server.c:529
+#: ../libbalsa/smtp-server.c:503
 msgid "_User Name:"
 msgstr "Nazwa _użytkownika:"
 
-#: ../libbalsa/smtp-server.c:536
+#: ../libbalsa/smtp-server.c:510
 msgid "_Pass Phrase:"
 msgstr "_Hasło:"
 
-#: ../libbalsa/smtp-server.c:549 ../src/folder-conf.c:374
+#: ../libbalsa/smtp-server.c:523 ../src/folder-conf.c:374
 #: ../src/mailbox-conf.c:1329 ../src/mailbox-conf.c:1456
 msgid "_Advanced"
 msgstr "Z_aawansowane"
 
 #. client certificate and passphrase
 #. client certificate configuration
-#: ../libbalsa/smtp-server.c:552 ../src/mailbox-conf.c:264
+#: ../libbalsa/smtp-server.c:526 ../src/mailbox-conf.c:264
 msgid "Server requires client certificate"
 msgstr "Serwer wymaga certyfikatu klienta"
 
-#: ../libbalsa/smtp-server.c:553
+#: ../libbalsa/smtp-server.c:527
 msgid "_Client Certificate:"
 msgstr "_Certyfikat klienta:"
 
-#: ../libbalsa/smtp-server.c:557 ../src/mailbox-conf.c:267
+#: ../libbalsa/smtp-server.c:531 ../src/mailbox-conf.c:267
 msgid "Choose Client Certificate"
 msgstr "Wybór certyfikatu klienta"
 
-#: ../libbalsa/smtp-server.c:559 ../src/mailbox-conf.c:266
+#: ../libbalsa/smtp-server.c:533 ../src/mailbox-conf.c:266
 msgid "Certificate _File:"
 msgstr "_Plik certyfikatu:"
 
-#: ../libbalsa/smtp-server.c:566 ../src/mailbox-conf.c:272
+#: ../libbalsa/smtp-server.c:540 ../src/mailbox-conf.c:272
 msgid "Certificate _Pass Phrase:"
 msgstr "_Hasło certyfikatu:"
 
 #. split large messages
-#: ../libbalsa/smtp-server.c:575
+#: ../libbalsa/smtp-server.c:549
 msgid "Sp_lit message larger than"
 msgstr "_Dzielenie wiadomości większych niż"
 
-#: ../libbalsa/smtp-server.c:580 ../src/pref-manager.c:2186
+#: ../libbalsa/smtp-server.c:554 ../src/pref-manager.c:2161
 msgid "MB"
 msgstr "MB"
 
@@ -2512,8 +2483,8 @@ msgstr "_Adres"
 
 #: ../src/ab-main.c:848 ../src/address-book-config.c:226
 #: ../src/address-book-config.c:331 ../src/address-book-config.c:375
-#: ../src/filter-edit-dialog.c:498 ../src/main-window.c:3965
-#: ../src/pref-manager.c:3297
+#: ../src/filter-edit-dialog.c:498 ../src/main-window.c:4051
+#: ../src/pref-manager.c:3259
 msgid "_Apply"
 msgstr "_Zastosuj"
 
@@ -2602,8 +2573,8 @@ msgstr "Dodaj książkę adresową %s"
 
 #: ../src/address-book-config.c:230 ../src/address-book-config.c:334
 #: ../src/address-book-config.c:379 ../src/mailbox-conf.c:612
-#: ../src/pref-manager.c:2014 ../src/pref-manager.c:2097
-#: ../src/pref-manager.c:2791
+#: ../src/pref-manager.c:1989 ../src/pref-manager.c:2072
+#: ../src/pref-manager.c:2753
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -2671,7 +2642,7 @@ msgid "GPE Address Book"
 msgstr "Książka adresowa GPE"
 
 #: ../src/address-book-config.c:601 ../src/main-window.c:948
-#: ../src/main-window.c:4078
+#: ../src/main-window.c:4164
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "Błąd podczas wyświetlania pomocy: %s\n"
@@ -2704,19 +2675,19 @@ msgstr "Książka adresowa Rubrica2"
 msgid "Osmo Address Book"
 msgstr "Książka adresowa Osmo"
 
-#: ../src/balsa-app.c:64 ../src/folder-conf.c:281 ../src/mailbox-conf.c:1378
+#: ../src/balsa-app.c:63 ../src/folder-conf.c:281 ../src/mailbox-conf.c:1378
 msgid "_Remember password in Secret Service"
 msgstr "_Pamiętanie hasła w usłudze"
 
-#: ../src/balsa-app.c:67 ../src/folder-conf.c:284 ../src/mailbox-conf.c:1381
+#: ../src/balsa-app.c:66 ../src/folder-conf.c:284 ../src/mailbox-conf.c:1381
 msgid "_Remember password in keyring"
 msgstr "_Pamiętanie hasła w bazie"
 
-#: ../src/balsa-app.c:70 ../src/folder-conf.c:287 ../src/mailbox-conf.c:1384
+#: ../src/balsa-app.c:69 ../src/folder-conf.c:287 ../src/mailbox-conf.c:1384
 msgid "_Remember password"
 msgstr "_Zapamiętanie hasła"
 
-#: ../src/balsa-app.c:76
+#: ../src/balsa-app.c:75
 #, c-format
 msgid ""
 "Opening remote mailbox %s.\n"
@@ -2725,25 +2696,25 @@ msgstr ""
 "Otwieranie zdalnej skrzynki %s.\n"
 "_Hasło dla %s@%s:"
 
-#: ../src/balsa-app.c:81
+#: ../src/balsa-app.c:80
 #, c-format
 msgid "_Password for %s@%s (%s):"
 msgstr "_Hasło dla %s@%s (%s):"
 
-#: ../src/balsa-app.c:84
+#: ../src/balsa-app.c:83
 msgid "Password needed"
 msgstr "Wymagane jest hasło"
 
-#: ../src/balsa-app.c:523
+#: ../src/balsa-app.c:509
 #, c-format
 msgid "Couldn’t open mailbox “%s”"
 msgstr "Nie można otworzyć skrzynki „%s”"
 
-#: ../src/balsa-index.c:384 ../src/pref-manager.c:219
+#: ../src/balsa-index.c:384 ../src/pref-manager.c:216
 msgid "Date"
 msgstr "Data"
 
-#: ../src/balsa-index.c:399 ../src/pref-manager.c:220
+#: ../src/balsa-index.c:399 ../src/pref-manager.c:217
 #: ../src/sendmsg-window.c:2699
 msgid "Size"
 msgstr "Rozmiar"
@@ -2782,8 +2753,8 @@ msgid "_Store Address…"
 msgstr "Zapisz adre_s…"
 
 #: ../src/balsa-index.c:1837 ../src/mailbox-node.c:1105
-#: ../src/mailbox-node.c:1121 ../src/pref-manager.c:2019
-#: ../src/pref-manager.c:2104 ../src/pref-manager.c:2798
+#: ../src/mailbox-node.c:1121 ../src/pref-manager.c:1994
+#: ../src/pref-manager.c:2079 ../src/pref-manager.c:2760
 msgid "_Delete"
 msgstr "_Usuń"
 
@@ -3298,7 +3269,7 @@ msgstr "Temat: %s\n"
 msgid "Se_nd message to obtain this part"
 msgstr "_Wyślij wiadomość, aby uzyskać tę część"
 
-#: ../src/balsa-mime-widget-message.c:323 ../src/balsa-mime-widget-text.c:811
+#: ../src/balsa-mime-widget-message.c:323 ../src/balsa-mime-widget-text.c:808
 #: ../src/sendmsg-window.c:1487
 #, c-format
 msgid "Error showing %s: %s\n"
@@ -3376,7 +3347,7 @@ msgstr "Otwórz odnośnik"
 msgid "Send link…"
 msgstr "Wyślij odnośnik…"
 
-#: ../src/balsa-mime-widget-text.c:548 ../src/balsa-mime-widget-text.c:1089
+#: ../src/balsa-mime-widget-text.c:548 ../src/balsa-mime-widget-text.c:1086
 msgid "Save…"
 msgstr "Zapisz…"
 
@@ -3384,60 +3355,60 @@ msgstr "Zapisz…"
 msgid "Highlight structured phrases"
 msgstr "Wyróżnianie cytowanego tekstu"
 
-#: ../src/balsa-mime-widget-text.c:789
+#: ../src/balsa-mime-widget-text.c:786
 #, c-format
 msgid "Calling URL %s…"
 msgstr "Wywoływanie adresu URL %s…"
 
-#: ../src/balsa-mime-widget-text.c:1056
+#: ../src/balsa-mime-widget-text.c:1053
 msgid "Zoom In"
 msgstr "Powiększ"
 
-#: ../src/balsa-mime-widget-text.c:1061
+#: ../src/balsa-mime-widget-text.c:1058
 msgid "Zoom Out"
 msgstr "Pomniejsz"
 
-#: ../src/balsa-mime-widget-text.c:1066
+#: ../src/balsa-mime-widget-text.c:1063
 msgid "Zoom 100%"
 msgstr "Oryginalny rozmiar"
 
-#: ../src/balsa-mime-widget-text.c:1075
+#: ../src/balsa-mime-widget-text.c:1072
 msgid "Select _All"
 msgstr "Z_aznacz wszystko"
 
-#: ../src/balsa-mime-widget-text.c:1098
+#: ../src/balsa-mime-widget-text.c:1095
 msgid "Print…"
 msgstr "Wydrukuj…"
 
-#: ../src/balsa-mime-widget-text.c:1236
+#: ../src/balsa-mime-widget-text.c:1233
 msgid "S_tore Address"
 msgstr "Zapi_sz adres"
 
-#: ../src/balsa-mime-widget-text.c:1243
+#: ../src/balsa-mime-widget-text.c:1240
 msgid "Full Name:"
 msgstr "Imię i nazwisko:"
 
-#: ../src/balsa-mime-widget-text.c:1244
+#: ../src/balsa-mime-widget-text.c:1241
 msgid "Nick Name:"
 msgstr "Pseudonim:"
 
-#: ../src/balsa-mime-widget-text.c:1245
+#: ../src/balsa-mime-widget-text.c:1242
 msgid "First Name:"
 msgstr "Imię:"
 
-#: ../src/balsa-mime-widget-text.c:1246
+#: ../src/balsa-mime-widget-text.c:1243
 msgid "Last Name:"
 msgstr "Nazwisko:"
 
-#: ../src/balsa-mime-widget-text.c:1247
+#: ../src/balsa-mime-widget-text.c:1244
 msgid "Organization:"
 msgstr "Organizacja:"
 
-#: ../src/balsa-mime-widget-text.c:1249
+#: ../src/balsa-mime-widget-text.c:1246
 msgid "Email Address:"
 msgstr "Adres e-mail:"
 
-#: ../src/balsa-mime-widget-text.c:1277
+#: ../src/balsa-mime-widget-text.c:1274
 #, c-format
 msgid ""
 "The message sent by %s with subject “%s” contains 8-bit characters, but no "
@@ -3647,15 +3618,15 @@ msgstr "_Wszystkie"
 msgid "C_lear"
 msgstr "Wyc_zyść"
 
-#: ../src/filter-edit-callbacks.c:963 ../src/main-window.c:3949
+#: ../src/filter-edit-callbacks.c:963 ../src/main-window.c:4035
 msgid "_Body"
 msgstr "_Treść"
 
-#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:3950
+#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:4036
 msgid "_To:"
 msgstr "_Do:"
 
-#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:3951
+#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:4037
 msgid "_From:"
 msgstr "_Od:"
 
@@ -3663,7 +3634,7 @@ msgstr "_Od:"
 msgid "_Subject"
 msgstr "_Temat"
 
-#: ../src/filter-edit-callbacks.c:967 ../src/main-window.c:3953
+#: ../src/filter-edit-callbacks.c:967 ../src/main-window.c:4039
 msgid "_CC:"
 msgstr "_DW:"
 
@@ -3717,7 +3688,7 @@ msgstr "_Typ wyszukiwania:"
 msgid "Edit condition for filter: "
 msgstr "Modyfikacja warunku filtru: "
 
-#: ../src/filter-edit-callbacks.c:1483 ../src/save-restore.c:1884
+#: ../src/filter-edit-callbacks.c:1483 ../src/save-restore.c:1874
 msgid "Filter with no condition was omitted"
 msgstr "Pominięto filtr bez warunku"
 
@@ -3756,7 +3727,7 @@ msgstr "Należy podać odtwarzany dźwięk"
 msgid "(Example: write December 31, 2000, as %s)"
 msgstr "(Przykład: 31 grudnia 2000 roku należy zapisać jako %s)"
 
-#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:226
+#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:223
 msgid "Simple"
 msgstr "Prosty"
 
@@ -4224,7 +4195,7 @@ msgstr "Potwierdzenie"
 msgid "Information — Balsa"
 msgstr "Informacje — Balsa"
 
-#: ../src/information-dialog.c:235 ../src/main-window.c:3970
+#: ../src/information-dialog.c:235 ../src/main-window.c:4056
 msgid "_Clear"
 msgstr "Wy_czyść"
 
@@ -4248,7 +4219,7 @@ msgid "FATAL: "
 msgstr "KRYTYCZNY BŁĄD: "
 
 #: ../src/mailbox-conf.c:207 ../src/mailbox-conf.c:1536
-#: ../src/pref-manager.c:212 ../src/pref-manager.c:1152
+#: ../src/pref-manager.c:209 ../src/pref-manager.c:1136
 msgid "Never"
 msgstr "Nigdy"
 
@@ -4429,7 +4400,7 @@ msgstr "Ścieżka do _katalogu:"
 msgid "_Identity:"
 msgstr "_Tożsamość:"
 
-#: ../src/mailbox-conf.c:1538 ../src/pref-manager.c:1154
+#: ../src/mailbox-conf.c:1538 ../src/pref-manager.c:1138
 msgid "Always"
 msgstr "Zawsze"
 
@@ -4552,77 +4523,77 @@ msgstr "Wczytano lokalną skrzynkę %s jako: %s\n"
 msgid "Local folder %s\n"
 msgstr "Lokalny katalog %s\n"
 
-#: ../src/main.c:120 ../src/main.c:125 ../src/main.c:131 ../src/main.c:137
-#: ../src/main.c:143
+#: ../src/main.c:124 ../src/main.c:129 ../src/main.c:135 ../src/main.c:141
+#: ../src/main.c:147
 #, c-format
 msgid "Balsa cannot open your “%s” mailbox."
 msgstr "Nie można otworzyć skrzynki „%s”."
 
-#: ../src/main.c:120
+#: ../src/main.c:124
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: ../src/main.c:126
+#: ../src/main.c:130
 msgid "Outbox"
 msgstr "Wychodzące"
 
-#: ../src/main.c:132
+#: ../src/main.c:136
 msgid "Sentbox"
 msgstr "Wysłane"
 
-#: ../src/main.c:138
+#: ../src/main.c:142
 msgid "Draftbox"
 msgstr "Szkice"
 
-#: ../src/main.c:143
+#: ../src/main.c:147
 msgid "Trash"
 msgstr "Kosz"
 
-#: ../src/main.c:384
+#: ../src/main.c:401
 msgid "Compressing mail folders…"
 msgstr "Kompresowanie katalogów poczty…"
 
-#: ../src/main.c:648
+#: ../src/main.c:665
 msgid "Get new mail on start-up"
 msgstr "Pobiera nową pocztę podczas uruchamiania"
 
-#: ../src/main.c:650
+#: ../src/main.c:667
 msgid "Compose a new email to EMAIL@ADDRESS"
 msgstr "Tworzy nową wiadomość do ADRES@E-MAIL"
 
-#: ../src/main.c:652
+#: ../src/main.c:669
 msgid "Attach file at URI"
 msgstr "Załącza plik pod adresem URI"
 
-#: ../src/main.c:655
+#: ../src/main.c:672
 msgid "Opens MAILBOXNAME"
 msgstr "Otwiera NAZWA-SKRZYNKI"
 
-#: ../src/main.c:655
+#: ../src/main.c:672
 msgid "MAILBOXNAME"
 msgstr "NAZWA-SKRZYNKI"
 
-#: ../src/main.c:658
+#: ../src/main.c:675
 msgid "Opens first unread mailbox"
 msgstr "Otwiera pierwszą nieprzeczytaną skrzynkę"
 
-#: ../src/main.c:661
+#: ../src/main.c:678
 msgid "Opens default Inbox on start-up"
 msgstr "Otwiera domyślne Odebrane podczas uruchamiania"
 
-#: ../src/main.c:664
+#: ../src/main.c:681
 msgid "Prints number unread and unsent messages"
 msgstr "Wyświetla liczbę nieprzeczytanych i niewysłanych wiadomości"
 
-#: ../src/main.c:666
+#: ../src/main.c:683
 msgid "Debug IMAP connection"
 msgstr "Debuguje połączenie IMAP"
 
-#: ../src/main.c:667
+#: ../src/main.c:684
 msgid "Show help options"
 msgstr "Wyświetla opcje pomocy"
 
-#: ../src/main.c:668
+#: ../src/main.c:685
 msgid "Show version"
 msgstr "Wyświetla wersję"
 
@@ -4735,7 +4706,12 @@ msgstr "Lokalna skrzynka: %s"
 msgid "Finished Checking."
 msgstr "Ukończono wyszukiwanie."
 
-#: ../src/main-window.c:3637
+#: ../src/main-window.c:3659
+#, c-format
+msgid "Sending error: %s"
+msgstr "Błąd podczas wysyłania: %s"
+
+#: ../src/main-window.c:3723
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -4743,73 +4719,73 @@ msgstr[0] "Odebrano %d nową wiadomość."
 msgstr[1] "Odebrano %d nowe wiadomości."
 msgstr[2] "Odebrano %d nowych wiadomości."
 
-#: ../src/main-window.c:3640
+#: ../src/main-window.c:3726
 msgid "You have new mail."
 msgstr "Nowa poczta."
 
-#: ../src/main-window.c:3708 ../src/main-window.c:3743
+#: ../src/main-window.c:3794 ../src/main-window.c:3829
 msgid "Balsa: New mail"
 msgstr "Balsa: nowa poczta"
 
-#: ../src/main-window.c:3901
+#: ../src/main-window.c:3987
 msgid "Search mailbox"
 msgstr "Przeszukiwanie skrzynki"
 
-#: ../src/main-window.c:3927
+#: ../src/main-window.c:4013
 msgid "_Search for:"
 msgstr "Wy_szukiwanie:"
 
 #. builds the toggle buttons to specify fields concerned by
 #. * the search.
-#: ../src/main-window.c:3940
+#: ../src/main-window.c:4026
 msgid "In:"
 msgstr "W:"
 
-#: ../src/main-window.c:3952
+#: ../src/main-window.c:4038
 msgid "S_ubject"
 msgstr "T_emat"
 
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:3957
+#: ../src/main-window.c:4043
 msgid "Show only matching messages"
 msgstr "Wyświetlenie tylko pasujących wiadomości"
 
 #. Frame with OK button
-#: ../src/main-window.c:3978
+#: ../src/main-window.c:4064
 msgid "Open next matching message"
 msgstr "Otwarcie następnej pasującej wiadomości"
 
-#: ../src/main-window.c:3990
+#: ../src/main-window.c:4076
 msgid "_Reverse search"
 msgstr "_Wyszukiwanie wstecz"
 
-#: ../src/main-window.c:3995
+#: ../src/main-window.c:4081
 msgid "_Wrap around"
 msgstr "_Automatyczny powrót do początku"
 
-#: ../src/main-window.c:4219
+#: ../src/main-window.c:4305
 #, c-format
 msgid "Could not open trash: %s"
 msgstr "Nie można otworzyć Kosza: %s"
 
-#: ../src/main-window.c:4354
+#: ../src/main-window.c:4440
 #, c-format
 msgid "Balsa: %s (read-only)"
 msgstr "Balsa: %s (tylko do odczytu)"
 
-#: ../src/main-window.c:4356
+#: ../src/main-window.c:4442
 #, c-format
 msgid "Balsa: %s"
 msgstr "Balsa: %s"
 
 #. xgettext: this is the first part of the message
 #. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
-#: ../src/main-window.c:4856
+#: ../src/main-window.c:4942
 #, c-format
 msgid "Shown mailbox: %s "
 msgstr "Wyświetlana skrzynka: %s "
 
-#: ../src/main-window.c:4861
+#: ../src/main-window.c:4947
 #, c-format
 msgid "with %d message"
 msgid_plural "with %d messages"
@@ -4817,7 +4793,7 @@ msgstr[0] "z %d wiadomością"
 msgstr[1] "z %d wiadomościami"
 msgstr[2] "z %d wiadomościami"
 
-#: ../src/main-window.c:4868
+#: ../src/main-window.c:4954
 #, c-format
 msgid ", %d new"
 msgid_plural ", %d new"
@@ -4825,7 +4801,7 @@ msgstr[0] ", %d nowa"
 msgstr[1] ", %d nowe"
 msgstr[2] ", %d nowych"
 
-#: ../src/main-window.c:4875
+#: ../src/main-window.c:4961
 #, c-format
 msgid ", %d hidden"
 msgid_plural ", %d hidden"
@@ -4833,12 +4809,12 @@ msgstr[0] ", %d ukryta"
 msgstr[1] ", %d ukryte"
 msgstr[2] ", %d ukrytych"
 
-#: ../src/main-window.c:4920
+#: ../src/main-window.c:5006
 #, c-format
 msgid "The next unread message is in %s"
 msgstr "Następna nieprzeczytana wiadomość jest w %s"
 
-#: ../src/main-window.c:4927
+#: ../src/main-window.c:5013
 #, c-format
 msgid "Do you want to select %s?"
 msgstr "Zaznaczyć %s?"
@@ -4852,190 +4828,190 @@ msgstr "P_rzenieś"
 msgid "Message from %s: %s"
 msgstr "Wiadomość od %s: %s"
 
-#: ../src/pref-manager.c:210
+#: ../src/pref-manager.c:207
 msgid "While retrieving messages"
 msgstr "Podczas pobierania wiadomości"
 
-#: ../src/pref-manager.c:211
+#: ../src/pref-manager.c:208
 msgid "Until closed"
 msgstr "Do zamknięcia"
 
-#: ../src/pref-manager.c:217
+#: ../src/pref-manager.c:214
 msgid "Message number"
 msgstr "Numer wiadomości"
 
-#: ../src/pref-manager.c:221
+#: ../src/pref-manager.c:218
 msgid "Sender"
 msgstr "Nadawca"
 
-#: ../src/pref-manager.c:225
+#: ../src/pref-manager.c:222
 msgid "Flat"
 msgstr "Płaskie"
 
-#: ../src/pref-manager.c:227
+#: ../src/pref-manager.c:224
 msgid "JWZ"
 msgstr "JWZ"
 
-#: ../src/pref-manager.c:937
+#: ../src/pref-manager.c:921
 #, c-format
 msgid "%s (default)"
 msgstr "%s (domyślna)"
 
-#: ../src/pref-manager.c:1054
+#: ../src/pref-manager.c:1038
 msgid "Default layout"
 msgstr "Domyślny układ"
 
-#: ../src/pref-manager.c:1055
+#: ../src/pref-manager.c:1039
 msgid "Wide message layout"
 msgstr "Szeroki układ wiadomości"
 
-#: ../src/pref-manager.c:1056
+#: ../src/pref-manager.c:1040
 msgid "Wide screen layout"
 msgstr "Szeroki układ ekranu"
 
-#: ../src/pref-manager.c:1064
+#: ../src/pref-manager.c:1048
 msgid "Show next unread message"
 msgstr "Wyświetlenie następnej nieprzeczytanej wiadomości"
 
-#: ../src/pref-manager.c:1065
+#: ../src/pref-manager.c:1049
 msgid "Show next message"
 msgstr "Wyświetlenie następnej wiadomości"
 
-#: ../src/pref-manager.c:1066
+#: ../src/pref-manager.c:1050
 msgid "Close message window"
 msgstr "Zamknięcie okna wiadomości"
 
-#: ../src/pref-manager.c:1120
+#: ../src/pref-manager.c:1104
 #, c-format
 msgid "Error displaying %s: %s\n"
 msgstr "Błąd podczas wyświetlania %s: %s\n"
 
-#: ../src/pref-manager.c:1133
+#: ../src/pref-manager.c:1117
 msgid "Show nothing"
 msgstr "Bez wyświetlania"
 
-#: ../src/pref-manager.c:1135
+#: ../src/pref-manager.c:1119
 msgid "Show dialog"
 msgstr "Wyświetlanie w oknie"
 
-#: ../src/pref-manager.c:1137
+#: ../src/pref-manager.c:1121
 msgid "Show in list"
 msgstr "Wyświetlanie na liście"
 
-#: ../src/pref-manager.c:1139
+#: ../src/pref-manager.c:1123
 msgid "Show in status bar"
 msgstr "Wyświetlanie na pasku stanu"
 
-#: ../src/pref-manager.c:1141
+#: ../src/pref-manager.c:1125
 msgid "Print to console"
 msgstr "Wyświetlanie w konsoli"
 
-#: ../src/pref-manager.c:1153
+#: ../src/pref-manager.c:1137
 msgid "Ask me"
 msgstr "Pytanie"
 
-#: ../src/pref-manager.c:1701
+#: ../src/pref-manager.c:1685
 msgid "Remote POP3 mailbox…"
 msgstr "Zdalna skrzynka POP3…"
 
-#: ../src/pref-manager.c:1705
+#: ../src/pref-manager.c:1689
 msgid "Remote IMAP mailbox…"
 msgstr "Zdalna skrzynka IMAP…"
 
-#: ../src/pref-manager.c:1709
+#: ../src/pref-manager.c:1693
 msgid "Remote IMAP folder…"
 msgstr "Zdalny katalog IMAP…"
 
-#: ../src/pref-manager.c:1970
+#: ../src/pref-manager.c:1945
 msgid "Remote mailbox servers"
 msgstr "Zdalne serwery skrzynek"
 
-#: ../src/pref-manager.c:1987 ../src/pref-manager.c:2752
+#: ../src/pref-manager.c:1962 ../src/pref-manager.c:2714
 #: ../src/sendmsg-window.c:2681
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/pref-manager.c:1995
+#: ../src/pref-manager.c:1970
 msgid "Mailbox name"
 msgstr "Nazwa skrzynki"
 
-#: ../src/pref-manager.c:2017 ../src/pref-manager.c:2100
-#: ../src/pref-manager.c:2795
+#: ../src/pref-manager.c:1992 ../src/pref-manager.c:2075
+#: ../src/pref-manager.c:2757
 msgid "_Modify"
 msgstr "_Modyfikuj"
 
-#: ../src/pref-manager.c:2039
+#: ../src/pref-manager.c:2014
 msgid "Local mail directory"
 msgstr "Lokalny katalog poczty"
 
-#: ../src/pref-manager.c:2042
+#: ../src/pref-manager.c:2017
 msgid "Select your local mail directory"
 msgstr "Wybór lokalnego katalogu poczty"
 
-#: ../src/pref-manager.c:2066
+#: ../src/pref-manager.c:2041
 msgid "Outgoing mail servers"
 msgstr "Serwery wysyłające wiadomości"
 
-#: ../src/pref-manager.c:2084
+#: ../src/pref-manager.c:2059
 msgid "Server name"
 msgstr "Nazwa serwera"
 
-#: ../src/pref-manager.c:2128
+#: ../src/pref-manager.c:2103
 msgid "Checking"
 msgstr "Wyszukiwanie"
 
-#: ../src/pref-manager.c:2131
+#: ../src/pref-manager.c:2106
 msgid "_Check mail automatically every"
 msgstr "Automatyczne _wyszukiwanie poczty co"
 
-#: ../src/pref-manager.c:2139 ../src/pref-manager.c:2311
-#: ../src/pref-manager.c:2926 ../src/pref-manager.c:2975
+#: ../src/pref-manager.c:2114 ../src/pref-manager.c:2888
+#: ../src/pref-manager.c:2937
 msgid "minutes"
 msgstr "min"
 
-#: ../src/pref-manager.c:2144
+#: ../src/pref-manager.c:2119
 msgid "Check _IMAP mailboxes"
 msgstr "Wyszukiwanie skrzynek _IMAP"
 
-#: ../src/pref-manager.c:2148
+#: ../src/pref-manager.c:2123
 msgid "Check Inbox _only"
 msgstr "Wyszukiwanie _tylko Odebranych"
 
-#: ../src/pref-manager.c:2153
+#: ../src/pref-manager.c:2128
 msgid "When mail arrives:"
 msgstr "Po nadejściu wiadomości:"
 
-#: ../src/pref-manager.c:2158
+#: ../src/pref-manager.c:2133
 msgid "Display message"
 msgstr "Wyświetlenie komunikatu"
 
-#: ../src/pref-manager.c:2163
+#: ../src/pref-manager.c:2138
 msgid "Play sound"
 msgstr "Odtworzenie dźwięku"
 
-#: ../src/pref-manager.c:2168
+#: ../src/pref-manager.c:2143
 msgid "Show icon"
 msgstr "Wyświetlenie ikony"
 
-#: ../src/pref-manager.c:2175
+#: ../src/pref-manager.c:2150
 msgid "Do background check quietly (no messages in status bar)"
 msgstr "Ciche sprawdzanie w tle (bez komunikatów na pasku stanu)"
 
-#: ../src/pref-manager.c:2178
+#: ../src/pref-manager.c:2153
 msgid "_POP message size limit:"
 msgstr "Ograniczenie rozmiaru wiadomości _POP:"
 
-#: ../src/pref-manager.c:2207
+#: ../src/pref-manager.c:2182
 msgid "Message disposition notification requests"
 msgstr "Żądania powiadomienia o otrzymaniu wiadomości"
 
-#: ../src/pref-manager.c:2212
+#: ../src/pref-manager.c:2187
 msgid ""
 "When I receive a message whose sender requested a Message Disposition "
 "Notification (MDN), send it if:"
 msgstr "Wysyłanie zażądanego powiadomienia o otrzymaniu wiadomości, jeśli:"
 
-#: ../src/pref-manager.c:2220
+#: ../src/pref-manager.c:2195
 msgid ""
 "The message header looks clean (the notify-to address is the return path, "
 "and I am in the “To:” or “CC:” list)."
@@ -5043,282 +5019,278 @@ msgstr ""
 "Nagłówek wiadomości wygląda poprawnie (adres w „notify-to” odpowiada ścieżce "
 "zwrotnej, a adres użytkownika jest na liście „Do:” lub „DW:”)."
 
-#: ../src/pref-manager.c:2234
+#: ../src/pref-manager.c:2209
 msgid "The message header looks suspicious."
 msgstr "Nagłówek wiadomości wygląda podejrzanie."
 
-#: ../src/pref-manager.c:2258
+#: ../src/pref-manager.c:2233
 msgid "Word wrap"
 msgstr "Zawijanie słów"
 
-#: ../src/pref-manager.c:2261
+#: ../src/pref-manager.c:2236
 msgid "Wrap outgoing text at"
 msgstr "Zawijanie wysyłanego tekstu po"
 
-#: ../src/pref-manager.c:2270 ../src/pref-manager.c:2525
+#: ../src/pref-manager.c:2245 ../src/pref-manager.c:2487
 msgid "characters"
 msgstr "znakach"
 
-#: ../src/pref-manager.c:2289
+#: ../src/pref-manager.c:2262
 msgid "Other options"
 msgstr "Inne opcje"
 
-#: ../src/pref-manager.c:2291
+#: ../src/pref-manager.c:2264
 msgid "Reply prefix:"
 msgstr "Przedrostek odpowiedzi:"
 
-#: ../src/pref-manager.c:2294
+#: ../src/pref-manager.c:2267
 msgid "Automatically quote original when replying"
 msgstr "Automatyczne cytowanie oryginału podczas odpowiadania"
 
-#: ../src/pref-manager.c:2297
+#: ../src/pref-manager.c:2270
 msgid "Forward a mail as attachment instead of quoting it"
 msgstr "Przekazywanie wiadomości jako załącznika zamiast cytowania"
 
-#: ../src/pref-manager.c:2300
+#: ../src/pref-manager.c:2273
 msgid "Copy outgoing messages to sentbox"
 msgstr "Kopiowanie wysyłanych wiadomości do Wysłanych"
 
-#: ../src/pref-manager.c:2302
+#: ../src/pref-manager.c:2275
 msgid "Send button always queues outgoing mail in outbox"
 msgstr ""
 "Przycisk wysyłania dodaje pocztę wychodzącą do kolejki w skrzynce wychodzącej"
 
-#: ../src/pref-manager.c:2306
-msgid "_Send queued mail automatically every"
-msgstr "Automatyczne _wysyłanie poczty z kolejki co"
-
-#: ../src/pref-manager.c:2316
+#: ../src/pref-manager.c:2278
 msgid "Edit headers in external editor"
 msgstr "Redagowanie nagłówków w zewnętrznym edytorze"
 
-#: ../src/pref-manager.c:2318
+#: ../src/pref-manager.c:2280
 msgid "Include HTML parts as text when replying or forwarding"
 msgstr ""
 "Załączanie części HTML jako tekst podczas odpowiadania lub przekazywania"
 
-#: ../src/pref-manager.c:2336 ../src/toolbar-prefs.c:170
+#: ../src/pref-manager.c:2298 ../src/toolbar-prefs.c:170
 msgid "Main window"
 msgstr "Główne okno"
 
-#: ../src/pref-manager.c:2339
+#: ../src/pref-manager.c:2301
 msgid "Use preview pane"
 msgstr "Panel podglądu"
 
-#: ../src/pref-manager.c:2343
+#: ../src/pref-manager.c:2305
 msgid "Show message counts in mailbox list"
 msgstr "Liczba wiadomości na liście skrzynek"
 
-#: ../src/pref-manager.c:2349
+#: ../src/pref-manager.c:2311
 msgid "Automatically view message when mailbox opened"
 msgstr "Automatyczne wyświetlenie wiadomości po otwarciu skrzynki"
 
-#: ../src/pref-manager.c:2352
+#: ../src/pref-manager.c:2314
 msgid "Ask me before selecting a different mailbox to show an unread message"
 msgstr ""
 "Pytanie przed wybraniem innej skrzynki do wyświetlenia nieprzeczytanej "
 "wiadomości"
 
-#: ../src/pref-manager.c:2356
+#: ../src/pref-manager.c:2318
 msgid "Page Up/Page Down keys scroll text by"
 msgstr "Klawisze Page Up/Page Down przewijają tekst o"
 
-#: ../src/pref-manager.c:2364
+#: ../src/pref-manager.c:2326
 msgid "percent"
 msgstr "procent"
 
-#: ../src/pref-manager.c:2381 ../src/toolbar-prefs.c:192
+#: ../src/pref-manager.c:2343 ../src/toolbar-prefs.c:192
 msgid "Message window"
 msgstr "Okno wiadomości"
 
-#: ../src/pref-manager.c:2383
+#: ../src/pref-manager.c:2345
 msgid "After moving a message:"
 msgstr "Po przeniesieniu wiadomości:"
 
-#: ../src/pref-manager.c:2404
+#: ../src/pref-manager.c:2366
 msgid "Sorting and threading"
 msgstr "Porządkowanie i wątki"
 
-#: ../src/pref-manager.c:2406
+#: ../src/pref-manager.c:2368
 msgid "Default sort column:"
 msgstr "Domyślna kolumna porządkowania:"
 
-#: ../src/pref-manager.c:2413
+#: ../src/pref-manager.c:2375
 msgid "Default threading style:"
 msgstr "Domyślny styl wątków:"
 
-#: ../src/pref-manager.c:2421
+#: ../src/pref-manager.c:2383
 msgid "Expand threads on open"
 msgstr "Rozwijanie wątków po otwarciu"
 
-#: ../src/pref-manager.c:2446 ../src/print-gtk.c:506
+#: ../src/pref-manager.c:2408 ../src/print-gtk.c:506
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: ../src/pref-manager.c:2449
+#: ../src/pref-manager.c:2411
 msgid "Use system fonts"
 msgstr "Czcionki systemu"
 
-#: ../src/pref-manager.c:2457
+#: ../src/pref-manager.c:2419
 msgid "Use default font size"
 msgstr "Domyślny rozmiar czcionki"
 
-#: ../src/pref-manager.c:2463
+#: ../src/pref-manager.c:2425
 msgid "Message font:"
 msgstr "Czcionka wiadomości:"
 
-#: ../src/pref-manager.c:2470
+#: ../src/pref-manager.c:2432
 msgid "Subject font:"
 msgstr "Czcionka tematu:"
 
 #. Quoted text regular expression
 #. and RFC2646-style flowed text
-#: ../src/pref-manager.c:2510
+#: ../src/pref-manager.c:2472
 msgid "Quoted and flowed text"
 msgstr "Cytowanie i przeformatowywanie tekstu"
 
-#: ../src/pref-manager.c:2513
+#: ../src/pref-manager.c:2475
 msgid "Mark quoted text"
 msgstr "Oznaczanie cytowanego tekstu"
 
-#: ../src/pref-manager.c:2516
+#: ../src/pref-manager.c:2478
 msgid "Quoted text regular expression:"
 msgstr "Wyrażenie regularne cytowanego tekstu:"
 
-#: ../src/pref-manager.c:2519
+#: ../src/pref-manager.c:2481
 msgid "Wrap text at"
 msgstr "Zawijanie tekstu po"
 
 #. handling of multipart/alternative
-#: ../src/pref-manager.c:2542
+#: ../src/pref-manager.c:2504
 msgid "Display of multipart/alternative parts"
 msgstr "Wyświetlanie wiadomości wieloczęściowych"
 
-#: ../src/pref-manager.c:2546
+#: ../src/pref-manager.c:2508
 msgid "Prefer text/plain over HTML"
 msgstr "Preferowanie zwykłego tekstu zamiast HTML"
 
-#: ../src/pref-manager.c:2562
+#: ../src/pref-manager.c:2524
 msgid "Message colors"
 msgstr "Kolory wiadomości"
 
-#: ../src/pref-manager.c:2567
+#: ../src/pref-manager.c:2529
 #, c-format
 msgid "Quote level %d color"
 msgstr "Kolor cytatu %d. poziomu"
 
-#: ../src/pref-manager.c:2585
+#: ../src/pref-manager.c:2547
 msgid "Link color"
 msgstr "Kolor odnośników"
 
-#: ../src/pref-manager.c:2587
+#: ../src/pref-manager.c:2549
 msgid "Hyperlink color"
 msgstr "Kolor odnośników"
 
-#: ../src/pref-manager.c:2602 ../src/pref-manager.c:3217
+#: ../src/pref-manager.c:2564 ../src/pref-manager.c:3179
 msgid "Format"
 msgstr "Format"
 
-#: ../src/pref-manager.c:2605
+#: ../src/pref-manager.c:2567
 msgid "Date encoding (for strftime):"
 msgstr "Kodowanie daty (dla „strftime”):"
 
-#: ../src/pref-manager.c:2607
+#: ../src/pref-manager.c:2569
 msgid "Selected headers:"
 msgstr "Wybrane nagłówki:"
 
 #. treatment of messages with 8-bit chars, but without proper MIME encoding
-#: ../src/pref-manager.c:2625
+#: ../src/pref-manager.c:2587
 msgid "National (8-bit) characters in broken messages without codeset header"
 msgstr ""
 "Znaki narodowe (8-bitowe) w uszkodzonych wiadomościach bez nagłówka zestawu "
 "znaków"
 
-#: ../src/pref-manager.c:2630
+#: ../src/pref-manager.c:2592
 msgid "display as “?”"
 msgstr "wyświetlanie jako „?”"
 
-#: ../src/pref-manager.c:2638
+#: ../src/pref-manager.c:2600
 msgid "display in codeset"
 msgstr "wyświetlanie w zestawie znaków"
 
-#: ../src/pref-manager.c:2663
+#: ../src/pref-manager.c:2625
 msgid "Information messages"
 msgstr "Komunikaty informacji"
 
-#: ../src/pref-manager.c:2667
+#: ../src/pref-manager.c:2629
 msgid "Information messages:"
 msgstr "Komunikaty informacji:"
 
-#: ../src/pref-manager.c:2671
+#: ../src/pref-manager.c:2633
 msgid "Warning messages:"
 msgstr "Komunikaty ostrzeżeń:"
 
-#: ../src/pref-manager.c:2675
+#: ../src/pref-manager.c:2637
 msgid "Error messages:"
 msgstr "Komunikaty o błędach:"
 
-#: ../src/pref-manager.c:2679
+#: ../src/pref-manager.c:2641
 msgid "Fatal error messages:"
 msgstr "Komunikaty o krytycznych błędach:"
 
-#: ../src/pref-manager.c:2683
+#: ../src/pref-manager.c:2645
 msgid "Debug messages:"
 msgstr "Komunikaty debugowania:"
 
-#: ../src/pref-manager.c:2701
+#: ../src/pref-manager.c:2663
 msgid "Display progress dialog"
 msgstr "Okno postępu"
 
-#: ../src/pref-manager.c:2732 ../src/pref-manager.c:3350
+#: ../src/pref-manager.c:2694 ../src/pref-manager.c:3312
 msgid "Address books"
 msgstr "Książki adresowe"
 
-#: ../src/pref-manager.c:2760
+#: ../src/pref-manager.c:2722
 msgid "Address book name"
 msgstr "Nazwa książki adresowej"
 
-#: ../src/pref-manager.c:2768
+#: ../src/pref-manager.c:2730
 msgid "Auto-complete"
 msgstr "Automatyczne uzupełnianie"
 
-#: ../src/pref-manager.c:2801
+#: ../src/pref-manager.c:2763
 msgid "_Set as default"
 msgstr "_Ustaw jako domyślną"
 
-#: ../src/pref-manager.c:2818
+#: ../src/pref-manager.c:2780
 msgid "Miscellaneous spelling settings"
 msgstr "Różne ustawienia sprawdzania pisowni"
 
-#: ../src/pref-manager.c:2822
+#: ../src/pref-manager.c:2784
 msgid "Check signature"
 msgstr "Sprawdzanie podpisu"
 
-#: ../src/pref-manager.c:2824
+#: ../src/pref-manager.c:2786
 msgid "Check quoted"
 msgstr "Sprawdzanie cytowania"
 
-#: ../src/pref-manager.c:2840
+#: ../src/pref-manager.c:2802
 msgid "Start-up options"
 msgstr "Opcje uruchamiania"
 
-#: ../src/pref-manager.c:2843
+#: ../src/pref-manager.c:2805
 msgid "Open Inbox upon start-up"
 msgstr "Otwieranie Odebranych podczas uruchamiania"
 
-#: ../src/pref-manager.c:2845
+#: ../src/pref-manager.c:2807
 msgid "Check mail upon start-up"
 msgstr "Wyszukiwanie poczty podczas uruchamiania"
 
-#: ../src/pref-manager.c:2847
+#: ../src/pref-manager.c:2809
 msgid "Remember open mailboxes between sessions"
 msgstr "Zapamiętywanie otwartych skrzynek między sesjami"
 
-#: ../src/pref-manager.c:2865
+#: ../src/pref-manager.c:2827
 msgid "Folder scanning"
 msgstr "Skanowanie katalogów"
 
-#: ../src/pref-manager.c:2868
+#: ../src/pref-manager.c:2830
 msgid ""
 "Choose depth 1 for fast start-up; this defers scanning some folders. To see "
 "more of the tree at start-up, choose a greater depth."
@@ -5327,38 +5299,38 @@ msgstr ""
 "katalogów. Wybranie większej głębi spowoduje wyświetlenie większej części "
 "drzewa."
 
-#: ../src/pref-manager.c:2875
+#: ../src/pref-manager.c:2837
 msgid "Scan local folders to depth"
 msgstr "Głębokość skanowania lokalnych katalogów"
 
-#: ../src/pref-manager.c:2884
+#: ../src/pref-manager.c:2846
 msgid "Scan IMAP folders to depth"
 msgstr "Głębokość skanowania katalogów IMAP"
 
-#: ../src/pref-manager.c:2906 ../src/pref-manager.c:3364
+#: ../src/pref-manager.c:2868 ../src/pref-manager.c:3326
 msgid "Miscellaneous"
 msgstr "Różne"
 
-#: ../src/pref-manager.c:2909
+#: ../src/pref-manager.c:2871
 msgid "Debug"
 msgstr "Informowanie o błędach"
 
-#: ../src/pref-manager.c:2911
+#: ../src/pref-manager.c:2873
 msgid "Empty trash on exit"
 msgstr "Opróżnianie Kosza przed zakończeniem"
 
-#: ../src/pref-manager.c:2915
+#: ../src/pref-manager.c:2877
 msgid "Close mailbox if unused more than"
 msgstr "Zamykanie skrzynki, jeśli nie jest używana dłużej niż"
 
-#: ../src/pref-manager.c:2943
+#: ../src/pref-manager.c:2905
 msgid "Deleting messages"
 msgstr "Usuwanie wiadomości"
 
 #. Translators: this used to be "using Mailbox -> Hide messages";
 #. * the UTF-8 string for the right-arrow symbol is broken out to
 #. * avoid msgconv problems.
-#: ../src/pref-manager.c:2948
+#: ../src/pref-manager.c:2910
 #, c-format
 msgid ""
 "The following setting is global, but may be overridden for the selected "
@@ -5367,64 +5339,64 @@ msgstr ""
 "Następujące ustawienie jest globalne, ale może zostać zastąpione dla "
 "wybranej skrzynki za pomocą Skrzynka %s Ukrywanie wiadomości:"
 
-#: ../src/pref-manager.c:2956
+#: ../src/pref-manager.c:2918
 msgid "Hide messages marked as deleted"
 msgstr "Ukrywanie wiadomości oznaczonych jako usunięte"
 
-#: ../src/pref-manager.c:2958
+#: ../src/pref-manager.c:2920
 msgid "The following settings are global:"
 msgstr "Następujące ustawienia są globalne:"
 
-#: ../src/pref-manager.c:2961
+#: ../src/pref-manager.c:2923
 msgid "Expunge deleted messages when mailbox is closed"
 msgstr "Oczyszczanie usuniętych wiadomości podczas zamykania skrzynki"
 
-#: ../src/pref-manager.c:2965
+#: ../src/pref-manager.c:2927
 msgid "…and if unused more than"
 msgstr "…oraz gdy skrzynka nie jest używana dłużej niż"
 
-#: ../src/pref-manager.c:3182
+#: ../src/pref-manager.c:3144
 msgid "Mail options"
 msgstr "Opcje poczty"
 
-#: ../src/pref-manager.c:3186
+#: ../src/pref-manager.c:3148
 msgid "Incoming"
 msgstr "Przychodzące"
 
-#: ../src/pref-manager.c:3190
+#: ../src/pref-manager.c:3152
 msgid "Outgoing"
 msgstr "Wychodzące"
 
-#: ../src/pref-manager.c:3201
+#: ../src/pref-manager.c:3163
 msgid "Display options"
 msgstr "Opcje wyświetlania"
 
-#: ../src/pref-manager.c:3205
+#: ../src/pref-manager.c:3167
 msgid "Sort and thread"
 msgstr "Porządkowanie i wątki"
 
-#: ../src/pref-manager.c:3209 ../src/print-gtk.c:497
+#: ../src/pref-manager.c:3171 ../src/print-gtk.c:497
 msgid "Message"
 msgstr "Wiadomość"
 
-#: ../src/pref-manager.c:3213
+#: ../src/pref-manager.c:3175
 msgid "Colors"
 msgstr "Kolory"
 
-#: ../src/pref-manager.c:3221
+#: ../src/pref-manager.c:3183
 msgid "Status messages"
 msgstr "Komunikaty stanu"
 
 #. must NOT be modal
-#: ../src/pref-manager.c:3292
+#: ../src/pref-manager.c:3254
 msgid "Balsa Preferences"
 msgstr "Preferencje programu Balsa"
 
-#: ../src/pref-manager.c:3355 ../src/toolbar-factory.c:166
+#: ../src/pref-manager.c:3317 ../src/toolbar-factory.c:166
 msgid "Spelling"
 msgstr "Pisownia"
 
-#: ../src/pref-manager.c:3360
+#: ../src/pref-manager.c:3322
 msgid "Start-up"
 msgstr "Uruchamianie"
 
@@ -5532,11 +5504,11 @@ msgstr "_Prawo"
 msgid "Error printing message: %s"
 msgstr "Błąd podczas drukowania wiadomości: %s"
 
-#: ../src/save-restore.c:588
+#: ../src/save-restore.c:587
 msgid "Error during filters loading: "
 msgstr "Błąd podczas wczytywania filtrów: "
 
-#: ../src/save-restore.c:590
+#: ../src/save-restore.c:589
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -5545,12 +5517,12 @@ msgstr ""
 "Błąd podczas wczytywania filtrów: %s\n"
 "Filtry mogą być niepoprawne."
 
-#: ../src/save-restore.c:711
+#: ../src/save-restore.c:710
 msgid "The option not to recognize “format=flowed” text has been removed."
 msgstr ""
 "Opcja powodująca nierozpoznawanie tekstu „format=flowed” została usunięta."
 
-#: ../src/save-restore.c:988
+#: ../src/save-restore.c:987
 msgid ""
 "The option not to send “format=flowed” text is now on the Options menu of "
 "the compose window."
@@ -5558,14 +5530,14 @@ msgstr ""
 "Opcja niewysyłania tekstu „format=flowed” znajduje się teraz w menu Opcje "
 "okna tworzenia wiadomości."
 
-#: ../src/save-restore.c:1027
+#: ../src/save-restore.c:1019
 msgid ""
 "The option to request a MDN is now on the Options menu of the compose window."
 msgstr ""
 "Opcja żądania powiadomienia o otrzymaniu wiadomości znajduje się teraz "
 "w menu Opcje okna tworzenia wiadomości."
 
-#: ../src/save-restore.c:1104
+#: ../src/save-restore.c:1096
 msgid ""
 "This version of Balsa uses a new user interface; if you have changed Balsa’s "
 "keyboard accelerators, you will need to set them again."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 60a2383..c1c01b3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: balsa\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=balsa&";
 "keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-06-19 00:23+0000\n"
-"PO-Revision-Date: 2017-06-24 11:24-0200\n"
+"POT-Creation-Date: 2017-05-02 00:48+0000\n"
+"PO-Revision-Date: 2017-05-25 08:52-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff gnome org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
 "Language: pt_BR\n"
@@ -76,7 +76,7 @@ msgid "Cannot find address in address book"
 msgstr "Não é possível encontrar o endereço no catálogo de endereços"
 
 #: ../libbalsa/address-book.c:321 ../src/main-window.c:2921
-#: ../src/main-window.c:4221 ../src/sendmsg-window.c:3821
+#: ../src/main-window.c:4267 ../src/sendmsg-window.c:3821
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -139,19 +139,19 @@ msgstr "Endereço de _e-mail:"
 msgid "A_dd"
 msgstr "A_dicionar"
 
-#: ../libbalsa/address-view.c:160 ../src/balsa-mime-widget-message.c:746
+#: ../libbalsa/address-view.c:160 ../src/balsa-mime-widget-message.c:753
 #: ../src/balsa-print-object-header.c:171 ../src/sendmsg-window.c:717
 #: ../src/sendmsg-window.c:3528
 msgid "To:"
 msgstr "Para:"
 
-#: ../libbalsa/address-view.c:161 ../src/balsa-mime-widget-message.c:748
+#: ../libbalsa/address-view.c:161 ../src/balsa-mime-widget-message.c:755
 #: ../src/balsa-print-object-header.c:173 ../src/sendmsg-window.c:717
 #: ../src/sendmsg-window.c:3536
 msgid "CC:"
 msgstr "CC:"
 
-#: ../libbalsa/address-view.c:162 ../src/balsa-mime-widget-message.c:750
+#: ../libbalsa/address-view.c:162 ../src/balsa-mime-widget-message.c:757
 #: ../src/balsa-print-object-header.c:175 ../src/sendmsg-window.c:717
 msgid "BCC:"
 msgstr "CCO:"
@@ -160,7 +160,7 @@ msgstr "CCO:"
 msgid "Reply To:"
 msgstr "Responder a:"
 
-#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1841
+#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1836
 #: ../libbalsa/message.c:843
 msgid "(No subject)"
 msgstr "(Sem assunto)"
@@ -175,7 +175,7 @@ msgstr "Falha ao criar o fluxo de saída"
 msgid "Could not read embedded message"
 msgstr "Não foi possível ler a mensagem incorporada"
 
-#: ../libbalsa/filter.c:125 ../libbalsa/mailbox_local.c:869
+#: ../libbalsa/filter.c:125 ../libbalsa/mailbox_local.c:864
 msgid "Unable to load message body to match filter"
 msgstr "Não foi possível carregar o corpo da mensagem para aplicar o filtro"
 
@@ -236,7 +236,7 @@ msgid "From"
 msgstr "De"
 
 #: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:367
-#: ../src/pref-manager.c:218
+#: ../src/pref-manager.c:380
 msgid "Subject"
 msgstr "Assunto"
 
@@ -382,14 +382,14 @@ msgid "_Download images"
 msgstr "_Baixar imagens"
 
 #: ../libbalsa/html.c:419 ../libbalsa/html.c:1089 ../libbalsa/identity.c:1702
-#: ../src/ab-window.c:148 ../src/mailbox-node.c:1113 ../src/main-window.c:3906
+#: ../src/ab-window.c:148 ../src/mailbox-node.c:1113 ../src/main-window.c:3952
 #: ../src/toolbar-prefs.c:140
 msgid "_Close"
 msgstr "_Fechar"
 
 #. should "re" be localized ?
-#: ../libbalsa/identity.c:99 ../libbalsa/mailbox_local.c:1964
-#: ../libbalsa/mailbox_local.c:1966 ../src/sendmsg-window.c:3769
+#: ../libbalsa/identity.c:99 ../libbalsa/mailbox_local.c:1959
+#: ../libbalsa/mailbox_local.c:1961 ../src/sendmsg-window.c:3769
 #: ../src/sendmsg-window.c:3771
 msgid "Re:"
 msgstr "Re:"
@@ -419,34 +419,34 @@ msgid "Signature in %s is not a UTF-8 text."
 msgstr "A assinatura em %s não é um texto no formato UTF-8."
 
 #: ../libbalsa/identity.c:468 ../libbalsa/libbalsa-gpgme-cb.c:157
-#: ../libbalsa/libbalsa-gpgme-cb.c:369 ../libbalsa/smtp-server.c:472
+#: ../libbalsa/libbalsa-gpgme-cb.c:369 ../libbalsa/smtp-server.c:446
 #: ../src/ab-main.c:858 ../src/ab-window.c:141 ../src/address-book-config.c:237
 #: ../src/address-book-config.c:342 ../src/address-book-config.c:388
-#: ../src/balsa-app.c:89 ../src/balsa-index.c:2654 ../src/balsa-mblist.c:1896
+#: ../src/balsa-app.c:88 ../src/balsa-index.c:2654 ../src/balsa-mblist.c:1896
 #: ../src/balsa-message.c:1766 ../src/balsa-mime-widget-callbacks.c:85
 #: ../src/filter-edit-callbacks.c:1247 ../src/filter-edit-dialog.c:402
 #: ../src/filter-edit-dialog.c:571 ../src/filter-export-dialog.c:79
-#: ../src/filter-run-dialog.c:316 ../src/folder-conf.c:311
+#: ../src/filter-run-dialog.c:321 ../src/folder-conf.c:311
 #: ../src/folder-conf.c:573 ../src/folder-conf.c:806 ../src/mailbox-conf.c:462
 #: ../src/mailbox-conf.c:483 ../src/mailbox-conf.c:499
 #: ../src/mailbox-conf.c:1222 ../src/mailbox-conf.c:1259
-#: ../src/pref-manager.c:3298 ../src/sendmsg-window.c:532
+#: ../src/pref-manager.c:491 ../src/sendmsg-window.c:532
 #: ../src/sendmsg-window.c:1557 ../src/sendmsg-window.c:2009
-#: ../src/sendmsg-window.c:3335 ../src/sendmsg-window.c:4698
-#: ../src/sendmsg-window.c:4995 ../src/sendmsg-window.c:5152
+#: ../src/sendmsg-window.c:3335 ../src/sendmsg-window.c:4697
+#: ../src/sendmsg-window.c:4994 ../src/sendmsg-window.c:5151
 #: ../src/spell-check.c:382 ../src/store-address.c:208
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #: ../libbalsa/identity.c:469 ../libbalsa/libbalsa-gpgme-cb.c:156
-#: ../libbalsa/libbalsa-gpgme-cb.c:368 ../libbalsa/smtp-server.c:471
-#: ../src/ab-window.c:140 ../src/balsa-app.c:88 ../src/balsa-message.c:1767
+#: ../libbalsa/libbalsa-gpgme-cb.c:368 ../libbalsa/smtp-server.c:445
+#: ../src/ab-window.c:140 ../src/balsa-app.c:87 ../src/balsa-message.c:1767
 #: ../src/balsa-mime-widget-callbacks.c:86 ../src/filter-edit-callbacks.c:1246
 #: ../src/filter-edit-dialog.c:570 ../src/filter-export-dialog.c:78
-#: ../src/filter-run-dialog.c:315 ../src/main-window.c:4001
-#: ../src/pref-manager.c:3296 ../src/sendmsg-window.c:1556
+#: ../src/filter-run-dialog.c:320 ../src/main-window.c:4047
+#: ../src/pref-manager.c:489 ../src/sendmsg-window.c:1556
 #: ../src/sendmsg-window.c:2010 ../src/sendmsg-window.c:3334
-#: ../src/sendmsg-window.c:4699 ../src/store-address.c:209
+#: ../src/sendmsg-window.c:4698 ../src/store-address.c:209
 msgid "_OK"
 msgstr "_OK"
 
@@ -454,7 +454,7 @@ msgstr "_OK"
 msgid "Current"
 msgstr "Atual"
 
-#: ../libbalsa/identity.c:731 ../libbalsa/smtp-server.c:179
+#: ../libbalsa/identity.c:731 ../libbalsa/smtp-server.c:177
 msgid "Default"
 msgstr "Padrão"
 
@@ -645,13 +645,13 @@ msgstr "Erro de exibição da ajuda para identidades: %s\n"
 msgid "Manage Identities"
 msgstr "Gerenciar Identidades"
 
-#: ../libbalsa/identity.c:1699 ../libbalsa/smtp-server.c:473
+#: ../libbalsa/identity.c:1699 ../libbalsa/smtp-server.c:447
 #: ../src/address-book-config.c:238 ../src/address-book-config.c:340
 #: ../src/address-book-config.c:386 ../src/filter-edit-callbacks.c:1248
 #: ../src/filter-edit-dialog.c:572 ../src/filter-export-dialog.c:80
-#: ../src/filter-run-dialog.c:317 ../src/folder-conf.c:312
-#: ../src/folder-conf.c:574 ../src/folder-conf.c:807 ../src/main-window.c:3905
-#: ../src/pref-manager.c:3299 ../src/toolbar-prefs.c:141
+#: ../src/filter-run-dialog.c:322 ../src/folder-conf.c:312
+#: ../src/folder-conf.c:574 ../src/folder-conf.c:807 ../src/main-window.c:3951
+#: ../src/pref-manager.c:492 ../src/toolbar-prefs.c:141
 msgid "_Help"
 msgstr "Aj_uda"
 
@@ -735,8 +735,8 @@ msgstr "Excedido o número de conexões por servidor %s"
 msgid "Invalid date"
 msgstr "Data inválida"
 
-#: ../libbalsa/libbalsa.c:386 ../src/pref-manager.c:934
-#: ../src/pref-manager.c:3600
+#: ../libbalsa/libbalsa.c:386 ../src/pref-manager.c:1370
+#: ../src/pref-manager.c:1466
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -1015,11 +1015,7 @@ msgstr ""
 "\n"
 "Chave: %s"
 
-#: ../libbalsa/libbalsa-progress.c:65 ../src/main-window.c:3272
-msgid "_Hide"
-msgstr "_Ocultar"
-
-#: ../libbalsa/libbalsa-vfs.c:557 ../src/sendmsg-window.c:4493
+#: ../libbalsa/libbalsa-vfs.c:557 ../src/sendmsg-window.c:4492
 #, c-format
 msgid "not a regular file"
 msgstr "não é um arquivo normal"
@@ -1040,66 +1036,66 @@ msgid "Open _part with %s"
 msgstr "Abrir _parte com %s"
 
 # 11
-#: ../libbalsa/mailbox.c:510
+#: ../libbalsa/mailbox.c:509
 #, c-format
 msgid "Cannot load mailbox %s"
 msgstr "Impossível carregar a caixa de mensagens %s"
 
-#: ../libbalsa/mailbox.c:517
+#: ../libbalsa/mailbox.c:516
 #, c-format
 msgid "No such mailbox type: %s"
 msgstr "Tipo de caixa de mensagens inexistente: %s"
 
 # 11
-#: ../libbalsa/mailbox.c:534
+#: ../libbalsa/mailbox.c:533
 #, c-format
 msgid "Bad local mailbox path “%s”"
 msgstr "Caminho “%s” para a caixa de mensagens local errado"
 
 # 11
-#: ../libbalsa/mailbox.c:539
+#: ../libbalsa/mailbox.c:538
 #, c-format
 msgid "Could not create a mailbox of type %s"
 msgstr "Não foi possível criar uma caixa de mensagens do tipo %s"
 
-#: ../libbalsa/mailbox.c:854
+#: ../libbalsa/mailbox.c:853
 #, c-format
 msgid "Applying filter rules to %s"
 msgstr "Aplicando regras de filtro para %s"
 
-#: ../libbalsa/mailbox.c:1019
+#: ../libbalsa/mailbox.c:1018
 #, c-format
 msgid "Copying from %s to %s"
 msgstr "Copiando de %s para %s"
 
-#: ../libbalsa/mailbox.c:1952
+#: ../libbalsa/mailbox.c:1951
 #, c-format
 msgid "libbalsa_mailbox_get_message: mailbox %s is closed"
 msgstr "libbalsa_mailbox_get_message: caixa de mensagens %s está fechada"
 
-#: ../libbalsa/mailbox.c:2157
+#: ../libbalsa/mailbox.c:2156
 #, c-format
 msgid "Removing messages from source mailbox failed"
 msgstr "Remoção de mensagens da caixa de mensagens fonte falhou"
 
-#: ../libbalsa/mailbox.c:2984
+#: ../libbalsa/mailbox.c:2983
 msgid "from unknown"
 msgstr "de desconhecido"
 
-#: ../libbalsa/mailbox.c:2986
+#: ../libbalsa/mailbox.c:2985
 msgid "Loading…"
 msgstr "Carregando…"
 
-#: ../libbalsa/mailbox.c:3955
+#: ../libbalsa/mailbox.c:3954
 #, c-format
 msgid "Searching %s for partial messages"
 msgstr "Pesquisando %s em mensagens parciais"
 
-#: ../libbalsa/mailbox.c:4045
+#: ../libbalsa/mailbox.c:4044
 msgid "Reconstructing message"
 msgstr "Reconstruindo a mensagem"
 
-#: ../libbalsa/mailbox.c:4304
+#: ../libbalsa/mailbox.c:4303
 #, c-format
 msgid "Finding duplicate messages in source mailbox failed"
 msgstr "Procura de mensagens duplicadas na caixa de correio fonte falhou"
@@ -1127,7 +1123,7 @@ msgstr "Comando IMAP assíncrono %s não pôde ser executado. Reconectando…"
 
 # 1
 #: ../libbalsa/mailbox_imap.c:1122 ../libbalsa/mailbox_maildir.c:503
-#: ../libbalsa/mailbox_mbox.c:754 ../libbalsa/mailbox_mh.c:539
+#: ../libbalsa/mailbox_mbox.c:737 ../libbalsa/mailbox_mh.c:539
 #, c-format
 msgid "%s: Opening %s Refcount: %d\n"
 msgstr "%s: Abrindo %s Refcount: %d\n"
@@ -1185,44 +1181,44 @@ msgstr "Enviando %ld kB"
 msgid "Server-side threading not supported."
 msgstr "O encadeamento usado pelo servidor não é suportado."
 
-#: ../libbalsa/mailbox_local.c:569
+#: ../libbalsa/mailbox_local.c:564
 #, c-format
 msgid "Failed to save cache file “%s”: %s."
 msgstr "Falhou ao salvar arquivo de cache “%s”: %s."
 
-#: ../libbalsa/mailbox_local.c:603
+#: ../libbalsa/mailbox_local.c:598
 #, c-format
 msgid "Cache file for mailbox %s will be created"
 msgstr "Arquivo de cache para a caixa de mensagens %s será criado"
 
-#: ../libbalsa/mailbox_local.c:612
+#: ../libbalsa/mailbox_local.c:607
 #, c-format
 msgid "Failed to read cache file %s: %s"
 msgstr "Falhou ao ler o arquivo de cache %s: %s"
 
-#: ../libbalsa/mailbox_local.c:630 ../libbalsa/mailbox_local.c:649
-#: ../libbalsa/mailbox_local.c:673
+#: ../libbalsa/mailbox_local.c:625 ../libbalsa/mailbox_local.c:644
+#: ../libbalsa/mailbox_local.c:668
 #, c-format
 msgid "Cache file for mailbox %s will be repaired"
 msgstr "Arquivo de cache para a caixa de mensagens %s será reparado"
 
-#: ../libbalsa/mailbox_local.c:1246
+#: ../libbalsa/mailbox_local.c:1241
 #, c-format
 msgid "Filtering %s"
 msgstr "Filtrando %s"
 
-#: ../libbalsa/mailbox_local.c:1335
+#: ../libbalsa/mailbox_local.c:1330
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: ../libbalsa/mailbox_local.c:2133
+#: ../libbalsa/mailbox_local.c:2128
 #, c-format
 msgid "Open of %s failed. Errno = %d, "
 msgstr "Abertura de %s falhou. Erronum = %d, "
 
 # 12
-#: ../libbalsa/mailbox_local.c:2155
+#: ../libbalsa/mailbox_local.c:2150
 #, c-format
 msgid "Failed to sync mailbox “%s”"
 msgstr "Falha ao sincronizar a caixa de mensagens “%s”"
@@ -1264,13 +1260,13 @@ msgstr ""
 "Não foi possível remover %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:484 ../libbalsa/mailbox_mbox.c:701
+#: ../libbalsa/mailbox_maildir.c:484 ../libbalsa/mailbox_mbox.c:684
 #: ../libbalsa/mailbox_mh.c:522
 #, c-format
 msgid "Mailbox does not exist."
 msgstr "A caixa de mensagens não existe."
 
-#: ../libbalsa/mailbox_maildir.c:924 ../libbalsa/mailbox_mbox.c:1985
+#: ../libbalsa/mailbox_maildir.c:924 ../libbalsa/mailbox_mbox.c:1968
 #: ../libbalsa/mailbox_mh.c:1102
 #, c-format
 msgid "Data copy error"
@@ -1303,33 +1299,33 @@ msgid "Could not unlink file %s: %s"
 msgstr "Não foi possível desvincular arquivo %s: %s"
 
 # 11
-#: ../libbalsa/mailbox_mbox.c:709
+#: ../libbalsa/mailbox_mbox.c:692
 #, c-format
 msgid "Cannot open mailbox."
 msgstr "Não é possível abrir a caixa de mensagens."
 
-#: ../libbalsa/mailbox_mbox.c:721
+#: ../libbalsa/mailbox_mbox.c:704
 #, c-format
 msgid "Mailbox is not in mbox format."
 msgstr "A caixa de mensagens não está no formato mbox."
 
 # 11
-#: ../libbalsa/mailbox_mbox.c:729
+#: ../libbalsa/mailbox_mbox.c:712
 #, c-format
 msgid "Cannot lock mailbox."
 msgstr "Não é possível travar a caixa de mensagens."
 
-#: ../libbalsa/mailbox_mbox.c:1941
+#: ../libbalsa/mailbox_mbox.c:1924
 #, c-format
 msgid "%s: could not open %s."
 msgstr "%s: não foi possível abrir %s."
 
-#: ../libbalsa/mailbox_mbox.c:1953
+#: ../libbalsa/mailbox_mbox.c:1936
 #, c-format
 msgid "%s: could not get new MIME stream."
 msgstr "%s: não foi possível obter um novo fluxo MIME."
 
-#: ../libbalsa/mailbox_mbox.c:1961
+#: ../libbalsa/mailbox_mbox.c:1944
 #, c-format
 msgid "%s: %s is not in mbox format."
 msgstr "%s: %s não está no formato mbox."
@@ -1384,54 +1380,53 @@ msgstr "Transferência da mensagem POP para %s falhou: %s"
 msgid "Message %lu of %lu (%s of %s)"
 msgstr "Mensagem %lu de %lu (%s de %s)"
 
-#: ../libbalsa/mailbox_pop3.c:437
+#: ../libbalsa/mailbox_pop3.c:436
 #, c-format
 msgid "Error appending message %d from %s to %s: %s"
 msgstr "Erro ao adicionar a mensagem %d de %s em %s: %s"
 
-#: ../libbalsa/mailbox_pop3.c:495 ../libbalsa/send.c:787
+#: ../libbalsa/mailbox_pop3.c:494 ../libbalsa/send.c:635
 #, c-format
 msgid "Cannot load certificate file %s: %s"
 msgstr "Não foi possível carregar o arquivo de certificado %s: %s"
 
-#: ../libbalsa/mailbox_pop3.c:509
+#: ../libbalsa/mailbox_pop3.c:508
 #, c-format
 msgid "POP3 mailbox %s: cannot connect %s: %s"
 msgstr "Caixa de mensagens POP3 %s: não foi possível conectar %s: %s"
 
-#: ../libbalsa/mailbox_pop3.c:518
+#: ../libbalsa/mailbox_pop3.c:517
 #, c-format
 msgid "POP3 mailbox %s error: %s"
 msgstr "Ocorreu erro na caixa de mensagens POP3 %s: %s"
 
-#: ../libbalsa/mailbox_pop3.c:562
+#: ../libbalsa/mailbox_pop3.c:561
 #, c-format
 msgid "POP3 message %d oversized: %s — skipped."
 msgstr "A mensagem POP3 %d excedeu o tamanho: %s — ignorada."
 
-#: ../libbalsa/mailbox_pop3.c:640
+#: ../libbalsa/mailbox_pop3.c:639
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libbalsa/mailbox_pop3.c:654
+#: ../libbalsa/mailbox_pop3.c:653
 #, c-format
 msgid "%lu new messages (%s)"
 msgstr "%lu novas mensagens (%s)"
 
 # Fica melhor "Exclusão" do que "Excluindo" na interface gráfica
-#: ../libbalsa/mailbox_pop3.c:665
+#: ../libbalsa/mailbox_pop3.c:664
 msgid "Deleting messages on server…"
 msgstr "Excluindo mensagens no servidor…"
 
-#: ../libbalsa/mailbox_pop3.c:687
+#: ../libbalsa/mailbox_pop3.c:686
 #, c-format
 msgid "POP3 error: %s"
 msgstr "Erro de POP3: %s"
 
 # 26
 #. done - clean up
-#: ../libbalsa/mailbox_pop3.c:694 ../libbalsa/send.c:1085
-#, c-format
+#: ../libbalsa/mailbox_pop3.c:691
 msgid "Finished"
 msgstr "Concluído"
 
@@ -1541,7 +1536,7 @@ msgstr "Tempo esgotado na tentativa de bloquear via flock!"
 msgid "Waiting for flock attempt… %d"
 msgstr "Aguardando por tentativa de flock… %d"
 
-#: ../libbalsa/misc.c:1077
+#: ../libbalsa/misc.c:1082
 #, c-format
 msgid "LDAP Directory for %s"
 msgstr "Diretório LDAP para %s"
@@ -1909,42 +1904,25 @@ msgstr "linha malformada “%s”, faltando “:”"
 msgid "malformed line “%s”, empty name or value"
 msgstr "linha malformada “%s”, nome ou valor vazio"
 
-#: ../libbalsa/send.c:206
-#, c-format
-#| msgid "SMT_P server:"
-msgid "SMTP server %s"
-msgstr "Servidor SMTP %s"
-
-#: ../libbalsa/send.c:627
-#, c-format
-#| msgid "Message %lu of %lu (%s of %s)"
-msgid "Message %u of %u"
-msgstr "Mensagem %u de %u"
+#: ../libbalsa/send.c:226 ../libbalsa/send.c:233
+msgid "Sending Mail…"
+msgstr "Enviando mensagem…"
 
-#: ../libbalsa/send.c:650
-#, c-format
-msgid "Cannot reach SMTP server %s (%s), any queued message will remain in %s."
-msgstr ""
-"Não foi possível atingir o servidor SMTP %s (%s), qualquer mensagem "
-"enfileirada será mantida em %s."
-
-#: ../libbalsa/send.c:840
-#| msgid "Sending Mail…"
-msgid "Sending Mail"
-msgstr "Enviando mensagem"
+#: ../libbalsa/send.c:230 ../src/main-window.c:3267
+msgid "_Hide"
+msgstr "_Ocultar"
 
-#: ../libbalsa/send.c:946
+#: ../libbalsa/send.c:810
 #, c-format
-#| msgid "Save this message and close"
-msgid "Save message in %s…"
-msgstr "Salvar mensagem em %s…"
+msgid "Connected to MTA %s: %s"
+msgstr "Conectado ao MTA %s: %s"
 
-#: ../libbalsa/send.c:954
+#: ../libbalsa/send.c:850
 #, c-format
 msgid "Saving sent message to %s failed: %s"
 msgstr "Gravação da mensagem enviada em %s falhou: %s"
 
-#: ../libbalsa/send.c:985
+#: ../libbalsa/send.c:876
 #, c-format
 msgid ""
 "Sending message failed: %s\n"
@@ -1953,43 +1931,22 @@ msgstr ""
 "Envio de mensagem falhou: %s\n"
 "A mensagem ficou na sua caixa de saída."
 
-#: ../libbalsa/send.c:1006
-#, c-format
-#| msgid "Continue message to %s: %s"
-msgid "Sending queued messages to %s"
-msgstr "Enviando mensagens enfileiradas para %s"
-
-#: ../libbalsa/send.c:1014
-#, c-format
-#| msgid "Connected to MTA %s: %s"
-msgid "Connected to %s"
-msgstr "Conectado a %s"
-
-#: ../libbalsa/send.c:1068
-#, c-format
-#| msgid "Connecting MTA %s (%s) failed: %s"
-msgid "Connecting SMTP server %s (%s) failed: %s"
-msgstr "Conexão com o servidor SMTP %s (%s) falhou: %s"
-
-#: ../libbalsa/send.c:1091
+#: ../libbalsa/send.c:887
 #, c-format
-#| msgid "Forward message to %s: %s"
-msgid "Transmitted %u message to %s"
-msgid_plural "Transmitted %u messages to %s"
-msgstr[0] "Mensagem %u transmitida para %s"
-msgstr[1] "Mensagens %u transmitidas para %s"
+msgid "Connecting MTA %s (%s) failed: %s"
+msgstr "Conexão com MTA %s (%s) falhou: %s"
 
-#: ../libbalsa/send.c:1263 ../libbalsa/send.c:1329
+#: ../libbalsa/send.c:1068 ../libbalsa/send.c:1134
 #, c-format
 msgid "Cannot read %s: %s"
 msgstr "Não é possível ler %s: %s"
 
-#: ../libbalsa/send.c:1266 ../libbalsa/send.c:1332
+#: ../libbalsa/send.c:1071 ../libbalsa/send.c:1137
 #, c-format
 msgid "Cannot read %s"
 msgstr "Não é possível ler %s"
 
-#: ../libbalsa/send.c:1296
+#: ../libbalsa/send.c:1101
 #, c-format
 msgid ""
 "Cannot determine character set for text file “%s”; sending as MIME type “%s”"
@@ -1997,13 +1954,13 @@ msgstr ""
 "Não é possível determinar o conjunto de caracteres para o arquivo texto "
 "“%s”; enviando como o tipo MIM “%s”"
 
-#: ../libbalsa/send.c:1731
+#: ../libbalsa/send.c:1536
 msgid "This message will not be encrypted for the BCC: recipient."
 msgid_plural "This message will not be encrypted for the BCC: recipients."
 msgstr[0] "Esta mensagem não será criptografada para o destinatário Cco."
 msgstr[1] "Esta mensagem não será criptografada para os destinatários Cco."
 
-#: ../libbalsa/send.c:1831
+#: ../libbalsa/send.c:1636
 msgid "This message will not be encrypted for the BCC: recipient(s)."
 msgstr "Essa mensagem não será criptografada para o(s) destinatário(s) de CCO."
 
@@ -2013,106 +1970,106 @@ msgstr "Essa mensagem não será criptografada para o(s) destinatário(s) de CCO
 msgid "Logging in to %s using %s"
 msgstr "Conectando-se em %s usando %s"
 
-#: ../libbalsa/smtp-server.c:298
+#: ../libbalsa/smtp-server.c:272
 msgid "SMTP over SSL (SMTPS)"
 msgstr "SMTP sobre SSL (SMTPS)"
 
-#: ../libbalsa/smtp-server.c:299 ../libinit_balsa/assistant_page_user.c:69
+#: ../libbalsa/smtp-server.c:273 ../libinit_balsa/assistant_page_user.c:69
 #: ../src/mailbox-conf.c:1295
 msgid "TLS required"
 msgstr "TLS exigido"
 
-#: ../libbalsa/smtp-server.c:300 ../libinit_balsa/assistant_page_user.c:70
+#: ../libbalsa/smtp-server.c:274 ../libinit_balsa/assistant_page_user.c:70
 #: ../src/mailbox-conf.c:1296
 msgid "TLS if possible (not recommended)"
 msgstr "TLS se possível (não recomendado)"
 
-#: ../libbalsa/smtp-server.c:301 ../libinit_balsa/assistant_page_user.c:71
+#: ../libbalsa/smtp-server.c:275 ../libinit_balsa/assistant_page_user.c:71
 #: ../src/mailbox-conf.c:1297
 msgid "None (not recommended)"
 msgstr "Nenhuma (não recomendado)"
 
-#: ../libbalsa/smtp-server.c:332
+#: ../libbalsa/smtp-server.c:306
 #, c-format
 msgid "Error displaying server help: %s\n"
 msgstr "Erro ao exibir a ajuda do servidor: %s\n"
 
-#: ../libbalsa/smtp-server.c:467
+#: ../libbalsa/smtp-server.c:441
 msgid "SMTP Server"
 msgstr "Servidor SMTP"
 
-#: ../libbalsa/smtp-server.c:497 ../src/folder-conf.c:336
+#: ../libbalsa/smtp-server.c:471 ../src/folder-conf.c:336
 #: ../src/mailbox-conf.c:1278 ../src/mailbox-conf.c:1391
 msgid "_Basic"
 msgstr "_Básico"
 
 #  INPUT FIELD CREATION
-#: ../libbalsa/smtp-server.c:502
+#: ../libbalsa/smtp-server.c:476
 msgid "_Descriptive Name:"
 msgstr "_Nome descritivo:"
 
 #. pop server
 #. imap server
-#: ../libbalsa/smtp-server.c:510 ../src/folder-conf.c:384
+#: ../libbalsa/smtp-server.c:484 ../src/folder-conf.c:384
 #: ../src/mailbox-conf.c:1285 ../src/mailbox-conf.c:1400
 msgid "_Server:"
 msgstr "_Servidor:"
 
 #. security
-#: ../libbalsa/smtp-server.c:518 ../src/mailbox-conf.c:1290
+#: ../libbalsa/smtp-server.c:492 ../src/mailbox-conf.c:1290
 msgid "Se_curity:"
 msgstr "Se_gurança:"
 
 #. authentication or anonymous access
-#: ../libbalsa/smtp-server.c:522
+#: ../libbalsa/smtp-server.c:496
 msgid "Server requires authentication"
 msgstr "O servidor requer autenticação"
 
-#: ../libbalsa/smtp-server.c:523
+#: ../libbalsa/smtp-server.c:497
 msgid "_Authentication:"
 msgstr "_Autenticação:"
 
-#: ../libbalsa/smtp-server.c:529
+#: ../libbalsa/smtp-server.c:503
 msgid "_User Name:"
 msgstr "Nome de _usuário:"
 
-#: ../libbalsa/smtp-server.c:536
+#: ../libbalsa/smtp-server.c:510
 msgid "_Pass Phrase:"
 msgstr "_Frase secreta:"
 
-#: ../libbalsa/smtp-server.c:549 ../src/folder-conf.c:374
+#: ../libbalsa/smtp-server.c:523 ../src/folder-conf.c:374
 #: ../src/mailbox-conf.c:1329 ../src/mailbox-conf.c:1456
 msgid "_Advanced"
 msgstr "_Avançado"
 
 #. client certificate and passphrase
 #. client certificate configuration
-#: ../libbalsa/smtp-server.c:552 ../src/mailbox-conf.c:264
+#: ../libbalsa/smtp-server.c:526 ../src/mailbox-conf.c:264
 msgid "Server requires client certificate"
 msgstr "O servidor requer um certificado de cliente"
 
-#: ../libbalsa/smtp-server.c:553
+#: ../libbalsa/smtp-server.c:527
 msgid "_Client Certificate:"
 msgstr "Certificado do _cliente:"
 
-#: ../libbalsa/smtp-server.c:557 ../src/mailbox-conf.c:267
+#: ../libbalsa/smtp-server.c:531 ../src/mailbox-conf.c:267
 msgid "Choose Client Certificate"
 msgstr "Escolher certificado de cliente"
 
-#: ../libbalsa/smtp-server.c:559 ../src/mailbox-conf.c:266
+#: ../libbalsa/smtp-server.c:533 ../src/mailbox-conf.c:266
 msgid "Certificate _File:"
 msgstr "Arquivo de c_ertificado:"
 
-#: ../libbalsa/smtp-server.c:566 ../src/mailbox-conf.c:272
+#: ../libbalsa/smtp-server.c:540 ../src/mailbox-conf.c:272
 msgid "Certificate _Pass Phrase:"
 msgstr "_Frase secreta do Certificado:"
 
 #. split large messages
-#: ../libbalsa/smtp-server.c:575
+#: ../libbalsa/smtp-server.c:549
 msgid "Sp_lit message larger than"
 msgstr "Di_vidir mensagem maior do que"
 
-#: ../libbalsa/smtp-server.c:580 ../src/pref-manager.c:2186
+#: ../libbalsa/smtp-server.c:554 ../src/pref-manager.c:1880
 msgid "MB"
 msgstr "MB"
 
@@ -2130,13 +2087,18 @@ msgstr "Código fonte da mensagem"
 msgid "Error adding from %s: %s\n"
 msgstr "Erro ao adicionar de %s: %s\n"
 
-#: ../libinit_balsa/assistant_helper.c:177
+#: ../libinit_balsa/assistant_helper.c:66
+#, c-format
+msgid "Error loading %s: %s\n"
+msgstr "Erro ao carregar %s: %s\n"
+
+#: ../libinit_balsa/assistant_helper.c:201
 #, c-format
 msgid "The path %s must be relative to the filesystem root (start with /)."
 msgstr ""
 "O caminho %s precisa ser relativo ao sistema de arquivo raiz (iniciar com /)."
 
-#: ../libinit_balsa/assistant_helper.c:189
+#: ../libinit_balsa/assistant_helper.c:213
 #, c-format
 msgid ""
 "Couldn’t create a directory: mkdir() failed on pathname “%s”, with error "
@@ -2145,13 +2107,13 @@ msgstr ""
 "Não foi possível criar um diretório: mkdir() falhou no caminho “%s”, com o "
 "erro “%s”."
 
-#: ../libinit_balsa/assistant_helper.c:201
-#: ../libinit_balsa/assistant_helper.c:224
+#: ../libinit_balsa/assistant_helper.c:225
+#: ../libinit_balsa/assistant_helper.c:248
 #, c-format
 msgid "The file with pathname “%s” is not a directory."
 msgstr "O arquivo com caminho “%s” não é um diretório."
 
-#: ../libinit_balsa/assistant_helper.c:215
+#: ../libinit_balsa/assistant_helper.c:239
 #, c-format
 msgid "Couldn’t create a directory: mkdir() failed on pathname “%s”."
 msgstr "Não foi possível criar um diretório: mkdir() falhou no caminho “%s”."
@@ -2310,6 +2272,7 @@ msgid "_Type of mail server:"
 msgstr "_Tipo do servidor de e-mail:"
 
 #: ../libinit_balsa/assistant_page_user.c:114
+#| msgid "connection lost"
 msgid "Connection _Security"
 msgstr "_Segurança da conexão"
 
@@ -2440,8 +2403,8 @@ msgstr "a conexão já está criptografada"
 
 #. unexpected server reply
 #: ../libnetclient/net-client-pop.c:214 ../libnetclient/net-client-pop.c:431
-#: ../libnetclient/net-client-smtp.c:586 ../libnetclient/net-client-smtp.c:657
-#: ../libnetclient/net-client-smtp.c:699
+#: ../libnetclient/net-client-smtp.c:581 ../libnetclient/net-client-smtp.c:652
+#: ../libnetclient/net-client-smtp.c:694
 #, c-format
 msgid "bad server reply: %s"
 msgstr "resposta inválida do servidor: %s"
@@ -2461,27 +2424,27 @@ msgstr "erro: %s."
 msgid "error"
 msgstr "erro"
 
-#: ../libnetclient/net-client-pop.c:489 ../libnetclient/net-client-smtp.c:396
+#: ../libnetclient/net-client-pop.c:489 ../libnetclient/net-client-smtp.c:391
 #, c-format
 msgid "password required"
 msgstr "requer senha"
 
-#: ../libnetclient/net-client-pop.c:508 ../libnetclient/net-client-smtp.c:411
+#: ../libnetclient/net-client-pop.c:508 ../libnetclient/net-client-smtp.c:406
 #, c-format
 msgid "no suitable authentication mechanism"
 msgstr "nenhum mecanismo de autenticação adequado"
 
-#: ../libnetclient/net-client-smtp.c:142
+#: ../libnetclient/net-client-smtp.c:141
 #, c-format
 msgid "remote server does not support STARTTLS"
 msgstr "o servidor remoto não oferece suporte a STARTTLS"
 
-#: ../libnetclient/net-client-smtp.c:689
+#: ../libnetclient/net-client-smtp.c:684
 #, c-format
 msgid "transient error %d: %s"
 msgstr "erro transiente %d: %s"
 
-#: ../libnetclient/net-client-smtp.c:694
+#: ../libnetclient/net-client-smtp.c:689
 #, c-format
 msgid "permanent error %d: %s"
 msgstr "erro permanente %d: %s"
@@ -2542,8 +2505,8 @@ msgstr "_Endereço"
 
 #: ../src/ab-main.c:848 ../src/address-book-config.c:226
 #: ../src/address-book-config.c:331 ../src/address-book-config.c:375
-#: ../src/filter-edit-dialog.c:498 ../src/main-window.c:3965
-#: ../src/pref-manager.c:3297
+#: ../src/filter-edit-dialog.c:498 ../src/main-window.c:4011
+#: ../src/pref-manager.c:490
 msgid "_Apply"
 msgstr "_Aplicar"
 
@@ -2552,8 +2515,8 @@ msgid "F_ilter:"
 msgstr "F_iltro:"
 
 #: ../src/ab-window.c:184 ../src/filter-edit-dialog.c:207
-#: ../src/filter-export-dialog.c:90 ../src/filter-run-dialog.c:229
-#: ../src/filter-run-dialog.c:334
+#: ../src/filter-export-dialog.c:90 ../src/filter-run-dialog.c:234
+#: ../src/filter-run-dialog.c:339
 msgid "Name"
 msgstr "Nome"
 
@@ -2634,8 +2597,8 @@ msgstr "Adicionar catálogo de endereços %s"
 
 #: ../src/address-book-config.c:230 ../src/address-book-config.c:334
 #: ../src/address-book-config.c:379 ../src/mailbox-conf.c:612
-#: ../src/pref-manager.c:2014 ../src/pref-manager.c:2097
-#: ../src/pref-manager.c:2791
+#: ../src/pref-manager.c:1683 ../src/pref-manager.c:1755
+#: ../src/pref-manager.c:2854
 msgid "_Add"
 msgstr "_Adicionar"
 
@@ -2703,8 +2666,8 @@ msgstr "Habilitar _TLS"
 msgid "GPE Address Book"
 msgstr "Catálogo de endereços GPE"
 
-#: ../src/address-book-config.c:601 ../src/main-window.c:948
-#: ../src/main-window.c:4078
+#: ../src/address-book-config.c:601 ../src/main-window.c:947
+#: ../src/main-window.c:4124
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "Erro ao exibir a ajuda: %s\n"
@@ -2737,19 +2700,19 @@ msgstr "Catálogo de endereços Rubrica2"
 msgid "Osmo Address Book"
 msgstr "Catálogo de endereços Osmo"
 
-#: ../src/balsa-app.c:64 ../src/folder-conf.c:281 ../src/mailbox-conf.c:1378
+#: ../src/balsa-app.c:63 ../src/folder-conf.c:281 ../src/mailbox-conf.c:1378
 msgid "_Remember password in Secret Service"
 msgstr "Lemb_rar da senha no serviço secreto"
 
-#: ../src/balsa-app.c:67 ../src/folder-conf.c:284 ../src/mailbox-conf.c:1381
+#: ../src/balsa-app.c:66 ../src/folder-conf.c:284 ../src/mailbox-conf.c:1381
 msgid "_Remember password in keyring"
 msgstr "Lemb_rar da senha no Chaveiro"
 
-#: ../src/balsa-app.c:70 ../src/folder-conf.c:287 ../src/mailbox-conf.c:1384
+#: ../src/balsa-app.c:69 ../src/folder-conf.c:287 ../src/mailbox-conf.c:1384
 msgid "_Remember password"
 msgstr "Lemb_rar senha"
 
-#: ../src/balsa-app.c:76
+#: ../src/balsa-app.c:75
 #, c-format
 msgid ""
 "Opening remote mailbox %s.\n"
@@ -2758,25 +2721,25 @@ msgstr ""
 "Abrindo caixa de mensagens remota %s.\n"
 "A _senha para %s@%s:"
 
-#: ../src/balsa-app.c:81
+#: ../src/balsa-app.c:80
 #, c-format
 msgid "_Password for %s@%s (%s):"
 msgstr "_Senha para %s@%s (%s):"
 
-#: ../src/balsa-app.c:84
+#: ../src/balsa-app.c:83
 msgid "Password needed"
 msgstr "Necessita uma senha"
 
-#: ../src/balsa-app.c:523
+#: ../src/balsa-app.c:509
 #, c-format
 msgid "Couldn’t open mailbox “%s”"
 msgstr "Não foi possível abrir a caixa de mensagens “%s”"
 
-#: ../src/balsa-index.c:384 ../src/pref-manager.c:219
+#: ../src/balsa-index.c:384 ../src/pref-manager.c:381
 msgid "Date"
 msgstr "Data"
 
-#: ../src/balsa-index.c:399 ../src/pref-manager.c:220
+#: ../src/balsa-index.c:399 ../src/pref-manager.c:382
 #: ../src/sendmsg-window.c:2699
 msgid "Size"
 msgstr "Tamanho"
@@ -2815,8 +2778,8 @@ msgid "_Store Address…"
 msgstr "Arma_zenar endereço…"
 
 #: ../src/balsa-index.c:1837 ../src/mailbox-node.c:1105
-#: ../src/mailbox-node.c:1121 ../src/pref-manager.c:2019
-#: ../src/pref-manager.c:2104 ../src/pref-manager.c:2798
+#: ../src/mailbox-node.c:1121 ../src/pref-manager.c:1688
+#: ../src/pref-manager.c:1762 ../src/pref-manager.c:2861
 msgid "_Delete"
 msgstr "_Excluir"
 
@@ -3356,42 +3319,42 @@ msgid "Reply…"
 msgstr "Responder…"
 
 #. Gmail sometimes fails to do that.
-#: ../src/balsa-mime-widget-message.c:710
+#: ../src/balsa-mime-widget-message.c:717
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../src/balsa-mime-widget-message.c:711
+#: ../src/balsa-mime-widget-message.c:718
 msgid "IMAP server did not report message structure"
 msgstr "O servidor IMAP não relatou a estrutura da mensagem"
 
-#: ../src/balsa-mime-widget-message.c:724
+#: ../src/balsa-mime-widget-message.c:731
 #: ../src/balsa-print-object-header.c:156 ../src/sendmsg-window.c:747
 #: ../src/sendmsg-window.c:749 ../src/sendmsg-window.c:841
-#: ../src/sendmsg-window.c:3513 ../src/sendmsg-window.c:5030
+#: ../src/sendmsg-window.c:3513 ../src/sendmsg-window.c:5029
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: ../src/balsa-mime-widget-message.c:729
+#: ../src/balsa-mime-widget-message.c:736
 #: ../src/balsa-print-object-header.c:164 ../src/sendmsg-window.c:3509
 msgid "Date:"
 msgstr "Data:"
 
 #. addresses
-#: ../src/balsa-mime-widget-message.c:735
+#: ../src/balsa-mime-widget-message.c:742
 #: ../src/balsa-print-object-header.c:169 ../src/sendmsg-window.c:3520
 msgid "From:"
 msgstr "De:"
 
-#: ../src/balsa-mime-widget-message.c:742
+#: ../src/balsa-mime-widget-message.c:749
 msgid "Reply-To:"
 msgstr "Responder a:"
 
-#: ../src/balsa-mime-widget-message.c:755
+#: ../src/balsa-mime-widget-message.c:762
 #: ../src/balsa-print-object-header.c:177
 msgid "FCC:"
 msgstr "CC:"
 
-#: ../src/balsa-mime-widget-message.c:763
+#: ../src/balsa-mime-widget-message.c:770
 #: ../src/balsa-print-object-header.c:180
 msgid "Disposition-Notification-To:"
 msgstr "Notificação-de-Disposição-Para:"
@@ -3683,15 +3646,15 @@ msgstr "_Todos"
 msgid "C_lear"
 msgstr "_Limpar"
 
-#: ../src/filter-edit-callbacks.c:963 ../src/main-window.c:3949
+#: ../src/filter-edit-callbacks.c:963 ../src/main-window.c:3995
 msgid "_Body"
 msgstr "_Corpo"
 
-#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:3950
+#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:3996
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:3951
+#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:3997
 msgid "_From:"
 msgstr "_De:"
 
@@ -3699,7 +3662,7 @@ msgstr "_De:"
 msgid "_Subject"
 msgstr "_Assunto"
 
-#: ../src/filter-edit-callbacks.c:967 ../src/main-window.c:3953
+#: ../src/filter-edit-callbacks.c:967 ../src/main-window.c:3999
 msgid "_CC:"
 msgstr "_CC:"
 
@@ -3753,7 +3716,7 @@ msgstr "T_ipo da busca:"
 msgid "Edit condition for filter: "
 msgstr "Editar condição para filtro: "
 
-#: ../src/filter-edit-callbacks.c:1483 ../src/save-restore.c:1884
+#: ../src/filter-edit-callbacks.c:1483 ../src/save-restore.c:1874
 msgid "Filter with no condition was omitted"
 msgstr "Filtro sem condições foi omitido"
 
@@ -3792,7 +3755,7 @@ msgstr "Você deve especificar um som para ser reproduzido"
 msgid "(Example: write December 31, 2000, as %s)"
 msgstr "(Exemplo: escreva 31 de dezembro de 2000 como %s)"
 
-#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:226
+#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:388
 msgid "Simple"
 msgstr "Simples"
 
@@ -3974,43 +3937,43 @@ msgstr ""
 "caixas de mensagens IMAP, isto é feito por um método muito lento; se "
 "possível, use sub strings para a comparação."
 
-#: ../src/filter-run-dialog.c:197
+#: ../src/filter-run-dialog.c:202
 msgid "Filters of Mailbox: "
 msgstr "Filtros da caixa de mensagens: "
 
-#: ../src/filter-run-dialog.c:238
+#: ../src/filter-run-dialog.c:243
 msgid "On reception"
 msgstr "Ao receber"
 
-#: ../src/filter-run-dialog.c:250
+#: ../src/filter-run-dialog.c:255
 msgid "On exit"
 msgstr "Ao sair"
 
-#: ../src/filter-run-dialog.c:359
+#: ../src/filter-run-dialog.c:364
 msgid "_Apply Selected"
 msgstr "_Aplicar seleção"
 
-#: ../src/filter-run-dialog.c:375
+#: ../src/filter-run-dialog.c:380
 msgid "Add selected filter to mailbox"
 msgstr "Adiciona o filtro selecionado à caixa de mensagens"
 
-#: ../src/filter-run-dialog.c:385
+#: ../src/filter-run-dialog.c:390
 msgid "Remove selected filter from mailbox"
 msgstr "Remove o filtro selecionado à caixa de mensagens"
 
-#: ../src/filter-run-dialog.c:427
+#: ../src/filter-run-dialog.c:432
 msgid "Move selected filter up"
 msgstr "Move o filtro selecionado para cima"
 
-#: ../src/filter-run-dialog.c:437
+#: ../src/filter-run-dialog.c:442
 msgid "Move selected filter down"
 msgstr "Move o filtro selecionado para baixo"
 
-#: ../src/filter-run-dialog.c:443
+#: ../src/filter-run-dialog.c:448
 msgid "A_pply Now!"
 msgstr "A_plicar agora!"
 
-#: ../src/filter-run-dialog.c:489
+#: ../src/filter-run-dialog.c:494
 msgid ""
 "The filters dialog is opened, close it before you can run filters on any "
 "mailbox"
@@ -4262,7 +4225,7 @@ msgstr "Confirmar"
 msgid "Information — Balsa"
 msgstr "Informações — Balsa"
 
-#: ../src/information-dialog.c:235 ../src/main-window.c:3970
+#: ../src/information-dialog.c:235 ../src/main-window.c:4016
 msgid "_Clear"
 msgstr "_Limpar"
 
@@ -4286,7 +4249,7 @@ msgid "FATAL: "
 msgstr "FATAL: "
 
 #: ../src/mailbox-conf.c:207 ../src/mailbox-conf.c:1536
-#: ../src/pref-manager.c:212 ../src/pref-manager.c:1152
+#: ../src/pref-manager.c:374 ../src/pref-manager.c:3311
 msgid "Never"
 msgstr "Nunca"
 
@@ -4472,7 +4435,7 @@ msgstr "Caminh_o da pasta:"
 msgid "_Identity:"
 msgstr "_Identidade:"
 
-#: ../src/mailbox-conf.c:1538 ../src/pref-manager.c:1154
+#: ../src/mailbox-conf.c:1538 ../src/pref-manager.c:3313
 msgid "Always"
 msgstr "Sempre"
 
@@ -4596,81 +4559,81 @@ msgstr "Caixa de mensagens local %s carregada como: %s\n"
 msgid "Local folder %s\n"
 msgstr "Pasta local %s\n"
 
-#: ../src/main.c:120 ../src/main.c:125 ../src/main.c:131 ../src/main.c:137
-#: ../src/main.c:143
+#: ../src/main.c:124 ../src/main.c:129 ../src/main.c:135 ../src/main.c:141
+#: ../src/main.c:147
 #, c-format
 msgid "Balsa cannot open your “%s” mailbox."
 msgstr "O Balsa não pode abrir sua “%s” caixa de mensagens."
 
-#: ../src/main.c:120
+#: ../src/main.c:124
 msgid "Inbox"
 msgstr "Entrada"
 
-#: ../src/main.c:126
+#: ../src/main.c:130
 msgid "Outbox"
 msgstr "Saída"
 
-#: ../src/main.c:132
+#: ../src/main.c:136
 msgid "Sentbox"
 msgstr "Enviadas"
 
-#: ../src/main.c:138
+#: ../src/main.c:142
 msgid "Draftbox"
 msgstr "Rascunhos"
 
-#: ../src/main.c:143
+#: ../src/main.c:147
 msgid "Trash"
 msgstr "Lixeira"
 
-#: ../src/main.c:384
+#: ../src/main.c:401
 msgid "Compressing mail folders…"
 msgstr "Compactando pastas de mensagens…"
 
-#: ../src/main.c:648
+#: ../src/main.c:665
 msgid "Get new mail on start-up"
 msgstr "Receber novas mensagens ao iniciar"
 
-#: ../src/main.c:650
+#: ../src/main.c:667
 msgid "Compose a new email to EMAIL@ADDRESS"
 msgstr "Compor um novo e-mail para E-MAIL@ENDEREÇO"
 
-#: ../src/main.c:652
+#: ../src/main.c:669
 msgid "Attach file at URI"
 msgstr "Anexar arquivo no URI"
 
-#: ../src/main.c:655
+#: ../src/main.c:672
 msgid "Opens MAILBOXNAME"
 msgstr "Abre NOME DA CAIXA DE MENSAGENS"
 
-#: ../src/main.c:655
+#: ../src/main.c:672
 msgid "MAILBOXNAME"
 msgstr "NOME DA CAIXA DE MENSAGENS"
 
-#: ../src/main.c:658
+#: ../src/main.c:675
 msgid "Opens first unread mailbox"
 msgstr "Abre a primeira caixa de mensagens não lida"
 
-#: ../src/main.c:661
+#: ../src/main.c:678
 msgid "Opens default Inbox on start-up"
 msgstr "Abre a caixa de entrada padrão ao iniciar"
 
-#: ../src/main.c:664
+#: ../src/main.c:681
 msgid "Prints number unread and unsent messages"
 msgstr "Mostra o número de mensagens não lidas e não enviadas"
 
-#: ../src/main.c:666
+#: ../src/main.c:683
 msgid "Debug IMAP connection"
 msgstr "Depurar a conexão IMAP"
 
-#: ../src/main.c:667
+#: ../src/main.c:684
 msgid "Show help options"
 msgstr "Mostrar opções de ajuda"
 
-#: ../src/main.c:668
+#: ../src/main.c:685
 msgid "Show version"
 msgstr "Mostrar versão"
 
-#: ../src/main-window.c:280
+#: ../src/main-window.c:275
 msgid ""
 "Balsa is sending a mail now.\n"
 "Abort sending?"
@@ -4678,31 +4641,31 @@ msgstr ""
 "O Balsa está enviando uma mensagem agora.\n"
 "Abortar o envio?"
 
-#: ../src/main-window.c:450
+#: ../src/main-window.c:445
 msgid "Subject or Sender Contains:"
 msgstr "Assunto ou remetente contém:"
 
-#: ../src/main-window.c:451
+#: ../src/main-window.c:446
 msgid "Subject or Recipient Contains:"
 msgstr "Assunto ou destinatário contém:"
 
-#: ../src/main-window.c:452
+#: ../src/main-window.c:447
 msgid "Subject Contains:"
 msgstr "Assunto contém:"
 
-#: ../src/main-window.c:453
+#: ../src/main-window.c:448
 msgid "Body Contains:"
 msgstr "Corpo contém:"
 
-#: ../src/main-window.c:454
+#: ../src/main-window.c:449
 msgid "Older than (days):"
 msgstr "Mais de (dias):"
 
-#: ../src/main-window.c:455
+#: ../src/main-window.c:450
 msgid "Old at most (days):"
 msgstr "Idade máxima (dias):"
 
-#: ../src/main-window.c:973
+#: ../src/main-window.c:972
 msgid "translator-credits"
 msgstr ""
 "Ariel Bressan da Silva <ariel conectiva com br>\n"
@@ -4715,16 +4678,16 @@ msgstr ""
 "Rafael Fontenelle <rafaelff gnome org>\n"
 "Enrico Nicoletto <liverig gmail com>"
 
-#: ../src/main-window.c:984
+#: ../src/main-window.c:983
 msgid "The Balsa email client is part of the GNOME desktop environment."
 msgstr "O cliente de e-mail Balsa é parte do ambiente gráfico GNOME."
 
 #. license ?
-#: ../src/main-window.c:989
+#: ../src/main-window.c:988
 msgid "About Balsa"
 msgstr "Sobre o Balsa"
 
-#: ../src/main-window.c:1011
+#: ../src/main-window.c:1010
 msgid "Balsa closes files and connections. Please wait…"
 msgstr "O Balsa fecha arquivos e conexões. Por favor aguarde…"
 
@@ -4763,124 +4726,129 @@ msgstr ""
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: ../src/main-window.c:3268 ../src/main-window.c:3286
+#: ../src/main-window.c:3263 ../src/main-window.c:3281
 msgid "Checking Mail…"
 msgstr "Verificando mensagem…"
 
-#: ../src/main-window.c:3426
+#: ../src/main-window.c:3421
 #, c-format
 msgid "IMAP mailbox: %s"
 msgstr "Caixa de mensagens IMAP: %s"
 
-#: ../src/main-window.c:3430
+#: ../src/main-window.c:3425
 #, c-format
 msgid "Local mailbox: %s"
 msgstr "Caixa de mensagens local: %s"
 
-#: ../src/main-window.c:3594
+#: ../src/main-window.c:3589
 msgid "Finished Checking."
 msgstr "Verificação concluída."
 
-#: ../src/main-window.c:3637
+#: ../src/main-window.c:3654
+#, c-format
+msgid "Sending error: %s"
+msgstr "Erro no envio: %s"
+
+#: ../src/main-window.c:3718
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Você recebeu %d mensagem nova."
 msgstr[1] "Você recebeu %d mensagens novas."
 
-#: ../src/main-window.c:3640
+#: ../src/main-window.c:3721
 msgid "You have new mail."
 msgstr "Você recebeu mensagens novas."
 
-#: ../src/main-window.c:3708 ../src/main-window.c:3743
+#: ../src/main-window.c:3789 ../src/main-window.c:3824
 msgid "Balsa: New mail"
 msgstr "Balsa: Nova mensagem"
 
-#: ../src/main-window.c:3901
+#: ../src/main-window.c:3947
 msgid "Search mailbox"
 msgstr "Procurar caixa de mensagens"
 
-#: ../src/main-window.c:3927
+#: ../src/main-window.c:3973
 msgid "_Search for:"
 msgstr "_Procurar por:"
 
 #. builds the toggle buttons to specify fields concerned by
 #. * the search.
-#: ../src/main-window.c:3940
+#: ../src/main-window.c:3986
 msgid "In:"
 msgstr "Em:"
 
-#: ../src/main-window.c:3952
+#: ../src/main-window.c:3998
 msgid "S_ubject"
 msgstr "Ass_unto"
 
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:3957
+#: ../src/main-window.c:4003
 msgid "Show only matching messages"
 msgstr "Mostrar apenas mensagens correspondentes"
 
 #. Frame with OK button
-#: ../src/main-window.c:3978
+#: ../src/main-window.c:4024
 msgid "Open next matching message"
 msgstr "Abrir a próxima mensagem correspondente"
 
-#: ../src/main-window.c:3990
+#: ../src/main-window.c:4036
 msgid "_Reverse search"
 msgstr "Busca _inversa"
 
-#: ../src/main-window.c:3995
+#: ../src/main-window.c:4041
 msgid "_Wrap around"
 msgstr "_Voltar ao início"
 
-#: ../src/main-window.c:4219
+#: ../src/main-window.c:4265
 #, c-format
 msgid "Could not open trash: %s"
 msgstr "Não foi possível abrir a lixeira: %s"
 
-#: ../src/main-window.c:4354
+#: ../src/main-window.c:4400
 #, c-format
 msgid "Balsa: %s (read-only)"
 msgstr "Balsa: %s (somente leitura)"
 
-#: ../src/main-window.c:4356
+#: ../src/main-window.c:4402
 #, c-format
 msgid "Balsa: %s"
 msgstr "Balsa: %s"
 
 #. xgettext: this is the first part of the message
 #. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
-#: ../src/main-window.c:4856
+#: ../src/main-window.c:4902
 #, c-format
 msgid "Shown mailbox: %s "
 msgstr "Mostrando caixa de mensagens: %s "
 
-#: ../src/main-window.c:4861
+#: ../src/main-window.c:4907
 #, c-format
 msgid "with %d message"
 msgid_plural "with %d messages"
 msgstr[0] "com %d mensagem"
 msgstr[1] "com %d mensagens"
 
-#: ../src/main-window.c:4868
+#: ../src/main-window.c:4914
 #, c-format
 msgid ", %d new"
 msgid_plural ", %d new"
 msgstr[0] ", %d nova"
 msgstr[1] ", %d novas"
 
-#: ../src/main-window.c:4875
+#: ../src/main-window.c:4921
 #, c-format
 msgid ", %d hidden"
 msgid_plural ", %d hidden"
 msgstr[0] ", %d escondida"
 msgstr[1] ", %d escondidas"
 
-#: ../src/main-window.c:4920
+#: ../src/main-window.c:4966
 #, c-format
 msgid "The next unread message is in %s"
 msgstr "A próxima mensagem não lida está em %s"
 
-#: ../src/main-window.c:4927
+#: ../src/main-window.c:4973
 #, c-format
 msgid "Do you want to select %s?"
 msgstr "Você deseja selecionar %s?"
@@ -4895,185 +4863,207 @@ msgid "Message from %s: %s"
 msgstr "Mensagem de %s: %s"
 
 # "Recuperar" é bem técnico... mas "retrieve" também.
-#: ../src/pref-manager.c:210
+#: ../src/pref-manager.c:372
 msgid "While retrieving messages"
 msgstr "Enquanto recupera mensagens"
 
-#: ../src/pref-manager.c:211
+#: ../src/pref-manager.c:373
 msgid "Until closed"
 msgstr "Até ser fechado"
 
-#: ../src/pref-manager.c:217
+#: ../src/pref-manager.c:379
 msgid "Message number"
 msgstr "Número da mensagem"
 
-#: ../src/pref-manager.c:221
+#: ../src/pref-manager.c:383
 msgid "Sender"
 msgstr "Remetente"
 
-#: ../src/pref-manager.c:225
+#: ../src/pref-manager.c:387
 msgid "Flat"
 msgstr "Plano"
 
-#: ../src/pref-manager.c:227
+#: ../src/pref-manager.c:389
 msgid "JWZ"
 msgstr "JWZ"
 
-#: ../src/pref-manager.c:937
-#, c-format
-msgid "%s (default)"
-msgstr "%s (padrão)"
+#. must NOT be modal
+#: ../src/pref-manager.c:485
+msgid "Balsa Preferences"
+msgstr "Preferências do Balsa"
 
-#: ../src/pref-manager.c:1054
-msgid "Default layout"
-msgstr "Layout padrão"
+#: ../src/pref-manager.c:538
+msgid "Mail options"
+msgstr "Opções de mensagem"
 
-#: ../src/pref-manager.c:1055
-msgid "Wide message layout"
-msgstr "Layout de mensagens ampla"
+#: ../src/pref-manager.c:540
+msgid "Display options"
+msgstr "Opções de exibição"
 
-#: ../src/pref-manager.c:1056
-msgid "Wide screen layout"
-msgstr "Layout de tela ampla"
+#: ../src/pref-manager.c:542 ../src/pref-manager.c:2794
+msgid "Address books"
+msgstr "Catálogos de endereços"
 
-#: ../src/pref-manager.c:1064
-msgid "Show next unread message"
-msgstr "Mostra a próxima mensagem não lida"
+#: ../src/pref-manager.c:546 ../src/toolbar-factory.c:164
+msgid "Spelling"
+msgstr "Verificar ortografia"
 
-#: ../src/pref-manager.c:1065
-msgid "Show next message"
-msgstr "Mostra a próxima mensagem"
+#: ../src/pref-manager.c:550
+msgid "Start-up"
+msgstr "Início"
 
-#: ../src/pref-manager.c:1066
-msgid "Close message window"
-msgstr "Fecha a janela da mensagem"
+#: ../src/pref-manager.c:552 ../src/pref-manager.c:2584
+msgid "Miscellaneous"
+msgstr "Miscelânea"
 
-#: ../src/pref-manager.c:1120
+#: ../src/pref-manager.c:1373
 #, c-format
-msgid "Error displaying %s: %s\n"
-msgstr "Erro de exibição %s: %s\n"
-
-#: ../src/pref-manager.c:1133
-msgid "Show nothing"
-msgstr "Não mostrar nada"
-
-#: ../src/pref-manager.c:1135
-msgid "Show dialog"
-msgstr "Mostrar diálogo"
-
-#: ../src/pref-manager.c:1137
-msgid "Show in list"
-msgstr "Mostrar na lista"
-
-#: ../src/pref-manager.c:1139
-msgid "Show in status bar"
-msgstr "Mostrar na barra de status"
-
-#: ../src/pref-manager.c:1141
-msgid "Print to console"
-msgstr "Mostrar no console"
-
-#: ../src/pref-manager.c:1153
-msgid "Ask me"
-msgstr "Pergunte-me"
-
-#: ../src/pref-manager.c:1701
-msgid "Remote POP3 mailbox…"
-msgstr "Caixa de mensagens POP3 remota…"
-
-#: ../src/pref-manager.c:1705
-msgid "Remote IMAP mailbox…"
-msgstr "Caixa de mensagens IMAP remota…"
-
-#: ../src/pref-manager.c:1709
-msgid "Remote IMAP folder…"
-msgstr "Pasta IMAP remota…"
+msgid "%s (default)"
+msgstr "%s (padrão)"
 
-#: ../src/pref-manager.c:1970
+#: ../src/pref-manager.c:1637
 msgid "Remote mailbox servers"
 msgstr "Servidores remotos de mensagem"
 
-#: ../src/pref-manager.c:1987 ../src/pref-manager.c:2752
+#: ../src/pref-manager.c:1658 ../src/pref-manager.c:2815
 #: ../src/sendmsg-window.c:2681
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/pref-manager.c:1995
+#: ../src/pref-manager.c:1666
 msgid "Mailbox name"
 msgstr "Nome da caixa de mensagens"
 
-#: ../src/pref-manager.c:2017 ../src/pref-manager.c:2100
-#: ../src/pref-manager.c:2795
+#: ../src/pref-manager.c:1686 ../src/pref-manager.c:1758
+#: ../src/pref-manager.c:2858
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../src/pref-manager.c:2039
+#: ../src/pref-manager.c:1700
 msgid "Local mail directory"
 msgstr "Diretório de e-mail local"
 
-#: ../src/pref-manager.c:2042
+#: ../src/pref-manager.c:1702
 msgid "Select your local mail directory"
 msgstr "Selecione seu diretório local de correio"
 
-#: ../src/pref-manager.c:2066
+#: ../src/pref-manager.c:1722
 msgid "Outgoing mail servers"
 msgstr "Servidores para envio de mensagens"
 
-#: ../src/pref-manager.c:2084
+#: ../src/pref-manager.c:1744
 msgid "Server name"
 msgstr "Nome do servidor"
 
-#: ../src/pref-manager.c:2128
+#: ../src/pref-manager.c:1783
+msgid "Mail servers"
+msgstr "Servidores de e-mail"
+
+#: ../src/pref-manager.c:1785
+msgid "Incoming"
+msgstr "Entrada"
+
+#: ../src/pref-manager.c:1787
+msgid "Outgoing"
+msgstr "Saída"
+
+#: ../src/pref-manager.c:1814
 msgid "Checking"
 msgstr "Verificação"
 
-#: ../src/pref-manager.c:2131
+#: ../src/pref-manager.c:1820
 msgid "_Check mail automatically every"
 msgstr "Verifi_car mensagens automaticamente a cada"
 
-#: ../src/pref-manager.c:2139 ../src/pref-manager.c:2311
-#: ../src/pref-manager.c:2926 ../src/pref-manager.c:2975
+#: ../src/pref-manager.c:1829 ../src/pref-manager.c:2607
+#: ../src/pref-manager.c:2666
 msgid "minutes"
 msgstr "minutos"
 
-#: ../src/pref-manager.c:2144
+#: ../src/pref-manager.c:1835
 msgid "Check _IMAP mailboxes"
 msgstr "Verificar caixas de mensagens _IMAP"
 
-#: ../src/pref-manager.c:2148
+#: ../src/pref-manager.c:1840
 msgid "Check Inbox _only"
 msgstr "Verificar a_penas a caixa de entrada"
 
-#: ../src/pref-manager.c:2153
+#: ../src/pref-manager.c:1846
 msgid "When mail arrives:"
 msgstr "Quando uma mensagem chegar:"
 
-#: ../src/pref-manager.c:2158
+#: ../src/pref-manager.c:1851
 msgid "Display message"
 msgstr "Mostrar mensagem"
 
-#: ../src/pref-manager.c:2163
+#: ../src/pref-manager.c:1856
 msgid "Play sound"
 msgstr "Reproduzir som"
 
-#: ../src/pref-manager.c:2168
+#: ../src/pref-manager.c:1861
 msgid "Show icon"
 msgstr "Mostrar ícone"
 
-#: ../src/pref-manager.c:2175
+#: ../src/pref-manager.c:1869
 msgid "Do background check quietly (no messages in status bar)"
 msgstr ""
 "Verificar em segundo plano silenciosamente (sem mensagens na barra de status)"
 
-#: ../src/pref-manager.c:2178
+#: ../src/pref-manager.c:1873
 msgid "_POP message size limit:"
 msgstr "Tamanho limite das mensagens _POP:"
 
-#: ../src/pref-manager.c:2207
+#. Quoted text regular expression
+#. and RFC2646-style flowed text
+#: ../src/pref-manager.c:1899
+msgid "Quoted and flowed text"
+msgstr "Texto citado e preenchido"
+
+#: ../src/pref-manager.c:1904
+msgid "Mark quoted text"
+msgstr "Marcar como citação"
+
+#: ../src/pref-manager.c:1908
+msgid "Quoted text regular expression:"
+msgstr "Expressão regular do texto citado:"
+
+#: ../src/pref-manager.c:1916
+msgid "Wrap text at"
+msgstr "Quebrar texto em"
+
+#: ../src/pref-manager.c:1924 ../src/pref-manager.c:2077
+msgid "characters"
+msgstr "caracteres"
+
+#. handling of multipart/alternative
+#: ../src/pref-manager.c:1939
+msgid "Display of multipart/alternative parts"
+msgstr "Exibição de partes múltiplas/alternativas"
+
+#: ../src/pref-manager.c:1942
+msgid "Prefer text/plain over HTML"
+msgstr "Preferir texto-puro a HTML"
+
+#: ../src/pref-manager.c:1958
+msgid "National (8-bit) characters in broken messages without codeset header"
+msgstr ""
+"Caracteres de nacionalidade (8-bit) na mensagem quebrada sem código no "
+"cabeçalho"
+
+#: ../src/pref-manager.c:1965
+msgid "display as “?”"
+msgstr "exibir como “?”"
+
+#: ../src/pref-manager.c:1973
+msgid "display in codeset"
+msgstr "exibir com a codificação"
+
+#. How to handle received MDN requests
+#: ../src/pref-manager.c:2000
 msgid "Message disposition notification requests"
 msgstr "Requisições de notificação de disposição de mensagem"
 
-#: ../src/pref-manager.c:2212
+#: ../src/pref-manager.c:2002
 msgid ""
 "When I receive a message whose sender requested a Message Disposition "
 "Notification (MDN), send it if:"
@@ -5081,7 +5071,7 @@ msgstr ""
 "Quando receber uma mensagem na qual o remetente requer notificação de "
 "disposição de mensagem (Message Disposition Notification-MDN), enviá-la se:"
 
-#: ../src/pref-manager.c:2220
+#: ../src/pref-manager.c:2014
 msgid ""
 "The message header looks clean (the notify-to address is the return path, "
 "and I am in the “To:” or “CC:” list)."
@@ -5089,283 +5079,280 @@ msgstr ""
 "O cabeçalho da mensagem parece limpo (o endereço em notify-to é igual ao "
 "endereço de resposta, eu estou na lista “Para:” ou “Cc:”)."
 
-#: ../src/pref-manager.c:2234
+#: ../src/pref-manager.c:2028
 msgid "The message header looks suspicious."
 msgstr "O cabeçalho da mensagem parece suspeito."
 
-#: ../src/pref-manager.c:2258
+#: ../src/pref-manager.c:2062
 msgid "Word wrap"
 msgstr "Quebra de palavra"
 
-#: ../src/pref-manager.c:2261
+#: ../src/pref-manager.c:2067
 msgid "Wrap outgoing text at"
 msgstr "Quebrar texto de saída em"
 
-#: ../src/pref-manager.c:2270 ../src/pref-manager.c:2525
-msgid "characters"
-msgstr "caracteres"
-
-#: ../src/pref-manager.c:2289
+#: ../src/pref-manager.c:2090
 msgid "Other options"
 msgstr "Outras opções"
 
-#: ../src/pref-manager.c:2291
+#: ../src/pref-manager.c:2095
 msgid "Reply prefix:"
 msgstr "Prefixo de resposta:"
 
-#: ../src/pref-manager.c:2294
+#: ../src/pref-manager.c:2098
 msgid "Automatically quote original when replying"
 msgstr "Citar a mensagem original quando responder"
 
-#: ../src/pref-manager.c:2297
+#: ../src/pref-manager.c:2101
 msgid "Forward a mail as attachment instead of quoting it"
 msgstr "Encaminhar mensagens como anexos em vez de citá-las"
 
-#: ../src/pref-manager.c:2300
+#: ../src/pref-manager.c:2104
 msgid "Copy outgoing messages to sentbox"
 msgstr "Copiar as mensagens de saída para a pasta enviadas"
 
-#: ../src/pref-manager.c:2302
+#: ../src/pref-manager.c:2106
 msgid "Send button always queues outgoing mail in outbox"
 msgstr "O botão enviar enfileira as mensagens na caixa de saída"
 
-#: ../src/pref-manager.c:2306
-#| msgid "_Check mail automatically every"
-msgid "_Send queued mail automatically every"
-msgstr "_Enviar mensagens enfileirados automaticamente a cada"
-
-#: ../src/pref-manager.c:2316
+#: ../src/pref-manager.c:2109
 msgid "Edit headers in external editor"
 msgstr "Editar cabeçalhos em um editor externo"
 
-#: ../src/pref-manager.c:2318
+#: ../src/pref-manager.c:2111
 msgid "Include HTML parts as text when replying or forwarding"
 msgstr "Incluir partes HTML como texto quando responder ou encaminhar"
 
-#: ../src/pref-manager.c:2336 ../src/toolbar-prefs.c:170
+#: ../src/pref-manager.c:2128
+msgid "Layout"
+msgstr "Layout"
+
+#: ../src/pref-manager.c:2130
+msgid "Sort and thread"
+msgstr "Ordenar e encadear"
+
+#: ../src/pref-manager.c:2132 ../src/print-gtk.c:497
+msgid "Message"
+msgstr "Mensagem"
+
+#: ../src/pref-manager.c:2134
+msgid "Colors"
+msgstr "Cores"
+
+#: ../src/pref-manager.c:2136 ../src/pref-manager.c:2223
+msgid "Format"
+msgstr "Formato"
+
+#: ../src/pref-manager.c:2138
+msgid "Status messages"
+msgstr "Mensagens de estado"
+
+#: ../src/pref-manager.c:2163 ../src/toolbar-prefs.c:170
 msgid "Main window"
 msgstr "Janela principal"
 
-#: ../src/pref-manager.c:2339
+#: ../src/pref-manager.c:2166
 msgid "Use preview pane"
 msgstr "Usar painel de visualização"
 
-#: ../src/pref-manager.c:2343
-#| msgid "Select all messages in current mailbox"
-msgid "Show message counts in mailbox list"
-msgstr "Mostrar contagem de mensagens na lista de caixa de mensagens atual"
+#: ../src/pref-manager.c:2168
+msgid "Show mailbox statistics in left pane"
+msgstr "Mostrar estatísticas da caixa de mensagens no painel esquerdo"
 
-#: ../src/pref-manager.c:2349
+#: ../src/pref-manager.c:2172
 msgid "Automatically view message when mailbox opened"
 msgstr "Ver as mensagens automaticamente quando abrir a caixa de mensagens"
 
-#: ../src/pref-manager.c:2352
+#: ../src/pref-manager.c:2175
 msgid "Ask me before selecting a different mailbox to show an unread message"
 msgstr ""
 "Perguntar antes de selecionar uma caixa de mensagens diferente para exibir "
 "uma mensagem não lida"
 
-#: ../src/pref-manager.c:2356
+#: ../src/pref-manager.c:2181
 msgid "Page Up/Page Down keys scroll text by"
 msgstr "Teclas Page Up/Page Down rolam o texto em"
 
-#: ../src/pref-manager.c:2364
+#: ../src/pref-manager.c:2189
 msgid "percent"
 msgstr "porcento"
 
-#: ../src/pref-manager.c:2381 ../src/toolbar-prefs.c:192
-msgid "Message window"
-msgstr "Janela de mensagem"
-
-#: ../src/pref-manager.c:2383
-msgid "After moving a message:"
-msgstr "Após mover uma mensagem:"
-
-#: ../src/pref-manager.c:2404
-msgid "Sorting and threading"
-msgstr "Ordenação e encadeamento"
-
-#: ../src/pref-manager.c:2406
-msgid "Default sort column:"
-msgstr "Coluna de ordenação padrão:"
-
-#: ../src/pref-manager.c:2413
-msgid "Default threading style:"
-msgstr "Estilo de encadeamento padrão:"
-
-#: ../src/pref-manager.c:2421
-msgid "Expand threads on open"
-msgstr "Expandir encadeamentos ao abrir"
-
-#: ../src/pref-manager.c:2446 ../src/print-gtk.c:506
-msgid "Fonts"
-msgstr "Fontes"
-
-#: ../src/pref-manager.c:2449
-msgid "Use system fonts"
-msgstr "Usar fontes do sistema"
-
-#: ../src/pref-manager.c:2457
-msgid "Use default font size"
-msgstr "Usar tamanho de fonte padrão"
+#: ../src/pref-manager.c:2203
+msgid "Display progress dialog"
+msgstr "Exibir diálogo de progresso"
 
-#: ../src/pref-manager.c:2463
-msgid "Message font:"
-msgstr "Fonte da mensagem:"
+#: ../src/pref-manager.c:2228
+msgid "Date encoding (for strftime):"
+msgstr "Codificação de data (para strftime):"
 
-#: ../src/pref-manager.c:2470
-msgid "Subject font:"
-msgstr "Fonte do assunto:"
+#: ../src/pref-manager.c:2230
+msgid "Selected headers:"
+msgstr "Cabeçalhos selecionados:"
 
-#. Quoted text regular expression
-#. and RFC2646-style flowed text
-#: ../src/pref-manager.c:2510
-msgid "Quoted and flowed text"
-msgstr "Texto citado e preenchido"
+#: ../src/pref-manager.c:2252
+msgid "Information messages"
+msgstr "Mensagens de informação"
 
-#: ../src/pref-manager.c:2513
-msgid "Mark quoted text"
-msgstr "Marcar como citação"
+#: ../src/pref-manager.c:2257
+msgid "Information messages:"
+msgstr "Mensagens de informação:"
 
-#: ../src/pref-manager.c:2516
-msgid "Quoted text regular expression:"
-msgstr "Expressão regular do texto citado:"
+#: ../src/pref-manager.c:2261
+msgid "Warning messages:"
+msgstr "Mensagens de advertência:"
 
-#: ../src/pref-manager.c:2519
-msgid "Wrap text at"
-msgstr "Quebrar texto em"
+#: ../src/pref-manager.c:2265
+msgid "Error messages:"
+msgstr "Mensagens de erro:"
 
-#. handling of multipart/alternative
-#: ../src/pref-manager.c:2542
-msgid "Display of multipart/alternative parts"
-msgstr "Exibição de partes múltiplas/alternativas"
+#: ../src/pref-manager.c:2269
+msgid "Fatal error messages:"
+msgstr "Mensagens de erro fatais:"
 
-#: ../src/pref-manager.c:2546
-msgid "Prefer text/plain over HTML"
-msgstr "Preferir texto-puro a HTML"
+#: ../src/pref-manager.c:2273
+msgid "Debug messages:"
+msgstr "Mensagens de depuração:"
 
-#: ../src/pref-manager.c:2562
+#: ../src/pref-manager.c:2298
 msgid "Message colors"
 msgstr "Cores das mensagens"
 
-#: ../src/pref-manager.c:2567
+#: ../src/pref-manager.c:2304
 #, c-format
 msgid "Quote level %d color"
 msgstr "Cor do nível %d da citação"
 
-#: ../src/pref-manager.c:2585
+#: ../src/pref-manager.c:2317
 msgid "Link color"
 msgstr "Cor do link"
 
-#: ../src/pref-manager.c:2587
+#: ../src/pref-manager.c:2319
 msgid "Hyperlink color"
 msgstr "Cor dos hyperlinks"
 
-#: ../src/pref-manager.c:2602 ../src/pref-manager.c:3217
-msgid "Format"
-msgstr "Formato"
+#: ../src/pref-manager.c:2405 ../src/print-gtk.c:506
+msgid "Fonts"
+msgstr "Fontes"
 
-#: ../src/pref-manager.c:2605
-msgid "Date encoding (for strftime):"
-msgstr "Codificação de data (para strftime):"
+#: ../src/pref-manager.c:2411
+msgid "Use system fonts"
+msgstr "Usar fontes do sistema"
 
-#: ../src/pref-manager.c:2607
-msgid "Selected headers:"
-msgstr "Cabeçalhos selecionados:"
+#: ../src/pref-manager.c:2419
+msgid "Message font:"
+msgstr "Fonte da mensagem:"
 
-#. treatment of messages with 8-bit chars, but without proper MIME encoding
-#: ../src/pref-manager.c:2625
-msgid "National (8-bit) characters in broken messages without codeset header"
-msgstr ""
-"Caracteres de nacionalidade (8-bit) na mensagem quebrada sem código no "
-"cabeçalho"
+#: ../src/pref-manager.c:2426
+msgid "Subject font:"
+msgstr "Fonte do assunto:"
 
-#: ../src/pref-manager.c:2630
-msgid "display as “?”"
-msgstr "exibir como “?”"
+#: ../src/pref-manager.c:2434
+msgid "Use default font size"
+msgstr "Usar tamanho de fonte padrão"
 
-#: ../src/pref-manager.c:2638
-msgid "display in codeset"
-msgstr "exibir com a codificação"
+#: ../src/pref-manager.c:2490
+msgid "Sorting and threading"
+msgstr "Ordenação e encadeamento"
 
-#: ../src/pref-manager.c:2663
-msgid "Information messages"
-msgstr "Mensagens de informação"
+#: ../src/pref-manager.c:2494
+msgid "Default sort column:"
+msgstr "Coluna de ordenação padrão:"
 
-#: ../src/pref-manager.c:2667
-msgid "Information messages:"
-msgstr "Mensagens de informação:"
+#: ../src/pref-manager.c:2498
+msgid "Default threading style:"
+msgstr "Estilo de encadeamento padrão:"
 
-#: ../src/pref-manager.c:2671
-msgid "Warning messages:"
-msgstr "Mensagens de advertência:"
+#: ../src/pref-manager.c:2503
+msgid "Expand threads on open"
+msgstr "Expandir encadeamentos ao abrir"
 
-#: ../src/pref-manager.c:2675
-msgid "Error messages:"
-msgstr "Mensagens de erro:"
+#: ../src/pref-manager.c:2556
+msgid "Miscellaneous spelling settings"
+msgstr "Configurações diversas de ortografia"
 
-#: ../src/pref-manager.c:2679
-msgid "Fatal error messages:"
-msgstr "Mensagens de erro fatais:"
+#: ../src/pref-manager.c:2558
+msgid "Check signature"
+msgstr "Verificar assinatura"
 
-#: ../src/pref-manager.c:2683
-msgid "Debug messages:"
-msgstr "Mensagens de depuração:"
+# 46
+#: ../src/pref-manager.c:2559
+msgid "Check quoted"
+msgstr "Verificar citação"
 
-#: ../src/pref-manager.c:2701
-msgid "Display progress dialog"
-msgstr "Exibir diálogo de progresso"
+#: ../src/pref-manager.c:2586
+msgid "Debug"
+msgstr "Depurar"
 
-#: ../src/pref-manager.c:2732 ../src/pref-manager.c:3350
-msgid "Address books"
-msgstr "Catálogos de endereços"
+#: ../src/pref-manager.c:2587
+msgid "Empty trash on exit"
+msgstr "Esvaziar a lixeira ao sair"
 
-#: ../src/pref-manager.c:2760
-msgid "Address book name"
-msgstr "Nome do catálogo de endereços"
+#: ../src/pref-manager.c:2594
+msgid "Close mailbox if unused more than"
+msgstr "Fechar caixa de mensagens automaticamente se não usada por mais de"
 
-#: ../src/pref-manager.c:2768
-msgid "Auto-complete"
-msgstr "Completamento automático"
+# Fica melhor "Exclusão" do que "Excluindo" na interface gráfica
+#: ../src/pref-manager.c:2622
+msgid "Deleting messages"
+msgstr "Exclusão de mensagens"
 
-#: ../src/pref-manager.c:2801
-msgid "_Set as default"
-msgstr "_Definir como padrão"
+#. Translators: this used to be "using Mailbox -> Hide messages";
+#. * the UTF-8 string for the right-arrow symbol is broken out to
+#. * avoid msgconv problems.
+#: ../src/pref-manager.c:2627
+#, c-format
+msgid ""
+"The following setting is global, but may be overridden for the selected "
+"mailbox using Mailbox %s Hide messages:"
+msgstr ""
+"A seguintes configurações são globais, mas podem ser sobrepostas pela caixa "
+"de mensagens selecionada usando %s Ocultar mensagens mensagens:"
 
-#: ../src/pref-manager.c:2818
-msgid "Miscellaneous spelling settings"
-msgstr "Configurações diversas de ortografia"
+#: ../src/pref-manager.c:2639
+msgid "Hide messages marked as deleted"
+msgstr "Ocultar mensagens marcadas como excluídas"
 
-#: ../src/pref-manager.c:2822
-msgid "Check signature"
-msgstr "Verificar assinatura"
+#: ../src/pref-manager.c:2641
+msgid "The following settings are global:"
+msgstr "As configurações seguintes são globais:"
 
-# 46
-#: ../src/pref-manager.c:2824
-msgid "Check quoted"
-msgstr "Verificar citação"
+#: ../src/pref-manager.c:2647
+msgid "Expunge deleted messages when mailbox is closed"
+msgstr "Apagar as mensagens excluídas ao fechar a caixa de mensagens"
 
-#: ../src/pref-manager.c:2840
+#: ../src/pref-manager.c:2654
+msgid "…and if unused more than"
+msgstr "…e se não for usada por mais de"
+
+#: ../src/pref-manager.c:2678 ../src/toolbar-prefs.c:192
+msgid "Message window"
+msgstr "Janela de mensagem"
+
+#: ../src/pref-manager.c:2683
+msgid "After moving a message:"
+msgstr "Após mover uma mensagem:"
+
+#: ../src/pref-manager.c:2709
 msgid "Start-up options"
 msgstr "Opções de inicialização"
 
-#: ../src/pref-manager.c:2843
+#: ../src/pref-manager.c:2712
 msgid "Open Inbox upon start-up"
 msgstr "Abrir a caixa de entrada ao iniciar"
 
-#: ../src/pref-manager.c:2845
+#: ../src/pref-manager.c:2714
 msgid "Check mail upon start-up"
 msgstr "Verificar mensagens ao iniciar"
 
-#: ../src/pref-manager.c:2847
+#: ../src/pref-manager.c:2716
 msgid "Remember open mailboxes between sessions"
 msgstr "Lembrar de caixas de mensagens abertas entre sessões"
 
-#: ../src/pref-manager.c:2865
+#: ../src/pref-manager.c:2730
 msgid "Folder scanning"
 msgstr "Busca em pastas"
 
-#: ../src/pref-manager.c:2868
+#: ../src/pref-manager.c:2732
 msgid ""
 "Choose depth 1 for fast start-up; this defers scanning some folders. To see "
 "more of the tree at start-up, choose a greater depth."
@@ -5374,107 +5361,90 @@ msgstr ""
 "algumas pastas. Para ver mais da árvore ao iniciar, escolha uma profundidade "
 "maior."
 
-#: ../src/pref-manager.c:2875
+#: ../src/pref-manager.c:2743
 msgid "Scan local folders to depth"
 msgstr "Buscar em pastas locais até a profundidade"
 
-#: ../src/pref-manager.c:2884
+#: ../src/pref-manager.c:2755
 msgid "Scan IMAP folders to depth"
 msgstr "Buscar em pastas IMAP até a profundidade"
 
-#: ../src/pref-manager.c:2906 ../src/pref-manager.c:3364
-msgid "Miscellaneous"
-msgstr "Miscelânea"
-
-#: ../src/pref-manager.c:2909
-msgid "Debug"
-msgstr "Depurar"
-
-#: ../src/pref-manager.c:2911
-msgid "Empty trash on exit"
-msgstr "Esvaziar a lixeira ao sair"
+#: ../src/pref-manager.c:2823
+msgid "Address book name"
+msgstr "Nome do catálogo de endereços"
 
-#: ../src/pref-manager.c:2915
-msgid "Close mailbox if unused more than"
-msgstr "Fechar caixa de mensagens automaticamente se não usada por mais de"
+#: ../src/pref-manager.c:2831
+msgid "Auto-complete"
+msgstr "Completamento automático"
 
-# Fica melhor "Exclusão" do que "Excluindo" na interface gráfica
-#: ../src/pref-manager.c:2943
-msgid "Deleting messages"
-msgstr "Exclusão de mensagens"
+#: ../src/pref-manager.c:2864
+msgid "_Set as default"
+msgstr "_Definir como padrão"
 
-#. Translators: this used to be "using Mailbox -> Hide messages";
-#. * the UTF-8 string for the right-arrow symbol is broken out to
-#. * avoid msgconv problems.
-#: ../src/pref-manager.c:2948
-#, c-format
-msgid ""
-"The following setting is global, but may be overridden for the selected "
-"mailbox using Mailbox %s Hide messages:"
-msgstr ""
-"A seguintes configurações são globais, mas podem ser sobrepostas pela caixa "
-"de mensagens selecionada usando %s Ocultar mensagens mensagens:"
+#: ../src/pref-manager.c:3165
+msgid "Remote POP3 mailbox…"
+msgstr "Caixa de mensagens POP3 remota…"
 
-#: ../src/pref-manager.c:2956
-msgid "Hide messages marked as deleted"
-msgstr "Ocultar mensagens marcadas como excluídas"
+#: ../src/pref-manager.c:3169
+msgid "Remote IMAP mailbox…"
+msgstr "Caixa de mensagens IMAP remota…"
 
-#: ../src/pref-manager.c:2958
-msgid "The following settings are global:"
-msgstr "As configurações seguintes são globais:"
+#: ../src/pref-manager.c:3173
+msgid "Remote IMAP folder…"
+msgstr "Pasta IMAP remota…"
 
-#: ../src/pref-manager.c:2961
-msgid "Expunge deleted messages when mailbox is closed"
-msgstr "Apagar as mensagens excluídas ao fechar a caixa de mensagens"
+#: ../src/pref-manager.c:3292
+msgid "Show nothing"
+msgstr "Não mostrar nada"
 
-#: ../src/pref-manager.c:2965
-msgid "…and if unused more than"
-msgstr "…e se não for usada por mais de"
+#: ../src/pref-manager.c:3294
+msgid "Show dialog"
+msgstr "Mostrar diálogo"
 
-#: ../src/pref-manager.c:3182
-msgid "Mail options"
-msgstr "Opções de mensagem"
+#: ../src/pref-manager.c:3296
+msgid "Show in list"
+msgstr "Mostrar na lista"
 
-#: ../src/pref-manager.c:3186
-msgid "Incoming"
-msgstr "Entrada"
+#: ../src/pref-manager.c:3298
+msgid "Show in status bar"
+msgstr "Mostrar na barra de status"
 
-#: ../src/pref-manager.c:3190
-msgid "Outgoing"
-msgstr "Saída"
+#: ../src/pref-manager.c:3300
+msgid "Print to console"
+msgstr "Mostrar no console"
 
-#: ../src/pref-manager.c:3201
-msgid "Display options"
-msgstr "Opções de exibição"
+#: ../src/pref-manager.c:3312
+msgid "Ask me"
+msgstr "Pergunte-me"
 
-#: ../src/pref-manager.c:3205
-msgid "Sort and thread"
-msgstr "Ordenar e encadear"
+#: ../src/pref-manager.c:3444
+msgid "Default layout"
+msgstr "Layout padrão"
 
-#: ../src/pref-manager.c:3209 ../src/print-gtk.c:497
-msgid "Message"
-msgstr "Mensagem"
+#: ../src/pref-manager.c:3445
+msgid "Wide message layout"
+msgstr "Layout de mensagens ampla"
 
-#: ../src/pref-manager.c:3213
-msgid "Colors"
-msgstr "Cores"
+#: ../src/pref-manager.c:3446
+msgid "Wide screen layout"
+msgstr "Layout de tela ampla"
 
-#: ../src/pref-manager.c:3221
-msgid "Status messages"
-msgstr "Mensagens de estado"
+#: ../src/pref-manager.c:3454
+msgid "Show next unread message"
+msgstr "Mostra a próxima mensagem não lida"
 
-#. must NOT be modal
-#: ../src/pref-manager.c:3292
-msgid "Balsa Preferences"
-msgstr "Preferências do Balsa"
+#: ../src/pref-manager.c:3455
+msgid "Show next message"
+msgstr "Mostra a próxima mensagem"
 
-#: ../src/pref-manager.c:3355 ../src/toolbar-factory.c:166
-msgid "Spelling"
-msgstr "Verificar ortografia"
+#: ../src/pref-manager.c:3456
+msgid "Close message window"
+msgstr "Fecha a janela da mensagem"
 
-#: ../src/pref-manager.c:3360
-msgid "Start-up"
-msgstr "Início"
+#: ../src/pref-manager.c:3521
+#, c-format
+msgid "Error displaying %s: %s\n"
+msgstr "Erro de exibição %s: %s\n"
 
 #: ../src/print-gtk.c:89 ../src/print-gtk.c:248
 #, c-format
@@ -5579,11 +5549,11 @@ msgstr "_Direita"
 msgid "Error printing message: %s"
 msgstr "Erro ao imprimir mensagem: %s"
 
-#: ../src/save-restore.c:588
+#: ../src/save-restore.c:587
 msgid "Error during filters loading: "
 msgstr "Erro ao carregar filtros: "
 
-#: ../src/save-restore.c:590
+#: ../src/save-restore.c:589
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -5592,11 +5562,11 @@ msgstr ""
 "Erro ao carregar filtros: %s\n"
 "Os filtros podem não estar corretos."
 
-#: ../src/save-restore.c:711
+#: ../src/save-restore.c:710
 msgid "The option not to recognize “format=flowed” text has been removed."
 msgstr "A opção para não reconhecer o texto “formato=preenchido” foi removida."
 
-#: ../src/save-restore.c:988
+#: ../src/save-restore.c:987
 msgid ""
 "The option not to send “format=flowed” text is now on the Options menu of "
 "the compose window."
@@ -5604,14 +5574,14 @@ msgstr ""
 "A opção para não enviar texto como “formato=preenchido” está agora no menu "
 "Opções da janela Compor mensagem."
 
-#: ../src/save-restore.c:1027
+#: ../src/save-restore.c:1019
 msgid ""
 "The option to request a MDN is now on the Options menu of the compose window."
 msgstr ""
 "A opção para requerer um MDN está agora no menu Opções da janela Compor "
 "Mensagem."
 
-#: ../src/save-restore.c:1104
+#: ../src/save-restore.c:1096
 msgid ""
 "This version of Balsa uses a new user interface; if you have changed Balsa’s "
 "keyboard accelerators, you will need to set them again."
@@ -5857,7 +5827,7 @@ msgstr "Anexar como um tipo MIME:"
 msgid "Character set for file %s changed from “%s” to “%s”."
 msgstr "O conjunto de caracteres para %s foi alterado de “%s” para “%s”."
 
-#: ../src/sendmsg-window.c:1684 ../src/sendmsg-window.c:5034
+#: ../src/sendmsg-window.c:1684 ../src/sendmsg-window.c:5033
 msgid "(no subject)"
 msgstr "(sem assunto)"
 
@@ -5897,7 +5867,7 @@ msgid "Attach file"
 msgstr "Anexar arquivo"
 
 #: ../src/sendmsg-window.c:2119 ../src/sendmsg-window.c:2222
-#: ../src/sendmsg-window.c:6865
+#: ../src/sendmsg-window.c:6863
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -6023,30 +5993,30 @@ msgstr "Não foi possível abrir a pasta rascunhos: %s"
 msgid "Message saved."
 msgstr "Mensagem salva."
 
-#: ../src/sendmsg-window.c:4470 ../src/sendmsg-window.c:4478
-#: ../src/sendmsg-window.c:4485 ../src/sendmsg-window.c:4492
-#: ../src/sendmsg-window.c:4516
+#: ../src/sendmsg-window.c:4469 ../src/sendmsg-window.c:4477
+#: ../src/sendmsg-window.c:4484 ../src/sendmsg-window.c:4491
+#: ../src/sendmsg-window.c:4515
 #, c-format
 msgid "Could not attach the file %s: %s."
 msgstr "Não foi possível anexar o arquivo %s: %s."
 
-#: ../src/sendmsg-window.c:4471
+#: ../src/sendmsg-window.c:4470
 msgid "not an absolute path"
 msgstr "não é um caminho absoluto"
 
-#: ../src/sendmsg-window.c:4479
+#: ../src/sendmsg-window.c:4478
 msgid "not in your directory"
 msgstr "não está em seu diretório"
 
-#: ../src/sendmsg-window.c:4486
+#: ../src/sendmsg-window.c:4485
 msgid "does not exist"
 msgstr "não existe"
 
-#: ../src/sendmsg-window.c:4517
+#: ../src/sendmsg-window.c:4516
 msgid "not in current directory"
 msgstr "não está no diretório atual"
 
-#: ../src/sendmsg-window.c:4567
+#: ../src/sendmsg-window.c:4566
 msgid ""
 "The link that you selected created\n"
 "a “Blind copy” (BCC) address.\n"
@@ -6058,44 +6028,44 @@ msgstr ""
 "Por favor, verifique se o endereço\n"
 "está correto."
 
-#: ../src/sendmsg-window.c:4676
+#: ../src/sendmsg-window.c:4675
 #, c-format
 msgid "Cannot not read the file “%s”: %s"
 msgstr "Não foi possível ler o arquivo “%s”: %s"
 
-#: ../src/sendmsg-window.c:4695
+#: ../src/sendmsg-window.c:4694
 msgid "Include file"
 msgstr "Incluir arquivo"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4880
+#: ../src/sendmsg-window.c:4879
 #, c-format
 msgid "Could not load Face header file %s: %s"
 msgstr "Não foi possível carregar o arquivo de cabeçalho Face %s: %s"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4883
+#: ../src/sendmsg-window.c:4882
 #, c-format
 msgid "Could not load X-Face header file %s: %s"
 msgstr "Não foi possível carregar o arquivo de cabeçalho X-Face %s: %s"
 
-#: ../src/sendmsg-window.c:4991
+#: ../src/sendmsg-window.c:4990
 msgid "No Subject"
 msgstr "Sem assunto"
 
-#: ../src/sendmsg-window.c:4996
+#: ../src/sendmsg-window.c:4995
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/sendmsg-window.c:5017
+#: ../src/sendmsg-window.c:5016
 msgid "You did not specify a subject for this message"
 msgstr "Você não especificou um assunto para esta mensagem"
 
-#: ../src/sendmsg-window.c:5018
+#: ../src/sendmsg-window.c:5017
 msgid "If you would like to provide one, enter it below."
 msgstr "Se você quiser escrever um, digite-o abaixo."
 
-#: ../src/sendmsg-window.c:5111
+#: ../src/sendmsg-window.c:5110
 #, c-format
 msgid ""
 "You did not select encryption for this message, although %s public keys are "
@@ -6106,19 +6076,19 @@ msgstr ""
 "públicas estejam disponíveis para todos os destinatários. Para proteger sua "
 "privacidade, a mensagem deveria ser %s criptografada."
 
-#: ../src/sendmsg-window.c:5133
+#: ../src/sendmsg-window.c:5132
 msgid "Send _encrypted"
 msgstr "_Enviar criptografada"
 
-#: ../src/sendmsg-window.c:5148
+#: ../src/sendmsg-window.c:5147
 msgid "Send _unencrypted"
 msgstr "_Enviar descriptografada"
 
-#: ../src/sendmsg-window.c:5208
+#: ../src/sendmsg-window.c:5207
 msgid "You selected OpenPGP security for this message.\n"
 msgstr "Você selecionou segurança OpenPGP para essa mensagem.\n"
 
-#: ../src/sendmsg-window.c:5213
+#: ../src/sendmsg-window.c:5212
 msgid ""
 "The message text will be sent as plain text and as HTML, but only the plain "
 "part can be signed.\n"
@@ -6126,14 +6096,14 @@ msgstr ""
 "O texto da mensagem será enviado como texto puro e HTML, mas somente a parte "
 "em texto puro pode ser assinada.\n"
 
-#: ../src/sendmsg-window.c:5218
+#: ../src/sendmsg-window.c:5217
 msgid ""
 "The message contains attachments, which cannot be signed or encrypted.\n"
 msgstr ""
 "A mensagem contém anexos, os quais não podem ser assinados ou "
 "criptografados.\n"
 
-#: ../src/sendmsg-window.c:5222
+#: ../src/sendmsg-window.c:5221
 msgid ""
 "You should select MIME mode if the complete message shall be protected. Do "
 "you really want to proceed?"
@@ -6141,36 +6111,36 @@ msgstr ""
 "Você deveria selecionar o modo MIME se a mensagem deve ser protegida "
 "completamente. Você realmente quer prosseguir?"
 
-#: ../src/sendmsg-window.c:5247
+#: ../src/sendmsg-window.c:5246
 #, c-format
 msgid "sending message with GPG mode %d"
 msgstr "enviando mensagem no modo GPG %d"
 
-#: ../src/sendmsg-window.c:5275
+#: ../src/sendmsg-window.c:5274
 msgid "Message could not be created"
 msgstr "A mensagem não pôde ser criada"
 
-#: ../src/sendmsg-window.c:5277
+#: ../src/sendmsg-window.c:5276
 msgid "Message could not be queued in outbox"
 msgstr "A mensagem não pôde ser colocada na caixa de saída"
 
-#: ../src/sendmsg-window.c:5279
+#: ../src/sendmsg-window.c:5278
 msgid "Message could not be saved in sentbox"
 msgstr "A mensagem não pôde ser salva na pasta enviadas"
 
-#: ../src/sendmsg-window.c:5281
+#: ../src/sendmsg-window.c:5280
 msgid "Message could not be sent"
 msgstr "A mensagem não pôde ser enviada"
 
-#: ../src/sendmsg-window.c:5284
+#: ../src/sendmsg-window.c:5283
 msgid "Message could not be signed"
 msgstr "A mensagem não pôde ser assinada"
 
-#: ../src/sendmsg-window.c:5286
+#: ../src/sendmsg-window.c:5285
 msgid "Message could not be encrypted"
 msgstr "A mensagem não pôde ser criptografada"
 
-#: ../src/sendmsg-window.c:5292
+#: ../src/sendmsg-window.c:5291
 #, c-format
 msgid ""
 "Send failed: %s\n"
@@ -6179,45 +6149,45 @@ msgstr ""
 "Falha de envio: %s\n"
 "%s"
 
-#: ../src/sendmsg-window.c:5297
+#: ../src/sendmsg-window.c:5296
 #, c-format
 msgid "Send failed: %s"
 msgstr "Falha de envio: %s"
 
-#: ../src/sendmsg-window.c:5396
+#: ../src/sendmsg-window.c:5395
 #, c-format
 msgid "Could not postpone message: %s"
 msgstr "Não foi possível adiar a mensagem: %s"
 
-#: ../src/sendmsg-window.c:5417
+#: ../src/sendmsg-window.c:5416
 msgid "Message postponed."
 msgstr "Mensagem adiada."
 
-#: ../src/sendmsg-window.c:5422
+#: ../src/sendmsg-window.c:5421
 msgid "Could not postpone message."
 msgstr "Não foi possível adiar a mensagem."
 
-#: ../src/sendmsg-window.c:5634
+#: ../src/sendmsg-window.c:5633
 #, c-format
 msgid "Error starting spell checker: %s"
 msgstr "Erro ao iniciar a verificação ortográfica: %s"
 
-#: ../src/sendmsg-window.c:6385
+#: ../src/sendmsg-window.c:6384
 #, c-format
 msgid "Reply to %s: %s"
 msgstr "Responder a %s: %s"
 
-#: ../src/sendmsg-window.c:6390
+#: ../src/sendmsg-window.c:6389
 #, c-format
 msgid "Forward message to %s: %s"
 msgstr "Encaminhar mensagem a %s: %s"
 
-#: ../src/sendmsg-window.c:6394
+#: ../src/sendmsg-window.c:6393
 #, c-format
 msgid "New message to %s: %s"
 msgstr "Nova mensagem para %s: %s"
 
-#: ../src/sendmsg-window.c:6564
+#: ../src/sendmsg-window.c:6563
 msgid "_Language"
 msgstr "_Idioma"
 
@@ -6437,35 +6407,26 @@ msgid "Send"
 msgstr "Enviar"
 
 #: ../src/toolbar-factory.c:160
-#| msgid "_Send Queued Mail"
-msgid "Send queued"
-msgstr "Enviar mensagens enfileiradas"
-
-#: ../src/toolbar-factory.c:161
 msgid "Exchange"
 msgstr "Enviar e receber"
 
-#: ../src/toolbar-factory.c:162 ../src/toolbar-factory.c:194
-msgid "Queue"
-msgstr "Colocar na caixa de saída"
-
-#: ../src/toolbar-factory.c:163
+#: ../src/toolbar-factory.c:161
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../src/toolbar-factory.c:164
+#: ../src/toolbar-factory.c:162
 msgid "Save"
 msgstr "Salvar"
 
-#: ../src/toolbar-factory.c:165
+#: ../src/toolbar-factory.c:163
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../src/toolbar-factory.c:167
+#: ../src/toolbar-factory.c:165
 msgid "Close"
 msgstr "Fechar"
 
-#: ../src/toolbar-factory.c:168
+#: ../src/toolbar-factory.c:166
 msgid ""
 "Toggle\n"
 "new"
@@ -6473,11 +6434,11 @@ msgstr ""
 "Alternar\n"
 "nova"
 
-#: ../src/toolbar-factory.c:169
+#: ../src/toolbar-factory.c:167
 msgid "Mark all"
 msgstr "Marcar todas"
 
-#: ../src/toolbar-factory.c:170
+#: ../src/toolbar-factory.c:168
 msgid ""
 "All\n"
 "headers"
@@ -6485,7 +6446,7 @@ msgstr ""
 "Todos os\n"
 "cabeçalhos"
 
-#: ../src/toolbar-factory.c:171
+#: ../src/toolbar-factory.c:169
 msgid ""
 "Reset\n"
 "Filter"
@@ -6493,34 +6454,34 @@ msgstr ""
 "Redefinir\n"
 "Filtro"
 
-#: ../src/toolbar-factory.c:172
+#: ../src/toolbar-factory.c:170
 msgid "Message Preview"
 msgstr "Visualização de Mensagem"
 
-#: ../src/toolbar-factory.c:174
+#: ../src/toolbar-factory.c:172
 msgid "Sign"
 msgstr "Assinar"
 
-#: ../src/toolbar-factory.c:175
+#: ../src/toolbar-factory.c:173
 msgid "Encrypt"
 msgstr "Criptografar"
 
-#: ../src/toolbar-factory.c:177
+#: ../src/toolbar-factory.c:175
 msgid "Undo"
 msgstr "Desfazer"
 
-#: ../src/toolbar-factory.c:178
+#: ../src/toolbar-factory.c:176
 msgid "Redo"
 msgstr "Refazer"
 
 # Quebra de linha em analogia à mensagem "Empty\nTrash"
-#: ../src/toolbar-factory.c:179
+#: ../src/toolbar-factory.c:177
 msgid "Expunge"
 msgstr ""
 "Excluir\n"
 "permanentemente"
 
-#: ../src/toolbar-factory.c:180
+#: ../src/toolbar-factory.c:178
 msgid ""
 "Empty\n"
 "Trash"
@@ -6528,41 +6489,45 @@ msgstr ""
 "Esvaziar\n"
 "lixeira"
 
-#: ../src/toolbar-factory.c:181
+#: ../src/toolbar-factory.c:179
 msgid "Edit"
 msgstr "Editar"
 
-#: ../src/toolbar-factory.c:407
+#: ../src/toolbar-factory.c:192
+msgid "Queue"
+msgstr "Colocar na caixa de saída"
+
+#: ../src/toolbar-factory.c:405
 #, c-format
 msgid "Unknown toolbar icon “%s”"
 msgstr "O ícone “%s” da barra de ferramenta é desconhecido"
 
-#: ../src/toolbar-factory.c:484
+#: ../src/toolbar-factory.c:482
 msgid "Queue this message for sending"
 msgstr "Coloca esta mensagem na caixa de saída para envio posterior"
 
-#: ../src/toolbar-factory.c:496
+#: ../src/toolbar-factory.c:494
 msgid "Text Be_low Icons"
 msgstr "Texto abai_xo de ícones"
 
-#: ../src/toolbar-factory.c:497
+#: ../src/toolbar-factory.c:495
 msgid "Priority Text Be_side Icons"
 msgstr "Priorizar texto aci_ma de ícones"
 
-#: ../src/toolbar-factory.c:499
+#: ../src/toolbar-factory.c:497
 msgid "_Icons Only"
 msgstr "Somente íc_ones"
 
-#: ../src/toolbar-factory.c:500
+#: ../src/toolbar-factory.c:498
 msgid "_Text Only"
 msgstr "Somente _texto"
 
-#: ../src/toolbar-factory.c:764
+#: ../src/toolbar-factory.c:760
 #, c-format
 msgid "Use Desktop _Default (%s)"
 msgstr "Usar os _padrões do ambiente (%s)"
 
-#: ../src/toolbar-factory.c:790
+#: ../src/toolbar-factory.c:786
 msgid "_Customize Toolbars…"
 msgstr "_Personalizar barras de ferramentas…"
 
@@ -6625,21 +6590,6 @@ msgstr "Adiciona o item selecionado para a barra de ferramentas"
 msgid "Move selected item down"
 msgstr "Move o item selecionado para baixo"
 
-#~ msgid "Error loading %s: %s\n"
-#~ msgstr "Erro ao carregar %s: %s\n"
-
-#~ msgid "Sending error: %s"
-#~ msgstr "Erro no envio: %s"
-
-#~ msgid "Mail servers"
-#~ msgstr "Servidores de e-mail"
-
-#~ msgid "Layout"
-#~ msgstr "Layout"
-
-#~ msgid "Show mailbox statistics in left pane"
-#~ msgstr "Mostrar estatísticas da caixa de mensagens no painel esquerdo"
-
 #~ msgid "Connect using _SSL:"
 #~ msgstr "Conectar usando _SSL:"
 
@@ -7022,6 +6972,9 @@ msgstr "Move o item selecionado para baixo"
 #~ msgid "Fetch new incoming mail"
 #~ msgstr "Procura novos e-mails"
 
+#~ msgid "_Send Queued Mail"
+#~ msgstr "_Enviar mensagem da fila"
+
 #~ msgid "Send messages from the outbox"
 #~ msgstr "Envia mensagens da caixa de saída"
 
@@ -7175,6 +7128,9 @@ msgstr "Move o item selecionado para baixo"
 #~ msgid "_Select All"
 #~ msgstr "_Selecionar tudo"
 
+#~ msgid "Select all messages in current mailbox"
+#~ msgstr "Seleciona todas as mensagens na caixa de mensagens atual"
+
 #~ msgid "_Delete..."
 #~ msgstr "E_xcluir..."
 
@@ -7619,6 +7575,9 @@ msgstr "Move o item selecionado para baixo"
 #~ msgid "_Postpone"
 #~ msgstr "_Adiar"
 
+#~ msgid "Save this message and close"
+#~ msgstr "Salva esta mensagem e fecha"
+
 #~ msgid "Send _Later"
 #~ msgstr "Enviar mais _tarde"
 
@@ -7830,6 +7789,9 @@ msgstr "Move o item selecionado para baixo"
 #~ msgid "Send _plain"
 #~ msgstr "Enviar como texto _puro"
 
+#~ msgid "Continue message to %s: %s"
+#~ msgstr "Continuar mensagem para %s: %s"
+
 #~ msgid "%s: signing failed: %s"
 #~ msgstr "%s: falha na assinatura: %s"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]