* Remove bell characted (\007) from status messages in Pico. This makes

     it possible to translate them.

1 files changed, 2778 insertions, 1803 deletions

diff --git a/po/alpine.pot b/po/alpine.pot
index f85d114d..4875ac0c 100644
--- a/po/alpine.pot
+++ b/po/alpine.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: chappa@gmx.com\n"
-"POT-Creation-Date: 2013-09-18 23:49-0600\n"
+"POT-Creation-Date: 2017-11-20 22:50-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,24 +17,32 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: alpine/osdep/termin.unx.c:738
+msgid "error on fputs() call!"
+msgstr ""
+
+#: alpine/osdep/termin.unx.c:755
+msgid "error on fputs() or fgets() call!"
+msgstr ""
+
 #. TRANSLATORS: these are command labels for printing screen
 #. TRANSLATORS: command names, editURL means user gets to edit a URL if they
 #. want, editApp is edit application where they edit the application used to
 #. view a URL
-#: alpine/osdep/print.c:109 alpine/mailview.c:728 alpine/send.c:1290
-#: alpine/send.c:4530 alpine/radio.c:50 alpine/mailcmd.c:806
-#: alpine/mailcmd.c:979 alpine/mailcmd.c:1092 alpine/reply.c:846
-#: alpine/reply.c:941 alpine/reply.c:1011 pico/display.c:1358
-#: pico/display.c:1387 pico/display.c:1404
+#: alpine/osdep/print.c:109 alpine/mailview.c:728 alpine/send.c:1346
+#: alpine/send.c:4592 alpine/radio.c:50 alpine/mailcmd.c:852
+#: alpine/mailcmd.c:1025 alpine/mailcmd.c:1140 alpine/reply.c:849
+#: alpine/reply.c:944 alpine/reply.c:1042 pico/display.c:1804
+#: pico/display.c:1832 pico/display.c:1849
 msgid "Yes"
 msgstr ""
 
 #: alpine/osdep/print.c:110 alpine/mailview.c:729 alpine/keymenu.c:555
 #: alpine/keymenu.c:570 alpine/takeaddr.c:581 alpine/takeaddr.c:603
-#: alpine/send.c:1295 alpine/send.c:4535 alpine/send.c:5175 alpine/radio.c:51
-#: alpine/mailcmd.c:807 alpine/mailcmd.c:980 alpine/mailcmd.c:1093
-#: alpine/titlebar.c:539 alpine/reply.c:945 alpine/reply.c:1012
-#: pico/display.c:1362 pico/display.c:1387 pico/display.c:1411
+#: alpine/send.c:1351 alpine/send.c:4597 alpine/send.c:5237 alpine/radio.c:51
+#: alpine/mailcmd.c:853 alpine/mailcmd.c:1026 alpine/mailcmd.c:1141
+#: alpine/titlebar.c:557 alpine/reply.c:948 alpine/reply.c:1047
+#: pico/display.c:1808 pico/display.c:1832 pico/display.c:1856
 msgid "No"
 msgstr ""
 
@@ -71,380 +79,419 @@ msgid "missing argument for option \"-aux\""
 msgstr ""
 
 #: alpine/arg.c:59
-msgid "missing argument for option \"-passfile\""
+msgid "missing argument for option \"-smimedir\""
 msgstr ""
 
 #: alpine/arg.c:60
+msgid "argument to \"-smimedir\" should be fully-qualified"
+msgstr ""
+
+#: alpine/arg.c:63
+msgid "missing argument for option \"-passfile\""
+msgstr ""
+
+#: alpine/arg.c:64
 msgid "argument to \"-passfile\" should be fully-qualified"
 msgstr ""
 
-#: alpine/arg.c:62
+#: alpine/arg.c:66
+msgid "missing argument for option \"-pwdcertdir\""
+msgstr ""
+
+#: alpine/arg.c:67
+msgid "argument to \"-pwdcertdir\" should be fully-qualified"
+msgstr ""
+
+#: alpine/arg.c:70
 msgid "missing argument for option \"-sort\""
 msgstr ""
 
-#: alpine/arg.c:63
+#: alpine/arg.c:71
 #, c-format
 msgid "missing argument for flag \"%c\""
 msgstr ""
 
-#: alpine/arg.c:64
+#: alpine/arg.c:72
 #, c-format
 msgid "Non numeric argument for flag \"%c\""
 msgstr ""
 
-#: alpine/arg.c:65
+#: alpine/arg.c:73
 #, c-format
 msgid "Non numeric argument for \"%s\""
 msgstr ""
 
-#: alpine/arg.c:66
+#: alpine/arg.c:74
 msgid "missing URL for \"-url\""
 msgstr ""
 
-#: alpine/arg.c:67
+#: alpine/arg.c:75
 #, c-format
 msgid "missing attachment for \"%s\""
 msgstr ""
 
-#: alpine/arg.c:68
+#: alpine/arg.c:76
 #, c-format
 msgid "conflicting action: \"%s\""
 msgstr ""
 
 #. TRANSLATORS: An error message about an unknown flag (option)
 #. on the command line
-#: alpine/arg.c:69 pico/main.c:85 pico/pilot.c:52
+#: alpine/arg.c:77 pico/main.c:89 pico/pilot.c:52
 #, c-format
 msgid "unknown flag \"%c\""
 msgstr ""
 
-#: alpine/arg.c:70
+#: alpine/arg.c:78
 #, c-format
 msgid "-I argument \"%s\": %s"
 msgstr ""
 
-#: alpine/arg.c:71
+#: alpine/arg.c:79
 #, c-format
 msgid "-d argument \"%s\": %s"
 msgstr ""
 
-#: alpine/arg.c:73
+#: alpine/arg.c:81
 msgid ""
 "missing argument for option \"-copy_pinerc\"\n"
 "Usage: pine -copy_pinerc <local_pinerc> <remote_pinerc>"
 msgstr ""
 
-#: alpine/arg.c:74
+#: alpine/arg.c:82
 msgid ""
 "missing argument for option \"-copy_abook\"\n"
 "Usage: pine -copy_abook <local_abook> <remote_abook>"
 msgstr ""
 
-#: alpine/arg.c:78
+#: alpine/arg.c:86
 msgid "Possible Starting Arguments for Alpine program:"
 msgstr ""
 
-#: alpine/arg.c:80
+#: alpine/arg.c:88
 msgid " Argument\tMeaning"
 msgstr ""
 
-#: alpine/arg.c:81
+#: alpine/arg.c:89
 msgid " <addrs>...\tGo directly into composer sending to given address"
 msgstr ""
 
-#: alpine/arg.c:82
+#: alpine/arg.c:90
 msgid "\t\tList multiple addresses with a single space between them."
 msgstr ""
 
-#: alpine/arg.c:83
+#: alpine/arg.c:91
 msgid "\t\tStandard input redirection is allowed with addresses."
 msgstr ""
 
-#: alpine/arg.c:84
+#: alpine/arg.c:92
 msgid "\t\tNote: Places addresses in the \"To\" field only."
 msgstr ""
 
-#: alpine/arg.c:85
+#: alpine/arg.c:93
 msgid " -attach <file>\tGo directly into composer with given file"
 msgstr ""
 
-#: alpine/arg.c:86
+#: alpine/arg.c:94
 msgid " -attachlist <file-list>"
 msgstr ""
 
-#: alpine/arg.c:87
+#: alpine/arg.c:95
 msgid " -attach_and_delete <file>"
 msgstr ""
 
-#: alpine/arg.c:88
+#: alpine/arg.c:96
 msgid "\t\tGo to composer, attach file, delete when finished"
 msgstr ""
 
-#: alpine/arg.c:89
+#: alpine/arg.c:97
 msgid "\t\tNote: Attach options can't be used if -f, -F"
 msgstr ""
 
-#: alpine/arg.c:90
+#: alpine/arg.c:98
 msgid "\t\tadded to Attachment list.  Attachlist must be the last"
 msgstr ""
 
-#: alpine/arg.c:91
+#: alpine/arg.c:99
 msgid "\t\toption on the command line"
 msgstr ""
 
-#: alpine/arg.c:92
+#: alpine/arg.c:100
 msgid " -bail\t\tExit if pinerc file doesn't already exist"
 msgstr ""
 
-#: alpine/arg.c:94
+#: alpine/arg.c:102
 msgid " -d n\t\tDebug - set debug level to 'n', or use the following:"
 msgstr ""
 
-#: alpine/arg.c:95
+#: alpine/arg.c:103
 msgid ""
 " -d keywords...\tflush,timestamp,imap=0..4,tcp,numfiles=0..31,verbose=0..9"
 msgstr ""
 
-#: alpine/arg.c:97
+#: alpine/arg.c:105
 msgid " -f <folder>\tFolder - give folder name to open"
 msgstr ""
 
-#: alpine/arg.c:98
+#: alpine/arg.c:106
 msgid " -c <number>\tContext - which context to apply to -f arg"
 msgstr ""
 
-#: alpine/arg.c:99
+#: alpine/arg.c:107
 msgid " -F <file>\tFile - give file name to open and page through and"
 msgstr ""
 
-#: alpine/arg.c:100
+#: alpine/arg.c:108
 msgid "\t\tforward as email."
 msgstr ""
 
-#: alpine/arg.c:101
+#: alpine/arg.c:109
 msgid " -h \t\tHelp - give this list of options"
 msgstr ""
 
-#: alpine/arg.c:102
+#: alpine/arg.c:110
 msgid " -k \t\tKeys - Force use of function keys"
 msgstr ""
 
-#: alpine/arg.c:103
+#: alpine/arg.c:111
 msgid " -z \t\tSuspend - allow use of ^Z suspension"
 msgstr ""
 
-#: alpine/arg.c:104
+#: alpine/arg.c:112
 msgid " -r \t\tRestricted - can only send mail to oneself"
 msgstr ""
 
-#: alpine/arg.c:105
+#: alpine/arg.c:113
 msgid " -sort <sort>\tSort - Specify sort order of folder:"
 msgstr ""
 
-#: alpine/arg.c:106
+#: alpine/arg.c:114
 msgid "\t\t\tarrival, subject, threaded, orderedsubject, date,"
 msgstr ""
 
-#: alpine/arg.c:107
+#: alpine/arg.c:115
 msgid "\t\t\tfrom, size, score, to, cc, /reverse"
 msgstr ""
 
-#: alpine/arg.c:108
+#: alpine/arg.c:116
 msgid " -i\t\tIndex - Go directly to index, bypassing main menu"
 msgstr ""
 
-#: alpine/arg.c:109
+#: alpine/arg.c:117
 msgid " -I <keystroke_list>   Initial keystrokes to be executed"
 msgstr ""
 
-#: alpine/arg.c:110
+#: alpine/arg.c:118
 msgid " -n <number>\tEntry in index to begin on"
 msgstr ""
 
-#: alpine/arg.c:111
+#: alpine/arg.c:119
 msgid " -o \t\tReadOnly - Open first folder read-only"
 msgstr ""
 
-#: alpine/arg.c:112
+#: alpine/arg.c:120
 msgid " -conf\t\tConfiguration - Print out fresh global configuration. The"
 msgstr ""
 
-#: alpine/arg.c:113
+#: alpine/arg.c:121
 msgid "\t\tvalues of your global configuration affect all Alpine users"
 msgstr ""
 
-#: alpine/arg.c:114
+#: alpine/arg.c:122
 msgid "\t\ton your system unless they have overridden the values in their"
 msgstr ""
 
-#: alpine/arg.c:115
+#: alpine/arg.c:123
 msgid "\t\tpinerc files."
 msgstr ""
 
-#: alpine/arg.c:116
+#: alpine/arg.c:124
 msgid ""
 " -pinerc <file>\tConfiguration - Put fresh pinerc configuration in <file>"
 msgstr ""
 
-#: alpine/arg.c:117
+#: alpine/arg.c:125
 msgid " -p <pinerc>\tUse alternate .pinerc file"
 msgstr ""
 
-#: alpine/arg.c:119
+#: alpine/arg.c:127
 msgid " -P <pine.conf>\tUse alternate pine.conf file"
 msgstr ""
 
-#: alpine/arg.c:121
+#: alpine/arg.c:129
 msgid " -aux <aux_files_dir>\tUse this with remote pinerc"
 msgstr ""
 
-#: alpine/arg.c:122
+#: alpine/arg.c:130
 msgid " -P <pine.conf>\tUse pine.conf file for default settings"
 msgstr ""
 
-#: alpine/arg.c:123
+#: alpine/arg.c:131
 msgid " -nosplash \tDisable the PC-Alpine splash screen"
 msgstr ""
 
-#: alpine/arg.c:127
+#: alpine/arg.c:135
 msgid " -erase_stored_passwords\tEliminate any stored passwords"
 msgstr ""
 
-#: alpine/arg.c:131
+#: alpine/arg.c:139
+msgid ""
+" -smimedir <fully_qualified_path>\tdirectory where smime personal "
+"certificates are saved"
+msgstr ""
+
+#: alpine/arg.c:143
 msgid ""
 " -passfile <fully_qualified_filename>\tSet the password file to something "
 "other"
 msgstr ""
 
-#: alpine/arg.c:132
+#: alpine/arg.c:144
 msgid "\t\tthan the default"
 msgstr ""
 
-#: alpine/arg.c:136
+#: alpine/arg.c:146
+msgid ""
+" -pwdcertdir <fully_qualified_path>\tSet the directory to store a personal"
+msgstr ""
+
+#: alpine/arg.c:147
+msgid "\t\tkey and certificate to encrypt and decrypt your password file."
+msgstr ""
+
+#: alpine/arg.c:152
 msgid ""
 " -nowrite_password_cache\tRead from a password cache if there is one, but"
 msgstr ""
 
-#: alpine/arg.c:137
+#: alpine/arg.c:153
 msgid "\t\t\t\tnever offer to write a password to the cache"
 msgstr ""
 
-#: alpine/arg.c:140
+#: alpine/arg.c:156
 msgid " -x <config>\tUse configuration exceptions in <config>."
 msgstr ""
 
-#: alpine/arg.c:141
+#: alpine/arg.c:157
 msgid "\t\tExceptions are used to override your default pinerc"
 msgstr ""
 
-#: alpine/arg.c:142
+#: alpine/arg.c:158
 msgid "\t\tsettings for a particular platform, can be a local file or"
 msgstr ""
 
-#: alpine/arg.c:143
+#: alpine/arg.c:159
 msgid "\t\ta remote folder."
 msgstr ""
 
-#: alpine/arg.c:144
+#: alpine/arg.c:160
 msgid " -v \t\tVersion - show version information"
 msgstr ""
 
-#: alpine/arg.c:145
+#: alpine/arg.c:161
 msgid " -version\tVersion - show version information"
 msgstr ""
 
-#: alpine/arg.c:146
+#: alpine/arg.c:162
 msgid " -supported\tList supported options"
 msgstr ""
 
-#: alpine/arg.c:147
+#: alpine/arg.c:163
 msgid " -url <url>\tOpen the given URL"
 msgstr ""
 
-#: alpine/arg.c:148
+#: alpine/arg.c:164
 msgid "\t\tNote: Can't be used if -f, -F"
 msgstr ""
 
-#: alpine/arg.c:149
+#: alpine/arg.c:165
 msgid "\t\tStandard input redirection is not allowed with URLs."
 msgstr ""
 
-#: alpine/arg.c:150
+#: alpine/arg.c:166
 msgid "\t\tFor mailto URLs, 'body='text should be used in place of"
 msgstr ""
 
-#: alpine/arg.c:151
+#: alpine/arg.c:167
 msgid "\t\tinput redirection."
 msgstr ""
 
-#: alpine/arg.c:152
+#: alpine/arg.c:168
 msgid ""
 " -copy_pinerc <local_pinerc> <remote_pinerc>  copy local pinerc to remote"
 msgstr ""
 
-#: alpine/arg.c:153
+#: alpine/arg.c:169
 msgid ""
 " -copy_abook <local_abook> <remote_abook>     copy local addressbook to "
 "remote"
 msgstr ""
 
-#: alpine/arg.c:154
+#: alpine/arg.c:170
 msgid " -convert_sigs -p <pinerc>   convert signatures to literal signatures"
 msgstr ""
 
-#: alpine/arg.c:156
+#: alpine/arg.c:172
 msgid " -install \tPrompt for some basic setup information"
 msgstr ""
 
-#: alpine/arg.c:157
+#: alpine/arg.c:173
 msgid " -uninstall \tRemove traces of Alpine from Windows system settings"
 msgstr ""
 
-#: alpine/arg.c:158
+#: alpine/arg.c:174
 msgid " -registry <cmd>\tWhere cmd is set,noset,clear,clearsilent,dump"
 msgstr ""
 
-#: alpine/arg.c:507
+#: alpine/arg.c:573
 msgid "Alpine related Registry values removed."
 msgstr ""
 
-#: alpine/arg.c:511
+#: alpine/arg.c:577
 msgid "Not all Alpine related Registry values could be removed"
 msgstr ""
 
-#: alpine/arg.c:529
+#: alpine/arg.c:595
 msgid "unknown registry command"
 msgstr ""
 
-#: alpine/arg.c:818
+#: alpine/arg.c:696
+msgid "getcwd() call failed while parsing argument (1)"
+msgstr ""
+
+#: alpine/arg.c:742
+msgid "getcwd() call failed while parsing argument (2)"
+msgstr ""
+
+#: alpine/arg.c:888
 msgid "May only have one of -conf and -pinerc"
 msgstr ""
 
-#: alpine/arg.c:971
+#: alpine/arg.c:1041
 #, c-format
 msgid "unknown debug keyword \"%s\""
 msgstr ""
 
-#: alpine/arg.c:1021
+#: alpine/arg.c:1091
 #, c-format
 msgid "unknown flag \"d\", debugging not compiled in"
 msgstr ""
 
-#: alpine/arg.c:1111
+#: alpine/arg.c:1181
 msgid "Argument Error"
 msgstr ""
 
-#: alpine/arg.c:1171
+#: alpine/arg.c:1249
 #, c-format
 msgid "Missing \"=\" after -%s\n"
 msgstr ""
 
-#: alpine/arg.c:1207
+#: alpine/arg.c:1288
 #, c-format
 msgid "Option \"%s\" is obsolete\n"
 msgstr ""
 
-#: alpine/arg.c:1209
+#: alpine/arg.c:1290
 #, c-format
 msgid "Option \"%s\" is not user settable\n"
 msgstr ""
@@ -476,7 +523,7 @@ msgstr ""
 msgid "MESSAGE TEXT"
 msgstr ""
 
-#: alpine/mailview.c:385
+#: alpine/mailview.c:385 alpine/smime.c:1211
 msgid "HELP FOR MESSAGE TEXT VIEW"
 msgstr ""
 
@@ -593,7 +640,7 @@ msgid "Current line contains the only match"
 msgstr ""
 
 #: alpine/mailview.c:3179 alpine/takeaddr.c:1637 alpine/confscroll.c:1281
-#: alpine/mailindx.c:3185 alpine/addrbook.c:5762 alpine/mailpart.c:783
+#: alpine/mailindx.c:3202 alpine/addrbook.c:5762 alpine/mailpart.c:784
 msgid "Word not found"
 msgstr ""
 
@@ -605,7 +652,7 @@ msgstr ""
 msgid "Last Line"
 msgstr ""
 
-#: alpine/mailview.c:3605 alpine/mailindx.c:2981
+#: alpine/mailview.c:3605 alpine/mailindx.c:2998
 #, c-format
 msgid "Word to search for [%s] : "
 msgstr ""
@@ -620,15 +667,15 @@ msgstr ""
 
 #: alpine/mailview.c:5020 alpine/mailview.c:5041 alpine/adrbkcmd.c:158
 #: alpine/adrbkcmd.c:244 alpine/adrbkcmd.c:676 alpine/adrbkcmd.c:807
-#: alpine/alpine.c:2347
+#: alpine/alpine.c:2375
 msgid "Error allocating space."
 msgstr ""
 
 #. TRANSLATORS: Justify is to reformat a paragraph automatically
 #. TRANSLATORS: Del Char is Delete Character
-#: alpine/keymenu.c:56 alpine/keymenu.c:918 alpine/radio.c:376
-#: pico/display.c:87 pico/display.c:1360 pico/display.c:1643 pico/word.c:662
-#: pico/composer.c:140
+#: alpine/keymenu.c:56 alpine/keymenu.c:936 alpine/radio.c:377
+#: pico/display.c:89 pico/display.c:1656 pico/display.c:1695
+#: pico/display.c:1806 pico/display.c:2090 pico/word.c:662 pico/composer.c:140
 msgid "Cancel"
 msgstr ""
 
@@ -647,16 +694,17 @@ msgstr ""
 #: alpine/keymenu.c:105 alpine/keymenu.c:127 alpine/keymenu.c:345
 #: alpine/keymenu.c:375 alpine/keymenu.c:404 alpine/keymenu.c:430
 #: alpine/keymenu.c:462 alpine/keymenu.c:636 alpine/keymenu.c:666
-#: alpine/keymenu.c:714 alpine/keymenu.c:1240 alpine/keymenu.c:1257
-#: alpine/keymenu.c:1458 alpine/keymenu.c:1474 alpine/keymenu.c:1490
-#: alpine/keymenu.c:1519 alpine/keymenu.c:1548 alpine/keymenu.c:1577
-#: alpine/keymenu.c:1606 alpine/keymenu.c:1635 alpine/keymenu.c:1666
-#: alpine/keymenu.c:1697 alpine/keymenu.c:2270 alpine/keymenu.c:2302
-#: alpine/keymenu.c:2319 alpine/keymenu.c:2335 alpine/keymenu.c:2353
-#: alpine/keymenu.c:2382 alpine/keymenu.c:2411 alpine/keymenu.c:2502
-#: alpine/mailcmd.c:7063 alpine/folder.c:3176 alpine/roleconf.c:166
-#: alpine/addrbook.c:2452 alpine/addrbook.c:2456 alpine/addrbook.c:2461
-#: alpine/addrbook.c:2490 pico/browse.c:2204
+#: alpine/keymenu.c:714 alpine/keymenu.c:1258 alpine/keymenu.c:1275
+#: alpine/keymenu.c:1476 alpine/keymenu.c:1492 alpine/keymenu.c:1508
+#: alpine/keymenu.c:1537 alpine/keymenu.c:1566 alpine/keymenu.c:1595
+#: alpine/keymenu.c:1624 alpine/keymenu.c:1653 alpine/keymenu.c:1684
+#: alpine/keymenu.c:1715 alpine/keymenu.c:2288 alpine/keymenu.c:2320
+#: alpine/keymenu.c:2337 alpine/keymenu.c:2353 alpine/keymenu.c:2371
+#: alpine/keymenu.c:2400 alpine/keymenu.c:2429 alpine/keymenu.c:2520
+#: alpine/keymenu.c:2642 alpine/keymenu.c:2759 alpine/mailcmd.c:7340
+#: alpine/folder.c:3188 alpine/roleconf.c:166 alpine/addrbook.c:2452
+#: alpine/addrbook.c:2456 alpine/addrbook.c:2461 alpine/addrbook.c:2490
+#: pico/browse.c:2250
 msgid "Select"
 msgstr ""
 
@@ -669,7 +717,7 @@ msgstr ""
 #. TRANSLATORS: Select current item
 #. TRANSLATORS: Select the current item
 #: alpine/keymenu.c:109 alpine/keymenu.c:347 alpine/keymenu.c:647
-#: alpine/keymenu.c:725 alpine/keymenu.c:855
+#: alpine/keymenu.c:725 alpine/keymenu.c:873
 msgid "SelectCur"
 msgstr ""
 
@@ -680,23 +728,23 @@ msgstr ""
 msgid "ZoomMode"
 msgstr ""
 
-#: alpine/keymenu.c:126 alpine/keymenu.c:1332 alpine/keymenu.c:1349
-#: alpine/keymenu.c:1457 alpine/keymenu.c:1489 alpine/keymenu.c:1547
-#: alpine/keymenu.c:1605 alpine/keymenu.c:1714 pico/display.c:70
-#: pico/display.c:1117
+#: alpine/keymenu.c:126 alpine/keymenu.c:1350 alpine/keymenu.c:1367
+#: alpine/keymenu.c:1475 alpine/keymenu.c:1507 alpine/keymenu.c:1565
+#: alpine/keymenu.c:1623 alpine/keymenu.c:1732 pico/display.c:72
+#: pico/display.c:1367
 msgid "Exit"
 msgstr ""
 
 #. TRANSLATORS: go to Previous entry
-#: alpine/keymenu.c:129 alpine/keymenu.c:1459 alpine/keymenu.c:1475
-#: alpine/keymenu.c:1491 alpine/keymenu.c:1520 alpine/keymenu.c:1549
-#: alpine/keymenu.c:1578 alpine/keymenu.c:1607 alpine/keymenu.c:1636
+#: alpine/keymenu.c:129 alpine/keymenu.c:1477 alpine/keymenu.c:1493
+#: alpine/keymenu.c:1509 alpine/keymenu.c:1538 alpine/keymenu.c:1567
+#: alpine/keymenu.c:1596 alpine/keymenu.c:1625 alpine/keymenu.c:1654
 msgid "Prev"
 msgstr ""
 
-#: alpine/keymenu.c:130 alpine/keymenu.c:1460 alpine/keymenu.c:1476
-#: alpine/keymenu.c:1492 alpine/keymenu.c:1521 alpine/keymenu.c:1550
-#: alpine/keymenu.c:1579 alpine/keymenu.c:1608 alpine/keymenu.c:1637
+#: alpine/keymenu.c:130 alpine/keymenu.c:1478 alpine/keymenu.c:1494
+#: alpine/keymenu.c:1510 alpine/keymenu.c:1539 alpine/keymenu.c:1568
+#: alpine/keymenu.c:1597 alpine/keymenu.c:1626 alpine/keymenu.c:1655
 msgid "Next"
 msgstr ""
 
@@ -714,8 +762,8 @@ msgstr ""
 #. TRANSLATORS: compose a message to the current address
 #. TRANSLATORS: Compose a message to be sent to the current address
 #. book entry
-#: alpine/keymenu.c:148 alpine/keymenu.c:198 alpine/keymenu.c:1279
-#: alpine/keymenu.c:1309 alpine/addrbook.c:2602 alpine/addrbook.c:2673
+#: alpine/keymenu.c:148 alpine/keymenu.c:198 alpine/keymenu.c:1297
+#: alpine/keymenu.c:1327 alpine/addrbook.c:2602 alpine/addrbook.c:2673
 msgid "ComposeTo"
 msgstr ""
 
@@ -738,14 +786,14 @@ msgstr ""
 msgid "NextLink"
 msgstr ""
 
-#: alpine/keymenu.c:178 alpine/keymenu.c:506 alpine/keymenu.c:890
-#: alpine/keymenu.c:1302
+#: alpine/keymenu.c:178 alpine/keymenu.c:506 alpine/keymenu.c:908
+#: alpine/keymenu.c:1320 alpine/keymenu.c:2729
 msgid "Exit Viewer"
 msgstr ""
 
 #: alpine/keymenu.c:187 alpine/keymenu.c:515 alpine/keymenu.c:562
-#: alpine/keymenu.c:578 alpine/keymenu.c:755 alpine/keymenu.c:899
-#: alpine/keymenu.c:1022 alpine/takeaddr.c:66 alpine/mailcmd.c:177
+#: alpine/keymenu.c:578 alpine/keymenu.c:755 alpine/keymenu.c:917
+#: alpine/keymenu.c:1040 alpine/takeaddr.c:66 alpine/mailcmd.c:175
 #: alpine/adrbkcmd.c:5242 alpine/adrbkcmd.c:5273
 msgid "Save"
 msgstr ""
@@ -756,7 +804,7 @@ msgstr ""
 msgid "Results Index"
 msgstr ""
 
-#: alpine/keymenu.c:225 alpine/folder.c:2984 alpine/addrbook.c:2586
+#: alpine/keymenu.c:225 alpine/folder.c:2996 alpine/addrbook.c:2586
 #: alpine/addrbook.c:2644 alpine/addrbook.c:2666 alpine/addrbook.c:2685
 msgid "Main Menu"
 msgstr ""
@@ -764,21 +812,21 @@ msgstr ""
 #. TRANSLATORS: View this Collection of folders
 #. TRANSLATORS: View this collection
 #: alpine/keymenu.c:227 alpine/keymenu.c:289 alpine/keymenu.c:306
-#: alpine/folder.c:3021 alpine/folder.c:3191
+#: alpine/folder.c:3033 alpine/folder.c:3203
 msgid "View Cltn"
 msgstr ""
 
 #. TRANSLATORS: a command name for a particular key
-#: alpine/keymenu.c:256 alpine/keymenu.c:938 alpine/keymenu.c:1425
-#: alpine/keymenu.c:1731 alpine/addrbook.c:2367
+#: alpine/keymenu.c:256 alpine/keymenu.c:956 alpine/keymenu.c:1443
+#: alpine/keymenu.c:1749 alpine/addrbook.c:2367
 msgid "Exit Setup"
 msgstr ""
 
 #. TRANSLATORS: Change is a command meaning Change some item,
 #. or Edit some item to change it
-#: alpine/keymenu.c:257 alpine/keymenu.c:1426 alpine/keymenu.c:1675
-#: alpine/keymenu.c:1732 alpine/keymenu.c:2286 alpine/keymenu.c:2442
-#: alpine/keymenu.c:2472 alpine/keymenu.c:2518 alpine/addrbook.c:2397
+#: alpine/keymenu.c:257 alpine/keymenu.c:1444 alpine/keymenu.c:1693
+#: alpine/keymenu.c:1750 alpine/keymenu.c:2304 alpine/keymenu.c:2460
+#: alpine/keymenu.c:2490 alpine/keymenu.c:2536 alpine/addrbook.c:2397
 msgid "Change"
 msgstr ""
 
@@ -788,8 +836,8 @@ msgstr ""
 
 #. TRANSLATORS: Shuffle refers to shuffling the order of things,
 #. that is, changing the order
-#: alpine/keymenu.c:266 alpine/keymenu.c:355 alpine/keymenu.c:1436
-#: alpine/keymenu.c:1740 alpine/keymenu.c:1777 alpine/keymenu.c:1806
+#: alpine/keymenu.c:266 alpine/keymenu.c:355 alpine/keymenu.c:1454
+#: alpine/keymenu.c:1758 alpine/keymenu.c:1795 alpine/keymenu.c:1824
 #: alpine/addrbook.c:2393
 msgid "Shuffle"
 msgstr ""
@@ -799,29 +847,29 @@ msgstr ""
 #. came from.
 #: alpine/keymenu.c:286 alpine/keymenu.c:304 alpine/keymenu.c:368
 #: alpine/keymenu.c:397 alpine/keymenu.c:461 alpine/keymenu.c:664
-#: alpine/keymenu.c:1238 alpine/keymenu.c:1264 alpine/folder.c:3129
+#: alpine/keymenu.c:1256 alpine/keymenu.c:1282 alpine/folder.c:3141
 #: alpine/addrbook.c:2416
 msgid "ExitSelect"
 msgstr ""
 
 #. TRANSLATORS: make an addition, for example add a new folder
 #. or a new entry in an address book
-#: alpine/keymenu.c:329 alpine/keymenu.c:1738 alpine/takeaddr.c:602
-#: alpine/folder.c:1270 pico/browse.c:2206
+#: alpine/keymenu.c:329 alpine/keymenu.c:1756 alpine/takeaddr.c:602
+#: alpine/folder.c:1270 pico/browse.c:2252
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: change the name of something
-#: alpine/keymenu.c:332 alpine/folder.c:5355 pico/browse.c:118
+#: alpine/keymenu.c:332 alpine/folder.c:5367 pico/browse.c:119
 msgid "Rename"
 msgstr ""
 
-#: alpine/keymenu.c:339 alpine/folder.c:3008
+#: alpine/keymenu.c:339 alpine/folder.c:3020
 msgid "View Fldr"
 msgstr ""
 
 #: alpine/keymenu.c:343 alpine/keymenu.c:767 alpine/keymenu.c:813
-#: alpine/mailcmd.c:175
+#: alpine/mailcmd.c:173
 msgid "Print"
 msgstr ""
 
@@ -837,7 +885,7 @@ msgid "AddNew"
 msgstr ""
 
 #. TRANSLATORS: Subscribe to a news group
-#: alpine/keymenu.c:427 alpine/folder.c:2299 alpine/folder.c:3235
+#: alpine/keymenu.c:427 alpine/folder.c:2299 alpine/folder.c:3247
 msgid "Subscribe"
 msgstr ""
 
@@ -857,7 +905,7 @@ msgstr ""
 msgid "Print All"
 msgstr ""
 
-#: alpine/keymenu.c:485 alpine/print.c:982 pith/ldap.c:1737
+#: alpine/keymenu.c:485 alpine/print.c:982 pith/ldap.c:1868
 msgid "Name"
 msgstr ""
 
@@ -871,7 +919,7 @@ msgstr ""
 msgid "Yes, continue"
 msgstr ""
 
-#: alpine/keymenu.c:554 alpine/imap.c:1573
+#: alpine/keymenu.c:554 alpine/imap.c:1572
 msgid "Details"
 msgstr ""
 
@@ -931,8 +979,8 @@ msgstr ""
 msgid "NextThd"
 msgstr ""
 
-#: alpine/keymenu.c:742 alpine/keymenu.c:1272 alpine/keymenu.c:1303
-#: alpine/folder.c:893 alpine/folder.c:983 pico/browse.c:2198
+#: alpine/keymenu.c:742 alpine/keymenu.c:1290 alpine/keymenu.c:1321
+#: alpine/folder.c:893 alpine/folder.c:983 pico/browse.c:2244
 msgid "View"
 msgstr ""
 
@@ -953,157 +1001,157 @@ msgstr ""
 
 #. TRANSLATORS: View highlighted URL
 #. TRANSLATORS: View the highlighted URL
-#: alpine/keymenu.c:792 alpine/keymenu.c:852
+#: alpine/keymenu.c:792 alpine/keymenu.c:870
 msgid "View Hilite"
 msgstr ""
 
 #. TRANSLATORS: go to Previous URL
 #. TRANSLATORS: go to previous URL
-#: alpine/keymenu.c:795 alpine/keymenu.c:857
+#: alpine/keymenu.c:795 alpine/keymenu.c:875
 msgid "Prev URL"
 msgstr ""
 
 #. TRANSLATORS: go to Next URL
 #. TRANSLATORS: go to next URL
-#: alpine/keymenu.c:797 alpine/keymenu.c:859
+#: alpine/keymenu.c:797 alpine/keymenu.c:877
 msgid "Next URL"
 msgstr ""
 
 #. TRANSLATORS: go to Message Index
-#: alpine/keymenu.c:824
+#: alpine/keymenu.c:842
 msgid "MsgIndex"
 msgstr ""
 
 #. TRANSLATORS: View the Attachment
-#: alpine/keymenu.c:826
+#: alpine/keymenu.c:844
 msgid "ViewAttch"
 msgstr ""
 
-#: alpine/keymenu.c:872
+#: alpine/keymenu.c:890
 msgid "TogglePreferPlain"
 msgstr ""
 
-#: alpine/keymenu.c:917 alpine/radio.c:288 alpine/radio.c:368
+#: alpine/keymenu.c:935 alpine/radio.c:289 alpine/radio.c:369
 msgid "Help"
 msgstr ""
 
 #. TRANSLATORS: The user is entering characters, for example, the
 #. name of a folder. Accept means the user is done and wants to
 #. accept what is currently displayed.
-#: alpine/keymenu.c:923
+#: alpine/keymenu.c:941
 msgid "Accept"
 msgstr ""
 
-#: alpine/keymenu.c:939
+#: alpine/keymenu.c:957
 msgid "Printer"
 msgstr ""
 
 #. TRANSLATORS: Change password
-#: alpine/keymenu.c:941
+#: alpine/keymenu.c:959
 msgid "Newpassword"
 msgstr ""
 
 #. TRANSLATORS: Configure Alpine
-#: alpine/keymenu.c:943 alpine/adrbkcmd.c:3182
+#: alpine/keymenu.c:961 alpine/adrbkcmd.c:3182
 msgid "Config"
 msgstr ""
 
 #. TRANSLATORS: Edit signature block
-#: alpine/keymenu.c:945
+#: alpine/keymenu.c:963
 msgid "Signature"
 msgstr ""
 
 #. TRANSLATORS: configure address books
-#: alpine/keymenu.c:947
+#: alpine/keymenu.c:965
 msgid "AddressBooks"
 msgstr ""
 
 #. TRANSLATORS: configure collection lists
-#: alpine/keymenu.c:949
+#: alpine/keymenu.c:967
 msgid "collectionList"
 msgstr ""
 
 #. TRANSLATORS: configure rules, an alpine concept
-#: alpine/keymenu.c:951
+#: alpine/keymenu.c:969
 msgid "Rules"
 msgstr ""
 
 #. TRANSLATORS: configure directory servers
-#: alpine/keymenu.c:953 alpine/folder.c:4458
+#: alpine/keymenu.c:971 alpine/folder.c:4470
 msgid "Directory"
 msgstr ""
 
 #. TRANSLATORS: configure color
-#: alpine/keymenu.c:955
+#: alpine/keymenu.c:973
 msgid "Kolor"
 msgstr ""
 
 #. TRANSLATORS: remote configuration setup
-#: alpine/keymenu.c:961
+#: alpine/keymenu.c:979
 msgid "RemoteConfigSetup"
 msgstr ""
 
 #. TRANSLATORS: configure S/MIME
-#: alpine/keymenu.c:963
+#: alpine/keymenu.c:981
 msgid "S/Mime"
 msgstr ""
 
 #. TRANSLATORS: go to Previous Command in list
-#: alpine/keymenu.c:980
+#: alpine/keymenu.c:998
 msgid "PrevCmd"
 msgstr ""
 
-#: alpine/keymenu.c:981
+#: alpine/keymenu.c:999
 msgid "NextCmd"
 msgstr ""
 
 #. TRANSLATORS: show release notes
-#: alpine/keymenu.c:985 alpine/keymenu.c:1053
+#: alpine/keymenu.c:1003 alpine/keymenu.c:1071
 msgid "RelNotes"
 msgstr ""
 
 #. TRANSLATORS: lock keyboard
-#: alpine/keymenu.c:987
+#: alpine/keymenu.c:1005
 msgid "KBLock"
 msgstr ""
 
-#: alpine/keymenu.c:997 alpine/mailcmd.c:5903
+#: alpine/keymenu.c:1015 alpine/mailcmd.c:6179
 msgid "Index"
 msgstr ""
 
 #. TRANSLATORS: go to the Journal. The Journal shows past
 #. messages that alpine has shown the user.
-#: alpine/keymenu.c:1000
+#: alpine/keymenu.c:1018
 msgid "Journal"
 msgstr ""
 
 #. TRANSLATORS: go to the Setup screen
-#: alpine/keymenu.c:1002
+#: alpine/keymenu.c:1020
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: go to the address book screen
-#: alpine/keymenu.c:1004
+#: alpine/keymenu.c:1022
 msgid "AddrBook"
 msgstr ""
 
-#: alpine/keymenu.c:1013
+#: alpine/keymenu.c:1031
 msgid "Quit Viewer"
 msgstr ""
 
 #. TRANSLATORS: Alpine asks the user to be counted when they
 #. first start using alpine.
-#: alpine/keymenu.c:1045
+#: alpine/keymenu.c:1063
 msgid "Be Counted!"
 msgstr ""
 
-#: alpine/keymenu.c:1074
+#: alpine/keymenu.c:1092
 msgid "Finished"
 msgstr ""
 
 #. TRANSLATORS: Take this address into the address book
-#: alpine/keymenu.c:1092 alpine/keymenu.c:1110 alpine/keymenu.c:2548
-#: alpine/keymenu.c:2564
+#: alpine/keymenu.c:1110 alpine/keymenu.c:1128 alpine/keymenu.c:2566
+#: alpine/keymenu.c:2582
 msgid "Take"
 msgstr ""
 
@@ -1112,24 +1160,24 @@ msgstr ""
 #. unsetting it (turning it off). For example, it might be
 #. a program option that can be turned on or off or it might
 #. be a way to mark which addresses to send a message to.
-#: alpine/keymenu.c:1097 alpine/keymenu.c:1553 alpine/keymenu.c:1582
-#: alpine/keymenu.c:1611 alpine/keymenu.c:1640 alpine/keymenu.c:2569
-#: alpine/folder.c:3228 alpine/addrbook.c:2518 pico/browse.c:2211
+#: alpine/keymenu.c:1115 alpine/keymenu.c:1571 alpine/keymenu.c:1600
+#: alpine/keymenu.c:1629 alpine/keymenu.c:1658 alpine/keymenu.c:2587
+#: alpine/folder.c:3240 alpine/addrbook.c:2518 pico/browse.c:2257
 msgid "Set/Unset"
 msgstr ""
 
-#: alpine/keymenu.c:1098 alpine/keymenu.c:2570
+#: alpine/keymenu.c:1116 alpine/keymenu.c:2588
 msgid "SetAll"
 msgstr ""
 
-#: alpine/keymenu.c:1099 alpine/keymenu.c:2571
+#: alpine/keymenu.c:1117 alpine/keymenu.c:2589
 msgid "UnSetAll"
 msgstr ""
 
 #. TRANSLATORS: The Take Address screen has a Single mode and a
 #. List mode. This command causes us to go into Single mode.
-#: alpine/keymenu.c:1102 alpine/keymenu.c:1554 alpine/keymenu.c:1583
-#: alpine/keymenu.c:2572
+#: alpine/keymenu.c:1120 alpine/keymenu.c:1572 alpine/keymenu.c:1601
+#: alpine/keymenu.c:2590
 msgid "SinglMode"
 msgstr ""
 
@@ -1139,255 +1187,293 @@ msgstr ""
 #. allows the user to select several of something. This is
 #. the name of the command to go into the List mode style
 #. of operating.
-#: alpine/keymenu.c:1120 alpine/keymenu.c:1496 alpine/keymenu.c:1525
-#: alpine/keymenu.c:2556 alpine/addrbook.c:2527 pico/browse.c:2215
+#: alpine/keymenu.c:1138 alpine/keymenu.c:1514 alpine/keymenu.c:1543
+#: alpine/keymenu.c:2574 alpine/addrbook.c:2527 pico/browse.c:2261
 msgid "ListMode"
 msgstr ""
 
-#: alpine/keymenu.c:1126
+#: alpine/keymenu.c:1144
 msgid "Stop Waiting"
 msgstr ""
 
 #. TRANSLATORS: Change Value
-#: alpine/keymenu.c:1145 alpine/keymenu.c:1367 alpine/keymenu.c:1396
-#: alpine/keymenu.c:1763 alpine/keymenu.c:1792 alpine/keymenu.c:1821
-#: alpine/keymenu.c:1852 alpine/keymenu.c:1881 alpine/keymenu.c:1911
-#: alpine/keymenu.c:1941 alpine/keymenu.c:1971 alpine/keymenu.c:2000
-#: alpine/keymenu.c:2046 alpine/keymenu.c:2076 alpine/keymenu.c:2106
-#: alpine/keymenu.c:2135 alpine/keymenu.c:2165 alpine/keymenu.c:2194
-#: alpine/keymenu.c:2224
+#: alpine/keymenu.c:1163 alpine/keymenu.c:1385 alpine/keymenu.c:1414
+#: alpine/keymenu.c:1781 alpine/keymenu.c:1810 alpine/keymenu.c:1839
+#: alpine/keymenu.c:1870 alpine/keymenu.c:1899 alpine/keymenu.c:1929
+#: alpine/keymenu.c:1959 alpine/keymenu.c:1989 alpine/keymenu.c:2018
+#: alpine/keymenu.c:2064 alpine/keymenu.c:2094 alpine/keymenu.c:2124
+#: alpine/keymenu.c:2153 alpine/keymenu.c:2183 alpine/keymenu.c:2212
+#: alpine/keymenu.c:2242
 msgid "Change Val"
 msgstr ""
 
 #. TRANSLATORS: Delete Value
-#: alpine/keymenu.c:1152 alpine/keymenu.c:1373 alpine/keymenu.c:1402
-#: alpine/keymenu.c:1769 alpine/keymenu.c:1798 alpine/keymenu.c:1827
-#: alpine/keymenu.c:1858 alpine/keymenu.c:1887 alpine/keymenu.c:1917
-#: alpine/keymenu.c:1947 alpine/keymenu.c:1977 alpine/keymenu.c:2006
-#: alpine/keymenu.c:2052 alpine/keymenu.c:2082 alpine/keymenu.c:2112
-#: alpine/keymenu.c:2141 alpine/keymenu.c:2171 alpine/keymenu.c:2200
-#: alpine/keymenu.c:2230
+#: alpine/keymenu.c:1170 alpine/keymenu.c:1391 alpine/keymenu.c:1420
+#: alpine/keymenu.c:1787 alpine/keymenu.c:1816 alpine/keymenu.c:1845
+#: alpine/keymenu.c:1876 alpine/keymenu.c:1905 alpine/keymenu.c:1935
+#: alpine/keymenu.c:1965 alpine/keymenu.c:1995 alpine/keymenu.c:2024
+#: alpine/keymenu.c:2070 alpine/keymenu.c:2100 alpine/keymenu.c:2130
+#: alpine/keymenu.c:2159 alpine/keymenu.c:2189 alpine/keymenu.c:2218
+#: alpine/keymenu.c:2248
 msgid "Delete Val"
 msgstr ""
 
-#: alpine/keymenu.c:1158 alpine/keymenu.c:2455 alpine/keymenu.c:2484
-#: alpine/keymenu.c:2530
+#: alpine/keymenu.c:1176 alpine/keymenu.c:2473 alpine/keymenu.c:2502
+#: alpine/keymenu.c:2548
 msgid "IndxHdr"
 msgstr ""
 
-#: alpine/keymenu.c:1221
+#: alpine/keymenu.c:1239
 msgid "Add KW"
 msgstr ""
 
 #. TRANSLATORS: Exit from the Flags screen
-#: alpine/keymenu.c:1223
+#: alpine/keymenu.c:1241
 msgid "Exit Flags"
 msgstr ""
 
 #. TRANSLATORS: go to address book list
-#: alpine/keymenu.c:1256 alpine/keymenu.c:1271 alpine/addrbook.c:2436
+#: alpine/keymenu.c:1274 alpine/keymenu.c:1289 alpine/addrbook.c:2436
 #: alpine/addrbook.c:2639
 msgid "AddressBkList"
 msgstr ""
 
-#: alpine/keymenu.c:1372 alpine/keymenu.c:1401 alpine/keymenu.c:1768
-#: alpine/keymenu.c:1797 alpine/keymenu.c:1826 alpine/keymenu.c:1857
-#: alpine/keymenu.c:1886 alpine/keymenu.c:1916 alpine/keymenu.c:1946
-#: alpine/keymenu.c:1976 alpine/keymenu.c:2005 alpine/keymenu.c:2051
-#: alpine/keymenu.c:2081 alpine/keymenu.c:2111 alpine/keymenu.c:2140
-#: alpine/keymenu.c:2170 alpine/keymenu.c:2199 alpine/keymenu.c:2229
+#: alpine/keymenu.c:1390 alpine/keymenu.c:1419 alpine/keymenu.c:1786
+#: alpine/keymenu.c:1815 alpine/keymenu.c:1844 alpine/keymenu.c:1875
+#: alpine/keymenu.c:1904 alpine/keymenu.c:1934 alpine/keymenu.c:1964
+#: alpine/keymenu.c:1994 alpine/keymenu.c:2023 alpine/keymenu.c:2069
+#: alpine/keymenu.c:2099 alpine/keymenu.c:2129 alpine/keymenu.c:2158
+#: alpine/keymenu.c:2188 alpine/keymenu.c:2217 alpine/keymenu.c:2247
 msgid "Add Value"
 msgstr ""
 
 #. TRANSLATORS: go to list of keywords
-#: alpine/keymenu.c:1411
+#: alpine/keymenu.c:1429
 msgid "ToCharsets"
 msgstr ""
 
 #. TRANSLATORS: go to previous LDAP directory server in the list
-#: alpine/keymenu.c:1428
+#: alpine/keymenu.c:1446
 msgid "PrevDir"
 msgstr ""
 
-#: alpine/keymenu.c:1429
+#: alpine/keymenu.c:1447
 msgid "NextDir"
 msgstr ""
 
 #. TRANSLATORS: add a directory server to configuration
-#: alpine/keymenu.c:1433
+#: alpine/keymenu.c:1451 pico/browse.c:1071
 msgid "Add Dir"
 msgstr ""
 
 #. TRANSLATORS: delete a directory
-#: alpine/keymenu.c:1435
+#: alpine/keymenu.c:1453
 msgid "Del Dir"
 msgstr ""
 
-#: alpine/keymenu.c:1473 alpine/keymenu.c:1518 alpine/keymenu.c:1576
-#: alpine/keymenu.c:1634
+#: alpine/keymenu.c:1491 alpine/keymenu.c:1536 alpine/keymenu.c:1594
+#: alpine/keymenu.c:1652
 msgid "exit"
 msgstr ""
 
 #. TRANSLATORS: add a printer to configuration
-#: alpine/keymenu.c:1672
+#: alpine/keymenu.c:1690
 msgid "Add Printer"
 msgstr ""
 
 #. TRANSLATORS: delete a printer from configuration
-#: alpine/keymenu.c:1674
+#: alpine/keymenu.c:1692
 msgid "DeletePrint"
 msgstr ""
 
 #. TRANSLATORS: go to previous Role in list
-#: alpine/keymenu.c:1717
+#: alpine/keymenu.c:1735
 msgid "PrevRole"
 msgstr ""
 
-#: alpine/keymenu.c:1718
+#: alpine/keymenu.c:1736
 msgid "NextRole"
 msgstr ""
 
 #. TRANSLATORS: go to previous Rule in list
-#: alpine/keymenu.c:1734
+#: alpine/keymenu.c:1752
 msgid "PrevRule"
 msgstr ""
 
-#: alpine/keymenu.c:1735
+#: alpine/keymenu.c:1753
 msgid "NextRule"
 msgstr ""
 
-#: alpine/keymenu.c:1739 alpine/addrbook.c:2598 alpine/addrbook.c:2656
-#: pico/browse.c:115
+#: alpine/keymenu.c:1757 alpine/keymenu.c:2690 alpine/keymenu.c:2731
+#: alpine/addrbook.c:2598 alpine/addrbook.c:2656 pico/browse.c:116
 msgid "Delete"
 msgstr ""
 
 #. TRANSLATORS: Include a File from filesystem
-#: alpine/keymenu.c:1748
+#: alpine/keymenu.c:1766
 msgid "IncludeFile"
 msgstr ""
 
-#: alpine/keymenu.c:1749
+#: alpine/keymenu.c:1767
 msgid "eXcludeFile"
 msgstr ""
 
-#: alpine/keymenu.c:1752
+#: alpine/keymenu.c:1770
 msgid "Replicate"
 msgstr ""
 
 #. TRANSLATORS: go to list of folders
-#: alpine/keymenu.c:1807 alpine/keymenu.c:2150 alpine/keymenu.c:2179
-#: alpine/mailcmd.c:5321
+#: alpine/keymenu.c:1825 alpine/keymenu.c:2168 alpine/keymenu.c:2197
+#: alpine/mailcmd.c:5578
 msgid "ToFldrs"
 msgstr ""
 
 #. TRANSLATORS: go to list of Files
-#: alpine/keymenu.c:1836 alpine/keymenu.c:1866
+#: alpine/keymenu.c:1854 alpine/keymenu.c:1884
 msgid "ToFiles"
 msgstr ""
 
 #. TRANSLATORS: edit a file
-#: alpine/keymenu.c:1838
+#: alpine/keymenu.c:1856
 msgid "editFile"
 msgstr ""
 
 #. TRANSLATORS: go to list of keywords
-#: alpine/keymenu.c:1896 alpine/keymenu.c:1925
+#: alpine/keymenu.c:1914 alpine/keymenu.c:1943
 msgid "ToKeywords"
 msgstr ""
 
 #. TRANSLATORS: toggle between NOT and not NOT, turn NOT on or off
-#: alpine/keymenu.c:1928 alpine/keymenu.c:1958 alpine/keymenu.c:2017
-#: alpine/keymenu.c:2063 alpine/keymenu.c:2092
+#: alpine/keymenu.c:1946 alpine/keymenu.c:1976 alpine/keymenu.c:2035
+#: alpine/keymenu.c:2081 alpine/keymenu.c:2110
 msgid "toggle NOT"
 msgstr ""
 
 #. TRANSLATORS: go to list of character sets
-#: alpine/keymenu.c:1956
+#: alpine/keymenu.c:1974
 msgid "ToCharSets"
 msgstr ""
 
 #. TRANSLATORS: add extra headers to list
-#: alpine/keymenu.c:2016 alpine/keymenu.c:2030 alpine/keymenu.c:2062
-#: alpine/keymenu.c:2091
+#: alpine/keymenu.c:2034 alpine/keymenu.c:2048 alpine/keymenu.c:2080
+#: alpine/keymenu.c:2109
 msgid "eXtraHdr"
 msgstr ""
 
 #. TRANSLATORS: go to address book to get address
-#: alpine/keymenu.c:2061 alpine/keymenu.c:2120
+#: alpine/keymenu.c:2079 alpine/keymenu.c:2138
 msgid "ToAddrBk"
 msgstr ""
 
 #. TRANSLATORS: remove a header we previously added
-#: alpine/keymenu.c:2095
+#: alpine/keymenu.c:2113
 msgid "RemoveHdr"
 msgstr ""
 
 #. TRANSLATORS: go to list of nicknames
-#: alpine/keymenu.c:2209
+#: alpine/keymenu.c:2227
 msgid "ToNicks"
 msgstr ""
 
 #. TRANSLATORS: go to list of address books
-#: alpine/keymenu.c:2239
+#: alpine/keymenu.c:2257
 msgid "ToAbookList"
 msgstr ""
 
 #. TRANSLATORS: go to color configuration screen
-#: alpine/keymenu.c:2301 alpine/keymenu.c:2318 alpine/keymenu.c:2334
-#: alpine/keymenu.c:2352 alpine/keymenu.c:2381 alpine/keymenu.c:2410
+#: alpine/keymenu.c:2319 alpine/keymenu.c:2336 alpine/keymenu.c:2352
+#: alpine/keymenu.c:2370 alpine/keymenu.c:2399 alpine/keymenu.c:2428
 msgid "To Colors"
 msgstr ""
 
-#: alpine/keymenu.c:2358 alpine/keymenu.c:2387 alpine/keymenu.c:2416
+#: alpine/keymenu.c:2376 alpine/keymenu.c:2405 alpine/keymenu.c:2434
 msgid "Customize"
 msgstr ""
 
-#: alpine/keymenu.c:2447 alpine/keymenu.c:2477 alpine/keymenu.c:2523
+#: alpine/keymenu.c:2465 alpine/keymenu.c:2495 alpine/keymenu.c:2541
 msgid "AddHeader"
 msgstr ""
 
 #. TRANSLATORS: restore defaults
-#: alpine/keymenu.c:2449 alpine/keymenu.c:2478 alpine/keymenu.c:2524
+#: alpine/keymenu.c:2467 alpine/keymenu.c:2496 alpine/keymenu.c:2542
 msgid "RestoreDefs"
 msgstr ""
 
-#: alpine/keymenu.c:2486
+#: alpine/keymenu.c:2504
 msgid "DeleteHdr"
 msgstr ""
 
 #. TRANSLATORS: shuffle headers (change the order of headers)
-#: alpine/keymenu.c:2488
+#: alpine/keymenu.c:2506
 msgid "ShuffleHdr"
 msgstr ""
 
 #. TRANSLATORS: exit the Take Address screen
-#: alpine/keymenu.c:2547 alpine/keymenu.c:2563
+#: alpine/keymenu.c:2565 alpine/keymenu.c:2581
 msgid "ExitTake"
 msgstr ""
 
-#: alpine/keymenu.c:2609
+#: alpine/keymenu.c:2627
 msgid "Transfer"
 msgstr ""
 
-#: alpine/takeaddr.c:67 alpine/mailcmd.c:178 alpine/adrbkcmd.c:5243
-#: alpine/mailpart.c:433
+#: alpine/keymenu.c:2643 alpine/keymenu.c:2657 alpine/keymenu.c:2688
+#: alpine/keymenu.c:2760
+msgid "Import Cert"
+msgstr ""
+
+#: alpine/keymenu.c:2672
+msgid "Import Key"
+msgstr ""
+
+#: alpine/keymenu.c:2673
+msgid "Create Key"
+msgstr ""
+
+#: alpine/keymenu.c:2687 alpine/keymenu.c:2715
+msgid "View Info"
+msgstr ""
+
+#: alpine/keymenu.c:2691 alpine/keymenu.c:2732
+msgid "Undelete"
+msgstr ""
+
+#: alpine/keymenu.c:2692 alpine/mailcmd.c:7354
+msgid "Expunge"
+msgstr ""
+
+#: alpine/keymenu.c:2730
+msgid "Trust Cert"
+msgstr ""
+
+#: alpine/keymenu.c:2733 alpine/smime.c:1092 alpine/smime.c:1100
+msgid "Public Key"
+msgstr ""
+
+#: alpine/keymenu.c:2734
+msgid "Private Key"
+msgstr ""
+
+#: alpine/takeaddr.c:67 alpine/mailcmd.c:176 alpine/adrbkcmd.c:5243
+#: alpine/mailpart.c:434
 msgid "Export"
 msgstr ""
 
 #. TRANSLATORS: To AddrBk is a command that takes the user to
 #. the address book screen to select an entry from there.
-#: alpine/takeaddr.c:138 alpine/send.c:1099 alpine/adrbkcmd.c:848
+#: alpine/takeaddr.c:138 alpine/send.c:1102 alpine/adrbkcmd.c:848
 #: alpine/adrbkcmd.c:863
 msgid "To AddrBk"
 msgstr ""
 
 #. TRANSLATORS: command asks alpine to complete the name when tab is typed
 #. TRANSLATORS: Complete is a verb, complete the name of a folder
-#: alpine/takeaddr.c:144 alpine/send.c:1105 alpine/mailcmd.c:2700
-#: alpine/mailcmd.c:3474 alpine/mailcmd.c:3885 alpine/mailcmd.c:5344
-#: alpine/adrbkcmd.c:4246 alpine/folder.c:3728 alpine/folder.c:3862
-#: alpine/folder.c:4991 alpine/mailpart.c:1324 alpine/mailpart.c:1733
-#: alpine/mailpart.c:1812 pico/attach.c:74 pico/file.c:158 pico/file.c:580
+#: alpine/takeaddr.c:144 alpine/send.c:1108 alpine/mailcmd.c:338
+#: alpine/mailcmd.c:2762 alpine/mailcmd.c:3577 alpine/mailcmd.c:4013
+#: alpine/mailcmd.c:5601 alpine/adrbkcmd.c:4246 alpine/folder.c:3740
+#: alpine/folder.c:3874 alpine/folder.c:5003 alpine/mailpart.c:1325
+#: alpine/mailpart.c:1743 alpine/mailpart.c:1822 pico/attach.c:75
+#: pico/file.c:159 pico/file.c:585
 msgid "Complete"
 msgstr ""
 
@@ -1424,8 +1510,8 @@ msgstr ""
 msgid "Already an entry %s in address book!"
 msgstr ""
 
-#: alpine/takeaddr.c:580 alpine/takeaddr.c:601 alpine/confscroll.c:1706
-#: alpine/print.c:747 pico/search.c:616
+#: alpine/takeaddr.c:580 alpine/takeaddr.c:601 alpine/confscroll.c:1715
+#: alpine/print.c:747 pico/search.c:812 pico/search.c:825
 msgid "Replace"
 msgstr ""
 
@@ -1511,7 +1597,7 @@ msgstr ""
 msgid "Already on first page."
 msgstr ""
 
-#: alpine/takeaddr.c:1526 alpine/takeaddr.c:2653
+#: alpine/takeaddr.c:1526 alpine/takeaddr.c:2655
 msgid "save"
 msgstr ""
 
@@ -1540,7 +1626,7 @@ msgstr ""
 msgid "Searched to bottom"
 msgstr ""
 
-#: alpine/takeaddr.c:1627 alpine/confscroll.c:1258 alpine/mailpart.c:773
+#: alpine/takeaddr.c:1627 alpine/confscroll.c:1258 alpine/mailpart.c:774
 msgid "WhereIs cancelled"
 msgstr ""
 
@@ -1564,106 +1650,106 @@ msgstr ""
 msgid "take"
 msgstr ""
 
-#: alpine/takeaddr.c:2466 alpine/takeaddr.c:2593
+#: alpine/takeaddr.c:2468 alpine/takeaddr.c:2595
 msgid "Nothing to save, cancelled"
 msgstr ""
 
-#: alpine/takeaddr.c:2497
+#: alpine/takeaddr.c:2499
 msgid "Backup"
 msgstr ""
 
-#: alpine/takeaddr.c:2498
+#: alpine/takeaddr.c:2500
 msgid "LDAP"
 msgstr ""
 
-#: alpine/takeaddr.c:2503
+#: alpine/takeaddr.c:2505
 msgid "Copy backup address or retain LDAP search criteria ? "
 msgstr ""
 
-#: alpine/takeaddr.c:2612 alpine/takeaddr.c:3042 alpine/adrbkcmd.c:5253
+#: alpine/takeaddr.c:2614 alpine/takeaddr.c:3043 alpine/adrbkcmd.c:5253
 #, c-format
 msgid "Save to address book or Export to filesystem ? "
 msgstr ""
 
-#: alpine/takeaddr.c:2618 alpine/takeaddr.c:3048 alpine/adrbkcmd.c:5259
+#: alpine/takeaddr.c:2620 alpine/takeaddr.c:3049 alpine/adrbkcmd.c:5259
 #: alpine/adrbkcmd.c:5452 alpine/adrbkcmd.c:5617
 msgid "Address book save cancelled"
 msgstr ""
 
-#: alpine/takeaddr.c:2665
+#: alpine/takeaddr.c:2667
 msgid "Save cancelled: no entries in attachment"
 msgstr ""
 
-#: alpine/takeaddr.c:2682 alpine/adrbkcmd.c:4182
+#: alpine/takeaddr.c:2684 alpine/adrbkcmd.c:4182
 msgid "Address List"
 msgstr ""
 
 #. TRANSLATORS: A VCard is kind of like an electronic business card. It is not
 #. something specific to alpine, it is universal.
-#: alpine/takeaddr.c:2683 alpine/takeaddr.c:3272 alpine/adrbkcmd.c:384
+#: alpine/takeaddr.c:2685 alpine/takeaddr.c:3273 alpine/adrbkcmd.c:384
 #: alpine/adrbkcmd.c:4183
 msgid "VCard"
 msgstr ""
 
-#: alpine/takeaddr.c:2694
+#: alpine/takeaddr.c:2696
 msgid "Export list of addresses or vCard text ? "
 msgstr ""
 
-#: alpine/takeaddr.c:2700 alpine/takeaddr.c:3282 alpine/adrbkcmd.c:4213
+#: alpine/takeaddr.c:2702 alpine/takeaddr.c:3283 alpine/adrbkcmd.c:4213
 #: alpine/adrbkcmd.c:4259
 msgid "Address book export cancelled"
 msgstr ""
 
-#: alpine/takeaddr.c:2711
+#: alpine/takeaddr.c:2713
 msgid "can't happen in export_vcard_att"
 msgstr ""
 
-#: alpine/takeaddr.c:2747
+#: alpine/takeaddr.c:2749
 msgid "No addresses to export"
 msgstr ""
 
-#: alpine/takeaddr.c:2753 alpine/takeaddr.c:2861
+#: alpine/takeaddr.c:2755 alpine/takeaddr.c:2863
 msgid "Nothing to export"
 msgstr ""
 
-#: alpine/takeaddr.c:2755 alpine/takeaddr.c:2855 alpine/takeaddr.c:3288
-#: alpine/takeaddr.c:3302 alpine/takeaddr.c:3320 alpine/mailcmd.c:3889
-#: alpine/adrbkcmd.c:6960 alpine/adrbkcmd.c:7151 alpine/reply.c:2234
-#: alpine/mailpart.c:2818
+#: alpine/takeaddr.c:2757 alpine/takeaddr.c:2857 alpine/takeaddr.c:3289
+#: alpine/takeaddr.c:3303 alpine/takeaddr.c:3321 alpine/mailcmd.c:4017
+#: alpine/adrbkcmd.c:6960 alpine/adrbkcmd.c:7150 alpine/reply.c:2375
+#: alpine/mailpart.c:2873
 msgid "Error allocating space"
 msgstr ""
 
-#: alpine/takeaddr.c:2766
+#: alpine/takeaddr.c:2768
 msgid "HELP FOR TAKE EXPORT SCREEN"
 msgstr ""
 
-#: alpine/takeaddr.c:2805
+#: alpine/takeaddr.c:2807
 msgid "No lines to export"
 msgstr ""
 
-#: alpine/takeaddr.c:2808
+#: alpine/takeaddr.c:2810
 msgid "Take Export"
 msgstr ""
 
-#: alpine/takeaddr.c:2859
+#: alpine/takeaddr.c:2861
 msgid "Use \"X\" to mark selections"
 msgstr ""
 
 #. TRANSLATORS: Text refers to plain old text, probably the text of
 #. an email message
-#: alpine/takeaddr.c:3270 alpine/mailcmd.c:155 alpine/mailcmd.c:195
-#: alpine/adrbkcmd.c:381 alpine/folder.c:3273
+#: alpine/takeaddr.c:3271 alpine/mailcmd.c:153 alpine/mailcmd.c:193
+#: alpine/adrbkcmd.c:381 alpine/folder.c:3285
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: Addresses refers to email Addresses
-#: alpine/takeaddr.c:3271 alpine/adrbkcmd.c:202 alpine/adrbkcmd.c:862
+#: alpine/takeaddr.c:3272 alpine/adrbkcmd.c:202 alpine/adrbkcmd.c:862
 #: alpine/adrbkcmd.c:1073 alpine/adrbkcmd.c:5925 alpine/adrbkcmd.c:5939
 #: alpine/adrbkcmd.c:5948 alpine/adrbkcmd.c:5959 alpine/adrbkcmd.c:5966
 msgid "Addresses"
 msgstr ""
 
-#: alpine/takeaddr.c:3276
+#: alpine/takeaddr.c:3277
 msgid "Export text of entry, address, or VCard format ? "
 msgstr ""
 
@@ -1713,7 +1799,7 @@ msgstr ""
 msgid "No email address available for this entry; choose another or ExitSelect"
 msgstr ""
 
-#: alpine/ldapconf.c:635
+#: alpine/ldapconf.c:636
 msgid "Bad Server Config, Delete this"
 msgstr ""
 
@@ -1727,7 +1813,7 @@ msgstr ""
 
 #. TRANSLATORS: Print something1 using something2.
 #. servers is something1
-#: alpine/ldapconf.c:725 alpine/ldapconf.c:1761
+#: alpine/ldapconf.c:725 alpine/ldapconf.c:1800
 msgid "servers"
 msgstr ""
 
@@ -1748,12 +1834,12 @@ msgid "Shuffle only makes sense when there is more than one server in list"
 msgstr ""
 
 #. TRANSLATORS: shuffle something Up or Down in a list
-#: alpine/ldapconf.c:949 alpine/adrbkcmd.c:3518 alpine/confscroll.c:2326
+#: alpine/ldapconf.c:949 alpine/adrbkcmd.c:3518 alpine/confscroll.c:2335
 #: alpine/roleconf.c:1686 alpine/colorconf.c:2267 alpine/context.c:604
 msgid "Up"
 msgstr ""
 
-#: alpine/ldapconf.c:954 alpine/adrbkcmd.c:3523 alpine/confscroll.c:2331
+#: alpine/ldapconf.c:954 alpine/adrbkcmd.c:3523 alpine/confscroll.c:2340
 #: alpine/roleconf.c:1691 alpine/colorconf.c:2272 alpine/context.c:622
 msgid "Down"
 msgstr ""
@@ -1782,502 +1868,533 @@ msgstr ""
 
 #. TRANSLATORS: Features is a section title in the LDAP configuration screen. Following
 #. this are a list of features or options that can be turned on or off.
-#: alpine/ldapconf.c:1337 alpine/roleconf.c:4603
+#: alpine/ldapconf.c:1339 alpine/roleconf.c:4603
 msgid "Features"
 msgstr ""
 
-#: alpine/ldapconf.c:1363
+#: alpine/ldapconf.c:1367
 msgid "HELP FOR LDAP SERVER"
 msgstr ""
 
-#: alpine/ldapconf.c:1379
+#: alpine/ldapconf.c:1383
 msgid "HELP FOR SERVER SEARCH BASE"
 msgstr ""
 
-#: alpine/ldapconf.c:1393
+#: alpine/ldapconf.c:1397
 msgid "HELP FOR PORT NUMBER"
 msgstr ""
 
-#: alpine/ldapconf.c:1408
+#: alpine/ldapconf.c:1412
 msgid "HELP FOR SERVER BIND DN"
 msgstr ""
 
-#: alpine/ldapconf.c:1422
+#: alpine/ldapconf.c:1426
 msgid "HELP FOR SERVER NICKNAME"
 msgstr ""
 
-#: alpine/ldapconf.c:1480
+#: alpine/ldapconf.c:1497
+msgid "Can not use TLS when connecting using LDAPS"
+msgstr ""
+
+#: alpine/ldapconf.c:1509
+msgid "Can not use LDAPS when connecting using TLS"
+msgstr ""
+
+#: alpine/ldapconf.c:1516
 msgid "HELP FOR LDAP FEATURES"
 msgstr ""
 
-#: alpine/ldapconf.c:1559
+#: alpine/ldapconf.c:1598
 msgid "HELP FOR SEARCH TYPE"
 msgstr ""
 
-#: alpine/ldapconf.c:1623
+#: alpine/ldapconf.c:1662
 msgid "HELP FOR SEARCH RULE"
 msgstr ""
 
-#: alpine/ldapconf.c:1647
+#: alpine/ldapconf.c:1686
 msgid "HELP FOR EMAIL ATTRIBUTE NAME"
 msgstr ""
 
-#: alpine/ldapconf.c:1661
+#: alpine/ldapconf.c:1700
 msgid "HELP FOR NAME ATTRIBUTE NAME"
 msgstr ""
 
-#: alpine/ldapconf.c:1675
+#: alpine/ldapconf.c:1714
 msgid "HELP FOR SURNAME ATTRIBUTE NAME"
 msgstr ""
 
-#: alpine/ldapconf.c:1689
+#: alpine/ldapconf.c:1728
 msgid "HELP FOR GIVEN NAME ATTRIBUTE NAME"
 msgstr ""
 
-#: alpine/ldapconf.c:1708
+#: alpine/ldapconf.c:1747
 msgid "HELP FOR SERVER TIMELIMIT"
 msgstr ""
 
-#: alpine/ldapconf.c:1724
+#: alpine/ldapconf.c:1763
 msgid "HELP FOR SERVER SIZELIMIT"
 msgstr ""
 
-#: alpine/ldapconf.c:1742
+#: alpine/ldapconf.c:1781
 msgid "HELP FOR CUSTOM SEARCH FILTER"
 msgstr ""
 
-#: alpine/ldapconf.c:2023
+#: alpine/ldapconf.c:2063
 msgid "Delete (unused) directory servers "
 msgstr ""
 
-#: alpine/ldapconf.c:2031
+#: alpine/ldapconf.c:2071
 msgid "Can't delete sys-admin defined value"
 msgstr ""
 
 #. TRANSLATORS: Ignore All means ignore all of the default values,
 #. and Remove One means just remove this one default value.
-#: alpine/ldapconf.c:2057 alpine/adrbkcmd.c:3126
+#: alpine/ldapconf.c:2097 alpine/adrbkcmd.c:3126
 msgid "Ignore All"
 msgstr ""
 
-#: alpine/ldapconf.c:2058 alpine/adrbkcmd.c:3127
+#: alpine/ldapconf.c:2098 alpine/adrbkcmd.c:3127
 msgid "Remove One"
 msgstr ""
 
-#: alpine/ldapconf.c:2061
+#: alpine/ldapconf.c:2101
 msgid "Ignore all default directory servers or just remove this one ? "
 msgstr ""
 
-#: alpine/ldapconf.c:2067
+#: alpine/ldapconf.c:2107
 #, c-format
 msgid "Really delete %s \"%s\" from directory servers "
 msgstr ""
 
-#: alpine/ldapconf.c:2168
+#: alpine/ldapconf.c:2208
 msgid "Reverting to default directory server"
 msgstr ""
 
-#: alpine/ldapconf.c:2208
+#: alpine/ldapconf.c:2248
 msgid "Server not deleted"
 msgstr ""
 
-#: alpine/ldapconf.c:2228 alpine/ldapconf.c:2283
+#: alpine/ldapconf.c:2268 alpine/ldapconf.c:2323
 msgid "HELP FOR DIRECTORY SERVER CONFIGURATION"
 msgstr ""
 
-#: alpine/send.c:146
+#: alpine/ldapconf.c:2428
+#, c-format
+msgid "Can not use LDAPS when using TLS. Disable \"%s\" first."
+msgstr ""
+
+#: alpine/ldapconf.c:2436 alpine/ldapconf.c:2444
+#, c-format
+msgid "Can not use TLS when using LDAPS. Disable \"%s\" first."
+msgstr ""
+
+#: alpine/send.c:147
 msgid "Continue INTERRUPTED composition (answering \"n\" won't erase it)"
 msgstr ""
 
-#: alpine/send.c:148
+#: alpine/send.c:149
 msgid "Continue postponed composition (answering \"No\" won't erase it)"
 msgstr ""
 
-#: alpine/send.c:150
+#: alpine/send.c:151
 msgid "Start composition from Form Letter Folder"
 msgstr ""
 
-#: alpine/send.c:152
+#: alpine/send.c:153
 msgid "Save to Postponed or Form letter folder? "
 msgstr ""
 
-#: alpine/send.c:154
+#: alpine/send.c:155
 msgid "Posted message may go to thousands of readers. Really post"
 msgstr ""
 
-#: alpine/send.c:156
+#: alpine/send.c:157
 msgid "Deleted messages will be removed from folder after use.  Proceed"
 msgstr ""
 
-#: alpine/send.c:507 alpine/send.c:549 alpine/send.c:587 alpine/send.c:855
+#: alpine/send.c:508 alpine/send.c:550 alpine/send.c:588 alpine/send.c:856
 msgid "Composition cancelled"
 msgstr ""
 
-#: alpine/send.c:514
+#: alpine/send.c:515
 #, c-format
 msgid "Can't open Interrupted mailbox: %s"
 msgstr ""
 
-#: alpine/send.c:595
+#: alpine/send.c:596
 msgid "Form letter folder doesn't exist!"
 msgstr ""
 
-#: alpine/send.c:648 alpine/adrbkcmd.c:4566 alpine/reply.c:1785
+#: alpine/send.c:649 alpine/adrbkcmd.c:4566 alpine/reply.c:1912
 #, c-format
 msgid "Composing using role \"%s\""
 msgstr ""
 
-#: alpine/send.c:668 alpine/mailpart.c:1700
+#: alpine/send.c:669 alpine/mailpart.c:1710
 msgid "Problem creating space for message text."
 msgstr ""
 
-#: alpine/send.c:802
+#: alpine/send.c:803
 msgid "Empty folder! No messages really postponed!"
 msgstr ""
 
-#: alpine/send.c:804
+#: alpine/send.c:805
 msgid "Empty folder! No messages really interrupted!"
 msgstr ""
 
-#: alpine/send.c:842
+#: alpine/send.c:843
 msgid "Undelete messages to remain postponed, and then continue message"
 msgstr ""
 
-#: alpine/send.c:844
+#: alpine/send.c:845
 msgid "Undelete form letters you want to keep, and then continue message"
 msgstr ""
 
-#: alpine/send.c:893
+#: alpine/send.c:894
 #, c-format
 msgid "%s folder unavailable while background posting"
 msgstr ""
 
-#: alpine/send.c:1085 alpine/send.c:2301
+#: alpine/send.c:1088 alpine/send.c:2363
 msgid ""
 "Site policy doesn't allow changing From address so role's From has no effect"
 msgstr ""
 
-#: alpine/send.c:1162
+#: alpine/send.c:1132
 msgid "FORWARD (as e-mail) to : "
 msgstr ""
 
-#: alpine/send.c:1163
+#: alpine/send.c:1144
+#, c-format
+msgid "BOUNCE (redirect) message using role \"%s\" to : "
+msgstr ""
+
+#: alpine/send.c:1146
 msgid "BOUNCE (redirect) message to : "
 msgstr ""
 
+#: alpine/send.c:1207 alpine/mailcmd.c:7361 alpine/reply.c:1108
+msgid "Set Role"
+msgstr ""
+
 #. TRANSLATORS: several possible key labels follow
-#: alpine/send.c:1373 alpine/send.c:4802
+#: alpine/send.c:1429 alpine/send.c:4864
 msgid "Normal"
 msgstr ""
 
-#: alpine/send.c:1373 alpine/send.c:4802
+#: alpine/send.c:1429 alpine/send.c:4864
 msgid "Verbose"
 msgstr ""
 
-#: alpine/send.c:1379 alpine/send.c:4815
+#: alpine/send.c:1435 alpine/send.c:4877
 msgid "NoDelay"
 msgstr ""
 
-#: alpine/send.c:1379 alpine/send.c:4815
+#: alpine/send.c:1435 alpine/send.c:4877
 msgid "Delay"
 msgstr ""
 
-#: alpine/send.c:1383 alpine/send.c:4818
+#: alpine/send.c:1439 alpine/send.c:4880
 msgid "NoSuccess"
 msgstr ""
 
-#: alpine/send.c:1383 alpine/send.c:4818
+#: alpine/send.c:1439 alpine/send.c:4880
 msgid "Success"
 msgstr ""
 
-#: alpine/send.c:1387 alpine/send.c:4821
+#: alpine/send.c:1443 alpine/send.c:4883
 msgid "ErrRets"
 msgstr ""
 
-#: alpine/send.c:1387 alpine/send.c:4821
+#: alpine/send.c:1443 alpine/send.c:4883
 msgid "NoErrRets"
 msgstr ""
 
-#: alpine/send.c:1391 alpine/send.c:4824
+#: alpine/send.c:1447 alpine/send.c:4886
 msgid "RetHdrs"
 msgstr ""
 
-#: alpine/send.c:1391 alpine/send.c:4824
+#: alpine/send.c:1447 alpine/send.c:4886
 msgid "RetFull"
 msgstr ""
 
-#: alpine/send.c:1441
+#: alpine/send.c:1497
 #, c-format
 msgid "DSN requested[%s%s%s%s]"
 msgstr ""
 
-#: alpine/send.c:1443
+#: alpine/send.c:1499
 msgid "Never"
 msgstr ""
 
-#: alpine/send.c:1505 alpine/send.c:3624
+#: alpine/send.c:1561 alpine/send.c:3686
 msgid "No recipients specified!"
 msgstr ""
 
-#: alpine/send.c:1515
+#: alpine/send.c:1571
 msgid "Use of a role-defined smtp-server is administratively prohibited"
 msgstr ""
 
-#: alpine/send.c:1530 alpine/send.c:1573
+#: alpine/send.c:1586 alpine/send.c:1629
 msgid "Message sent"
 msgstr ""
 
-#: alpine/send.c:1555 alpine/send.c:3864 alpine/send.c:3958
+#: alpine/send.c:1611 alpine/send.c:3926 alpine/send.c:4020
 msgid "Fcc Failed!.  No message saved."
 msgstr ""
 
-#: alpine/send.c:1602 alpine/send.c:1630
+#: alpine/send.c:1658 alpine/send.c:1686
 msgid "Send cancelled"
 msgstr ""
 
-#: alpine/send.c:1608
+#: alpine/send.c:1664
 #, c-format
 msgid "Error in address: %s"
 msgstr ""
 
-#: alpine/send.c:1621
+#: alpine/send.c:1677
 msgid "No addressee!  No e-mail sent."
 msgstr ""
 
-#: alpine/send.c:1884
+#: alpine/send.c:1946
 #, c-format
 msgid "Post to current newsgroup (%s)"
 msgstr ""
 
-#: alpine/send.c:1927
+#: alpine/send.c:1989
 msgid "Message cancelled"
 msgstr ""
 
-#: alpine/send.c:2718
+#: alpine/send.c:2780
 msgid "Not allowed to change header \"From\""
 msgstr ""
 
-#: alpine/send.c:3122
+#: alpine/send.c:3184
 msgid "Not allowed to postpone message until addresses are qualified"
 msgstr ""
 
-#: alpine/send.c:3225 pith/send.c:2172
+#: alpine/send.c:3287 pith/send.c:2191
 msgid "No postponed file defined"
 msgstr ""
 
-#: alpine/send.c:3568
+#: alpine/send.c:3630
 msgid "Composition saved to Form Letter Folder. Select Compose to send."
 msgstr ""
 
-#: alpine/send.c:3571
+#: alpine/send.c:3633
 msgid "Composition postponed. Select Compose to resume."
 msgstr ""
 
-#: alpine/send.c:3582
+#: alpine/send.c:3644
 #, c-format
 msgid "Message cancelled%s%s%s"
 msgstr ""
 
-#: alpine/send.c:3590
+#: alpine/send.c:3652
 msgid "Continuing composition.  Message not postponed or sent"
 msgstr ""
 
-#: alpine/send.c:3607
+#: alpine/send.c:3669
 msgid "Message not posted"
 msgstr ""
 
-#: alpine/send.c:3616
+#: alpine/send.c:3678
 msgid "No recipients, really copy only to Fcc "
 msgstr ""
 
-#: alpine/send.c:3640
+#: alpine/send.c:3702
 msgid "No To, Cc, or Newsgroup specified, send anyway "
 msgstr ""
 
-#: alpine/send.c:3723
+#: alpine/send.c:3785
 #, c-format
 msgid "Problem filtering!  Nothing sent%s."
 msgstr ""
 
-#: alpine/send.c:3887
+#: alpine/send.c:3949
 msgid "Message handed off for posting"
 msgstr ""
 
-#: alpine/send.c:4135
+#: alpine/send.c:4197
 msgid "Postponed Folder"
 msgstr ""
 
-#: alpine/send.c:4136
+#: alpine/send.c:4198
 msgid "Form Letter Folder"
 msgstr ""
 
-#: alpine/send.c:4543
+#: alpine/send.c:4605
 msgid "Prev Filter"
 msgstr ""
 
-#: alpine/send.c:4548
+#: alpine/send.c:4610
 msgid "Next Filter"
 msgstr ""
 
-#: alpine/send.c:4591
+#: alpine/send.c:4653
 msgid "Priority"
 msgstr ""
 
-#: alpine/send.c:4619
+#: alpine/send.c:4681
 msgid "DSNOpts"
 msgstr ""
 
-#: alpine/send.c:4799
+#: alpine/send.c:4861
 msgid "NoFlow"
 msgstr ""
 
-#: alpine/send.c:4799
+#: alpine/send.c:4861
 msgid "Flow"
 msgstr ""
 
-#: alpine/send.c:4806
+#: alpine/send.c:4868
 msgid "Foreground"
 msgstr ""
 
-#: alpine/send.c:4806
+#: alpine/send.c:4868
 msgid "Background"
 msgstr ""
 
-#: alpine/send.c:4809
+#: alpine/send.c:4871
 msgid "Fcc Attchmnts"
 msgstr ""
 
-#: alpine/send.c:4810
+#: alpine/send.c:4872
 msgid "No Fcc Atmts "
 msgstr ""
 
-#: alpine/send.c:4857
+#: alpine/send.c:4919
 msgid "No Message Sent"
 msgstr ""
 
-#: alpine/send.c:4861
+#: alpine/send.c:4923
 msgid "Send Cancelled"
 msgstr ""
 
-#: alpine/send.c:5023
+#: alpine/send.c:5085
 msgid "NONE - No X-Priority header included"
 msgstr ""
 
 #. TRANSLATORS: SELECT A PRIORITY is a screen title
 #. TRANSLATORS: Print something1 using something2.
 #. "priorities" is something1
-#: alpine/send.c:5031
+#: alpine/send.c:5093
 msgid "SELECT A PRIORITY"
 msgstr ""
 
-#: alpine/send.c:5032
+#: alpine/send.c:5094
 msgid "priorities"
 msgstr ""
 
-#: alpine/send.c:5033
+#: alpine/send.c:5095
 msgid "HELP FOR SELECTING A PRIORITY"
 msgstr ""
 
-#: alpine/send.c:5037 alpine/context.c:755
+#: alpine/send.c:5099 alpine/context.c:755
 msgid "No change"
 msgstr ""
 
-#: alpine/send.c:5085
+#: alpine/send.c:5147
 #, c-format
 msgid "File %s attached as type %s/%s"
 msgstr ""
 
-#: alpine/send.c:5156 alpine/mailpart.c:3753
+#: alpine/send.c:5218 alpine/mailpart.c:3808
 msgid "Error opening pipe"
 msgstr ""
 
-#: alpine/send.c:5171
+#: alpine/send.c:5233
 msgid ""
 "Cancel message (answering \"Confirm\" will abandon your mail message) ? "
 msgstr ""
 
-#: alpine/send.c:5174
+#: alpine/send.c:5236
 msgid "Confirm"
 msgstr ""
 
-#: alpine/send.c:5191
+#: alpine/send.c:5253
 msgid " Type \"C\" to cancel message "
 msgstr ""
 
-#: alpine/send.c:5449
+#: alpine/send.c:5511
 #, c-format
 msgid "Problem filtering: %s"
 msgstr ""
 
-#: alpine/send.c:6033
+#: alpine/send.c:6095
 #, c-format
 msgid "Error \"%s\", couldn't attach file \"%s\""
 msgstr ""
 
-#: alpine/send.c:6238
+#: alpine/send.c:6300
 msgid "Can't post while posting!"
 msgstr ""
 
-#: alpine/send.c:6270
+#: alpine/send.c:6332
 msgid "News postings MUST have a subject!  Please add one!"
 msgstr ""
 
-#: alpine/send.c:6960
+#: alpine/send.c:7022
 #, c-format
 msgid "User-id for From address : "
 msgstr ""
 
-#: alpine/send.c:6982
+#: alpine/send.c:7044
 msgid "Send cancelled (User-id must be provided before sending)"
 msgstr ""
 
-#: alpine/send.c:6987
+#: alpine/send.c:7049
 #, c-format
 msgid "Preserve %.*s as \"user-id\" in PINERC"
 msgstr ""
 
-#: alpine/send.c:7005
+#: alpine/send.c:7067
 #, c-format
 msgid "Personal name for From address : "
 msgstr ""
 
-#: alpine/send.c:7026
+#: alpine/send.c:7088
 #, c-format
 msgid "Preserve %.*s as \"personal-name\" in PINERC"
 msgstr ""
 
-#: alpine/send.c:7057
+#: alpine/send.c:7119
 #, c-format
 msgid "Host/domain for From address : "
 msgstr ""
 
-#: alpine/send.c:7079
+#: alpine/send.c:7141
 msgid "Send cancelled (Host/domain name must be provided before sending)"
 msgstr ""
 
-#: alpine/send.c:7084
+#: alpine/send.c:7146
 #, c-format
 msgid "Preserve %.*s as \"user-domain\" in PINERC"
 msgstr ""
 
-#: alpine/send.c:7117
+#: alpine/send.c:7179
 #, c-format
 msgid "SMTP server to forward message : "
 msgstr ""
 
-#: alpine/send.c:7139
+#: alpine/send.c:7201
 msgid "Send cancelled (SMTP server must be provided before sending)"
 msgstr ""
 
+#: alpine/radio.c:78
+msgid "error on fprintf() or fgets()"
+msgstr ""
+
 #. TRANSLATORS: This is the name of the command that will show
 #. which other commands are available. 12 commands are shown at
 #. the bottom of the screen, this command would show the next set
 #. of 12
-#: alpine/radio.c:818 alpine/addrbook.c:2561
+#: alpine/radio.c:819 alpine/addrbook.c:2561
 msgid "OTHER CMDS"
 msgstr ""
 
-#: alpine/mailcmd.c:124
+#: alpine/mailcmd.c:122
 msgid "ALTER message selection : "
 msgstr ""
 
@@ -2286,19 +2403,19 @@ msgstr ""
 #. remove some selections (like a logical AND instead of logical OR), and Flip
 #. Selected means that all the messages that are currently selected become unselected,
 #. and all the unselected messages become selected.
-#: alpine/mailcmd.c:131
+#: alpine/mailcmd.c:129
 msgid "unselect All"
 msgstr ""
 
-#: alpine/mailcmd.c:133
+#: alpine/mailcmd.c:131
 msgid "Broaden selctn"
 msgstr ""
 
-#: alpine/mailcmd.c:134
+#: alpine/mailcmd.c:132
 msgid "Narrow selctn"
 msgstr ""
 
-#: alpine/mailcmd.c:135
+#: alpine/mailcmd.c:133
 msgid "Flip selected"
 msgstr ""
 
@@ -2310,40 +2427,40 @@ msgstr ""
 #. and Rule is an alpine rule
 #. TRANSLATORS: keymenu descriptions, select all folders, current folder, select
 #. based on folder properties, or select based on text contents in folders
-#: alpine/mailcmd.c:151 alpine/mailcmd.c:190 alpine/folder.c:3270
+#: alpine/mailcmd.c:149 alpine/mailcmd.c:188 alpine/folder.c:3282
 msgid "select All"
 msgstr ""
 
-#: alpine/mailcmd.c:152 alpine/mailcmd.c:6626 alpine/folder.c:3271
-#: alpine/folder.c:3285
+#: alpine/mailcmd.c:150 alpine/mailcmd.c:6902 alpine/folder.c:3283
+#: alpine/folder.c:3297
 msgid "select Cur"
 msgstr ""
 
-#: alpine/mailcmd.c:153 alpine/mailcmd.c:193
+#: alpine/mailcmd.c:151 alpine/mailcmd.c:191
 msgid "Number"
 msgstr ""
 
-#: alpine/mailcmd.c:154 alpine/mailcmd.c:194
+#: alpine/mailcmd.c:152 alpine/mailcmd.c:192
 msgid "Date"
 msgstr ""
 
-#: alpine/mailcmd.c:156 alpine/mailcmd.c:196
+#: alpine/mailcmd.c:154 alpine/mailcmd.c:194
 msgid "Status"
 msgstr ""
 
-#: alpine/mailcmd.c:157 alpine/mailcmd.c:197
+#: alpine/mailcmd.c:155 alpine/mailcmd.c:195
 msgid "siZe"
 msgstr ""
 
-#: alpine/mailcmd.c:158 alpine/mailcmd.c:198
+#: alpine/mailcmd.c:156 alpine/mailcmd.c:196
 msgid "Keyword"
 msgstr ""
 
-#: alpine/mailcmd.c:159 alpine/mailcmd.c:199
+#: alpine/mailcmd.c:157 alpine/mailcmd.c:197
 msgid "Rule"
 msgstr ""
 
-#: alpine/mailcmd.c:160 alpine/mailcmd.c:200
+#: alpine/mailcmd.c:158 alpine/mailcmd.c:198
 msgid "tHread"
 msgstr ""
 
@@ -2352,38 +2469,40 @@ msgstr ""
 #. the address book; Save means to save the messages into another alpine folder;
 #. Export means to copy the messages to a file outside of alpine, external to
 #. alpine's world.
-#: alpine/mailcmd.c:171
+#: alpine/mailcmd.c:169
 msgid "Del"
 msgstr ""
 
-#: alpine/mailcmd.c:172
+#: alpine/mailcmd.c:170
 msgid "Undel"
 msgstr ""
 
-#: alpine/mailcmd.c:173 alpine/mailcmd.c:263 alpine/mailcmd.c:2577
-#: alpine/reply.c:833 alpine/reply.c:1161
+#: alpine/mailcmd.c:171 alpine/mailcmd.c:261 alpine/mailcmd.c:2639
+#: alpine/mailcmd.c:7467 alpine/mailcmd.c:7492 alpine/reply.c:836
+#: alpine/reply.c:1288
 msgid "Reply"
 msgstr ""
 
-#: alpine/mailcmd.c:174 alpine/mailcmd.c:264 alpine/mailcmd.c:2576
-#: alpine/folder.c:6644 alpine/reply.c:835
+#: alpine/mailcmd.c:172 alpine/mailcmd.c:262 alpine/mailcmd.c:2638
+#: alpine/mailcmd.c:7468 alpine/mailcmd.c:7491 alpine/folder.c:6657
+#: alpine/reply.c:838
 msgid "Forward"
 msgstr ""
 
-#: alpine/mailcmd.c:176
+#: alpine/mailcmd.c:174
 msgid "TakeAddr"
 msgstr ""
 
 #. TRANSLATORS: select currrently highlighted message Thread
-#: alpine/mailcmd.c:192 alpine/mailcmd.c:6621
+#: alpine/mailcmd.c:190 alpine/mailcmd.c:6897
 msgid "select Curthrd"
 msgstr ""
 
-#: alpine/mailcmd.c:206
+#: alpine/mailcmd.c:204
 msgid "Select New, Deleted, Answered, Forwarded, or Important messages ? "
 msgstr ""
 
-#: alpine/mailcmd.c:208
+#: alpine/mailcmd.c:206
 msgid ""
 "Select NOT New, NOT Deleted, NOT Answered, NOT Forwarded or NOT Important "
 "msgs ? "
@@ -2395,1036 +2514,1074 @@ msgstr ""
 #. thing, so message is not New or not Important.
 #. TRANSLATORS: these are types of flags (markers) that the user can
 #. set. For example, they can flag the message as an important message.
-#: alpine/mailcmd.c:214 alpine/mailcmd.c:297 alpine/mailcmd.c:1643
-#: alpine/mailcmd.c:9452
+#: alpine/mailcmd.c:212 alpine/mailcmd.c:295 alpine/mailcmd.c:1691
+#: alpine/mailcmd.c:9863
 msgid "New"
 msgstr ""
 
-#: alpine/mailcmd.c:215 alpine/mailcmd.c:298 alpine/mailcmd.c:1642
-#: alpine/mailcmd.c:9451
+#: alpine/mailcmd.c:213 alpine/mailcmd.c:296 alpine/mailcmd.c:1690
+#: alpine/mailcmd.c:9862
 msgid "Important"
 msgstr ""
 
-#: alpine/mailcmd.c:216 alpine/mailcmd.c:299 alpine/mailcmd.c:1646
-#: alpine/mailcmd.c:9454 alpine/confscroll.c:2749 alpine/confscroll.c:2976
+#: alpine/mailcmd.c:214 alpine/mailcmd.c:297 alpine/mailcmd.c:1694
+#: alpine/mailcmd.c:9865 alpine/confscroll.c:2758 alpine/confscroll.c:2985
 #: alpine/colorconf.c:1281
 msgid "Deleted"
 msgstr ""
 
-#: alpine/mailcmd.c:217 alpine/mailcmd.c:300 alpine/mailcmd.c:1644
-#: alpine/mailcmd.c:9453
+#: alpine/mailcmd.c:215 alpine/mailcmd.c:298 alpine/mailcmd.c:1692
+#: alpine/mailcmd.c:9864
 msgid "Answered"
 msgstr ""
 
-#: alpine/mailcmd.c:218 alpine/mailcmd.c:301 alpine/mailcmd.c:1645
+#: alpine/mailcmd.c:216 alpine/mailcmd.c:299 alpine/mailcmd.c:1693
 msgid "Forwarded"
 msgstr ""
 
-#: alpine/mailcmd.c:220 alpine/mailcmd.c:253 alpine/mailcmd.c:290
-#: alpine/mailcmd.c:302
+#: alpine/mailcmd.c:218 alpine/mailcmd.c:251 alpine/mailcmd.c:288
+#: alpine/mailcmd.c:300
 msgid "Not"
 msgstr ""
 
-#: alpine/mailcmd.c:222 alpine/folder.c:3327
+#: alpine/mailcmd.c:220 alpine/folder.c:3339
 msgid "Recent"
 msgstr ""
 
-#: alpine/mailcmd.c:223 alpine/folder.c:3333
+#: alpine/mailcmd.c:221 alpine/folder.c:3345
 msgid "Unseen"
 msgstr ""
 
 #. TRANSLATORS: options when selecting messages by Date
-#: alpine/mailcmd.c:231
+#: alpine/mailcmd.c:229
 msgid "Prev Day"
 msgstr ""
 
-#: alpine/mailcmd.c:232
+#: alpine/mailcmd.c:230
 msgid "Next Day"
 msgstr ""
 
-#: alpine/mailcmd.c:233
+#: alpine/mailcmd.c:231
 msgid "Cur Msg"
 msgstr ""
 
-#: alpine/mailcmd.c:234
+#: alpine/mailcmd.c:232
 msgid "Toggle When"
 msgstr ""
 
-#: alpine/mailcmd.c:242
+#: alpine/mailcmd.c:240
 msgid ""
 "Select based on To, From, Cc, Recip, Partic, Subject fields or All msg "
 "text ? "
 msgstr ""
 
-#: alpine/mailcmd.c:244
+#: alpine/mailcmd.c:242
 msgid ""
 "Select based on NOT To, From, Cc, Recip, Partic, Subject or All msg text ? "
 msgstr ""
 
 #. TRANSLATORS: Select messages based on the text contained in the From line, or
 #. the Subject line, and so on.
-#: alpine/mailcmd.c:248
+#: alpine/mailcmd.c:246
 msgid "From"
 msgstr ""
 
-#: alpine/mailcmd.c:249
+#: alpine/mailcmd.c:247
 msgid "Subject"
 msgstr ""
 
-#: alpine/mailcmd.c:250
+#: alpine/mailcmd.c:248
 msgid "To"
 msgstr ""
 
-#: alpine/mailcmd.c:251
+#: alpine/mailcmd.c:249
 msgid "All Text"
 msgstr ""
 
-#: alpine/mailcmd.c:252
+#: alpine/mailcmd.c:250
 msgid "Cc"
 msgstr ""
 
-#: alpine/mailcmd.c:254
+#: alpine/mailcmd.c:252
 msgid "Recipient"
 msgstr ""
 
-#: alpine/mailcmd.c:255
+#: alpine/mailcmd.c:253
 msgid "Participant"
 msgstr ""
 
-#: alpine/mailcmd.c:256
+#: alpine/mailcmd.c:254
 msgid "Body"
 msgstr ""
 
-#: alpine/mailcmd.c:257
+#: alpine/mailcmd.c:255
 msgid "Header"
 msgstr ""
 
-#: alpine/mailcmd.c:262 alpine/reply.c:837
+#: alpine/mailcmd.c:260 alpine/reply.c:840
 msgid "Compose"
 msgstr ""
 
-#: alpine/mailcmd.c:265 alpine/mailcmd.c:2578 alpine/mailcmd.c:7045
+#: alpine/mailcmd.c:263 alpine/mailcmd.c:2640 alpine/mailcmd.c:7322
+#: alpine/mailcmd.c:7469 alpine/mailcmd.c:7492
 msgid "Bounce"
 msgstr ""
 
-#: alpine/mailcmd.c:270
+#: alpine/mailcmd.c:268
 msgid "Enter comma-delimited list of numbers (dash between ranges): "
 msgstr ""
 
-#: alpine/mailcmd.c:273
+#: alpine/mailcmd.c:271
 msgid "Select messages with size larger than: "
 msgstr ""
 
-#: alpine/mailcmd.c:276
+#: alpine/mailcmd.c:274
 msgid "Select messages with size smaller than: "
 msgstr ""
 
-#: alpine/mailcmd.c:278
+#: alpine/mailcmd.c:276
 msgid "Larger"
 msgstr ""
 
-#: alpine/mailcmd.c:279
+#: alpine/mailcmd.c:277
 msgid "Smaller"
 msgstr ""
 
-#: alpine/mailcmd.c:288
+#: alpine/mailcmd.c:286
 msgid "To List"
 msgstr ""
 
-#: alpine/mailcmd.c:303
+#: alpine/mailcmd.c:301
 msgid "To Flag Details"
 msgstr ""
 
-#: alpine/mailcmd.c:360
+#: alpine/mailcmd.c:310
+#, c-format
+msgid "Save certificate for <%s>"
+msgstr ""
+
+#: alpine/mailcmd.c:311
+msgid "missing address"
+msgstr ""
+
+#: alpine/mailcmd.c:330 alpine/mailcmd.c:3561 alpine/mailcmd.c:4005
+#: alpine/adrbkcmd.c:4178 alpine/folder.c:3731 alpine/folder.c:3866
+#: alpine/mailpart.c:1299 alpine/mailpart.c:1735 alpine/mailpart.c:1814
+#: pico/attach.c:70 pico/file.c:133 pico/file.c:582
+msgid "To Files"
+msgstr ""
+
+#: alpine/mailcmd.c:406
 msgid "HELP FOR MESSAGE INDEX"
 msgstr ""
 
-#: alpine/mailcmd.c:362
+#: alpine/mailcmd.c:408
 msgid "HELP FOR MESSAGE TEXT"
 msgstr ""
 
-#: alpine/mailcmd.c:363
+#: alpine/mailcmd.c:409
 msgid "HELP FOR THREAD INDEX"
 msgstr ""
 
-#: alpine/mailcmd.c:411 alpine/mailcmd.c:477
+#: alpine/mailcmd.c:457 alpine/mailcmd.c:523
 #, c-format
 msgid "Already on first %s in Zoomed Index"
 msgstr ""
 
-#: alpine/mailcmd.c:412 alpine/mailcmd.c:478 alpine/mailcmd.c:492
+#: alpine/mailcmd.c:458 alpine/mailcmd.c:524 alpine/mailcmd.c:538
 msgid "thread"
 msgstr ""
 
-#: alpine/mailcmd.c:412 alpine/mailcmd.c:478 alpine/mailcmd.c:492
-#: alpine/mailcmd.c:1159
+#: alpine/mailcmd.c:458 alpine/mailcmd.c:524 alpine/mailcmd.c:538
+#: alpine/mailcmd.c:1207
 msgid "message"
 msgstr ""
 
-#: alpine/mailcmd.c:418
+#: alpine/mailcmd.c:464
 msgid "View previous thread"
 msgstr ""
 
-#: alpine/mailcmd.c:423
+#: alpine/mailcmd.c:469
 msgid "Viewing previous thread"
 msgstr ""
 
-#: alpine/mailcmd.c:491
+#: alpine/mailcmd.c:537
 #, c-format
 msgid "Already on first %s"
 msgstr ""
 
-#: alpine/mailcmd.c:527
+#: alpine/mailcmd.c:573
 msgid "View next thread"
 msgstr ""
 
-#: alpine/mailcmd.c:532
+#: alpine/mailcmd.c:578
 msgid "Viewing next thread"
 msgstr ""
 
-#: alpine/mailcmd.c:589
+#: alpine/mailcmd.c:635
 msgid "Expand collapsed thread to see more messages"
 msgstr ""
 
-#: alpine/mailcmd.c:607
+#: alpine/mailcmd.c:653
 msgid ".  Press TAB for next folder."
 msgstr ""
 
-#: alpine/mailcmd.c:610
+#: alpine/mailcmd.c:656
 msgid ".  No more folders to TAB to."
 msgstr ""
 
-#: alpine/mailcmd.c:808 alpine/mailcmd.c:1094
+#: alpine/mailcmd.c:854 alpine/mailcmd.c:1142
 msgid "NextNew"
 msgstr ""
 
-#: alpine/mailcmd.c:813
+#: alpine/mailcmd.c:859
 #, c-format
 msgid "View thread number %s? "
 msgstr ""
 
-#: alpine/mailcmd.c:817
+#: alpine/mailcmd.c:863
 #, c-format
 msgid "View message in thread number %s? "
 msgstr ""
 
-#: alpine/mailcmd.c:981
+#: alpine/mailcmd.c:1027
 msgid "To Inbox"
 msgstr ""
 
-#: alpine/mailcmd.c:991
+#: alpine/mailcmd.c:1037
 #, c-format
 msgid "No more incoming folders. Return to \"%s\"? "
 msgstr ""
 
-#: alpine/mailcmd.c:993
+#: alpine/mailcmd.c:1039
 #, c-format
 msgid "No more news groups. Return to \"%s\"? "
 msgstr ""
 
-#: alpine/mailcmd.c:1017
+#: alpine/mailcmd.c:1063
 msgid "No more incoming folders"
 msgstr ""
 
-#: alpine/mailcmd.c:1019
+#: alpine/mailcmd.c:1065
 msgid "No more news groups"
 msgstr ""
 
-#: alpine/mailcmd.c:1150 alpine/mailindx.c:2917
+#: alpine/mailcmd.c:1198 alpine/mailindx.c:2934
 msgid "Index Zoom Mode is now off"
 msgstr ""
 
-#: alpine/mailcmd.c:1156
+#: alpine/mailcmd.c:1204
 #, c-format
 msgid "In Zoomed Index of %s%s%s%s.  Use \"Z\" to restore regular Index"
 msgstr ""
 
-#: alpine/mailcmd.c:1159
+#: alpine/mailcmd.c:1207
 msgid "threads"
 msgstr ""
 
-#: alpine/mailcmd.c:1164
+#: alpine/mailcmd.c:1212
 msgid "All messages selected, so not entering Index Zoom Mode"
 msgstr ""
 
-#: alpine/mailcmd.c:1218
+#: alpine/mailcmd.c:1266
 msgid "Unexclude not available for mail folders"
 msgstr ""
 
-#: alpine/mailcmd.c:1408 alpine/mailpart.c:522 alpine/mailpart.c:2609
+#: alpine/mailcmd.c:1456 alpine/mailpart.c:523 alpine/mailpart.c:2650
 msgid "Display of full headers is now off."
 msgstr ""
 
-#: alpine/mailcmd.c:1413 alpine/mailpart.c:527 alpine/mailpart.c:2614
+#: alpine/mailcmd.c:1461 alpine/mailpart.c:528 alpine/mailpart.c:2655
 #, c-format
 msgid "Quotes displayed, use %s to see full headers"
 msgstr ""
 
-#: alpine/mailcmd.c:1419 alpine/mailpart.c:533 alpine/mailpart.c:2620
+#: alpine/mailcmd.c:1467 alpine/mailpart.c:534 alpine/mailpart.c:2661
 msgid "Display of full headers is now on."
 msgstr ""
 
-#: alpine/mailcmd.c:1628
+#: alpine/mailcmd.c:1676
 msgid "    Set desired flags for current message below.  An 'X' means set"
 msgstr ""
 
-#: alpine/mailcmd.c:1629
+#: alpine/mailcmd.c:1677
 msgid "    it, and a ' ' means to unset it.  Choose \"Exit\" when finished."
 msgstr ""
 
-#: alpine/mailcmd.c:1634
+#: alpine/mailcmd.c:1682
 msgid "    Set desired flags below for selected messages.  A '?' means to"
 msgstr ""
 
-#: alpine/mailcmd.c:1635
+#: alpine/mailcmd.c:1683
 msgid "    leave the flag unchanged, 'X' means to set it, and a ' ' means"
 msgstr ""
 
-#: alpine/mailcmd.c:1636
+#: alpine/mailcmd.c:1684
 msgid "    to unset it.  Use the \"Return\" key to toggle, and choose"
 msgstr ""
 
-#: alpine/mailcmd.c:1637
+#: alpine/mailcmd.c:1685
 msgid "    \"Exit\" when finished."
 msgstr ""
 
-#: alpine/mailcmd.c:1722 alpine/mailcmd.c:1724
+#: alpine/mailcmd.c:1770 alpine/mailcmd.c:1772
 msgid "User-defined Keywords from Setup/Config"
 msgstr ""
 
-#: alpine/mailcmd.c:1757 alpine/mailcmd.c:1759
+#: alpine/mailcmd.c:1805 alpine/mailcmd.c:1807
 msgid "Other keywords in the mailbox that are not user-defined"
 msgstr ""
 
-#: alpine/mailcmd.c:1833
+#: alpine/mailcmd.c:1881
 msgid "Error accessing message data"
 msgstr ""
 
-#: alpine/mailcmd.c:2059
+#: alpine/mailcmd.c:2107
 msgid "No more keywords allowed in this folder!"
 msgstr ""
 
-#: alpine/mailcmd.c:2062
+#: alpine/mailcmd.c:2110
 msgid "Cannot add keywords for this folder so cannot set Forwarded flag"
 msgstr ""
 
-#: alpine/mailcmd.c:2065
+#: alpine/mailcmd.c:2113
 msgid "Cannot add keywords for this folder"
 msgstr ""
 
-#: alpine/mailcmd.c:2100
+#: alpine/mailcmd.c:2148
 msgid "No flags changed."
 msgstr ""
 
-#: alpine/mailcmd.c:2123
+#: alpine/mailcmd.c:2171
 msgid "Flag New, Deleted, Answered, Forwarded or Important ? "
 msgstr ""
 
-#: alpine/mailcmd.c:2125
+#: alpine/mailcmd.c:2173
 msgid "Flag New, Deleted, Answered, Forwarded, Important or Keyword initial ? "
 msgstr ""
 
-#: alpine/mailcmd.c:2127
+#: alpine/mailcmd.c:2175
 msgid "Flag !New, !Deleted, !Answered, !Forwarded, or !Important ? "
 msgstr ""
 
-#: alpine/mailcmd.c:2129
+#: alpine/mailcmd.c:2177
 msgid ""
 "Flag !New, !Deleted, !Answered, !Forwarded, !Important or !Keyword initial ? "
 msgstr ""
 
-#: alpine/mailcmd.c:2379
+#: alpine/mailcmd.c:2392
+msgid "WARNING: non-selected message is being bounced!"
+msgstr ""
+
+#: alpine/mailcmd.c:2397
+msgid "WARNING: not bouncing all selected messages!"
+msgstr ""
+
+#: alpine/mailcmd.c:2441
 msgid "Saved copy will NOT include entire message!  Continue"
 msgstr ""
 
-#: alpine/mailcmd.c:2394
+#: alpine/mailcmd.c:2456
 msgid "Can't save message.  Error accessing folder"
 msgstr ""
 
-#: alpine/mailcmd.c:2432
+#: alpine/mailcmd.c:2494
 msgid "Saving"
 msgstr ""
 
-#: alpine/mailcmd.c:2547
+#: alpine/mailcmd.c:2609
 msgid "Compose, Forward, Reply, or Bounce? "
 msgstr ""
 
-#: alpine/mailcmd.c:2553 alpine/roleconf.c:144
+#: alpine/mailcmd.c:2615 alpine/roleconf.c:144
 msgid "No roles available. Use Setup/Rules to add roles."
 msgstr ""
 
-#: alpine/mailcmd.c:2578
+#: alpine/mailcmd.c:2640
 msgid "Composition"
 msgstr ""
 
 #. TRANSLATORS: command means go to Folders list
 #. TRANSLATORS: To Folders
-#: alpine/mailcmd.c:2681 alpine/adrbkcmd.c:857
+#: alpine/mailcmd.c:2743 alpine/adrbkcmd.c:857
 msgid "To Fldrs"
 msgstr ""
 
-#: alpine/mailcmd.c:2687 alpine/mailcmd.c:5327
+#: alpine/mailcmd.c:2749 alpine/mailcmd.c:5584
 msgid "Prev Collection"
 msgstr ""
 
-#: alpine/mailcmd.c:2692 alpine/mailcmd.c:5332
+#: alpine/mailcmd.c:2754 alpine/mailcmd.c:5589
 msgid "Next Collection"
 msgstr ""
 
 #. TRANSLATORS: list all the matches
-#: alpine/mailcmd.c:2708 alpine/mailcmd.c:3483 alpine/mailcmd.c:5351
+#: alpine/mailcmd.c:2770 alpine/mailcmd.c:3586 alpine/mailcmd.c:5608
 msgid "ListMatches"
 msgstr ""
 
-#: alpine/mailcmd.c:2830 alpine/mailcmd.c:5468
+#: alpine/mailcmd.c:2892 alpine/mailcmd.c:5744
 msgid "Error reading folder name"
 msgstr ""
 
-#: alpine/mailcmd.c:2861 alpine/mailcmd.c:5543 alpine/mailcmd.c:5554
+#: alpine/mailcmd.c:2923 alpine/mailcmd.c:5819 alpine/mailcmd.c:5830
 #, c-format
 msgid "Problem accessing folder \"%s\""
 msgstr ""
 
-#: alpine/mailcmd.c:2910 alpine/folder.c:2744
+#: alpine/mailcmd.c:2972 alpine/folder.c:2744
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr ""
 
-#: alpine/mailcmd.c:2956
+#: alpine/mailcmd.c:3018
 msgid "HELP FOR SAVE"
 msgstr ""
 
-#: alpine/mailcmd.c:3102
+#: alpine/mailcmd.c:3164
 #, c-format
 msgid "\"%.15s%s\" doesn't exist - Add it in FOLDER LIST screen"
 msgstr ""
 
-#: alpine/mailcmd.c:3109
+#: alpine/mailcmd.c:3171
 #, c-format
 msgid "Folder \"%.15s%s\" in <%.15s%s> doesn't exist. Create"
 msgstr ""
 
-#: alpine/mailcmd.c:3116
+#: alpine/mailcmd.c:3178
 #, c-format
 msgid "Folder \"%.40s%s\" doesn't exist.  Create"
 msgstr ""
 
-#: alpine/mailcmd.c:3195
+#: alpine/mailcmd.c:3227
+msgid "No selected messages are deleted"
+msgstr ""
+
+#: alpine/mailcmd.c:3282
 msgid "Can't expunge. Folder is read-only"
 msgstr ""
 
-#: alpine/mailcmd.c:3244
+#: alpine/mailcmd.c:3335
 msgid "Expunging"
 msgstr ""
 
-#: alpine/mailcmd.c:3276
+#: alpine/mailcmd.c:3371
 #, c-format
 msgid "No messages expunged from folder \"%s\""
 msgstr ""
 
-#: alpine/mailcmd.c:3280
+#: alpine/mailcmd.c:3377
 msgid "No messages marked deleted.  No messages expunged."
 msgstr ""
 
-#: alpine/mailcmd.c:3458 alpine/mailcmd.c:3877 alpine/adrbkcmd.c:4178
-#: alpine/folder.c:3719 alpine/folder.c:3854 alpine/mailpart.c:1298
-#: alpine/mailpart.c:1725 alpine/mailpart.c:1804 pico/attach.c:69
-#: pico/file.c:132 pico/file.c:577
-msgid "To Files"
-msgstr ""
-
 #. TRANSLATORS: this is an abbreviation for Download Messages
-#: alpine/mailcmd.c:3466 alpine/mailpart.c:1316
+#: alpine/mailcmd.c:3569 alpine/mailpart.c:1317
 msgid "Downld Msg"
 msgstr ""
 
-#: alpine/mailcmd.c:3536 alpine/mailcmd.c:3972 alpine/adrbkcmd.c:4264
-#: alpine/folder.c:3751 alpine/mailpart.c:1753 alpine/mailpart.c:1830
+#: alpine/mailcmd.c:3639 alpine/mailcmd.c:4100 alpine/adrbkcmd.c:4264
+#: alpine/folder.c:3763 alpine/mailpart.c:1763 alpine/mailpart.c:1840
 #, c-format
 msgid "Can't export to file outside of %s"
 msgstr ""
 
-#: alpine/mailcmd.c:3597
+#: alpine/mailcmd.c:3700
 msgid "Error running download command"
 msgstr ""
 
-#: alpine/mailcmd.c:3610
+#: alpine/mailcmd.c:3713
 msgid "Download Command Completed"
 msgstr ""
 
 #. TRANSLATORS: error opening file "<filename>" to export message: <error text>
 #. TRANSLATORS: Error opening file <filename> to export message: <error text>
-#: alpine/mailcmd.c:3628 alpine/mailpart.c:1782
+#: alpine/mailcmd.c:3731 alpine/mailpart.c:1792
 #, c-format
 msgid "Error opening file \"%s\" to export message: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:3640
+#: alpine/mailcmd.c:3743
 msgid "Can't export message. Error accessing mail folder"
 msgstr ""
 
 #. TRANSLATORS: Error exporting to <filename>: <error text>
-#: alpine/mailcmd.c:3681 alpine/adrbkcmd.c:4469
+#: alpine/mailcmd.c:3784 alpine/adrbkcmd.c:4469
 #, c-format
 msgid "Error exporting to \"%s\" : %s"
 msgstr ""
 
-#: alpine/mailcmd.c:3707
+#: alpine/mailcmd.c:3810
 #, c-format
 msgid "Can't save attachments, filename too long: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:3748
+#: alpine/mailcmd.c:3851
 msgid "Problem saving attachments"
 msgstr ""
 
-#: alpine/mailcmd.c:3755
+#: alpine/mailcmd.c:3858
 #, c-format
 msgid "Problem saving attachments: %s: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:3766
+#: alpine/mailcmd.c:3869
 msgid "Problem reading message"
 msgstr ""
 
-#: alpine/mailcmd.c:3817
+#: alpine/mailcmd.c:3945
 msgid "Problems saving attachments"
 msgstr ""
 
 #. TRANSLATORS: Saved <how many> attachements to <directory name>
-#: alpine/mailcmd.c:3823
+#: alpine/mailcmd.c:3951
 #, c-format
 msgid "Saved %s attachments to %s"
 msgstr ""
 
-#: alpine/mailcmd.c:3826
+#: alpine/mailcmd.c:3954
 msgid "No attachments to save"
 msgstr ""
 
 #. TRANSLATORS: Problem saving to <filename>: <error text>
-#: alpine/mailcmd.c:3925 alpine/mailcmd.c:3935
+#: alpine/mailcmd.c:4053 alpine/mailcmd.c:4063
 #, c-format
 msgid "Problem saving to \"%s\": %s"
 msgstr ""
 
-#: alpine/mailcmd.c:3942
+#: alpine/mailcmd.c:4070
 #, c-format
 msgid "Error opening file \"%s\" for export: %s"
 msgstr ""
 
 #. TRANSLATORS: Export all attachment parts
-#: alpine/mailcmd.c:4074 alpine/mailcmd.c:4499
+#: alpine/mailcmd.c:4225 alpine/mailcmd.c:4701
 msgid "AllParts"
 msgstr ""
 
-#: alpine/mailcmd.c:4271
+#: alpine/mailcmd.c:4233 alpine/mailcmd.c:4721
+msgid "Binary"
+msgstr ""
+
+#: alpine/mailcmd.c:4471
 msgid "HELP FOR IMPORT FILE SELECT"
 msgstr ""
 
-#: alpine/mailcmd.c:4273 alpine/mailcmd.c:4275
+#: alpine/mailcmd.c:4473 alpine/mailcmd.c:4475
 msgid "HELP FOR EXPORT FILE SELECT"
 msgstr ""
 
-#: alpine/mailcmd.c:4504
+#: alpine/mailcmd.c:4578
+msgid "getcwd() call failed at get_export_filename"
+msgstr ""
+
+#: alpine/mailcmd.c:4706
 msgid "NoAllParts"
 msgstr ""
 
-#: alpine/mailcmd.c:4580
+#: alpine/mailcmd.c:4725
+msgid "No Binary"
+msgstr ""
+
+#: alpine/mailcmd.c:4827
 #, c-format
 msgid "Error expanding file name: \"%s\" unknown user"
 msgstr ""
 
 #. TRANSLATORS: asking user if they want to overwrite (replace contents of)
 #. a file or append to the end of the file
-#: alpine/mailcmd.c:4632
+#: alpine/mailcmd.c:4879
 msgid "Overwrite"
 msgstr ""
 
-#: alpine/mailcmd.c:4633
+#: alpine/mailcmd.c:4880
 msgid "Append"
 msgstr ""
 
 #. TRANSLATORS: asking user whether to overwrite a file or not,
 #. File <filename> already exists. Overwrite it ?
-#: alpine/mailcmd.c:4643
+#: alpine/mailcmd.c:4890
 #, c-format
 msgid "File \"%s%s\" already exists. Overwrite it "
 msgstr ""
 
 #. TRANSLATORS: Cannot remove old <filename>: <error text>
-#: alpine/mailcmd.c:4654
+#: alpine/mailcmd.c:4901
 #, c-format
 msgid "Cannot remove old %s: %s"
 msgstr ""
 
 #. TRANSLATORS: File <filename> already exists. Overwrite or append to it ?
-#: alpine/mailcmd.c:4667
+#: alpine/mailcmd.c:4914
 #, c-format
 msgid "File \"%s%s\" already exists. Overwrite or append to it ? "
 msgstr ""
 
 #. TRANSLATORS: Warning: Cannot truncate old <filename>: <error text>
-#: alpine/mailcmd.c:4681
+#: alpine/mailcmd.c:4928
 #, c-format
 msgid "Warning: Cannot truncate old %s: %s"
 msgstr ""
 
 #. TRANSLATORS: go to First Message
-#: alpine/mailcmd.c:4825 alpine/mailindx.c:2949
+#: alpine/mailcmd.c:5081 alpine/mailindx.c:2966
 msgid "First Msg"
 msgstr ""
 
-#: alpine/mailcmd.c:4826 alpine/mailindx.c:2950
+#: alpine/mailcmd.c:5082 alpine/mailindx.c:2967
 msgid "Last Msg"
 msgstr ""
 
-#: alpine/mailcmd.c:4909 alpine/mailcmd.c:5167
+#: alpine/mailcmd.c:5165 alpine/mailcmd.c:5423
 msgid "Invalid number entered. Use only digits 0-9"
 msgstr ""
 
-#: alpine/mailcmd.c:5174
+#: alpine/mailcmd.c:5430
 msgid "Number should be >= 0"
 msgstr ""
 
-#: alpine/mailcmd.c:5177
+#: alpine/mailcmd.c:5433
 #, c-format
 msgid "Maximum is %s"
 msgstr ""
 
-#: alpine/mailcmd.c:5338
+#: alpine/mailcmd.c:5595
 msgid "INBOX"
 msgstr ""
 
-#: alpine/mailcmd.c:5558
+#: alpine/mailcmd.c:5834
 #, c-format
 msgid "Can't find Incoming Folder: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:5562
+#: alpine/mailcmd.c:5838
 #, c-format
 msgid "Can't find folder \"%s\" in %s"
 msgstr ""
 
-#: alpine/mailcmd.c:5566
+#: alpine/mailcmd.c:5842
 #, c-format
 msgid "Can't find folder \"%s\""
 msgstr ""
 
 #. TRANSLATORS: This is a question, Print Index ?
-#: alpine/mailcmd.c:5909
+#: alpine/mailcmd.c:6185
 msgid "Print Index"
 msgstr ""
 
-#: alpine/mailcmd.c:5972
+#: alpine/mailcmd.c:6248
 msgid "Error printing folder index"
 msgstr ""
 
-#: alpine/mailcmd.c:6001
+#: alpine/mailcmd.c:6277
 msgid "Error printing message"
 msgstr ""
 
-#: alpine/mailcmd.c:6131
+#: alpine/mailcmd.c:6407
 msgid "Shown Text"
 msgstr ""
 
-#: alpine/mailcmd.c:6131
+#: alpine/mailcmd.c:6407
 msgid "Raw Text"
 msgstr ""
 
-#: alpine/mailcmd.c:6132
+#: alpine/mailcmd.c:6408
 msgid "Free Output"
 msgstr ""
 
-#: alpine/mailcmd.c:6132
+#: alpine/mailcmd.c:6408
 msgid "Capture Output"
 msgstr ""
 
-#: alpine/mailcmd.c:6133
+#: alpine/mailcmd.c:6409
 msgid "No Delimiter"
 msgstr ""
 
-#: alpine/mailcmd.c:6133
+#: alpine/mailcmd.c:6409
 msgid "With Delimiter"
 msgstr ""
 
-#: alpine/mailcmd.c:6135
+#: alpine/mailcmd.c:6411
 msgid "To Same Pipe"
 msgstr ""
 
-#: alpine/mailcmd.c:6135
+#: alpine/mailcmd.c:6411
 msgid "To Individual Pipes"
 msgstr ""
 
-#: alpine/mailcmd.c:6161
+#: alpine/mailcmd.c:6437
 msgid "Internal problem encountered"
 msgstr ""
 
-#: alpine/mailcmd.c:6284
+#: alpine/mailcmd.c:6560
 #, c-format
 msgid "Internal Error: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:6307
+#: alpine/mailcmd.c:6583
 msgid "Error piping message"
 msgstr ""
 
-#: alpine/mailcmd.c:6317
+#: alpine/mailcmd.c:6593
 msgid "Pipe command completed"
 msgstr ""
 
-#: alpine/mailcmd.c:6331
+#: alpine/mailcmd.c:6607
 msgid "HELP FOR PIPE COMMAND"
 msgstr ""
 
-#: alpine/mailcmd.c:6401
+#: alpine/mailcmd.c:6677
 msgid " has information associated with it "
 msgstr ""
 
-#: alpine/mailcmd.c:6402
+#: alpine/mailcmd.c:6678
 msgid "that explains how to participate in an email list.  An "
 msgstr ""
 
-#: alpine/mailcmd.c:6403
+#: alpine/mailcmd.c:6679
 msgid "email list is represented by a single email address that "
 msgstr ""
 
-#: alpine/mailcmd.c:6404
+#: alpine/mailcmd.c:6680
 msgid "users sharing a common interest can send messages to (known "
 msgstr ""
 
-#: alpine/mailcmd.c:6405
+#: alpine/mailcmd.c:6681
 msgid "as posting) which are then redistributed to all members "
 msgstr ""
 
-#: alpine/mailcmd.c:6406
+#: alpine/mailcmd.c:6682
 msgid "of the list (sometimes after review by a moderator)."
 msgstr ""
 
-#: alpine/mailcmd.c:6407
+#: alpine/mailcmd.c:6683
 msgid "<P>List participation commands in this message include:"
 msgstr ""
 
-#: alpine/mailcmd.c:6452
+#: alpine/mailcmd.c:6728
 msgid "With the provided comment:<P><BLOCKQUOTE>"
 msgstr ""
 
-#: alpine/mailcmd.c:6461
+#: alpine/mailcmd.c:6737
 msgid "Posting is <EM>not</EM> allowed on this list"
 msgstr ""
 
-#: alpine/mailcmd.c:6545
+#: alpine/mailcmd.c:6821
 msgid "MAIL LIST COMMANDS"
 msgstr ""
 
-#: alpine/mailcmd.c:6549
+#: alpine/mailcmd.c:6825
 msgid "HELP FOR LIST COMMANDS"
 msgstr ""
 
-#: alpine/mailcmd.c:6621
+#: alpine/mailcmd.c:6897
 msgid "unselect Curthrd"
 msgstr ""
 
-#: alpine/mailcmd.c:6626 alpine/folder.c:3285
+#: alpine/mailcmd.c:6902 alpine/folder.c:3297
 msgid "unselect Cur"
 msgstr ""
 
-#: alpine/mailcmd.c:6671
+#: alpine/mailcmd.c:6947
 msgid "HELP FOR SELECT"
 msgstr ""
 
-#: alpine/mailcmd.c:6846
+#: alpine/mailcmd.c:7122
 msgid "No change resulted.  Matching messages already selected."
 msgstr ""
 
-#: alpine/mailcmd.c:6849
+#: alpine/mailcmd.c:7125
 #, c-format
 msgid "Select failed.  No %smessages selected."
 msgstr ""
 
-#: alpine/mailcmd.c:6850
+#: alpine/mailcmd.c:7126
 msgid "additional "
 msgstr ""
 
-#: alpine/mailcmd.c:6865
+#: alpine/mailcmd.c:7141
 #, c-format
 msgid "Select matched %s message%s!"
 msgstr ""
 
-#: alpine/mailcmd.c:7031
+#: alpine/mailcmd.c:7308
 msgid "Flag"
 msgstr ""
 
-#: alpine/mailcmd.c:7038
+#: alpine/mailcmd.c:7315
 msgid "Pipe"
 msgstr ""
 
-#: alpine/mailcmd.c:7053
+#: alpine/mailcmd.c:7330
 msgid "Collapse"
 msgstr ""
 
-#: alpine/mailcmd.c:7054 alpine/addrbook.c:2503 alpine/addrbook.c:2725
+#: alpine/mailcmd.c:7331 alpine/addrbook.c:2503 alpine/addrbook.c:2725
 msgid "Expand"
 msgstr ""
 
-#: alpine/mailcmd.c:7061
+#: alpine/mailcmd.c:7338
 msgid "UnSelect"
 msgstr ""
 
-#: alpine/mailcmd.c:7244 alpine/mailcmd.c:7396
+#: alpine/mailcmd.c:7475
+msgid "Reply, Forward or Bounce using a role? "
+msgstr ""
+
+#: alpine/mailcmd.c:7610 alpine/mailcmd.c:7782
 #, c-format
 msgid "Invalid number range, missing number before \"-\": %s"
 msgstr ""
 
-#: alpine/mailcmd.c:7254
+#: alpine/mailcmd.c:7628
 #, c-format
 msgid "Invalid message number: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:7263 alpine/mailcmd.c:7293
+#: alpine/mailcmd.c:7639 alpine/mailcmd.c:7679
 #, c-format
 msgid "\"%s\" out of message number range"
 msgstr ""
 
-#: alpine/mailcmd.c:7283 alpine/mailcmd.c:7436
+#: alpine/mailcmd.c:7667 alpine/mailcmd.c:7842
 #, c-format
 msgid "Invalid number range, missing number after \"-\": %s"
 msgstr ""
 
-#: alpine/mailcmd.c:7304 alpine/mailcmd.c:7457
+#: alpine/mailcmd.c:7690 alpine/mailcmd.c:7867
 #, c-format
 msgid "Invalid reverse message number range: %s-%s"
 msgstr ""
 
-#: alpine/mailcmd.c:7406
+#: alpine/mailcmd.c:7800
 #, c-format
 msgid "Invalid thread number: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:7415 alpine/mailcmd.c:7446
+#: alpine/mailcmd.c:7813 alpine/mailcmd.c:7856
 #, c-format
 msgid "\"%s\" out of thread number range"
 msgstr ""
 
-#: alpine/mailcmd.c:7648 alpine/mailcmd.c:7998 alpine/mailcmd.c:8151
-#: alpine/mailcmd.c:8249 alpine/mailcmd.c:8336 alpine/mailcmd.c:8557
+#: alpine/mailcmd.c:8058 alpine/mailcmd.c:8409 alpine/mailcmd.c:8562
+#: alpine/mailcmd.c:8660 alpine/mailcmd.c:8747 alpine/mailcmd.c:8968
 msgid "Selecting"
 msgstr ""
 
-#: alpine/mailcmd.c:7662
+#: alpine/mailcmd.c:8072
 #, c-format
 msgid "Invalid date entered: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:7694
+#: alpine/mailcmd.c:8104
 msgid "[Match_My_Addresses]"
 msgstr ""
 
-#: alpine/mailcmd.c:7695
+#: alpine/mailcmd.c:8105
 msgid "[Don't_Match_My_Addresses]"
 msgstr ""
 
 #. TRANSLATORS: use Current To Address
-#: alpine/mailcmd.c:7734
+#: alpine/mailcmd.c:8144
 msgid "Cur To"
 msgstr ""
 
 #. TRANSLATORS: use Current From Address
-#: alpine/mailcmd.c:7739
+#: alpine/mailcmd.c:8149
 msgid "Cur From"
 msgstr ""
 
 #. TRANSLATORS: use Current Cc Address
-#: alpine/mailcmd.c:7744
+#: alpine/mailcmd.c:8154
 msgid "Cur Cc"
 msgstr ""
 
 #. TRANSLATORS: Match Me means match my address
-#: alpine/mailcmd.c:7749
+#: alpine/mailcmd.c:8159
 msgid "Match Me"
 msgstr ""
 
 #. TRANSLATORS: use Current Subject
-#: alpine/mailcmd.c:7762
+#: alpine/mailcmd.c:8172
 msgid "Cur Subject"
 msgstr ""
 
-#: alpine/mailcmd.c:8073 alpine/mailcmd.c:8092
+#: alpine/mailcmd.c:8484 alpine/mailcmd.c:8503
 #, c-format
 msgid "Invalid size entered: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:8234
+#: alpine/mailcmd.c:8645
 msgid "HELP FOR SELECT BASED ON STATUS"
 msgstr ""
 
-#: alpine/mailcmd.c:8287
+#: alpine/mailcmd.c:8698
 msgid "Rule to NOT match: "
 msgstr ""
 
-#: alpine/mailcmd.c:8288
+#: alpine/mailcmd.c:8699
 msgid "Rule to match: "
 msgstr ""
 
-#: alpine/mailcmd.c:8305
+#: alpine/mailcmd.c:8716
 msgid "HELP FOR SELECT BY RULE"
 msgstr ""
 
-#: alpine/mailcmd.c:8370
+#: alpine/mailcmd.c:8781
 msgid "No rules available. Use Setup/Rules to add some."
 msgstr ""
 
-#: alpine/mailcmd.c:8382
+#: alpine/mailcmd.c:8793
 msgid "No rules defined, use Setup/Rules"
 msgstr ""
 
 #. TRANSLATORS: SELECT A RULE is a screen title
 #. TRANSLATORS: Print something1 using something2.
 #. "rules" is something1
-#: alpine/mailcmd.c:8396
+#: alpine/mailcmd.c:8807
 msgid "SELECT A RULE"
 msgstr ""
 
 #. TRANSLATORS: Print something1 using something2.
 #. "rules" is something1
-#: alpine/mailcmd.c:8397 alpine/roleconf.c:377
+#: alpine/mailcmd.c:8808 alpine/roleconf.c:377
 msgid "rules"
 msgstr ""
 
-#: alpine/mailcmd.c:8398
+#: alpine/mailcmd.c:8809
 msgid "HELP FOR SELECTING A RULE NICKNAME"
 msgstr ""
 
-#: alpine/mailcmd.c:8481
+#: alpine/mailcmd.c:8892
 msgid "Keyword (or keyword initial) to NOT match: "
 msgstr ""
 
-#: alpine/mailcmd.c:8483
+#: alpine/mailcmd.c:8894
 msgid "Keyword (or keyword initial) to match: "
 msgstr ""
 
-#: alpine/mailcmd.c:8487
+#: alpine/mailcmd.c:8898
 msgid "Keyword to NOT match: "
 msgstr ""
 
-#: alpine/mailcmd.c:8489
+#: alpine/mailcmd.c:8900
 msgid "Keyword to match: "
 msgstr ""
 
-#: alpine/mailcmd.c:8594
+#: alpine/mailcmd.c:9005
 msgid "No keywords defined, use \"keywords\" option in Setup/Config"
 msgstr ""
 
 #. TRANSLATORS: SELECT A KEYWORD is a screen title
 #. TRANSLATORS: Print something1 using something2.
 #. "keywords" is something1
-#: alpine/mailcmd.c:8607
+#: alpine/mailcmd.c:9018
 msgid "SELECT A KEYWORD"
 msgstr ""
 
-#: alpine/mailcmd.c:8608 alpine/mailcmd.c:8659
+#: alpine/mailcmd.c:9019 alpine/mailcmd.c:9070
 msgid "keywords"
 msgstr ""
 
-#: alpine/mailcmd.c:8609
+#: alpine/mailcmd.c:9020
 msgid "HELP FOR SELECTING A KEYWORD"
 msgstr ""
 
-#: alpine/mailcmd.c:8659
+#: alpine/mailcmd.c:9070
 msgid "SELECT KEYWORDS"
 msgstr ""
 
-#: alpine/mailcmd.c:8661
+#: alpine/mailcmd.c:9072
 msgid "HELP FOR SELECTING KEYWORDS"
 msgstr ""
 
-#: alpine/mailcmd.c:8709
+#: alpine/mailcmd.c:9120
 msgid "No charsets found? Enter charset manually."
 msgstr ""
 
 #. TRANSLATORS: SELECT A CHARACTER SET is a screen title
 #. TRANSLATORS: Print something1 using something2.
 #. "character sets" is something1
-#: alpine/mailcmd.c:8730
+#: alpine/mailcmd.c:9141
 msgid "SELECT A CHARACTER SET"
 msgstr ""
 
-#: alpine/mailcmd.c:8731 alpine/mailcmd.c:8905
+#: alpine/mailcmd.c:9142 alpine/mailcmd.c:9316
 msgid "character sets"
 msgstr ""
 
-#: alpine/mailcmd.c:8732
+#: alpine/mailcmd.c:9143
 msgid "HELP FOR SELECTING A CHARACTER SET"
 msgstr ""
 
-#: alpine/mailcmd.c:8842
+#: alpine/mailcmd.c:9253
 msgid "Scripts representing groups of related character sets"
 msgstr ""
 
-#: alpine/mailcmd.c:8872
+#: alpine/mailcmd.c:9283
 msgid "Individual character sets, may be mixed with scripts"
 msgstr ""
 
-#: alpine/mailcmd.c:8905
+#: alpine/mailcmd.c:9316
 msgid "SELECT CHARACTER SETS"
 msgstr ""
 
-#: alpine/mailcmd.c:8907
+#: alpine/mailcmd.c:9318
 msgid "HELP FOR SELECTING CHARACTER SETS"
 msgstr ""
 
-#: alpine/mailcmd.c:8959
+#: alpine/mailcmd.c:9370
 msgid "Resource : "
 msgstr ""
 
-#: alpine/mailcmd.c:8963
+#: alpine/mailcmd.c:9374
 msgid "Usage    : "
 msgstr ""
 
-#: alpine/mailcmd.c:8968 alpine/mailcmd.c:8983
+#: alpine/mailcmd.c:9379 alpine/mailcmd.c:9394
 msgid " message"
 msgstr ""
 
-#: alpine/mailcmd.c:8970
+#: alpine/mailcmd.c:9381
 msgid "s "
 msgstr ""
 
-#: alpine/mailcmd.c:8972
+#: alpine/mailcmd.c:9383
 msgid " "
 msgstr ""
 
-#: alpine/mailcmd.c:8978
+#: alpine/mailcmd.c:9389
 msgid "Limit    : "
 msgstr ""
 
-#: alpine/mailcmd.c:8985
+#: alpine/mailcmd.c:9396
 msgid ""
 "s\n"
 "\n"
 msgstr ""
 
-#: alpine/mailcmd.c:8987
+#: alpine/mailcmd.c:9398
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: alpine/mailcmd.c:8994
+#: alpine/mailcmd.c:9405
 msgid "Quota Resources Summary"
 msgstr ""
 
-#: alpine/mailcmd.c:8995
+#: alpine/mailcmd.c:9406
 msgid "QUOTA SUMMARY"
 msgstr ""
 
-#: alpine/mailcmd.c:9049
+#: alpine/mailcmd.c:9460
 msgid "Choose type of sort : "
 msgstr ""
 
-#: alpine/mailcmd.c:9051
+#: alpine/mailcmd.c:9462
 msgid "Choose type of sort, or 'R' to reverse current sort : "
 msgstr ""
 
-#: alpine/mailcmd.c:9071
+#: alpine/mailcmd.c:9482
 msgid "Reverse"
 msgstr ""
 
@@ -3434,34 +3591,34 @@ msgstr ""
 #. of the message or thread, as in
 #. Message 17
 #. when reading message number 17.
-#: alpine/titlebar.c:521 alpine/titlebar.c:531
+#: alpine/titlebar.c:539 alpine/titlebar.c:549
 msgid "Thd"
 msgstr ""
 
-#: alpine/titlebar.c:521 alpine/titlebar.c:531
+#: alpine/titlebar.c:539 alpine/titlebar.c:549
 msgid "Thread"
 msgstr ""
 
-#: alpine/titlebar.c:523
+#: alpine/titlebar.c:541
 msgid "Msg"
 msgstr ""
 
-#: alpine/titlebar.c:523
+#: alpine/titlebar.c:541
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: it might say READONLY or CLOSED in the titlebar, referring to
 #. the current folder.
-#: alpine/titlebar.c:678
+#: alpine/titlebar.c:696
 msgid "(CLOSED)"
 msgstr ""
 
-#: alpine/titlebar.c:681
+#: alpine/titlebar.c:699
 msgid "(READONLY)"
 msgstr ""
 
 #. TRANSLATORS: the name of the open folder follows this in the titlebar
-#: alpine/titlebar.c:766
+#: alpine/titlebar.c:793
 msgid "Folder: "
 msgstr ""
 
@@ -3583,6 +3740,9 @@ msgstr ""
 msgid "ADDRESS BOOK (%c%s)"
 msgstr ""
 
+#. TRANSLATORS: The following lines go together to form a screen of
+#. explanation about how to edit an address book entry.
+#.
 #: alpine/adrbkcmd.c:1000
 msgid ""
 "\n"
@@ -3690,7 +3850,7 @@ msgstr ""
 msgid "Server"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1603 alpine/folder.c:4463
+#: alpine/adrbkcmd.c:1603 alpine/folder.c:4475
 msgid "Folder"
 msgstr ""
 
@@ -3817,8 +3977,8 @@ msgid "You now have a chance to change the name of the remote addrbook..."
 msgstr ""
 
 #: alpine/adrbkcmd.c:2261 alpine/adrbkcmd.c:2415 alpine/adrbkcmd.c:2523
-#: alpine/adrbkcmd.c:2598 alpine/adrbkcmd.c:2869 alpine/mailpart.c:2344
-#: alpine/mailpart.c:2395 alpine/mailpart.c:2851
+#: alpine/adrbkcmd.c:2598 alpine/adrbkcmd.c:2869 alpine/mailpart.c:2363
+#: alpine/mailpart.c:2414 alpine/mailpart.c:2906
 msgid "Error allocating space for message."
 msgstr ""
 
@@ -4217,8 +4377,8 @@ msgid "personal"
 msgstr ""
 
 #: alpine/adrbkcmd.c:3148 alpine/adrbkcmd.c:3160 alpine/adrbkcmd.c:3207
-#: alpine/adrbkcmd.c:3228 alpine/adrbkcmd.c:3290 alpine/folder.c:5696
-#: alpine/folder.c:5735
+#: alpine/adrbkcmd.c:3228 alpine/adrbkcmd.c:3290 alpine/folder.c:5708
+#: alpine/folder.c:5747
 msgid "Delete cancelled"
 msgstr ""
 
@@ -4233,7 +4393,7 @@ msgstr ""
 msgid "Data"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3183 alpine/reply.c:1162
+#: alpine/adrbkcmd.c:3183 alpine/reply.c:1289
 msgid "Both"
 msgstr ""
 
@@ -4514,11 +4674,11 @@ msgstr ""
 msgid "String to search for : "
 msgstr ""
 
-#: alpine/adrbkcmd.c:6635 alpine/alpine.c:823 pico/pico.c:943
+#: alpine/adrbkcmd.c:6635 alpine/alpine.c:846 pico/pico.c:989
 msgid "Cancelled"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6647 alpine/mailindx.c:3086 alpine/addrbook.c:2473
+#: alpine/adrbkcmd.c:6647 alpine/mailindx.c:3103 alpine/addrbook.c:2473
 #: alpine/addrbook.c:2726
 msgid "Search"
 msgstr ""
@@ -4584,54 +4744,54 @@ msgstr ""
 msgid "HELP FOR DIRECTORY VIEW"
 msgstr ""
 
-#: alpine/adrbkcmd.c:7117
+#: alpine/adrbkcmd.c:7116
 msgid "No address to compose to"
 msgstr ""
 
-#: alpine/adrbkcmd.c:7585
+#: alpine/adrbkcmd.c:7584
 #, c-format
 msgid "No host in %s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:7593
+#: alpine/adrbkcmd.c:7592
 msgid "Searching for LDAP url"
 msgstr ""
 
-#: alpine/adrbkcmd.c:7607
+#: alpine/adrbkcmd.c:7612
 msgid "LDAP search failed: can't initialize"
 msgstr ""
 
-#: alpine/adrbkcmd.c:7631
+#: alpine/adrbkcmd.c:7643
 #, c-format
 msgid "LDAP search failed: %s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:7648
+#: alpine/adrbkcmd.c:7664
 msgid "No matches found for url"
 msgstr ""
 
 #. TRANSLATORS: sigs refers to signatures, which the user was trying to convert
-#: alpine/alpine.c:485
+#: alpine/alpine.c:508
 #, c-format
 msgid "trouble converting sigs\n"
 msgstr ""
 
-#: alpine/alpine.c:598
+#: alpine/alpine.c:621
 #, c-format
 msgid "Failed to disable mail driver \"%s\": name not found"
 msgstr ""
 
-#: alpine/alpine.c:619
+#: alpine/alpine.c:642
 #, c-format
 msgid "Failed to disable SASL authenticator \"%s\": name not found"
 msgstr ""
 
-#: alpine/alpine.c:652
+#: alpine/alpine.c:675
 #, c-format
 msgid "Who are you? (Unable to look up login name)\n"
 msgstr ""
 
-#: alpine/alpine.c:673
+#: alpine/alpine.c:696
 #, c-format
 msgid ""
 "Can't access terminal or input is not a terminal. Redirection of\n"
@@ -4639,577 +4799,580 @@ msgid ""
 "%c"
 msgstr ""
 
-#: alpine/alpine.c:685
+#: alpine/alpine.c:708
 #, c-format
 msgid "Terminal type (environment variable TERM) not set.\n"
 msgstr ""
 
-#: alpine/alpine.c:688
+#: alpine/alpine.c:711
 #, c-format
 msgid "Terminal type \"%s\" is unknown.\n"
 msgstr ""
 
-#: alpine/alpine.c:691
+#: alpine/alpine.c:714
 #, c-format
 msgid "Can't open terminal capabilities database.\n"
 msgstr ""
 
-#: alpine/alpine.c:694
+#: alpine/alpine.c:717
 #, c-format
 msgid ""
 "Your terminal, of type \"%s\", is lacking functions needed to run alpine.\n"
 msgstr ""
 
-#: alpine/alpine.c:729
+#: alpine/alpine.c:752
 msgid "Warning: sensitive authentication data included in debug file"
 msgstr ""
 
 #. TRANSLATORS: file is computer data
-#: alpine/alpine.c:811
+#: alpine/alpine.c:834
 msgid "File to open : "
 msgstr ""
 
 #. TRANSLATORS: file is computer data
-#: alpine/alpine.c:838
+#: alpine/alpine.c:861
 msgid "No file to open"
 msgstr ""
 
-#: alpine/alpine.c:854
+#: alpine/alpine.c:877
 #, c-format
 msgid "Problem reading standard input: %s"
 msgstr ""
 
 #. TRANSLATORS: file is computer file being read by user
-#: alpine/alpine.c:879
+#: alpine/alpine.c:902
 msgid "file"
 msgstr ""
 
 #. TRANSLATORS: this is in the title bar at top of screen
-#: alpine/alpine.c:881
+#: alpine/alpine.c:904
 msgid "FILE VIEW"
 msgstr ""
 
-#: alpine/alpine.c:894
+#: alpine/alpine.c:917
 #, c-format
 msgid "Can't display \"%s\": %s"
 msgstr ""
 
-#: alpine/alpine.c:895
+#: alpine/alpine.c:918
 msgid "Standard Input"
 msgstr ""
 
 #. TRANSLATORS: refers to bad email address
-#: alpine/alpine.c:951
+#: alpine/alpine.c:974
 #, c-format
 msgid "Bad address: %s"
 msgstr ""
 
-#: alpine/alpine.c:1002
+#: alpine/alpine.c:1025
 msgid "Only mailto URLs are allowed with file attachments"
 msgstr ""
 
-#: alpine/alpine.c:1011
+#: alpine/alpine.c:1034
 #, c-format
 msgid "Unrecognized URL \"%s\""
 msgstr ""
 
 #. TRANSLATORS: Initial Keystroke List is the literal name of an option
-#: alpine/alpine.c:1033
+#: alpine/alpine.c:1056
 msgid "Executing Initial Keystroke List......"
 msgstr ""
 
-#: alpine/alpine.c:1081
+#: alpine/alpine.c:1104
 msgid "Please wait, opening mail folder......"
 msgstr ""
 
-#: alpine/alpine.c:1134
+#: alpine/alpine.c:1157
 msgid "No folder to open"
 msgstr ""
 
-#: alpine/alpine.c:1166
+#: alpine/alpine.c:1194
 #, c-format
 msgid "Unable to open folder \"%s\""
 msgstr ""
 
-#: alpine/alpine.c:1191
+#: alpine/alpine.c:1219
 msgid "No inbox!  Folder to open as inbox : "
 msgstr ""
 
-#: alpine/alpine.c:1203
+#: alpine/alpine.c:1231
 msgid "Folder open cancelled"
 msgstr ""
 
 #. TRANSLATORS: Inbox-Path and PINERC are literal, not to be translated
-#: alpine/alpine.c:1216
+#: alpine/alpine.c:1244
 msgid "Preserve folder as \"Inbox-Path\" in PINERC"
 msgstr ""
 
-#: alpine/alpine.c:1237 pith/mailcmd.c:900
+#: alpine/alpine.c:1265 pith/mailcmd.c:901
 msgid "No folder opened"
 msgstr ""
 
-#: alpine/alpine.c:1281
+#: alpine/alpine.c:1309
 msgid "Use Compose command to continue interrupted message."
 msgstr ""
 
-#: alpine/alpine.c:1290
+#: alpine/alpine.c:1318
 #, c-format
 msgid "WARNING! Over your disk quota by %s bytes (%s)"
 msgstr ""
 
 #. TRANSLATORS: config is an abbreviation for configuration
-#: alpine/alpine.c:1303
+#: alpine/alpine.c:1331
 msgid ""
 "Note: some of your config options conflict with site policy and are ignored"
 msgstr ""
 
 #. TRANSLATORS: Pruned-Folders is literal
-#: alpine/alpine.c:1308
+#: alpine/alpine.c:1336
 msgid "Note: ignoring Pruned-Folders outside of default collection for saves"
 msgstr ""
 
-#: alpine/alpine.c:1314
+#: alpine/alpine.c:1342
 msgid ""
 "Note: Mail-Check-Interval=0 may cause IMAP server connection to time out"
 msgstr ""
 
-#: alpine/alpine.c:1494
+#. TRANSLATORS: These next few are headings on the Main alpine menu.
+#. It's nice if the dashes can be made to line up vertically.
+#.
+#: alpine/alpine.c:1522
 #, c-format
 msgid " %s     HELP               -  Get help using Alpine"
 msgstr ""
 
-#: alpine/alpine.c:1496
+#: alpine/alpine.c:1524
 #, c-format
 msgid " %s     COMPOSE MESSAGE    -  Compose and send%s a message"
 msgstr ""
 
 #. TRANSLATORS: We think of sending an email message or posting a news message.
 #. The message is shown as Compose and send/post a message
-#: alpine/alpine.c:1499
+#: alpine/alpine.c:1527
 msgid "/post"
 msgstr ""
 
-#: alpine/alpine.c:1500
+#: alpine/alpine.c:1528
 #, c-format
 msgid " %s     MESSAGE INDEX      -  View messages in current folder"
 msgstr ""
 
-#: alpine/alpine.c:1502
+#: alpine/alpine.c:1530
 #, c-format
 msgid " %s     FOLDER LIST        -  Select a folder%s to view"
 msgstr ""
 
 #. TRANSLATORS: When news is supported the message above becomes
 #. Select a folder OR news group to view
-#: alpine/alpine.c:1505
+#: alpine/alpine.c:1533
 msgid " OR news group"
 msgstr ""
 
-#: alpine/alpine.c:1506
+#: alpine/alpine.c:1534
 #, c-format
 msgid " %s     ADDRESS BOOK       -  Update address book"
 msgstr ""
 
-#: alpine/alpine.c:1508
+#: alpine/alpine.c:1536
 #, c-format
 msgid " %s     SETUP              -  Configure Alpine Options"
 msgstr ""
 
 #. TRANSLATORS: final Main menu line
-#: alpine/alpine.c:1511
+#: alpine/alpine.c:1539
 #, c-format
 msgid " %s     QUIT               -  Leave the Alpine program"
 msgstr ""
 
-#: alpine/alpine.c:1708
+#: alpine/alpine.c:1736
 #, c-format
 msgid "Debug level set to %s"
 msgstr ""
 
 #. TRANSLATORS: This is a screen title
-#: alpine/alpine.c:1743
+#: alpine/alpine.c:1771
 msgid "HELP FOR MAIN MENU"
 msgstr ""
 
 #. TRANSLATORS: list refers to list of commands in main menu
-#: alpine/alpine.c:1772
+#: alpine/alpine.c:1800
 msgid "Already at top of list"
 msgstr ""
 
-#: alpine/alpine.c:1788
+#: alpine/alpine.c:1816
 msgid "Already at bottom of list"
 msgstr ""
 
 #. TRANSLATORS: This is a screen title
-#: alpine/alpine.c:1796
+#: alpine/alpine.c:1824
 msgid "ALPINE RELEASE NOTES"
 msgstr ""
 
 #. TRANSLATORS: screen title
-#: alpine/alpine.c:2061
+#: alpine/alpine.c:2089
 msgid "MAIN MENU"
 msgstr ""
 
 #. TRANSLATORS: screen title
-#: alpine/alpine.c:2296
+#: alpine/alpine.c:2324
 msgid "SETUP EXCEPTIONS"
 msgstr ""
 
-#: alpine/alpine.c:2302
+#: alpine/alpine.c:2330
 msgid "not eXceptions"
 msgstr ""
 
 #. TRANSLATORS: screen title
-#: alpine/alpine.c:2307 alpine/alpine.c:2502
+#: alpine/alpine.c:2335 alpine/alpine.c:2530
 msgid "SETUP"
 msgstr ""
 
-#: alpine/alpine.c:2310 alpine/alpine.c:2530 alpine/alpine.c:2533
+#: alpine/alpine.c:2338 alpine/alpine.c:2558 alpine/alpine.c:2561
 msgid "eXceptions"
 msgstr ""
 
-#: alpine/alpine.c:2321
+#: alpine/alpine.c:2349
 msgid ""
 "Need argument \"-x <except_config>\" or \"PINERCEX\" file to use eXceptions"
 msgstr ""
 
-#: alpine/alpine.c:2323
+#: alpine/alpine.c:2351
 msgid ""
 "Need argument \"-x <except_config>\" or \".pinercex\" file to use eXceptions"
 msgstr ""
 
 #. TRANSLATORS: starting here we have a whole screen of help text
-#: alpine/alpine.c:2379
+#: alpine/alpine.c:2407
 msgid ""
 "This is the Setup screen for Alpine. Choose from the following commands:\n"
 msgstr ""
 
-#: alpine/alpine.c:2382
+#: alpine/alpine.c:2410
 msgid "(E) Exit Setup:\n"
 msgstr ""
 
-#: alpine/alpine.c:2383
+#: alpine/alpine.c:2411
 msgid "    This puts you back at the Main Menu.\n"
 msgstr ""
 
-#: alpine/alpine.c:2387 alpine/alpine.c:2479
+#: alpine/alpine.c:2415 alpine/alpine.c:2507
 msgid "(X) eXceptions:\n"
 msgstr ""
 
-#: alpine/alpine.c:2388 alpine/alpine.c:2480
+#: alpine/alpine.c:2416 alpine/alpine.c:2508
 msgid ""
 "    This command is different from the rest. It is not actually a command\n"
 msgstr ""
 
-#: alpine/alpine.c:2389 alpine/alpine.c:2481
+#: alpine/alpine.c:2417 alpine/alpine.c:2509
 msgid ""
 "    itself. Instead, it is a toggle which modifies the behavior of the\n"
 msgstr ""
 
-#: alpine/alpine.c:2390 alpine/alpine.c:2482
+#: alpine/alpine.c:2418 alpine/alpine.c:2510
 msgid ""
 "    other commands. You toggle Exceptions editing on and off with this\n"
 msgstr ""
 
-#: alpine/alpine.c:2391 alpine/alpine.c:2483
+#: alpine/alpine.c:2419 alpine/alpine.c:2511
 msgid ""
 "    command. When it is off you will be editing (changing) your regular\n"
 msgstr ""
 
-#: alpine/alpine.c:2392 alpine/alpine.c:2484
+#: alpine/alpine.c:2420 alpine/alpine.c:2512
 msgid ""
 "    configuration file. When it is on you will be editing your exceptions\n"
 msgstr ""
 
-#: alpine/alpine.c:2393 alpine/alpine.c:2485
+#: alpine/alpine.c:2421 alpine/alpine.c:2513
 msgid ""
 "    configuration file. For example, you might want to type the command \n"
 msgstr ""
 
-#: alpine/alpine.c:2394 alpine/alpine.c:2486
+#: alpine/alpine.c:2422 alpine/alpine.c:2514
 msgid ""
 "    \"eXceptions\" followed by \"Kolor\" to setup different screen colors\n"
 msgstr ""
 
-#: alpine/alpine.c:2395 alpine/alpine.c:2487
+#: alpine/alpine.c:2423 alpine/alpine.c:2515
 msgid "    on a particular platform.\n"
 msgstr ""
 
-#: alpine/alpine.c:2396 alpine/alpine.c:2472
+#: alpine/alpine.c:2424 alpine/alpine.c:2500
 msgid ""
 "    (Note: this command does not show up on the keymenu at the bottom of\n"
 msgstr ""
 
-#: alpine/alpine.c:2397 alpine/alpine.c:2473
+#: alpine/alpine.c:2425 alpine/alpine.c:2501
 msgid ""
 "    the screen unless you press \"O\" for \"Other Commands\" --but you "
 "don't\n"
 msgstr ""
 
-#: alpine/alpine.c:2398 alpine/alpine.c:2474
+#: alpine/alpine.c:2426 alpine/alpine.c:2502
 msgid "    need to press the \"O\" in order to invoke the command.)\n"
 msgstr ""
 
-#: alpine/alpine.c:2403
+#: alpine/alpine.c:2431
 msgid "(P) Printer:\n"
 msgstr ""
 
-#: alpine/alpine.c:2404
+#: alpine/alpine.c:2432
 msgid "    Allows you to set a default printer and to define custom\n"
 msgstr ""
 
-#: alpine/alpine.c:2405
+#: alpine/alpine.c:2433
 msgid "    print commands.\n"
 msgstr ""
 
-#: alpine/alpine.c:2410
+#: alpine/alpine.c:2438
 msgid "(N) Newpassword:\n"
 msgstr ""
 
-#: alpine/alpine.c:2411
+#: alpine/alpine.c:2439
 msgid "    Change your password.\n"
 msgstr ""
 
-#: alpine/alpine.c:2416
+#: alpine/alpine.c:2444
 msgid "(C) Config:\n"
 msgstr ""
 
-#: alpine/alpine.c:2417
+#: alpine/alpine.c:2445
 msgid "    Allows you to set or unset many features of Alpine.\n"
 msgstr ""
 
-#: alpine/alpine.c:2418
+#: alpine/alpine.c:2446
 msgid "    You may also set the values of many options with this command.\n"
 msgstr ""
 
-#: alpine/alpine.c:2423
+#: alpine/alpine.c:2451
 msgid "(S) Signature:\n"
 msgstr ""
 
-#: alpine/alpine.c:2424
+#: alpine/alpine.c:2452
 msgid "    Enter or edit a custom signature which will\n"
 msgstr ""
 
-#: alpine/alpine.c:2425
+#: alpine/alpine.c:2453
 msgid "    be included with each new message you send.\n"
 msgstr ""
 
-#: alpine/alpine.c:2429
+#: alpine/alpine.c:2457
 msgid "(A) AddressBooks:\n"
 msgstr ""
 
-#: alpine/alpine.c:2430
+#: alpine/alpine.c:2458
 msgid "    Define a non-default address book.\n"
 msgstr ""
 
-#: alpine/alpine.c:2433
+#: alpine/alpine.c:2461
 msgid "(L) collectionLists:\n"
 msgstr ""
 
-#: alpine/alpine.c:2434
+#: alpine/alpine.c:2462
 msgid ""
 "    You may define groups of folders to help you better organize your mail.\n"
 msgstr ""
 
-#: alpine/alpine.c:2437
+#: alpine/alpine.c:2465
 msgid "(R) Rules:\n"
 msgstr ""
 
-#: alpine/alpine.c:2438
+#: alpine/alpine.c:2466
 msgid "    This has up to six sub-categories: Roles, Index Colors, Filters,\n"
 msgstr ""
 
-#: alpine/alpine.c:2439
+#: alpine/alpine.c:2467
 msgid "    SetScores, Search, and Other. If the Index Colors option is\n"
 msgstr ""
 
-#: alpine/alpine.c:2440
+#: alpine/alpine.c:2468
 msgid "    missing you may turn it on (if possible) with Setup/Kolor.\n"
 msgstr ""
 
-#: alpine/alpine.c:2441
+#: alpine/alpine.c:2469
 msgid ""
 "    If Roles is missing it has probably been administratively disabled.\n"
 msgstr ""
 
-#: alpine/alpine.c:2445
+#: alpine/alpine.c:2473
 msgid "(D) Directory:\n"
 msgstr ""
 
-#: alpine/alpine.c:2446
+#: alpine/alpine.c:2474
 msgid ""
 "    Define an LDAP Directory server for Alpine's use. A directory server is\n"
 msgstr ""
 
-#: alpine/alpine.c:2447
+#: alpine/alpine.c:2475
 msgid "    similar to an address book, but it is usually maintained by an\n"
 msgstr ""
 
-#: alpine/alpine.c:2448
+#: alpine/alpine.c:2476
 msgid "    organization. It is similar to a telephone directory.\n"
 msgstr ""
 
-#: alpine/alpine.c:2452
+#: alpine/alpine.c:2480
 msgid "(K) Kolor:\n"
 msgstr ""
 
-#: alpine/alpine.c:2453
+#: alpine/alpine.c:2481
 msgid ""
 "    Set custom colors for various parts of the Alpine screens. For example, "
 "the\n"
 msgstr ""
 
-#: alpine/alpine.c:2454
+#: alpine/alpine.c:2482
 msgid ""
 "    command key labels, the titlebar at the top of each page, and quoted\n"
 msgstr ""
 
-#: alpine/alpine.c:2455
+#: alpine/alpine.c:2483
 msgid "    sections of messages you are viewing.\n"
 msgstr ""
 
-#: alpine/alpine.c:2459
+#: alpine/alpine.c:2487
 msgid "(M) S/MIME:\n"
 msgstr ""
 
-#: alpine/alpine.c:2460
+#: alpine/alpine.c:2488
 msgid "    Setup for using S/MIME to verify signed messages, decrypt\n"
 msgstr ""
 
-#: alpine/alpine.c:2461
+#: alpine/alpine.c:2489
 msgid "    encrypted messages, and to sign or encrypt outgoing messages.\n"
 msgstr ""
 
-#: alpine/alpine.c:2465
+#: alpine/alpine.c:2493
 msgid "(Z) RemoteConfigSetup:\n"
 msgstr ""
 
-#: alpine/alpine.c:2466
+#: alpine/alpine.c:2494
 msgid ""
 "    This is a command you will probably only want to use once, if at all.\n"
 msgstr ""
 
-#: alpine/alpine.c:2467
+#: alpine/alpine.c:2495
 msgid ""
 "    It helps you transfer your Alpine configuration data to an IMAP server,\n"
 msgstr ""
 
-#: alpine/alpine.c:2468
+#: alpine/alpine.c:2496
 msgid ""
 "    where it will be accessible from any of the computers you read mail\n"
 msgstr ""
 
-#: alpine/alpine.c:2469
+#: alpine/alpine.c:2497
 msgid ""
 "    from (using Alpine). The idea behind a remote configuration is that you\n"
 msgstr ""
 
-#: alpine/alpine.c:2470
+#: alpine/alpine.c:2498
 msgid ""
 "    can change your configuration in one place and have that change show\n"
 msgstr ""
 
-#: alpine/alpine.c:2471
+#: alpine/alpine.c:2499
 msgid "    up on all of the computers you use.\n"
 msgstr ""
 
-#: alpine/alpine.c:2488
+#: alpine/alpine.c:2516
 msgid ""
 "    (Note: this command does not do anything unless you have a "
 "configuration\n"
 msgstr ""
 
-#: alpine/alpine.c:2489
+#: alpine/alpine.c:2517
 msgid ""
 "    with exceptions enabled (you don't have that). Common ways to enable an\n"
 msgstr ""
 
-#: alpine/alpine.c:2490
+#: alpine/alpine.c:2518
 msgid ""
 "    exceptions config are the command line argument \"-x <exception_config>"
 "\";\n"
 msgstr ""
 
-#: alpine/alpine.c:2491
+#: alpine/alpine.c:2519
 msgid ""
 "    or the existence of the file \".pinercex\" for Unix Alpine, or \"PINERCEX"
 "\")\n"
 msgstr ""
 
-#: alpine/alpine.c:2492
+#: alpine/alpine.c:2520
 msgid "    for PC-Alpine.)\n"
 msgstr ""
 
-#: alpine/alpine.c:2493
+#: alpine/alpine.c:2521
 msgid ""
 "    (Another note: this command does not show up on the keymenu at the "
 "bottom\n"
 msgstr ""
 
-#: alpine/alpine.c:2494
+#: alpine/alpine.c:2522
 msgid ""
 "    of the screen unless you press \"O\" for \"Other Commands\" --but you\n"
 msgstr ""
 
-#: alpine/alpine.c:2495
+#: alpine/alpine.c:2523
 msgid "    don't need to press the \"O\" in order to invoke the command.)\n"
 msgstr ""
 
-#: alpine/alpine.c:2501
+#: alpine/alpine.c:2529
 msgid "Information About Setup Command"
 msgstr ""
 
-#: alpine/alpine.c:2623
+#: alpine/alpine.c:2651
 msgid "Config file not changeable"
 msgstr ""
 
-#: alpine/alpine.c:2628
+#: alpine/alpine.c:2656
 msgid "Problem accessing configuration"
 msgstr ""
 
-#: alpine/alpine.c:2637 alpine/alpine.c:2659
+#: alpine/alpine.c:2665 alpine/alpine.c:2687
 msgid "SIGNATURE EDITOR"
 msgstr ""
 
-#: alpine/alpine.c:2707
+#: alpine/alpine.c:2735
 msgid "Type of rule setup : "
 msgstr ""
 
-#: alpine/alpine.c:2726
+#: alpine/alpine.c:2754
 msgid "Try turning on color with the Setup/Kolor command."
 msgstr ""
 
-#: alpine/alpine.c:2769
+#: alpine/alpine.c:2797
 msgid "Password changing not configured for this version of Alpine."
 msgstr ""
 
-#: alpine/alpine.c:3104
+#: alpine/alpine.c:3132
 msgid "Quit even though new mail just arrived"
 msgstr ""
 
-#: alpine/alpine.c:3113
+#: alpine/alpine.c:3141
 msgid "Really quit Alpine"
 msgstr ""
 
-#: alpine/alpine.c:3137
+#: alpine/alpine.c:3165
 msgid "Alpine finished"
 msgstr ""
 
-#: alpine/alpine.c:3347
+#: alpine/alpine.c:3375
 #, c-format
 msgid ""
 "No more available memory.\n"
 "Alpine Exiting"
 msgstr ""
 
-#: alpine/alpine.c:3349
+#: alpine/alpine.c:3377
 #, c-format
 msgid ""
 "Problem detected: \"%s\".\n"
 "Alpine Exiting."
 msgstr ""
 
-#: alpine/alpine.c:3563
+#: alpine/alpine.c:3591
 msgid "PC-Alpine MAIN MENU Help"
 msgstr ""
 
@@ -5388,7 +5551,7 @@ msgstr ""
 msgid "Exit, saving changes and creating Path"
 msgstr ""
 
-#: alpine/folder.c:1277 pico/browse.c:2200
+#: alpine/folder.c:1277 pico/browse.c:2246
 msgid "Edit"
 msgstr ""
 
@@ -5434,7 +5597,7 @@ msgstr ""
 msgid "No Folders!  Nothing to View"
 msgstr ""
 
-#: alpine/folder.c:2493 alpine/folder.c:5304
+#: alpine/folder.c:2493 alpine/folder.c:5316
 msgid "Empty folder collection.  No folder to rename!"
 msgstr ""
 
@@ -5499,456 +5662,460 @@ msgstr ""
 msgid "No folder to check! Can't get recent info"
 msgstr ""
 
-#: alpine/folder.c:2864 alpine/folder.c:3831
+#: alpine/folder.c:2816
+msgid "Collection not updated"
+msgstr ""
+
+#: alpine/folder.c:2876 alpine/folder.c:3843
 msgid "Empty folder list!"
 msgstr ""
 
-#: alpine/folder.c:2914
+#: alpine/folder.c:2926
 msgid "Name of new folder : "
 msgstr ""
 
-#: alpine/folder.c:2926 alpine/folder.c:4504 alpine/folder.c:5381
+#: alpine/folder.c:2938 alpine/folder.c:4516 alpine/folder.c:5393
 msgid "Folder name can't begin with dot"
 msgstr ""
 
-#: alpine/folder.c:2929 alpine/folder.c:4507
+#: alpine/folder.c:2941 alpine/folder.c:4519
 #, c-format
 msgid "Config feature \"%s\" enables names beginning with dot"
 msgstr ""
 
-#: alpine/folder.c:2937
+#: alpine/folder.c:2949
 #, c-format
 msgid "Can't add folder named %s"
 msgstr ""
 
 #. TRANSLATORS: go to parent directory one level up
-#: alpine/folder.c:2974 alpine/folder.c:3089
+#: alpine/folder.c:2986 alpine/folder.c:3101
 msgid "ParentDir"
 msgstr ""
 
 #. TRANSLATORS: go to Collection List
-#: alpine/folder.c:2980 alpine/folder.c:3108
+#: alpine/folder.c:2992 alpine/folder.c:3120
 msgid "ClctnList"
 msgstr ""
 
-#: alpine/folder.c:2998 alpine/folder.c:3162 alpine/folder.c:3169
+#: alpine/folder.c:3010 alpine/folder.c:3174 alpine/folder.c:3181
 msgid "View Dir"
 msgstr ""
 
 #. TRANSLATORS: New Messages
-#: alpine/folder.c:3051
+#: alpine/folder.c:3063
 msgid "NewMsgs"
 msgstr ""
 
-#: alpine/folder.c:3272
+#: alpine/folder.c:3284
 msgid "Properties"
 msgstr ""
 
-#: alpine/folder.c:3303
+#: alpine/folder.c:3315
 #, c-format
 msgid "Select \"%s\" not supported in Incoming Folders"
 msgstr ""
 
-#: alpine/folder.c:3317 alpine/folder.c:3404
+#: alpine/folder.c:3329 alpine/folder.c:3416
 msgid "Unsupported Select option"
 msgstr ""
 
-#: alpine/folder.c:3440
+#: alpine/folder.c:3452
 msgid "No change resulted"
 msgstr ""
 
-#: alpine/folder.c:3441
+#: alpine/folder.c:3453
 msgid "No messages in intersection"
 msgstr ""
 
-#: alpine/folder.c:3446
+#: alpine/folder.c:3458
 msgid "No change resulted.  Matching folders already selected."
 msgstr ""
 
-#: alpine/folder.c:3540
+#: alpine/folder.c:3552
 #, c-format
 msgid "Now in directory: %s"
 msgstr ""
 
-#: alpine/folder.c:3545
+#: alpine/folder.c:3557
 msgid "Returned to collection's top directory"
 msgstr ""
 
-#: alpine/folder.c:3663 pith/mailcmd.c:569
+#: alpine/folder.c:3675 pith/mailcmd.c:569
 #, c-format
 msgid "Can't find Incoming Folder %s."
 msgstr ""
 
-#: alpine/folder.c:3778
+#: alpine/folder.c:3790
 msgid "Error creating file"
 msgstr ""
 
-#: alpine/folder.c:3793
+#: alpine/folder.c:3805
 msgid "Copying folder"
 msgstr ""
 
-#: alpine/folder.c:3806
+#: alpine/folder.c:3818
 #, c-format
 msgid "Error exporting to %s"
 msgstr ""
 
-#: alpine/folder.c:3817
+#: alpine/folder.c:3829
 #, c-format
 msgid "No messages in %s to export"
 msgstr ""
 
-#: alpine/folder.c:3820
+#: alpine/folder.c:3832
 msgid "Can't open folder for exporting"
 msgstr ""
 
-#: alpine/folder.c:3884
+#: alpine/folder.c:3896
 #, c-format
 msgid "Can't import file outside of %s"
 msgstr ""
 
-#: alpine/folder.c:3944
+#: alpine/folder.c:3956
 #, c-format
 msgid "Error importing to %s"
 msgstr ""
 
-#: alpine/folder.c:3950
+#: alpine/folder.c:3962
 #, c-format
 msgid "No messages in file %s"
 msgstr ""
 
-#: alpine/folder.c:3954
+#: alpine/folder.c:3966
 #, c-format
 msgid "Can't open file %s for import"
 msgstr ""
 
-#: alpine/folder.c:4076
+#: alpine/folder.c:4088
 msgid "Cancelled: config file not editable"
 msgstr ""
 
-#: alpine/folder.c:4177
+#: alpine/folder.c:4189
 msgid "Use Inbox Host"
 msgstr ""
 
 #. TRANSLATORS: a mail drop is a place where mail is copied to so you
 #. can read it.
-#: alpine/folder.c:4192
+#: alpine/folder.c:4204
 msgid "Use a Mail Drop"
 msgstr ""
 
-#: alpine/folder.c:4198
+#: alpine/folder.c:4210
 msgid "Do Not use a Mail Drop"
 msgstr ""
 
-#: alpine/folder.c:4207
+#: alpine/folder.c:4219
 #, c-format
 msgid "Name of Mail Drop server : "
 msgstr ""
 
-#: alpine/folder.c:4209
+#: alpine/folder.c:4221
 #, c-format
 msgid "Name of server to contain destination folder : "
 msgstr ""
 
-#: alpine/folder.c:4211
+#: alpine/folder.c:4223
 #, c-format
 msgid "Name of Inbox server : "
 msgstr ""
 
-#: alpine/folder.c:4213
+#: alpine/folder.c:4225
 #, c-format
 msgid "Name of server to contain added folder : "
 msgstr ""
 
-#: alpine/folder.c:4298 alpine/folder.c:4301
+#: alpine/folder.c:4310 alpine/folder.c:4313
 msgid "HELP FOR DESTINATION SERVER "
 msgstr ""
 
-#: alpine/folder.c:4303 alpine/folder.c:4306
+#: alpine/folder.c:4315 alpine/folder.c:4318
 msgid "HELP FOR MAILDROP NAME "
 msgstr ""
 
-#: alpine/folder.c:4309
+#: alpine/folder.c:4321
 msgid "HELP FOR INBOX SERVER "
 msgstr ""
 
-#: alpine/folder.c:4312
+#: alpine/folder.c:4324
 msgid "HELP FOR SERVER NAME "
 msgstr ""
 
-#: alpine/folder.c:4341 alpine/folder.c:4546 alpine/folder.c:4681
+#: alpine/folder.c:4353 alpine/folder.c:4558 alpine/folder.c:4693
 msgid "INBOX change cancelled"
 msgstr ""
 
-#: alpine/folder.c:4342 alpine/folder.c:4547 alpine/folder.c:4631
-#: alpine/folder.c:4682
+#: alpine/folder.c:4354 alpine/folder.c:4559 alpine/folder.c:4643
+#: alpine/folder.c:4694
 msgid "Addition of new folder cancelled"
 msgstr ""
 
-#: alpine/folder.c:4456
+#: alpine/folder.c:4468
 msgid "Create Folder"
 msgstr ""
 
-#: alpine/folder.c:4461
+#: alpine/folder.c:4473
 msgid "Create Directory"
 msgstr ""
 
-#: alpine/folder.c:4494
+#: alpine/folder.c:4506
 msgid "#move folders may only be the INBOX or in the Incoming Collection"
 msgstr ""
 
-#: alpine/folder.c:4529
+#: alpine/folder.c:4541
 msgid "Can't have trailing directory delimiters!"
 msgstr ""
 
-#: alpine/folder.c:4541
+#: alpine/folder.c:4553
 msgid "HELP FOR FOLDER NAME "
 msgstr ""
 
-#: alpine/folder.c:4618
+#: alpine/folder.c:4630
 msgid "A subfolder name is required, there is no default subfolder name"
 msgstr ""
 
-#: alpine/folder.c:4627
+#: alpine/folder.c:4639
 msgid "HELP FOR SUBFOLDER NAME "
 msgstr ""
 
-#: alpine/folder.c:4644
+#: alpine/folder.c:4656
 #, c-format
 msgid "Cannot add folder %s in current context"
 msgstr ""
 
-#: alpine/folder.c:4658
+#: alpine/folder.c:4670
 #, c-format
 msgid "Nickname for folder \"%s\" : "
 msgstr ""
 
-#: alpine/folder.c:4671
+#: alpine/folder.c:4683
 #, c-format
 msgid "Nickname cannot be \"%s\""
 msgstr ""
 
-#: alpine/folder.c:4714
+#: alpine/folder.c:4726
 #, c-format
 msgid "Incoming folder \"%s\" already exists"
 msgstr ""
 
-#: alpine/folder.c:4744
+#: alpine/folder.c:4756
 #, c-format
 msgid "Error checking for %s"
 msgstr ""
 
-#: alpine/folder.c:4985
+#: alpine/folder.c:4997
 msgid "To All Grps"
 msgstr ""
 
-#: alpine/folder.c:5019
+#: alpine/folder.c:5031
 msgid "Fetching newsgroup list"
 msgstr ""
 
-#: alpine/folder.c:5054
+#: alpine/folder.c:5066
 msgid "No group substring to match! Use ^T to list all news groups."
 msgstr ""
 
-#: alpine/folder.c:5108
+#: alpine/folder.c:5120
 msgid "No groups to select from!"
 msgstr ""
 
-#: alpine/folder.c:5111
+#: alpine/folder.c:5123
 #, c-format
 msgid "News group \"%s\" didn't match any existing groups"
 msgstr ""
 
-#: alpine/folder.c:5157
+#: alpine/folder.c:5169
 msgid "Subscribe cancelled"
 msgstr ""
 
-#: alpine/folder.c:5187 alpine/folder.c:5235 alpine/folder.c:5252
+#: alpine/folder.c:5199 alpine/folder.c:5247 alpine/folder.c:5264
 #, c-format
 msgid "Error subscribing to \"%s\""
 msgstr ""
 
-#: alpine/folder.c:5218
+#: alpine/folder.c:5230
 msgid "Subscriptions failed, subscribed to no new groups"
 msgstr ""
 
-#: alpine/folder.c:5258
+#: alpine/folder.c:5270
 #, c-format
 msgid "Subscribed to \"%s\""
 msgstr ""
 
-#: alpine/folder.c:5299
+#: alpine/folder.c:5311
 msgid "Can't rename news groups!"
 msgstr ""
 
-#: alpine/folder.c:5312
+#: alpine/folder.c:5324
 #, c-format
 msgid "Can't change special folder name \"%s\""
 msgstr ""
 
-#: alpine/folder.c:5342
+#: alpine/folder.c:5354
 msgid "Rename cancelled: folder not in editable config file"
 msgstr ""
 
-#: alpine/folder.c:5357
+#: alpine/folder.c:5369
 msgid "nickname"
 msgstr ""
 
-#: alpine/folder.c:5359 pith/bldaddr.c:658
+#: alpine/folder.c:5371 pith/bldaddr.c:658
 msgid "directory"
 msgstr ""
 
-#: alpine/folder.c:5359
+#: alpine/folder.c:5371
 msgid "folder"
 msgstr ""
 
-#: alpine/folder.c:5384
+#: alpine/folder.c:5396
 msgid "Config feature \"s\" enables names beginning with dot"
 msgstr ""
 
-#: alpine/folder.c:5393
+#: alpine/folder.c:5405
 #, c-format
 msgid "Folder \"%s\" already exists"
 msgstr ""
 
-#: alpine/folder.c:5402
+#: alpine/folder.c:5414
 #, c-format
 msgid "Can't rename incoming folder to %s"
 msgstr ""
 
-#: alpine/folder.c:5405
+#: alpine/folder.c:5417
 #, c-format
 msgid "Can't rename folder to %s"
 msgstr ""
 
-#: alpine/folder.c:5429
+#: alpine/folder.c:5441
 msgid "Folder rename cancelled"
 msgstr ""
 
-#: alpine/folder.c:5575
+#: alpine/folder.c:5587
 #, c-format
 msgid "Really unsubscribe from \"%s\""
 msgstr ""
 
-#: alpine/folder.c:5596
+#: alpine/folder.c:5608
 #, c-format
 msgid "Error unsubscribing from \"%s\""
 msgstr ""
 
-#: alpine/folder.c:5654
+#: alpine/folder.c:5666
 #, c-format
 msgid "Can't delete special folder \"%s\"."
 msgstr ""
 
-#: alpine/folder.c:5660
+#: alpine/folder.c:5672
 msgid "Deletion cancelled: folder not in editable config file"
 msgstr ""
 
-#: alpine/folder.c:5685
+#: alpine/folder.c:5697
 #, c-format
 msgid "Can't delete non-empty directory \"%s\"%s."
 msgstr ""
 
-#: alpine/folder.c:5697
+#: alpine/folder.c:5709
 msgid "No folder deleted"
 msgstr ""
 
-#: alpine/folder.c:5704
+#: alpine/folder.c:5716
 msgid "Nickname only"
 msgstr ""
 
-#: alpine/folder.c:5705
+#: alpine/folder.c:5717
 msgid "Both Folder and Nickname"
 msgstr ""
 
-#: alpine/folder.c:5708
+#: alpine/folder.c:5720
 msgid "DELETE only Nickname or Both nickname and folder? "
 msgstr ""
 
-#: alpine/folder.c:5736
+#: alpine/folder.c:5748
 msgid "Nothing deleted"
 msgstr ""
 
-#: alpine/folder.c:5866
+#: alpine/folder.c:5878
 msgid "folder list"
 msgstr ""
 
-#: alpine/folder.c:5881
+#: alpine/folder.c:5893
 #, c-format
 msgid "String in folder %s to match : "
 msgstr ""
 
-#: alpine/folder.c:5914
+#: alpine/folder.c:5926
 msgid "Name Select"
 msgstr ""
 
-#: alpine/folder.c:5915
+#: alpine/folder.c:5927
 msgid "Content Select"
 msgstr ""
 
-#: alpine/folder.c:5921
+#: alpine/folder.c:5933
 msgid "Select \"Text\" not supported in Incoming Folders"
 msgstr ""
 
-#: alpine/folder.c:6053
+#: alpine/folder.c:6065
 msgid "Unseen msgs"
 msgstr ""
 
-#: alpine/folder.c:6054
+#: alpine/folder.c:6066
 msgid "New msgs"
 msgstr ""
 
-#: alpine/folder.c:6055
+#: alpine/folder.c:6067
 msgid "msg Count"
 msgstr ""
 
-#: alpine/folder.c:6061
+#: alpine/folder.c:6073
 msgid "Select \"Properties\" not supported in Incoming Folders"
 msgstr ""
 
-#: alpine/folder.c:6129
+#: alpine/folder.c:6141
 msgid "Toggle Comparison"
 msgstr ""
 
-#: alpine/folder.c:6529
+#: alpine/folder.c:6542
 #, c-format
 msgid "Check of folder %s failed. Continue "
 msgstr ""
 
-#: alpine/folder.c:6531 alpine/folder.c:6534
+#: alpine/folder.c:6544 alpine/folder.c:6547
 #, c-format
 msgid "Check of %s failed. Continue "
 msgstr ""
 
-#: alpine/folder.c:6536
+#: alpine/folder.c:6549
 #, c-format
 msgid "Check failed. Continue "
 msgstr ""
 
-#: alpine/folder.c:6595
+#: alpine/folder.c:6608
 msgid "Cannot shuffle INBOX"
 msgstr ""
 
-#: alpine/folder.c:6626
+#: alpine/folder.c:6639
 msgid "Shuffle cancelled: config file not editable"
 msgstr ""
 
-#: alpine/folder.c:6639
+#: alpine/folder.c:6652
 msgid "Back"
 msgstr ""
 
-#: alpine/folder.c:6663
+#: alpine/folder.c:6676
 msgid "Shuffle cancelled: unexpected trouble shuffling"
 msgstr ""
 
-#: alpine/folder.c:6677
+#: alpine/folder.c:6690
 msgid "Cannot shuffle from one config file to another."
 msgstr ""
 
-#: alpine/folder.c:6851
+#: alpine/folder.c:6864
 msgid "Can't post messages, NNTP server needs to be configured"
 msgstr ""
 
-#: alpine/folder.c:6858
+#: alpine/folder.c:6871
 msgid "Getting full list of groups for posting"
 msgstr ""
 
@@ -6129,41 +6296,42 @@ msgstr ""
 
 #. TRANSLATORS: Print something1 using something2.
 #. configuration is something1
-#: alpine/setup.c:437 alpine/flagmaint.c:168 alpine/colorconf.c:109
-#: alpine/colorconf.c:2921 alpine/smime.c:613
+#: alpine/setup.c:442 alpine/flagmaint.c:168 alpine/colorconf.c:109
+#: alpine/colorconf.c:2921 alpine/smime.c:719 alpine/smime.c:1429
+#: alpine/smime.c:1685
 msgid "configuration"
 msgstr ""
 
-#: alpine/setup.c:527 alpine/confscroll.c:1869
+#: alpine/setup.c:533 alpine/confscroll.c:1878
 msgid "Leave unset and use default "
 msgstr ""
 
-#: alpine/setup.c:689 alpine/setup.c:836
+#: alpine/setup.c:695 alpine/setup.c:842
 #, c-format
 msgid "Turn on incoming folders with Config feature \"%s\""
 msgstr ""
 
-#: alpine/setup.c:708 alpine/setup.c:729 alpine/setup.c:741
+#: alpine/setup.c:714 alpine/setup.c:735 alpine/setup.c:747
 msgid "Using default, monitor all incoming folders"
 msgstr ""
 
-#: alpine/setup.c:727
+#: alpine/setup.c:733
 msgid "List is unchanged"
 msgstr ""
 
-#: alpine/setup.c:824
+#: alpine/setup.c:830
 msgid "Incoming folders to be monitored"
 msgstr ""
 
-#: alpine/setup.c:842
+#: alpine/setup.c:848
 msgid "SELECT FOLDERS TO MONITOR"
 msgstr ""
 
-#: alpine/setup.c:842
+#: alpine/setup.c:848
 msgid "folders"
 msgstr ""
 
-#: alpine/setup.c:844
+#: alpine/setup.c:850
 msgid "HELP FOR SELECTING FOLDERS"
 msgstr ""
 
@@ -6238,12 +6406,12 @@ msgid "Screen too small"
 msgstr ""
 
 #. TRANSLATORS: "Config file not changeable," is what replaces the %s
-#: alpine/confscroll.c:485 alpine/confscroll.c:1330
+#: alpine/confscroll.c:485 alpine/confscroll.c:1335
 #, c-format
 msgid "%s can't change options or settings"
 msgstr ""
 
-#: alpine/confscroll.c:487 alpine/confscroll.c:1332
+#: alpine/confscroll.c:487 alpine/confscroll.c:1337
 msgid "Config file not changeable,"
 msgstr ""
 
@@ -6294,257 +6462,257 @@ msgstr ""
 #. TRANSLATORS: Command <command letter> not defined here.
 #. Leave the trailing %s which might be a parenthetical
 #. remark.
-#: alpine/confscroll.c:1347
+#: alpine/confscroll.c:1352
 #, c-format
 msgid "Command \"%s\" not defined here.%s"
 msgstr ""
 
-#: alpine/confscroll.c:1647
+#: alpine/confscroll.c:1656
 msgid "Decrease"
 msgstr ""
 
-#: alpine/confscroll.c:1651
+#: alpine/confscroll.c:1660
 msgid "Increase"
 msgstr ""
 
-#: alpine/confscroll.c:1670
+#: alpine/confscroll.c:1679
 msgid "Only single value allowed.  Use \"Change\"."
 msgstr ""
 
-#: alpine/confscroll.c:1696
+#: alpine/confscroll.c:1705
 msgid "Enter text to insert before \"%.*w\": "
 msgstr ""
 
-#: alpine/confscroll.c:1710 alpine/print.c:751
+#: alpine/confscroll.c:1719 alpine/print.c:751
 msgid "Add To"
 msgstr ""
 
-#: alpine/confscroll.c:1712 alpine/print.c:753
+#: alpine/confscroll.c:1721 alpine/print.c:753
 msgid "Replace or Add To default value ? "
 msgstr ""
 
-#: alpine/confscroll.c:1733 alpine/confscroll.c:1761
+#: alpine/confscroll.c:1742 alpine/confscroll.c:1770
 #, c-format
 msgid "Enter the numeric text to be added : "
 msgstr ""
 
-#: alpine/confscroll.c:1735 alpine/confscroll.c:1763
+#: alpine/confscroll.c:1744 alpine/confscroll.c:1772
 #, c-format
 msgid "Enter the text to be added : "
 msgstr ""
 
-#: alpine/confscroll.c:1747
+#: alpine/confscroll.c:1756
 #, c-format
 msgid "Enter the  numeric replacement text : "
 msgstr ""
 
-#: alpine/confscroll.c:1749
+#: alpine/confscroll.c:1758
 #, c-format
 msgid "Enter the  replacement text : "
 msgstr ""
 
 #. TRANSLATORS: Insert new item before current item
-#: alpine/confscroll.c:1782 alpine/print.c:804
+#: alpine/confscroll.c:1791 alpine/print.c:804
 msgid "InsertBefore"
 msgstr ""
 
-#: alpine/confscroll.c:1782 alpine/print.c:804
+#: alpine/confscroll.c:1791 alpine/print.c:804
 msgid "InsertAfter"
 msgstr ""
 
-#: alpine/confscroll.c:1843 alpine/confscroll.c:1851 alpine/print.c:893
+#: alpine/confscroll.c:1852 alpine/confscroll.c:1860 alpine/print.c:893
 #, c-format
 msgid "Can't add %s to list"
 msgstr ""
 
-#: alpine/confscroll.c:1859 alpine/confscroll.c:2231
+#: alpine/confscroll.c:1868 alpine/confscroll.c:2240
 msgid "Entry must be numeric"
 msgstr ""
 
-#: alpine/confscroll.c:1903
+#: alpine/confscroll.c:1912
 #, c-format
 msgid "Enter text to insert after \"%.*s\": "
 msgstr ""
 
-#: alpine/confscroll.c:1905
+#: alpine/confscroll.c:1914
 #, c-format
 msgid "Enter text to insert before \"%.*s\": "
 msgstr ""
 
-#: alpine/confscroll.c:1926 alpine/confscroll.c:2263
+#: alpine/confscroll.c:1935 alpine/confscroll.c:2272
 #, c-format
 msgid "Minimum value is %s"
 msgstr ""
 
-#: alpine/confscroll.c:1951 alpine/confscroll.c:2280
+#: alpine/confscroll.c:1960 alpine/confscroll.c:2289
 #, c-format
 msgid "Maximum value is %s"
 msgstr ""
 
-#: alpine/confscroll.c:1977 alpine/confscroll.c:1991 alpine/print.c:920
+#: alpine/confscroll.c:1986 alpine/confscroll.c:2000 alpine/print.c:920
 #, c-format
 msgid "Override default with %s"
 msgstr ""
 
-#: alpine/confscroll.c:2007 alpine/print.c:935
+#: alpine/confscroll.c:2016 alpine/print.c:935
 msgid "No set value to delete"
 msgstr ""
 
-#: alpine/confscroll.c:2011
+#: alpine/confscroll.c:2020
 #, c-format
 msgid "Delete (unused) %s from %s "
 msgstr ""
 
-#: alpine/confscroll.c:2023
+#: alpine/confscroll.c:2032
 #, c-format
 msgid "Really delete %s%s from %s "
 msgstr ""
 
-#: alpine/confscroll.c:2059
+#: alpine/confscroll.c:2068
 msgid "Value not deleted"
 msgstr ""
 
-#: alpine/confscroll.c:2123
+#: alpine/confscroll.c:2132
 #, c-format
 msgid "Change field %s list entry : "
 msgstr ""
 
-#: alpine/confscroll.c:2130
+#: alpine/confscroll.c:2139
 #, c-format
 msgid "Change numeric field %s value : "
 msgstr ""
 
-#: alpine/confscroll.c:2132
+#: alpine/confscroll.c:2141
 #, c-format
 msgid "Change field %s value : "
 msgstr ""
 
-#: alpine/confscroll.c:2302
+#: alpine/confscroll.c:2311
 msgid "Can't shuffle single-valued setting"
 msgstr ""
 
-#: alpine/confscroll.c:2317
+#: alpine/confscroll.c:2326
 msgid "Shuffle only makes sense when there is more than one value defined"
 msgstr ""
 
-#: alpine/confscroll.c:2746 alpine/confscroll.c:2973 alpine/colorconf.c:1277
+#: alpine/confscroll.c:2755 alpine/confscroll.c:2982 alpine/colorconf.c:1277
 msgid "Delete old unused personal option setting"
 msgstr ""
 
-#: alpine/confscroll.c:4279
+#: alpine/confscroll.c:4290
 msgid "<Ignored: using Literal-Signature instead>"
 msgstr ""
 
 #. TRANSLATORS: In the configuration screen, telling the user we
 #. can't change this option because the system administrator
 #. prohibits it.
-#: alpine/confscroll.c:4533 pith/conf.c:6972
+#: alpine/confscroll.c:4544 pith/conf.c:7056
 msgid "Can't change value fixed by sys-admin."
 msgstr ""
 
-#: alpine/confscroll.c:4798
+#: alpine/confscroll.c:4838
 #, c-format
 msgid "Warning: \"%s\" is overridden in your exceptions configuration"
 msgstr ""
 
-#: alpine/confscroll.c:4824
+#: alpine/confscroll.c:4864
 msgid "FIXING PINERC"
 msgstr ""
 
-#: alpine/confscroll.c:4828
+#: alpine/confscroll.c:4868
 msgid "Some of your options conflict with site policy.  Investigate"
 msgstr ""
 
-#: alpine/confscroll.c:4852
+#: alpine/confscroll.c:4892
 #, c-format
 msgid "Your setting for %s is "
 msgstr ""
 
-#: alpine/confscroll.c:4872 alpine/confscroll.c:4881 alpine/confscroll.c:4885
+#: alpine/confscroll.c:4912 alpine/confscroll.c:4921 alpine/confscroll.c:4925
 #, c-format
 msgid "Your setting for %s is %s"
 msgstr ""
 
-#: alpine/confscroll.c:4941 alpine/confscroll.c:4945
+#: alpine/confscroll.c:4981 alpine/confscroll.c:4985
 msgid "ON"
 msgstr ""
 
-#: alpine/confscroll.c:4941 alpine/confscroll.c:4945
+#: alpine/confscroll.c:4981 alpine/confscroll.c:4985
 msgid "OFF"
 msgstr ""
 
-#: alpine/confscroll.c:5029
+#: alpine/confscroll.c:5069
 msgid "Using default value"
 msgstr ""
 
-#: alpine/confscroll.c:5040
+#: alpine/confscroll.c:5080
 #, c-format
 msgid "User-Domain (%s) cannot contain \"@\"; using %s"
 msgstr ""
 
-#: alpine/confscroll.c:5049
+#: alpine/confscroll.c:5089
 #, c-format
 msgid "User-domain (%s) cannot contain \"@\"; deleting"
 msgstr ""
 
-#: alpine/confscroll.c:5120 alpine/confscroll.c:5133 alpine/confscroll.c:5146
-#: alpine/confscroll.c:5153 pith/conf.c:7081
+#: alpine/confscroll.c:5160 alpine/confscroll.c:5173 alpine/confscroll.c:5186
+#: alpine/confscroll.c:5193 pith/conf.c:7165
 msgid "This option has no effect without Enable-Incoming-Folders-Checking"
 msgstr ""
 
-#: alpine/confscroll.c:5188
+#: alpine/confscroll.c:5228
 msgid "Initial command changes will affect your next Alpine session."
 msgstr ""
 
-#: alpine/confscroll.c:5241 alpine/confscroll.c:5257 pith/conf.c:6832
+#: alpine/confscroll.c:5291 alpine/confscroll.c:5307 pith/conf.c:6916
 msgid "This change has no effect because feature Use-System-Translation is on"
 msgstr ""
 
-#: alpine/confscroll.c:5311
+#: alpine/confscroll.c:5361
 #, c-format
 msgid "Ignoring Quote-Suppression-Threshold value of %s, see help"
 msgstr ""
 
-#: alpine/confscroll.c:5336
+#: alpine/confscroll.c:5386
 msgid "Active Example"
 msgstr ""
 
-#: alpine/confscroll.c:5406 alpine/roleconf.c:5208
+#: alpine/confscroll.c:5456 alpine/roleconf.c:5208
 #, c-format
 msgid "Warning: Sig file can't be outside of %s"
 msgstr ""
 
-#: alpine/confscroll.c:5440
+#: alpine/confscroll.c:5490
 msgid ""
 "Warning: automatic new mail checking and mailbox checkpointing is disabled"
 msgstr ""
 
-#: alpine/confscroll.c:5443
+#: alpine/confscroll.c:5493
 msgid ""
 "Warning: Mail-Check-Interval=0 may cause IMAP server connection to time out"
 msgstr ""
 
-#: alpine/confscroll.c:5560
+#: alpine/confscroll.c:5610
 #, c-format
 msgid "\"%s\" can't be Empty, using default"
 msgstr ""
 
-#: alpine/confscroll.c:5611
+#: alpine/confscroll.c:5661
 #, c-format
 msgid "Can't set \"%s\" to that value, see Setup/Printer"
 msgstr ""
 
-#: alpine/confscroll.c:5651
+#: alpine/confscroll.c:5719
 #, c-format
 msgid "Score Value must be in range %s to %s"
 msgstr ""
 
-#: alpine/confscroll.c:5696
+#: alpine/confscroll.c:5764
 #, c-format
 msgid "Changes%s%s will affect your next Alpine session."
 msgstr ""
 
-#: alpine/confscroll.c:5707
+#: alpine/confscroll.c:5775
 msgid "Timeout changes will affect your next Alpine session."
 msgstr ""
 
@@ -6589,98 +6757,98 @@ msgstr ""
 msgid "No folder is currently open"
 msgstr ""
 
-#: alpine/mailindx.c:623
+#: alpine/mailindx.c:626
 msgid "First Index page"
 msgstr ""
 
-#: alpine/mailindx.c:637
+#: alpine/mailindx.c:640
 msgid "Already at start of Index"
 msgstr ""
 
-#: alpine/mailindx.c:657
+#: alpine/mailindx.c:660
 msgid "Last Index page"
 msgstr ""
 
-#: alpine/mailindx.c:666
+#: alpine/mailindx.c:669
 msgid "Already at end of Index"
 msgstr ""
 
-#: alpine/mailindx.c:695
+#: alpine/mailindx.c:698
 msgid "First Index Page"
 msgstr ""
 
-#: alpine/mailindx.c:716
+#: alpine/mailindx.c:719
 msgid "Last Index Page"
 msgstr ""
 
-#: alpine/mailindx.c:1074
+#: alpine/mailindx.c:1092
 msgid "HELP FOR SELECTING INTERRUPTED MSG"
 msgstr ""
 
-#: alpine/mailindx.c:1075
+#: alpine/mailindx.c:1093
 msgid "HELP FOR SELECTING POSTPONED MSG"
 msgstr ""
 
-#: alpine/mailindx.c:1102
+#: alpine/mailindx.c:1120
 #, c-format
 msgid "Message %s deleted"
 msgstr ""
 
-#: alpine/mailindx.c:1102
+#: alpine/mailindx.c:1120
 #, c-format
 msgid "Message %s already deleted"
 msgstr ""
 
-#: alpine/mailindx.c:1131
+#: alpine/mailindx.c:1149
 #, c-format
 msgid "Message %s UNdeleted"
 msgstr ""
 
-#: alpine/mailindx.c:1131
+#: alpine/mailindx.c:1149
 #, c-format
 msgid "Message %s NOT deleted"
 msgstr ""
 
-#: alpine/mailindx.c:2852
+#: alpine/mailindx.c:2869
 msgid "Remember the \"O\" command is always optional"
 msgstr ""
 
-#: alpine/mailindx.c:2987
+#: alpine/mailindx.c:3004
 msgid "Select Matches"
 msgstr ""
 
-#: alpine/mailindx.c:3023
+#: alpine/mailindx.c:3040
 msgid "Searched to First Message."
 msgstr ""
 
-#: alpine/mailindx.c:3039
+#: alpine/mailindx.c:3056
 msgid "Searched to Last Message."
 msgstr ""
 
-#: alpine/mailindx.c:3165
+#: alpine/mailindx.c:3182
 #, c-format
 msgid "Search cancelled.%s"
 msgstr ""
 
-#: alpine/mailindx.c:3166
+#: alpine/mailindx.c:3183
 msgid " Selected set may be incomplete."
 msgstr ""
 
-#: alpine/mailindx.c:3175
+#: alpine/mailindx.c:3192
 #, c-format
 msgid "%s messages found matching word"
 msgstr ""
 
-#: alpine/mailindx.c:3179
+#: alpine/mailindx.c:3196
 #, c-format
 msgid "Word found%s"
 msgstr ""
 
-#: alpine/mailindx.c:3180
+#: alpine/mailindx.c:3197
 msgid ". Search wrapped to beginning"
 msgstr ""
 
-#: alpine/mailindx.c:3181
+#: alpine/mailindx.c:3198
 msgid ". Current line contains only match"
 msgstr ""
 
@@ -7516,7 +7684,7 @@ msgstr ""
 msgid "Folder not created"
 msgstr ""
 
-#: alpine/roleconf.c:6415 pico/pico.c:775
+#: alpine/roleconf.c:6415 pico/pico.c:820
 msgid "Exit cancelled"
 msgstr ""
 
@@ -8023,6 +8191,12 @@ msgstr ""
 msgid "Matched string in ?"
 msgstr ""
 
+#. TRANSLATORS: this is telling the user that one of the characters
+#. they have included in a nickname will not work. It will say something like
+#. Blank spaces not allowed in nicknames    or
+#. Commas not...
+#. etc.
+#.
 #: alpine/addrbook.c:6896
 #, c-format
 msgid "%s not allowed in nicknames"
@@ -8074,603 +8248,644 @@ msgstr ""
 msgid "Alpine ADDRESS_BOOK Help"
 msgstr ""
 
-#: alpine/reply.c:158 alpine/reply.c:201 alpine/reply.c:544 alpine/reply.c:666
+#: alpine/reply.c:159 alpine/reply.c:202 alpine/reply.c:547 alpine/reply.c:669
 #, c-format
 msgid "Error fetching message %s. Can't reply to it."
 msgstr ""
 
-#: alpine/reply.c:416 alpine/mailpart.c:3434
+#: alpine/reply.c:419 alpine/mailpart.c:3489
 #, c-format
 msgid "Replying using role \"%s\" and To as From"
 msgstr ""
 
-#: alpine/reply.c:419 alpine/mailpart.c:3437
+#: alpine/reply.c:422 alpine/mailpart.c:3492
 #, c-format
 msgid "Replying using role \"%s\""
 msgstr ""
 
-#: alpine/reply.c:422 alpine/mailpart.c:3440
+#: alpine/reply.c:425 alpine/mailpart.c:3495
 msgid "Replying using incoming To as outgoing From"
 msgstr ""
 
-#: alpine/reply.c:441 alpine/mailpart.c:3450
+#: alpine/reply.c:444 alpine/mailpart.c:3505
 msgid "Warning: no valid addresses to reply to!"
 msgstr ""
 
-#: alpine/reply.c:451 alpine/reply.c:1423 alpine/reply.c:1818
-#: alpine/mailpart.c:3109 alpine/mailpart.c:3268 alpine/mailpart.c:3507
-#: pith/reply.c:2450
+#: alpine/reply.c:454 alpine/reply.c:1550 alpine/reply.c:1945
+#: alpine/mailpart.c:3164 alpine/mailpart.c:3323 alpine/mailpart.c:3562
+#: pith/reply.c:2548
 msgid "Error allocating message text"
 msgstr ""
 
-#: alpine/reply.c:564
+#: alpine/reply.c:567
 msgid "WARNING!  Attachments not included in multiple reply."
 msgstr ""
 
-#: alpine/reply.c:583
+#: alpine/reply.c:586
 msgid "Multipart with no leading text part."
 msgstr ""
 
-#: alpine/reply.c:589
+#: alpine/reply.c:592
 msgid "Non-text message not included."
 msgstr ""
 
-#: alpine/reply.c:697
+#: alpine/reply.c:700
 msgid "COMPOSE MESSAGE REPLY"
 msgstr ""
 
-#: alpine/reply.c:849
+#: alpine/reply.c:852
 msgid "No, use default role"
 msgstr ""
 
-#: alpine/reply.c:851
+#: alpine/reply.c:854
 msgid "No, use default settings"
 msgstr ""
 
-#: alpine/reply.c:853
+#: alpine/reply.c:856
 msgid "To Select Alternate Role"
 msgstr ""
 
 #. TRANSLATORS: This is something like Use role <nickname of role> for Reply?
-#: alpine/reply.c:857
+#: alpine/reply.c:860
 #, c-format
 msgid "Use role \"%s\" for %s? "
 msgstr ""
 
-#: alpine/reply.c:862
+#: alpine/reply.c:865
 #, c-format
 msgid "Use role \"<a role without a nickname>\" for %s? "
 msgstr ""
 
-#: alpine/reply.c:871
+#: alpine/reply.c:874
 msgid "To Select Role"
 msgstr ""
 
-#: alpine/reply.c:873
+#: alpine/reply.c:876
 #, c-format
 msgid "Press Return to %s using %s role, or ^T to select a role "
 msgstr ""
 
-#: alpine/reply.c:874
+#: alpine/reply.c:877
 msgid "default"
 msgstr ""
 
-#: alpine/reply.c:874
+#: alpine/reply.c:877
 msgid "no"
 msgstr ""
 
-#: alpine/reply.c:955
+#: alpine/reply.c:956
 msgid "Not Preserve"
 msgstr ""
 
-#: alpine/reply.c:955
+#: alpine/reply.c:956
 msgid "Preserve"
 msgstr ""
 
-#: alpine/reply.c:956
+#: alpine/reply.c:957
 #, c-format
 msgid "Reply to all recipients%s"
 msgstr ""
 
-#: alpine/reply.c:957
+#: alpine/reply.c:958
 msgid " (preserving fields)? "
 msgstr ""
 
-#. TRANSLATORS: The final three %s's can probably be safely ignored
-#: alpine/reply.c:1024
+#. TRANSLATORS: The final five %s's can probably be safely ignored
+#: alpine/reply.c:1051
 #, c-format
-msgid "Include %s original messages in Reply%s%s%s? "
+msgid "Include %s%soriginal message%s in Reply%s%s%s%s%s%s? "
 msgstr ""
 
-#: alpine/reply.c:1030
+#: alpine/reply.c:1067 alpine/reply.c:1113
+msgid "Edit Indent String"
+msgstr ""
+
+#: alpine/reply.c:1072
 #, c-format
-msgid "Include original message in Reply%s%s%s? "
+msgid "Include %s%soriginal message%s in Reply (using \"%s%s%s\")? "
 msgstr ""
 
-#: alpine/reply.c:1039
-msgid "Edit Indent String"
+#: alpine/reply.c:1085
+msgid "No Header"
 msgstr ""
 
-#: alpine/reply.c:1139
+#: alpine/reply.c:1085
+msgid "Inc Headr"
+msgstr ""
+
+#: alpine/reply.c:1091
+msgid "No Strip"
+msgstr ""
+
+#: alpine/reply.c:1091
+msgid "Strip Sig"
+msgstr ""
+
+#: alpine/reply.c:1097
+msgid "No Attach"
+msgstr ""
+
+#: alpine/reply.c:1097
+msgid "Inc Attach"
+msgstr ""
+
+#: alpine/reply.c:1103
+msgid "Sig Top"
+msgstr ""
+
+#: alpine/reply.c:1103
+msgid "Sig Bottom"
+msgstr ""
+
+#: alpine/reply.c:1266
 msgid "Replying to Poster as specified in \"Followup-To\""
 msgstr ""
 
-#: alpine/reply.c:1160
+#: alpine/reply.c:1287
 msgid "Follow-up"
 msgstr ""
 
-#: alpine/reply.c:1171
+#: alpine/reply.c:1298
 msgid "Follow-up to news group(s), Reply via email to author or Both? "
 msgstr ""
 
-#: alpine/reply.c:1196
+#: alpine/reply.c:1323
 msgid "Posting to specified Followup-To groups"
 msgstr ""
 
-#: alpine/reply.c:1232
+#: alpine/reply.c:1359
 msgid "Pipes for signatures are administratively disabled"
 msgstr ""
 
-#: alpine/reply.c:1237
+#: alpine/reply.c:1364
 msgid "Pipes for templates are administratively disabled"
 msgstr ""
 
 #. TRANSLATORS: First arg is the directory name, second is
 #. the file user wants to read but can't.
-#: alpine/reply.c:1251 pith/smime.c:287 pith/smime.c:349 pith/smime.c:453
+#: alpine/reply.c:1378 pith/smime.c:1379 pith/smime.c:1456 pith/smime.c:1520
 #, c-format
 msgid "Can't read file outside %s: %s"
 msgstr ""
 
-#: alpine/reply.c:1286
+#: alpine/reply.c:1413
 #, c-format
 msgid "Can't get file: %s"
 msgstr ""
 
-#: alpine/reply.c:1295
+#: alpine/reply.c:1422
 #, c-format
 msgid "Error running program \"%s\"%s"
 msgstr ""
 
-#: alpine/reply.c:1324
+#: alpine/reply.c:1451
 #, c-format
 msgid "Error running program \"%s\""
 msgstr ""
 
 #. TRANSLATORS: Arg is a program name
-#: alpine/reply.c:1335
+#: alpine/reply.c:1462
 #, c-format
 msgid "Can't execute \"%s\": Permission denied"
 msgstr ""
 
 #. TRANSLATORS: First arg is error description, 2nd is
 #. filename
-#: alpine/reply.c:1346
+#: alpine/reply.c:1473
 #, c-format
 msgid "Error \"%s\" reading file \"%s\""
 msgstr ""
 
-#: alpine/reply.c:1411 alpine/reply.c:1597 alpine/reply.c:1649
-#: alpine/mailpart.c:3272
+#: alpine/reply.c:1538 alpine/reply.c:1724 alpine/reply.c:1776
+#: alpine/mailpart.c:3327
 #, c-format
 msgid "Error fetching message %s. Can't forward it."
 msgstr ""
 
-#: alpine/reply.c:1430
+#: alpine/reply.c:1557
 msgid "Forward messages as a MIME digest"
 msgstr ""
 
-#: alpine/reply.c:1432 alpine/mailpart.c:3146
+#: alpine/reply.c:1559 alpine/mailpart.c:3201
 msgid "Forward message as an attachment"
 msgstr ""
 
-#: alpine/reply.c:1476 alpine/mailpart.c:3038 alpine/mailpart.c:3164
+#: alpine/reply.c:1603 alpine/mailpart.c:3093 alpine/mailpart.c:3219
 #, c-format
 msgid "Forwarding using role \"%s\""
 msgstr ""
 
-#: alpine/reply.c:1520
+#: alpine/reply.c:1647
 msgid "Insufficient memory for message text"
 msgstr ""
 
-#: alpine/reply.c:1616
+#: alpine/reply.c:1743
 msgid "WARNING!  Attachments not included in multiple forward."
 msgstr ""
 
-#: alpine/reply.c:1634
+#: alpine/reply.c:1761
 msgid "Multipart with no leading text part!"
 msgstr ""
 
-#: alpine/reply.c:1639
+#: alpine/reply.c:1766
 msgid "Non-text message not included!"
 msgstr ""
 
-#: alpine/reply.c:1731 alpine/mailpart.c:3104 alpine/mailpart.c:3263
+#: alpine/reply.c:1858 alpine/mailpart.c:3159 alpine/mailpart.c:3318
 msgid "Error fetching message contents.  Can't forward message."
 msgstr ""
 
-#: alpine/reply.c:1808
+#: alpine/reply.c:1935
 #, c-format
 msgid "Error reading text \"%s\""
 msgstr ""
 
-#: alpine/reply.c:1850
+#: alpine/reply.c:1978
+#, c-format
+msgid "BOUNCE (redirect) %ld messages (using role %s) to : "
+msgstr ""
+
+#: alpine/reply.c:1981
 #, c-format
 msgid "BOUNCE (redirect) %ld messages to : "
 msgstr ""
 
-#: alpine/reply.c:1854
+#: alpine/reply.c:1985
 #, c-format
 msgid "Send %ld messages "
 msgstr ""
 
-#: alpine/reply.c:1869
+#: alpine/reply.c:2000
 msgid "Can't fetch Subject for Bounce"
 msgstr ""
 
-#: alpine/reply.c:1950
+#: alpine/reply.c:2091
 msgid "No signature file defined."
 msgstr ""
 
-#: alpine/reply.c:1955
+#: alpine/reply.c:2096
 msgid "Can't access remote configuration."
 msgstr ""
 
-#: alpine/reply.c:1957
+#: alpine/reply.c:2098
 msgid "Error attempting to edit remote configuration"
 msgstr ""
 
-#: alpine/reply.c:1993
+#: alpine/reply.c:2134
 msgid "Can't access remote sig"
 msgstr ""
 
-#: alpine/reply.c:2001
+#: alpine/reply.c:2142
 msgid "Can't get write permission for remote sig"
 msgstr ""
 
-#: alpine/reply.c:2041
+#: alpine/reply.c:2182
 #, c-format
 msgid "Can't edit file outside of %s"
 msgstr ""
 
-#: alpine/reply.c:2050
+#: alpine/reply.c:2191
 msgid "Error allocating space for file"
 msgstr ""
 
-#: alpine/reply.c:2061
+#: alpine/reply.c:2202
 #, c-format
 msgid "Error editing \"%s\": %s"
 msgstr ""
 
-#: alpine/reply.c:2075
+#: alpine/reply.c:2216
 #, c-format
 msgid "Error reading file: \"%s\""
 msgstr ""
 
-#: alpine/reply.c:2115 alpine/reply.c:2125
+#: alpine/reply.c:2256 alpine/reply.c:2266
 #, c-format
 msgid "Error writing file: \"%s\""
 msgstr ""
 
-#: alpine/reply.c:2141
+#: alpine/reply.c:2282
 #, c-format
 msgid "Error opening temporary sig file %s: %s"
 msgstr ""
 
-#: alpine/reply.c:2149 pith/smime.c:762 pith/smkeys.c:454
+#: alpine/reply.c:2290 pith/smime.c:1936 pith/smkeys.c:1046
 #, c-format
 msgid "Error copying to %s: %s"
 msgstr ""
 
-#: alpine/reply.c:2157
+#: alpine/reply.c:2298
 msgid "Copy of sig to remote folder failed, changes NOT saved remotely"
 msgstr ""
 
-#: alpine/reply.c:2171
+#: alpine/reply.c:2312
 #, c-format
 msgid "Error writing \"%s\""
 msgstr ""
 
-#: alpine/reply.c:2264
+#: alpine/reply.c:2405
 msgid "Edit Cancelled"
 msgstr ""
 
-#: alpine/reply.c:2305
+#: alpine/reply.c:2446
 msgid "Save changes"
 msgstr ""
 
-#: alpine/reply.c:2306
+#: alpine/reply.c:2447
 msgid "Don't save changes"
 msgstr ""
 
-#: alpine/reply.c:2314
+#: alpine/reply.c:2455
 msgid "Exit editor? "
 msgstr ""
 
-#: alpine/reply.c:2321
+#: alpine/reply.c:2462
 msgid "No Changes Saved"
 msgstr ""
 
-#: alpine/reply.c:2325
+#: alpine/reply.c:2466
 msgid "Exit Cancelled"
 msgstr ""
 
-#: alpine/mailpart.c:193
+#: alpine/mailpart.c:194
 msgid "Screen too small to view attachment"
 msgstr ""
 
-#: alpine/mailpart.c:200
+#: alpine/mailpart.c:201
 msgid "Can only view one message's attachments at a time."
 msgstr ""
 
-#: alpine/mailpart.c:205
+#: alpine/mailpart.c:206
 #, c-format
 msgid "Message %s has only one part (the message body), and no attachments."
 msgstr ""
 
-#: alpine/mailpart.c:238
+#: alpine/mailpart.c:239
 #, c-format
 msgid "Malformed message: %s"
 msgstr ""
 
-#: alpine/mailpart.c:500
+#: alpine/mailpart.c:501
 msgid "HELP FOR ATTACHMENT INDEX"
 msgstr ""
 
-#: alpine/mailpart.c:560
+#: alpine/mailpart.c:561
 msgid "Already on last attachment"
 msgstr ""
 
-#: alpine/mailpart.c:568
+#: alpine/mailpart.c:569
 msgid "Already on first attachment"
 msgstr ""
 
-#: alpine/mailpart.c:582
+#: alpine/mailpart.c:583
 msgid "Already on last page of attachments"
 msgstr ""
 
-#: alpine/mailpart.c:602
+#: alpine/mailpart.c:603
 msgid "Already on first page of attachments"
 msgstr ""
 
-#: alpine/mailpart.c:1159
+#: alpine/mailpart.c:1160
 msgid "ATTACHMENT INDEX"
 msgstr ""
 
-#: alpine/mailpart.c:1285
+#: alpine/mailpart.c:1286
 #, c-format
 msgid "Can't Export %s. Use \"Save\" to write file, \"<\" to leave index."
 msgstr ""
 
-#: alpine/mailpart.c:1344
+#: alpine/mailpart.c:1348
 #, c-format
 msgid "Can't save to file outside of %s"
 msgstr ""
 
 #. TRANSLATORS: Error opening destination <filename>: <error text>
-#: alpine/mailpart.c:1460
+#: alpine/mailpart.c:1470
 #, c-format
 msgid "Error opening destination %s: %s"
 msgstr ""
 
 #. TRANSLATORS: <error text>: Error writing attachment to <filename>
-#: alpine/mailpart.c:1487
+#: alpine/mailpart.c:1497
 #, c-format
 msgid "%s: Error writing attachment to \"%s\""
 msgstr ""
 
-#: alpine/mailpart.c:1566
+#: alpine/mailpart.c:1576
 #, c-format
 msgid "Attached Msg (part %s) "
 msgstr ""
 
-#: alpine/mailpart.c:1601
+#: alpine/mailpart.c:1611
 #, c-format
 msgid "Attached message (part %s) saved to \"%s\""
 msgstr ""
 
-#: alpine/mailpart.c:1667
+#: alpine/mailpart.c:1677
 #, c-format
 msgid "Attached digest (part %s) saved to \"%s\""
 msgstr ""
 
 #. TRANSLATORS: Message Attachment (a screen title)
-#: alpine/mailpart.c:1741
+#: alpine/mailpart.c:1751
 msgid "MSG ATTACHMENT"
 msgstr ""
 
-#: alpine/mailpart.c:1767
+#: alpine/mailpart.c:1777
 #, c-format
 msgid "Attached message (part %s) %s to \"%s\""
 msgstr ""
 
-#: alpine/mailpart.c:1770
+#: alpine/mailpart.c:1780
 msgid "overwritten"
 msgstr ""
 
-#: alpine/mailpart.c:1771
+#: alpine/mailpart.c:1781
 msgid "appended"
 msgstr ""
 
-#: alpine/mailpart.c:1771
+#: alpine/mailpart.c:1781
 msgid "written"
 msgstr ""
 
-#: alpine/mailpart.c:1776
+#: alpine/mailpart.c:1786
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: alpine/mailpart.c:1818
+#: alpine/mailpart.c:1828
 msgid "DIGEST ATTACHMENT"
 msgstr ""
 
-#: alpine/mailpart.c:1859
+#: alpine/mailpart.c:1869
 #, c-format
 msgid "Error exporting: %s"
 msgstr ""
 
-#: alpine/mailpart.c:1861
+#: alpine/mailpart.c:1871
 #, c-format
 msgid "%s messages exported before error occurred"
 msgstr ""
 
-#: alpine/mailpart.c:1875
+#: alpine/mailpart.c:1885
 #, c-format
 msgid "Error opening file \"%s\" to export digest: %s"
 msgstr ""
 
-#: alpine/mailpart.c:1941
+#: alpine/mailpart.c:1951
 #, c-format
 msgid "Error printing message %s, part %s"
 msgstr ""
 
-#: alpine/mailpart.c:1969
+#: alpine/mailpart.c:1979
 #, c-format
 msgid "Can't print digest: %s"
 msgstr ""
 
 #. TRANSLATORS: Don't know how to display <certain type> attachments. <might say Try Save.>
-#: alpine/mailpart.c:2009
+#: alpine/mailpart.c:2019
 #, c-format
 msgid "Don't know how to display %s%s%s attachments.%s"
 msgstr ""
 
-#: alpine/mailpart.c:2013
+#: alpine/mailpart.c:2023
 msgid " Try Save."
 msgstr ""
 
-#: alpine/mailpart.c:2016
+#: alpine/mailpart.c:2026
 #, c-format
 msgid "Don't know how to unpack \"%s\" encoding"
 msgstr ""
 
-#: alpine/mailpart.c:2029
+#: alpine/mailpart.c:2039
 #, c-format
 msgid "Can't display Multipart/%s"
 msgstr ""
 
-#: alpine/mailpart.c:2034
+#: alpine/mailpart.c:2044
 msgid "Can't display unknown Multipart Subtype"
 msgstr ""
 
-#: alpine/mailpart.c:2057
+#: alpine/mailpart.c:2067
 msgid "View selected Attachment"
 msgstr ""
 
-#: alpine/mailpart.c:2144
+#: alpine/mailpart.c:2163
 #, c-format
 msgid "Error \"%s\", Can't create temporary file"
 msgstr ""
 
-#: alpine/mailpart.c:2151
+#: alpine/mailpart.c:2170
 #, c-format
 msgid "Error \"%s\", Can't write file %s"
 msgstr ""
 
-#: alpine/mailpart.c:2253
+#: alpine/mailpart.c:2272
 #, c-format
 msgid "Cannot display %s attachment"
 msgstr ""
 
-#: alpine/mailpart.c:2312 alpine/mailpart.c:2736
+#: alpine/mailpart.c:2331 alpine/mailpart.c:2791
 msgid "Error allocating space for attachment."
 msgstr ""
 
 #. TRANSLATORS: User is viewing a message and all of
 #. the header text is being shown.
-#: alpine/mailpart.c:2353 alpine/mailpart.c:2453 pith/mailview.c:175
+#: alpine/mailpart.c:2372 alpine/mailpart.c:2472 pith/mailview.c:175
 msgid "Full header mode ON.  All header text being included"
 msgstr ""
 
-#: alpine/mailpart.c:2424 alpine/mailpart.c:2436
+#: alpine/mailpart.c:2443 alpine/mailpart.c:2455
 #, c-format
 msgid "Can't format digest: %s"
 msgstr ""
 
-#: alpine/mailpart.c:2455
+#: alpine/mailpart.c:2474
 msgid "ATTACHED MESSAGES"
 msgstr ""
 
-#: alpine/mailpart.c:2479
+#: alpine/mailpart.c:2498
 msgid "HELP FOR ATTACHED TEXT VIEW"
 msgstr ""
 
-#: alpine/mailpart.c:2485
+#: alpine/mailpart.c:2504
 msgid "MsgText"
 msgstr ""
 
-#: alpine/mailpart.c:2488
+#: alpine/mailpart.c:2507
 msgid "AttchIndex"
 msgstr ""
 
-#: alpine/mailpart.c:2729
+#: alpine/mailpart.c:2564 alpine/smime.c:212
+msgid "Not a signed or encrypted message"
+msgstr ""
+
+#: alpine/mailpart.c:2784
 msgid "Error accessing attachment."
 msgstr ""
 
-#: alpine/mailpart.c:2801
+#: alpine/mailpart.c:2856
 msgid ""
 "This is a vCard which has been forwarded to you. You may add parts of it to "
 "your address book with the Save command. You will have a chance to edit it "
 "before committing it to your address book."
 msgstr ""
 
-#: alpine/mailpart.c:2802
+#: alpine/mailpart.c:2857
 msgid ""
 "This is a vCard which has been forwarded to you. You may add the entries to "
 "your address book with the Save command."
 msgstr ""
 
-#: alpine/mailpart.c:2811
+#: alpine/mailpart.c:2866
 msgid "ADDRESS BOOK ATTACHMENT"
 msgstr ""
 
-#: alpine/mailpart.c:2824
+#: alpine/mailpart.c:2879
 #, c-format
 msgid "Can't format entry : %s"
 msgstr ""
 
-#: alpine/mailpart.c:2981
+#: alpine/mailpart.c:3036
 msgid "ABOUT ATTACHMENT"
 msgstr ""
 
-#: alpine/mailpart.c:2983
+#: alpine/mailpart.c:3038
 msgid "HELP FOR \"ABOUT ATTACHMENT\""
 msgstr ""
 
-#: alpine/mailpart.c:3499
+#: alpine/mailpart.c:3554
 msgid "Error building message body"
 msgstr ""
 
-#: alpine/mailpart.c:3741
+#: alpine/mailpart.c:3796
 #, c-format
 msgid "Error detaching for pipe: %s"
 msgstr ""
 
-#: alpine/mailpart.c:3745
+#: alpine/mailpart.c:3800
 msgid "PIPE ATTACHMENT (ERROR)"
 msgstr ""
 
-#: alpine/mailpart.c:3746
+#: alpine/mailpart.c:3801
 msgid "PIPE ATTACHMENT"
 msgstr ""
 
-#: alpine/mailpart.c:3780
+#: alpine/mailpart.c:3835
 #, c-format
 msgid "Part %s will be omitted only if message is Saved"
 msgstr ""
 
-#: alpine/mailpart.c:3785
+#: alpine/mailpart.c:3840
 #, c-format
 msgid "Part %s already deleted"
 msgstr ""
 
-#: alpine/mailpart.c:3806
+#: alpine/mailpart.c:3861
 #, c-format
 msgid "Part %s already UNdeleted"
 msgstr ""
 
-#: alpine/signal.c:267
+#: alpine/signal.c:269
 #, c-format
 msgid ""
 "\n"
@@ -8678,7 +8893,7 @@ msgid ""
 "Alpine timed out (No user input for %d %s)\n"
 msgstr ""
 
-#: alpine/signal.c:302
+#: alpine/signal.c:304
 #, c-format
 msgid ""
 "\n"
@@ -8687,36 +8902,36 @@ msgid ""
 "\n"
 msgstr ""
 
-#: alpine/signal.c:419
+#: alpine/signal.c:421
 #, c-format
 msgid "Another email program is accessing %s. Session now Read-Only."
 msgstr ""
 
-#: alpine/signal.c:791
+#: alpine/signal.c:793
 msgid "Alpine suspension not enabled - see help text"
 msgstr ""
 
-#: alpine/signal.c:874
+#: alpine/signal.c:876
 #, c-format
 msgid "Error loading \"%s\""
 msgstr ""
 
-#: alpine/signal.c:880
+#: alpine/signal.c:882
 msgid "Suspended for too long, IMAP connection broken"
 msgstr ""
 
-#: alpine/signal.c:893
+#: alpine/signal.c:895
 #, c-format
 msgid ""
 "\n"
 "Alpine suspended. Give the \"%s\" command to come back.\n"
 msgstr ""
 
-#: alpine/signal.c:903
+#: alpine/signal.c:905
 msgid "Warning: Your IMAP connection will be closed if Alpine"
 msgstr ""
 
-#: alpine/signal.c:904
+#: alpine/signal.c:906
 msgid "is suspended for more than 30 minutes\n"
 msgstr ""
 
@@ -8912,7 +9127,7 @@ msgstr ""
 msgid "No collections deleted"
 msgstr ""
 
-#: alpine/imap.c:194
+#: alpine/imap.c:193
 #, c-format
 msgid "Alert received while accessing \"%s\":  %s"
 msgstr ""
@@ -8921,142 +9136,142 @@ msgstr ""
 #. that the password will be sent unencrypted over the network. This is
 #. just a warning message that gets added parenthetically when the user
 #. is asked for a password.
-#: alpine/imap.c:346
+#: alpine/imap.c:345
 msgid " (INSECURE)"
 msgstr ""
 
 #. TRANSLATORS: Retrying is shown when the user is being asked for a password
 #. after having already failed at least once.
-#: alpine/imap.c:349
+#: alpine/imap.c:348
 msgid "Retrying - "
 msgstr ""
 
 #. TRANSLATORS: A label for the hostname that the user is logging in on
-#: alpine/imap.c:351
+#: alpine/imap.c:350
 msgid "HOST"
 msgstr ""
 
 #. TRANSLATORS: user is logging in as a particular user (a particular
 #. login name), this is just labelling that user name.
-#: alpine/imap.c:354
+#: alpine/imap.c:353
 msgid "USER"
 msgstr ""
 
 #. TRANSLATORS: user is being asked to type in their login name
-#: alpine/imap.c:611
+#: alpine/imap.c:610
 msgid "ENTER LOGIN NAME"
 msgstr ""
 
 #. TRANSLATORS: An abbreviated form of ENTER LOGIN NAME because
 #. longer version doesn't fit on screen
-#: alpine/imap.c:645
+#: alpine/imap.c:644
 msgid "LOGIN"
 msgstr ""
 
 #. TRANSLATORS: user is being asked to type in their password
-#: alpine/imap.c:867
+#: alpine/imap.c:866
 msgid "ENTER PASSWORD"
 msgstr ""
 
 #. TRANSLATORS: An abbreviated form of ENTER PASSWORD
-#: alpine/imap.c:918
+#: alpine/imap.c:917
 msgid "PASSWORD"
 msgstr ""
 
-#: alpine/imap.c:1217
+#: alpine/imap.c:1216
 #, c-format
 msgid "No reply in %s seconds from server %s. Break connection"
 msgstr ""
 
-#: alpine/imap.c:1281
+#: alpine/imap.c:1280
 #, c-format
 msgid "No reply in %s seconds from server %s. Break connection?"
 msgstr ""
 
-#: alpine/imap.c:1301
+#: alpine/imap.c:1300
 #, c-format
 msgid "No reply in %s seconds from server %s. Still Waiting..."
 msgstr ""
 
-#: alpine/imap.c:1394
+#: alpine/imap.c:1393
 msgid "There was a failure validating the SSL/TLS certificate for the server"
 msgstr ""
 
-#: alpine/imap.c:1401 alpine/imap.c:1662
+#: alpine/imap.c:1400 alpine/imap.c:1661
 msgid "The reason for the failure was"
 msgstr ""
 
-#: alpine/imap.c:1424
+#: alpine/imap.c:1423
 msgid ""
 "We have not verified the identity of your server. If you ignore this "
 "certificate validation problem and continue, you could end up connecting to "
 "an imposter server."
 msgstr ""
 
-#: alpine/imap.c:1427
+#: alpine/imap.c:1426
 msgid ""
 "If the certificate validation failure was expected and permanent you may "
 "avoid seeing this warning message in the future by adding the option"
 msgstr ""
 
-#: alpine/imap.c:1434
+#: alpine/imap.c:1433
 msgid ""
 "to the name of the folder you attempted to access. In other words, wherever "
 "you see the characters"
 msgstr ""
 
-#: alpine/imap.c:1441 alpine/imap.c:1732
+#: alpine/imap.c:1440 alpine/imap.c:1731
 msgid "in your configuration, replace those characters with"
 msgstr ""
 
-#: alpine/imap.c:1449
+#: alpine/imap.c:1448
 msgid ""
 "Answer \"Yes\" to ignore the warning and continue, \"No\" to cancel the open "
 "of this folder."
 msgstr ""
 
-#: alpine/imap.c:1468 alpine/imap.c:1768 alpine/help.c:200
+#: alpine/imap.c:1467 alpine/imap.c:1767 alpine/help.c:200
 msgid "help text"
 msgstr ""
 
-#: alpine/imap.c:1469
+#: alpine/imap.c:1468
 msgid "SSL/TLS CERTIFICATE VALIDATION FAILURE"
 msgstr ""
 
-#: alpine/imap.c:1477
+#: alpine/imap.c:1476
 msgid "HELP FOR CERT VALIDATION FAILURE"
 msgstr ""
 
-#: alpine/imap.c:1504
+#: alpine/imap.c:1503
 msgid "SSL/TLS certificate validation failure"
 msgstr ""
 
-#: alpine/imap.c:1507
+#: alpine/imap.c:1506
 msgid ": Continue anyway "
 msgstr ""
 
-#: alpine/imap.c:1514
+#: alpine/imap.c:1513
 #, c-format
 msgid "Open of %s cancelled"
 msgstr ""
 
-#: alpine/imap.c:1536
+#: alpine/imap.c:1535
 #, c-format
 msgid "Rename newsrc \"%s%s\" for use as new host-specific newsrc"
 msgstr ""
 
-#: alpine/imap.c:1556
+#: alpine/imap.c:1555
 msgid "Error allocating space for details."
 msgstr ""
 
-#: alpine/imap.c:1560
+#: alpine/imap.c:1559
 msgid ""
 "Host given by user:\n"
 "\n"
 "  "
 msgstr ""
 
-#: alpine/imap.c:1562
+#: alpine/imap.c:1561
 msgid ""
 "\n"
 "\n"
@@ -9065,7 +9280,7 @@ msgid ""
 "  "
 msgstr ""
 
-#: alpine/imap.c:1564
+#: alpine/imap.c:1563
 msgid ""
 "\n"
 "\n"
@@ -9073,24 +9288,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: alpine/imap.c:1574
+#: alpine/imap.c:1573
 msgid "CERT VALIDATION DETAILS"
 msgstr ""
 
-#: alpine/imap.c:1579
+#: alpine/imap.c:1578
 msgid "HELP FOR CERT VALIDATION DETAILS"
 msgstr ""
 
-#: alpine/imap.c:1626
+#: alpine/imap.c:1625
 #, c-format
 msgid "SSL/TLS failure for %s: %s"
 msgstr ""
 
-#: alpine/imap.c:1639
+#: alpine/imap.c:1638
 msgid "There was an SSL/TLS failure for the server"
 msgstr ""
 
-#: alpine/imap.c:1685
+#: alpine/imap.c:1684
 msgid ""
 "This is just an informational message. With the current setup, SSL/TLS will "
 "not work. If this error re-occurs every time you run Alpine, your current "
@@ -9098,46 +9313,46 @@ msgid ""
 "want to add the option"
 msgstr ""
 
-#: alpine/imap.c:1708
+#: alpine/imap.c:1707
 msgid ""
 "to the name of the mail server you are attempting to access. In other words, "
 "wherever you see the characters"
 msgstr ""
 
-#: alpine/imap.c:1759
+#: alpine/imap.c:1758
 msgid "Type RETURN to continue."
 msgstr ""
 
-#: alpine/imap.c:1769
+#: alpine/imap.c:1768
 msgid "SSL/TLS FAILURE"
 msgstr ""
 
-#: alpine/imap.c:1777
+#: alpine/imap.c:1776
 msgid "HELP FOR TLS/SSL FAILURE"
 msgstr ""
 
-#: alpine/imap.c:2678
+#: alpine/imap.c:2685
 msgid "Erase previously preserved passwords"
 msgstr ""
 
-#: alpine/imap.c:2743 alpine/imap.c:2757
+#: alpine/imap.c:2750 alpine/imap.c:2764
 msgid "Preserve password for next login"
 msgstr ""
 
-#: alpine/imap.c:2763
+#: alpine/imap.c:2770
 msgid "Stop \"Preserve passwords?\" prompts by deleting Alpine Keychain entry"
 msgstr ""
 
-#: alpine/imap.c:2770
+#: alpine/imap.c:2777
 msgid ""
 "Restart \"Preserve passwords?\" prompts by deleting Alpine Keychain entry"
 msgstr ""
 
-#: alpine/imap.c:2776
+#: alpine/imap.c:2790
 msgid "Preserve password on DISK for next login"
 msgstr ""
 
-#: alpine/help.c:225 pico/display.c:1791
+#: alpine/help.c:225 pico/display.c:2236
 msgid "HELP"
 msgstr ""
 
@@ -9163,104 +9378,104 @@ msgstr ""
 msgid "Help Help"
 msgstr ""
 
-#: alpine/help.c:457
+#: alpine/help.c:458
 msgid "View Link"
 msgstr ""
 
-#: alpine/help.c:509
+#: alpine/help.c:510
 #, c-format
 msgid "Printing Error: %s"
 msgstr ""
 
-#: alpine/help.c:522
+#: alpine/help.c:523
 msgid "all 150+ pages of help text"
 msgstr ""
 
-#: alpine/help.c:527
+#: alpine/help.c:528
 msgid "Print of all help cancelled"
 msgstr ""
 
-#: alpine/help.c:618
+#: alpine/help.c:619
 msgid "HELP SUB-SECTION"
 msgstr ""
 
-#: alpine/help.c:626 alpine/help.c:651
+#: alpine/help.c:627 alpine/help.c:652
 #, c-format
 msgid "Unrecognized Internal help: \"%s\""
 msgstr ""
 
 #. TRANSLATORS: Help for configuration
-#: alpine/help.c:641
+#: alpine/help.c:642
 msgid "HELP CONFIG"
 msgstr ""
 
 #. TRANSLATORS: command label asking pine to include time stamps in output
-#: alpine/help.c:670
+#: alpine/help.c:671
 msgid "Timestamps"
 msgstr ""
 
 #. TRANSLATORS: do not include time stamps in output
-#: alpine/help.c:672
+#: alpine/help.c:673
 msgid "NoTimestamps"
 msgstr ""
 
-#: alpine/help.c:691
+#: alpine/help.c:692
 msgid "Failed allocating memory"
 msgstr ""
 
-#: alpine/help.c:695
+#: alpine/help.c:696
 msgid "Turning off new messages while reviewing"
 msgstr ""
 
-#: alpine/help.c:744
+#: alpine/help.c:745
 msgid "**** Journal entries prior to this point have been trimmed. ****\n"
 msgstr ""
 
-#: alpine/help.c:752
+#: alpine/help.c:753
 msgid "**** Debug 0-4 entries prior to this point have been trimmed. ****\n"
 msgstr ""
 
-#: alpine/help.c:760
+#: alpine/help.c:761
 msgid "**** Debug 5-9 entries prior to this point have been trimmed. ****\n"
 msgstr ""
 
-#: alpine/help.c:834
+#: alpine/help.c:835
 msgid "journal"
 msgstr ""
 
 #. TRANSLATORS: these are some screen titles
-#: alpine/help.c:846
+#: alpine/help.c:847
 msgid "HELP FOR DEBUG JOURNAL"
 msgstr ""
 
-#: alpine/help.c:848
+#: alpine/help.c:849
 msgid "REVIEW DEBUGGING"
 msgstr ""
 
-#: alpine/help.c:851 alpine/help.c:858
+#: alpine/help.c:852 alpine/help.c:859
 msgid "HELP FOR JOURNAL"
 msgstr ""
 
-#: alpine/help.c:853 alpine/help.c:860
+#: alpine/help.c:854 alpine/help.c:861
 msgid "REVIEW RECENT MESSAGES"
 msgstr ""
 
 #. TRANSLATORS: shows what numeric level Debug output is displayed at
-#: alpine/help.c:870
+#: alpine/help.c:871
 #, c-format
 msgid "Debug (%d)"
 msgstr ""
 
 #. TRANSLATORS: include debug output in journal
-#: alpine/help.c:873
+#: alpine/help.c:874
 msgid "DebugView"
 msgstr ""
 
-#: alpine/help.c:940
+#: alpine/help.c:941
 msgid "COMPOSE TO LOCAL SUPPORT"
 msgstr ""
 
-#: alpine/help.c:947
+#: alpine/help.c:948
 msgid "REQUEST FOR ASSISTANCE"
 msgstr ""
 
@@ -9430,159 +9645,430 @@ msgstr ""
 msgid "Change TRAILER string : "
 msgstr ""
 
-#: alpine/smime.c:74
+#: alpine/smime.c:85 pith/smime.c:882
 #, c-format
 msgid "Enter passphrase for <%s>: "
 msgstr ""
 
-#: alpine/smime.c:111
-msgid "Can only view one message's information at a time."
+#: alpine/smime.c:206
+msgid "Can't fetch body of message."
 msgstr ""
 
-#: alpine/smime.c:121
-msgid "Can't fetch body of message."
+#: alpine/smime.c:218
+msgid "Can only view one message's information at a time."
 msgstr ""
 
-#: alpine/smime.c:201 pith/smime.c:1713 pith/smime.c:1933
+#: alpine/smime.c:249 pith/smime.c:3153 pith/smime.c:3324
 msgid "This message was cryptographically signed."
 msgstr ""
 
-#: alpine/smime.c:210
+#: alpine/smime.c:258
 #, c-format
 msgid "Certificate%s used for signing"
 msgstr ""
 
-#: alpine/smime.c:235 pith/smime.c:1946
+#: alpine/smime.c:283 pith/smime.c:3337
 msgid "This message was encrypted."
 msgstr ""
 
-#: alpine/smime.c:245
+#: alpine/smime.c:293
 msgid "The algorithm used to encrypt was "
 msgstr ""
 
-#: alpine/smime.c:258
+#: alpine/smime.c:306
 #, c-format
 msgid "Certificate%s for decrypting"
 msgstr ""
 
-#: alpine/smime.c:289
+#: alpine/smime.c:337
 msgid "No certificate capable of decrypting could be found."
 msgstr ""
 
-#: alpine/smime.c:390
-msgid "Couldn't find certificate info."
-msgstr ""
-
-#: alpine/smime.c:609
+#: alpine/smime.c:715
 msgid "SETUP S/MIME EXCEPTIONS"
 msgstr ""
 
-#: alpine/smime.c:610
+#: alpine/smime.c:716
 msgid "SETUP S/MIME"
 msgstr ""
 
-#: alpine/smime.c:627
+#: alpine/smime.c:733
 msgid "conf_scroll_screen bad ret in smime_config"
 msgstr ""
 
-#: alpine/smime.c:765
+#: alpine/smime.c:882
 msgid "Mac OS X specific features"
 msgstr ""
 
-#: alpine/smime.c:788
+#: alpine/smime.c:907
 msgid ""
 "Be careful with the following commands, they REPLACE contents in the target"
 msgstr ""
 
-#: alpine/smime.c:802
+#: alpine/smime.c:921
 msgid "Transfer public certs FROM directory TO container"
 msgstr ""
 
-#: alpine/smime.c:810
+#: alpine/smime.c:929
 msgid "Transfer private keys FROM directory TO container"
 msgstr ""
 
-#: alpine/smime.c:818
+#: alpine/smime.c:937
 msgid "Transfer CA certs FROM directory TO container"
 msgstr ""
 
-#: alpine/smime.c:829
+#: alpine/smime.c:948
 msgid "Transfer public certs FROM container TO directory"
 msgstr ""
 
-#: alpine/smime.c:837
+#: alpine/smime.c:956
 msgid "Transfer private keys FROM container TO directory"
 msgstr ""
 
-#: alpine/smime.c:845
+#: alpine/smime.c:964
 msgid "Transfer CA certs FROM container TO directory"
 msgstr ""
 
-#: alpine/smime.c:858
+#: alpine/smime.c:977
 msgid "Transfer public certs FROM container TO keychain"
 msgstr ""
 
-#: alpine/smime.c:866
+#: alpine/smime.c:985
 msgid "Transfer public certs FROM keychain TO container"
 msgstr ""
 
-#: alpine/smime.c:884 alpine/smime.c:962
+#: alpine/smime.c:1004
+msgid "Manage your own certificates"
+msgstr ""
+
+#: alpine/smime.c:1018
+msgid "Manage Public Certificates"
+msgstr ""
+
+#: alpine/smime.c:1027
+msgid "Manage Private Keys"
+msgstr ""
+
+#: alpine/smime.c:1036
+msgid "Manage Certificate Authorities"
+msgstr ""
+
+#: alpine/smime.c:1050
+msgid "Manage Key and Certificate for Password File"
+msgstr ""
+
+#: alpine/smime.c:1064
+msgid "Manage Password File Key and Certificate"
+msgstr ""
+
+#: alpine/smime.c:1093 alpine/smime.c:1099
+msgid "No Priv Key"
+msgstr ""
+
+#: alpine/smime.c:1093 alpine/smime.c:1099
+msgid "Pivate Key"
+msgstr ""
+
+#: alpine/smime.c:1130 alpine/smime.c:1323
+msgid "Certificate already deleted"
+msgstr ""
+
+#: alpine/smime.c:1133 alpine/smime.c:1328
+msgid "Certificate marked deleted"
+msgstr ""
+
+#: alpine/smime.c:1140 alpine/smime.c:1339
+msgid "Certificate marked UNdeleted"
+msgstr ""
+
+#: alpine/smime.c:1143 alpine/smime.c:1334
+msgid "Certificate not marked deleted"
+msgstr ""
+
+#: alpine/smime.c:1151
+msgid "Problem Reading Private Certificate Information"
+msgstr ""
+
+#: alpine/smime.c:1158
+msgid "Certificate Information"
+msgstr ""
+
+#: alpine/smime.c:1168
+#, c-format
+msgid "Error validating certificate: %s"
+msgstr ""
+
+#: alpine/smime.c:1170
+msgid "Certificate validated without errors"
+msgstr ""
+
+#: alpine/smime.c:1183
+#, c-format
+msgid "%s information shown at bottom of certificate information"
+msgstr ""
+
+#: alpine/smime.c:1183 alpine/smime.c:1661 pith/smkeys.c:868
+msgid "Public"
+msgstr ""
+
+#: alpine/smime.c:1183 alpine/smime.c:1661 pith/smkeys.c:868
+msgid "Private"
+msgstr ""
+
+#: alpine/smime.c:1207
+msgid "CERTIFICATE INFORMATION"
+msgstr ""
+
+#: alpine/smime.c:1292
+#, c-format
+msgid "Could not remove private key %s.key"
+msgstr ""
+
+#: alpine/smime.c:1297
+#, c-format
+msgid "Could not remove public certificate %s.crt"
+msgstr ""
+
+#: alpine/smime.c:1300
+#, c-format
+msgid "Could not remove temporary directory %s"
+msgstr ""
+
+#: alpine/smime.c:1312
+msgid "Problem Reading Certificate"
+msgstr ""
+
+#: alpine/smime.c:1352
+msgid "No certificates marked deleted"
+msgstr ""
+
+#: alpine/smime.c:1367
+#, c-format
+msgid "Can't import certificate outside of %s"
+msgstr ""
+
+#: alpine/smime.c:1419
+msgid "Failed to initialize password management screen (no key)"
+msgstr ""
+
+#: alpine/smime.c:1426
+msgid "MANAGE PASSWORD FILE CERTS"
+msgstr ""
+
+#: alpine/smime.c:1473
+msgid "Manage Certificates and Keys Used to Encrypt your Password File"
+msgstr ""
+
+#: alpine/smime.c:1505
+msgid "New Public Certificate and Key:"
+msgstr ""
+
+#: alpine/smime.c:1515
+msgid "Press \"RETURN\" to add new personal key"
+msgstr ""
+
+#: alpine/smime.c:1527
+msgid "Current Public Certificate and Key:"
+msgstr ""
+
+#: alpine/smime.c:1575
+#, c-format
+msgid "List of %s certificates"
+msgstr ""
+
+#: alpine/smime.c:1575 pith/smkeys.c:1386
+msgid "public"
+msgstr ""
+
+#: alpine/smime.c:1576
+msgid "private"
+msgstr ""
+
+#: alpine/smime.c:1577 alpine/smime.c:1661
+msgid "certificate authority"
+msgstr ""
+
+#: alpine/smime.c:1650
+msgid "  \tNo certificates found, press \"RETURN\" to add one."
+msgstr ""
+
+#: alpine/smime.c:1661
+msgid "unknown"
+msgstr ""
+
+#: alpine/smime.c:1682
+msgid "MANAGE CERTIFICATES"
+msgstr ""
+
+#: alpine/smime.c:1703 alpine/smime.c:1781
 msgid "Public certs transferred to container"
 msgstr ""
 
-#: alpine/smime.c:886 alpine/smime.c:897 alpine/smime.c:908 alpine/smime.c:919
-#: alpine/smime.c:930 alpine/smime.c:941
+#: alpine/smime.c:1705 alpine/smime.c:1716 alpine/smime.c:1727
+#: alpine/smime.c:1738 alpine/smime.c:1749 alpine/smime.c:1760
 msgid "Problem transferring certs"
 msgstr ""
 
-#: alpine/smime.c:895
+#: alpine/smime.c:1714
 msgid "Public certs transferred to directory, delete Container config to use"
 msgstr ""
 
-#: alpine/smime.c:906
+#: alpine/smime.c:1725
 msgid "Private keys transferred to container"
 msgstr ""
 
-#: alpine/smime.c:917
+#: alpine/smime.c:1736
 msgid "Private keys transferred to directory, delete Container config to use"
 msgstr ""
 
-#: alpine/smime.c:928
+#: alpine/smime.c:1747
 msgid "CA certs transferred to container"
 msgstr ""
 
-#: alpine/smime.c:939
+#: alpine/smime.c:1758
 msgid "CA certs transferred to directory, delete Container config to use"
 msgstr ""
 
-#: alpine/smime.c:951
+#: alpine/smime.c:1770
 msgid "Public certs transferred to keychain"
 msgstr ""
 
-#: alpine/smime.c:953 alpine/smime.c:964
+#: alpine/smime.c:1772 alpine/smime.c:1783
 msgid "Command not implemented yet"
 msgstr ""
 
-#: pico/osdep/mswin_spell.c:57 pico/osdep/spell.c:99
+#: pico/osdep/getkey.c:112
+msgid "Problem reading from keyboard!"
+msgstr ""
+
+#: pico/osdep/mswin_spell.c:58 pico/osdep/spell.c:99
 msgid "Checking spelling..."
 msgstr ""
 
-#: pico/osdep/mswin_spell.c:68
+#: pico/osdep/mswin_spell.c:66
+msgid "Speller Cancelled"
+msgstr ""
+
+#: pico/osdep/mswin_spell.c:77
 msgid "Spelling: initializing Aspell failed"
 msgstr ""
 
-#: pico/osdep/mswin_spell.c:109 pico/osdep/spell.c:258
+#: pico/osdep/mswin_spell.c:119 pico/osdep/spell.c:258
 msgid "Done checking spelling"
 msgstr ""
 
-#: pico/osdep/mswin_spell.c:292
+#: pico/osdep/mswin_spell.c:302
 msgid "Spelling: lptstr_to_ucs4() failed"
 msgstr ""
 
-#: pico/osdep/mswin_spell.c:531
+#: pico/osdep/mswin_spell.c:549
 msgid "Spelling: speller_check_word() failed"
 msgstr ""
 
+#: pico/osdep/filesys.c:302
+#, c-format
+msgid "File not found: \"%s\""
+msgstr ""
+
+#: pico/osdep/filesys.c:308
+#, c-format
+msgid "File name too long: \"%s\""
+msgstr ""
+
+#: pico/osdep/filesys.c:314
+#, c-format
+msgid "Error getting file info: \"%s\""
+msgstr ""
+
+#: pico/osdep/filesys.c:328 pico/browse.c:1038
+#, c-format
+msgid "Not a directory: \"%s\""
+msgstr ""
+
+#: pico/osdep/filesys.c:336
+#, c-format
+msgid "Can't malloc space for file names"
+msgstr ""
+
+#: pico/osdep/filesys.c:345
+#, c-format
+msgid "Can't open \"%s\": %s"
+msgstr ""
+
+#: pico/osdep/filesys.c:401
+#, c-format
+msgid "Can't malloc enough space for file names"
+msgstr ""
+
+#: pico/osdep/filesys.c:443
+#, c-format
+msgid "File \"%s\" not found"
+msgstr ""
+
+#: pico/osdep/filesys.c:446
+#, c-format
+msgid "End of file \"%s\" reached"
+msgstr ""
+
+#: pico/osdep/filesys.c:449
+#, c-format
+msgid "File name \"%s\" too long"
+msgstr ""
+
+#: pico/osdep/filesys.c:452
+#, c-format
+msgid "File \"%s\" is a directory"
+msgstr ""
+
+#: pico/osdep/filesys.c:455 pico/osdep/filesys.c:813
+#, c-format
+msgid "Write permission denied: %s"
+msgstr ""
+
+#: pico/osdep/filesys.c:458 pico/osdep/filesys.c:790
+#, c-format
+msgid "Read permission denied: %s"
+msgstr ""
+
+#: pico/osdep/filesys.c:461
+#, c-format
+msgid "Permission denied: %s"
+msgstr ""
+
+#: pico/osdep/filesys.c:464
+#, c-format
+msgid "Execute permission denied: %s"
+msgstr ""
+
+#: pico/osdep/filesys.c:467
+#, c-format
+msgid "File I/O error: %s"
+msgstr ""
+
+#: pico/osdep/filesys.c:796 pico/osdep/filesys.c:819
+#, c-format
+msgid "Can't copy: %s is a directory"
+msgstr ""
+
+#: pico/osdep/filesys.c:806
+#, c-format
+msgid "Can't Copy: %s"
+msgstr ""
+
+#: pico/osdep/filesys.c:824
+msgid "Identical files.  File not copied"
+msgstr ""
+
+#: pico/osdep/filesys.c:942
+#, c-format
+msgid "Error preparing to close file: %s"
+msgstr ""
+
+#: pico/osdep/filesys.c:948
+#, c-format
+msgid "Error closing file: %s"
+msgstr ""
+
 #. TRANSLATORS: Some help text. The ~ characters cause
 #. the characters they are in front of to be bold.
 #: pico/osdep/spell.c:50 pico/osdep/spell.c:68
@@ -9658,7 +10144,7 @@ msgstr ""
 
 #: pico/osdep/spell.c:145
 #, c-format
-msgid "\aSpell-checking file \"%s\" not found"
+msgid "Spell-checking file \"%s\" not found"
 msgstr ""
 
 #: pico/osdep/spell.c:152
@@ -9682,170 +10168,240 @@ msgstr ""
 msgid "Help with Spelling Checker"
 msgstr ""
 
+#: pico/osdep/altedit.c:292
+#, c-format
+msgid "Can't fork %%s: %s"
+msgstr ""
+
 #. TRANSLATORS: Read File is a prompt for the name of
 #. a file to be read into the composer.
-#: pico/attach.c:92 pico/display.c:68 pico/display.c:84
+#: pico/attach.c:93 pico/display.c:70 pico/display.c:86
 msgid "Read File"
 msgstr ""
 
-#: pico/attach.c:92
+#: pico/attach.c:93
 msgid "RcvUpload"
 msgstr ""
 
-#: pico/attach.c:98
+#: pico/attach.c:99
 msgid "Name to give uploaded attachment: "
 msgstr ""
 
 #. TRANSLATORS: User is being asked for the name
 #. of the file they want to attach to a message.
-#: pico/attach.c:101
+#: pico/attach.c:102
 msgid "File to attach: "
 msgstr ""
 
 #. TRANSLATORS: This is a prompt for a comment about the file
 #. they have attached.
-#: pico/attach.c:107
+#: pico/attach.c:108
 msgid "Attachment comment: "
 msgstr ""
 
-#: pico/attach.c:115
+#: pico/attach.c:116
 msgid "Attach Help"
 msgstr ""
 
-#: pico/attach.c:320 pico/attach.c:330 pico/attach.c:885 pico/attach.c:903
+#: pico/attach.c:222 pico/attach.c:346 pico/browse.c:1588 pico/browse.c:2029
+#: pico/composer.c:811 pico/composer.c:1296
+msgid "Can't malloc space for filename"
+msgstr ""
+
+#: pico/attach.c:260
+msgid "File name too BIG, cannot select!"
+msgstr ""
+
+#: pico/attach.c:271
+msgid "File name too big, cannot select!"
+msgstr ""
+
+#: pico/attach.c:321 pico/attach.c:331 pico/attach.c:886 pico/attach.c:904
 msgid "home directory"
 msgstr ""
 
 #. TRANSLATORS: the %s is replaced with the name of a directory
-#: pico/attach.c:323
+#: pico/attach.c:324
 #, c-format
 msgid "Restricted mode allows attachments from %s only: too many ..'s"
 msgstr ""
 
-#: pico/attach.c:332
+#: pico/attach.c:333
 #, c-format
-msgid "\aRestricted mode allows attachments from %s only"
+msgid "Restricted mode allows attachments from %s only"
+msgstr ""
+
+#: pico/attach.c:386 pico/file.c:308
+msgid "Restricted mode disallows uploaded command"
 msgstr ""
 
-#: pico/attach.c:405
+#: pico/attach.c:406
 msgid "Attach cancelled"
 msgstr ""
 
-#: pico/attach.c:850 pico/attach.c:1052
+#: pico/attach.c:455
+#, c-format
+msgid "Can't allocate space for %s known attachment array entries"
+msgstr ""
+
+#: pico/attach.c:478
 #, c-format
-msgid "\aAttchmnt: '%s' not allowed in file name"
+msgid "Can't allocate space for %s build array entries"
 msgstr ""
 
-#: pico/attach.c:887
+#: pico/attach.c:491
+#, c-format
+msgid "Can't resize build array to %s entries"
+msgstr ""
+
+#: pico/attach.c:539
+msgid "Can't realloc filename space"
+msgstr ""
+
+#: pico/attach.c:553
+msgid "Can't realloc space for size"
+msgstr ""
+
+#: pico/attach.c:568
+msgid "Can't realloc description"
+msgstr ""
+
+#: pico/attach.c:851 pico/attach.c:1053
+#, c-format
+msgid "Attchmnt: '%s' not allowed in file name"
+msgstr ""
+
+#: pico/attach.c:888
 #, c-format
 msgid "Attachments allowed only from %s: too many ..'s"
 msgstr ""
 
-#: pico/attach.c:904
+#: pico/attach.c:905
 #, c-format
-msgid "\aAttachments allowed only from %s"
+msgid "Attachments allowed only from %s"
+msgstr ""
+
+#: pico/attach.c:951
+msgid "Attchmnt: Problem displaying real file path"
 msgstr ""
 
-#: pico/attach.c:974
+#: pico/attach.c:975
 #, c-format
-msgid "\aAttchmnt: Expected ']' after \"%s\""
+msgid "Attchmnt: Expected ']' after \"%s\""
 msgstr ""
 
-#: pico/attach.c:1095
+#: pico/attach.c:1004
 #, c-format
-msgid "\aAttchmnt: Expected '(' or '\"' after %s"
+msgid "Attchmnt: Unknown reference: %s"
 msgstr ""
 
-#: pico/attach.c:1154
+#: pico/attach.c:1096
 #, c-format
-msgid "\aAttchmnt: Size field missing ')': \"%s\""
+msgid "Attchmnt: Expected '(' or '\"' after %s"
 msgstr ""
 
-#: pico/attach.c:1173
-msgid "\aAttchmnt: Malformed comment, quotes required"
+#: pico/attach.c:1155
+#, c-format
+msgid "Attchmnt: Size field missing ')': \"%s\""
+msgstr ""
+
+#: pico/attach.c:1174
+msgid "Attchmnt: Malformed comment, quotes required"
+msgstr ""
+
+#: pico/attach.c:1196
+msgid "Attchmnt: Closing quote required at end of comment"
+msgstr ""
+
+#: pico/attach.c:1240
+msgid "Attchmnt: Comma must separate attachments"
 msgstr ""
 
-#: pico/attach.c:1195
-msgid "\aAttchmnt: Closing quote required at end of comment"
+#: pico/attach.c:1247
+msgid "Attchmnt: Weirdness in ParseAttach"
 msgstr ""
 
-#: pico/attach.c:1239
-msgid "\aAttchmnt: Comma must separate attachments"
+#: pico/attach.c:1500
+msgid "No end of line???"
 msgstr ""
 
 #. TRANSLATORS: command key labels, Send means send the message
 #. we are currently working on.
-#: pico/display.c:67 pico/display.c:83 pico/display.c:1623 pico/browse.c:113
-#: pico/composer.c:132
+#: pico/display.c:69 pico/display.c:85 pico/display.c:1652 pico/display.c:2072
+#: pico/browse.c:114 pico/composer.c:132
 msgid "Get Help"
 msgstr ""
 
-#: pico/display.c:67
+#: pico/display.c:69
 msgid "WriteOut"
 msgstr ""
 
 #. TRANSLATORS: Previous Page
-#: pico/display.c:68 pico/display.c:84 pico/browse.c:114 pico/bind.c:246
+#: pico/display.c:70 pico/display.c:86 pico/browse.c:115 pico/bind.c:246
 msgid "Prev Pg"
 msgstr ""
 
-#: pico/display.c:69 pico/display.c:85
+#: pico/display.c:71 pico/display.c:87
 msgid "Cut Text"
 msgstr ""
 
-#: pico/display.c:69
+#: pico/display.c:71
 msgid "Cur Pos"
 msgstr ""
 
-#: pico/display.c:70 pico/display.c:87
+#: pico/display.c:72 pico/display.c:89
 msgid "Justify"
 msgstr ""
 
-#: pico/display.c:71 pico/display.c:1124 pico/browse.c:117
+#: pico/display.c:73 pico/display.c:1374 pico/browse.c:118
 msgid "Where is"
 msgstr ""
 
 #. TRANSLATORS: Next Page, a command key label
-#: pico/display.c:71 pico/display.c:88 pico/browse.c:117 pico/bind.c:238
+#: pico/display.c:73 pico/display.c:90 pico/browse.c:118 pico/bind.c:238
 msgid "Next Pg"
 msgstr ""
 
-#: pico/display.c:74 pico/display.c:91
+#: pico/display.c:76 pico/display.c:93
 msgid "To Spell"
 msgstr ""
 
-#: pico/display.c:76 pico/display.c:93 pico/composer.c:140
+#: pico/display.c:78 pico/display.c:95 pico/composer.c:140
 msgid "Del Char"
 msgstr ""
 
-#: pico/display.c:85 pico/display.c:1121 pico/composer.c:138
-#: pico/composer.c:4426
+#: pico/display.c:87 pico/display.c:1371 pico/composer.c:138
+#: pico/composer.c:4444
 msgid "Postpone"
 msgstr ""
 
 #. TRANSLATORS: UnJustify means undo the previous
 #. Justify command.
-#: pico/display.c:793 pico/display.c:1127
+#: pico/display.c:879 pico/display.c:1377
 msgid "UnJustify"
 msgstr ""
 
-#: pico/display.c:795 pico/display.c:808
+#: pico/display.c:881 pico/display.c:894
 msgid "Can now UnJustify!"
 msgstr ""
 
-#: pico/display.c:800 pico/display.c:1128
+#: pico/display.c:886 pico/display.c:1378
 msgid "UnCut Text"
 msgstr ""
 
-#: pico/display.c:1117 pico/composer.c:132 pico/composer.c:4389
+#: pico/display.c:1367 pico/composer.c:132 pico/composer.c:4407
 msgid "Send"
 msgstr ""
 
-#: pico/display.c:1123
+#: pico/display.c:1373
 msgid "Alt Edit"
 msgstr ""
 
-#: pico/display.c:1397 pico/display.c:1744 pico/word.c:683
+#: pico/display.c:1613
+msgid "Choose Dictionary: "
+msgstr ""
+
+#: pico/display.c:1842 pico/display.c:2189 pico/word.c:683
 msgid "ABORT"
 msgstr ""
 
@@ -9861,48 +10417,44 @@ msgstr ""
 msgid "Xterm mouse tracking still off ($DISPLAY variable set?)"
 msgstr ""
 
-#: pico/pico.c:342
+#: pico/pico.c:378
 msgid "Please make the screen bigger."
 msgstr ""
 
 #. TRANSLATORS: The user typed the Cancel command and was
 #. asked to confirm that. Instead they canceled the cancel
 #. command.
-#: pico/pico.c:653
+#: pico/pico.c:689 pico/pico.c:708
 msgid "Cancel Cancelled"
 msgstr ""
 
-#: pico/pico.c:662
+#: pico/pico.c:698
 msgid "Cancel message (answering \"Yes\" will abandon your mail message)"
 msgstr ""
 
-#: pico/pico.c:664
+#: pico/pico.c:700
 msgid "Cancel Edit (and abandon changes)"
 msgstr ""
 
-#: pico/pico.c:665
+#: pico/pico.c:701
 msgid "Cancel Edit"
 msgstr ""
 
-#: pico/pico.c:672
-msgid "\aCancel Cancelled"
-msgstr ""
-
-#: pico/pico.c:713
-msgid "\aProblem with attachments!  Fix errors or delete attachments."
+#: pico/pico.c:749
+msgid "Problem with attachments!  Fix errors or delete attachments."
 msgstr ""
 
 #. TRANSLATORS: buffer is the in-memory copy of a file
-#: pico/pico.c:762
+#: pico/pico.c:798
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES)"
 msgstr ""
 
-#: pico/pico.c:1916
+#: pico/pico.c:1962
 #, c-format
 msgid "Attached dropped file \"%s\""
 msgstr ""
 
-#: pico/pico.c:1918
+#: pico/pico.c:1964
 #, c-format
 msgid "Inserted dropped file \"%s\""
 msgstr ""
@@ -9913,663 +10465,756 @@ msgstr ""
 msgid "can't create '%s'\n"
 msgstr ""
 
-#: pico/browse.c:115
+#: pico/browse.c:116
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: The next several lines go together. The ~ characters
 #. should be left in front of the characters they cause to be bold.
-#: pico/browse.c:173
+#: pico/browse.c:174
 msgid "Help for Browse Command"
 msgstr ""
 
-#: pico/browse.c:175
+#: pico/browse.c:176
 msgid "        Pico's file browser is used to select a file from the"
 msgstr ""
 
-#: pico/browse.c:176
+#: pico/browse.c:177
 msgid "        file system for inclusion in the edited text."
 msgstr ""
 
-#: pico/browse.c:178
+#: pico/browse.c:179
 msgid "~        Both directories and files are displayed.  Press ~S"
 msgstr ""
 
-#: pico/browse.c:179
+#: pico/browse.c:180
 msgid "~        or ~R~e~t~u~r~n to select a file or directory.  When a file"
 msgstr ""
 
-#: pico/browse.c:180
+#: pico/browse.c:181
 msgid "        is selected during the \"Read File\" command, it is"
 msgstr ""
 
-#: pico/browse.c:181
+#: pico/browse.c:182
 msgid "        inserted into edited text.  Answering \"yes\" to the"
 msgstr ""
 
-#: pico/browse.c:182
+#: pico/browse.c:183
 msgid "        verification question after a directory is selected causes"
 msgstr ""
 
-#: pico/browse.c:183
+#: pico/browse.c:184
 msgid "        the contents of that directory to be displayed for selection."
 msgstr ""
 
-#: pico/browse.c:185
+#: pico/browse.c:186
 msgid "        The file named \"..\" is special, and means the \"parent\""
 msgstr ""
 
-#: pico/browse.c:186
+#: pico/browse.c:187
 msgid "        of the directory being displayed.  Select this directory"
 msgstr ""
 
-#: pico/browse.c:187
+#: pico/browse.c:188
 msgid "        to move upward in the directory tree."
 msgstr ""
 
-#: pico/browse.c:189
+#: pico/browse.c:190
 msgid "End of Browser Help."
 msgstr ""
 
 #. TRANSLATORS: Some more help text
-#: pico/browse.c:199
+#: pico/browse.c:200
 msgid "Help for Pilot (PIne's Looker-upper Of Things"
 msgstr ""
 
-#: pico/browse.c:201
+#: pico/browse.c:202
 msgid ""
 "        Pilot is a simple, display-oriented file system browser based on the"
 msgstr ""
 
-#: pico/browse.c:202
+#: pico/browse.c:203
 msgid ""
 "~        Alpine message system composer.  As with Alpine, commands are "
 "displayed at"
 msgstr ""
 
-#: pico/browse.c:203
+#: pico/browse.c:204
 msgid ""
 "~        the bottom of the screen, and context-sensitive help is provided."
 msgstr ""
 
-#: pico/browse.c:205
+#: pico/browse.c:206
 msgid ""
 "~        Pilot displays the current working directory at the top of the "
 "screen."
 msgstr ""
 
-#: pico/browse.c:206
+#: pico/browse.c:207
 msgid ""
 "~        The directory's contents are displayed in columns of file name, file"
 msgstr ""
 
-#: pico/browse.c:207
+#: pico/browse.c:208
 msgid ""
 "~        size pairs.  Names that are directories are indicated by the name"
 msgstr ""
 
-#: pico/browse.c:208
+#: pico/browse.c:209
 msgid ""
 "~        ~(~d~i~r~) in place of the file size.  The parent of the current "
 "working"
 msgstr ""
 
-#: pico/browse.c:209
+#: pico/browse.c:210
 msgid ""
-"~        directory is indicated by the file name ~.~. and size of ~"
-"(~p~a~r~e~n~t~ ~d~i~r~)."
+"~        directory is indicated by the file name ~.~. and size of "
+"~(~p~a~r~e~n~t~ ~d~i~r~)."
 msgstr ""
 
-#: pico/browse.c:210
+#: pico/browse.c:211
 msgid ""
 "~        File names that are symbolic links to other files are displayed "
 "with a"
 msgstr ""
 
-#: pico/browse.c:211
+#: pico/browse.c:212
 msgid "~        file size of ~-~-."
 msgstr ""
 
-#: pico/browse.c:213
+#: pico/browse.c:214
 msgid "        The following function keys are available in Pilot:"
 msgstr ""
 
-#: pico/browse.c:215
+#: pico/browse.c:216
 msgid "~        ~?        Display this help text."
 msgstr ""
 
-#: pico/browse.c:216
+#: pico/browse.c:217
 msgid "~        ~Q        Quit Pilot."
 msgstr ""
 
-#: pico/browse.c:218
+#: pico/browse.c:219
 msgid ""
 "~        ~V        View the currently selected file or open the selected "
 "directory."
 msgstr ""
 
-#: pico/browse.c:219
+#: pico/browse.c:220
 msgid ""
 "~                Note: Pilot invokes ~p~i~n~e ~-~F, or the program defined "
 "by the ~P~A~G~E~R"
 msgstr ""
 
-#: pico/browse.c:220
+#: pico/browse.c:221
 msgid "~                      environment variable, to view the file."
 msgstr ""
 
-#: pico/browse.c:221
+#: pico/browse.c:222
 msgid "~        ~L        Launch an external application program."
 msgstr ""
 
-#: pico/browse.c:223
+#: pico/browse.c:224
 msgid "~        ~W        Search for a file by name."
 msgstr ""
 
-#: pico/browse.c:224
+#: pico/browse.c:225
 msgid "~        ~-        Scroll up one page."
 msgstr ""
 
-#: pico/browse.c:225
+#: pico/browse.c:226
 msgid "~        ~S~p~a~c~e        Scroll down one page."
 msgstr ""
 
-#: pico/browse.c:226
+#: pico/browse.c:227
 msgid "~        ~N,~^~F        Move forward (right) one column."
 msgstr ""
 
-#: pico/browse.c:227
+#: pico/browse.c:228
 msgid "~        ~P,~^~B        Move back (left) one column."
 msgstr ""
 
-#: pico/browse.c:228
+#: pico/browse.c:229
 msgid "~        ~^~N        Move down one row."
 msgstr ""
 
-#: pico/browse.c:229
+#: pico/browse.c:230
 msgid "~        ~^~P        Move up one row."
 msgstr ""
 
-#: pico/browse.c:231
+#: pico/browse.c:232
 msgid "~        ~D        Delete the selected file."
 msgstr ""
 
-#: pico/browse.c:232
+#: pico/browse.c:233
 msgid "~        ~R        Rename the selected file or directory."
 msgstr ""
 
-#: pico/browse.c:233
+#: pico/browse.c:234
 msgid "~        ~C        Copy the selected file."
 msgstr ""
 
-#: pico/browse.c:234
+#: pico/browse.c:235
 msgid "~        ~E        Edit the selected file."
 msgstr ""
 
-#: pico/browse.c:235
+#: pico/browse.c:236
 msgid ""
 "~                Note: Pilot invokes ~p~i~c~o, or the program defined by the "
 "~E~D~I~T~O~R"
 msgstr ""
 
-#: pico/browse.c:236
+#: pico/browse.c:237
 msgid "~                      environment variable, to edit the file."
 msgstr ""
 
-#: pico/browse.c:238
+#: pico/browse.c:239
 msgid "End of Pilot Help."
 msgstr ""
 
-#: pico/browse.c:331
+#: pico/browse.c:334
 #, c-format
-msgid "\aCan't read outside of %s in restricted mode"
+msgid "Can't read outside of %s in restricted mode"
 msgstr ""
 
-#: pico/browse.c:435 pico/main.c:416
+#: pico/browse.c:438 pico/main.c:458
 msgid "You may possibly have new mail."
 msgstr ""
 
-#: pico/browse.c:711
+#: pico/browse.c:714
 msgid "Can't edit non-text file.  Try Launch."
 msgstr ""
 
-#: pico/browse.c:748
-msgid "\aType L command to use ListMode"
+#: pico/browse.c:751
+msgid "Type L command to use ListMode"
 msgstr ""
 
-#: pico/browse.c:756
-msgid "\aCan't Set directories"
+#: pico/browse.c:759
+msgid "Can't Set directories"
 msgstr ""
 
-#: pico/browse.c:777
-msgid "\aAlready in ListMode"
+#: pico/browse.c:780
+msgid "Already in ListMode"
 msgstr ""
 
-#: pico/browse.c:802
+#: pico/browse.c:805
 msgid "Add Name"
 msgstr ""
 
-#: pico/browse.c:806
+#: pico/browse.c:817
 msgid "Command to execute: "
 msgstr ""
 
-#: pico/browse.c:810 pico/browse.c:973 pico/browse.c:1055 pico/browse.c:1180
-#: pico/browse.c:1308 pico/browse.c:1601
-msgid "\aNo help yet!"
+#: pico/browse.c:821 pico/browse.c:987 pico/browse.c:1077 pico/browse.c:1216
+#: pico/browse.c:1344 pico/browse.c:1637
+msgid "No help yet!"
 msgstr ""
 
-#: pico/browse.c:822
+#: pico/browse.c:833
 msgid "Command cancelled"
 msgstr ""
 
-#: pico/browse.c:830
+#: pico/browse.c:841
 msgid "No command specified"
 msgstr ""
 
-#: pico/browse.c:849
-msgid "\aCan't delete a directory"
+#: pico/browse.c:860
+msgid "Can't delete a directory"
 msgstr ""
 
-#: pico/browse.c:854
+#: pico/browse.c:865
 msgid "Delete not allowed in restricted mode"
 msgstr ""
 
-#: pico/browse.c:865
+#: pico/browse.c:876
 msgid "File is write protected! OVERRIDE"
 msgstr ""
 
 #. TRANSLATORS: This is a question, Delete file <filename>
-#: pico/browse.c:870
+#: pico/browse.c:881
 #, c-format
 msgid "Delete file \"%.*s\""
 msgstr ""
 
-#: pico/browse.c:873
+#: pico/browse.c:884
 msgid "File CANNOT be UNdeleted!  Really delete"
 msgstr ""
 
-#: pico/browse.c:879
+#: pico/browse.c:890
 msgid "Delete Cancelled"
 msgstr ""
 
-#: pico/browse.c:880
+#: pico/browse.c:891
 msgid "File Not Deleted"
 msgstr ""
 
-#: pico/browse.c:889
+#: pico/browse.c:900
 #, c-format
 msgid "Delete Failed: %s"
 msgstr ""
 
-#: pico/browse.c:939 pico/browse.c:948
+#: pico/browse.c:953 pico/browse.c:962
 msgid "Help for Browsing"
 msgstr ""
 
-#: pico/browse.c:946
+#: pico/browse.c:960
 msgid "Browser Help"
 msgstr ""
 
 #. TRANSLATORS: A prompt asking for a directory to
 #. move into
-#: pico/browse.c:968
+#: pico/browse.c:982
 msgid "Directory to go to: "
 msgstr ""
 
-#: pico/browse.c:981
+#: pico/browse.c:995
 msgid "Goto cancelled"
 msgstr ""
 
-#: pico/browse.c:995
+#: pico/browse.c:1009
 #, c-format
 msgid "Invalid Directory: %s"
 msgstr ""
 
-#: pico/browse.c:1000
+#: pico/browse.c:1014
 msgid "Restricted mode browsing limited to home directory"
 msgstr ""
 
-#: pico/browse.c:1006
+#: pico/browse.c:1020
 #, c-format
-msgid "\a Can't go outside of %s in restricted mode"
+msgid "Can't go outside of %s in restricted mode"
 msgstr ""
 
-#: pico/browse.c:1024
-#, c-format
-msgid "\aNot a directory: \"%s\""
+#: pico/browse.c:1052
+msgid "Add not allowed in restricted mode"
 msgstr ""
 
-#: pico/browse.c:1038
-msgid "Add not allowed in restricted mode"
+#: pico/browse.c:1071
+msgid "Add File"
 msgstr ""
 
-#: pico/browse.c:1052
+#: pico/browse.c:1074
 msgid "Name of file to add: "
 msgstr ""
 
-#: pico/browse.c:1063
+#: pico/browse.c:1074
+msgid "Name of directory to add: "
+msgstr ""
+
+#: pico/browse.c:1088
 msgid "Add File Cancelled"
 msgstr ""
 
-#: pico/browse.c:1078
+#: pico/browse.c:1088
+msgid "Add Directory Cancelled"
+msgstr ""
+
+#: pico/browse.c:1103
 msgid "No file named.  Add Cancelled."
 msgstr ""
 
-#: pico/browse.c:1083 pico/browse.c:1209 pico/browse.c:1329
+#: pico/browse.c:1103
+msgid "No directory named. Add Cancelled"
+msgstr ""
+
+#: pico/browse.c:1108 pico/browse.c:1245 pico/browse.c:1365
 msgid "Too many ..'s in name"
 msgstr ""
 
-#: pico/browse.c:1089
+#: pico/browse.c:1114
+#, c-format
+msgid "Restricted mode allows Add in %s only"
+msgstr ""
+
+#: pico/browse.c:1120
 #, c-format
-msgid "\aRestricted mode allows Add in %s only"
+msgid "%s \"%.*s\" already exists!"
 msgstr ""
 
-#: pico/browse.c:1095
+#: pico/browse.c:1133
 #, c-format
-msgid "File \"%.*s\" already exists!"
+msgid "Error adding Directory \"%s\""
 msgstr ""
 
-#: pico/browse.c:1112
+#: pico/browse.c:1145
 #, c-format
 msgid "Added File \"%s\""
 msgstr ""
 
-#: pico/browse.c:1115 pico/browse.c:1249 pico/browse.c:1364
+#: pico/browse.c:1151 pico/browse.c:1285 pico/browse.c:1400
 msgid "Problems refiguring browser"
 msgstr ""
 
-#: pico/browse.c:1163
-msgid "\aCan't copy a directory"
+#: pico/browse.c:1199
+msgid "Can't copy a directory"
 msgstr ""
 
-#: pico/browse.c:1168
+#: pico/browse.c:1204
 msgid "Copy not allowed in restricted mode"
 msgstr ""
 
-#: pico/browse.c:1177
+#: pico/browse.c:1213
 msgid "Name of new copy: "
 msgstr ""
 
-#: pico/browse.c:1188
+#: pico/browse.c:1224
 msgid "Make Copy Cancelled"
 msgstr ""
 
-#: pico/browse.c:1199
+#: pico/browse.c:1235
 msgid "No destination, file not copied"
 msgstr ""
 
-#: pico/browse.c:1204
-msgid "\aCan't copy file on to itself!"
+#: pico/browse.c:1240
+msgid "Can't copy file on to itself!"
 msgstr ""
 
-#: pico/browse.c:1215
+#: pico/browse.c:1251
 #, c-format
-msgid "\aRestricted mode allows Copy in %s only"
+msgid "Restricted mode allows Copy in %s only"
 msgstr ""
 
 #. TRANSLATORS: A question: File <filename> exists! Replace?
-#: pico/browse.c:1222 pico/browse.c:1343
+#: pico/browse.c:1258 pico/browse.c:1379
 #, c-format
 msgid "File \"%.*s\" exists! OVERWRITE"
 msgstr ""
 
-#: pico/browse.c:1226
+#: pico/browse.c:1262
 msgid "Make copy cancelled"
 msgstr ""
 
-#: pico/browse.c:1227
+#: pico/browse.c:1263
 msgid "File Not Renamed"
 msgstr ""
 
-#: pico/browse.c:1246
+#: pico/browse.c:1282
 #, c-format
 msgid "File copied to %s"
 msgstr ""
 
-#: pico/browse.c:1291
-msgid "\aCan't rename \"..\""
+#: pico/browse.c:1327
+msgid "Can't rename \"..\""
 msgstr ""
 
-#: pico/browse.c:1296
+#: pico/browse.c:1332
 msgid "Rename not allowed in restricted mode"
 msgstr ""
 
-#: pico/browse.c:1305
+#: pico/browse.c:1341
 msgid "Rename file to: "
 msgstr ""
 
-#: pico/browse.c:1316 pico/browse.c:1348
+#: pico/browse.c:1352 pico/browse.c:1384
 msgid "Rename cancelled"
 msgstr ""
 
-#: pico/browse.c:1335
+#: pico/browse.c:1371
 #, c-format
-msgid "\aRestricted mode allows Rename in %s only"
+msgid "Restricted mode allows Rename in %s only"
 msgstr ""
 
-#: pico/browse.c:1349
+#: pico/browse.c:1385
 msgid "Not Renamed"
 msgstr ""
 
-#: pico/browse.c:1360
+#: pico/browse.c:1396
 #, c-format
 msgid "Rename Failed: %s"
 msgstr ""
 
-#: pico/browse.c:1422
+#: pico/browse.c:1458
 #, c-format
-msgid "\aCan't visit %s in restricted mode"
+msgid "Can't visit %s in restricted mode"
 msgstr ""
 
-#: pico/browse.c:1449
-msgid "\aCan't move up a directory"
+#: pico/browse.c:1485
+msgid "Can't move up a directory"
 msgstr ""
 
-#: pico/browse.c:1497
+#: pico/browse.c:1533
 #, c-format
-msgid "\aProblem finding dir \"%s\""
+msgid "Problem finding dir \"%s\""
 msgstr ""
 
-#: pico/browse.c:1538
+#: pico/browse.c:1574
 msgid "No files are selected, use \"X\" to mark files for selection"
 msgstr ""
 
-#: pico/browse.c:1599
+#: pico/browse.c:1635
 msgid "File name to find"
 msgstr ""
 
-#: pico/browse.c:1632
+#: pico/browse.c:1677
 msgid "Searched to end of directory"
 msgstr ""
 
-#: pico/browse.c:1635
+#: pico/browse.c:1680
 msgid "Searched to start of directory"
 msgstr ""
 
-#: pico/browse.c:1654
+#: pico/browse.c:1699
 msgid "Whereis cancelled"
 msgstr ""
 
-#: pico/browse.c:1685 pico/search.c:299
+#: pico/browse.c:1730 pico/search.c:433
 #, c-format
 msgid "\"%s\" not found"
 msgstr ""
 
+#: pico/browse.c:1796
+msgid "Can't malloc space for master filename cell"
+msgstr ""
+
+#: pico/browse.c:1845
+msgid "Can't malloc space for name array"
+msgstr ""
+
+#: pico/browse.c:1900
+msgid "Can't malloc cells for browser!"
+msgstr ""
+
+#: pico/browse.c:1931
+msgid "Can't malloc cells for temp buffer!"
+msgstr ""
+
 #. TRANSLATORS: Brwsr is an abbreviation for Browser, which is
 #. a command used to look through something
-#: pico/browse.c:2191
+#: pico/browse.c:2237
 msgid "Quit"
 msgstr ""
 
-#: pico/browse.c:2191
+#: pico/browse.c:2237
 msgid "Exit Brwsr"
 msgstr ""
 
-#: pico/browse.c:2193
+#: pico/browse.c:2239
 msgid "Goto"
 msgstr ""
 
-#: pico/browse.c:2196
+#: pico/browse.c:2242
 msgid "Launch"
 msgstr ""
 
-#: pico/browse.c:2854
+#: pico/browse.c:2380
+msgid "Internal error: can't find fname cell"
+msgstr ""
+
+#: pico/browse.c:2900
 msgid "Can't display non-text file.  Try \"Launch\"."
 msgstr ""
 
-#: pico/browse.c:2861
+#: pico/browse.c:2907
 #, c-format
 msgid "Can't read file: %s"
 msgstr ""
 
-#: pico/browse.c:2868
+#: pico/browse.c:2914
 #, c-format
 msgid "Can't open file: %s"
 msgstr ""
 
+#: pico/search.c:66
+msgid "FirstLine"
+msgstr ""
+
+#: pico/search.c:67
+msgid "LastLine"
+msgstr ""
+
+#: pico/search.c:68 pico/search.c:85 pico/search.c:811 pico/search.c:824
+msgid "No Replace"
+msgstr ""
+
+#: pico/search.c:69
+msgid "Optns Menu"
+msgstr ""
+
+#: pico/search.c:70
+msgid "LineNumber"
+msgstr ""
+
+#: pico/search.c:71
+msgid "Start of Para"
+msgstr ""
+
+#: pico/search.c:72
+msgid "End of Para"
+msgstr ""
+
+#: pico/search.c:73
+msgid "FullJustify"
+msgstr ""
+
+#: pico/search.c:83
+msgid "Orig Menu"
+msgstr ""
+
+#: pico/search.c:84 pico/search.c:821 pico/search.c:1022
+msgid "Exact"
+msgstr ""
+
+#: pico/search.c:86 pico/search.c:833 pico/search.c:1030
+msgid "Bgn Line"
+msgstr ""
+
+#: pico/search.c:87 pico/search.c:837 pico/search.c:1034
+msgid "End Line"
+msgstr ""
+
+#: pico/search.c:88
+msgid "BackSearch"
+msgstr ""
+
 #. TRANSLATORS: Some help text that goes together in a group.
-#: pico/search.c:65
+#: pico/search.c:111
 msgid "Help for Search Command"
 msgstr ""
 
-#: pico/search.c:67
+#: pico/search.c:113
 msgid "        Enter the words or characters you would like to search"
 msgstr ""
 
-#: pico/search.c:68
+#: pico/search.c:114
 msgid "~        for, then press ~R~e~t~u~r~n.  The search then takes place."
 msgstr ""
 
-#: pico/search.c:69
+#: pico/search.c:115
 msgid "        When the characters or words that you entered "
 msgstr ""
 
-#: pico/search.c:70
+#: pico/search.c:116
 msgid "        are found, the buffer will be redisplayed with the cursor "
 msgstr ""
 
-#: pico/search.c:71
+#: pico/search.c:117
 msgid "        at the beginning of the selected text."
 msgstr ""
 
-#: pico/search.c:73
+#: pico/search.c:119
 msgid "        The most recent string for which a search was made is"
 msgstr ""
 
-#: pico/search.c:74
+#: pico/search.c:120
 msgid "        displayed in the \"Search\" prompt between the square"
 msgstr ""
 
-#: pico/search.c:75
+#: pico/search.c:121
 msgid "        brackets.  This string is the default search prompt."
 msgstr ""
 
-#: pico/search.c:76
+#: pico/search.c:122
 msgid "~        Hitting only ~R~e~t~u~r~n or at the prompt will cause the"
 msgstr ""
 
-#: pico/search.c:77
+#: pico/search.c:123
 msgid "        search to be made with the default value."
 msgstr ""
 
-#: pico/search.c:79
+#: pico/search.c:125
 msgid "        The text search is not case sensitive, and will examine the"
 msgstr ""
 
-#: pico/search.c:80
+#: pico/search.c:126
 msgid "        entire message."
 msgstr ""
 
-#: pico/search.c:82
+#: pico/search.c:128
 msgid "        Should the search fail, a message will be displayed."
 msgstr ""
 
-#: pico/search.c:84
+#: pico/search.c:130
 msgid "End of Search Help."
 msgstr ""
 
-#: pico/search.c:147 pico/search.c:154 pico/search.c:438 pico/search.c:445
+#: pico/search.c:206 pico/search.c:213 pico/search.c:606 pico/search.c:613
 msgid "Help for Searching"
 msgstr ""
 
-#: pico/search.c:172
+#: pico/search.c:299
 msgid "Search to Line Number : "
 msgstr ""
 
-#: pico/search.c:174
+#: pico/search.c:301
 msgid "Search to Line Number Cancelled"
 msgstr ""
 
-#: pico/search.c:178
+#: pico/search.c:305
 msgid "Line number must be greater than zero"
 msgstr ""
 
-#: pico/search.c:182
+#: pico/search.c:309
 msgid "Line number must contain only digits"
 msgstr ""
 
-#: pico/search.c:241
+#: pico/search.c:373
 msgid "Search Cancelled"
 msgstr ""
 
 #. TRANSLATORS: abbreviation for Replace All occurences
-#: pico/search.c:341 pico/search.c:456
+#: pico/search.c:487 pico/search.c:624
 msgid "Repl All"
 msgstr ""
 
 #. TRANSLATORS: Replace just one occurence
-#: pico/search.c:461
+#: pico/search.c:629
 msgid "Repl One"
 msgstr ""
 
-#: pico/search.c:468
+#: pico/search.c:636
 msgid "Replacement Cancelled"
 msgstr ""
 
-#: pico/search.c:583
+#: pico/search.c:773
 #, c-format
 msgid "No more matches for \"%s\""
 msgstr ""
 
-#: pico/search.c:587
+#: pico/search.c:777
 msgid "No more matches"
 msgstr ""
 
-#: pico/search.c:606 pico/search.c:775
-msgid "FirstLine"
+#: pico/search.c:820 pico/search.c:1021
+msgid "No Exact"
 msgstr ""
 
-#: pico/search.c:611 pico/search.c:780
-msgid "LastLine"
+#: pico/search.c:828 pico/search.c:1025
+msgid "Srch Fwd"
 msgstr ""
 
-#: pico/search.c:616
-msgid "No Replace"
+#: pico/search.c:829 pico/search.c:1026
+msgid "Srch Back"
 msgstr ""
 
-#: pico/search.c:622 pico/search.c:786
-msgid "LineNumber"
+#: pico/search.c:832 pico/search.c:836 pico/search.c:1029 pico/search.c:1033
+msgid "Anywhere"
 msgstr ""
 
-#. TRANSLATORS: Start of paragraph
-#: pico/search.c:628 pico/search.c:791
-msgid "Start of Para"
+#: pico/search.c:851 pico/search.c:1049
+msgid " backward"
 msgstr ""
 
-#: pico/search.c:633 pico/search.c:796
-msgid "End of Para"
+#: pico/search.c:857 pico/search.c:1055
+msgid " at start of line"
 msgstr ""
 
-#. TRANSLATORS: Instead of justifying (formatting) just a
-#. single paragraph, Full Justify justifies the entire
-#. message.
-#: pico/search.c:641 pico/search.c:801
-msgid "FullJustify"
+#: pico/search.c:862 pico/search.c:1060
+msgid " at end of line"
+msgstr ""
+
+#: pico/search.c:868 pico/search.c:1066
+msgid " exactly for"
 msgstr ""
 
-#: pico/search.c:729
+#: pico/search.c:950
 msgid "No Line Number"
 msgstr ""
 
+#: pico/fileio.c:76
+#, c-format
+msgid "Write error: %s"
+msgstr ""
+
 #. TRANSLATORS: A question asking whether to forget about
 #. the changes and revert to the unchanged version.
 #: pico/buffer.c:155
@@ -10811,7 +11456,7 @@ msgstr ""
 msgid "No file name entered"
 msgstr ""
 
-#: pico/file.c:66 pico/main.c:327
+#: pico/file.c:66 pico/main.c:366
 #, c-format
 msgid "Can't read file from outside of %s"
 msgstr ""
@@ -10866,304 +11511,422 @@ msgstr ""
 #. that inserts a file into a message being composed.
 #. InsertMsg means Insert Message and it inserts a different
 #. message into the message being composed.
-#: pico/file.c:142
+#: pico/file.c:143
 msgid "InsertFile"
 msgstr ""
 
-#: pico/file.c:142
+#: pico/file.c:143
 msgid "InsertMsg"
 msgstr ""
 
-#: pico/file.c:179
+#: pico/file.c:180
 #, c-format
 msgid "Message %s included"
 msgstr ""
 
-#: pico/file.c:185
+#: pico/file.c:186
 msgid "Can't insert file in restricted mode"
 msgstr ""
 
-#: pico/file.c:192
+#: pico/file.c:193
 #, c-format
 msgid "Can't insert file from outside of %s: too many ..'s"
 msgstr ""
 
-#: pico/file.c:199
+#: pico/file.c:200
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr ""
 
-#: pico/file.c:226
+#: pico/file.c:227
 msgid "Can't select messages yet!"
 msgstr ""
 
-#: pico/file.c:262
+#: pico/file.c:263
 msgid "Can't insert in restricted mode"
 msgstr ""
 
-#: pico/file.c:307
-msgid "\aRestricted mode disallows uploaded command"
-msgstr ""
-
-#: pico/file.c:340 pico/file.c:347
+#: pico/file.c:341 pico/file.c:348
 msgid "Help for Insert File"
 msgstr ""
 
-#: pico/file.c:495
+#: pico/file.c:496
 msgid "New file"
 msgstr ""
 
-#: pico/file.c:502
+#: pico/file.c:503
 msgid "Reading file"
 msgstr ""
 
-#: pico/file.c:512
+#: pico/file.c:513
 #, c-format
 msgid "Read %ld lines"
 msgstr ""
 
-#: pico/file.c:514
+#: pico/file.c:515
 #, c-format
 msgid "Read 1 line"
 msgstr ""
 
 #. TRANSLATORS: Asking for name of file to write data into
-#: pico/file.c:585
+#: pico/file.c:590
 msgid "File Name to write : "
 msgstr ""
 
-#: pico/file.c:597
+#: pico/file.c:602
 #, c-format
 msgid "Can't write outside of %s: too many ..'s"
 msgstr ""
 
-#: pico/file.c:605
+#: pico/file.c:610
 #, c-format
 msgid "Can't write outside of %s"
 msgstr ""
 
-#: pico/file.c:749
+#: pico/file.c:754
 #, c-format
 msgid "File \"%s\" exists, OVERWRITE"
 msgstr ""
 
-#: pico/file.c:781 pico/file.c:828
+#: pico/file.c:786 pico/file.c:833
 #, c-format
 msgid "Wrote %s lines"
 msgstr ""
 
-#: pico/file.c:784 pico/file.c:831
+#: pico/file.c:789 pico/file.c:836
 msgid "Wrote 1 line"
 msgstr ""
 
-#: pico/file.c:811
+#: pico/file.c:816
 msgid "No file name"
 msgstr ""
 
-#: pico/file.c:956
+#: pico/file.c:961
 #, c-format
 msgid "Inserting %s."
 msgstr ""
 
-#: pico/file.c:969
+#: pico/file.c:974
 #, c-format
 msgid "Inserted %ld lines"
 msgstr ""
 
-#: pico/file.c:971
+#: pico/file.c:976
 #, c-format
 msgid "Inserted 1 line"
 msgstr ""
 
 #. TRANSLATORS: error message about command line
-#: pico/main.c:87 pico/pilot.c:53
+#: pico/main.c:91 pico/pilot.c:53
 #, c-format
 msgid "missing or empty argument to \"%c\" flag"
 msgstr ""
 
-#: pico/main.c:88 pico/pilot.c:54
+#: pico/main.c:92
+#, c-format
+msgid "missing or empty argument to \"%s\" flag"
+msgstr ""
+
+#: pico/main.c:93 pico/pilot.c:54
 #, c-format
 msgid "non numeric argument for \"%c\" flag"
 msgstr ""
 
-#: pico/main.c:89 pico/pilot.c:55
+#: pico/main.c:94 pico/pilot.c:55
 #, c-format
 msgid "missing color for \"%s\" flag"
 msgstr ""
 
-#: pico/main.c:90 pico/pilot.c:56
+#: pico/main.c:95 pico/pilot.c:56
 #, c-format
 msgid "missing character set for \"%s\" flag"
 msgstr ""
 
-#: pico/main.c:91 pico/pilot.c:57
+#: pico/main.c:96 pico/pilot.c:57
 #, c-format
 msgid "input character set \"%s\" is unsupported"
 msgstr ""
 
-#: pico/main.c:92 pico/pilot.c:58
+#: pico/main.c:97 pico/pilot.c:58
 #, c-format
 msgid "output character set \"%s\" is unsupported"
 msgstr ""
 
 #. TRANSLATORS: little help printed out when incorrect arguments
 #. are given to pico program.
-#: pico/main.c:97
+#: pico/main.c:102
 msgid "Possible Starting Arguments for Pico editor:"
 msgstr ""
 
-#: pico/main.c:99 pico/pilot.c:65
+#: pico/main.c:104 pico/pilot.c:65
 msgid "\tArgument\t\tMeaning"
 msgstr ""
 
-#: pico/main.c:100
+#: pico/main.c:105
 msgid "\t -e \t\tComplete - allow file name completion"
 msgstr ""
 
-#: pico/main.c:101
+#: pico/main.c:106
 msgid "\t -k \t\tCut - let ^K cut from cursor position to end of line"
 msgstr ""
 
-#: pico/main.c:102 pico/pilot.c:66
+#: pico/main.c:107 pico/pilot.c:66
 msgid "\t -a \t\tShowDot - show dot files in file browser"
 msgstr ""
 
-#: pico/main.c:103 pico/pilot.c:67
+#: pico/main.c:108 pico/pilot.c:67
 msgid "\t -j \t\tGoto - allow 'Goto' command in file browser"
 msgstr ""
 
-#: pico/main.c:104 pico/pilot.c:68
+#: pico/main.c:109 pico/pilot.c:68
 msgid "\t -g \t\tShow - show cursor in file browser"
 msgstr ""
 
-#: pico/main.c:105 pico/pilot.c:69
+#: pico/main.c:110 pico/pilot.c:69
 msgid "\t -m \t\tMouse - turn on mouse support"
 msgstr ""
 
-#: pico/main.c:106 pico/pilot.c:71
+#: pico/main.c:111 pico/pilot.c:71
 msgid "\t -x \t\tNoKeyhelp - suppress keyhelp"
 msgstr ""
 
-#: pico/main.c:107
+#: pico/main.c:112
 msgid ""
 "\t -p \t\tPreserveStartStop - preserve \"start\"(^Q) and \"stop\"(^S) "
 "characters"
 msgstr ""
 
-#: pico/main.c:108 pico/pilot.c:72
+#: pico/main.c:113 pico/pilot.c:72
 msgid ""
 "\t -q \t\tTermdefWins - termcap or terminfo takes precedence over defaults"
 msgstr ""
 
-#: pico/main.c:109
+#: pico/main.c:114
 msgid ""
 "\t -Q <quotestr> \tSet quote string (eg. \"> \") esp. for composing email"
 msgstr ""
 
-#: pico/main.c:110
+#: pico/main.c:115
 msgid "\t -d \t\tRebind - let delete key delete current character"
 msgstr ""
 
-#: pico/main.c:111 pico/pilot.c:73
+#: pico/main.c:116 pico/pilot.c:73
 msgid "\t -f \t\tKeys - force use of function keys"
 msgstr ""
 
-#: pico/main.c:112
+#: pico/main.c:117
 msgid "\t -b \t\tReplace - allow search and replace"
 msgstr ""
 
-#: pico/main.c:113 pico/pilot.c:74
+#: pico/main.c:118 pico/pilot.c:74
 msgid "\t -h \t\tHelp - give this list of options"
 msgstr ""
 
-#: pico/main.c:114
+#: pico/main.c:119
 msgid "\t -r[#cols] \tFill - set fill column to #cols columns, default=72"
 msgstr ""
 
-#: pico/main.c:115 pico/pilot.c:80
+#: pico/main.c:120 pico/pilot.c:80
 msgid "\t -n[#s] \tMail - notify about new mail every #s seconds, default=180"
 msgstr ""
 
-#: pico/main.c:116
+#: pico/main.c:121
 msgid "\t -s <speller> \tSpeller - specify alternative speller"
 msgstr ""
 
-#: pico/main.c:117 pico/pilot.c:81
+#: pico/main.c:122 pico/pilot.c:81
 msgid "\t -t \t\tShutdown - enable special shutdown mode"
 msgstr ""
 
-#: pico/main.c:118 pico/pilot.c:82
+#: pico/main.c:123 pico/pilot.c:82
 msgid "\t -o <dir>\tOperation - specify the operating directory"
 msgstr ""
 
-#: pico/main.c:119 pico/pilot.c:83
+#: pico/main.c:124 pico/pilot.c:83
 msgid "\t -z \t\tSuspend - allow use of ^Z suspension"
 msgstr ""
 
-#: pico/main.c:120
+#: pico/main.c:125
 msgid "\t -w \t\tNoWrap - turn off word wrap"
 msgstr ""
 
-#: pico/main.c:121
+#: pico/main.c:126
 msgid "\t -W <wordseps> \tSet word separators other than whitespace"
 msgstr ""
 
-#: pico/main.c:123 pico/pilot.c:76
+#: pico/main.c:128 pico/pilot.c:76
 msgid ""
 "\t -dcs <display_character_set> \tdefault uses LANG or LC_CTYPE from "
 "environment"
 msgstr ""
 
-#: pico/main.c:124 pico/pilot.c:77
+#: pico/main.c:129 pico/pilot.c:77
 msgid "\t -kcs <keyboard_character_set> \tdefaults to display_character_set"
 msgstr ""
 
-#: pico/main.c:125 pico/pilot.c:78
+#: pico/main.c:130 pico/pilot.c:78
 msgid "\t -syscs\t\tuse system-supplied translation routines"
 msgstr ""
 
-#: pico/main.c:128 pico/pilot.c:85
+#: pico/main.c:133
+msgid ""
+"\t -dict \"dict1,dict2\" a comma separated list of dictionaries, e.g. en_US, "
+"de_DE, es_ES, etc."
+msgstr ""
+
+#: pico/main.c:134 pico/pilot.c:85
 msgid "\t -cnf color \tforeground color"
 msgstr ""
 
-#: pico/main.c:129 pico/pilot.c:86
+#: pico/main.c:135 pico/pilot.c:86
 msgid "\t -cnb color \tbackground color"
 msgstr ""
 
-#: pico/main.c:130 pico/pilot.c:87
+#: pico/main.c:136 pico/pilot.c:87
 msgid "\t -crf color \treverse foreground color"
 msgstr ""
 
-#: pico/main.c:131 pico/pilot.c:88
+#: pico/main.c:137 pico/pilot.c:88
 msgid "\t -crb color \treverse background color"
 msgstr ""
 
-#: pico/main.c:133
+#: pico/main.c:140
+msgid "\t -color_code  \tdisplay number codes for different colors"
+msgstr ""
+
+#: pico/main.c:141
+msgid "\t -ncolors number \tnumber of colors for screen (8, 16, or 256)"
+msgstr ""
+
+#: pico/main.c:142
+msgid "\t -ntfc number \tnumber of color of foreground text"
+msgstr ""
+
+#: pico/main.c:143
+msgid "\t -ntbc number \tnumber of color of the background"
+msgstr ""
+
+#: pico/main.c:144
+msgid "\t -rtfc number \tnumber of color of reverse text"
+msgstr ""
+
+#: pico/main.c:145
+msgid "\t -rtbc number \tnumber of color of reverse background"
+msgstr ""
+
+#: pico/main.c:146
+msgid "\t -tbfc number \tnumber of color of foreground (text) of the title bar"
+msgstr ""
+
+#: pico/main.c:147
+msgid "\t -tbbc number \tnumber of color of background of the title bar"
+msgstr ""
+
+#: pico/main.c:148
+msgid "\t -klfc number \tnumber of color of foreground (text) of the key label"
+msgstr ""
+
+#: pico/main.c:149
+msgid "\t -klbc number \tnumber of color of background of the key label"
+msgstr ""
+
+#: pico/main.c:150
+msgid "\t -knfc number \tnumber of color of foreground (text) of the key name"
+msgstr ""
+
+#: pico/main.c:151
+msgid "\t -knbc number \tnumber of color of background of the key name"
+msgstr ""
+
+#: pico/main.c:152
+msgid ""
+"\t -stfc number \tnumber of color of foreground (text) of the status line"
+msgstr ""
+
+#: pico/main.c:153
+msgid "\t -stbc number \tnumber of color of background of the status line"
+msgstr ""
+
+#: pico/main.c:154
+msgid "\t -prfc number \tnumber of color of foreground (text) of a prompt"
+msgstr ""
+
+#: pico/main.c:155
+msgid "\t -prbc number \tnumber of color of background of a prompt"
+msgstr ""
+
+#: pico/main.c:156
+msgid ""
+"\t -q1fc number \tnumber of color of foreground (text) of level one of "
+"quoted text"
+msgstr ""
+
+#: pico/main.c:157
+msgid ""
+"\t -q1bc number \tnumber of color of background of level one of quoted text"
+msgstr ""
+
+#: pico/main.c:158
+msgid ""
+"\t -q2fc number \tnumber of color of foreground (text) of level two of "
+"quoted text"
+msgstr ""
+
+#: pico/main.c:159
+msgid ""
+"\t -q2bc number \tnumber of color of background of level two of quoted text"
+msgstr ""
+
+#: pico/main.c:160
+msgid ""
+"\t -q3fc number \tnumber of color of foreground (text) of level three of "
+"quoted text"
+msgstr ""
+
+#: pico/main.c:161
+msgid ""
+"\t -q3bc number \tnumber of color of background of level three of quoted text"
+msgstr ""
+
+#: pico/main.c:162
+msgid "\t -sbfc number \tnumber of color of foreground of signature block text"
+msgstr ""
+
+#: pico/main.c:163
+msgid "\t -sbbc number \tnumber of color of background of signature block text"
+msgstr ""
+
+#: pico/main.c:165
 msgid "\t +[line#] \tLine - start on line# line, default=1"
 msgstr ""
 
-#: pico/main.c:134
+#: pico/main.c:166
 msgid "\t -v \t\tView - view file"
 msgstr ""
 
-#: pico/main.c:135 pico/pilot.c:90
+#: pico/main.c:167 pico/pilot.c:90
 msgid "\t -no_setlocale_collate\tdo not do setlocale(LC_COLLATE)"
 msgstr ""
 
-#: pico/main.c:136
+#: pico/main.c:168
 msgid "\t -version\tPico version number"
 msgstr ""
 
-#: pico/main.c:138
+#: pico/main.c:170
 msgid "\t All arguments may be followed by a file name to display."
 msgstr ""
 
-#: pico/main.c:358 pico/pilot.c:216
+#: pico/main.c:397 pico/pilot.c:216
 #, c-format
 msgid "Checking for new mail every %s seconds"
 msgstr ""
 
-#: pico/main.c:844 pico/pilot.c:463
+#: pico/main.c:757
+#, c-format
+msgid "Unsupported number of colors: %d"
+msgstr ""
+
+#: pico/main.c:1277 pico/pilot.c:463
 #, c-format
 msgid "Argument Error: %.200s"
 msgstr ""
@@ -11184,7 +11947,7 @@ msgstr ""
 
 #. TRANSLATORS: Rich Headers is a command to display more headers. It
 #. is triggered with the ^R key. PrvPg stands for Previous Page.
-#: pico/composer.c:135 pico/composer.c:4410
+#: pico/composer.c:135 pico/composer.c:4428
 msgid "Rich Hdr"
 msgstr ""
 
@@ -11212,21 +11975,40 @@ msgstr ""
 msgid "UnDel Line"
 msgstr ""
 
+#: pico/composer.c:268
+#, c-format
+msgid "Can't realloc addrbuf to %d bytes"
+msgstr ""
+
 #: pico/composer.c:754
 msgid "Problem with attachments. Postpone anyway?"
 msgstr ""
 
+#: pico/composer.c:759 pico/composer.c:1007 pico/composer.c:1320
+#: pico/composer.c:1654 pico/composer.c:1756 pico/composer.c:1869
+msgid "Format lines failed!"
+msgstr ""
+
 #: pico/composer.c:1726
 #, c-format
 msgid "Can't move beyond top of %s"
 msgstr ""
 
+#: pico/composer.c:1840
+msgid "Can't allocate line for new attachment!"
+msgstr ""
+
+#: pico/composer.c:1863
+#, c-format
+msgid "Problem attaching: %s"
+msgstr ""
+
 #: pico/composer.c:1952
 msgid "Please make the screen larger."
 msgstr ""
 
 #: pico/composer.c:2026 pico/composer.c:2248 pico/composer.c:2262
-msgid "\aCan't edit attachment number!"
+msgid "Can't edit attachment number!"
 msgstr ""
 
 #. TRANSLATORS: Killing text is deleting it and
@@ -11235,16 +12017,16 @@ msgstr ""
 msgid "Problem Unkilling text"
 msgstr ""
 
-#: pico/composer.c:4417
+#: pico/composer.c:4435
 msgid "Edit File"
 msgstr ""
 
-#: pith/charconv/utf8.c:1935
+#: pith/charconv/utf8.c:1947
 #, c-format
 msgid "Display character set \"%s\" is ignored when using system translation"
 msgstr ""
 
-#: pith/charconv/utf8.c:1947
+#: pith/charconv/utf8.c:1959
 #, c-format
 msgid "Keyboard character set \"%s\" is ignored when using system translation"
 msgstr ""
@@ -11253,19 +12035,23 @@ msgstr ""
 #. set the user is trying to use (which is unsupported by alpine).
 #. The second argument is " (except for posting)" if they are
 #. trying to use ISO-2022-JP for something other than posting.
-#: pith/charconv/utf8.c:1995 pith/charconv/utf8.c:2033
+#: pith/charconv/utf8.c:2007 pith/charconv/utf8.c:2045
 #, c-format
 msgid "Character set \"%s\" is unsupported%s, using US-ASCII"
 msgstr ""
 
-#: pith/charconv/utf8.c:1997 pith/charconv/utf8.c:2035
+#: pith/charconv/utf8.c:2009 pith/charconv/utf8.c:2047
 msgid " (except for posting)"
 msgstr ""
 
-#: pith/charconv/utf8.c:2049
+#: pith/charconv/utf8.c:2061
 msgid "Help, can't figure out display character set or even use US-ASCII."
 msgstr ""
 
+#: pith/osdep/debugtime.c:48
+msgid "Time Unavailable"
+msgstr ""
+
 #. TRANSLATORS: User is viewing a message and all the quoted text is
 #. being shown.
 #: pith/mailview.c:170
@@ -11284,7 +12070,7 @@ msgstr ""
 msgid "Formatting error: %s"
 msgstr ""
 
-#: pith/mailview.c:328 pith/reply.c:2588
+#: pith/mailview.c:328 pith/reply.c:2686
 msgid "    [ERROR fetching text of message]"
 msgstr ""
 
@@ -11349,279 +12135,279 @@ msgid " Below this line are some possibilities taken from the text of the msg "
 msgstr ""
 
 #. TRANSLATORS: -bail is a literal option name, don't change it.
-#: pith/conf.c:1774
+#: pith/conf.c:1806
 msgid "Exiting because -bail option is set and config file doesn't exist."
 msgstr ""
 
-#: pith/conf.c:2545
+#: pith/conf.c:2588
 msgid "Only using first character of threading-indicator-character option"
 msgstr ""
 
-#: pith/conf.c:2552
+#: pith/conf.c:2595
 msgid "Only using first character of threading-expanded-character option"
 msgstr ""
 
-#: pith/conf.c:2562
+#: pith/conf.c:2605
 msgid "Only using first character of threading-lastreply-character option"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2689
+#: pith/conf.c:2732
 msgid "Advanced User Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2692
+#: pith/conf.c:2735
 msgid "Folder Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2695
+#: pith/conf.c:2738
 msgid "Address Book Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2698
+#: pith/conf.c:2741
 msgid "Composer Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2701
+#: pith/conf.c:2744
 msgid "News Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2704
+#: pith/conf.c:2747
 msgid "Viewer Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2707
+#: pith/conf.c:2750
 msgid "Advanced Command Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2710
+#: pith/conf.c:2753
 msgid "Printer Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2713
+#: pith/conf.c:2756
 msgid "Reply Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2716
+#: pith/conf.c:2759
 msgid "Sending Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2719
+#: pith/conf.c:2762
 msgid "Message Index Preferences"
 msgstr ""
 
-#: pith/conf.c:5028
+#: pith/conf.c:5082
 msgid "Unable to read or write remote configuration"
 msgstr ""
 
-#: pith/conf.c:5554
+#: pith/conf.c:5612
 msgid "Can't access remote config, changes NOT saved!"
 msgstr ""
 
-#: pith/conf.c:5580
+#: pith/conf.c:5638
 #, c-format
 msgid "No write permission for remote config %.200s, changes NOT saved!"
 msgstr ""
 
-#: pith/conf.c:5586
+#: pith/conf.c:5644
 msgid "Remote config changed, aborting our change to avoid damage..."
 msgstr ""
 
-#: pith/conf.c:5638
+#: pith/conf.c:5696
 #, c-format
 msgid "Can't modify configuration file \"%.200s\": ReadOnly"
 msgstr ""
 
 #. TRANSLATORS: first argument is a filename, second
 #. arg is the text of the error message
-#: pith/conf.c:5668
+#: pith/conf.c:5726
 #, c-format
 msgid "Error creating \"%.200s\" : %.200s"
 msgstr ""
 
-#: pith/conf.c:5923
+#: pith/conf.c:5995
 msgid "Copying to remote config"
 msgstr ""
 
-#: pith/conf.c:5931 pith/adrbklib.c:3413
+#: pith/conf.c:6003 pith/adrbklib.c:3413
 #, c-format
 msgid "Error copying to %.200s: %.200s"
 msgstr ""
 
-#: pith/conf.c:5935
+#: pith/conf.c:6007
 msgid "Copy of config to remote folder failed, changes NOT saved remotely"
 msgstr ""
 
-#: pith/conf.c:5970
+#: pith/conf.c:6045
 #, c-format
 msgid "Error saving configuration in \"%.200s\": %.200s"
 msgstr ""
 
 #. TRANSLATORS: The %s is either "Postload " or nothing. A Postload config file
 #. is a type of config file.
-#: pith/conf.c:6084
+#: pith/conf.c:6168
 #, c-format
 msgid "Must quit Alpine to change %sconfig file."
 msgstr ""
 
-#: pith/conf.c:6843
+#: pith/conf.c:6927
 #, c-format
 msgid "Posting-Character set \"%s\" is unsupported, using UTF-8"
 msgstr ""
 
-#: pith/conf.c:6858
+#: pith/conf.c:6942
 msgid "(fixed)"
 msgstr ""
 
-#: pith/conf.c:6859
+#: pith/conf.c:6943
 msgid "(default)"
 msgstr ""
 
-#: pith/conf.c:6860
+#: pith/conf.c:6944
 msgid "(overridden)"
 msgstr ""
 
-#: pith/conf.c:7073
+#: pith/conf.c:7157
 msgid "This option has no effect without Enable-Incoming-Folders"
 msgstr ""
 
-#: pith/conf.c:7252
+#: pith/conf.c:7336
 #, c-format
 msgid "Posting-Character-Set \"%s\" is unsupported, using UTF-8"
 msgstr ""
 
-#: pith/conf.c:7265
+#: pith/conf.c:7349
 msgid "Posting-Character-Set is ignored with Use-System-Translation turned on"
 msgstr ""
 
-#: pith/conf.c:7423
+#: pith/conf.c:7507
 #, c-format
 msgid "No local file specified"
 msgstr ""
 
-#: pith/conf.c:7428
+#: pith/conf.c:7512
 #, c-format
 msgid "No remote folder specified"
 msgstr ""
 
-#: pith/conf.c:7433
+#: pith/conf.c:7517
 #, c-format
 msgid "Remote folder name \"%s\" %s"
 msgstr ""
 
-#: pith/conf.c:7434
+#: pith/conf.c:7518
 msgid "must begin with \"{\""
 msgstr ""
 
-#: pith/conf.c:7434
+#: pith/conf.c:7518
 msgid "not valid"
 msgstr ""
 
-#: pith/conf.c:7439
+#: pith/conf.c:7523
 #, c-format
 msgid "First argument \"%s\" must be a local filename"
 msgstr ""
 
-#: pith/conf.c:7445
+#: pith/conf.c:7529
 #, c-format
 msgid "Local file \"%s\" does not exist"
 msgstr ""
 
-#: pith/conf.c:7450
+#: pith/conf.c:7534
 #, c-format
 msgid "Can't read local file \"%s\": %s"
 msgstr ""
 
-#: pith/conf.c:7460 pith/remote.c:98 pith/reply.c:3407
+#: pith/conf.c:7544 pith/remote.c:98 pith/reply.c:3534
 msgid "Error: "
 msgstr ""
 
-#: pith/conf.c:7460
+#: pith/conf.c:7544
 msgid "Can't copy to remote folder."
 msgstr ""
 
-#: pith/conf.c:7463
+#: pith/conf.c:7547
 #, c-format
 msgid "Can't create \"%s\""
 msgstr ""
 
-#: pith/conf.c:7478
+#: pith/conf.c:7562
 #, c-format
 msgid "Can't open remote folder \"%s\""
 msgstr ""
 
-#: pith/conf.c:7484
+#: pith/conf.c:7568
 #, c-format
 msgid "Remote folder \"%s\" is readonly"
 msgstr ""
 
-#: pith/conf.c:7497
+#: pith/conf.c:7581
 #, c-format
 msgid "Failed initializing remote folder \"%s\", check debug file"
 msgstr ""
 
-#: pith/conf.c:7518
+#: pith/conf.c:7602
 #, c-format
 msgid "Error copying to remote folder \"%s\""
 msgstr ""
 
-#: pith/conf.c:8037
+#: pith/conf.c:8130
 msgid "Supported features in this Alpine"
 msgstr ""
 
 #. TRANSLATORS: headings
-#: pith/conf.c:8075
+#: pith/conf.c:8168
 msgid "Encryption:"
 msgstr ""
 
-#: pith/conf.c:8078
+#: pith/conf.c:8171
 msgid "  TLS and SSL"
 msgstr ""
 
-#: pith/conf.c:8080
+#: pith/conf.c:8173
 msgid "  None (no TLS or SSL)"
 msgstr ""
 
-#: pith/conf.c:8090
+#: pith/conf.c:8187
 msgid "Authenticators:"
 msgstr ""
 
-#: pith/conf.c:8104
+#: pith/conf.c:8201
 msgid "Mailbox drivers:"
 msgstr ""
 
-#: pith/conf.c:8119
+#: pith/conf.c:8216
 msgid "Directories:"
 msgstr ""
 
-#: pith/conf.c:8135
+#: pith/conf.c:8232
 msgid ""
 "Authenticators may be disabled because of the \"disable-these-authenticators"
 "\" hidden config option. Mailbox drivers may be disabled because of the "
 "\"disable-these-drivers\" hidden config option."
 msgstr ""
 
-#: pith/conf.c:8139
+#: pith/conf.c:8236
 msgid ""
 "Authenticators may be disabled because of the \"disable-these-authenticators"
 "\""
 msgstr ""
 
-#: pith/conf.c:8141
+#: pith/conf.c:8238
 msgid "hidden config option. Mailbox drivers may be disabled because of the"
 msgstr ""
 
-#: pith/conf.c:8143
+#: pith/conf.c:8240
 msgid "\"disable-these-drivers\" hidden config option."
 msgstr ""
 
@@ -11629,20 +12415,20 @@ msgstr ""
 msgid "Can't find body for requested message"
 msgstr ""
 
-#: pith/detach.c:277
+#: pith/detach.c:281
 msgid "Formatting error: no space to make copy, no display filters used"
 msgstr ""
 
-#: pith/detach.c:634 pith/detach.c:786
+#: pith/detach.c:639 pith/detach.c:791
 msgid "Message size does not match expected size, continuing..."
 msgstr ""
 
 #. TRANSLATORS: data transfer was interrupted by something
-#: pith/detach.c:700
+#: pith/detach.c:705
 msgid "Transfer interrupted!"
 msgstr ""
 
-#: pith/detach.c:790
+#: pith/detach.c:795
 msgid "Server returns zero bytes, Quell-Partial-Fetch feature may help"
 msgstr ""
 
@@ -11655,27 +12441,27 @@ msgstr ""
 msgid "No folder collections defined"
 msgstr ""
 
-#: pith/folder.c:2340 pith/mailcmd.c:1958
+#: pith/folder.c:2355 pith/mailcmd.c:1971
 msgid "new"
 msgstr ""
 
-#: pith/folder.c:2344 pith/mailcmd.c:1955
+#: pith/folder.c:2359 pith/mailcmd.c:1968
 msgid "unseen"
 msgstr ""
 
 #. TRANSLATORS: This is the description of an attachment that isn't being
 #. shown but that can be viewed or saved.
-#: pith/mimedesc.c:821
+#: pith/mimedesc.c:825
 msgid "Not Shown. Use the \"V\" command to view or save to address book."
 msgstr ""
 
 #. TRANSLATORS: This is the description of an attachment that isn't being
 #. shown but that can be viewed or saved.
-#: pith/mimedesc.c:826
+#: pith/mimedesc.c:830
 msgid "Not Shown. Use the \"V\" command to view or save this part."
 msgstr ""
 
-#: pith/mimedesc.c:840
+#: pith/mimedesc.c:844
 msgid "Unable to print this part."
 msgstr ""
 
@@ -11700,32 +12486,32 @@ msgstr ""
 msgid "addressbook"
 msgstr ""
 
-#: pith/mailindx.c:661
+#: pith/mailindx.c:669
 #, c-format
 msgid "Unrecognized word in index-format: %s"
 msgstr ""
 
-#: pith/mailindx.c:908
+#: pith/mailindx.c:918
 msgid "Configured \"index-format\" unrecognizable. Using default."
 msgstr ""
 
-#: pith/mailindx.c:2056 pith/mailindx.c:3253
+#: pith/mailindx.c:2073 pith/mailindx.c:3283
 msgid "[ No Message Text Available ]"
 msgstr ""
 
-#: pith/mailindx.c:4173
+#: pith/mailindx.c:4203
 msgid "Today"
 msgstr ""
 
-#: pith/mailindx.c:4676
+#: pith/mailindx.c:4706
 msgid "Yesterday"
 msgstr ""
 
-#: pith/mailindx.c:4680
+#: pith/mailindx.c:4710
 msgid "Tomorrow"
 msgstr ""
 
-#: pith/mailindx.c:4682
+#: pith/mailindx.c:4712
 #, c-format
 msgid "Next %.3s!"
 msgstr ""
@@ -11768,26 +12554,26 @@ msgstr ""
 msgid "Unknown error saving pattern variable"
 msgstr ""
 
-#: pith/pattern.c:7133
+#: pith/pattern.c:7135
 #, c-format
 msgid "Processing filter \"%s\""
 msgstr ""
 
-#: pith/pattern.c:7760
+#: pith/pattern.c:7762
 msgid "filtering done"
 msgstr ""
 
-#: pith/pattern.c:7917
+#: pith/pattern.c:7919
 #, c-format
 msgid "Can't delete messages in readonly folder \"%s\""
 msgstr ""
 
-#: pith/pattern.c:7995
+#: pith/pattern.c:7997
 #, c-format
 msgid "Filtered all %s message to \"%s\""
 msgstr ""
 
-#: pith/pattern.c:8033
+#: pith/pattern.c:8035
 #, c-format
 msgid "Can't set flags in readonly folder \"%s\""
 msgstr ""
@@ -11834,133 +12620,133 @@ msgstr ""
 msgid "%s message folder doesn't exist!"
 msgstr ""
 
-#: pith/send.c:888 pith/reply.c:1089 pith/reply.c:1144
+#: pith/send.c:888 pith/reply.c:1140 pith/reply.c:1195
 msgid "Error including all message parts"
 msgstr ""
 
 #. TRANSLATORS: Arg is a mailbox name
-#: pith/send.c:1004
+#: pith/send.c:1007
 #, c-format
 msgid "Can't delete %s"
 msgstr ""
 
 #. TRANSLATORS: First arg is the address we can't
 #. send to, second arg is "not in addressbook".
-#: pith/send.c:1503
+#: pith/send.c:1506
 #, c-format
 msgid "Can't send to address %s: %s"
 msgstr ""
 
-#: pith/send.c:1507
+#: pith/send.c:1510
 msgid "not in addressbook"
 msgstr ""
 
 #. TRANSLATORS: program is busy updating the Answered flags so warns user
-#: pith/send.c:1620
+#: pith/send.c:1624
 msgid "Updating \"Answered\" Flags"
 msgstr ""
 
-#: pith/send.c:1757
+#: pith/send.c:1761
 msgid "Can't send message. No recipients specified!"
 msgstr ""
 
-#: pith/send.c:1789
+#: pith/send.c:1795
 msgid "Sending mail"
 msgstr ""
 
-#: pith/send.c:2008
+#: pith/send.c:2027
 msgid "Delivery Status Notification not available from this server."
 msgstr ""
 
-#: pith/send.c:2015
+#: pith/send.c:2034
 #, c-format
 msgid "Mail not sent. Sending error%s%s"
 msgstr ""
 
-#: pith/send.c:2038 pith/send.c:2057
+#: pith/send.c:2057 pith/send.c:2076
 #, c-format
 msgid "Mail not sent: %.80s"
 msgstr ""
 
-#: pith/send.c:2083
+#: pith/send.c:2102
 #, c-format
 msgid "Error sending%.2s%.80s"
 msgstr ""
 
-#: pith/send.c:2423
+#: pith/send.c:2442
 msgid "Fcc creation error. Message NOT sent or copied."
 msgstr ""
 
-#: pith/send.c:2426
+#: pith/send.c:2445
 msgid "Fcc creation rejected. Message NOT sent or copied."
 msgstr ""
 
-#: pith/send.c:4369
+#: pith/send.c:4409
 #, c-format
 msgid "Encoding Error \"%s\""
 msgstr ""
 
-#: pith/send.c:4386
-msgid "The following attachment was sent,\r\n"
+#: pith/send.c:4426
+msgid "The following attachment was sent,"
 msgstr ""
 
-#: pith/send.c:4387
-msgid "but NOT saved in the Fcc copy:\r\n"
+#: pith/send.c:4427
+msgid "but NOT saved in the Fcc copy:"
 msgstr ""
 
-#: pith/send.c:4999
+#: pith/send.c:5039
 #, c-format
 msgid "Space not allowed in header name (%s)"
 msgstr ""
 
-#: pith/send.c:5010
+#: pith/send.c:5050
 #, c-format
 msgid "Not allowed to change header \"%s\""
 msgstr ""
 
-#: pith/send.c:5378
+#: pith/send.c:5418
 #, c-format
 msgid "Error posting message: %s"
 msgstr ""
 
-#: pith/send.c:5398
+#: pith/send.c:5438
 #, c-format
 msgid "Error connecting to news server: %s"
 msgstr ""
 
-#: pith/send.c:5411 pith/send.c:5598
+#: pith/send.c:5451 pith/send.c:5639
 #, c-format
 msgid "Can't post, NNTP-server must be defined!"
 msgstr ""
 
-#: pith/send.c:5448
+#: pith/send.c:5488
 msgid "SMTP-server must be defined!"
 msgstr ""
 
-#: pith/send.c:5459
+#: pith/send.c:5500
 msgid "No default posting command."
 msgstr ""
 
-#: pith/send.c:5590
+#: pith/send.c:5631
 #, c-format
 msgid "News not posted: \"%s\": %s"
 msgstr ""
 
-#: pith/send.c:5630
+#: pith/send.c:5671
 msgid "Error posting."
 msgstr ""
 
-#: pith/send.c:5635
+#: pith/send.c:5676
 #, c-format
 msgid "Posting program %s returned error"
 msgstr ""
 
-#: pith/send.c:5641
+#: pith/send.c:5682
 #, c-format
 msgid "Error running \"%s\""
 msgstr ""
 
-#: pith/send.c:5713
+#: pith/send.c:5755
 #, c-format
 msgid "Unexpected hostname for piped SMTP: %.*s"
 msgstr ""
@@ -11994,12 +12780,12 @@ msgstr ""
 msgid "Opened folder \"%s\" with %s message%s"
 msgstr ""
 
-#: pith/mailcmd.c:1951
+#: pith/mailcmd.c:1964
 msgid "recent"
 msgstr ""
 
 #. TRANSLATORS: warning to user that we're busy selecting messages
-#: pith/mailcmd.c:2441
+#: pith/mailcmd.c:2454
 msgid "Busy Selecting"
 msgstr ""
 
@@ -12126,7 +12912,7 @@ msgstr ""
 #. TRANSLATORS: error while translating from one
 #. character set to another, for example from UTF-8
 #. to ISO-2022-JP or something like that.
-#: pith/filter.c:1853 pith/filter.c:10974
+#: pith/filter.c:1853 pith/filter.c:11076
 msgid "translation error"
 msgstr ""
 
@@ -12270,128 +13056,132 @@ msgid "Missing username in LDAP address"
 msgstr ""
 
 #. TRANSLATORS: All of the three args together are an error message
-#: pith/ldap.c:482
+#: pith/ldap.c:541
 #, c-format
 msgid "Access to LDAP server failed: %s%s(%s)"
 msgstr ""
 
-#: pith/ldap.c:594
+#: pith/ldap.c:667
 msgid "Invalid password"
 msgstr ""
 
-#: pith/ldap.c:598
+#: pith/ldap.c:671
 #, c-format
 msgid "LDAP server failed: %s%s%s%s"
 msgstr ""
 
-#: pith/ldap.c:941 pith/ldap.c:1023
+#: pith/ldap.c:1056 pith/ldap.c:1142
 #, c-format
 msgid "LDAP search failed: %s%s%s%s"
 msgstr ""
 
-#: pith/ldap.c:978
+#: pith/ldap.c:1097
 #, c-format
 msgid "LDAP partial results: %s%s%s%s"
 msgstr ""
 
-#: pith/ldap.c:1113
+#: pith/ldap.c:1236
 #, c-format
 msgid "SELECT ONE ADDRESS%s%s%s"
 msgstr ""
 
-#: pith/ldap.c:1146
+#: pith/ldap.c:1269
 msgid "None of the names matched on directory server has an email address"
 msgstr ""
 
-#: pith/ldap.c:1158
+#: pith/ldap.c:1281
 msgid "No matches on directory server"
 msgstr ""
 
-#: pith/ldap.c:1731 pith/ldap.c:1739
+#. TRANSLATORS: This is a list of LDAP attributes with translations to present
+#. to the user. For example the attribute mail is Email Address and the attribute
+#. cn is Name.
+#.
+#: pith/ldap.c:1862 pith/ldap.c:1870
 msgid "Email Address"
 msgstr ""
 
-#: pith/ldap.c:1733
+#: pith/ldap.c:1864
 msgid "Surname"
 msgstr ""
 
-#: pith/ldap.c:1735
+#: pith/ldap.c:1866
 msgid "Given Name"
 msgstr ""
 
-#: pith/ldap.c:1741
+#: pith/ldap.c:1872
 msgid "Organization"
 msgstr ""
 
-#: pith/ldap.c:1742
+#: pith/ldap.c:1873
 msgid "Unit"
 msgstr ""
 
-#: pith/ldap.c:1743
+#: pith/ldap.c:1874
 msgid "Country"
 msgstr ""
 
-#: pith/ldap.c:1744
+#: pith/ldap.c:1875
 msgid "State or Province"
 msgstr ""
 
-#: pith/ldap.c:1745
+#: pith/ldap.c:1876
 msgid "Locality"
 msgstr ""
 
-#: pith/ldap.c:1746
+#: pith/ldap.c:1877
 msgid "Object Class"
 msgstr ""
 
-#: pith/ldap.c:1747
+#: pith/ldap.c:1878
 msgid "Title"
 msgstr ""
 
-#: pith/ldap.c:1748
+#: pith/ldap.c:1879
 msgid "Department"
 msgstr ""
 
-#: pith/ldap.c:1749
+#: pith/ldap.c:1880
 msgid "Postal Address"
 msgstr ""
 
-#: pith/ldap.c:1750
+#: pith/ldap.c:1881
 msgid "Home Address"
 msgstr ""
 
-#: pith/ldap.c:1751
+#: pith/ldap.c:1882
 msgid "Mail Stop"
 msgstr ""
 
-#: pith/ldap.c:1752
+#: pith/ldap.c:1883
 msgid "Voice Telephone"
 msgstr ""
 
-#: pith/ldap.c:1753
+#: pith/ldap.c:1884
 msgid "Home Telephone"
 msgstr ""
 
-#: pith/ldap.c:1754
+#: pith/ldap.c:1885
 msgid "Office Telephone"
 msgstr ""
 
-#: pith/ldap.c:1755
+#: pith/ldap.c:1886
 msgid "FAX Telephone"
 msgstr ""
 
-#: pith/ldap.c:1756
+#: pith/ldap.c:1887
 msgid "Mobile Telephone"
 msgstr ""
 
-#: pith/ldap.c:1757
+#: pith/ldap.c:1888
 msgid "Pager"
 msgstr ""
 
-#: pith/ldap.c:1758
+#: pith/ldap.c:1889
 msgid "Room Number"
 msgstr ""
 
-#: pith/ldap.c:1759
+#: pith/ldap.c:1890
 msgid "User ID"
 msgstr ""
 
@@ -12407,20 +13197,20 @@ msgstr ""
 
 #. TRANSLATORS: When a message is forwarded by the user this is the
 #. text that shows where the forwarded part of the message begins.
-#: pith/reply.c:2052
+#: pith/reply.c:2138
 msgid "---------- Forwarded message ----------"
 msgstr ""
 
-#: pith/reply.c:2484
+#: pith/reply.c:2582
 msgid "Error fetching message contents. Can't Bounce message"
 msgstr ""
 
-#: pith/reply.c:2966 pith/reply.c:2987
+#: pith/reply.c:3063 pith/reply.c:3084
 #, c-format
 msgid "Error fetching part %s"
 msgstr ""
 
-#: pith/reply.c:3407
+#: pith/reply.c:3534
 msgid "Can't fetch remote configuration."
 msgstr ""
 
@@ -12470,23 +13260,23 @@ msgstr ""
 msgid "Mail saved to folder \"...%.80s\""
 msgstr ""
 
-#: pith/save.c:763 pith/save.c:894 pith/save.c:1372
+#: pith/save.c:763 pith/save.c:894 pith/save.c:1373
 msgid "Can only save to existing folders in Incoming Collection"
 msgstr ""
 
 #. TRANSLATORS: A warning to user that the message parts
 #. they deleted will not be included in the copy they
 #. are now saving to.
-#: pith/save.c:1125 pith/save.c:1272
+#: pith/save.c:1125 pith/save.c:1273
 msgid "NOTE: Deleted message parts NOT included in saved copy!"
 msgstr ""
 
-#: pith/save.c:1145 pith/save.c:1332
+#: pith/save.c:1145 pith/save.c:1333
 #, c-format
 msgid "Cannot save because current folder is Closed"
 msgstr ""
 
-#: pith/save.c:1591
+#: pith/save.c:1593
 msgid "The following attachment was DELETED when this message was saved:"
 msgstr ""
 
@@ -12496,139 +13286,324 @@ msgstr ""
 msgid "Not allowed outside of %.150s"
 msgstr ""
 
-#: pith/smime.c:321 pith/smime.c:385 pith/smime.c:482 pith/smime.c:840
-#: pith/smime.c:870 pith/smime.c:900
+#: pith/smime.c:161 pith/smime.c:331
+#, c-format
+msgid "Enter password of key <%s> to unlock password file: "
+msgstr ""
+
+#: pith/smime.c:170
+#, c-format
+msgid "Cannot find certificate that matches key <%s>. Continuing..."
+msgstr ""
+
+#: pith/smime.c:504
+#, c-format
+msgid "Error removing certificate %s"
+msgstr ""
+
+#: pith/smime.c:543
+msgid "Error expunging certificate"
+msgstr ""
+
+#: pith/smime.c:557
+#, c-format
+msgid "Removed %s certificate%s"
+msgstr ""
+
+#: pith/smime.c:560
+msgid "Error: No certificates were removed"
+msgstr ""
+
+#: pith/smime.c:633
+msgid "import of certificates not implemented yet!"
+msgstr ""
+
+#: pith/smime.c:676
+msgid "Error in key name. Check file extension"
+msgstr ""
+
+#: pith/smime.c:680
+#, c-format
+msgid "Enter passphrase to unlock new key <%s>: "
+msgstr ""
+
+#: pith/smime.c:747
+msgid "Error parsing certificate"
+msgstr ""
+
+#: pith/smime.c:750
+msgid "Error reading certificate"
+msgstr ""
+
+#: pith/smime.c:758
+msgid "Certificate does not match key"
+msgstr ""
+
+#: pith/smime.c:764 pith/smime.c:928 pith/smime.c:960
+msgid "Error in certificate file (not a certificate?)"
+msgstr ""
+
+#: pith/smime.c:769 pith/smime.c:896
+msgid "Private key saved"
+msgstr ""
+
+#: pith/smime.c:776
+msgid "Error reading password file!"
+msgstr ""
+
+#: pith/smime.c:820
+msgid "Failed to remove old key"
+msgstr ""
+
+#: pith/smime.c:825
+msgid "Failed to remove old certificate"
+msgstr ""
+
+#: pith/smime.c:830
+msgid "Password file reencrypted"
+msgstr ""
+
+#: pith/smime.c:832
+msgid "Failed to reencrypt password file"
+msgstr ""
+
+#: pith/smime.c:836
+msgid "Error decrypting Password file"
+msgstr ""
+
+#: pith/smime.c:839
+msgid "Password file not encrypted and coulr not encrypt"
+msgstr ""
+
+#: pith/smime.c:845
+msgid "Error saving public certificate"
+msgstr ""
+
+#: pith/smime.c:847
+msgid "Error while cleaning private key"
+msgstr ""
+
+#: pith/smime.c:853 pith/smime.c:898
+msgid "Error saving private key"
+msgstr ""
+
+#: pith/smime.c:860
+msgid "Error unlocking private key"
+msgstr ""
+
+#: pith/smime.c:903
+msgid "Problem unlocking key (not a certificate or wrong password)"
+msgstr ""
+
+#: pith/smime.c:922
+msgid "Certificate saved"
+msgstr ""
+
+#: pith/smime.c:924
+msgid "Error saving certificate"
+msgstr ""
+
+#: pith/smime.c:1413 pith/smime.c:1490 pith/smime.c:1551 pith/smime.c:2021
+#: pith/smime.c:2051 pith/smime.c:2081
 #, c-format
 msgid "Can't create directory %s"
 msgstr ""
 
-#: pith/smime.c:577 pith/smime.c:910
+#: pith/smime.c:1725 pith/smime.c:2091
 msgid "Directory not defined"
 msgstr ""
 
-#: pith/smime.c:584 pith/smime.c:821
+#: pith/smime.c:1732 pith/smime.c:2002
 msgid "Turn off the Keychain feature above first"
 msgstr ""
 
-#: pith/smime.c:588 pith/smime.c:825 pith/smime.c:855 pith/smime.c:885
-#: pith/smime.c:915
+#: pith/smime.c:1736 pith/smime.c:2006 pith/smime.c:2036 pith/smime.c:2066
+#: pith/smime.c:2096
 msgid "Container path is not defined"
 msgstr ""
 
-#: pith/smime.c:606 pith/smkeys.c:365
+#: pith/smime.c:1754 pith/smkeys.c:939
 msgid "Can't access remote smime configuration."
 msgstr ""
 
-#: pith/smime.c:740 pith/smime.c:969 pith/smkeys.c:431
+#: pith/smime.c:1908 pith/smime.c:1919 pith/smime.c:2150 pith/smkeys.c:1023
 #, c-format
 msgid "Can't rename %s to %s"
 msgstr ""
 
-#: pith/smime.c:754 pith/smkeys.c:446
+#: pith/smime.c:1911
+#, c-format
+msgid "saved container to %s"
+msgstr ""
+
+#: pith/smime.c:1928 pith/smkeys.c:1038
 #, c-format
 msgid "Error opening temporary smime file %s: %s"
 msgstr ""
 
-#: pith/smime.c:770
+#: pith/smime.c:1944
 msgid "Copy of smime key to remote folder failed, NOT saved remotely"
 msgstr ""
 
-#: pith/smime.c:834 pith/smime.c:864 pith/smime.c:894
+#: pith/smime.c:2015 pith/smime.c:2045 pith/smime.c:2075
 msgid "Directory is not defined"
 msgstr ""
 
-#: pith/smime.c:1156
+#: pith/smime.c:2313
 msgid "Incorrect passphrase"
 msgstr ""
 
-#: pith/smime.c:1158
+#: pith/smime.c:2315
 #, c-format
 msgid "Couldn't read key: %s"
 msgstr ""
 
-#: pith/smime.c:1411
+#: pith/smime.c:2567
 #, c-format
 msgid "Unable to find certificate for <%s@%s>"
 msgstr ""
 
-#: pith/smime.c:1603
+#: pith/smime.c:2780
 msgid "Couldn't verify S/MIME signature: No CA Certs were loaded"
 msgstr ""
 
-#: pith/smime.c:1611
+#: pith/smime.c:2811
 msgid "S/MIME signature verified ok"
 msgstr ""
 
-#: pith/smime.c:1625
+#: pith/smime.c:2824
 #, c-format
 msgid "Couldn't verify S/MIME signature: %s"
 msgstr ""
 
-#: pith/smime.c:1714 pith/smime.c:1934
+#: pith/smime.c:3154 pith/smime.c:3325
 msgid ""
 "This message was cryptographically signed but the signature could not be "
 "verified."
 msgstr ""
 
-#: pith/smime.c:1864 pith/smime.c:1984
+#: pith/smime.c:3263 pith/smime.c:3375
 #, c-format
 msgid "Error decrypting: %s"
 msgstr ""
 
-#: pith/smime.c:1952
+#: pith/smime.c:3343
 msgid "Couldn't find the certificate needed to decrypt."
 msgstr ""
 
-#: pith/smime.c:2013
+#: pith/smime.c:3403
 msgid "Encrypted data couldn't be parsed."
 msgstr ""
 
-#: pith/smime.c:2219
+#: pith/smime.c:3426
+msgid "Couldn't find cookie in attachment list."
+msgstr ""
+
+#: pith/smime.c:3679
 msgid "Couldn't find the certificate needed to sign."
 msgstr ""
 
-#: pith/smime.c:2246
+#: pith/smime.c:3702
+msgid ""
+"Not all certificates needed to verify signature included in signed message"
+msgstr ""
+
+#: pith/smime.c:3743
 msgid "Error creating signed object."
 msgstr ""
 
-#: pith/smkeys.c:106
+#: pith/smkeys.c:66
+msgid "Password cannot be blank"
+msgstr ""
+
+#: pith/smkeys.c:69
+msgid "Password is too short"
+msgstr ""
+
+#: pith/smkeys.c:73
+msgid ". Enter password again"
+msgstr ""
+
+#: pith/smkeys.c:91
+msgid " Creating a Master Password for your Password file "
+msgstr ""
+
+#: pith/smkeys.c:94
+msgid " Retrying to create a Master Password for your Password file "
+msgstr ""
+
+#: pith/smkeys.c:98
+#, c-format
+msgid "Create master password (attempt %d of %d): "
+msgstr ""
+
+#: pith/smkeys.c:110
+#, c-format
+msgid "Confirm master password (attempt %d of %d): "
+msgstr ""
+
+#: pith/smkeys.c:119
+msgid "Passwords do not match, try again."
+msgstr ""
+
+#: pith/smkeys.c:121
+msgid "Passwords do not match, too many failures."
+msgstr ""
+
+#: pith/smkeys.c:163
+msgid "Problem reading configuration file"
+msgstr ""
+
+#: pith/smkeys.c:174
+msgid "Problem loading openssl configuration"
+msgstr ""
+
+#: pith/smkeys.c:627
+msgid "Invalid"
+msgstr ""
+
+#: pith/smkeys.c:685
 #, c-format
 msgid "Error loading file %s"
 msgstr ""
 
-#: pith/smkeys.c:442
+#: pith/smkeys.c:1034
 msgid "Copying to remote smime container"
 msgstr ""
 
-#: pith/smkeys.c:462
+#: pith/smkeys.c:1054
 msgid "Copy of smime cert to remote folder failed, changes NOT saved remotely"
 msgstr ""
 
-#: pith/smkeys.c:491
+#: pith/smkeys.c:1083
 #, c-format
 msgid "Saved certificate for <%s>"
 msgstr ""
 
-#: pith/smkeys.c:494
+#: pith/smkeys.c:1086
 #, c-format
 msgid "Couldn't save certificate for <%s>"
 msgstr ""
 
-#: pith/smkeys.c:657
+#: pith/smkeys.c:1319
 msgid "Error in privatekey container, missing END"
 msgstr ""
 
-#: pith/smkeys.c:728
+#: pith/smkeys.c:1386
 #, c-format
-msgid "Error in publiccert container, missing BEGIN, certtext=%s"
+msgid "Error in %scert container, missing BEGIN, certtext=%s"
+msgstr ""
+
+#: pith/smkeys.c:1386
+msgid "ca"
 msgstr ""
 
-#: pith/smkeys.c:818
+#: pith/smkeys.c:1478
 #, c-format
 msgid "Error in cacert container, missing BEGIN, certtext=%s"
 msgstr ""
 
-#: pith/smkeys.c:823
+#: pith/smkeys.c:1483
 #, c-format
 msgid "Error in cacert container, missing separator, line=%s"
 msgstr ""