* Update of the information on how to configure Alpine to use Gmail with

XOAUTH2 authentication.
author: Eduardo Chappa <chappa@washington.edu> 2022-03-07 02:07:25 -0700
committer: Eduardo Chappa <chappa@washington.edu> 2022-03-07 02:07:25 -0700
commit: 20dd136ff32a3879a5f36bbd463cf38ff1f9c087 (patch)
tree: cd7b2be5b54ab9406b063b8f1648b75179ea43d2 /po
parent: 9a7f8440acfa23764cf3227dee3051ea96f09d8e (diff)
download: alpine-20dd136ff32a3879a5f36bbd463cf38ff1f9c087.tar.xz
1 files changed, 3888 insertions, 2996 deletions
diff --git a/po/alpine.pot b/po/alpine.pot
index e55b7d68..d3fb05cf 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: 2017-11-20 22:50-0700\n"
+"POT-Creation-Date: 2022-02-04 21:32-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,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: alpine/osdep/termin.unx.c:738
+#: alpine/osdep/termin.unx.c:734
 msgid "error on fputs() call!"
 msgstr ""
 
-#: alpine/osdep/termin.unx.c:755
+#: alpine/osdep/termin.unx.c:751
 msgid "error on fputs() or fgets() call!"
 msgstr ""
 
@@ -29,40 +29,40 @@ msgstr ""
 #. 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: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
+#: alpine/osdep/print.c:105 alpine/mailview.c:728 alpine/send.c:1349
+#: alpine/send.c:4613 alpine/radio.c:46 alpine/mailcmd.c:906
+#: alpine/mailcmd.c:1079 alpine/mailcmd.c:1194 alpine/reply.c:845
+#: alpine/reply.c:940 alpine/reply.c:1037 pico/display.c:1795
+#: pico/display.c:1823 pico/display.c:1840
 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: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
+#: alpine/osdep/print.c:106 alpine/mailview.c:729 alpine/keymenu.c:551
+#: alpine/keymenu.c:595 alpine/takeaddr.c:577 alpine/takeaddr.c:599
+#: alpine/send.c:1354 alpine/send.c:4618 alpine/send.c:5258 alpine/radio.c:47
+#: alpine/mailcmd.c:907 alpine/mailcmd.c:1080 alpine/mailcmd.c:1195
+#: alpine/titlebar.c:556 alpine/reply.c:944 alpine/reply.c:1042
+#: pico/display.c:1799 pico/display.c:1823 pico/display.c:1847
 msgid "No"
 msgstr ""
 
 #. TRANSLATORS: go to Previous Printer in list
-#: alpine/osdep/print.c:112
+#: alpine/osdep/print.c:108
 msgid "Prev Printer"
 msgstr ""
 
-#: alpine/osdep/print.c:113
+#: alpine/osdep/print.c:109
 msgid "Next Printer"
 msgstr ""
 
 #. TRANSLATORS: use Custom Print command
-#: alpine/osdep/print.c:116
+#: alpine/osdep/print.c:112
 msgid "CustomPrint"
 msgstr ""
 
 #. TRANSLATORS: Print something1 using something2.
 #. For example, Print configuration using printer three.
-#: alpine/osdep/print.c:200
+#: alpine/osdep/print.c:196
 #, c-format
 msgid "Print %s using \"%s\" ? "
 msgstr ""
@@ -70,690 +70,799 @@ msgstr ""
 #. TRANSLATORS: This is a list of errors printed when something goes wrong
 #. early on with the argument list. Be careful not to change literal
 #. option names mentioned in the strings.
-#: alpine/arg.c:54
+#: alpine/arg.c:52
 msgid "missing argument for option \"-pinerc\" (use - for standard out)"
 msgstr ""
 
-#: alpine/arg.c:56
+#: alpine/arg.c:54
 msgid "missing argument for option \"-aux\""
 msgstr ""
 
-#: alpine/arg.c:59
+#: alpine/arg.c:57
 msgid "missing argument for option \"-smimedir\""
 msgstr ""
 
-#: alpine/arg.c:60
+#: alpine/arg.c:58
 msgid "argument to \"-smimedir\" should be fully-qualified"
 msgstr ""
 
-#: alpine/arg.c:63
+#: alpine/arg.c:61
 msgid "missing argument for option \"-passfile\""
 msgstr ""
 
-#: alpine/arg.c:64
+#: alpine/arg.c:62
 msgid "argument to \"-passfile\" should be fully-qualified"
 msgstr ""
 
-#: alpine/arg.c:66
+#: alpine/arg.c:64
 msgid "missing argument for option \"-pwdcertdir\""
 msgstr ""
 
-#: alpine/arg.c:67
+#: alpine/arg.c:65
 msgid "argument to \"-pwdcertdir\" should be fully-qualified"
 msgstr ""
 
-#: alpine/arg.c:70
+#: alpine/arg.c:68
 msgid "missing argument for option \"-sort\""
 msgstr ""
 
-#: alpine/arg.c:71
+#: alpine/arg.c:69
 #, c-format
 msgid "missing argument for flag \"%c\""
 msgstr ""
 
-#: alpine/arg.c:72
+#: alpine/arg.c:70
 #, c-format
 msgid "Non numeric argument for flag \"%c\""
 msgstr ""
 
-#: alpine/arg.c:73
+#: alpine/arg.c:71
 #, c-format
 msgid "Non numeric argument for \"%s\""
 msgstr ""
 
-#: alpine/arg.c:74
+#: alpine/arg.c:72
 msgid "missing URL for \"-url\""
 msgstr ""
 
-#: alpine/arg.c:75
+#: alpine/arg.c:73
 #, c-format
 msgid "missing attachment for \"%s\""
 msgstr ""
 
-#: alpine/arg.c:76
+#: alpine/arg.c:74
 #, c-format
 msgid "conflicting action: \"%s\""
 msgstr ""
 
 #. TRANSLATORS: An error message about an unknown flag (option)
 #. on the command line
-#: alpine/arg.c:77 pico/main.c:89 pico/pilot.c:52
+#: alpine/arg.c:75 pico/main.c:85 pico/pilot.c:48
 #, c-format
 msgid "unknown flag \"%c\""
 msgstr ""
 
-#: alpine/arg.c:78
+#: alpine/arg.c:76
 #, c-format
 msgid "-I argument \"%s\": %s"
 msgstr ""
 
-#: alpine/arg.c:79
+#: alpine/arg.c:77
 #, c-format
 msgid "-d argument \"%s\": %s"
 msgstr ""
 
-#: alpine/arg.c:81
+#: alpine/arg.c:79
 msgid ""
 "missing argument for option \"-copy_pinerc\"\n"
 "Usage: pine -copy_pinerc <local_pinerc> <remote_pinerc>"
 msgstr ""
 
-#: alpine/arg.c:82
+#: alpine/arg.c:80
 msgid ""
 "missing argument for option \"-copy_abook\"\n"
 "Usage: pine -copy_abook <local_abook> <remote_abook>"
 msgstr ""
 
+#: alpine/arg.c:81
+msgid "missing server name. Example: -xoauth2-server Gmail"
+msgstr ""
+
+#: alpine/arg.c:82
+msgid "missing client-id name. Example: -xoauth2-client-id 760.someserver.com"
+msgstr ""
+
+#: alpine/arg.c:83
+msgid "missing client-secret name. Example: -xoauth2-client-secret V56i0fa_"
+msgstr ""
+
+#: alpine/arg.c:84
+msgid "missing tenant value. Example: -xoauth2-tenant common"
+msgstr ""
+
+#: alpine/arg.c:85
+msgid "missing username value. Example: -xoauth2-user user@example.com"
+msgstr ""
+
 #: alpine/arg.c:86
+msgid "missing flow. Example: -xoauth2-client-flow Authorize"
+msgstr ""
+
+#: alpine/arg.c:87
+msgid ""
+"you must set all options -xoauth2-server, -xoauth2-client-id and -xoauth2-"
+"client-secret if you use any of them"
+msgstr ""
+
+#: alpine/arg.c:90
 msgid "Possible Starting Arguments for Alpine program:"
 msgstr ""
 
-#: alpine/arg.c:88
+#: alpine/arg.c:92
 msgid " Argument\tMeaning"
 msgstr ""
 
-#: alpine/arg.c:89
+#: alpine/arg.c:93
 msgid " <addrs>...\tGo directly into composer sending to given address"
 msgstr ""
 
-#: alpine/arg.c:90
+#: alpine/arg.c:94
 msgid "\t\tList multiple addresses with a single space between them."
 msgstr ""
 
-#: alpine/arg.c:91
+#: alpine/arg.c:95
 msgid "\t\tStandard input redirection is allowed with addresses."
 msgstr ""
 
-#: alpine/arg.c:92
+#: alpine/arg.c:96
 msgid "\t\tNote: Places addresses in the \"To\" field only."
 msgstr ""
 
-#: alpine/arg.c:93
+#: alpine/arg.c:97
 msgid " -attach <file>\tGo directly into composer with given file"
 msgstr ""
 
-#: alpine/arg.c:94
+#: alpine/arg.c:98
 msgid " -attachlist <file-list>"
 msgstr ""
 
-#: alpine/arg.c:95
+#: alpine/arg.c:99
 msgid " -attach_and_delete <file>"
 msgstr ""
 
-#: alpine/arg.c:96
+#: alpine/arg.c:100
 msgid "\t\tGo to composer, attach file, delete when finished"
 msgstr ""
 
-#: alpine/arg.c:97
+#: alpine/arg.c:101
 msgid "\t\tNote: Attach options can't be used if -f, -F"
 msgstr ""
 
-#: alpine/arg.c:98
+#: alpine/arg.c:102
 msgid "\t\tadded to Attachment list.  Attachlist must be the last"
 msgstr ""
 
-#: alpine/arg.c:99
+#: alpine/arg.c:103
 msgid "\t\toption on the command line"
 msgstr ""
 
-#: alpine/arg.c:100
+#: alpine/arg.c:104
 msgid " -bail\t\tExit if pinerc file doesn't already exist"
 msgstr ""
 
-#: alpine/arg.c:102
+#: alpine/arg.c:106
 msgid " -d n\t\tDebug - set debug level to 'n', or use the following:"
 msgstr ""
 
-#: alpine/arg.c:103
+#: alpine/arg.c:107
 msgid ""
-" -d keywords...\tflush,timestamp,imap=0..4,tcp,numfiles=0..31,verbose=0..9"
+" -d keywords...\tflush,timestamp,imap=0..4,tcp,http,numfiles=0..31,"
+"verbose=0..9"
 msgstr ""
 
-#: alpine/arg.c:105
+#: alpine/arg.c:109
 msgid " -f <folder>\tFolder - give folder name to open"
 msgstr ""
 
-#: alpine/arg.c:106
+#: alpine/arg.c:110
 msgid " -c <number>\tContext - which context to apply to -f arg"
 msgstr ""
 
-#: alpine/arg.c:107
+#: alpine/arg.c:111
 msgid " -F <file>\tFile - give file name to open and page through and"
 msgstr ""
 
-#: alpine/arg.c:108
+#: alpine/arg.c:112
 msgid "\t\tforward as email."
 msgstr ""
 
-#: alpine/arg.c:109
+#: alpine/arg.c:113
 msgid " -h \t\tHelp - give this list of options"
 msgstr ""
 
-#: alpine/arg.c:110
+#: alpine/arg.c:114
 msgid " -k \t\tKeys - Force use of function keys"
 msgstr ""
 
-#: alpine/arg.c:111
+#: alpine/arg.c:115
 msgid " -z \t\tSuspend - allow use of ^Z suspension"
 msgstr ""
 
-#: alpine/arg.c:112
+#: alpine/arg.c:116
 msgid " -r \t\tRestricted - can only send mail to oneself"
 msgstr ""
 
-#: alpine/arg.c:113
+#: alpine/arg.c:117
 msgid " -sort <sort>\tSort - Specify sort order of folder:"
 msgstr ""
 
-#: alpine/arg.c:114
+#: alpine/arg.c:118
 msgid "\t\t\tarrival, subject, threaded, orderedsubject, date,"
 msgstr ""
 
-#: alpine/arg.c:115
+#: alpine/arg.c:119
 msgid "\t\t\tfrom, size, score, to, cc, /reverse"
 msgstr ""
 
-#: alpine/arg.c:116
+#: alpine/arg.c:120
 msgid " -i\t\tIndex - Go directly to index, bypassing main menu"
 msgstr ""
 
-#: alpine/arg.c:117
+#: alpine/arg.c:121
 msgid " -I <keystroke_list>   Initial keystrokes to be executed"
 msgstr ""
 
-#: alpine/arg.c:118
+#: alpine/arg.c:122
 msgid " -n <number>\tEntry in index to begin on"
 msgstr ""
 
-#: alpine/arg.c:119
+#: alpine/arg.c:123
 msgid " -o \t\tReadOnly - Open first folder read-only"
 msgstr ""
 
-#: alpine/arg.c:120
+#: alpine/arg.c:124
 msgid " -conf\t\tConfiguration - Print out fresh global configuration. The"
 msgstr ""
 
-#: alpine/arg.c:121
+#: alpine/arg.c:125
 msgid "\t\tvalues of your global configuration affect all Alpine users"
 msgstr ""
 
-#: alpine/arg.c:122
+#: alpine/arg.c:126
 msgid "\t\ton your system unless they have overridden the values in their"
 msgstr ""
 
-#: alpine/arg.c:123
+#: alpine/arg.c:127
 msgid "\t\tpinerc files."
 msgstr ""
 
-#: alpine/arg.c:124
+#: alpine/arg.c:128
 msgid ""
 " -pinerc <file>\tConfiguration - Put fresh pinerc configuration in <file>"
 msgstr ""
 
-#: alpine/arg.c:125
+#: alpine/arg.c:129
 msgid " -p <pinerc>\tUse alternate .pinerc file"
 msgstr ""
 
-#: alpine/arg.c:127
+#: alpine/arg.c:131
 msgid " -P <pine.conf>\tUse alternate pine.conf file"
 msgstr ""
 
-#: alpine/arg.c:129
+#: alpine/arg.c:133
 msgid " -aux <aux_files_dir>\tUse this with remote pinerc"
 msgstr ""
 
-#: alpine/arg.c:130
+#: alpine/arg.c:134
 msgid " -P <pine.conf>\tUse pine.conf file for default settings"
 msgstr ""
 
-#: alpine/arg.c:131
+#: alpine/arg.c:135
 msgid " -nosplash \tDisable the PC-Alpine splash screen"
 msgstr ""
 
-#: alpine/arg.c:135
+#: alpine/arg.c:139
 msgid " -erase_stored_passwords\tEliminate any stored passwords"
 msgstr ""
 
-#: alpine/arg.c:139
+#: alpine/arg.c:143
 msgid ""
 " -smimedir <fully_qualified_path>\tdirectory where smime personal "
 "certificates are saved"
 msgstr ""
 
-#: alpine/arg.c:143
+#: alpine/arg.c:147
 msgid ""
 " -passfile <fully_qualified_filename>\tSet the password file to something "
 "other"
 msgstr ""
 
-#: alpine/arg.c:144
+#: alpine/arg.c:148
 msgid "\t\tthan the default"
 msgstr ""
 
-#: alpine/arg.c:146
+#: alpine/arg.c:150
 msgid ""
 " -pwdcertdir <fully_qualified_path>\tSet the directory to store a personal"
 msgstr ""
 
-#: alpine/arg.c:147
+#: alpine/arg.c:151
 msgid "\t\tkey and certificate to encrypt and decrypt your password file."
 msgstr ""
 
-#: alpine/arg.c:152
+#: alpine/arg.c:156
 msgid ""
 " -nowrite_password_cache\tRead from a password cache if there is one, but"
 msgstr ""
 
-#: alpine/arg.c:153
+#: alpine/arg.c:157
 msgid "\t\t\t\tnever offer to write a password to the cache"
 msgstr ""
 
-#: alpine/arg.c:156
+#: alpine/arg.c:160
 msgid " -x <config>\tUse configuration exceptions in <config>."
 msgstr ""
 
-#: alpine/arg.c:157
+#: alpine/arg.c:161
 msgid "\t\tExceptions are used to override your default pinerc"
 msgstr ""
 
-#: alpine/arg.c:158
+#: alpine/arg.c:162
 msgid "\t\tsettings for a particular platform, can be a local file or"
 msgstr ""
 
-#: alpine/arg.c:159
+#: alpine/arg.c:163
 msgid "\t\ta remote folder."
 msgstr ""
 
-#: alpine/arg.c:160
+#: alpine/arg.c:164
 msgid " -v \t\tVersion - show version information"
 msgstr ""
 
-#: alpine/arg.c:161
+#: alpine/arg.c:165
 msgid " -version\tVersion - show version information"
 msgstr ""
 
-#: alpine/arg.c:162
+#: alpine/arg.c:166
 msgid " -supported\tList supported options"
 msgstr ""
 
-#: alpine/arg.c:163
+#: alpine/arg.c:167
 msgid " -url <url>\tOpen the given URL"
 msgstr ""
 
-#: alpine/arg.c:164
+#: alpine/arg.c:168
 msgid "\t\tNote: Can't be used if -f, -F"
 msgstr ""
 
-#: alpine/arg.c:165
+#: alpine/arg.c:169
 msgid "\t\tStandard input redirection is not allowed with URLs."
 msgstr ""
 
-#: alpine/arg.c:166
+#: alpine/arg.c:170
 msgid "\t\tFor mailto URLs, 'body='text should be used in place of"
 msgstr ""
 
-#: alpine/arg.c:167
+#: alpine/arg.c:171
 msgid "\t\tinput redirection."
 msgstr ""
 
-#: alpine/arg.c:168
+#: alpine/arg.c:172
 msgid ""
 " -copy_pinerc <local_pinerc> <remote_pinerc>  copy local pinerc to remote"
 msgstr ""
 
-#: alpine/arg.c:169
+#: alpine/arg.c:173
 msgid ""
 " -copy_abook <local_abook> <remote_abook>     copy local addressbook to "
 "remote"
 msgstr ""
 
-#: alpine/arg.c:170
+#: alpine/arg.c:174
 msgid " -convert_sigs -p <pinerc>   convert signatures to literal signatures"
 msgstr ""
 
-#: alpine/arg.c:172
+#: alpine/arg.c:176
 msgid " -install \tPrompt for some basic setup information"
 msgstr ""
 
-#: alpine/arg.c:173
+#: alpine/arg.c:177
 msgid " -uninstall \tRemove traces of Alpine from Windows system settings"
 msgstr ""
 
-#: alpine/arg.c:174
+#: alpine/arg.c:178
 msgid " -registry <cmd>\tWhere cmd is set,noset,clear,clearsilent,dump"
 msgstr ""
 
-#: alpine/arg.c:573
+#: alpine/arg.c:180
+msgid " -xoauth2-server <value>"
+msgstr ""
+
+#: alpine/arg.c:181
+msgid " -xoauth2-client-id <value>"
+msgstr ""
+
+#: alpine/arg.c:182
+msgid " -xoauth2-client-secret <value>"
+msgstr ""
+
+#: alpine/arg.c:183
+msgid ""
+"\tNote: All of -xoauth options above must be used, if any of them is used"
+msgstr ""
+
+#: alpine/arg.c:184
+msgid " -xoauth2-tenant <value>"
+msgstr ""
+
+#: alpine/arg.c:185
+msgid " -xoauth2-user <value>"
+msgstr ""
+
+#: alpine/arg.c:186
+msgid " -xoauth2-flow <value>"
+msgstr ""
+
+#: alpine/arg.c:187
+msgid ""
+"\tNote: The previous two options are optional and if not used, Alpine "
+"resorts to their default values"
+msgstr ""
+
+#: alpine/arg.c:732
 msgid "Alpine related Registry values removed."
 msgstr ""
 
-#: alpine/arg.c:577
+#: alpine/arg.c:736
 msgid "Not all Alpine related Registry values could be removed"
 msgstr ""
 
-#: alpine/arg.c:595
+#: alpine/arg.c:754
 msgid "unknown registry command"
 msgstr ""
 
-#: alpine/arg.c:696
+#: alpine/arg.c:855
 msgid "getcwd() call failed while parsing argument (1)"
 msgstr ""
 
-#: alpine/arg.c:742
+#: alpine/arg.c:901
 msgid "getcwd() call failed while parsing argument (2)"
 msgstr ""
 
-#: alpine/arg.c:888
+#: alpine/arg.c:1053
 msgid "May only have one of -conf and -pinerc"
 msgstr ""
 
-#: alpine/arg.c:1041
+#: alpine/arg.c:1091
+msgid "Alpine was built with the following options:"
+msgstr ""
+
+#: alpine/arg.c:1230
 #, c-format
 msgid "unknown debug keyword \"%s\""
 msgstr ""
 
-#: alpine/arg.c:1091
+#: alpine/arg.c:1283
 #, c-format
 msgid "unknown flag \"d\", debugging not compiled in"
 msgstr ""
 
-#: alpine/arg.c:1181
+#: alpine/arg.c:1373
 msgid "Argument Error"
 msgstr ""
 
-#: alpine/arg.c:1249
+#: alpine/arg.c:1441
 #, c-format
 msgid "Missing \"=\" after -%s\n"
 msgstr ""
 
-#: alpine/arg.c:1288
+#: alpine/arg.c:1480
 #, c-format
 msgid "Option \"%s\" is obsolete\n"
 msgstr ""
 
-#: alpine/arg.c:1290
+#: alpine/arg.c:1482
 #, c-format
 msgid "Option \"%s\" is not user settable\n"
 msgstr ""
 
-#: alpine/mailview.c:138
+#: alpine/mailview.c:135
 msgid ""
 "Selectable items in text -- Use Up/Down Arrows to choose, Return to view"
 msgstr ""
 
-#: alpine/mailview.c:140
+#: alpine/mailview.c:137
 msgid "No selected item displayed -- Use PrevPage to bring choice into view"
 msgstr ""
 
-#: alpine/mailview.c:142
+#: alpine/mailview.c:139
 msgid "No selected item displayed -- Use NextPage to bring choice into view"
 msgstr ""
 
-#: alpine/mailview.c:248
+#: alpine/mailview.c:247
 msgid "Screen too small to view message"
 msgstr ""
 
-#: alpine/mailview.c:265
+#: alpine/mailview.c:264
 msgid "No messages to read!"
 msgstr ""
 
 #. TRANSLATORS: a screen title
 #. TRANSLATORS: this is a screen title
-#: alpine/mailview.c:381 alpine/adrbkcmd.c:823
+#: alpine/mailview.c:380 alpine/adrbkcmd.c:819
 msgid "MESSAGE TEXT"
 msgstr ""
 
-#: alpine/mailview.c:385 alpine/smime.c:1211
+#: alpine/mailview.c:384 alpine/smime.c:1213
 msgid "HELP FOR MESSAGE TEXT VIEW"
 msgstr ""
 
-#: alpine/mailview.c:732
+#: alpine/mailview.c:734
 msgid "editURL"
 msgstr ""
 
-#: alpine/mailview.c:733
+#: alpine/mailview.c:735
 msgid "editApp"
 msgstr ""
 
-#: alpine/mailview.c:760
+#: alpine/mailview.c:762
 msgid "URL-Viewer is disabled by sys-admin"
 msgstr ""
 
 #. TRANSLATORS: a question
-#: alpine/mailview.c:765
+#: alpine/mailview.c:767
 msgid "No URL-Viewer application defined.  Define now"
 msgstr ""
 
-#: alpine/mailview.c:776
+#: alpine/mailview.c:778
 msgid "Web Browser: "
 msgstr ""
 
-#: alpine/mailview.c:810
+#: alpine/mailview.c:812
 #, c-format
 msgid "Browser not found: %s"
 msgstr ""
 
-#: alpine/mailview.c:880
+#. TRANSLATORS: a question
+#: alpine/mailview.c:842
+msgid "No Image-Viewer application defined.  Define now"
+msgstr ""
+
+#: alpine/mailview.c:853
+msgid "Image Viewer: "
+msgstr ""
+
+#: alpine/mailview.c:865
+#, c-format
+msgid "Image Viewer Not Found: %s"
+msgstr ""
+
+#: alpine/mailview.c:894 alpine/mailview.c:961
+msgid "No eXternal"
+msgstr ""
+
+#: alpine/mailview.c:894 alpine/mailview.c:961
+msgid "External"
+msgstr ""
+
+#: alpine/mailview.c:896 alpine/mailview.c:963 alpine/mailview.c:968
+msgid "Inline imgs"
+msgstr ""
+
+#: alpine/mailview.c:896 alpine/mailview.c:963 alpine/mailview.c:968
+msgid "All images"
+msgstr ""
+
+#: alpine/mailview.c:937
+msgid "setRole"
+msgstr ""
+
+#: alpine/mailview.c:1004
 msgid "Edit URL: "
 msgstr ""
 
-#: alpine/mailview.c:918
+#: alpine/mailview.c:1042
 msgid "Viewer Command: "
 msgstr ""
 
-#: alpine/mailview.c:1451
+#: alpine/mailview.c:1598
 msgid "VIEWER command completed"
 msgstr ""
 
 #. TRANSLATORS: Cannot start command : <command name>
-#: alpine/mailview.c:1456
+#: alpine/mailview.c:1603
 #, c-format
 msgid "Cannot start command : %s"
 msgstr ""
 
-#: alpine/mailview.c:1464
+#: alpine/mailview.c:1611
 #, c-format
 msgid "\"URL-Viewer\" not defined: Can't open %s"
 msgstr ""
 
-#: alpine/mailview.c:1788
+#: alpine/mailview.c:1694
+msgid "\"Image-Viewer\" not defined: Can't open image"
+msgstr ""
+
+#: alpine/mailview.c:2059
 msgid "Can't create space for composer"
 msgstr ""
 
 #. TRANSLATORS: these are errors in news group URLs
-#: alpine/mailview.c:1963
+#: alpine/mailview.c:2235
 msgid "Invalid newsgroup specified"
 msgstr ""
 
-#: alpine/mailview.c:1972
+#: alpine/mailview.c:2244
 msgid "No newsgroup specified"
 msgstr ""
 
-#: alpine/mailview.c:1975
+#: alpine/mailview.c:2247
 msgid "No server specified"
 msgstr ""
 
-#: alpine/mailview.c:2010
+#: alpine/mailview.c:2282
 msgid "Couldn't find specified article number"
 msgstr ""
 
 #. TRANSLATORS: this is a warning that the file URL can cause programs to run which may
 #. be a security problem. We are asking the user to confirm that they want to do this.
-#: alpine/mailview.c:2109
+#: alpine/mailview.c:2381
 msgid "\"file\" URL may cause programs to be run on your system. Run anyway"
 msgstr ""
 
-#: alpine/mailview.c:2122
+#: alpine/mailview.c:2394
 msgid "No viewer for \"file\" URL.  VIEWER command cancelled"
 msgstr ""
 
-#: alpine/mailview.c:2126
+#: alpine/mailview.c:2398
 msgid "VIEWER command cancelled"
 msgstr ""
 
-#: alpine/mailview.c:2663
+#: alpine/mailview.c:2964
 msgid "No help text currently available"
 msgstr ""
 
-#: alpine/mailview.c:2718 alpine/mailview.c:2922
+#: alpine/mailview.c:3019 alpine/mailview.c:3223
 #, c-format
 msgid "Already at start of %s"
 msgstr ""
 
-#: alpine/mailview.c:2741 alpine/mailview.c:2850
+#: alpine/mailview.c:3042 alpine/mailview.c:3151
 #, c-format
 msgid "Already at end of %s"
 msgstr ""
 
-#: alpine/mailview.c:2957
+#: alpine/mailview.c:3258
 #, c-format
 msgid "Already on last item in %s"
 msgstr ""
 
-#: alpine/mailview.c:2992
+#: alpine/mailview.c:3293
 #, c-format
 msgid "Already on first item in %s"
 msgstr ""
 
-#: alpine/mailview.c:3124 alpine/confscroll.c:1266 alpine/addrbook.c:5770
+#: alpine/mailview.c:3425 alpine/confscroll.c:1268 alpine/addrbook.c:5770
 msgid "Current line contains the only match"
 msgstr ""
 
-#: alpine/mailview.c:3179 alpine/takeaddr.c:1637 alpine/confscroll.c:1281
-#: alpine/mailindx.c:3202 alpine/addrbook.c:5762 alpine/mailpart.c:784
+#: alpine/mailview.c:3480 alpine/takeaddr.c:1633 alpine/confscroll.c:1283
+#: alpine/mailindx.c:3225 alpine/addrbook.c:5762 alpine/mailpart.c:789
 msgid "Word not found"
 msgstr ""
 
-#: alpine/mailview.c:3585
+#: alpine/mailview.c:3886
 msgid "First Line"
 msgstr ""
 
-#: alpine/mailview.c:3586
+#: alpine/mailview.c:3887
 msgid "Last Line"
 msgstr ""
 
-#: alpine/mailview.c:3605 alpine/mailindx.c:2998
+#: alpine/mailview.c:3906
 #, c-format
 msgid "Word to search for [%s] : "
 msgstr ""
 
-#: alpine/mailview.c:3638
+#: alpine/mailview.c:3939
 msgid "Searched to First Line."
 msgstr ""
 
-#: alpine/mailview.c:3644
+#: alpine/mailview.c:3945
 msgid "Searched to Last Line."
 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:2375
+#: alpine/mailview.c:5335 alpine/mailview.c:5356 alpine/adrbkcmd.c:154
+#: alpine/adrbkcmd.c:240 alpine/adrbkcmd.c:672 alpine/adrbkcmd.c:803
+#: alpine/alpine.c:2469
 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: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
+#: alpine/keymenu.c:52 alpine/keymenu.c:961 alpine/radio.c:379
+#: pico/display.c:85 pico/display.c:1647 pico/display.c:1686
+#: pico/display.c:1797 pico/display.c:2081 pico/word.c:658 pico/composer.c:136
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: go to Previous Entry
-#: alpine/keymenu.c:79
+#: alpine/keymenu.c:75
 msgid "PrevEntry"
 msgstr ""
 
 #. TRANSLATORS: go to Next Entry
-#: alpine/keymenu.c:81
+#: alpine/keymenu.c:77
 msgid "NextEntry"
 msgstr ""
 
 #. TRANSLATORS: Select this Entry
 #. TRANSLATORS: Select something, choose something
-#: 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: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
+#: alpine/keymenu.c:101 alpine/keymenu.c:123 alpine/keymenu.c:341
+#: alpine/keymenu.c:371 alpine/keymenu.c:400 alpine/keymenu.c:426
+#: alpine/keymenu.c:458 alpine/keymenu.c:661 alpine/keymenu.c:691
+#: alpine/keymenu.c:739 alpine/keymenu.c:1281 alpine/keymenu.c:1298
+#: alpine/keymenu.c:1527 alpine/keymenu.c:1543 alpine/keymenu.c:1559
+#: alpine/keymenu.c:1588 alpine/keymenu.c:1617 alpine/keymenu.c:1646
+#: alpine/keymenu.c:1675 alpine/keymenu.c:1704 alpine/keymenu.c:1735
+#: alpine/keymenu.c:1766 alpine/keymenu.c:1800 alpine/keymenu.c:1815
+#: alpine/keymenu.c:2396 alpine/keymenu.c:2428 alpine/keymenu.c:2445
+#: alpine/keymenu.c:2461 alpine/keymenu.c:2479 alpine/keymenu.c:2508
+#: alpine/keymenu.c:2537 alpine/keymenu.c:2628 alpine/keymenu.c:2750
+#: alpine/keymenu.c:2882 alpine/mailcmd.c:7451 alpine/folder.c:3179
+#: alpine/roleconf.c:162 alpine/addrbook.c:2452 alpine/addrbook.c:2456
+#: alpine/addrbook.c:2461 alpine/addrbook.c:2490 pico/browse.c:2329
 msgid "Select"
 msgstr ""
 
 #. TRANSLATORS: Apply a command to several objects at once
-#: alpine/keymenu.c:107 alpine/keymenu.c:637 alpine/keymenu.c:715
+#: alpine/keymenu.c:103 alpine/keymenu.c:662 alpine/keymenu.c:740
 msgid "Apply"
 msgstr ""
 
 #. TRANSLATORS: Select Current entry
 #. 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:873
+#: alpine/keymenu.c:105 alpine/keymenu.c:343 alpine/keymenu.c:672
+#: alpine/keymenu.c:750 alpine/keymenu.c:898
 msgid "SelectCur"
 msgstr ""
 
 #. TRANSLATORS: Zoom refers to zooming in on a smaller set of
 #. items, like with a camera zoom lense
-#: alpine/keymenu.c:112 alpine/keymenu.c:344 alpine/keymenu.c:648
-#: alpine/keymenu.c:726
+#: alpine/keymenu.c:108 alpine/keymenu.c:340 alpine/keymenu.c:673
+#: alpine/keymenu.c:751
 msgid "ZoomMode"
 msgstr ""
 
-#: 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
+#: alpine/keymenu.c:122 alpine/keymenu.c:566 alpine/keymenu.c:580
+#: alpine/keymenu.c:1373 alpine/keymenu.c:1390 alpine/keymenu.c:1526
+#: alpine/keymenu.c:1558 alpine/keymenu.c:1616 alpine/keymenu.c:1674
+#: alpine/keymenu.c:1783 alpine/keymenu.c:1799 alpine/keymenu.c:1814
+#: pico/display.c:68 pico/display.c:1362
 msgid "Exit"
 msgstr ""
 
 #. TRANSLATORS: go to Previous entry
-#: 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
+#: alpine/keymenu.c:125 alpine/keymenu.c:1528 alpine/keymenu.c:1544
+#: alpine/keymenu.c:1560 alpine/keymenu.c:1589 alpine/keymenu.c:1618
+#: alpine/keymenu.c:1647 alpine/keymenu.c:1676 alpine/keymenu.c:1705
 msgid "Prev"
 msgstr ""
 
-#: 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
+#: alpine/keymenu.c:126 alpine/keymenu.c:1529 alpine/keymenu.c:1545
+#: alpine/keymenu.c:1561 alpine/keymenu.c:1590 alpine/keymenu.c:1619
+#: alpine/keymenu.c:1648 alpine/keymenu.c:1677 alpine/keymenu.c:1706
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: Abook is an abbreviation for Address Book
-#: alpine/keymenu.c:144
+#: alpine/keymenu.c:140
 msgid "Abook"
 msgstr ""
 
-#: alpine/keymenu.c:145
+#: alpine/keymenu.c:141
 msgid "Update"
 msgstr ""
 
@@ -762,396 +871,407 @@ 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:1297
-#: alpine/keymenu.c:1327 alpine/addrbook.c:2602 alpine/addrbook.c:2673
+#: alpine/keymenu.c:144 alpine/keymenu.c:194 alpine/keymenu.c:1320
+#: alpine/keymenu.c:1350 alpine/addrbook.c:2602 alpine/addrbook.c:2673
 msgid "ComposeTo"
 msgstr ""
 
 #. TRANSLATORS: abbreviation for Forward as Email
-#: alpine/keymenu.c:155
+#: alpine/keymenu.c:151
 msgid "Fwd Email"
 msgstr ""
 
 #. TRANSLATORS: View the highlighted link, for example, a URL
-#: alpine/keymenu.c:161 alpine/keymenu.c:209
+#: alpine/keymenu.c:157 alpine/keymenu.c:205 alpine/keymenu.c:1086
 msgid "ViewLink"
 msgstr ""
 
 #. TRANSLATORS: go to the previous link, for example, the previous URL
-#: alpine/keymenu.c:164 alpine/keymenu.c:211 alpine/keymenu.c:479
+#: alpine/keymenu.c:160 alpine/keymenu.c:207 alpine/keymenu.c:475
 msgid "PrevLink"
 msgstr ""
 
-#: alpine/keymenu.c:165 alpine/keymenu.c:212 alpine/keymenu.c:480
+#: alpine/keymenu.c:161 alpine/keymenu.c:208 alpine/keymenu.c:476
 msgid "NextLink"
 msgstr ""
 
-#: alpine/keymenu.c:178 alpine/keymenu.c:506 alpine/keymenu.c:908
-#: alpine/keymenu.c:1320 alpine/keymenu.c:2729
+#: alpine/keymenu.c:174 alpine/keymenu.c:502 alpine/keymenu.c:933
+#: alpine/keymenu.c:1343 alpine/keymenu.c:2852
 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:917
-#: alpine/keymenu.c:1040 alpine/takeaddr.c:66 alpine/mailcmd.c:175
-#: alpine/adrbkcmd.c:5242 alpine/adrbkcmd.c:5273
+#: alpine/keymenu.c:183 alpine/keymenu.c:511 alpine/keymenu.c:558
+#: alpine/keymenu.c:573 alpine/keymenu.c:586 alpine/keymenu.c:603
+#: alpine/keymenu.c:780 alpine/keymenu.c:942 alpine/keymenu.c:1065
+#: alpine/takeaddr.c:62 alpine/mailcmd.c:175 alpine/adrbkcmd.c:5239
+#: alpine/adrbkcmd.c:5270
 msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: go back to the index of results instead of
 #. viewing this particular entry
-#: alpine/keymenu.c:196
+#: alpine/keymenu.c:192
 msgid "Results Index"
 msgstr ""
 
-#: alpine/keymenu.c:225 alpine/folder.c:2996 alpine/addrbook.c:2586
+#: alpine/keymenu.c:221 alpine/folder.c:2992 alpine/addrbook.c:2586
 #: alpine/addrbook.c:2644 alpine/addrbook.c:2666 alpine/addrbook.c:2685
 msgid "Main Menu"
 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:3033 alpine/folder.c:3203
+#: alpine/keymenu.c:223 alpine/keymenu.c:285 alpine/keymenu.c:302
+#: alpine/folder.c:3029 alpine/folder.c:3194
 msgid "View Cltn"
 msgstr ""
 
 #. TRANSLATORS: a command name for a particular key
-#: alpine/keymenu.c:256 alpine/keymenu.c:956 alpine/keymenu.c:1443
-#: alpine/keymenu.c:1749 alpine/addrbook.c:2367
+#: alpine/keymenu.c:252 alpine/keymenu.c:981 alpine/keymenu.c:1494
+#: alpine/keymenu.c:1830 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: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
+#: alpine/keymenu.c:253 alpine/keymenu.c:1495 alpine/keymenu.c:1744
+#: alpine/keymenu.c:1831 alpine/keymenu.c:2412 alpine/keymenu.c:2568
+#: alpine/keymenu.c:2598 alpine/keymenu.c:2644 alpine/addrbook.c:2397
 msgid "Change"
 msgstr ""
 
-#: alpine/keymenu.c:263
+#: alpine/keymenu.c:259
 msgid "Add Cltn"
 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:1454
-#: alpine/keymenu.c:1758 alpine/keymenu.c:1795 alpine/keymenu.c:1824
-#: alpine/addrbook.c:2393
+#: alpine/keymenu.c:262 alpine/keymenu.c:351 alpine/keymenu.c:1505
+#: alpine/keymenu.c:1839 alpine/keymenu.c:1876 alpine/keymenu.c:1904
+#: alpine/keymenu.c:1932 alpine/addrbook.c:2393
 msgid "Shuffle"
 msgstr ""
 
 #. TRANSLATORS: Command to Exit the Select screen. This would
 #. be a way to make no Selection and go back to where you
 #. 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:1256 alpine/keymenu.c:1282 alpine/folder.c:3141
+#: alpine/keymenu.c:282 alpine/keymenu.c:300 alpine/keymenu.c:364
+#: alpine/keymenu.c:393 alpine/keymenu.c:457 alpine/keymenu.c:689
+#: alpine/keymenu.c:1279 alpine/keymenu.c:1305 alpine/folder.c:3137
 #: 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:1756 alpine/takeaddr.c:602
-#: alpine/folder.c:1270 pico/browse.c:2252
+#: alpine/keymenu.c:325 alpine/keymenu.c:1837 alpine/takeaddr.c:598
+#: alpine/folder.c:1266 pico/browse.c:2331
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: change the name of something
-#: alpine/keymenu.c:332 alpine/folder.c:5367 pico/browse.c:119
+#: alpine/keymenu.c:328 alpine/folder.c:5362 pico/browse.c:120
 msgid "Rename"
 msgstr ""
 
-#: alpine/keymenu.c:339 alpine/folder.c:3020
+#: alpine/keymenu.c:335 alpine/folder.c:3016
 msgid "View Fldr"
 msgstr ""
 
-#: alpine/keymenu.c:343 alpine/keymenu.c:767 alpine/keymenu.c:813
+#: alpine/keymenu.c:339 alpine/keymenu.c:792 alpine/keymenu.c:838
 #: alpine/mailcmd.c:173
 msgid "Print"
 msgstr ""
 
 #. TRANSLATORS: Import refers to bringing something in from
 #. outside of alpine's normal world
-#: alpine/keymenu.c:360
+#: alpine/keymenu.c:356
 msgid "Import"
 msgstr ""
 
 #. TRANSLATORS: Add a new entry (this is a command)
-#: alpine/keymenu.c:406 alpine/addrbook.c:2596 alpine/addrbook.c:2654
+#: alpine/keymenu.c:402 alpine/addrbook.c:2596 alpine/addrbook.c:2654
 msgid "AddNew"
 msgstr ""
 
 #. TRANSLATORS: Subscribe to a news group
-#: alpine/keymenu.c:427 alpine/folder.c:2299 alpine/folder.c:3247
+#: alpine/keymenu.c:423 alpine/folder.c:2295 alpine/folder.c:3238
 msgid "Subscribe"
 msgstr ""
 
 #. TRANSLATORS: Exit Subscribe screen
-#: alpine/keymenu.c:429
+#: alpine/keymenu.c:425
 msgid "ExitSubscb"
 msgstr ""
 
 #. TRANSLATORS: List Mode in alpine is where you can select not just
 #. one of something but you can select a whole list of something, for
 #. example a whole list of addresses to send to.
-#: alpine/keymenu.c:438
+#: alpine/keymenu.c:434
 msgid "List Mode"
 msgstr ""
 
-#: alpine/keymenu.c:484
+#: alpine/keymenu.c:480
 msgid "Print All"
 msgstr ""
 
-#: alpine/keymenu.c:485 alpine/print.c:982 pith/ldap.c:1868
+#: alpine/keymenu.c:481 alpine/print.c:978 pith/ldap.c:1886
 msgid "Name"
 msgstr ""
 
 #. TRANSLATORS: Continue means to keep going. The user is paused to read
 #. something and has to tell us to continue when they are finished.
-#: alpine/keymenu.c:538
+#: alpine/keymenu.c:534
 msgid "Continue"
 msgstr ""
 
-#: alpine/keymenu.c:553 alpine/keymenu.c:569
+#: alpine/keymenu.c:549 alpine/keymenu.c:594
 msgid "Yes, continue"
 msgstr ""
 
-#: alpine/keymenu.c:554 alpine/imap.c:1572
+#: alpine/keymenu.c:550 alpine/imap.c:2700
 msgid "Details"
 msgstr ""
 
+#: alpine/keymenu.c:564
+msgid "Enter Code"
+msgstr ""
+
+#: alpine/keymenu.c:565 alpine/keymenu.c:579
+msgid "View URL"
+msgstr ""
+
 #. TRANSLATORS: Exit Command List
-#: alpine/keymenu.c:586
+#: alpine/keymenu.c:611
 msgid "Exit CmdList"
 msgstr ""
 
-#: alpine/keymenu.c:587
+#: alpine/keymenu.c:612
 msgid "Try Command"
 msgstr ""
 
 #. TRANSLATORS: go to Previous Command in list
-#: alpine/keymenu.c:590
+#: alpine/keymenu.c:615
 msgid "Prev Cmd"
 msgstr ""
 
 #. TRANSLATORS: go to Next Command in list
-#: alpine/keymenu.c:592
+#: alpine/keymenu.c:617
 msgid "Next Cmd"
 msgstr ""
 
 #. TRANSLATORS: this stands for unexclude which is the opposite
 #. of the exclude command. Exclude eliminates some messages from
 #. the view and unexclude gets them back.
-#: alpine/keymenu.c:635 alpine/keymenu.c:713
+#: alpine/keymenu.c:660 alpine/keymenu.c:738
 msgid "unXclude"
 msgstr ""
 
 #. TRANSLATORS: toggles a collapsed view or an expanded view
 #. of a message thread on and off
-#: alpine/keymenu.c:656 alpine/keymenu.c:732
+#: alpine/keymenu.c:681 alpine/keymenu.c:757
 msgid "Collapse/Expand"
 msgstr ""
 
-#: alpine/keymenu.c:657 alpine/keymenu.c:733
+#: alpine/keymenu.c:682 alpine/keymenu.c:758
 msgid "Quota"
 msgstr ""
 
 #. TRANSLATORS: go to the Folder List
-#: alpine/keymenu.c:682 alpine/mailindx.c:137
+#: alpine/keymenu.c:707 alpine/mailindx.c:133
 msgid "FldrList"
 msgstr ""
 
 #. TRANSLATORS: View a Thread of messages
-#: alpine/keymenu.c:684
+#: alpine/keymenu.c:709
 msgid "ViewThd"
 msgstr ""
 
 #. TRANSLATORS: go to the Previous Thread
-#: alpine/keymenu.c:687
+#: alpine/keymenu.c:712
 msgid "PrevThd"
 msgstr ""
 
 #. TRANSLATORS: go to the Next Thread
-#: alpine/keymenu.c:689
+#: alpine/keymenu.c:714
 msgid "NextThd"
 msgstr ""
 
-#: alpine/keymenu.c:742 alpine/keymenu.c:1290 alpine/keymenu.c:1321
-#: alpine/folder.c:893 alpine/folder.c:983 pico/browse.c:2244
+#: alpine/keymenu.c:767 alpine/keymenu.c:1313 alpine/keymenu.c:1344
+#: alpine/folder.c:889 alpine/folder.c:979 pico/browse.c:2323
 msgid "View"
 msgstr ""
 
 #. TRANSLATORS: go to Previous Attachment
-#: alpine/keymenu.c:745
+#: alpine/keymenu.c:770
 msgid "PrevAttch"
 msgstr ""
 
 #. TRANSLATORS: go to Next Attachment
-#: alpine/keymenu.c:748
+#: alpine/keymenu.c:773
 msgid "NextAtch"
 msgstr ""
 
 #. TRANSLATORS: About Attachment, a short description of the attachment
-#: alpine/keymenu.c:765
+#: alpine/keymenu.c:790
 msgid "AboutAttch"
 msgstr ""
 
+#: alpine/keymenu.c:800
+msgid "eXternal"
+msgstr ""
+
 #. TRANSLATORS: View highlighted URL
 #. TRANSLATORS: View the highlighted URL
-#: alpine/keymenu.c:792 alpine/keymenu.c:870
+#: alpine/keymenu.c:817 alpine/keymenu.c:895
 msgid "View Hilite"
 msgstr ""
 
 #. TRANSLATORS: go to Previous URL
 #. TRANSLATORS: go to previous URL
-#: alpine/keymenu.c:795 alpine/keymenu.c:875
+#: alpine/keymenu.c:820 alpine/keymenu.c:900
 msgid "Prev URL"
 msgstr ""
 
 #. TRANSLATORS: go to Next URL
 #. TRANSLATORS: go to next URL
-#: alpine/keymenu.c:797 alpine/keymenu.c:877
+#: alpine/keymenu.c:822 alpine/keymenu.c:902
 msgid "Next URL"
 msgstr ""
 
 #. TRANSLATORS: go to Message Index
-#: alpine/keymenu.c:842
+#: alpine/keymenu.c:867
 msgid "MsgIndex"
 msgstr ""
 
 #. TRANSLATORS: View the Attachment
-#: alpine/keymenu.c:844
+#: alpine/keymenu.c:869
 msgid "ViewAttch"
 msgstr ""
 
-#: alpine/keymenu.c:890
+#: alpine/keymenu.c:915
 msgid "TogglePreferPlain"
 msgstr ""
 
-#: alpine/keymenu.c:935 alpine/radio.c:289 alpine/radio.c:369
+#: alpine/keymenu.c:960 alpine/radio.c:291 alpine/radio.c:371
 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:941
+#: alpine/keymenu.c:966
 msgid "Accept"
 msgstr ""
 
-#: alpine/keymenu.c:957
+#: alpine/keymenu.c:982
 msgid "Printer"
 msgstr ""
 
 #. TRANSLATORS: Change password
-#: alpine/keymenu.c:959
+#: alpine/keymenu.c:984
 msgid "Newpassword"
 msgstr ""
 
 #. TRANSLATORS: Configure Alpine
-#: alpine/keymenu.c:961 alpine/adrbkcmd.c:3182
+#: alpine/keymenu.c:986 alpine/adrbkcmd.c:3179
 msgid "Config"
 msgstr ""
 
 #. TRANSLATORS: Edit signature block
-#: alpine/keymenu.c:963
+#: alpine/keymenu.c:988
 msgid "Signature"
 msgstr ""
 
 #. TRANSLATORS: configure address books
-#: alpine/keymenu.c:965
+#: alpine/keymenu.c:990
 msgid "AddressBooks"
 msgstr ""
 
 #. TRANSLATORS: configure collection lists
-#: alpine/keymenu.c:967
+#: alpine/keymenu.c:992
 msgid "collectionList"
 msgstr ""
 
 #. TRANSLATORS: configure rules, an alpine concept
-#: alpine/keymenu.c:969
+#: alpine/keymenu.c:994
 msgid "Rules"
 msgstr ""
 
 #. TRANSLATORS: configure directory servers
-#: alpine/keymenu.c:971 alpine/folder.c:4470
+#: alpine/keymenu.c:996 alpine/folder.c:4465
 msgid "Directory"
 msgstr ""
 
 #. TRANSLATORS: configure color
-#: alpine/keymenu.c:973
+#: alpine/keymenu.c:998
 msgid "Kolor"
 msgstr ""
 
 #. TRANSLATORS: remote configuration setup
-#: alpine/keymenu.c:979
+#: alpine/keymenu.c:1004
 msgid "RemoteConfigSetup"
 msgstr ""
 
 #. TRANSLATORS: configure S/MIME
-#: alpine/keymenu.c:981
+#: alpine/keymenu.c:1006
 msgid "S/Mime"
 msgstr ""
 
+#: alpine/keymenu.c:1007
+msgid "xoaUth2"
+msgstr ""
+
 #. TRANSLATORS: go to Previous Command in list
-#: alpine/keymenu.c:998
+#: alpine/keymenu.c:1023
 msgid "PrevCmd"
 msgstr ""
 
-#: alpine/keymenu.c:999
+#: alpine/keymenu.c:1024
 msgid "NextCmd"
 msgstr ""
 
 #. TRANSLATORS: show release notes
-#: alpine/keymenu.c:1003 alpine/keymenu.c:1071
+#: alpine/keymenu.c:1028 alpine/keymenu.c:1094
 msgid "RelNotes"
 msgstr ""
 
 #. TRANSLATORS: lock keyboard
-#: alpine/keymenu.c:1005
+#: alpine/keymenu.c:1030
 msgid "KBLock"
 msgstr ""
 
-#: alpine/keymenu.c:1015 alpine/mailcmd.c:6179
+#: alpine/keymenu.c:1040 alpine/mailcmd.c:6248
 msgid "Index"
 msgstr ""
 
 #. TRANSLATORS: go to the Journal. The Journal shows past
 #. messages that alpine has shown the user.
-#: alpine/keymenu.c:1018
+#: alpine/keymenu.c:1043
 msgid "Journal"
 msgstr ""
 
 #. TRANSLATORS: go to the Setup screen
-#: alpine/keymenu.c:1020
+#: alpine/keymenu.c:1045
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: go to the address book screen
-#: alpine/keymenu.c:1022
+#: alpine/keymenu.c:1047
 msgid "AddrBook"
 msgstr ""
 
-#: alpine/keymenu.c:1031
+#: alpine/keymenu.c:1056
 msgid "Quit Viewer"
 msgstr ""
 
-#. TRANSLATORS: Alpine asks the user to be counted when they
-#. first start using alpine.
-#: alpine/keymenu.c:1063
-msgid "Be Counted!"
-msgstr ""
-
-#: alpine/keymenu.c:1092
+#: alpine/keymenu.c:1115
 msgid "Finished"
 msgstr ""
 
 #. TRANSLATORS: Take this address into the address book
-#: alpine/keymenu.c:1110 alpine/keymenu.c:1128 alpine/keymenu.c:2566
-#: alpine/keymenu.c:2582
+#: alpine/keymenu.c:1133 alpine/keymenu.c:1151 alpine/keymenu.c:2674
+#: alpine/keymenu.c:2690
 msgid "Take"
 msgstr ""
 
@@ -1160,24 +1280,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: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
+#: alpine/keymenu.c:1138 alpine/keymenu.c:1622 alpine/keymenu.c:1651
+#: alpine/keymenu.c:1680 alpine/keymenu.c:1709 alpine/keymenu.c:2695
+#: alpine/folder.c:3231 alpine/addrbook.c:2518 pico/browse.c:2336
 msgid "Set/Unset"
 msgstr ""
 
-#: alpine/keymenu.c:1116 alpine/keymenu.c:2588
+#: alpine/keymenu.c:1139 alpine/keymenu.c:2696
 msgid "SetAll"
 msgstr ""
 
-#: alpine/keymenu.c:1117 alpine/keymenu.c:2589
+#: alpine/keymenu.c:1140 alpine/keymenu.c:2697
 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:1120 alpine/keymenu.c:1572 alpine/keymenu.c:1601
-#: alpine/keymenu.c:2590
+#: alpine/keymenu.c:1143 alpine/keymenu.c:1623 alpine/keymenu.c:1652
+#: alpine/keymenu.c:2698
 msgid "SinglMode"
 msgstr ""
 
@@ -1187,297 +1307,330 @@ 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:1138 alpine/keymenu.c:1514 alpine/keymenu.c:1543
-#: alpine/keymenu.c:2574 alpine/addrbook.c:2527 pico/browse.c:2261
+#: alpine/keymenu.c:1161 alpine/keymenu.c:1565 alpine/keymenu.c:1594
+#: alpine/keymenu.c:2682 alpine/addrbook.c:2527 pico/browse.c:2340
 msgid "ListMode"
 msgstr ""
 
-#: alpine/keymenu.c:1144
+#: alpine/keymenu.c:1167
 msgid "Stop Waiting"
 msgstr ""
 
 #. TRANSLATORS: Change Value
-#: 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
+#: alpine/keymenu.c:1186 alpine/keymenu.c:1408 alpine/keymenu.c:1436
+#: alpine/keymenu.c:1465 alpine/keymenu.c:1862 alpine/keymenu.c:1890
+#: alpine/keymenu.c:1918 alpine/keymenu.c:1947 alpine/keymenu.c:1978
+#: alpine/keymenu.c:2007 alpine/keymenu.c:2037 alpine/keymenu.c:2067
+#: alpine/keymenu.c:2097 alpine/keymenu.c:2126 alpine/keymenu.c:2172
+#: alpine/keymenu.c:2202 alpine/keymenu.c:2232 alpine/keymenu.c:2261
+#: alpine/keymenu.c:2291 alpine/keymenu.c:2320 alpine/keymenu.c:2350
 msgid "Change Val"
 msgstr ""
 
 #. TRANSLATORS: Delete Value
-#: 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
+#: alpine/keymenu.c:1193 alpine/keymenu.c:1414 alpine/keymenu.c:1442
+#: alpine/keymenu.c:1471 alpine/keymenu.c:1868 alpine/keymenu.c:1896
+#: alpine/keymenu.c:1924 alpine/keymenu.c:1953 alpine/keymenu.c:1984
+#: alpine/keymenu.c:2013 alpine/keymenu.c:2043 alpine/keymenu.c:2073
+#: alpine/keymenu.c:2103 alpine/keymenu.c:2132 alpine/keymenu.c:2178
+#: alpine/keymenu.c:2208 alpine/keymenu.c:2238 alpine/keymenu.c:2267
+#: alpine/keymenu.c:2297 alpine/keymenu.c:2326 alpine/keymenu.c:2356
 msgid "Delete Val"
 msgstr ""
 
-#: alpine/keymenu.c:1176 alpine/keymenu.c:2473 alpine/keymenu.c:2502
-#: alpine/keymenu.c:2548
+#: alpine/keymenu.c:1199 alpine/keymenu.c:2581 alpine/keymenu.c:2610
+#: alpine/keymenu.c:2656
 msgid "IndxHdr"
 msgstr ""
 
-#: alpine/keymenu.c:1239
+#: alpine/keymenu.c:1262
 msgid "Add KW"
 msgstr ""
 
 #. TRANSLATORS: Exit from the Flags screen
-#: alpine/keymenu.c:1241
+#: alpine/keymenu.c:1264
 msgid "Exit Flags"
 msgstr ""
 
 #. TRANSLATORS: go to address book list
-#: alpine/keymenu.c:1274 alpine/keymenu.c:1289 alpine/addrbook.c:2436
+#: alpine/keymenu.c:1297 alpine/keymenu.c:1312 alpine/addrbook.c:2436
 #: alpine/addrbook.c:2639
 msgid "AddressBkList"
 msgstr ""
 
-#: 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
+#: alpine/keymenu.c:1413 alpine/keymenu.c:1441 alpine/keymenu.c:1470
+#: alpine/keymenu.c:1867 alpine/keymenu.c:1895 alpine/keymenu.c:1923
+#: alpine/keymenu.c:1952 alpine/keymenu.c:1983 alpine/keymenu.c:2012
+#: alpine/keymenu.c:2042 alpine/keymenu.c:2072 alpine/keymenu.c:2102
+#: alpine/keymenu.c:2131 alpine/keymenu.c:2177 alpine/keymenu.c:2207
+#: alpine/keymenu.c:2237 alpine/keymenu.c:2266 alpine/keymenu.c:2296
+#: alpine/keymenu.c:2325 alpine/keymenu.c:2355
 msgid "Add Value"
 msgstr ""
 
+#: alpine/keymenu.c:1448 alpine/keymenu.c:1902
+msgid "Add Server"
+msgstr ""
+
+#: alpine/keymenu.c:1449 alpine/keymenu.c:1903
+msgid "Del Server"
+msgstr ""
+
+#: alpine/keymenu.c:1451 alpine/keymenu.c:1905
+msgid "Conf Help"
+msgstr ""
+
 #. TRANSLATORS: go to list of keywords
-#: alpine/keymenu.c:1429
+#: alpine/keymenu.c:1480
 msgid "ToCharsets"
 msgstr ""
 
 #. TRANSLATORS: go to previous LDAP directory server in the list
-#: alpine/keymenu.c:1446
+#: alpine/keymenu.c:1497
 msgid "PrevDir"
 msgstr ""
 
-#: alpine/keymenu.c:1447
+#: alpine/keymenu.c:1498
 msgid "NextDir"
 msgstr ""
 
 #. TRANSLATORS: add a directory server to configuration
-#: alpine/keymenu.c:1451 pico/browse.c:1071
+#: alpine/keymenu.c:1502 pico/browse.c:1110
 msgid "Add Dir"
 msgstr ""
 
 #. TRANSLATORS: delete a directory
-#: alpine/keymenu.c:1453
+#: alpine/keymenu.c:1504
 msgid "Del Dir"
 msgstr ""
 
-#: alpine/keymenu.c:1491 alpine/keymenu.c:1536 alpine/keymenu.c:1594
-#: alpine/keymenu.c:1652
+#: alpine/keymenu.c:1542 alpine/keymenu.c:1587 alpine/keymenu.c:1645
+#: alpine/keymenu.c:1703
 msgid "exit"
 msgstr ""
 
 #. TRANSLATORS: add a printer to configuration
-#: alpine/keymenu.c:1690
+#: alpine/keymenu.c:1741
 msgid "Add Printer"
 msgstr ""
 
 #. TRANSLATORS: delete a printer from configuration
-#: alpine/keymenu.c:1692
+#: alpine/keymenu.c:1743
 msgid "DeletePrint"
 msgstr ""
 
 #. TRANSLATORS: go to previous Role in list
-#: alpine/keymenu.c:1735
+#: alpine/keymenu.c:1786
 msgid "PrevRole"
 msgstr ""
 
-#: alpine/keymenu.c:1736
+#: alpine/keymenu.c:1787
 msgid "NextRole"
 msgstr ""
 
+#: alpine/keymenu.c:1801
+msgid "PrevFlow"
+msgstr ""
+
+#: alpine/keymenu.c:1802
+msgid "NextFlow"
+msgstr ""
+
+#: alpine/keymenu.c:1816
+msgid "PrevID"
+msgstr ""
+
+#: alpine/keymenu.c:1817
+msgid "NextID"
+msgstr ""
+
 #. TRANSLATORS: go to previous Rule in list
-#: alpine/keymenu.c:1752
+#: alpine/keymenu.c:1833
 msgid "PrevRule"
 msgstr ""
 
-#: alpine/keymenu.c:1753
+#: alpine/keymenu.c:1834
 msgid "NextRule"
 msgstr ""
 
-#: alpine/keymenu.c:1757 alpine/keymenu.c:2690 alpine/keymenu.c:2731
-#: alpine/addrbook.c:2598 alpine/addrbook.c:2656 pico/browse.c:116
+#: alpine/keymenu.c:1838 alpine/keymenu.c:2798 alpine/keymenu.c:2854
+#: alpine/addrbook.c:2598 alpine/addrbook.c:2656 pico/browse.c:117
 msgid "Delete"
 msgstr ""
 
 #. TRANSLATORS: Include a File from filesystem
-#: alpine/keymenu.c:1766
+#: alpine/keymenu.c:1847
 msgid "IncludeFile"
 msgstr ""
 
-#: alpine/keymenu.c:1767
+#: alpine/keymenu.c:1848
 msgid "eXcludeFile"
 msgstr ""
 
-#: alpine/keymenu.c:1770
+#: alpine/keymenu.c:1851
 msgid "Replicate"
 msgstr ""
 
 #. TRANSLATORS: go to list of folders
-#: alpine/keymenu.c:1825 alpine/keymenu.c:2168 alpine/keymenu.c:2197
-#: alpine/mailcmd.c:5578
+#: alpine/keymenu.c:1933 alpine/keymenu.c:2276 alpine/keymenu.c:2305
+#: alpine/mailcmd.c:5647
 msgid "ToFldrs"
 msgstr ""
 
 #. TRANSLATORS: go to list of Files
-#: alpine/keymenu.c:1854 alpine/keymenu.c:1884
+#: alpine/keymenu.c:1962 alpine/keymenu.c:1992
 msgid "ToFiles"
 msgstr ""
 
 #. TRANSLATORS: edit a file
-#: alpine/keymenu.c:1856
+#: alpine/keymenu.c:1964
 msgid "editFile"
 msgstr ""
 
 #. TRANSLATORS: go to list of keywords
-#: alpine/keymenu.c:1914 alpine/keymenu.c:1943
+#: alpine/keymenu.c:2022 alpine/keymenu.c:2051
 msgid "ToKeywords"
 msgstr ""
 
 #. TRANSLATORS: toggle between NOT and not NOT, turn NOT on or off
-#: alpine/keymenu.c:1946 alpine/keymenu.c:1976 alpine/keymenu.c:2035
-#: alpine/keymenu.c:2081 alpine/keymenu.c:2110
+#: alpine/keymenu.c:2054 alpine/keymenu.c:2084 alpine/keymenu.c:2143
+#: alpine/keymenu.c:2189 alpine/keymenu.c:2218
 msgid "toggle NOT"
 msgstr ""
 
 #. TRANSLATORS: go to list of character sets
-#: alpine/keymenu.c:1974
+#: alpine/keymenu.c:2082
 msgid "ToCharSets"
 msgstr ""
 
 #. TRANSLATORS: add extra headers to list
-#: alpine/keymenu.c:2034 alpine/keymenu.c:2048 alpine/keymenu.c:2080
-#: alpine/keymenu.c:2109
+#: alpine/keymenu.c:2142 alpine/keymenu.c:2156 alpine/keymenu.c:2188
+#: alpine/keymenu.c:2217
 msgid "eXtraHdr"
 msgstr ""
 
 #. TRANSLATORS: go to address book to get address
-#: alpine/keymenu.c:2079 alpine/keymenu.c:2138
+#: alpine/keymenu.c:2187 alpine/keymenu.c:2246
 msgid "ToAddrBk"
 msgstr ""
 
 #. TRANSLATORS: remove a header we previously added
-#: alpine/keymenu.c:2113
+#: alpine/keymenu.c:2221
 msgid "RemoveHdr"
 msgstr ""
 
 #. TRANSLATORS: go to list of nicknames
-#: alpine/keymenu.c:2227
+#: alpine/keymenu.c:2335
 msgid "ToNicks"
 msgstr ""
 
 #. TRANSLATORS: go to list of address books
-#: alpine/keymenu.c:2257
+#: alpine/keymenu.c:2365
 msgid "ToAbookList"
 msgstr ""
 
 #. TRANSLATORS: go to color configuration screen
-#: alpine/keymenu.c:2319 alpine/keymenu.c:2336 alpine/keymenu.c:2352
-#: alpine/keymenu.c:2370 alpine/keymenu.c:2399 alpine/keymenu.c:2428
+#: alpine/keymenu.c:2427 alpine/keymenu.c:2444 alpine/keymenu.c:2460
+#: alpine/keymenu.c:2478 alpine/keymenu.c:2507 alpine/keymenu.c:2536
 msgid "To Colors"
 msgstr ""
 
-#: alpine/keymenu.c:2376 alpine/keymenu.c:2405 alpine/keymenu.c:2434
+#: alpine/keymenu.c:2484 alpine/keymenu.c:2513 alpine/keymenu.c:2542
 msgid "Customize"
 msgstr ""
 
-#: alpine/keymenu.c:2465 alpine/keymenu.c:2495 alpine/keymenu.c:2541
+#: alpine/keymenu.c:2573 alpine/keymenu.c:2603 alpine/keymenu.c:2649
 msgid "AddHeader"
 msgstr ""
 
 #. TRANSLATORS: restore defaults
-#: alpine/keymenu.c:2467 alpine/keymenu.c:2496 alpine/keymenu.c:2542
+#: alpine/keymenu.c:2575 alpine/keymenu.c:2604 alpine/keymenu.c:2650
 msgid "RestoreDefs"
 msgstr ""
 
-#: alpine/keymenu.c:2504
+#: alpine/keymenu.c:2612
 msgid "DeleteHdr"
 msgstr ""
 
 #. TRANSLATORS: shuffle headers (change the order of headers)
-#: alpine/keymenu.c:2506
+#: alpine/keymenu.c:2614
 msgid "ShuffleHdr"
 msgstr ""
 
 #. TRANSLATORS: exit the Take Address screen
-#: alpine/keymenu.c:2565 alpine/keymenu.c:2581
+#: alpine/keymenu.c:2673 alpine/keymenu.c:2689
 msgid "ExitTake"
 msgstr ""
 
-#: alpine/keymenu.c:2627
+#: alpine/keymenu.c:2735
 msgid "Transfer"
 msgstr ""
 
-#: alpine/keymenu.c:2643 alpine/keymenu.c:2657 alpine/keymenu.c:2688
-#: alpine/keymenu.c:2760
+#: alpine/keymenu.c:2751 alpine/keymenu.c:2765 alpine/keymenu.c:2796
+#: alpine/keymenu.c:2883
 msgid "Import Cert"
 msgstr ""
 
-#: alpine/keymenu.c:2672
+#: alpine/keymenu.c:2780
 msgid "Import Key"
 msgstr ""
 
-#: alpine/keymenu.c:2673
+#: alpine/keymenu.c:2781
 msgid "Create Key"
 msgstr ""
 
-#: alpine/keymenu.c:2687 alpine/keymenu.c:2715
+#: alpine/keymenu.c:2795 alpine/keymenu.c:2823 alpine/keymenu.c:2838
 msgid "View Info"
 msgstr ""
 
-#: alpine/keymenu.c:2691 alpine/keymenu.c:2732
+#: alpine/keymenu.c:2799 alpine/keymenu.c:2855
 msgid "Undelete"
 msgstr ""
 
-#: alpine/keymenu.c:2692 alpine/mailcmd.c:7354
+#: alpine/keymenu.c:2800 alpine/mailcmd.c:7465
 msgid "Expunge"
 msgstr ""
 
-#: alpine/keymenu.c:2730
+#: alpine/keymenu.c:2824
+msgid "Delete pwd"
+msgstr ""
+
+#: alpine/keymenu.c:2853
 msgid "Trust Cert"
 msgstr ""
 
-#: alpine/keymenu.c:2733 alpine/smime.c:1092 alpine/smime.c:1100
+#: alpine/keymenu.c:2856 alpine/smime.c:1094 alpine/smime.c:1102
 msgid "Public Key"
 msgstr ""
 
-#: alpine/keymenu.c:2734
+#: alpine/keymenu.c:2857
 msgid "Private Key"
 msgstr ""
 
-#: alpine/takeaddr.c:67 alpine/mailcmd.c:176 alpine/adrbkcmd.c:5243
+#: alpine/takeaddr.c:63 alpine/mailcmd.c:176 alpine/adrbkcmd.c:5240
 #: 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:1102 alpine/adrbkcmd.c:848
-#: alpine/adrbkcmd.c:863
+#: alpine/takeaddr.c:134 alpine/send.c:1096 alpine/adrbkcmd.c:844
+#: alpine/adrbkcmd.c:859
 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: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
+#: alpine/takeaddr.c:140 alpine/send.c:1102 alpine/mailcmd.c:390
+#: alpine/mailcmd.c:2814 alpine/mailcmd.c:3629 alpine/mailcmd.c:4074
+#: alpine/mailcmd.c:5670 alpine/adrbkcmd.c:4243 alpine/folder.c:3735
+#: alpine/folder.c:3869 alpine/folder.c:4998 alpine/mailpart.c:1332
+#: alpine/mailpart.c:1750 alpine/mailpart.c:1829 pico/attach.c:71
+#: pico/file.c:155 pico/file.c:581
 msgid "Complete"
 msgstr ""
 
-#: alpine/takeaddr.c:176
+#: alpine/takeaddr.c:172
 #, c-format
 msgid "Already an entry with nickname \"%s\""
 msgstr ""
@@ -1486,131 +1639,131 @@ msgstr ""
 #. happened and alpine is re-initializing the address book.
 #. TRANSLATORS: a warning message telling the user that the address book
 #. is being reset (re-sychronized, restarted)
-#: alpine/takeaddr.c:422 alpine/adrbkcmd.c:1474 alpine/addrbook.c:1528
+#: alpine/takeaddr.c:418 alpine/adrbkcmd.c:1470 alpine/addrbook.c:1528
 #: alpine/addrbook.c:1558 alpine/addrbook.c:1590 alpine/addrbook.c:1631
 #: alpine/addrbook.c:1671 alpine/addrbook.c:1713 alpine/addrbook.c:1756
 #: alpine/addrbook.c:1804 alpine/addrbook.c:1846 alpine/addrbook.c:1886
-#: alpine/addrbook.c:1930 alpine/addrbook.c:1978 pith/ablookup.c:81
-#: pith/ablookup.c:152 pith/ablookup.c:229 pith/ablookup.c:358
+#: alpine/addrbook.c:1930 alpine/addrbook.c:1978 pith/ablookup.c:77
+#: pith/ablookup.c:148 pith/ablookup.c:225 pith/ablookup.c:354
 msgid "Resetting address book..."
 msgstr ""
 
-#: alpine/takeaddr.c:527
+#: alpine/takeaddr.c:523
 #, c-format
 msgid "Warning: address exists with %s%s, continue "
 msgstr ""
 
-#: alpine/takeaddr.c:559
+#: alpine/takeaddr.c:555
 #, c-format
 msgid "Enter new or existing nickname (one word and easy to remember): "
 msgstr ""
 
-#: alpine/takeaddr.c:572
+#: alpine/takeaddr.c:568
 #, c-format
 msgid "Already an entry %s in address book!"
 msgstr ""
 
-#: alpine/takeaddr.c:580 alpine/takeaddr.c:601 alpine/confscroll.c:1715
-#: alpine/print.c:747 pico/search.c:812 pico/search.c:825
+#: alpine/takeaddr.c:576 alpine/takeaddr.c:597 alpine/confscroll.c:1739
+#: alpine/print.c:743 pico/search.c:808 pico/search.c:821
 msgid "Replace"
 msgstr ""
 
-#: alpine/takeaddr.c:584
+#: alpine/takeaddr.c:580
 #, c-format
 msgid "Entry %s (%s) exists, replace ? "
 msgstr ""
 
-#: alpine/takeaddr.c:607
+#: alpine/takeaddr.c:603
 #, c-format
 msgid "%s %s (%s) exists, replace or add addresses to it ? "
 msgstr ""
 
-#: alpine/takeaddr.c:648
+#: alpine/takeaddr.c:644
 msgid "Address book is at maximum size, cancelled."
 msgstr ""
 
-#: alpine/takeaddr.c:791
+#: alpine/takeaddr.c:787
 #, c-format
 msgid "All of the addresses are already included in \"%s\""
 msgstr ""
 
-#: alpine/takeaddr.c:869 alpine/takeaddr.c:1325
+#: alpine/takeaddr.c:865 alpine/takeaddr.c:1321
 msgid "Address book addition cancelled"
 msgstr ""
 
-#: alpine/takeaddr.c:897
+#: alpine/takeaddr.c:893
 msgid "No address book configured!"
 msgstr ""
 
-#: alpine/takeaddr.c:918
+#: alpine/takeaddr.c:914
 msgid "Can't open address book!"
 msgstr ""
 
 #. TRANSLATORS: Address book can be viewed but not changed
-#: alpine/takeaddr.c:924 alpine/adrbkcmd.c:417 alpine/adrbkcmd.c:435
+#: alpine/takeaddr.c:920 alpine/adrbkcmd.c:413 alpine/adrbkcmd.c:431
 #: alpine/addrbook.c:2133 alpine/addrbook.c:3359 alpine/addrbook.c:4110
 msgid "AddressBook is Read Only"
 msgstr ""
 
-#: alpine/takeaddr.c:927 alpine/addrbook.c:2136
+#: alpine/takeaddr.c:923 alpine/addrbook.c:2136
 msgid "AddressBook not accessible, permission denied"
 msgstr ""
 
-#: alpine/takeaddr.c:956
+#: alpine/takeaddr.c:952
 msgid "Prev AddrBook"
 msgstr ""
 
-#: alpine/takeaddr.c:957
+#: alpine/takeaddr.c:953
 msgid "Next AddrBook"
 msgstr ""
 
-#: alpine/takeaddr.c:1009
+#: alpine/takeaddr.c:1005
 #, c-format
 msgid "No addressbook \"%s\""
 msgstr ""
 
-#: alpine/takeaddr.c:1160 alpine/takeaddr.c:1474
+#: alpine/takeaddr.c:1156 alpine/takeaddr.c:1470
 msgid "List mode: Use \"X\" to mark addresses to be included in list"
 msgstr ""
 
-#: alpine/takeaddr.c:1163 alpine/takeaddr.c:1469
+#: alpine/takeaddr.c:1159 alpine/takeaddr.c:1465
 msgid "Single mode: Use \"P\" or \"N\" to select desired address"
 msgstr ""
 
-#: alpine/takeaddr.c:1319
+#: alpine/takeaddr.c:1315
 msgid "HELP FOR TAKE ADDRESS SCREEN"
 msgstr ""
 
-#: alpine/takeaddr.c:1343 alpine/addrbook.c:3808
+#: alpine/takeaddr.c:1339 alpine/addrbook.c:3808
 msgid "Already on last line."
 msgstr ""
 
-#: alpine/takeaddr.c:1351 alpine/addrbook.c:3750
+#: alpine/takeaddr.c:1347 alpine/addrbook.c:3750
 msgid "Already on first line."
 msgstr ""
 
-#: alpine/takeaddr.c:1367 alpine/addrbook.c:4044
+#: alpine/takeaddr.c:1363 alpine/addrbook.c:4044
 msgid "Already on last page."
 msgstr ""
 
-#: alpine/takeaddr.c:1394 alpine/addrbook.c:4008
+#: alpine/takeaddr.c:1390 alpine/addrbook.c:4008
 msgid "Already on first page."
 msgstr ""
 
-#: alpine/takeaddr.c:1526 alpine/takeaddr.c:2655
+#: alpine/takeaddr.c:1522 alpine/takeaddr.c:2651
 msgid "save"
 msgstr ""
 
 #. TRANSLATORS: go to Top of screen
-#: alpine/takeaddr.c:1561 alpine/confscroll.c:1060
+#: alpine/takeaddr.c:1557 alpine/confscroll.c:1062
 msgid "Top"
 msgstr ""
 
-#: alpine/takeaddr.c:1562 alpine/confscroll.c:1061
+#: alpine/takeaddr.c:1558 alpine/confscroll.c:1063
 msgid "Bottom"
 msgstr ""
 
-#: alpine/takeaddr.c:1570
+#: alpine/takeaddr.c:1566
 #, c-format
 msgid "Word to find %s%.*s%s: "
 msgstr ""
@@ -1618,771 +1771,776 @@ msgstr ""
 #. TRANSLATORS: Searched to ... is the result of the search, searched
 #. to top means the search went past the bottom of the screen and
 #. wrapped back around to the top.
-#: alpine/takeaddr.c:1619 alpine/confscroll.c:1241
+#: alpine/takeaddr.c:1615 alpine/confscroll.c:1243
 msgid "Searched to top"
 msgstr ""
 
-#: alpine/takeaddr.c:1623 alpine/confscroll.c:1255
+#: alpine/takeaddr.c:1619 alpine/confscroll.c:1257
 msgid "Searched to bottom"
 msgstr ""
 
-#: alpine/takeaddr.c:1627 alpine/confscroll.c:1258 alpine/mailpart.c:774
+#: alpine/takeaddr.c:1623 alpine/confscroll.c:1260 alpine/mailpart.c:779
 msgid "WhereIs cancelled"
 msgstr ""
 
-#: alpine/takeaddr.c:1632 alpine/addrbook.c:5767
+#: alpine/takeaddr.c:1628 alpine/addrbook.c:5767
 msgid "Search wrapped to beginning"
 msgstr ""
 
-#: alpine/takeaddr.c:1632 alpine/confscroll.c:1277
+#: alpine/takeaddr.c:1628 alpine/confscroll.c:1279
 msgid "Word found"
 msgstr ""
 
-#: alpine/takeaddr.c:1660
+#: alpine/takeaddr.c:1656
 msgid "No addresses marked for taking. Use ExitTake to leave TakeAddr screen"
 msgstr ""
 
-#: alpine/takeaddr.c:2000
+#: alpine/takeaddr.c:1996
 msgid "Can't find anything to export"
 msgstr ""
 
-#: alpine/takeaddr.c:2022 alpine/adrbkcmd.c:1582
+#: alpine/takeaddr.c:2018 alpine/adrbkcmd.c:1578
 msgid "take"
 msgstr ""
 
-#: alpine/takeaddr.c:2468 alpine/takeaddr.c:2595
+#: alpine/takeaddr.c:2464 alpine/takeaddr.c:2591
 msgid "Nothing to save, cancelled"
 msgstr ""
 
-#: alpine/takeaddr.c:2499
+#: alpine/takeaddr.c:2495
 msgid "Backup"
 msgstr ""
 
-#: alpine/takeaddr.c:2500
+#: alpine/takeaddr.c:2496
 msgid "LDAP"
 msgstr ""
 
-#: alpine/takeaddr.c:2505
+#: alpine/takeaddr.c:2501
 msgid "Copy backup address or retain LDAP search criteria ? "
 msgstr ""
 
-#: alpine/takeaddr.c:2614 alpine/takeaddr.c:3043 alpine/adrbkcmd.c:5253
+#: alpine/takeaddr.c:2610 alpine/takeaddr.c:3039 alpine/adrbkcmd.c:5250
 #, c-format
 msgid "Save to address book or Export to filesystem ? "
 msgstr ""
 
-#: alpine/takeaddr.c:2620 alpine/takeaddr.c:3049 alpine/adrbkcmd.c:5259
-#: alpine/adrbkcmd.c:5452 alpine/adrbkcmd.c:5617
+#: alpine/takeaddr.c:2616 alpine/takeaddr.c:3045 alpine/adrbkcmd.c:5256
+#: alpine/adrbkcmd.c:5449 alpine/adrbkcmd.c:5614
 msgid "Address book save cancelled"
 msgstr ""
 
-#: alpine/takeaddr.c:2667
+#: alpine/takeaddr.c:2663
 msgid "Save cancelled: no entries in attachment"
 msgstr ""
 
-#: alpine/takeaddr.c:2684 alpine/adrbkcmd.c:4182
+#: alpine/takeaddr.c:2680 alpine/adrbkcmd.c:4179
 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:2685 alpine/takeaddr.c:3273 alpine/adrbkcmd.c:384
-#: alpine/adrbkcmd.c:4183
+#: alpine/takeaddr.c:2681 alpine/takeaddr.c:3269 alpine/adrbkcmd.c:380
+#: alpine/adrbkcmd.c:4180
 msgid "VCard"
 msgstr ""
 
-#: alpine/takeaddr.c:2696
+#: alpine/takeaddr.c:2692
 msgid "Export list of addresses or vCard text ? "
 msgstr ""
 
-#: alpine/takeaddr.c:2702 alpine/takeaddr.c:3283 alpine/adrbkcmd.c:4213
-#: alpine/adrbkcmd.c:4259
+#: alpine/takeaddr.c:2698 alpine/takeaddr.c:3279 alpine/adrbkcmd.c:4210
+#: alpine/adrbkcmd.c:4256
 msgid "Address book export cancelled"
 msgstr ""
 
-#: alpine/takeaddr.c:2713
+#: alpine/takeaddr.c:2709
 msgid "can't happen in export_vcard_att"
 msgstr ""
 
-#: alpine/takeaddr.c:2749
+#: alpine/takeaddr.c:2745
 msgid "No addresses to export"
 msgstr ""
 
-#: alpine/takeaddr.c:2755 alpine/takeaddr.c:2863
+#: alpine/takeaddr.c:2751 alpine/takeaddr.c:2859
 msgid "Nothing to export"
 msgstr ""
 
-#: 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
+#: alpine/takeaddr.c:2753 alpine/takeaddr.c:2853 alpine/takeaddr.c:3285
+#: alpine/takeaddr.c:3299 alpine/takeaddr.c:3317 alpine/mailcmd.c:4078
+#: alpine/adrbkcmd.c:6957 alpine/adrbkcmd.c:7147 alpine/reply.c:2370
+#: alpine/mailpart.c:3058
 msgid "Error allocating space"
 msgstr ""
 
-#: alpine/takeaddr.c:2768
+#: alpine/takeaddr.c:2764
 msgid "HELP FOR TAKE EXPORT SCREEN"
 msgstr ""
 
-#: alpine/takeaddr.c:2807
+#: alpine/takeaddr.c:2803
 msgid "No lines to export"
 msgstr ""
 
-#: alpine/takeaddr.c:2810
+#: alpine/takeaddr.c:2806
 msgid "Take Export"
 msgstr ""
 
-#: alpine/takeaddr.c:2861
+#: alpine/takeaddr.c:2857
 msgid "Use \"X\" to mark selections"
 msgstr ""
 
 #. TRANSLATORS: Text refers to plain old text, probably the text of
 #. an email message
-#: alpine/takeaddr.c:3271 alpine/mailcmd.c:153 alpine/mailcmd.c:193
-#: alpine/adrbkcmd.c:381 alpine/folder.c:3285
+#: alpine/takeaddr.c:3267 alpine/mailcmd.c:153 alpine/mailcmd.c:193
+#: alpine/mailcmd.c:213 alpine/mailcmd.c:233 alpine/adrbkcmd.c:377
+#: alpine/folder.c:3276
 msgid "Text"
 msgstr ""
 
 #. TRANSLATORS: Addresses refers to email Addresses
-#: 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
+#: alpine/takeaddr.c:3268 alpine/adrbkcmd.c:198 alpine/adrbkcmd.c:858
+#: alpine/adrbkcmd.c:1069 alpine/adrbkcmd.c:5922 alpine/adrbkcmd.c:5936
+#: alpine/adrbkcmd.c:5945 alpine/adrbkcmd.c:5956 alpine/adrbkcmd.c:5963
 msgid "Addresses"
 msgstr ""
 
-#: alpine/takeaddr.c:3277
+#: alpine/takeaddr.c:3273
 msgid "Export text of entry, address, or VCard format ? "
 msgstr ""
 
-#: alpine/ldapconf.c:60
+#: alpine/ldapconf.c:56
 msgid "HELP FOR SEARCH RESULTS INDEX"
 msgstr ""
 
-#: alpine/ldapconf.c:62
+#: alpine/ldapconf.c:58
 msgid "Use Add to add a directory server"
 msgstr ""
 
-#: alpine/ldapconf.c:69
+#: alpine/ldapconf.c:65
 msgid "Directory Server on "
 msgstr ""
 
-#: alpine/ldapconf.c:382
+#: alpine/ldapconf.c:378
 #, c-format
 msgid "(%d email addresses)"
 msgstr ""
 
-#: alpine/ldapconf.c:400
+#: alpine/ldapconf.c:396
 msgid "<No Email Address Available>"
 msgstr ""
 
 #. TRANSLATORS: No matches returned for an LDAP search
-#: alpine/ldapconf.c:442
+#: alpine/ldapconf.c:438
 #, c-format
 msgid "%s, No Matches Returned"
 msgstr ""
 
-#: alpine/ldapconf.c:445
+#: alpine/ldapconf.c:441
 msgid "No Matches"
 msgstr ""
 
 #. TRANSLATORS: a request for user to choose Exit after they read text
-#: alpine/ldapconf.c:450
+#: alpine/ldapconf.c:446
 msgid " -- Choose Exit ]"
 msgstr ""
 
 #. TRANSLATORS: Print something1 using something2.
 #. "this" is something1
-#: alpine/ldapconf.c:474
+#: alpine/ldapconf.c:470
 msgid "this"
 msgstr ""
 
-#: alpine/ldapconf.c:554
+#: alpine/ldapconf.c:550
 msgid "No email address available for this entry; choose another or ExitSelect"
 msgstr ""
 
-#: alpine/ldapconf.c:636
+#: alpine/ldapconf.c:632
 msgid "Bad Server Config, Delete this"
 msgstr ""
 
-#: alpine/ldapconf.c:682
+#: alpine/ldapconf.c:678
 msgid "Exception Setup not implemented for directory"
 msgstr ""
 
-#: alpine/ldapconf.c:725
+#: alpine/ldapconf.c:721
 msgid "SETUP DIRECTORY SERVERS"
 msgstr ""
 
 #. TRANSLATORS: Print something1 using something2.
 #. servers is something1
-#: alpine/ldapconf.c:725 alpine/ldapconf.c:1800
+#: alpine/ldapconf.c:721 alpine/ldapconf.c:1796
 msgid "servers"
 msgstr ""
 
-#: alpine/ldapconf.c:741 alpine/roleconf.c:1096
+#: alpine/ldapconf.c:737 alpine/roleconf.c:1092
 msgid "Nothing to Delete, use Add"
 msgstr ""
 
-#: alpine/ldapconf.c:767 alpine/roleconf.c:1117
+#: alpine/ldapconf.c:763 alpine/roleconf.c:1113
 msgid "Nothing to Shuffle, use Add"
 msgstr ""
 
-#: alpine/ldapconf.c:906
+#: alpine/ldapconf.c:902
 msgid "Add cancelled, no server name"
 msgstr ""
 
-#: alpine/ldapconf.c:938
+#: alpine/ldapconf.c:934
 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:2335
-#: alpine/roleconf.c:1686 alpine/colorconf.c:2267 alpine/context.c:604
+#: alpine/ldapconf.c:945 alpine/adrbkcmd.c:3515 alpine/confscroll.c:2359
+#: alpine/roleconf.c:1682 alpine/colorconf.c:2264 alpine/context.c:600
 msgid "Up"
 msgstr ""
 
-#: alpine/ldapconf.c:954 alpine/adrbkcmd.c:3523 alpine/confscroll.c:2340
-#: alpine/roleconf.c:1691 alpine/colorconf.c:2272 alpine/context.c:622
+#: alpine/ldapconf.c:950 alpine/adrbkcmd.c:3520 alpine/confscroll.c:2364
+#: alpine/roleconf.c:1687 alpine/colorconf.c:2269 alpine/context.c:618
 msgid "Down"
 msgstr ""
 
-#: alpine/ldapconf.c:968 alpine/adrbkcmd.c:3571 alpine/roleconf.c:1763
-#: alpine/colorconf.c:2285 alpine/context.c:631
+#: alpine/ldapconf.c:964 alpine/adrbkcmd.c:3568 alpine/roleconf.c:1759
+#: alpine/colorconf.c:2282 alpine/context.c:627
 msgid "UP"
 msgstr ""
 
-#: alpine/ldapconf.c:970 alpine/adrbkcmd.c:3573 alpine/roleconf.c:1765
-#: alpine/colorconf.c:2287 alpine/context.c:633
+#: alpine/ldapconf.c:966 alpine/adrbkcmd.c:3570 alpine/roleconf.c:1761
+#: alpine/colorconf.c:2284 alpine/context.c:629
 msgid "DOWN"
 msgstr ""
 
-#: alpine/ldapconf.c:1019 alpine/adrbkcmd.c:3633
+#: alpine/ldapconf.c:1015 alpine/adrbkcmd.c:3630
 msgid "Shuffle cancelled: couldn't save configuration file"
 msgstr ""
 
-#: alpine/ldapconf.c:1075
+#: alpine/ldapconf.c:1071
 msgid "No change, cancelled"
 msgstr ""
 
-#: alpine/ldapconf.c:1078
+#: alpine/ldapconf.c:1074
 msgid "Change cancelled, use Delete if you want to remove this server"
 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:1339 alpine/roleconf.c:4603
+#: alpine/ldapconf.c:1335 alpine/roleconf.c:4598
 msgid "Features"
 msgstr ""
 
-#: alpine/ldapconf.c:1367
+#: alpine/ldapconf.c:1363
 msgid "HELP FOR LDAP SERVER"
 msgstr ""
 
-#: alpine/ldapconf.c:1383
+#: alpine/ldapconf.c:1379
 msgid "HELP FOR SERVER SEARCH BASE"
 msgstr ""
 
-#: alpine/ldapconf.c:1397
+#: alpine/ldapconf.c:1393
 msgid "HELP FOR PORT NUMBER"
 msgstr ""
 
-#: alpine/ldapconf.c:1412
+#: alpine/ldapconf.c:1408
 msgid "HELP FOR SERVER BIND DN"
 msgstr ""
 
-#: alpine/ldapconf.c:1426
+#: alpine/ldapconf.c:1422
 msgid "HELP FOR SERVER NICKNAME"
 msgstr ""
 
-#: alpine/ldapconf.c:1497
+#: alpine/ldapconf.c:1493
 msgid "Can not use TLS when connecting using LDAPS"
 msgstr ""
 
-#: alpine/ldapconf.c:1509
+#: alpine/ldapconf.c:1505
 msgid "Can not use LDAPS when connecting using TLS"
 msgstr ""
 
-#: alpine/ldapconf.c:1516
+#: alpine/ldapconf.c:1512
 msgid "HELP FOR LDAP FEATURES"
 msgstr ""
 
-#: alpine/ldapconf.c:1598
+#: alpine/ldapconf.c:1594
 msgid "HELP FOR SEARCH TYPE"
 msgstr ""
 
-#: alpine/ldapconf.c:1662
+#: alpine/ldapconf.c:1658
 msgid "HELP FOR SEARCH RULE"
 msgstr ""
 
-#: alpine/ldapconf.c:1686
+#: alpine/ldapconf.c:1682
 msgid "HELP FOR EMAIL ATTRIBUTE NAME"
 msgstr ""
 
-#: alpine/ldapconf.c:1700
+#: alpine/ldapconf.c:1696
 msgid "HELP FOR NAME ATTRIBUTE NAME"
 msgstr ""
 
-#: alpine/ldapconf.c:1714
+#: alpine/ldapconf.c:1710
 msgid "HELP FOR SURNAME ATTRIBUTE NAME"
 msgstr ""
 
-#: alpine/ldapconf.c:1728
+#: alpine/ldapconf.c:1724
 msgid "HELP FOR GIVEN NAME ATTRIBUTE NAME"
 msgstr ""
 
-#: alpine/ldapconf.c:1747
+#: alpine/ldapconf.c:1743
 msgid "HELP FOR SERVER TIMELIMIT"
 msgstr ""
 
-#: alpine/ldapconf.c:1763
+#: alpine/ldapconf.c:1759
 msgid "HELP FOR SERVER SIZELIMIT"
 msgstr ""
 
-#: alpine/ldapconf.c:1781
+#: alpine/ldapconf.c:1777
 msgid "HELP FOR CUSTOM SEARCH FILTER"
 msgstr ""
 
-#: alpine/ldapconf.c:2063
+#: alpine/ldapconf.c:2059
 msgid "Delete (unused) directory servers "
 msgstr ""
 
-#: alpine/ldapconf.c:2071
+#: alpine/ldapconf.c:2067
 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:2097 alpine/adrbkcmd.c:3126
+#: alpine/ldapconf.c:2093 alpine/adrbkcmd.c:3123
 msgid "Ignore All"
 msgstr ""
 
-#: alpine/ldapconf.c:2098 alpine/adrbkcmd.c:3127
+#: alpine/ldapconf.c:2094 alpine/adrbkcmd.c:3124
 msgid "Remove One"
 msgstr ""
 
-#: alpine/ldapconf.c:2101
+#: alpine/ldapconf.c:2097
 msgid "Ignore all default directory servers or just remove this one ? "
 msgstr ""
 
-#: alpine/ldapconf.c:2107
+#: alpine/ldapconf.c:2103
 #, c-format
 msgid "Really delete %s \"%s\" from directory servers "
 msgstr ""
 
-#: alpine/ldapconf.c:2208
+#: alpine/ldapconf.c:2204
 msgid "Reverting to default directory server"
 msgstr ""
 
-#: alpine/ldapconf.c:2248
+#: alpine/ldapconf.c:2244
 msgid "Server not deleted"
 msgstr ""
 
-#: alpine/ldapconf.c:2268 alpine/ldapconf.c:2323
+#: alpine/ldapconf.c:2264 alpine/ldapconf.c:2319
 msgid "HELP FOR DIRECTORY SERVER CONFIGURATION"
 msgstr ""
 
-#: alpine/ldapconf.c:2428
+#: alpine/ldapconf.c:2424
 #, c-format
 msgid "Can not use LDAPS when using TLS. Disable \"%s\" first."
 msgstr ""
 
-#: alpine/ldapconf.c:2436 alpine/ldapconf.c:2444
+#: alpine/ldapconf.c:2432 alpine/ldapconf.c:2440
 #, c-format
 msgid "Can not use TLS when using LDAPS. Disable \"%s\" first."
 msgstr ""
 
-#: alpine/send.c:147
+#: alpine/send.c:139
 msgid "Continue INTERRUPTED composition (answering \"n\" won't erase it)"
 msgstr ""
 
-#: alpine/send.c:149
+#: alpine/send.c:141
 msgid "Continue postponed composition (answering \"No\" won't erase it)"
 msgstr ""
 
-#: alpine/send.c:151
+#: alpine/send.c:143
 msgid "Start composition from Form Letter Folder"
 msgstr ""
 
-#: alpine/send.c:153
+#: alpine/send.c:145
 msgid "Save to Postponed or Form letter folder? "
 msgstr ""
 
-#: alpine/send.c:155
+#: alpine/send.c:147
 msgid "Posted message may go to thousands of readers. Really post"
 msgstr ""
 
-#: alpine/send.c:157
+#: alpine/send.c:149
 msgid "Deleted messages will be removed from folder after use.  Proceed"
 msgstr ""
 
-#: alpine/send.c:508 alpine/send.c:550 alpine/send.c:588 alpine/send.c:856
+#: alpine/send.c:500 alpine/send.c:542 alpine/send.c:583 alpine/send.c:850
 msgid "Composition cancelled"
 msgstr ""
 
-#: alpine/send.c:515
+#: alpine/send.c:507
 #, c-format
 msgid "Can't open Interrupted mailbox: %s"
 msgstr ""
 
-#: alpine/send.c:596
+#: alpine/send.c:549
+msgid "No postponed messages found!"
+msgstr ""
+
+#: alpine/send.c:591
 msgid "Form letter folder doesn't exist!"
 msgstr ""
 
-#: alpine/send.c:649 alpine/adrbkcmd.c:4566 alpine/reply.c:1912
+#: alpine/send.c:642 alpine/adrbkcmd.c:4562 alpine/reply.c:1905
 #, c-format
 msgid "Composing using role \"%s\""
 msgstr ""
 
-#: alpine/send.c:669 alpine/mailpart.c:1710
+#: alpine/send.c:663 alpine/mailpart.c:1717
 msgid "Problem creating space for message text."
 msgstr ""
 
-#: alpine/send.c:803
+#: alpine/send.c:797
 msgid "Empty folder! No messages really postponed!"
 msgstr ""
 
-#: alpine/send.c:805
+#: alpine/send.c:799
 msgid "Empty folder! No messages really interrupted!"
 msgstr ""
 
-#: alpine/send.c:843
+#: alpine/send.c:837
 msgid "Undelete messages to remain postponed, and then continue message"
 msgstr ""
 
-#: alpine/send.c:845
+#: alpine/send.c:839
 msgid "Undelete form letters you want to keep, and then continue message"
 msgstr ""
 
-#: alpine/send.c:894
+#: alpine/send.c:888
 #, c-format
 msgid "%s folder unavailable while background posting"
 msgstr ""
 
-#: alpine/send.c:1088 alpine/send.c:2363
+#: alpine/send.c:1082 alpine/send.c:2367
 msgid ""
 "Site policy doesn't allow changing From address so role's From has no effect"
 msgstr ""
 
-#: alpine/send.c:1132
+#: alpine/send.c:1126
 msgid "FORWARD (as e-mail) to : "
 msgstr ""
 
-#: alpine/send.c:1144
+#: alpine/send.c:1143
 #, c-format
 msgid "BOUNCE (redirect) message using role \"%s\" to : "
 msgstr ""
 
-#: alpine/send.c:1146
+#: alpine/send.c:1145
 msgid "BOUNCE (redirect) message to : "
 msgstr ""
 
-#: alpine/send.c:1207 alpine/mailcmd.c:7361 alpine/reply.c:1108
+#: alpine/send.c:1206 alpine/mailcmd.c:7472 alpine/reply.c:1101
 msgid "Set Role"
 msgstr ""
 
 #. TRANSLATORS: several possible key labels follow
-#: alpine/send.c:1429 alpine/send.c:4864
+#: alpine/send.c:1432 alpine/send.c:4885
 msgid "Normal"
 msgstr ""
 
-#: alpine/send.c:1429 alpine/send.c:4864
+#: alpine/send.c:1432 alpine/send.c:4885
 msgid "Verbose"
 msgstr ""
 
-#: alpine/send.c:1435 alpine/send.c:4877
+#: alpine/send.c:1438 alpine/send.c:4898
 msgid "NoDelay"
 msgstr ""
 
-#: alpine/send.c:1435 alpine/send.c:4877
+#: alpine/send.c:1438 alpine/send.c:4898
 msgid "Delay"
 msgstr ""
 
-#: alpine/send.c:1439 alpine/send.c:4880
+#: alpine/send.c:1442 alpine/send.c:4901
 msgid "NoSuccess"
 msgstr ""
 
-#: alpine/send.c:1439 alpine/send.c:4880
+#: alpine/send.c:1442 alpine/send.c:4901
 msgid "Success"
 msgstr ""
 
-#: alpine/send.c:1443 alpine/send.c:4883
+#: alpine/send.c:1446 alpine/send.c:4904
 msgid "ErrRets"
 msgstr ""
 
-#: alpine/send.c:1443 alpine/send.c:4883
+#: alpine/send.c:1446 alpine/send.c:4904
 msgid "NoErrRets"
 msgstr ""
 
-#: alpine/send.c:1447 alpine/send.c:4886
+#: alpine/send.c:1450 alpine/send.c:4907
 msgid "RetHdrs"
 msgstr ""
 
-#: alpine/send.c:1447 alpine/send.c:4886
+#: alpine/send.c:1450 alpine/send.c:4907
 msgid "RetFull"
 msgstr ""
 
-#: alpine/send.c:1497
+#: alpine/send.c:1500
 #, c-format
 msgid "DSN requested[%s%s%s%s]"
 msgstr ""
 
-#: alpine/send.c:1499
+#: alpine/send.c:1502
 msgid "Never"
 msgstr ""
 
-#: alpine/send.c:1561 alpine/send.c:3686
+#: alpine/send.c:1564 alpine/send.c:3707
 msgid "No recipients specified!"
 msgstr ""
 
-#: alpine/send.c:1571
+#: alpine/send.c:1574
 msgid "Use of a role-defined smtp-server is administratively prohibited"
 msgstr ""
 
-#: alpine/send.c:1586 alpine/send.c:1629
+#: alpine/send.c:1589 alpine/send.c:1632
 msgid "Message sent"
 msgstr ""
 
-#: alpine/send.c:1611 alpine/send.c:3926 alpine/send.c:4020
+#: alpine/send.c:1614 alpine/send.c:3947 alpine/send.c:4041
 msgid "Fcc Failed!.  No message saved."
 msgstr ""
 
-#: alpine/send.c:1658 alpine/send.c:1686
+#: alpine/send.c:1661 alpine/send.c:1689
 msgid "Send cancelled"
 msgstr ""
 
-#: alpine/send.c:1664
+#: alpine/send.c:1667
 #, c-format
 msgid "Error in address: %s"
 msgstr ""
 
-#: alpine/send.c:1677
+#: alpine/send.c:1680
 msgid "No addressee!  No e-mail sent."
 msgstr ""
 
-#: alpine/send.c:1946
+#: alpine/send.c:1949
 #, c-format
 msgid "Post to current newsgroup (%s)"
 msgstr ""
 
-#: alpine/send.c:1989
+#: alpine/send.c:1992
 msgid "Message cancelled"
 msgstr ""
 
-#: alpine/send.c:2780
+#: alpine/send.c:2784
 msgid "Not allowed to change header \"From\""
 msgstr ""
 
-#: alpine/send.c:3184
+#: alpine/send.c:3204
 msgid "Not allowed to postpone message until addresses are qualified"
 msgstr ""
 
-#: alpine/send.c:3287 pith/send.c:2191
+#: alpine/send.c:3308 pith/send.c:2130
 msgid "No postponed file defined"
 msgstr ""
 
-#: alpine/send.c:3630
+#: alpine/send.c:3651
 msgid "Composition saved to Form Letter Folder. Select Compose to send."
 msgstr ""
 
-#: alpine/send.c:3633
+#: alpine/send.c:3654
 msgid "Composition postponed. Select Compose to resume."
 msgstr ""
 
-#: alpine/send.c:3644
+#: alpine/send.c:3665
 #, c-format
 msgid "Message cancelled%s%s%s"
 msgstr ""
 
-#: alpine/send.c:3652
+#: alpine/send.c:3673
 msgid "Continuing composition.  Message not postponed or sent"
 msgstr ""
 
-#: alpine/send.c:3669
+#: alpine/send.c:3690
 msgid "Message not posted"
 msgstr ""
 
-#: alpine/send.c:3678
+#: alpine/send.c:3699
 msgid "No recipients, really copy only to Fcc "
 msgstr ""
 
-#: alpine/send.c:3702
+#: alpine/send.c:3723
 msgid "No To, Cc, or Newsgroup specified, send anyway "
 msgstr ""
 
-#: alpine/send.c:3785
+#: alpine/send.c:3806
 #, c-format
 msgid "Problem filtering!  Nothing sent%s."
 msgstr ""
 
-#: alpine/send.c:3949
+#: alpine/send.c:3970
 msgid "Message handed off for posting"
 msgstr ""
 
-#: alpine/send.c:4197
+#: alpine/send.c:4218
 msgid "Postponed Folder"
 msgstr ""
 
-#: alpine/send.c:4198
+#: alpine/send.c:4219
 msgid "Form Letter Folder"
 msgstr ""
 
-#: alpine/send.c:4605
+#: alpine/send.c:4626
 msgid "Prev Filter"
 msgstr ""
 
-#: alpine/send.c:4610
+#: alpine/send.c:4631
 msgid "Next Filter"
 msgstr ""
 
-#: alpine/send.c:4653
+#: alpine/send.c:4674
 msgid "Priority"
 msgstr ""
 
-#: alpine/send.c:4681
+#: alpine/send.c:4702
 msgid "DSNOpts"
 msgstr ""
 
-#: alpine/send.c:4861
+#: alpine/send.c:4882
 msgid "NoFlow"
 msgstr ""
 
-#: alpine/send.c:4861
+#: alpine/send.c:4882
 msgid "Flow"
 msgstr ""
 
-#: alpine/send.c:4868
+#: alpine/send.c:4889
 msgid "Foreground"
 msgstr ""
 
-#: alpine/send.c:4868
+#: alpine/send.c:4889
 msgid "Background"
 msgstr ""
 
-#: alpine/send.c:4871
+#: alpine/send.c:4892
 msgid "Fcc Attchmnts"
 msgstr ""
 
-#: alpine/send.c:4872
+#: alpine/send.c:4893
 msgid "No Fcc Atmts "
 msgstr ""
 
-#: alpine/send.c:4919
+#: alpine/send.c:4940
 msgid "No Message Sent"
 msgstr ""
 
-#: alpine/send.c:4923
+#: alpine/send.c:4944
 msgid "Send Cancelled"
 msgstr ""
 
-#: alpine/send.c:5085
+#: alpine/send.c:5106
 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:5093
+#: alpine/send.c:5114
 msgid "SELECT A PRIORITY"
 msgstr ""
 
-#: alpine/send.c:5094
+#: alpine/send.c:5115
 msgid "priorities"
 msgstr ""
 
-#: alpine/send.c:5095
+#: alpine/send.c:5116
 msgid "HELP FOR SELECTING A PRIORITY"
 msgstr ""
 
-#: alpine/send.c:5099 alpine/context.c:755
+#: alpine/send.c:5120 alpine/context.c:751
 msgid "No change"
 msgstr ""
 
-#: alpine/send.c:5147
+#: alpine/send.c:5168
 #, c-format
 msgid "File %s attached as type %s/%s"
 msgstr ""
 
-#: alpine/send.c:5218 alpine/mailpart.c:3808
+#: alpine/send.c:5239 alpine/mailpart.c:4228
 msgid "Error opening pipe"
 msgstr ""
 
-#: alpine/send.c:5233
+#: alpine/send.c:5254
 msgid ""
 "Cancel message (answering \"Confirm\" will abandon your mail message) ? "
 msgstr ""
 
-#: alpine/send.c:5236
+#: alpine/send.c:5257
 msgid "Confirm"
 msgstr ""
 
-#: alpine/send.c:5253
+#: alpine/send.c:5274
 msgid " Type \"C\" to cancel message "
 msgstr ""
 
-#: alpine/send.c:5511
+#: alpine/send.c:5532
 #, c-format
 msgid "Problem filtering: %s"
 msgstr ""
 
-#: alpine/send.c:6095
+#: alpine/send.c:6059
 #, c-format
 msgid "Error \"%s\", couldn't attach file \"%s\""
 msgstr ""
 
-#: alpine/send.c:6300
+#: alpine/send.c:6268
 msgid "Can't post while posting!"
 msgstr ""
 
-#: alpine/send.c:6332
+#: alpine/send.c:6300
 msgid "News postings MUST have a subject!  Please add one!"
 msgstr ""
 
-#: alpine/send.c:7022
+#: alpine/send.c:6990
 #, c-format
 msgid "User-id for From address : "
 msgstr ""
 
-#: alpine/send.c:7044
+#: alpine/send.c:7012
 msgid "Send cancelled (User-id must be provided before sending)"
 msgstr ""
 
-#: alpine/send.c:7049
+#: alpine/send.c:7017
 #, c-format
 msgid "Preserve %.*s as \"user-id\" in PINERC"
 msgstr ""
 
-#: alpine/send.c:7067
+#: alpine/send.c:7035
 #, c-format
 msgid "Personal name for From address : "
 msgstr ""
 
-#: alpine/send.c:7088
+#: alpine/send.c:7056
 #, c-format
 msgid "Preserve %.*s as \"personal-name\" in PINERC"
 msgstr ""
 
-#: alpine/send.c:7119
+#: alpine/send.c:7087
 #, c-format
 msgid "Host/domain for From address : "
 msgstr ""
 
-#: alpine/send.c:7141
+#: alpine/send.c:7109
 msgid "Send cancelled (Host/domain name must be provided before sending)"
 msgstr ""
 
-#: alpine/send.c:7146
+#: alpine/send.c:7114
 #, c-format
 msgid "Preserve %.*s as \"user-domain\" in PINERC"
 msgstr ""
 
-#: alpine/send.c:7179
+#: alpine/send.c:7147
 #, c-format
 msgid "SMTP server to forward message : "
 msgstr ""
 
-#: alpine/send.c:7201
+#: alpine/send.c:7169
 msgid "Send cancelled (SMTP server must be provided before sending)"
 msgstr ""
 
-#: alpine/radio.c:78
+#: alpine/radio.c:74
 msgid "error on fprintf() or fgets()"
 msgstr ""
 
@@ -2390,11 +2548,11 @@ msgstr ""
 #. 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:819 alpine/addrbook.c:2561
+#: alpine/radio.c:821 alpine/addrbook.c:2561 pico/browse.c:113
 msgid "OTHER CMDS"
 msgstr ""
 
-#: alpine/mailcmd.c:122
+#: alpine/mailcmd.c:119
 msgid "ALTER message selection : "
 msgstr ""
 
@@ -2403,22 +2561,26 @@ 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:129
+#: alpine/mailcmd.c:126
 msgid "unselect All"
 msgstr ""
 
-#: alpine/mailcmd.c:131
+#: alpine/mailcmd.c:128
 msgid "Broaden selctn"
 msgstr ""
 
-#: alpine/mailcmd.c:132
+#: alpine/mailcmd.c:129
 msgid "Narrow selctn"
 msgstr ""
 
-#: alpine/mailcmd.c:133
+#: alpine/mailcmd.c:130
 msgid "Flip selected"
 msgstr ""
 
+#: alpine/mailcmd.c:131
+msgid "Replace selctn"
+msgstr ""
+
 #. TRANSLATORS: very short descriptions of message selection criteria. Select Cur
 #. means select the currently highlighted message; select by Number is by message
 #. number; Status is by status of the message, for example the message might be
@@ -2427,40 +2589,48 @@ 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:149 alpine/mailcmd.c:188 alpine/folder.c:3282
+#: alpine/mailcmd.c:149 alpine/mailcmd.c:188 alpine/mailcmd.c:209
+#: alpine/mailcmd.c:228 alpine/folder.c:3273
 msgid "select All"
 msgstr ""
 
-#: alpine/mailcmd.c:150 alpine/mailcmd.c:6902 alpine/folder.c:3283
-#: alpine/folder.c:3297
+#: alpine/mailcmd.c:150 alpine/mailcmd.c:210 alpine/mailcmd.c:6983
+#: alpine/folder.c:3274 alpine/folder.c:3288
 msgid "select Cur"
 msgstr ""
 
-#: alpine/mailcmd.c:151 alpine/mailcmd.c:191
+#: alpine/mailcmd.c:151 alpine/mailcmd.c:191 alpine/mailcmd.c:211
+#: alpine/mailcmd.c:231
 msgid "Number"
 msgstr ""
 
-#: alpine/mailcmd.c:152 alpine/mailcmd.c:192
+#: alpine/mailcmd.c:152 alpine/mailcmd.c:192 alpine/mailcmd.c:212
+#: alpine/mailcmd.c:232
 msgid "Date"
 msgstr ""
 
-#: alpine/mailcmd.c:154 alpine/mailcmd.c:194
+#: alpine/mailcmd.c:154 alpine/mailcmd.c:194 alpine/mailcmd.c:214
+#: alpine/mailcmd.c:234
 msgid "Status"
 msgstr ""
 
-#: alpine/mailcmd.c:155 alpine/mailcmd.c:195
+#: alpine/mailcmd.c:155 alpine/mailcmd.c:195 alpine/mailcmd.c:215
+#: alpine/mailcmd.c:235
 msgid "siZe"
 msgstr ""
 
-#: alpine/mailcmd.c:156 alpine/mailcmd.c:196
+#: alpine/mailcmd.c:156 alpine/mailcmd.c:196 alpine/mailcmd.c:216
+#: alpine/mailcmd.c:236
 msgid "Keyword"
 msgstr ""
 
-#: alpine/mailcmd.c:157 alpine/mailcmd.c:197
+#: alpine/mailcmd.c:157 alpine/mailcmd.c:197 alpine/mailcmd.c:217
+#: alpine/mailcmd.c:237
 msgid "Rule"
 msgstr ""
 
-#: alpine/mailcmd.c:158 alpine/mailcmd.c:198
+#: alpine/mailcmd.c:158 alpine/mailcmd.c:198 alpine/mailcmd.c:218
+#: alpine/mailcmd.c:238
 msgid "tHread"
 msgstr ""
 
@@ -2477,15 +2647,15 @@ msgstr ""
 msgid "Undel"
 msgstr ""
 
-#: 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
+#: alpine/mailcmd.c:171 alpine/mailcmd.c:308 alpine/mailcmd.c:2691
+#: alpine/mailcmd.c:7578 alpine/mailcmd.c:7603 alpine/reply.c:832
+#: alpine/reply.c:1281
 msgid "Reply"
 msgstr ""
 
-#: 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
+#: alpine/mailcmd.c:172 alpine/mailcmd.c:309 alpine/mailcmd.c:2690
+#: alpine/mailcmd.c:7579 alpine/mailcmd.c:7602 alpine/folder.c:6652
+#: alpine/mailindx.c:3033 alpine/reply.c:834
 msgid "Forward"
 msgstr ""
 
@@ -2494,15 +2664,23 @@ msgid "TakeAddr"
 msgstr ""
 
 #. TRANSLATORS: select currently highlighted message Thread
-#: alpine/mailcmd.c:190 alpine/mailcmd.c:6897
+#: alpine/mailcmd.c:190 alpine/mailcmd.c:230 alpine/mailcmd.c:6978
 msgid "select Curthrd"
 msgstr ""
 
-#: alpine/mailcmd.c:204
+#: alpine/mailcmd.c:219
+msgid "GmSearch"
+msgstr ""
+
+#: alpine/mailcmd.c:239
+msgid "Gmail"
+msgstr ""
+
+#: alpine/mailcmd.c:249
 msgid "Select New, Deleted, Answered, Forwarded, or Important messages ? "
 msgstr ""
 
-#: alpine/mailcmd.c:206
+#: alpine/mailcmd.c:251
 msgid ""
 "Select NOT New, NOT Deleted, NOT Answered, NOT Forwarded or NOT Important "
 "msgs ? "
@@ -2514,1074 +2692,1079 @@ 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:212 alpine/mailcmd.c:295 alpine/mailcmd.c:1691
-#: alpine/mailcmd.c:9863
+#: alpine/mailcmd.c:257 alpine/mailcmd.c:342 alpine/mailcmd.c:1746
+#: alpine/mailcmd.c:10040
 msgid "New"
 msgstr ""
 
-#: alpine/mailcmd.c:213 alpine/mailcmd.c:296 alpine/mailcmd.c:1690
-#: alpine/mailcmd.c:9862
+#: alpine/mailcmd.c:258 alpine/mailcmd.c:343 alpine/mailcmd.c:1745
+#: alpine/mailcmd.c:10039
 msgid "Important"
 msgstr ""
 
-#: 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
+#: alpine/mailcmd.c:259 alpine/mailcmd.c:344 alpine/mailcmd.c:1749
+#: alpine/mailcmd.c:10042 alpine/confscroll.c:2782 alpine/confscroll.c:3009
+#: alpine/colorconf.c:1278
 msgid "Deleted"
 msgstr ""
 
-#: alpine/mailcmd.c:215 alpine/mailcmd.c:298 alpine/mailcmd.c:1692
-#: alpine/mailcmd.c:9864
+#: alpine/mailcmd.c:260 alpine/mailcmd.c:345 alpine/mailcmd.c:1747
+#: alpine/mailcmd.c:10041
 msgid "Answered"
 msgstr ""
 
-#: alpine/mailcmd.c:216 alpine/mailcmd.c:299 alpine/mailcmd.c:1693
+#: alpine/mailcmd.c:261 alpine/mailcmd.c:346 alpine/mailcmd.c:1748
 msgid "Forwarded"
 msgstr ""
 
-#: alpine/mailcmd.c:218 alpine/mailcmd.c:251 alpine/mailcmd.c:288
-#: alpine/mailcmd.c:300
+#: alpine/mailcmd.c:263 alpine/mailcmd.c:298 alpine/mailcmd.c:335
+#: alpine/mailcmd.c:347
 msgid "Not"
 msgstr ""
 
-#: alpine/mailcmd.c:220 alpine/folder.c:3339
+#: alpine/mailcmd.c:265 alpine/folder.c:3330
 msgid "Recent"
 msgstr ""
 
-#: alpine/mailcmd.c:221 alpine/folder.c:3345
+#: alpine/mailcmd.c:266 alpine/folder.c:3336
 msgid "Unseen"
 msgstr ""
 
 #. TRANSLATORS: options when selecting messages by Date
-#: alpine/mailcmd.c:229
+#: alpine/mailcmd.c:274
 msgid "Prev Day"
 msgstr ""
 
-#: alpine/mailcmd.c:230
+#: alpine/mailcmd.c:275
 msgid "Next Day"
 msgstr ""
 
-#: alpine/mailcmd.c:231
+#: alpine/mailcmd.c:276
 msgid "Cur Msg"
 msgstr ""
 
-#: alpine/mailcmd.c:232
+#: alpine/mailcmd.c:277
 msgid "Toggle When"
 msgstr ""
 
-#: alpine/mailcmd.c:240
+#: alpine/mailcmd.c:285
+msgid "Search: "
+msgstr ""
+
+#: alpine/mailcmd.c:287
 msgid ""
 "Select based on To, From, Cc, Recip, Partic, Subject fields or All msg "
 "text ? "
 msgstr ""
 
-#: alpine/mailcmd.c:242
+#: alpine/mailcmd.c:289
 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:246
+#: alpine/mailcmd.c:293
 msgid "From"
 msgstr ""
 
-#: alpine/mailcmd.c:247
+#: alpine/mailcmd.c:294
 msgid "Subject"
 msgstr ""
 
-#: alpine/mailcmd.c:248
+#: alpine/mailcmd.c:295
 msgid "To"
 msgstr ""
 
-#: alpine/mailcmd.c:249
+#: alpine/mailcmd.c:296
 msgid "All Text"
 msgstr ""
 
-#: alpine/mailcmd.c:250
+#: alpine/mailcmd.c:297
 msgid "Cc"
 msgstr ""
 
-#: alpine/mailcmd.c:252
+#: alpine/mailcmd.c:299
 msgid "Recipient"
 msgstr ""
 
-#: alpine/mailcmd.c:253
+#: alpine/mailcmd.c:300
 msgid "Participant"
 msgstr ""
 
-#: alpine/mailcmd.c:254
+#: alpine/mailcmd.c:301
 msgid "Body"
 msgstr ""
 
-#: alpine/mailcmd.c:255
+#: alpine/mailcmd.c:302
 msgid "Header"
 msgstr ""
 
-#: alpine/mailcmd.c:260 alpine/reply.c:840
+#: alpine/mailcmd.c:307 alpine/reply.c:836
 msgid "Compose"
 msgstr ""
 
-#: alpine/mailcmd.c:263 alpine/mailcmd.c:2640 alpine/mailcmd.c:7322
-#: alpine/mailcmd.c:7469 alpine/mailcmd.c:7492
+#: alpine/mailcmd.c:310 alpine/mailcmd.c:2692 alpine/mailcmd.c:7433
+#: alpine/mailcmd.c:7580 alpine/mailcmd.c:7603
 msgid "Bounce"
 msgstr ""
 
-#: alpine/mailcmd.c:268
+#: alpine/mailcmd.c:315
 msgid "Enter comma-delimited list of numbers (dash between ranges): "
 msgstr ""
 
-#: alpine/mailcmd.c:271
+#: alpine/mailcmd.c:318
 msgid "Select messages with size larger than: "
 msgstr ""
 
-#: alpine/mailcmd.c:274
+#: alpine/mailcmd.c:321
 msgid "Select messages with size smaller than: "
 msgstr ""
 
-#: alpine/mailcmd.c:276
+#: alpine/mailcmd.c:323
 msgid "Larger"
 msgstr ""
 
-#: alpine/mailcmd.c:277
+#: alpine/mailcmd.c:324
 msgid "Smaller"
 msgstr ""
 
-#: alpine/mailcmd.c:286
+#: alpine/mailcmd.c:333
 msgid "To List"
 msgstr ""
 
-#: alpine/mailcmd.c:301
+#: alpine/mailcmd.c:348
 msgid "To Flag Details"
 msgstr ""
 
-#: alpine/mailcmd.c:310
+#: alpine/mailcmd.c:357
 #, c-format
 msgid "Save certificate for <%s>"
 msgstr ""
 
-#: alpine/mailcmd.c:311
+#: alpine/mailcmd.c:358
 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
+#: alpine/mailcmd.c:382 alpine/mailcmd.c:3613 alpine/mailcmd.c:4066
+#: alpine/adrbkcmd.c:4175 alpine/folder.c:3726 alpine/folder.c:3861
+#: alpine/mailpart.c:1306 alpine/mailpart.c:1742 alpine/mailpart.c:1821
+#: pico/attach.c:66 pico/file.c:129 pico/file.c:578
 msgid "To Files"
 msgstr ""
 
-#: alpine/mailcmd.c:406
+#: alpine/mailcmd.c:458
 msgid "HELP FOR MESSAGE INDEX"
 msgstr ""
 
-#: alpine/mailcmd.c:408
+#: alpine/mailcmd.c:460
 msgid "HELP FOR MESSAGE TEXT"
 msgstr ""
 
-#: alpine/mailcmd.c:409
+#: alpine/mailcmd.c:461
 msgid "HELP FOR THREAD INDEX"
 msgstr ""
 
-#: alpine/mailcmd.c:457 alpine/mailcmd.c:523
+#: alpine/mailcmd.c:509 alpine/mailcmd.c:575
 #, c-format
 msgid "Already on first %s in Zoomed Index"
 msgstr ""
 
-#: alpine/mailcmd.c:458 alpine/mailcmd.c:524 alpine/mailcmd.c:538
+#: alpine/mailcmd.c:510 alpine/mailcmd.c:576 alpine/mailcmd.c:590
 msgid "thread"
 msgstr ""
 
-#: alpine/mailcmd.c:458 alpine/mailcmd.c:524 alpine/mailcmd.c:538
-#: alpine/mailcmd.c:1207
+#: alpine/mailcmd.c:510 alpine/mailcmd.c:576 alpine/mailcmd.c:590
+#: alpine/mailcmd.c:1261
 msgid "message"
 msgstr ""
 
-#: alpine/mailcmd.c:464
+#: alpine/mailcmd.c:516
 msgid "View previous thread"
 msgstr ""
 
-#: alpine/mailcmd.c:469
+#: alpine/mailcmd.c:521
 msgid "Viewing previous thread"
 msgstr ""
 
-#: alpine/mailcmd.c:537
+#: alpine/mailcmd.c:589
 #, c-format
 msgid "Already on first %s"
 msgstr ""
 
-#: alpine/mailcmd.c:573
+#: alpine/mailcmd.c:625
 msgid "View next thread"
 msgstr ""
 
-#: alpine/mailcmd.c:578
+#: alpine/mailcmd.c:630
 msgid "Viewing next thread"
 msgstr ""
 
-#: alpine/mailcmd.c:635
+#: alpine/mailcmd.c:689
 msgid "Expand collapsed thread to see more messages"
 msgstr ""
 
-#: alpine/mailcmd.c:653
+#: alpine/mailcmd.c:707
 msgid ".  Press TAB for next folder."
 msgstr ""
 
-#: alpine/mailcmd.c:656
+#: alpine/mailcmd.c:710
 msgid ".  No more folders to TAB to."
 msgstr ""
 
-#: alpine/mailcmd.c:854 alpine/mailcmd.c:1142
+#: alpine/mailcmd.c:908 alpine/mailcmd.c:1196
 msgid "NextNew"
 msgstr ""
 
-#: alpine/mailcmd.c:859
+#: alpine/mailcmd.c:913
 #, c-format
 msgid "View thread number %s? "
 msgstr ""
 
-#: alpine/mailcmd.c:863
+#: alpine/mailcmd.c:917
 #, c-format
 msgid "View message in thread number %s? "
 msgstr ""
 
-#: alpine/mailcmd.c:1027
+#: alpine/mailcmd.c:1081
 msgid "To Inbox"
 msgstr ""
 
-#: alpine/mailcmd.c:1037
+#: alpine/mailcmd.c:1091
 #, c-format
 msgid "No more incoming folders. Return to \"%s\"? "
 msgstr ""
 
-#: alpine/mailcmd.c:1039
+#: alpine/mailcmd.c:1093
 #, c-format
 msgid "No more news groups. Return to \"%s\"? "
 msgstr ""
 
-#: alpine/mailcmd.c:1063
+#: alpine/mailcmd.c:1117
 msgid "No more incoming folders"
 msgstr ""
 
-#: alpine/mailcmd.c:1065
+#: alpine/mailcmd.c:1119
 msgid "No more news groups"
 msgstr ""
 
-#: alpine/mailcmd.c:1198 alpine/mailindx.c:2934
+#: alpine/mailcmd.c:1252 alpine/mailindx.c:2934
 msgid "Index Zoom Mode is now off"
 msgstr ""
 
-#: alpine/mailcmd.c:1204
+#: alpine/mailcmd.c:1258
 #, c-format
 msgid "In Zoomed Index of %s%s%s%s.  Use \"Z\" to restore regular Index"
 msgstr ""
 
-#: alpine/mailcmd.c:1207
+#: alpine/mailcmd.c:1261
 msgid "threads"
 msgstr ""
 
-#: alpine/mailcmd.c:1212
+#: alpine/mailcmd.c:1266
 msgid "All messages selected, so not entering Index Zoom Mode"
 msgstr ""
 
-#: alpine/mailcmd.c:1266
+#: alpine/mailcmd.c:1320
 msgid "Unexclude not available for mail folders"
 msgstr ""
 
-#: alpine/mailcmd.c:1456 alpine/mailpart.c:523 alpine/mailpart.c:2650
+#: alpine/mailcmd.c:1510 alpine/mailpart.c:523 alpine/mailpart.c:2814
 msgid "Display of full headers is now off."
 msgstr ""
 
-#: alpine/mailcmd.c:1461 alpine/mailpart.c:528 alpine/mailpart.c:2655
+#: alpine/mailcmd.c:1515 alpine/mailpart.c:528 alpine/mailpart.c:2819
 #, c-format
 msgid "Quotes displayed, use %s to see full headers"
 msgstr ""
 
-#: alpine/mailcmd.c:1467 alpine/mailpart.c:534 alpine/mailpart.c:2661
+#: alpine/mailcmd.c:1521 alpine/mailpart.c:534 alpine/mailpart.c:2825
 msgid "Display of full headers is now on."
 msgstr ""
 
-#: alpine/mailcmd.c:1676
+#: alpine/mailcmd.c:1731
 msgid "    Set desired flags for current message below.  An 'X' means set"
 msgstr ""
 
-#: alpine/mailcmd.c:1677
+#: alpine/mailcmd.c:1732
 msgid "    it, and a ' ' means to unset it.  Choose \"Exit\" when finished."
 msgstr ""
 
-#: alpine/mailcmd.c:1682
+#: alpine/mailcmd.c:1737
 msgid "    Set desired flags below for selected messages.  A '?' means to"
 msgstr ""
 
-#: alpine/mailcmd.c:1683
+#: alpine/mailcmd.c:1738
 msgid "    leave the flag unchanged, 'X' means to set it, and a ' ' means"
 msgstr ""
 
-#: alpine/mailcmd.c:1684
+#: alpine/mailcmd.c:1739
 msgid "    to unset it.  Use the \"Return\" key to toggle, and choose"
 msgstr ""
 
-#: alpine/mailcmd.c:1685
+#: alpine/mailcmd.c:1740
 msgid "    \"Exit\" when finished."
 msgstr ""
 
-#: alpine/mailcmd.c:1770 alpine/mailcmd.c:1772
+#: alpine/mailcmd.c:1825 alpine/mailcmd.c:1827
 msgid "User-defined Keywords from Setup/Config"
 msgstr ""
 
-#: alpine/mailcmd.c:1805 alpine/mailcmd.c:1807
+#: alpine/mailcmd.c:1860 alpine/mailcmd.c:1862
 msgid "Other keywords in the mailbox that are not user-defined"
 msgstr ""
 
-#: alpine/mailcmd.c:1881
+#: alpine/mailcmd.c:1936
 msgid "Error accessing message data"
 msgstr ""
 
-#: alpine/mailcmd.c:2107
+#: alpine/mailcmd.c:2159
 msgid "No more keywords allowed in this folder!"
 msgstr ""
 
-#: alpine/mailcmd.c:2110
+#: alpine/mailcmd.c:2162
 msgid "Cannot add keywords for this folder so cannot set Forwarded flag"
 msgstr ""
 
-#: alpine/mailcmd.c:2113
+#: alpine/mailcmd.c:2165
 msgid "Cannot add keywords for this folder"
 msgstr ""
 
-#: alpine/mailcmd.c:2148
+#: alpine/mailcmd.c:2200
 msgid "No flags changed."
 msgstr ""
 
-#: alpine/mailcmd.c:2171
+#: alpine/mailcmd.c:2223
 msgid "Flag New, Deleted, Answered, Forwarded or Important ? "
 msgstr ""
 
-#: alpine/mailcmd.c:2173
+#: alpine/mailcmd.c:2225
 msgid "Flag New, Deleted, Answered, Forwarded, Important or Keyword initial ? "
 msgstr ""
 
-#: alpine/mailcmd.c:2175
+#: alpine/mailcmd.c:2227
 msgid "Flag !New, !Deleted, !Answered, !Forwarded, or !Important ? "
 msgstr ""
 
-#: alpine/mailcmd.c:2177
+#: alpine/mailcmd.c:2229
 msgid ""
 "Flag !New, !Deleted, !Answered, !Forwarded, !Important or !Keyword initial ? "
 msgstr ""
 
-#: alpine/mailcmd.c:2392
+#: alpine/mailcmd.c:2444
 msgid "WARNING: non-selected message is being bounced!"
 msgstr ""
 
-#: alpine/mailcmd.c:2397
+#: alpine/mailcmd.c:2449
 msgid "WARNING: not bouncing all selected messages!"
 msgstr ""
 
-#: alpine/mailcmd.c:2441
+#: alpine/mailcmd.c:2493
 msgid "Saved copy will NOT include entire message!  Continue"
 msgstr ""
 
-#: alpine/mailcmd.c:2456
+#: alpine/mailcmd.c:2508
 msgid "Can't save message.  Error accessing folder"
 msgstr ""
 
-#: alpine/mailcmd.c:2494
+#: alpine/mailcmd.c:2546
 msgid "Saving"
 msgstr ""
 
-#: alpine/mailcmd.c:2609
+#: alpine/mailcmd.c:2661
 msgid "Compose, Forward, Reply, or Bounce? "
 msgstr ""
 
-#: alpine/mailcmd.c:2615 alpine/roleconf.c:144
+#: alpine/mailcmd.c:2667 alpine/roleconf.c:140
 msgid "No roles available. Use Setup/Rules to add roles."
 msgstr ""
 
-#: alpine/mailcmd.c:2640
+#: alpine/mailcmd.c:2692
 msgid "Composition"
 msgstr ""
 
 #. TRANSLATORS: command means go to Folders list
 #. TRANSLATORS: To Folders
-#: alpine/mailcmd.c:2743 alpine/adrbkcmd.c:857
+#: alpine/mailcmd.c:2795 alpine/adrbkcmd.c:853
 msgid "To Fldrs"
 msgstr ""
 
-#: alpine/mailcmd.c:2749 alpine/mailcmd.c:5584
+#: alpine/mailcmd.c:2801 alpine/mailcmd.c:5653
 msgid "Prev Collection"
 msgstr ""
 
-#: alpine/mailcmd.c:2754 alpine/mailcmd.c:5589
+#: alpine/mailcmd.c:2806 alpine/mailcmd.c:5658
 msgid "Next Collection"
 msgstr ""
 
 #. TRANSLATORS: list all the matches
-#: alpine/mailcmd.c:2770 alpine/mailcmd.c:3586 alpine/mailcmd.c:5608
+#: alpine/mailcmd.c:2822 alpine/mailcmd.c:3638 alpine/mailcmd.c:5677
 msgid "ListMatches"
 msgstr ""
 
-#: alpine/mailcmd.c:2892 alpine/mailcmd.c:5744
+#: alpine/mailcmd.c:2944 alpine/mailcmd.c:5813
 msgid "Error reading folder name"
 msgstr ""
 
-#: alpine/mailcmd.c:2923 alpine/mailcmd.c:5819 alpine/mailcmd.c:5830
+#: alpine/mailcmd.c:2975 alpine/mailcmd.c:5888 alpine/mailcmd.c:5899
 #, c-format
 msgid "Problem accessing folder \"%s\""
 msgstr ""
 
-#: alpine/mailcmd.c:2972 alpine/folder.c:2744
+#: alpine/mailcmd.c:3024 alpine/folder.c:2740
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr ""
 
-#: alpine/mailcmd.c:3018
+#: alpine/mailcmd.c:3070
 msgid "HELP FOR SAVE"
 msgstr ""
 
-#: alpine/mailcmd.c:3164
+#: alpine/mailcmd.c:3216
 #, c-format
 msgid "\"%.15s%s\" doesn't exist - Add it in FOLDER LIST screen"
 msgstr ""
 
-#: alpine/mailcmd.c:3171
+#: alpine/mailcmd.c:3223
 #, c-format
 msgid "Folder \"%.15s%s\" in <%.15s%s> doesn't exist. Create"
 msgstr ""
 
-#: alpine/mailcmd.c:3178
+#: alpine/mailcmd.c:3230
 #, c-format
 msgid "Folder \"%.40s%s\" doesn't exist.  Create"
 msgstr ""
 
-#: alpine/mailcmd.c:3227
+#: alpine/mailcmd.c:3279
 msgid "No selected messages are deleted"
 msgstr ""
 
-#: alpine/mailcmd.c:3282
+#: alpine/mailcmd.c:3334
 msgid "Can't expunge. Folder is read-only"
 msgstr ""
 
-#: alpine/mailcmd.c:3335
+#: alpine/mailcmd.c:3387
 msgid "Expunging"
 msgstr ""
 
-#: alpine/mailcmd.c:3371
+#: alpine/mailcmd.c:3423
 #, c-format
 msgid "No messages expunged from folder \"%s\""
 msgstr ""
 
-#: alpine/mailcmd.c:3377
+#: alpine/mailcmd.c:3429
 msgid "No messages marked deleted.  No messages expunged."
 msgstr ""
 
 #. TRANSLATORS: this is an abbreviation for Download Messages
-#: alpine/mailcmd.c:3569 alpine/mailpart.c:1317
+#: alpine/mailcmd.c:3621 alpine/mailpart.c:1324
 msgid "Downld Msg"
 msgstr ""
 
-#: alpine/mailcmd.c:3639 alpine/mailcmd.c:4100 alpine/adrbkcmd.c:4264
-#: alpine/folder.c:3763 alpine/mailpart.c:1763 alpine/mailpart.c:1840
+#: alpine/mailcmd.c:3691 alpine/mailcmd.c:4161 alpine/adrbkcmd.c:4261
+#: alpine/folder.c:3758 alpine/mailpart.c:1770 alpine/mailpart.c:1847
 #, c-format
 msgid "Can't export to file outside of %s"
 msgstr ""
 
-#: alpine/mailcmd.c:3700
+#: alpine/mailcmd.c:3752
 msgid "Error running download command"
 msgstr ""
 
-#: alpine/mailcmd.c:3713
+#: alpine/mailcmd.c:3765
 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:3731 alpine/mailpart.c:1792
+#: alpine/mailcmd.c:3783 alpine/mailpart.c:1799
 #, c-format
 msgid "Error opening file \"%s\" to export message: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:3743
+#: alpine/mailcmd.c:3795
 msgid "Can't export message. Error accessing mail folder"
 msgstr ""
 
 #. TRANSLATORS: Error exporting to <filename>: <error text>
-#: alpine/mailcmd.c:3784 alpine/adrbkcmd.c:4469
+#: alpine/mailcmd.c:3836 alpine/adrbkcmd.c:4466
 #, c-format
 msgid "Error exporting to \"%s\" : %s"
 msgstr ""
 
-#: alpine/mailcmd.c:3810
+#: alpine/mailcmd.c:3862
 #, c-format
 msgid "Can't save attachments, filename too long: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:3851
+#: alpine/mailcmd.c:3903
 msgid "Problem saving attachments"
 msgstr ""
 
-#: alpine/mailcmd.c:3858
+#: alpine/mailcmd.c:3910
 #, c-format
 msgid "Problem saving attachments: %s: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:3869
+#: alpine/mailcmd.c:3921
 msgid "Problem reading message"
 msgstr ""
 
-#: alpine/mailcmd.c:3945
+#: alpine/mailcmd.c:4006
 msgid "Problems saving attachments"
 msgstr ""
 
 #. TRANSLATORS: Saved <how many> attachments to <directory name>
-#: alpine/mailcmd.c:3951
+#: alpine/mailcmd.c:4012
 #, c-format
 msgid "Saved %s attachments to %s"
 msgstr ""
 
-#: alpine/mailcmd.c:3954
+#: alpine/mailcmd.c:4015
 msgid "No attachments to save"
 msgstr ""
 
 #. TRANSLATORS: Problem saving to <filename>: <error text>
-#: alpine/mailcmd.c:4053 alpine/mailcmd.c:4063
+#: alpine/mailcmd.c:4114 alpine/mailcmd.c:4124
 #, c-format
 msgid "Problem saving to \"%s\": %s"
 msgstr ""
 
-#: alpine/mailcmd.c:4070
+#: alpine/mailcmd.c:4131
 #, c-format
 msgid "Error opening file \"%s\" for export: %s"
 msgstr ""
 
 #. TRANSLATORS: Export all attachment parts
-#: alpine/mailcmd.c:4225 alpine/mailcmd.c:4701
+#: alpine/mailcmd.c:4286 alpine/mailcmd.c:4768
 msgid "AllParts"
 msgstr ""
 
-#: alpine/mailcmd.c:4233 alpine/mailcmd.c:4721
+#: alpine/mailcmd.c:4294 alpine/mailcmd.c:4788
 msgid "Binary"
 msgstr ""
 
-#: alpine/mailcmd.c:4471
+#: alpine/mailcmd.c:4538
 msgid "HELP FOR IMPORT FILE SELECT"
 msgstr ""
 
-#: alpine/mailcmd.c:4473 alpine/mailcmd.c:4475
+#: alpine/mailcmd.c:4540 alpine/mailcmd.c:4542
 msgid "HELP FOR EXPORT FILE SELECT"
 msgstr ""
 
-#: alpine/mailcmd.c:4578
+#: alpine/mailcmd.c:4645
 msgid "getcwd() call failed at get_export_filename"
 msgstr ""
 
-#: alpine/mailcmd.c:4706
+#: alpine/mailcmd.c:4773
 msgid "NoAllParts"
 msgstr ""
 
-#: alpine/mailcmd.c:4725
+#: alpine/mailcmd.c:4792
 msgid "No Binary"
 msgstr ""
 
-#: alpine/mailcmd.c:4827
+#: alpine/mailcmd.c:4896
 #, 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:4879
+#: alpine/mailcmd.c:4948
 msgid "Overwrite"
 msgstr ""
 
-#: alpine/mailcmd.c:4880
+#: alpine/mailcmd.c:4949
 msgid "Append"
 msgstr ""
 
 #. TRANSLATORS: asking user whether to overwrite a file or not,
 #. File <filename> already exists. Overwrite it ?
-#: alpine/mailcmd.c:4890
+#: alpine/mailcmd.c:4959
 #, c-format
 msgid "File \"%s%s\" already exists. Overwrite it "
 msgstr ""
 
 #. TRANSLATORS: Cannot remove old <filename>: <error text>
-#: alpine/mailcmd.c:4901
+#: alpine/mailcmd.c:4970
 #, c-format
 msgid "Cannot remove old %s: %s"
 msgstr ""
 
 #. TRANSLATORS: File <filename> already exists. Overwrite or append to it ?
-#: alpine/mailcmd.c:4914
+#: alpine/mailcmd.c:4983
 #, 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:4928
+#: alpine/mailcmd.c:4997
 #, c-format
 msgid "Warning: Cannot truncate old %s: %s"
 msgstr ""
 
 #. TRANSLATORS: go to First Message
-#: alpine/mailcmd.c:5081 alpine/mailindx.c:2966
+#: alpine/mailcmd.c:5150 alpine/mailindx.c:2967
 msgid "First Msg"
 msgstr ""
 
-#: alpine/mailcmd.c:5082 alpine/mailindx.c:2967
+#: alpine/mailcmd.c:5151 alpine/mailindx.c:2968
 msgid "Last Msg"
 msgstr ""
 
-#: alpine/mailcmd.c:5165 alpine/mailcmd.c:5423
+#: alpine/mailcmd.c:5234 alpine/mailcmd.c:5492
 msgid "Invalid number entered. Use only digits 0-9"
 msgstr ""
 
-#: alpine/mailcmd.c:5430
+#: alpine/mailcmd.c:5499
 msgid "Number should be >= 0"
 msgstr ""
 
-#: alpine/mailcmd.c:5433
+#: alpine/mailcmd.c:5502
 #, c-format
 msgid "Maximum is %s"
 msgstr ""
 
-#: alpine/mailcmd.c:5595
+#: alpine/mailcmd.c:5664
 msgid "INBOX"
 msgstr ""
 
-#: alpine/mailcmd.c:5834
+#: alpine/mailcmd.c:5903
 #, c-format
 msgid "Can't find Incoming Folder: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:5838
+#: alpine/mailcmd.c:5907
 #, c-format
 msgid "Can't find folder \"%s\" in %s"
 msgstr ""
 
-#: alpine/mailcmd.c:5842
+#: alpine/mailcmd.c:5911
 #, c-format
 msgid "Can't find folder \"%s\""
 msgstr ""
 
 #. TRANSLATORS: This is a question, Print Index ?
-#: alpine/mailcmd.c:6185
+#: alpine/mailcmd.c:6254
 msgid "Print Index"
 msgstr ""
 
-#: alpine/mailcmd.c:6248
+#: alpine/mailcmd.c:6317
 msgid "Error printing folder index"
 msgstr ""
 
-#: alpine/mailcmd.c:6277
+#: alpine/mailcmd.c:6346
 msgid "Error printing message"
 msgstr ""
 
-#: alpine/mailcmd.c:6407
+#: alpine/mailcmd.c:6476
 msgid "Shown Text"
 msgstr ""
 
-#: alpine/mailcmd.c:6407
+#: alpine/mailcmd.c:6476
 msgid "Raw Text"
 msgstr ""
 
-#: alpine/mailcmd.c:6408
+#: alpine/mailcmd.c:6477
 msgid "Free Output"
 msgstr ""
 
-#: alpine/mailcmd.c:6408
+#: alpine/mailcmd.c:6477
 msgid "Capture Output"
 msgstr ""
 
-#: alpine/mailcmd.c:6409
+#: alpine/mailcmd.c:6478
 msgid "No Delimiter"
 msgstr ""
 
-#: alpine/mailcmd.c:6409
+#: alpine/mailcmd.c:6478
 msgid "With Delimiter"
 msgstr ""
 
-#: alpine/mailcmd.c:6411
+#: alpine/mailcmd.c:6480
 msgid "To Same Pipe"
 msgstr ""
 
-#: alpine/mailcmd.c:6411
+#: alpine/mailcmd.c:6480
 msgid "To Individual Pipes"
 msgstr ""
 
-#: alpine/mailcmd.c:6437
+#: alpine/mailcmd.c:6506
 msgid "Internal problem encountered"
 msgstr ""
 
-#: alpine/mailcmd.c:6560
+#: alpine/mailcmd.c:6629
 #, c-format
 msgid "Internal Error: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:6583
+#: alpine/mailcmd.c:6652
 msgid "Error piping message"
 msgstr ""
 
-#: alpine/mailcmd.c:6593
+#: alpine/mailcmd.c:6662
 msgid "Pipe command completed"
 msgstr ""
 
-#: alpine/mailcmd.c:6607
+#: alpine/mailcmd.c:6676
 msgid "HELP FOR PIPE COMMAND"
 msgstr ""
 
-#: alpine/mailcmd.c:6677
+#: alpine/mailcmd.c:6746
 msgid " has information associated with it "
 msgstr ""
 
-#: alpine/mailcmd.c:6678
+#: alpine/mailcmd.c:6747
 msgid "that explains how to participate in an email list.  An "
 msgstr ""
 
-#: alpine/mailcmd.c:6679
+#: alpine/mailcmd.c:6748
 msgid "email list is represented by a single email address that "
 msgstr ""
 
-#: alpine/mailcmd.c:6680
+#: alpine/mailcmd.c:6749
 msgid "users sharing a common interest can send messages to (known "
 msgstr ""
 
-#: alpine/mailcmd.c:6681
+#: alpine/mailcmd.c:6750
 msgid "as posting) which are then redistributed to all members "
 msgstr ""
 
-#: alpine/mailcmd.c:6682
+#: alpine/mailcmd.c:6751
 msgid "of the list (sometimes after review by a moderator)."
 msgstr ""
 
-#: alpine/mailcmd.c:6683
+#: alpine/mailcmd.c:6752
 msgid "<P>List participation commands in this message include:"
 msgstr ""
 
-#: alpine/mailcmd.c:6728
+#: alpine/mailcmd.c:6797
 msgid "With the provided comment:<P><BLOCKQUOTE>"
 msgstr ""
 
-#: alpine/mailcmd.c:6737
+#: alpine/mailcmd.c:6806
 msgid "Posting is <EM>not</EM> allowed on this list"
 msgstr ""
 
-#: alpine/mailcmd.c:6821
+#: alpine/mailcmd.c:6890
 msgid "MAIL LIST COMMANDS"
 msgstr ""
 
-#: alpine/mailcmd.c:6825
+#: alpine/mailcmd.c:6894
 msgid "HELP FOR LIST COMMANDS"
 msgstr ""
 
-#: alpine/mailcmd.c:6897
+#: alpine/mailcmd.c:6978
 msgid "unselect Curthrd"
 msgstr ""
 
-#: alpine/mailcmd.c:6902 alpine/folder.c:3297
+#: alpine/mailcmd.c:6983 alpine/folder.c:3288
 msgid "unselect Cur"
 msgstr ""
 
-#: alpine/mailcmd.c:6947
+#: alpine/mailcmd.c:7042
 msgid "HELP FOR SELECT"
 msgstr ""
 
-#: alpine/mailcmd.c:7122
+#: alpine/mailcmd.c:7233
 msgid "No change resulted.  Matching messages already selected."
 msgstr ""
 
-#: alpine/mailcmd.c:7125
+#: alpine/mailcmd.c:7236
 #, c-format
 msgid "Select failed.  No %smessages selected."
 msgstr ""
 
-#: alpine/mailcmd.c:7126
+#: alpine/mailcmd.c:7237
 msgid "additional "
 msgstr ""
 
-#: alpine/mailcmd.c:7141
+#: alpine/mailcmd.c:7252
 #, c-format
 msgid "Select matched %s message%s!"
 msgstr ""
 
-#: alpine/mailcmd.c:7308
+#: alpine/mailcmd.c:7419
 msgid "Flag"
 msgstr ""
 
-#: alpine/mailcmd.c:7315
+#: alpine/mailcmd.c:7426
 msgid "Pipe"
 msgstr ""
 
-#: alpine/mailcmd.c:7330
+#: alpine/mailcmd.c:7441
 msgid "Collapse"
 msgstr ""
 
-#: alpine/mailcmd.c:7331 alpine/addrbook.c:2503 alpine/addrbook.c:2725
+#: alpine/mailcmd.c:7442 alpine/addrbook.c:2503 alpine/addrbook.c:2725
 msgid "Expand"
 msgstr ""
 
-#: alpine/mailcmd.c:7338
+#: alpine/mailcmd.c:7449
 msgid "UnSelect"
 msgstr ""
 
-#: alpine/mailcmd.c:7475
+#: alpine/mailcmd.c:7586
 msgid "Reply, Forward or Bounce using a role? "
 msgstr ""
 
-#: alpine/mailcmd.c:7610 alpine/mailcmd.c:7782
+#: alpine/mailcmd.c:7721 alpine/mailcmd.c:7893
 #, c-format
 msgid "Invalid number range, missing number before \"-\": %s"
 msgstr ""
 
-#: alpine/mailcmd.c:7628
+#: alpine/mailcmd.c:7739
 #, c-format
 msgid "Invalid message number: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:7639 alpine/mailcmd.c:7679
+#: alpine/mailcmd.c:7750 alpine/mailcmd.c:7790
 #, c-format
 msgid "\"%s\" out of message number range"
 msgstr ""
 
-#: alpine/mailcmd.c:7667 alpine/mailcmd.c:7842
+#: alpine/mailcmd.c:7778 alpine/mailcmd.c:7953
 #, c-format
 msgid "Invalid number range, missing number after \"-\": %s"
 msgstr ""
 
-#: alpine/mailcmd.c:7690 alpine/mailcmd.c:7867
+#: alpine/mailcmd.c:7801 alpine/mailcmd.c:7978
 #, c-format
 msgid "Invalid reverse message number range: %s-%s"
 msgstr ""
 
-#: alpine/mailcmd.c:7800
+#: alpine/mailcmd.c:7911
 #, c-format
 msgid "Invalid thread number: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:7813 alpine/mailcmd.c:7856
+#: alpine/mailcmd.c:7924 alpine/mailcmd.c:7967
 #, c-format
 msgid "\"%s\" out of thread number range"
 msgstr ""
 
-#: alpine/mailcmd.c:8058 alpine/mailcmd.c:8409 alpine/mailcmd.c:8562
-#: alpine/mailcmd.c:8660 alpine/mailcmd.c:8747 alpine/mailcmd.c:8968
+#: alpine/mailcmd.c:8169 alpine/mailcmd.c:8257 alpine/mailcmd.c:8586
+#: alpine/mailcmd.c:8739 alpine/mailcmd.c:8837 alpine/mailcmd.c:8924
+#: alpine/mailcmd.c:9145
 msgid "Selecting"
 msgstr ""
 
-#: alpine/mailcmd.c:8072
+#: alpine/mailcmd.c:8183
 #, c-format
 msgid "Invalid date entered: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:8104
+#: alpine/mailcmd.c:8289
 msgid "[Match_My_Addresses]"
 msgstr ""
 
-#: alpine/mailcmd.c:8105
+#: alpine/mailcmd.c:8290
 msgid "[Don't_Match_My_Addresses]"
 msgstr ""
 
 #. TRANSLATORS: use Current To Address
-#: alpine/mailcmd.c:8144
+#: alpine/mailcmd.c:8328
 msgid "Cur To"
 msgstr ""
 
 #. TRANSLATORS: use Current From Address
-#: alpine/mailcmd.c:8149
+#: alpine/mailcmd.c:8333
 msgid "Cur From"
 msgstr ""
 
 #. TRANSLATORS: use Current Cc Address
-#: alpine/mailcmd.c:8154
+#: alpine/mailcmd.c:8338
 msgid "Cur Cc"
 msgstr ""
 
 #. TRANSLATORS: Match Me means match my address
-#: alpine/mailcmd.c:8159
+#: alpine/mailcmd.c:8343
 msgid "Match Me"
 msgstr ""
 
 #. TRANSLATORS: use Current Subject
-#: alpine/mailcmd.c:8172
+#: alpine/mailcmd.c:8356
 msgid "Cur Subject"
 msgstr ""
 
-#: alpine/mailcmd.c:8484 alpine/mailcmd.c:8503
+#: alpine/mailcmd.c:8661 alpine/mailcmd.c:8680
 #, c-format
 msgid "Invalid size entered: %s"
 msgstr ""
 
-#: alpine/mailcmd.c:8645
+#: alpine/mailcmd.c:8822
 msgid "HELP FOR SELECT BASED ON STATUS"
 msgstr ""
 
-#: alpine/mailcmd.c:8698
+#: alpine/mailcmd.c:8875
 msgid "Rule to NOT match: "
 msgstr ""
 
-#: alpine/mailcmd.c:8699
+#: alpine/mailcmd.c:8876
 msgid "Rule to match: "
 msgstr ""
 
-#: alpine/mailcmd.c:8716
+#: alpine/mailcmd.c:8893
 msgid "HELP FOR SELECT BY RULE"
 msgstr ""
 
-#: alpine/mailcmd.c:8781
+#: alpine/mailcmd.c:8958
 msgid "No rules available. Use Setup/Rules to add some."
 msgstr ""
 
-#: alpine/mailcmd.c:8793
+#: alpine/mailcmd.c:8970
 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:8807
+#: alpine/mailcmd.c:8984
 msgid "SELECT A RULE"
 msgstr ""
 
 #. TRANSLATORS: Print something1 using something2.
 #. "rules" is something1
-#: alpine/mailcmd.c:8808 alpine/roleconf.c:377
+#: alpine/mailcmd.c:8985 alpine/roleconf.c:373
 msgid "rules"
 msgstr ""
 
-#: alpine/mailcmd.c:8809
+#: alpine/mailcmd.c:8986
 msgid "HELP FOR SELECTING A RULE NICKNAME"
 msgstr ""
 
-#: alpine/mailcmd.c:8892
+#: alpine/mailcmd.c:9069
 msgid "Keyword (or keyword initial) to NOT match: "
 msgstr ""
 
-#: alpine/mailcmd.c:8894
+#: alpine/mailcmd.c:9071
 msgid "Keyword (or keyword initial) to match: "
 msgstr ""
 
-#: alpine/mailcmd.c:8898
+#: alpine/mailcmd.c:9075
 msgid "Keyword to NOT match: "
 msgstr ""
 
-#: alpine/mailcmd.c:8900
+#: alpine/mailcmd.c:9077
 msgid "Keyword to match: "
 msgstr ""
 
-#: alpine/mailcmd.c:9005
+#: alpine/mailcmd.c:9182
 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:9018
+#: alpine/mailcmd.c:9195
 msgid "SELECT A KEYWORD"
 msgstr ""
 
-#: alpine/mailcmd.c:9019 alpine/mailcmd.c:9070
+#: alpine/mailcmd.c:9196 alpine/mailcmd.c:9247
 msgid "keywords"
 msgstr ""
 
-#: alpine/mailcmd.c:9020
+#: alpine/mailcmd.c:9197
 msgid "HELP FOR SELECTING A KEYWORD"
 msgstr ""
 
-#: alpine/mailcmd.c:9070
+#: alpine/mailcmd.c:9247
 msgid "SELECT KEYWORDS"
 msgstr ""
 
-#: alpine/mailcmd.c:9072
+#: alpine/mailcmd.c:9249
 msgid "HELP FOR SELECTING KEYWORDS"
 msgstr ""
 
-#: alpine/mailcmd.c:9120
+#: alpine/mailcmd.c:9297
 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:9141
+#: alpine/mailcmd.c:9318
 msgid "SELECT A CHARACTER SET"
 msgstr ""
 
-#: alpine/mailcmd.c:9142 alpine/mailcmd.c:9316
+#: alpine/mailcmd.c:9319 alpine/mailcmd.c:9493
 msgid "character sets"
 msgstr ""
 
-#: alpine/mailcmd.c:9143
+#: alpine/mailcmd.c:9320
 msgid "HELP FOR SELECTING A CHARACTER SET"
 msgstr ""
 
-#: alpine/mailcmd.c:9253
+#: alpine/mailcmd.c:9430
 msgid "Scripts representing groups of related character sets"
 msgstr ""
 
-#: alpine/mailcmd.c:9283
+#: alpine/mailcmd.c:9460
 msgid "Individual character sets, may be mixed with scripts"
 msgstr ""
 
-#: alpine/mailcmd.c:9316
+#: alpine/mailcmd.c:9493
 msgid "SELECT CHARACTER SETS"
 msgstr ""
 
-#: alpine/mailcmd.c:9318
+#: alpine/mailcmd.c:9495
 msgid "HELP FOR SELECTING CHARACTER SETS"
 msgstr ""
 
-#: alpine/mailcmd.c:9370
+#: alpine/mailcmd.c:9548
 msgid "Resource : "
 msgstr ""
 
-#: alpine/mailcmd.c:9374
+#: alpine/mailcmd.c:9552
 msgid "Usage    : "
 msgstr ""
 
-#: alpine/mailcmd.c:9379 alpine/mailcmd.c:9394
+#: alpine/mailcmd.c:9557 alpine/mailcmd.c:9572
 msgid " message"
 msgstr ""
 
-#: alpine/mailcmd.c:9381
+#: alpine/mailcmd.c:9559
 msgid "s "
 msgstr ""
 
-#: alpine/mailcmd.c:9383
+#: alpine/mailcmd.c:9561
 msgid " "
 msgstr ""
 
-#: alpine/mailcmd.c:9389
+#: alpine/mailcmd.c:9567
 msgid "Limit    : "
 msgstr ""
 
-#: alpine/mailcmd.c:9396
+#: alpine/mailcmd.c:9574
 msgid ""
 "s\n"
 "\n"
 msgstr ""
 
-#: alpine/mailcmd.c:9398
+#: alpine/mailcmd.c:9576
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: alpine/mailcmd.c:9405
+#: alpine/mailcmd.c:9583
 msgid "Quota Resources Summary"
 msgstr ""
 
-#: alpine/mailcmd.c:9406
+#: alpine/mailcmd.c:9584
 msgid "QUOTA SUMMARY"
 msgstr ""
 
-#: alpine/mailcmd.c:9460
+#: alpine/mailcmd.c:9638
 msgid "Choose type of sort : "
 msgstr ""
 
-#: alpine/mailcmd.c:9462
+#: alpine/mailcmd.c:9640
 msgid "Choose type of sort, or 'R' to reverse current sort : "
 msgstr ""
 
-#: alpine/mailcmd.c:9482
+#: alpine/mailcmd.c:9660
 msgid "Reverse"
 msgstr ""
 
@@ -3591,42 +3774,42 @@ msgstr ""
 #. of the message or thread, as in
 #. Message 17
 #. when reading message number 17.
-#: alpine/titlebar.c:539 alpine/titlebar.c:549
+#: alpine/titlebar.c:538 alpine/titlebar.c:548
 msgid "Thd"
 msgstr ""
 
-#: alpine/titlebar.c:539 alpine/titlebar.c:549
+#: alpine/titlebar.c:538 alpine/titlebar.c:548
 msgid "Thread"
 msgstr ""
 
-#: alpine/titlebar.c:541
+#: alpine/titlebar.c:540
 msgid "Msg"
 msgstr ""
 
-#: alpine/titlebar.c:541
+#: alpine/titlebar.c:540
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: it might say READONLY or CLOSED in the titlebar, referring to
 #. the current folder.
-#: alpine/titlebar.c:696
+#: alpine/titlebar.c:695
 msgid "(CLOSED)"
 msgstr ""
 
-#: alpine/titlebar.c:699
+#: alpine/titlebar.c:698
 msgid "(READONLY)"
 msgstr ""
 
 #. TRANSLATORS: the name of the open folder follows this in the titlebar
-#: alpine/titlebar.c:793
+#: alpine/titlebar.c:792
 msgid "Folder: "
 msgstr ""
 
-#: alpine/adrbkcmd.c:148
+#: alpine/adrbkcmd.c:144
 msgid "Error reading entry"
 msgstr ""
 
-#: alpine/adrbkcmd.c:153
+#: alpine/adrbkcmd.c:149
 msgid "Nothing to view"
 msgstr ""
 
@@ -3634,11 +3817,11 @@ msgstr ""
 #. TRANSLATORS: these are the headings for setting up a collection of
 #. folders, PATH is a filesystem path, VIEW is sort of a technical
 #. term that can be used to restrict the View to fewer folders
-#: alpine/adrbkcmd.c:162 alpine/adrbkcmd.c:165 alpine/adrbkcmd.c:569
-#: alpine/adrbkcmd.c:845 alpine/adrbkcmd.c:1028 alpine/adrbkcmd.c:1036
-#: alpine/adrbkcmd.c:1606 alpine/adrbkcmd.c:1867 alpine/adrbkcmd.c:5748
-#: alpine/adrbkcmd.c:5860 alpine/folder.c:884 alpine/folder.c:956
-#: alpine/folder.c:961 alpine/roleconf.c:2928
+#: alpine/adrbkcmd.c:158 alpine/adrbkcmd.c:161 alpine/adrbkcmd.c:565
+#: alpine/adrbkcmd.c:841 alpine/adrbkcmd.c:1024 alpine/adrbkcmd.c:1032
+#: alpine/adrbkcmd.c:1602 alpine/adrbkcmd.c:1863 alpine/adrbkcmd.c:5745
+#: alpine/adrbkcmd.c:5857 alpine/folder.c:880 alpine/folder.c:952
+#: alpine/folder.c:957 alpine/roleconf.c:2924
 msgid "Nickname"
 msgstr ""
 
@@ -3646,8 +3829,8 @@ msgstr ""
 #. For example, in
 #. Fred Flintstone <fred@bedrock.org>
 #. Fred Flintstone is the Full Name.
-#: alpine/adrbkcmd.c:176 alpine/adrbkcmd.c:586 alpine/adrbkcmd.c:850
-#: alpine/adrbkcmd.c:1046 alpine/adrbkcmd.c:5868
+#: alpine/adrbkcmd.c:172 alpine/adrbkcmd.c:582 alpine/adrbkcmd.c:846
+#: alpine/adrbkcmd.c:1042 alpine/adrbkcmd.c:5865
 msgid "Fullname"
 msgstr ""
 
@@ -3655,41 +3838,41 @@ msgstr ""
 #. a cc which is a copy of a message that goes to somebody other than the
 #. main recipient, only this is a copy of a message which is put into a
 #. file on the user's computer.
-#: alpine/adrbkcmd.c:187 alpine/adrbkcmd.c:1054 alpine/adrbkcmd.c:5876
+#: alpine/adrbkcmd.c:183 alpine/adrbkcmd.c:1050 alpine/adrbkcmd.c:5873
 msgid "Fcc"
 msgstr ""
 
 #. TRANSLATORS: %s is the error message
-#: alpine/adrbkcmd.c:275
+#: alpine/adrbkcmd.c:271
 #, c-format
 msgid "Can't format entry: %s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:285 alpine/adrbkcmd.c:749 alpine/adrbkcmd.c:821
-#: alpine/adrbkcmd.c:6936
+#: alpine/adrbkcmd.c:281 alpine/adrbkcmd.c:745 alpine/adrbkcmd.c:817
+#: alpine/adrbkcmd.c:6933
 msgid "expanded entry"
 msgstr ""
 
 #. TRANSLATORS: a screen title. We are viewing an address book
 #. TRANSLATORS: screen titles
-#: alpine/adrbkcmd.c:295 alpine/adrbkcmd.c:969
+#: alpine/adrbkcmd.c:291 alpine/adrbkcmd.c:965
 #, c-format
 msgid "ADDRESS BOOK (View)"
 msgstr ""
 
 #. TRANSLATORS: help screen title
-#: alpine/adrbkcmd.c:302
+#: alpine/adrbkcmd.c:298
 msgid "HELP FOR ADDRESS BOOK VIEW"
 msgstr ""
 
 #. TRANSLATORS: The address book was changed by some other
 #. process. The user is being told that their change (their
 #. Update) has been canceled and they should try again.
-#: alpine/adrbkcmd.c:428
+#: alpine/adrbkcmd.c:424
 msgid "Address book changed. Update cancelled. Try again."
 msgstr ""
 
-#: alpine/adrbkcmd.c:457
+#: alpine/adrbkcmd.c:453
 msgid "update"
 msgstr ""
 
@@ -3698,44 +3881,44 @@ msgstr ""
 #. in the new message. Forward as a Vcard attachment means to
 #. attach it to the message in a special format so it is recognizable
 #. as a Vcard.
-#: alpine/adrbkcmd.c:507
+#: alpine/adrbkcmd.c:503
 msgid "Forward as text or forward as Vcard attachment ? "
 msgstr ""
 
-#: alpine/adrbkcmd.c:512 alpine/adrbkcmd.c:4671
+#: alpine/adrbkcmd.c:508 alpine/adrbkcmd.c:4668
 msgid "Address book forward cancelled"
 msgstr ""
 
-#: alpine/adrbkcmd.c:570 alpine/adrbkcmd.c:584
+#: alpine/adrbkcmd.c:566 alpine/adrbkcmd.c:580
 msgid "Address"
 msgstr ""
 
 #. TRANSLATORS: screen title for viewing an address book entry in Rich
 #. view mode. Rich just means it is expanded to include everything.
-#: alpine/adrbkcmd.c:752
+#: alpine/adrbkcmd.c:748
 msgid "ADDRESS BOOK (Rich View)"
 msgstr ""
 
-#: alpine/adrbkcmd.c:851 alpine/adrbkcmd.c:860
+#: alpine/adrbkcmd.c:847 alpine/adrbkcmd.c:856
 msgid "To Message"
 msgstr ""
 
 #. TRANSLATORS: a File Copy is a copy of a sent message saved in a regular
 #. file on the computer's disk
-#: alpine/adrbkcmd.c:855
+#: alpine/adrbkcmd.c:851
 msgid "FileCopy"
 msgstr ""
 
-#: alpine/adrbkcmd.c:859 alpine/adrbkcmd.c:1062 alpine/adrbkcmd.c:5895
-#: alpine/roleconf.c:2947
+#: alpine/adrbkcmd.c:855 alpine/adrbkcmd.c:1058 alpine/adrbkcmd.c:5892
+#: alpine/roleconf.c:2943
 msgid "Comment"
 msgstr ""
 
-#: alpine/adrbkcmd.c:965
+#: alpine/adrbkcmd.c:961
 msgid "RichView"
 msgstr ""
 
-#: alpine/adrbkcmd.c:971
+#: alpine/adrbkcmd.c:967
 #, c-format
 msgid "ADDRESS BOOK (%c%s)"
 msgstr ""
@@ -3743,65 +3926,65 @@ 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
+#: alpine/adrbkcmd.c:996
 msgid ""
 "\n"
 " Fill in the fields. It is ok to leave fields blank."
 msgstr ""
 
-#: alpine/adrbkcmd.c:1002
+#: alpine/adrbkcmd.c:998
 msgid ""
 "\n"
 " To form a list, just enter multiple comma-separated addresses."
 msgstr ""
 
 #. TRANSLATORS: Same here, but a different version of the screen.
-#: alpine/adrbkcmd.c:1007
+#: alpine/adrbkcmd.c:1003
 msgid ""
 "\n"
 " Change any of the fields. It is ok to leave fields blank."
 msgstr ""
 
-#: alpine/adrbkcmd.c:1010
+#: alpine/adrbkcmd.c:1006
 msgid ""
 "\n"
 " Since this entry does a directory lookup you may not edit the address field."
 msgstr ""
 
-#: alpine/adrbkcmd.c:1013
+#: alpine/adrbkcmd.c:1009
 msgid ""
 "\n"
 " Additional comma-separated addresses may be entered in the address field."
 msgstr ""
 
-#: alpine/adrbkcmd.c:1017
+#: alpine/adrbkcmd.c:1013
 msgid ""
 "\n"
 " Press \"^X\" to save the entry, \"^C\" to cancel, \"^G\" for help."
 msgstr ""
 
-#: alpine/adrbkcmd.c:1019
+#: alpine/adrbkcmd.c:1015
 msgid ""
 "\n"
 " If you want to use quotation marks inside the Fullname field, it is best"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1021
+#: alpine/adrbkcmd.c:1017
 msgid ""
 "\n"
 " to use single quotation marks; for example: George 'Husky' Washington."
 msgstr ""
 
-#: alpine/adrbkcmd.c:1149
+#: alpine/adrbkcmd.c:1145
 #, c-format
 msgid "Address book %s cancelled"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1178
+#: alpine/adrbkcmd.c:1174
 msgid "Warning: entry has no addresses"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1257 alpine/adrbkcmd.c:6472
+#: alpine/adrbkcmd.c:1253 alpine/adrbkcmd.c:6469
 #, c-format
 msgid "Error updating address book: %s"
 msgstr ""
@@ -3811,155 +3994,155 @@ msgstr ""
 #. The second %s is the name of the other address book.
 #. The third %s is " as " because it will say something
 #. like also exists in <name> as <description>.
-#: alpine/adrbkcmd.c:1280
+#: alpine/adrbkcmd.c:1276
 #, c-format
 msgid "Warning! Nickname %s also exists in \"%s\"%s%s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1282
+#: alpine/adrbkcmd.c:1278
 msgid " as "
 msgstr ""
 
 #. TRANSLATORS: The %s is the nickname of an entry that is already
 #. in the address book
-#: alpine/adrbkcmd.c:1377
+#: alpine/adrbkcmd.c:1373
 #, c-format
 msgid "\"%s\" already in address book."
 msgstr ""
 
 #. TRANSLATORS: A question
-#: alpine/adrbkcmd.c:1529
+#: alpine/adrbkcmd.c:1525
 msgid "Exit and save changes "
 msgstr ""
 
-#: alpine/adrbkcmd.c:1534 alpine/folder.c:1256
+#: alpine/adrbkcmd.c:1530 alpine/folder.c:1252
 msgid "Use ^C to abandon changes you've made"
 msgstr ""
 
 #. TRANSLATORS: A question. The %s is a noun describing what is being cancelled.
-#: alpine/adrbkcmd.c:1560 alpine/folder.c:1291
+#: alpine/adrbkcmd.c:1556 alpine/folder.c:1287
 #, c-format
 msgid "Cancel %s (answering \"Yes\" will abandon any changes made) "
 msgstr ""
 
-#: alpine/adrbkcmd.c:1589
+#: alpine/adrbkcmd.c:1585
 msgid "changes"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1600 alpine/folder.c:887 alpine/folder.c:968
+#: alpine/adrbkcmd.c:1596 alpine/folder.c:883 alpine/folder.c:964
 msgid "Server"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1603 alpine/folder.c:4475
+#: alpine/adrbkcmd.c:1599 alpine/folder.c:4470
 msgid "Folder"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1638
+#: alpine/adrbkcmd.c:1634
 msgid "New address book added. Use \"$\" to adjust order"
 msgstr ""
 
 #. TRANSLATORS: Change was the name of the command the user was
 #. trying to perform. It is what was cancelled.
-#: alpine/adrbkcmd.c:1707
+#: alpine/adrbkcmd.c:1703
 msgid "Change cancelled: config file not changeable"
 msgstr ""
 
 #. TRANSLATORS: Add was the command that is being cancelled.
-#: alpine/adrbkcmd.c:1710
+#: alpine/adrbkcmd.c:1706
 msgid "Add cancelled: config file not changeable"
 msgstr ""
 
 #. TRANSLATORS: Operation was cancelled because the system management
 #. does not allow the changing of global address books
-#: alpine/adrbkcmd.c:1722
+#: alpine/adrbkcmd.c:1718
 msgid "Cancelled: Sys. Mgmt. does not allow changing global address books"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1724
+#: alpine/adrbkcmd.c:1720
 msgid "Cancelled: Sys. Mgmt. does not allow changing address books"
 msgstr ""
 
 #. TRANSLATORS: screen title
-#: alpine/adrbkcmd.c:1752
+#: alpine/adrbkcmd.c:1748
 msgid "CHANGE ADDRESS BOOK"
 msgstr ""
 
 #. TRANSLATORS: screen title
-#: alpine/adrbkcmd.c:1755
+#: alpine/adrbkcmd.c:1751
 msgid "ADD ADDRESS BOOK"
 msgstr ""
 
 #. TRANSLATORS: The next few lines go together to explain how to add
 #. the address book entry the user is working on.
-#: alpine/adrbkcmd.c:1771
+#: alpine/adrbkcmd.c:1767
 msgid ""
 " To add a local address book that will be accessed *only* by Alpine running\n"
 " on this machine, leave the server field blank."
 msgstr ""
 
-#: alpine/adrbkcmd.c:1773
+#: alpine/adrbkcmd.c:1769
 msgid ""
 " To add an address book that will be accessed by IMAP, fill in the\n"
 " server name."
 msgstr ""
 
-#: alpine/adrbkcmd.c:1775
+#: alpine/adrbkcmd.c:1771
 msgid ""
 " (NOTE: An address book cannot be accessed by IMAP from\n"
 " one Alpine and as a local file from another. It is either always accessed\n"
 " by IMAP or it is a local address book which is never accessed by IMAP.)"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1777
+#: alpine/adrbkcmd.c:1773
 msgid " In the Folder field, type the remote folder name or local file name."
 msgstr ""
 
-#: alpine/adrbkcmd.c:1779
+#: alpine/adrbkcmd.c:1775
 msgid ""
 " In the Nickname field, give the address book a nickname or leave it blank."
 msgstr ""
 
-#: alpine/adrbkcmd.c:1781
+#: alpine/adrbkcmd.c:1777
 msgid " To get help specific to an item, press ^G."
 msgstr ""
 
-#: alpine/adrbkcmd.c:1783
+#: alpine/adrbkcmd.c:1779
 msgid " To exit and save the configuration, press ^X. To cancel, press ^C."
 msgstr ""
 
-#: alpine/adrbkcmd.c:1847 alpine/adrbkcmd.c:1853
+#: alpine/adrbkcmd.c:1843 alpine/adrbkcmd.c:1849
 msgid "Server Name"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1860
+#: alpine/adrbkcmd.c:1856
 msgid "Folder Name"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1889 alpine/adrbkcmd.c:1970
+#: alpine/adrbkcmd.c:1885 alpine/adrbkcmd.c:1966
 msgid "Address book change is cancelled"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1891 alpine/adrbkcmd.c:1972
+#: alpine/adrbkcmd.c:1887 alpine/adrbkcmd.c:1968
 msgid "Address book add is cancelled"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1900
+#: alpine/adrbkcmd.c:1896
 msgid "No change: Address book change is cancelled"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1902
+#: alpine/adrbkcmd.c:1898
 msgid "No change: Address book add is cancelled"
 msgstr ""
 
-#: alpine/adrbkcmd.c:1998
+#: alpine/adrbkcmd.c:1994
 msgid "Change cancelled: couldn't save configuration file"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2000
+#: alpine/adrbkcmd.c:1996
 msgid "Add cancelled: couldn't save configuration file"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2119
+#: alpine/adrbkcmd.c:2115
 #, c-format
 msgid "Convert addressbook%s to a remote addrbook "
 msgstr ""
@@ -3967,71 +4150,71 @@ msgstr ""
 #. TRANSLATORS: The user is defining an address book which will be
 #. stored on another server. This is called a remote addrbook and
 #. this is a question asking for the name of the server.
-#: alpine/adrbkcmd.c:2145
+#: alpine/adrbkcmd.c:2141
 #, c-format
 msgid "Name of server to contain remote addrbook : "
 msgstr ""
 
-#: alpine/adrbkcmd.c:2212
+#: alpine/adrbkcmd.c:2209
 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:2363
-#: alpine/mailpart.c:2414 alpine/mailpart.c:2906
+#: alpine/adrbkcmd.c:2258 alpine/adrbkcmd.c:2412 alpine/adrbkcmd.c:2520
+#: alpine/adrbkcmd.c:2595 alpine/adrbkcmd.c:2866 alpine/mailpart.c:2527
+#: alpine/mailpart.c:2578 alpine/mailpart.c:3326
 msgid "Error allocating space for message."
 msgstr ""
 
 #. TRANSLATORS: Several lines in a row here that go together.
-#: alpine/adrbkcmd.c:2266
+#: alpine/adrbkcmd.c:2263
 #, c-format
 msgid ""
 "\n"
 "Your addressbook%s has been copied to the"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2269
+#: alpine/adrbkcmd.c:2266
 msgid ""
 "\n"
 "remote folder \""
 msgstr ""
 
-#: alpine/adrbkcmd.c:2272
+#: alpine/adrbkcmd.c:2269
 msgid ""
 "\n"
 "A definition for this remote address book has been added to your list"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2273
+#: alpine/adrbkcmd.c:2270
 msgid ""
 "\n"
 "of address books. The definition for the address book it was copied"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2274
+#: alpine/adrbkcmd.c:2271
 msgid ""
 "\n"
 "from is also still there. You may want to remove that after you"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2275
+#: alpine/adrbkcmd.c:2272
 msgid ""
 "\n"
 "are confident that the new address book is complete and working."
 msgstr ""
 
-#: alpine/adrbkcmd.c:2276
+#: alpine/adrbkcmd.c:2273
 msgid ""
 "\n"
 "Use the Setup/AddressBooks command to do that.\n"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2281
+#: alpine/adrbkcmd.c:2278
 msgid "Remote Address Book Information"
 msgstr ""
 
 #. TRANSLATORS: a screen title
-#: alpine/adrbkcmd.c:2283
+#: alpine/adrbkcmd.c:2280
 msgid "ABOUT REMOTE ABOOK"
 msgstr ""
 
@@ -4039,13 +4222,13 @@ msgstr ""
 #. in alpine. It isn't a very descriptive name. Instead of
 #. storing it in its own file it is stored in the configuration
 #. file.
-#: alpine/adrbkcmd.c:2390
+#: alpine/adrbkcmd.c:2387
 #, c-format
 msgid "Convert signature file \"%s\" to a literal sig "
 msgstr ""
 
 #. TRANSLATORS: following lines go together
-#: alpine/adrbkcmd.c:2421
+#: alpine/adrbkcmd.c:2418
 #, c-format
 msgid ""
 "\n"
@@ -4053,55 +4236,55 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: several lines that go together
-#: alpine/adrbkcmd.c:2425 alpine/adrbkcmd.c:2539
+#: alpine/adrbkcmd.c:2422 alpine/adrbkcmd.c:2536
 msgid ""
 "\n"
 "to a literal signature, which means it is contained in your"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2427 alpine/adrbkcmd.c:2541
+#: alpine/adrbkcmd.c:2424 alpine/adrbkcmd.c:2538
 msgid ""
 "\n"
 "Alpine configuration instead of being in a file of its own."
 msgstr ""
 
-#: alpine/adrbkcmd.c:2429 alpine/adrbkcmd.c:2543
+#: alpine/adrbkcmd.c:2426 alpine/adrbkcmd.c:2540
 msgid ""
 "\n"
 "If that configuration is copied to a remote folder then the"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2431 alpine/adrbkcmd.c:2545
+#: alpine/adrbkcmd.c:2428 alpine/adrbkcmd.c:2542
 msgid ""
 "\n"
 "signature will be available remotely also."
 msgstr ""
 
-#: alpine/adrbkcmd.c:2433 alpine/adrbkcmd.c:2547
+#: alpine/adrbkcmd.c:2430 alpine/adrbkcmd.c:2544
 msgid ""
 "\n"
 "Changes to the signature file itself will no longer have any"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2435
+#: alpine/adrbkcmd.c:2432
 msgid ""
 "\n"
 "effect on Alpine but you may still edit the signature with the"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2437
+#: alpine/adrbkcmd.c:2434
 msgid ""
 "\n"
 "Setup/Signature command.\n"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2442 alpine/adrbkcmd.c:2557
+#: alpine/adrbkcmd.c:2439 alpine/adrbkcmd.c:2554
 msgid "Literal Signature Information"
 msgstr ""
 
 #. TRANSLATORS: screen title
 #. TRANSLATORS: a screen title
-#: alpine/adrbkcmd.c:2444 alpine/adrbkcmd.c:2559
+#: alpine/adrbkcmd.c:2441 alpine/adrbkcmd.c:2556
 msgid "ABOUT LITERAL SIG"
 msgstr ""
 
@@ -4109,689 +4292,713 @@ msgstr ""
 #. we call a literal signature, which is one contained in the regular
 #. configuration file. Think of the set of 4 %s arguments as a
 #. single argument which is the name of the signature file.
-#: alpine/adrbkcmd.c:2479
+#: alpine/adrbkcmd.c:2476
 #, c-format
 msgid "Convert signature file \"%s\"%s%s%s to a literal sig "
 msgstr ""
 
 #. TRANSLATORS: Keep the %s's together, they are sort of
 #. the name of the file.
-#: alpine/adrbkcmd.c:2530
+#: alpine/adrbkcmd.c:2527
 #, c-format
 msgid "Your signature file \"%s\"%s%s%s has been converted"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2549
+#: alpine/adrbkcmd.c:2546
 msgid ""
 "\n"
 "effect on Alpine. You may edit the signature with the"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2551
+#: alpine/adrbkcmd.c:2548
 msgid ""
 "\n"
 "Setup/Rules/Roles command.\n"
 msgstr ""
 
 #. TRANSLATORS: config is an abbreviation for configuration
-#: alpine/adrbkcmd.c:2572
+#: alpine/adrbkcmd.c:2569
 msgid "Error writing rules config."
 msgstr ""
 
 #. TRANSLATORS: sig is signature
-#: alpine/adrbkcmd.c:2576
+#: alpine/adrbkcmd.c:2573
 #, c-format
 msgid "Error converting role sig\n"
 msgstr ""
 
 #. TRANSLATORS: several lines that go together
-#: alpine/adrbkcmd.c:2603
+#: alpine/adrbkcmd.c:2600
 msgid ""
 "\n"
 "Some of your Rules are contained in Rule files instead of being directly"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2604
+#: alpine/adrbkcmd.c:2601
 msgid ""
 "\n"
 "contained in your Alpine configuration file. To make those rules"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2605
+#: alpine/adrbkcmd.c:2602
 msgid ""
 "\n"
 "available remotely you will need to move them out of the files."
 msgstr ""
 
-#: alpine/adrbkcmd.c:2606
+#: alpine/adrbkcmd.c:2603
 msgid ""
 "\n"
 "That can be done using the Shuffle command in the appropriate"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2607
+#: alpine/adrbkcmd.c:2604
 msgid ""
 "\n"
 "Setup/Rules subcommands.\n"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2612
+#: alpine/adrbkcmd.c:2609
 msgid "Rule Files Information"
 msgstr ""
 
 #. TRANSLATORS: a screen title
-#: alpine/adrbkcmd.c:2614
+#: alpine/adrbkcmd.c:2611
 msgid "ABOUT RULE FILES"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2637
+#: alpine/adrbkcmd.c:2634
 msgid "eXceptions does not make sense with this command"
 msgstr ""
 
 #. TRANSLATORS: AddressBooks is Address Books
-#: alpine/adrbkcmd.c:2660
+#: alpine/adrbkcmd.c:2657
 #, c-format
 msgid "Config is already remote, convert AddressBooks and signature files "
 msgstr ""
 
-#: alpine/adrbkcmd.c:2662
+#: alpine/adrbkcmd.c:2659
 #, c-format
 msgid "Config is already remote, convert AddressBooks "
 msgstr ""
 
-#: alpine/adrbkcmd.c:2664
+#: alpine/adrbkcmd.c:2661
 #, c-format
 msgid "Config is already remote, convert signature files "
 msgstr ""
 
-#: alpine/adrbkcmd.c:2729
+#: alpine/adrbkcmd.c:2726
 msgid "Cannot copy config file since it is already remote."
 msgstr ""
 
-#: alpine/adrbkcmd.c:2749
+#: alpine/adrbkcmd.c:2746
 #, c-format
 msgid "Name of server to contain remote Alpine config : "
 msgstr ""
 
-#: alpine/adrbkcmd.c:2811
+#: alpine/adrbkcmd.c:2808
 #, c-format
 msgid "Folder to contain remote config : "
 msgstr ""
 
 #. TRANSLATORS: several lines that go together
-#: alpine/adrbkcmd.c:2874
+#: alpine/adrbkcmd.c:2871
 msgid ""
 "\n"
 "You may want to save a copy of this information!"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2875
+#: alpine/adrbkcmd.c:2872
 msgid ""
 "\n"
 "\n"
 "Your Alpine configuration data has been copied to"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2879
+#: alpine/adrbkcmd.c:2876
 msgid ""
 "\n"
 "To use that remote configuration from this computer you will"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2880
+#: alpine/adrbkcmd.c:2877
 msgid ""
 "\n"
 "have to change the way you start Alpine by using the command line option"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2881
+#: alpine/adrbkcmd.c:2878
 msgid ""
 "\n"
 "\"alpine -p <remote_folder>\". The command should probably be"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2887
+#: alpine/adrbkcmd.c:2884
 msgid ""
 "\n"
 "With PC-Alpine, you may want to create a shortcut which"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2888
+#: alpine/adrbkcmd.c:2885
 msgid ""
 "\n"
 "has the required arguments."
 msgstr ""
 
-#: alpine/adrbkcmd.c:2894
+#: alpine/adrbkcmd.c:2891
 msgid ""
 "\n"
 "The quotes are there around the last argument to protect the special"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2895
+#: alpine/adrbkcmd.c:2892
 msgid ""
 "\n"
 "characters in the folder name (like braces) from the command shell"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2896
+#: alpine/adrbkcmd.c:2893
 msgid ""
 "\n"
 "you use. If you are not running Alpine from a command shell which knows"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2897
+#: alpine/adrbkcmd.c:2894
 msgid ""
 "\n"
 "about quoting, it is possible you will have to remove those quotes"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2898
+#: alpine/adrbkcmd.c:2895
 msgid ""
 "\n"
 "from the command. For example, if you also use PC-Alpine you will probably"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2899
+#: alpine/adrbkcmd.c:2896
 msgid ""
 "\n"
 "want to create a shortcut, and you would not need the quotes there."
 msgstr ""
 
-#: alpine/adrbkcmd.c:2900
+#: alpine/adrbkcmd.c:2897
 msgid ""
 "\n"
 "Without the quotes, the command might look like"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2905
+#: alpine/adrbkcmd.c:2902
 msgid ""
 "\n"
 "Consider creating an alias or shell script to execute this command to make"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2906
+#: alpine/adrbkcmd.c:2903
 msgid ""
 "\n"
 "it more convenient."
 msgstr ""
 
-#: alpine/adrbkcmd.c:2908
+#: alpine/adrbkcmd.c:2905
 msgid ""
 "\n"
 "\n"
 "If you want to use your new remote configuration for this session, quit"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2909
+#: alpine/adrbkcmd.c:2906
 msgid ""
 "\n"
 "Alpine now and restart with the changed command line options mentioned "
 "above.\n"
 msgstr ""
 
-#: alpine/adrbkcmd.c:2914
+#: alpine/adrbkcmd.c:2911
 msgid "Remote Config Information"
 msgstr ""
 
 #. TRANSLATORS: a screen title
-#: alpine/adrbkcmd.c:2916
+#: alpine/adrbkcmd.c:2913
 msgid "ABOUT REMOTE CONFIG"
 msgstr ""
 
 #. TRANSLATORS: Double quote refers to the " character
-#: alpine/adrbkcmd.c:2987
+#: alpine/adrbkcmd.c:2984
 msgid "Double quote not allowed in nickname"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3000
+#: alpine/adrbkcmd.c:2997
 msgid "Nickname is already being used"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3049
+#: alpine/adrbkcmd.c:3046
 msgid "Delete cancelled: config file not changeable"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3067 alpine/adrbkcmd.c:3531 alpine/adrbkcmd.c:3674
+#: alpine/adrbkcmd.c:3064 alpine/adrbkcmd.c:3528 alpine/adrbkcmd.c:3671
 msgid ""
 "Cancelled: Sys. Mgmt. does not allow changing global address book config"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3070 alpine/adrbkcmd.c:3551
+#: alpine/adrbkcmd.c:3067 alpine/adrbkcmd.c:3548
 msgid "Cancelled: Sys. Mgmt. does not allow changing address book config"
 msgstr ""
 
 #. TRANSLATORS: %s is an adjective modifying address books
-#: alpine/adrbkcmd.c:3132
+#: alpine/adrbkcmd.c:3129
 #, c-format
 msgid "Ignore all default %s address books or just remove this one ? "
 msgstr ""
 
 #. TRANSLATORS: global or personal address books
-#: alpine/adrbkcmd.c:3134
+#: alpine/adrbkcmd.c:3131
 msgid "global"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3134
+#: alpine/adrbkcmd.c:3131
 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:5708
-#: alpine/folder.c:5747
+#: alpine/adrbkcmd.c:3145 alpine/adrbkcmd.c:3157 alpine/adrbkcmd.c:3204
+#: alpine/adrbkcmd.c:3225 alpine/adrbkcmd.c:3287 alpine/folder.c:5703
+#: alpine/folder.c:5742
 msgid "Delete cancelled"
 msgstr ""
 
 #. TRANSLATORS: a question
-#: alpine/adrbkcmd.c:3155
+#: alpine/adrbkcmd.c:3152
 msgid "Delete this default address book from config "
 msgstr ""
 
 #. TRANSLATORS: user is asked whether to remove just data files, just configuration,
 #. or both for an address book.
-#: alpine/adrbkcmd.c:3181
+#: alpine/adrbkcmd.c:3178
 msgid "Data"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3183 alpine/reply.c:1289
+#: alpine/adrbkcmd.c:3180 alpine/reply.c:1282
 msgid "Both"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3186
+#: alpine/adrbkcmd.c:3183
 msgid "Delete data, config, or both ? "
 msgstr ""
 
 #. TRANSLATORS: a question
-#: alpine/adrbkcmd.c:3218
+#: alpine/adrbkcmd.c:3215
 msgid "Delete configuration for highlighted addressbook "
 msgstr ""
 
 #. TRANSLATORS: %s is an error message
-#: alpine/adrbkcmd.c:3258
+#: alpine/adrbkcmd.c:3255
 #, c-format
 msgid "Can't delete data: %s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3260
+#: alpine/adrbkcmd.c:3257
 msgid "Can't delete address book data"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3280
+#: alpine/adrbkcmd.c:3277
 #, c-format
 msgid ""
 "About to delete the contents of address book (%ld entries), really delete "
 msgstr ""
 
-#: alpine/adrbkcmd.c:3357
+#: alpine/adrbkcmd.c:3354
 #, c-format
 msgid "Trouble deleting data %s%s%s%s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3376
+#: alpine/adrbkcmd.c:3373
 msgid "Addressbook data deleted"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3443
+#: alpine/adrbkcmd.c:3440
 msgid "Delete cancelled: couldn't save pine configuration file"
 msgstr ""
 
 #. TRANSLATORS: the %s may be "global " or nothing
-#: alpine/adrbkcmd.c:3455
+#: alpine/adrbkcmd.c:3452
 #, c-format
 msgid "Reverting to default %saddress books"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3456
+#: alpine/adrbkcmd.c:3453
 msgid "global "
 msgstr ""
 
-#: alpine/adrbkcmd.c:3507
+#: alpine/adrbkcmd.c:3504
 msgid "Shuffle cancelled: config file not changeable"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3569
+#: alpine/adrbkcmd.c:3566
 #, c-format
 msgid "Shuffle \"%s\" %s%s%s ? "
 msgstr ""
 
-#: alpine/adrbkcmd.c:3591
+#: alpine/adrbkcmd.c:3588
 msgid "Shuffle cancelled"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3650
+#: alpine/adrbkcmd.c:3647
 msgid "Shuffle cancelled: highlight entry you wish to shuffle"
 msgstr ""
 
-#: alpine/adrbkcmd.c:3667
+#: alpine/adrbkcmd.c:3664
 msgid ""
 "Cancelled: Sys. Mgmt. does not allow changing address book configuration"
 msgstr ""
 
 #. TRANSLATORS: TabSep is a command key label meaning Tab Separated List
-#: alpine/adrbkcmd.c:4185
+#: alpine/adrbkcmd.c:4182
 msgid "TabSep"
 msgstr ""
 
-#: alpine/adrbkcmd.c:4198
+#: alpine/adrbkcmd.c:4195
 msgid "Export list of addresses, vCard format, or Tab Separated ? "
 msgstr ""
 
 #. TRANSLATORS: a screen title
-#: alpine/adrbkcmd.c:4203
+#: alpine/adrbkcmd.c:4200
 msgid "HELP FOR EXPORT FORMAT"
 msgstr ""
 
-#: alpine/adrbkcmd.c:4252 alpine/addrbook.c:7274
+#: alpine/adrbkcmd.c:4249 alpine/addrbook.c:7274
 msgid "addresses"
 msgstr ""
 
-#: alpine/adrbkcmd.c:4252
+#: alpine/adrbkcmd.c:4249
 msgid "address"
 msgstr ""
 
-#: alpine/adrbkcmd.c:4253
+#: alpine/adrbkcmd.c:4250
 msgid "EXPORT"
 msgstr ""
 
-#: alpine/adrbkcmd.c:4276
+#: alpine/adrbkcmd.c:4273
 #, c-format
 msgid "Error opening file \"%s\" for address export: %s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:4396
+#: alpine/adrbkcmd.c:4393
 msgid "List is empty, nothing to export!"
 msgstr ""
 
-#: alpine/adrbkcmd.c:4525
+#: alpine/adrbkcmd.c:4522
 msgid "Trouble accessing current entry"
 msgstr ""
 
-#: alpine/adrbkcmd.c:4585 alpine/adrbkcmd.c:4728
+#: alpine/adrbkcmd.c:4581 alpine/adrbkcmd.c:4725
 msgid "Problem creating space for message text"
 msgstr ""
 
-#: alpine/adrbkcmd.c:4668
+#: alpine/adrbkcmd.c:4665
 msgid "Expand nicknames"
 msgstr ""
 
-#: alpine/adrbkcmd.c:4734
+#: alpine/adrbkcmd.c:4731
 msgid "FORWARDING ADDRESS BOOK ENTRY"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5247
+#: alpine/adrbkcmd.c:5244
 #, c-format
 msgid "Save highlighted entry to address book or Export to filesystem ? "
 msgstr ""
 
-#: alpine/adrbkcmd.c:5249
+#: alpine/adrbkcmd.c:5246
 #, c-format
 msgid "Save selected entries to address book or Export to filesystem ? "
 msgstr ""
 
-#: alpine/adrbkcmd.c:5251
+#: alpine/adrbkcmd.c:5248
 #, c-format
 msgid "Save selected entry to address book or Export to filesystem ? "
 msgstr ""
 
-#: alpine/adrbkcmd.c:5312
+#: alpine/adrbkcmd.c:5309
 #, c-format
 msgid "Can't re-open address book %s to save from"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5370
+#: alpine/adrbkcmd.c:5367
 msgid "No current entry to save"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5413
+#: alpine/adrbkcmd.c:5410
 #, c-format
 msgid "Saved %d entries to %s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5415
+#: alpine/adrbkcmd.c:5412
 #, c-format
 msgid "Saved %d entry to %s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5432
+#: alpine/adrbkcmd.c:5429
 #, c-format
 msgid "Entry with nickname \"%.*s\" already exists, replace "
 msgstr ""
 
-#: alpine/adrbkcmd.c:5436
+#: alpine/adrbkcmd.c:5433
 #, c-format
 msgid "Nicknames \"%.*s\" and \"%.*s\" already exist, replace "
 msgstr ""
 
-#: alpine/adrbkcmd.c:5439
+#: alpine/adrbkcmd.c:5436
 #, c-format
 msgid "%d of the nicknames already exist, replace "
 msgstr ""
 
-#: alpine/adrbkcmd.c:5482
+#: alpine/adrbkcmd.c:5479
 msgid "Saving entries"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5496 alpine/adrbkcmd.c:5581
+#: alpine/adrbkcmd.c:5493 alpine/adrbkcmd.c:5578
 #, c-format
 msgid "Error saving entry: %s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5515
+#: alpine/adrbkcmd.c:5512
 #, c-format
 msgid "Error replacing entry in %s: %s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5579
+#: alpine/adrbkcmd.c:5576
 #, c-format
 msgid "Error saving %s: %s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5615
+#: alpine/adrbkcmd.c:5612
 msgid "Save only partially completed"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5694
+#: alpine/adrbkcmd.c:5691
 msgid "AddressBook"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5695
+#: alpine/adrbkcmd.c:5692
 msgid "Entry"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5698
+#: alpine/adrbkcmd.c:5695
 msgid "Print Address Book or just this Entry? "
 msgstr ""
 
-#: alpine/adrbkcmd.c:5702 alpine/adrbkcmd.c:5787
+#: alpine/adrbkcmd.c:5699 alpine/adrbkcmd.c:5784
 msgid "Address book print cancelled"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5720
+#: alpine/adrbkcmd.c:5717
 msgid "selected entries"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5723
+#: alpine/adrbkcmd.c:5720
 msgid "address book list"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5725
+#: alpine/adrbkcmd.c:5722
 msgid "entry"
 msgstr ""
 
-#: alpine/adrbkcmd.c:5727
+#: alpine/adrbkcmd.c:5724
 msgid "address book"
 msgstr ""
 
 #. TRANSLATORS: a screen title for address book screen. Almost all of
 #. the translatable strings which are all upper case are screen titles.
-#: alpine/adrbkcmd.c:6091 alpine/addrbook.c:1537 alpine/addrbook.c:2288
+#: alpine/adrbkcmd.c:6088 alpine/addrbook.c:1537 alpine/addrbook.c:2288
 #, c-format
 msgid "ADDRESS BOOK"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6158
+#: alpine/adrbkcmd.c:6155
 #, c-format
 msgid "Really delete %d selected entries"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6244
+#: alpine/adrbkcmd.c:6241
 msgid "Deletions completed"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6365
+#: alpine/adrbkcmd.c:6362
 #, c-format
 msgid "Really delete \"%s\""
 msgstr ""
 
-#: alpine/adrbkcmd.c:6373
+#: alpine/adrbkcmd.c:6370
 #, c-format
 msgid "Really delete ENTIRE list \"%s\""
 msgstr ""
 
-#: alpine/adrbkcmd.c:6379
+#: alpine/adrbkcmd.c:6376
 #, c-format
 msgid "Really delete \"%s\" from list"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6455
+#: alpine/adrbkcmd.c:6452
 msgid "Entry deleted, address book updated"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6484
+#: alpine/adrbkcmd.c:6481
 msgid "Entry not deleted"
 msgstr ""
 
 #. TRANSLATORS: go to more complex search screen
-#: alpine/adrbkcmd.c:6604
+#: alpine/adrbkcmd.c:6601
 msgid "To complex search"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6613
+#: alpine/adrbkcmd.c:6610
 msgid "No LDAP server available for lookup"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6623
+#: alpine/adrbkcmd.c:6620
 msgid "String to search for : "
 msgstr ""
 
-#: alpine/adrbkcmd.c:6635 alpine/alpine.c:846 pico/pico.c:989
+#: alpine/adrbkcmd.c:6632 alpine/alpine.c:926 pico/pico.c:985
 msgid "Cancelled"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6647 alpine/mailindx.c:3103 alpine/addrbook.c:2473
+#: alpine/adrbkcmd.c:6644 alpine/mailindx.c:3114 alpine/addrbook.c:2473
 #: alpine/addrbook.c:2726
 msgid "Search"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6651
+#: alpine/adrbkcmd.c:6648
 msgid "Restore"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6654
+#: alpine/adrbkcmd.c:6651
 msgid "SEARCH DIRECTORY SERVER"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6672
+#: alpine/adrbkcmd.c:6669
 msgid ""
 "\n"
 " Fill in some of the fields above to create a query."
 msgstr ""
 
-#: alpine/adrbkcmd.c:6674
+#: alpine/adrbkcmd.c:6671
 msgid ""
 "\n"
 " The match will be for the exact string unless you include wildcards (*)."
 msgstr ""
 
-#: alpine/adrbkcmd.c:6676
+#: alpine/adrbkcmd.c:6673
 msgid ""
 "\n"
 " All filled-in fields must match in order to be counted as a match."
 msgstr ""
 
-#: alpine/adrbkcmd.c:6678
+#: alpine/adrbkcmd.c:6675
 msgid ""
 "\n"
 " Press \"^R\" to restore previous query values (if you've queried "
 "previously)."
 msgstr ""
 
-#: alpine/adrbkcmd.c:6680
+#: alpine/adrbkcmd.c:6677
 msgid ""
 "\n"
 " \"^G\" for help specific to each item. \"^X\" to make the query, or \"^C\" "
 "to cancel."
 msgstr ""
 
-#: alpine/adrbkcmd.c:6761
+#: alpine/adrbkcmd.c:6758
 msgid "Search strings too long"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6864 pith/ldap.c:197
+#: alpine/adrbkcmd.c:6861 pith/ldap.c:193
 msgid "Missing hostname in LDAP address"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6879 pith/ldap.c:222
+#: alpine/adrbkcmd.c:6876 pith/ldap.c:218
 #, c-format
 msgid "No email address available for \"%s\""
 msgstr ""
 
-#: alpine/adrbkcmd.c:6938
+#: alpine/adrbkcmd.c:6935
 msgid "DIRECTORY ENTRY"
 msgstr ""
 
-#: alpine/adrbkcmd.c:6942
+#: alpine/adrbkcmd.c:6939
 msgid "HELP FOR DIRECTORY VIEW"
 msgstr ""
 
-#: alpine/adrbkcmd.c:7116
+#: alpine/adrbkcmd.c:7113
 msgid "No address to compose to"
 msgstr ""
 
-#: alpine/adrbkcmd.c:7584
+#: alpine/adrbkcmd.c:7329
+msgid "[ Binary Data ]"
+msgstr ""
+
+#: alpine/adrbkcmd.c:7597
 #, c-format
 msgid "No host in %s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:7592
+#: alpine/adrbkcmd.c:7605
 msgid "Searching for LDAP url"
 msgstr ""
 
-#: alpine/adrbkcmd.c:7612
+#: alpine/adrbkcmd.c:7629
 msgid "LDAP search failed: can't initialize"
 msgstr ""
 
-#: alpine/adrbkcmd.c:7643
+#: alpine/adrbkcmd.c:7660
 #, c-format
 msgid "LDAP search failed: %s"
 msgstr ""
 
-#: alpine/adrbkcmd.c:7664
+#: alpine/adrbkcmd.c:7681
 msgid "No matches found for url"
 msgstr ""
 
 #. TRANSLATORS: sigs refers to signatures, which the user was trying to convert
-#: alpine/alpine.c:508
+#: alpine/alpine.c:520
 #, c-format
 msgid "trouble converting sigs\n"
 msgstr ""
 
-#: alpine/alpine.c:621
+#: alpine/alpine.c:633
 #, c-format
 msgid "Failed to disable mail driver \"%s\": name not found"
 msgstr ""
 
-#: alpine/alpine.c:642
+#: alpine/alpine.c:654
 #, c-format
 msgid "Failed to disable SASL authenticator \"%s\": name not found"
 msgstr ""
 
-#: alpine/alpine.c:675
+#: alpine/alpine.c:669 alpine/alpine.c:698
+#, c-format
+msgid "Bad encryption range: \"%s\": resetting to default"
+msgstr ""
+
+#: alpine/alpine.c:680
+#, c-format
+msgid "Bad default encryption range: \"%s\""
+msgstr ""
+
+#: alpine/alpine.c:708
+#, c-format
+msgid ""
+"Minimum encryption protocol (%s) bigger than maximum value (%s). Reversing..."
+msgstr ""
+
+#: alpine/alpine.c:718
+msgid "Security alert: SSL maximum encryption version was set to SSLv3."
+msgstr ""
+
+#: alpine/alpine.c:755
 #, c-format
 msgid "Who are you? (Unable to look up login name)\n"
 msgstr ""
 
-#: alpine/alpine.c:696
+#: alpine/alpine.c:776
 #, c-format
 msgid ""
 "Can't access terminal or input is not a terminal. Redirection of\n"
@@ -4799,136 +5006,136 @@ msgid ""
 "%c"
 msgstr ""
 
-#: alpine/alpine.c:708
+#: alpine/alpine.c:788
 #, c-format
 msgid "Terminal type (environment variable TERM) not set.\n"
 msgstr ""
 
-#: alpine/alpine.c:711
+#: alpine/alpine.c:791
 #, c-format
 msgid "Terminal type \"%s\" is unknown.\n"
 msgstr ""
 
-#: alpine/alpine.c:714
+#: alpine/alpine.c:794
 #, c-format
 msgid "Can't open terminal capabilities database.\n"
 msgstr ""
 
-#: alpine/alpine.c:717
+#: alpine/alpine.c:797
 #, c-format
 msgid ""
 "Your terminal, of type \"%s\", is lacking functions needed to run alpine.\n"
 msgstr ""
 
-#: alpine/alpine.c:752
+#: alpine/alpine.c:832
 msgid "Warning: sensitive authentication data included in debug file"
 msgstr ""
 
 #. TRANSLATORS: file is computer data
-#: alpine/alpine.c:834
+#: alpine/alpine.c:914
 msgid "File to open : "
 msgstr ""
 
 #. TRANSLATORS: file is computer data
-#: alpine/alpine.c:861
+#: alpine/alpine.c:941
 msgid "No file to open"
 msgstr ""
 
-#: alpine/alpine.c:877
+#: alpine/alpine.c:957
 #, c-format
 msgid "Problem reading standard input: %s"
 msgstr ""
 
 #. TRANSLATORS: file is computer file being read by user
-#: alpine/alpine.c:902
+#: alpine/alpine.c:982
 msgid "file"
 msgstr ""
 
 #. TRANSLATORS: this is in the title bar at top of screen
-#: alpine/alpine.c:904
+#: alpine/alpine.c:984
 msgid "FILE VIEW"
 msgstr ""
 
-#: alpine/alpine.c:917
+#: alpine/alpine.c:997
 #, c-format
 msgid "Can't display \"%s\": %s"
 msgstr ""
 
-#: alpine/alpine.c:918
+#: alpine/alpine.c:998
 msgid "Standard Input"
 msgstr ""
 
 #. TRANSLATORS: refers to bad email address
-#: alpine/alpine.c:974
+#: alpine/alpine.c:1054
 #, c-format
 msgid "Bad address: %s"
 msgstr ""
 
-#: alpine/alpine.c:1025
+#: alpine/alpine.c:1105
 msgid "Only mailto URLs are allowed with file attachments"
 msgstr ""
 
-#: alpine/alpine.c:1034
+#: alpine/alpine.c:1114
 #, c-format
 msgid "Unrecognized URL \"%s\""
 msgstr ""
 
 #. TRANSLATORS: Initial Keystroke List is the literal name of an option
-#: alpine/alpine.c:1056
+#: alpine/alpine.c:1136
 msgid "Executing Initial Keystroke List......"
 msgstr ""
 
-#: alpine/alpine.c:1104
+#: alpine/alpine.c:1184
 msgid "Please wait, opening mail folder......"
 msgstr ""
 
-#: alpine/alpine.c:1157
+#: alpine/alpine.c:1237
 msgid "No folder to open"
 msgstr ""
 
-#: alpine/alpine.c:1194
+#: alpine/alpine.c:1274
 #, c-format
 msgid "Unable to open folder \"%s\""
 msgstr ""
 
-#: alpine/alpine.c:1219
+#: alpine/alpine.c:1301
 msgid "No inbox!  Folder to open as inbox : "
 msgstr ""
 
-#: alpine/alpine.c:1231
+#: alpine/alpine.c:1313
 msgid "Folder open cancelled"
 msgstr ""
 
 #. TRANSLATORS: Inbox-Path and PINERC are literal, not to be translated
-#: alpine/alpine.c:1244
+#: alpine/alpine.c:1326
 msgid "Preserve folder as \"Inbox-Path\" in PINERC"
 msgstr ""
 
-#: alpine/alpine.c:1265 pith/mailcmd.c:901
+#: alpine/alpine.c:1347 pith/mailcmd.c:911
 msgid "No folder opened"
 msgstr ""
 
-#: alpine/alpine.c:1309
+#: alpine/alpine.c:1391
 msgid "Use Compose command to continue interrupted message."
 msgstr ""
 
-#: alpine/alpine.c:1318
+#: alpine/alpine.c:1403
 #, c-format
 msgid "WARNING! Over your disk quota by %s bytes (%s)"
 msgstr ""
 
 #. TRANSLATORS: config is an abbreviation for configuration
-#: alpine/alpine.c:1331
+#: alpine/alpine.c:1416
 msgid ""
 "Note: some of your config options conflict with site policy and are ignored"
 msgstr ""
 
 #. TRANSLATORS: Pruned-Folders is literal
-#: alpine/alpine.c:1336
+#: alpine/alpine.c:1421
 msgid "Note: ignoring Pruned-Folders outside of default collection for saves"
 msgstr ""
 
-#: alpine/alpine.c:1342
+#: alpine/alpine.c:1427
 msgid ""
 "Note: Mail-Check-Interval=0 may cause IMAP server connection to time out"
 msgstr ""
@@ -4936,1200 +5143,1221 @@ msgstr ""
 #. 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
+#: alpine/alpine.c:1607
 #, c-format
 msgid " %s     HELP               -  Get help using Alpine"
 msgstr ""
 
-#: alpine/alpine.c:1524
+#: alpine/alpine.c:1609
 #, 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:1527
+#: alpine/alpine.c:1612
 msgid "/post"
 msgstr ""
 
-#: alpine/alpine.c:1528
+#: alpine/alpine.c:1613
 #, c-format
 msgid " %s     MESSAGE INDEX      -  View messages in current folder"
 msgstr ""
 
-#: alpine/alpine.c:1530
+#: alpine/alpine.c:1615
 #, 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:1533
+#: alpine/alpine.c:1618
 msgid " OR news group"
 msgstr ""
 
-#: alpine/alpine.c:1534
+#: alpine/alpine.c:1619
 #, c-format
 msgid " %s     ADDRESS BOOK       -  Update address book"
 msgstr ""
 
-#: alpine/alpine.c:1536
+#: alpine/alpine.c:1621
 #, c-format
 msgid " %s     SETUP              -  Configure Alpine Options"
 msgstr ""
 
 #. TRANSLATORS: final Main menu line
-#: alpine/alpine.c:1539
+#: alpine/alpine.c:1624
 #, c-format
 msgid " %s     QUIT               -  Leave the Alpine program"
 msgstr ""
 
-#: alpine/alpine.c:1736
+#: alpine/alpine.c:1826
 #, c-format
 msgid "Debug level set to %s"
 msgstr ""
 
 #. TRANSLATORS: This is a screen title
-#: alpine/alpine.c:1771
+#: alpine/alpine.c:1861
 msgid "HELP FOR MAIN MENU"
 msgstr ""
 
 #. TRANSLATORS: list refers to list of commands in main menu
-#: alpine/alpine.c:1800
+#: alpine/alpine.c:1890
 msgid "Already at top of list"
 msgstr ""
 
-#: alpine/alpine.c:1816
+#: alpine/alpine.c:1906
 msgid "Already at bottom of list"
 msgstr ""
 
 #. TRANSLATORS: This is a screen title
-#: alpine/alpine.c:1824
+#: alpine/alpine.c:1914
 msgid "ALPINE RELEASE NOTES"
 msgstr ""
 
 #. TRANSLATORS: screen title
-#: alpine/alpine.c:2089
+#: alpine/alpine.c:2179
 msgid "MAIN MENU"
 msgstr ""
 
 #. TRANSLATORS: screen title
-#: alpine/alpine.c:2324
+#: alpine/alpine.c:2418
 msgid "SETUP EXCEPTIONS"
 msgstr ""
 
-#: alpine/alpine.c:2330
+#: alpine/alpine.c:2424
 msgid "not eXceptions"
 msgstr ""
 
 #. TRANSLATORS: screen title
-#: alpine/alpine.c:2335 alpine/alpine.c:2530
+#: alpine/alpine.c:2429 alpine/alpine.c:2629
 msgid "SETUP"
 msgstr ""
 
-#: alpine/alpine.c:2338 alpine/alpine.c:2558 alpine/alpine.c:2561
+#: alpine/alpine.c:2432 alpine/alpine.c:2657 alpine/alpine.c:2660
 msgid "eXceptions"
 msgstr ""
 
-#: alpine/alpine.c:2349
+#: alpine/alpine.c:2443
 msgid ""
 "Need argument \"-x <except_config>\" or \"PINERCEX\" file to use eXceptions"
 msgstr ""
 
-#: alpine/alpine.c:2351
+#: alpine/alpine.c:2445
 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:2407
+#: alpine/alpine.c:2501
 msgid ""
 "This is the Setup screen for Alpine. Choose from the following commands:\n"
 msgstr ""
 
-#: alpine/alpine.c:2410
+#: alpine/alpine.c:2504
 msgid "(E) Exit Setup:\n"
 msgstr ""
 
-#: alpine/alpine.c:2411
+#: alpine/alpine.c:2505
 msgid "    This puts you back at the Main Menu.\n"
 msgstr ""
 
-#: alpine/alpine.c:2415 alpine/alpine.c:2507
+#: alpine/alpine.c:2509 alpine/alpine.c:2606
 msgid "(X) eXceptions:\n"
 msgstr ""
 
-#: alpine/alpine.c:2416 alpine/alpine.c:2508
+#: alpine/alpine.c:2510 alpine/alpine.c:2607
 msgid ""
 "    This command is different from the rest. It is not actually a command\n"
 msgstr ""
 
-#: alpine/alpine.c:2417 alpine/alpine.c:2509
+#: alpine/alpine.c:2511 alpine/alpine.c:2608
 msgid ""
 "    itself. Instead, it is a toggle which modifies the behavior of the\n"
 msgstr ""
 
-#: alpine/alpine.c:2418 alpine/alpine.c:2510
+#: alpine/alpine.c:2512 alpine/alpine.c:2609
 msgid ""
 "    other commands. You toggle Exceptions editing on and off with this\n"
 msgstr ""
 
-#: alpine/alpine.c:2419 alpine/alpine.c:2511
+#: alpine/alpine.c:2513 alpine/alpine.c:2610
 msgid ""
 "    command. When it is off you will be editing (changing) your regular\n"
 msgstr ""
 
-#: alpine/alpine.c:2420 alpine/alpine.c:2512
+#: alpine/alpine.c:2514 alpine/alpine.c:2611
 msgid ""
 "    configuration file. When it is on you will be editing your exceptions\n"
 msgstr ""
 
-#: alpine/alpine.c:2421 alpine/alpine.c:2513
+#: alpine/alpine.c:2515 alpine/alpine.c:2612
 msgid ""
 "    configuration file. For example, you might want to type the command \n"
 msgstr ""
 
-#: alpine/alpine.c:2422 alpine/alpine.c:2514
+#: alpine/alpine.c:2516 alpine/alpine.c:2613
 msgid ""
 "    \"eXceptions\" followed by \"Kolor\" to setup different screen colors\n"
 msgstr ""
 
-#: alpine/alpine.c:2423 alpine/alpine.c:2515
+#: alpine/alpine.c:2517 alpine/alpine.c:2614
 msgid "    on a particular platform.\n"
 msgstr ""
 
-#: alpine/alpine.c:2424 alpine/alpine.c:2500
+#: alpine/alpine.c:2518 alpine/alpine.c:2599
 msgid ""
 "    (Note: this command does not show up on the keymenu at the bottom of\n"
 msgstr ""
 
-#: alpine/alpine.c:2425 alpine/alpine.c:2501
+#: alpine/alpine.c:2519 alpine/alpine.c:2600
 msgid ""
 "    the screen unless you press \"O\" for \"Other Commands\" --but you "
 "don't\n"
 msgstr ""
 
-#: alpine/alpine.c:2426 alpine/alpine.c:2502
+#: alpine/alpine.c:2520 alpine/alpine.c:2601
 msgid "    need to press the \"O\" in order to invoke the command.)\n"
 msgstr ""
 
-#: alpine/alpine.c:2431
+#: alpine/alpine.c:2525
 msgid "(P) Printer:\n"
 msgstr ""
 
-#: alpine/alpine.c:2432
+#: alpine/alpine.c:2526
 msgid "    Allows you to set a default printer and to define custom\n"
 msgstr ""
 
-#: alpine/alpine.c:2433
+#: alpine/alpine.c:2527
 msgid "    print commands.\n"
 msgstr ""
 
-#: alpine/alpine.c:2438
+#: alpine/alpine.c:2532
 msgid "(N) Newpassword:\n"
 msgstr ""
 
-#: alpine/alpine.c:2439
+#: alpine/alpine.c:2533
 msgid "    Change your password.\n"
 msgstr ""
 
-#: alpine/alpine.c:2444
+#: alpine/alpine.c:2538
 msgid "(C) Config:\n"
 msgstr ""
 
-#: alpine/alpine.c:2445
+#: alpine/alpine.c:2539
 msgid "    Allows you to set or unset many features of Alpine.\n"
 msgstr ""
 
-#: alpine/alpine.c:2446
+#: alpine/alpine.c:2540
 msgid "    You may also set the values of many options with this command.\n"
 msgstr ""
 
-#: alpine/alpine.c:2451
+#: alpine/alpine.c:2545
 msgid "(S) Signature:\n"
 msgstr ""
 
-#: alpine/alpine.c:2452
+#: alpine/alpine.c:2546
 msgid "    Enter or edit a custom signature which will\n"
 msgstr ""
 
-#: alpine/alpine.c:2453
+#: alpine/alpine.c:2547
 msgid "    be included with each new message you send.\n"
 msgstr ""
 
-#: alpine/alpine.c:2457
+#: alpine/alpine.c:2551
 msgid "(A) AddressBooks:\n"
 msgstr ""
 
-#: alpine/alpine.c:2458
+#: alpine/alpine.c:2552
 msgid "    Define a non-default address book.\n"
 msgstr ""
 
-#: alpine/alpine.c:2461
+#: alpine/alpine.c:2555
 msgid "(L) collectionLists:\n"
 msgstr ""
 
-#: alpine/alpine.c:2462
+#: alpine/alpine.c:2556
 msgid ""
 "    You may define groups of folders to help you better organize your mail.\n"
 msgstr ""
 
-#: alpine/alpine.c:2465
+#: alpine/alpine.c:2559
 msgid "(R) Rules:\n"
 msgstr ""
 
-#: alpine/alpine.c:2466
+#: alpine/alpine.c:2560
 msgid "    This has up to six sub-categories: Roles, Index Colors, Filters,\n"
 msgstr ""
 
-#: alpine/alpine.c:2467
+#: alpine/alpine.c:2561
 msgid "    SetScores, Search, and Other. If the Index Colors option is\n"
 msgstr ""
 
-#: alpine/alpine.c:2468
+#: alpine/alpine.c:2562
 msgid "    missing you may turn it on (if possible) with Setup/Kolor.\n"
 msgstr ""
 
-#: alpine/alpine.c:2469
+#: alpine/alpine.c:2563
 msgid ""
 "    If Roles is missing it has probably been administratively disabled.\n"
 msgstr ""
 
-#: alpine/alpine.c:2473
+#: alpine/alpine.c:2567
 msgid "(D) Directory:\n"
 msgstr ""
 
-#: alpine/alpine.c:2474
+#: alpine/alpine.c:2568
 msgid ""
 "    Define an LDAP Directory server for Alpine's use. A directory server is\n"
 msgstr ""
 
-#: alpine/alpine.c:2475
+#: alpine/alpine.c:2569
 msgid "    similar to an address book, but it is usually maintained by an\n"
 msgstr ""
 
-#: alpine/alpine.c:2476
+#: alpine/alpine.c:2570
 msgid "    organization. It is similar to a telephone directory.\n"
 msgstr ""
 
-#: alpine/alpine.c:2480
+#: alpine/alpine.c:2574
 msgid "(K) Kolor:\n"
 msgstr ""
 
-#: alpine/alpine.c:2481
+#: alpine/alpine.c:2575
 msgid ""
 "    Set custom colors for various parts of the Alpine screens. For example, "
 "the\n"
 msgstr ""
 
-#: alpine/alpine.c:2482
+#: alpine/alpine.c:2576
 msgid ""
 "    command key labels, the titlebar at the top of each page, and quoted\n"
 msgstr ""
 
-#: alpine/alpine.c:2483
+#: alpine/alpine.c:2577
 msgid "    sections of messages you are viewing.\n"
 msgstr ""
 
-#: alpine/alpine.c:2487
+#: alpine/alpine.c:2581
 msgid "(M) S/MIME:\n"
 msgstr ""
 
-#: alpine/alpine.c:2488
+#: alpine/alpine.c:2582
 msgid "    Setup for using S/MIME to verify signed messages, decrypt\n"
 msgstr ""
 
-#: alpine/alpine.c:2489
+#: alpine/alpine.c:2583
 msgid "    encrypted messages, and to sign or encrypt outgoing messages.\n"
 msgstr ""
 
-#: alpine/alpine.c:2493
+#: alpine/alpine.c:2587
+msgid "(U) xoaUth2:\n"
+msgstr ""
+
+#: alpine/alpine.c:2588
+msgid "    Set client-id and client-secret to use the XOAUTH2\n"
+msgstr ""
+
+#: alpine/alpine.c:2589
+msgid "    authenticator.\n"
+msgstr ""
+
+#: alpine/alpine.c:2592
 msgid "(Z) RemoteConfigSetup:\n"
 msgstr ""
 
-#: alpine/alpine.c:2494
+#: alpine/alpine.c:2593
 msgid ""
 "    This is a command you will probably only want to use once, if at all.\n"
 msgstr ""
 
-#: alpine/alpine.c:2495
+#: alpine/alpine.c:2594
 msgid ""
 "    It helps you transfer your Alpine configuration data to an IMAP server,\n"
 msgstr ""
 
-#: alpine/alpine.c:2496
+#: alpine/alpine.c:2595
 msgid ""
 "    where it will be accessible from any of the computers you read mail\n"
 msgstr ""
 
-#: alpine/alpine.c:2497
+#: alpine/alpine.c:2596
 msgid ""
 "    from (using Alpine). The idea behind a remote configuration is that you\n"
 msgstr ""
 
-#: alpine/alpine.c:2498
+#: alpine/alpine.c:2597
 msgid ""
 "    can change your configuration in one place and have that change show\n"
 msgstr ""
 
-#: alpine/alpine.c:2499
+#: alpine/alpine.c:2598
 msgid "    up on all of the computers you use.\n"
 msgstr ""
 
-#: alpine/alpine.c:2516
+#: alpine/alpine.c:2615
 msgid ""
 "    (Note: this command does not do anything unless you have a "
 "configuration\n"
 msgstr ""
 
-#: alpine/alpine.c:2517
+#: alpine/alpine.c:2616
 msgid ""
 "    with exceptions enabled (you don't have that). Common ways to enable an\n"
 msgstr ""
 
-#: alpine/alpine.c:2518
+#: alpine/alpine.c:2617
 msgid ""
 "    exceptions config are the command line argument \"-x <exception_config>"
 "\";\n"
 msgstr ""
 
-#: alpine/alpine.c:2519
+#: alpine/alpine.c:2618
 msgid ""
 "    or the existence of the file \".pinercex\" for Unix Alpine, or \"PINERCEX"
 "\")\n"
 msgstr ""
 
-#: alpine/alpine.c:2520
+#: alpine/alpine.c:2619
 msgid "    for PC-Alpine.)\n"
 msgstr ""
 
-#: alpine/alpine.c:2521
+#: alpine/alpine.c:2620
 msgid ""
 "    (Another note: this command does not show up on the keymenu at the "
 "bottom\n"
 msgstr ""
 
-#: alpine/alpine.c:2522
+#: alpine/alpine.c:2621
 msgid ""
 "    of the screen unless you press \"O\" for \"Other Commands\" --but you\n"
 msgstr ""
 
-#: alpine/alpine.c:2523
+#: alpine/alpine.c:2622
 msgid "    don't need to press the \"O\" in order to invoke the command.)\n"
 msgstr ""
 
-#: alpine/alpine.c:2529
+#: alpine/alpine.c:2628
 msgid "Information About Setup Command"
 msgstr ""
 
-#: alpine/alpine.c:2651
+#: alpine/alpine.c:2750
 msgid "Config file not changeable"
 msgstr ""
 
-#: alpine/alpine.c:2656
+#: alpine/alpine.c:2755
 msgid "Problem accessing configuration"
 msgstr ""
 
-#: alpine/alpine.c:2665 alpine/alpine.c:2687
+#: alpine/alpine.c:2764 alpine/alpine.c:2786
 msgid "SIGNATURE EDITOR"
 msgstr ""
 
-#: alpine/alpine.c:2735
+#: alpine/alpine.c:2840
 msgid "Type of rule setup : "
 msgstr ""
 
-#: alpine/alpine.c:2754
+#: alpine/alpine.c:2859
 msgid "Try turning on color with the Setup/Kolor command."
 msgstr ""
 
-#: alpine/alpine.c:2797
+#: alpine/alpine.c:2902
 msgid "Password changing not configured for this version of Alpine."
 msgstr ""
 
-#: alpine/alpine.c:3132
+#: alpine/alpine.c:3240
+msgid "Quit even though 1 new mail just arrived"
+msgstr ""
+
+#: alpine/alpine.c:3242
+#, c-format
+msgid "Quit even though %lu new messages just arrived"
+msgstr ""
+
+#: alpine/alpine.c:3246
 msgid "Quit even though new mail just arrived"
 msgstr ""
 
-#: alpine/alpine.c:3141
+#: alpine/alpine.c:3259
 msgid "Really quit Alpine"
 msgstr ""
 
-#: alpine/alpine.c:3165
+#: alpine/alpine.c:3283
 msgid "Alpine finished"
 msgstr ""
 
-#: alpine/alpine.c:3375
+#: alpine/alpine.c:3499
 #, c-format
 msgid ""
 "No more available memory.\n"
 "Alpine Exiting"
 msgstr ""
 
-#: alpine/alpine.c:3377
+#: alpine/alpine.c:3501
 #, c-format
 msgid ""
 "Problem detected: \"%s\".\n"
 "Alpine Exiting."
 msgstr ""
 
-#: alpine/alpine.c:3591
+#: alpine/alpine.c:3721
 msgid "PC-Alpine MAIN MENU Help"
 msgstr ""
 
-#: alpine/folder.c:64
+#: alpine/folder.c:60
 msgid "Enter newsgroup name (or partial name to get a list): "
 msgstr ""
 
-#: alpine/folder.c:65
+#: alpine/folder.c:61
 msgid "Use \"X\" to mark selections in list mode"
 msgstr ""
 
-#: alpine/folder.c:66
+#: alpine/folder.c:62
 msgid "ALTER folder selection : "
 msgstr ""
 
-#: alpine/folder.c:67
+#: alpine/folder.c:63
 msgid "Select by folder Name or Contents ? "
 msgstr ""
 
-#: alpine/folder.c:68
+#: alpine/folder.c:64
 msgid "Select by which folder property ? "
 msgstr ""
 
-#: alpine/folder.c:70
+#: alpine/folder.c:66
 msgid "Folder and directory of the same name will be deleted.  Continue"
 msgstr ""
 
 #. TRANSLATORS: The all upper case things are screen titles
-#: alpine/folder.c:262
+#: alpine/folder.c:258
 msgid "FOLDER LIST"
 msgstr ""
 
-#: alpine/folder.c:265
+#: alpine/folder.c:261
 msgid "HELP FOR FOLDERS"
 msgstr ""
 
-#: alpine/folder.c:369
+#: alpine/folder.c:365
 #, c-format
 msgid "SETUP EXCEPTIONS COLLECTION LIST"
 msgstr ""
 
-#: alpine/folder.c:370
+#: alpine/folder.c:366
 #, c-format
 msgid "HELP FOR SETUP EXCEPTIONS COLLECTIONS"
 msgstr ""
 
-#: alpine/folder.c:373
+#: alpine/folder.c:369
 #, c-format
 msgid "SETUP COLLECTION LIST"
 msgstr ""
 
-#: alpine/folder.c:374
+#: alpine/folder.c:370
 #, c-format
 msgid "HELP FOR SETUP COLLECTIONS"
 msgstr ""
 
 #. TRANSLATORS: Print something1 using something2.
 #. contexts is something1
-#: alpine/folder.c:381 alpine/folder.c:861
+#: alpine/folder.c:377 alpine/folder.c:857
 msgid "contexts"
 msgstr ""
 
-#: alpine/folder.c:422
+#: alpine/folder.c:418
 msgid "GOTO: SELECT FOLDER"
 msgstr ""
 
-#: alpine/folder.c:425
+#: alpine/folder.c:421
 msgid "HELP FOR OPENING FOLDERS"
 msgstr ""
 
-#: alpine/folder.c:434 alpine/folder.c:493
+#: alpine/folder.c:430 alpine/folder.c:489
 msgid "All folders displayed for Incoming Collection"
 msgstr ""
 
-#: alpine/folder.c:481
+#: alpine/folder.c:477
 msgid "SAVE: SELECT FOLDER"
 msgstr ""
 
-#: alpine/folder.c:484
+#: alpine/folder.c:480
 msgid "HELP FOR SAVING MESSAGES TO FOLDERS"
 msgstr ""
 
-#: alpine/folder.c:538
+#: alpine/folder.c:534
 msgid "SUBSCRIBE: SELECT FOLDER"
 msgstr ""
 
-#: alpine/folder.c:541
+#: alpine/folder.c:537
 msgid "HELP SELECTING NEWSGROUP TO SUBSCRIBE TO"
 msgstr ""
 
-#: alpine/folder.c:578
+#: alpine/folder.c:574
 msgid "NEWS: SELECT GROUP"
 msgstr ""
 
-#: alpine/folder.c:581
+#: alpine/folder.c:577
 msgid "HELP FOR SELECTING NEWSGROUP TO POST TO"
 msgstr ""
 
-#: alpine/folder.c:660
+#: alpine/folder.c:656
 #, c-format
 msgid "List of folders matching \"%s*\""
 msgstr ""
 
-#: alpine/folder.c:692
+#: alpine/folder.c:688
 msgid "FCC: SELECT FOLDER"
 msgstr ""
 
-#: alpine/folder.c:695
+#: alpine/folder.c:691
 msgid "HELP FOR SELECTING THE FCC"
 msgstr ""
 
-#: alpine/folder.c:766
+#: alpine/folder.c:762
 msgid "SELECT FOLDER"
 msgstr ""
 
-#: alpine/folder.c:771
+#: alpine/folder.c:767
 msgid "HELP FOR SELECTING CURRENT FOLDER"
 msgstr ""
 
-#: alpine/folder.c:775 alpine/folder.c:779
+#: alpine/folder.c:771 alpine/folder.c:775
 msgid "HELP FOR SELECTING FOLDER"
 msgstr ""
 
-#: alpine/folder.c:860
+#: alpine/folder.c:856
 msgid "COLLECTION LIST"
 msgstr ""
 
-#: alpine/folder.c:865
+#: alpine/folder.c:861
 msgid "HELP FOR COLLECTION LIST"
 msgstr ""
 
-#: alpine/folder.c:890 alpine/folder.c:976
+#: alpine/folder.c:886 alpine/folder.c:972
 msgid "Path"
 msgstr ""
 
-#: alpine/folder.c:925
+#: alpine/folder.c:921
 #, c-format
 msgid "FOLDER COLLECTION %s"
 msgstr ""
 
-#: alpine/folder.c:936
+#: alpine/folder.c:932
 msgid ""
 "\n"
 "   Fill in the fields above to add a Folder Collection to your"
 msgstr ""
 
-#: alpine/folder.c:938
+#: alpine/folder.c:934
 msgid ""
 "\n"
 "   COLLECTION LIST screen."
 msgstr ""
 
-#: alpine/folder.c:940
+#: alpine/folder.c:936
 msgid ""
 "\n"
 "   Use the \"^G\" command to get help specific to each item, and"
 msgstr ""
 
-#: alpine/folder.c:942
+#: alpine/folder.c:938
 msgid ""
 "\n"
 "   use \"^X\" when finished."
 msgstr ""
 
-#: alpine/folder.c:1238
+#: alpine/folder.c:1234
 msgid "Problem testing for directory existence"
 msgstr ""
 
-#: alpine/folder.c:1244
+#: alpine/folder.c:1240
 #, c-format
 msgid "Exit and save changes"
 msgstr ""
 
-#: alpine/folder.c:1246
+#: alpine/folder.c:1242
 #, c-format
 msgid "Exit, saving changes and creating Path"
 msgstr ""
 
-#: alpine/folder.c:1277 pico/browse.c:2246
+#: alpine/folder.c:1273 pico/browse.c:2325
 msgid "Edit"
 msgstr ""
 
-#: alpine/folder.c:1289
+#: alpine/folder.c:1285
 msgid "Cancel Add (answering \"Yes\" will abandon any changes made) "
 msgstr ""
 
-#: alpine/folder.c:1292
+#: alpine/folder.c:1288
 #, c-format
 msgid "%s Cancelled) "
 msgstr ""
 
-#: alpine/folder.c:1357
+#: alpine/folder.c:1353
 msgid "Fetching default directory"
 msgstr ""
 
-#: alpine/folder.c:1401
+#: alpine/folder.c:1397
 #, c-format
 msgid "Already subscribed to \"%s\""
 msgstr ""
 
-#: alpine/folder.c:1445
+#: alpine/folder.c:1441
 msgid "Fetching folder data"
 msgstr ""
 
-#: alpine/folder.c:1893
+#: alpine/folder.c:1889
 msgid "[No Folders in Collection]"
 msgstr ""
 
-#: alpine/folder.c:1912
+#: alpine/folder.c:1908
 msgid "[Select Here to See Expanded List]"
 msgstr ""
 
-#: alpine/folder.c:2310
+#: alpine/folder.c:2306
 msgid "Already in List Mode"
 msgstr ""
 
-#: alpine/folder.c:2314
+#: alpine/folder.c:2310
 msgid "No Folders!  Can't enter List Mode"
 msgstr ""
 
-#: alpine/folder.c:2340
+#: alpine/folder.c:2336
 msgid "No Folders!  Nothing to View"
 msgstr ""
 
-#: alpine/folder.c:2493 alpine/folder.c:5316
+#: alpine/folder.c:2489 alpine/folder.c:5311
 msgid "Empty folder collection.  No folder to rename!"
 msgstr ""
 
-#: alpine/folder.c:2503
+#: alpine/folder.c:2499
 msgid "Empty folder collection.  No folder to delete!"
 msgstr ""
 
-#: alpine/folder.c:2540
+#: alpine/folder.c:2536
 msgid "May only shuffle Incoming-Folders."
 msgstr ""
 
-#: alpine/folder.c:2543
+#: alpine/folder.c:2539
 msgid "No folders to shuffle."
 msgstr ""
 
-#: alpine/folder.c:2546
+#: alpine/folder.c:2542
 msgid "Shuffle only makes sense with more than one folder."
 msgstr ""
 
-#: alpine/folder.c:2652
+#: alpine/folder.c:2648
 msgid "Empty folder collection.  No folder to select!"
 msgstr ""
 
-#: alpine/folder.c:2668
+#: alpine/folder.c:2664
 msgid "Folder List Zoom mode is now off"
 msgstr ""
 
-#: alpine/folder.c:2672
+#: alpine/folder.c:2668
 #, c-format
 msgid "In Zoomed list of %s folders. Use \"Z\" to restore regular list"
 msgstr ""
 
-#: alpine/folder.c:2694
+#: alpine/folder.c:2690
 msgid "No selected folders to Zoom on"
 msgstr ""
 
-#: alpine/folder.c:2697
+#: alpine/folder.c:2693
 msgid "No Folders to Zoom on!"
 msgstr ""
 
 #. TRANSLATORS: we are asking for confirmation about abandonding selections
 #. in the address book.
-#: alpine/folder.c:2717 alpine/addrbook.c:3002
+#: alpine/folder.c:2713 alpine/addrbook.c:3002
 msgid "Really abandon your selections "
 msgstr ""
 
-#: alpine/folder.c:2740
+#: alpine/folder.c:2736
 msgid "Invalid Folder Name"
 msgstr ""
 
-#: alpine/folder.c:2759
+#: alpine/folder.c:2755
 #, c-format
 msgid "%lu total message%s, %lu of them recent"
 msgstr ""
 
-#: alpine/folder.c:2763
+#: alpine/folder.c:2759
 #, c-format
 msgid "%s: Trouble checking for recent mail"
 msgstr ""
 
-#: alpine/folder.c:2770
+#: alpine/folder.c:2766
 msgid "No folder to check! Can't get recent info"
 msgstr ""
 
-#: alpine/folder.c:2816
+#: alpine/folder.c:2812
 msgid "Collection not updated"
 msgstr ""
 
-#: alpine/folder.c:2876 alpine/folder.c:3843
+#: alpine/folder.c:2872 alpine/folder.c:3838
 msgid "Empty folder list!"
 msgstr ""
 
-#: alpine/folder.c:2926
+#: alpine/folder.c:2922
 msgid "Name of new folder : "
 msgstr ""
 
-#: alpine/folder.c:2938 alpine/folder.c:4516 alpine/folder.c:5393
+#: alpine/folder.c:2934 alpine/folder.c:4511 alpine/folder.c:5388
 msgid "Folder name can't begin with dot"
 msgstr ""
 
-#: alpine/folder.c:2941 alpine/folder.c:4519
+#: alpine/folder.c:2937 alpine/folder.c:4514
 #, c-format
 msgid "Config feature \"%s\" enables names beginning with dot"
 msgstr ""
 
-#: alpine/folder.c:2949
+#: alpine/folder.c:2945
 #, c-format
 msgid "Can't add folder named %s"
 msgstr ""
 
 #. TRANSLATORS: go to parent directory one level up
-#: alpine/folder.c:2986 alpine/folder.c:3101
+#: alpine/folder.c:2982 alpine/folder.c:3097
 msgid "ParentDir"
 msgstr ""
 
 #. TRANSLATORS: go to Collection List
-#: alpine/folder.c:2992 alpine/folder.c:3120
+#: alpine/folder.c:2988 alpine/folder.c:3116
 msgid "ClctnList"
 msgstr ""
 
-#: alpine/folder.c:3010 alpine/folder.c:3174 alpine/folder.c:3181
+#: alpine/folder.c:3006 alpine/folder.c:3168
 msgid "View Dir"
 msgstr ""
 
 #. TRANSLATORS: New Messages
-#: alpine/folder.c:3063
+#: alpine/folder.c:3059
 msgid "NewMsgs"
 msgstr ""
 
-#: alpine/folder.c:3284
+#: alpine/folder.c:3275
 msgid "Properties"
 msgstr ""
 
-#: alpine/folder.c:3315
+#: alpine/folder.c:3306
 #, c-format
 msgid "Select \"%s\" not supported in Incoming Folders"
 msgstr ""
 
-#: alpine/folder.c:3329 alpine/folder.c:3416
+#: alpine/folder.c:3320 alpine/folder.c:3407
 msgid "Unsupported Select option"
 msgstr ""
 
-#: alpine/folder.c:3452
+#: alpine/folder.c:3443
 msgid "No change resulted"
 msgstr ""
 
-#: alpine/folder.c:3453
+#: alpine/folder.c:3444
 msgid "No messages in intersection"
 msgstr ""
 
-#: alpine/folder.c:3458
+#: alpine/folder.c:3449
 msgid "No change resulted.  Matching folders already selected."
 msgstr ""
 
-#: alpine/folder.c:3552
+#: alpine/folder.c:3547
 #, c-format
 msgid "Now in directory: %s"
 msgstr ""
 
-#: alpine/folder.c:3557
+#: alpine/folder.c:3552
 msgid "Returned to collection's top directory"
 msgstr ""
 
-#: alpine/folder.c:3675 pith/mailcmd.c:569
+#: alpine/folder.c:3670 pith/mailcmd.c:565
 #, c-format
 msgid "Can't find Incoming Folder %s."
 msgstr ""
 
-#: alpine/folder.c:3790
+#: alpine/folder.c:3785
 msgid "Error creating file"
 msgstr ""
 
-#: alpine/folder.c:3805
+#: alpine/folder.c:3800
 msgid "Copying folder"
 msgstr ""
 
-#: alpine/folder.c:3818
+#: alpine/folder.c:3813
 #, c-format
 msgid "Error exporting to %s"
 msgstr ""
 
-#: alpine/folder.c:3829
+#: alpine/folder.c:3824
 #, c-format
 msgid "No messages in %s to export"
 msgstr ""
 
-#: alpine/folder.c:3832
+#: alpine/folder.c:3827
 msgid "Can't open folder for exporting"
 msgstr ""
 
-#: alpine/folder.c:3896
+#: alpine/folder.c:3891
 #, c-format
 msgid "Can't import file outside of %s"
 msgstr ""
 
-#: alpine/folder.c:3956
+#: alpine/folder.c:3951
 #, c-format
 msgid "Error importing to %s"
 msgstr ""
 
-#: alpine/folder.c:3962
+#: alpine/folder.c:3957
 #, c-format
 msgid "No messages in file %s"
 msgstr ""
 
-#: alpine/folder.c:3966
+#: alpine/folder.c:3961
 #, c-format
 msgid "Can't open file %s for import"
 msgstr ""
 
-#: alpine/folder.c:4088
+#: alpine/folder.c:4083
 msgid "Cancelled: config file not editable"
 msgstr ""
 
-#: alpine/folder.c:4189
+#: alpine/folder.c:4184
 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:4204
+#: alpine/folder.c:4199
 msgid "Use a Mail Drop"
 msgstr ""
 
-#: alpine/folder.c:4210
+#: alpine/folder.c:4205
 msgid "Do Not use a Mail Drop"
 msgstr ""
 
-#: alpine/folder.c:4219
+#: alpine/folder.c:4214
 #, c-format
 msgid "Name of Mail Drop server : "
 msgstr ""
 
-#: alpine/folder.c:4221
+#: alpine/folder.c:4216
 #, c-format
 msgid "Name of server to contain destination folder : "
 msgstr ""
 
-#: alpine/folder.c:4223
+#: alpine/folder.c:4218
 #, c-format
 msgid "Name of Inbox server : "
 msgstr ""
 
-#: alpine/folder.c:4225
+#: alpine/folder.c:4220
 #, c-format
 msgid "Name of server to contain added folder : "
 msgstr ""
 
-#: alpine/folder.c:4310 alpine/folder.c:4313
+#: alpine/folder.c:4305 alpine/folder.c:4308
 msgid "HELP FOR DESTINATION SERVER "
 msgstr ""
 
-#: alpine/folder.c:4315 alpine/folder.c:4318
+#: alpine/folder.c:4310 alpine/folder.c:4313
 msgid "HELP FOR MAILDROP NAME "
 msgstr ""
 
-#: alpine/folder.c:4321
+#: alpine/folder.c:4316
 msgid "HELP FOR INBOX SERVER "
 msgstr ""
 
-#: alpine/folder.c:4324
+#: alpine/folder.c:4319
 msgid "HELP FOR SERVER NAME "
 msgstr ""
 
-#: alpine/folder.c:4353 alpine/folder.c:4558 alpine/folder.c:4693
+#: alpine/folder.c:4348 alpine/folder.c:4553 alpine/folder.c:4688
 msgid "INBOX change cancelled"
 msgstr ""
 
-#: alpine/folder.c:4354 alpine/folder.c:4559 alpine/folder.c:4643
-#: alpine/folder.c:4694
+#: alpine/folder.c:4349 alpine/folder.c:4554 alpine/folder.c:4638
+#: alpine/folder.c:4689
 msgid "Addition of new folder cancelled"
 msgstr ""
 
-#: alpine/folder.c:4468
+#: alpine/folder.c:4463
 msgid "Create Folder"
 msgstr ""
 
-#: alpine/folder.c:4473
+#: alpine/folder.c:4468
 msgid "Create Directory"
 msgstr ""
 
-#: alpine/folder.c:4506
+#: alpine/folder.c:4501
 msgid "#move folders may only be the INBOX or in the Incoming Collection"
 msgstr ""
 
-#: alpine/folder.c:4541
+#: alpine/folder.c:4536
 msgid "Can't have trailing directory delimiters!"
 msgstr ""
 
-#: alpine/folder.c:4553
+#: alpine/folder.c:4548
 msgid "HELP FOR FOLDER NAME "
 msgstr ""
 
-#: alpine/folder.c:4630
+#: alpine/folder.c:4625
 msgid "A subfolder name is required, there is no default subfolder name"
 msgstr ""
 
-#: alpine/folder.c:4639
+#: alpine/folder.c:4634
 msgid "HELP FOR SUBFOLDER NAME "
 msgstr ""
 
-#: alpine/folder.c:4656
+#: alpine/folder.c:4651
 #, c-format
 msgid "Cannot add folder %s in current context"
 msgstr ""
 
-#: alpine/folder.c:4670
+#: alpine/folder.c:4665
 #, c-format
 msgid "Nickname for folder \"%s\" : "
 msgstr ""
 
-#: alpine/folder.c:4683
+#: alpine/folder.c:4678
 #, c-format
 msgid "Nickname cannot be \"%s\""
 msgstr ""
 
-#: alpine/folder.c:4726
+#: alpine/folder.c:4721
 #, c-format
 msgid "Incoming folder \"%s\" already exists"
 msgstr ""
 
-#: alpine/folder.c:4756
+#: alpine/folder.c:4751
 #, c-format
 msgid "Error checking for %s"
 msgstr ""
 
-#: alpine/folder.c:4997
+#: alpine/folder.c:4992
 msgid "To All Grps"
 msgstr ""
 
-#: alpine/folder.c:5031
+#: alpine/folder.c:5026
 msgid "Fetching newsgroup list"
 msgstr ""
 
-#: alpine/folder.c:5066
+#: alpine/folder.c:5061
 msgid "No group substring to match! Use ^T to list all news groups."
 msgstr ""
 
-#: alpine/folder.c:5120
+#: alpine/folder.c:5115
 msgid "No groups to select from!"
 msgstr ""
 
-#: alpine/folder.c:5123
+#: alpine/folder.c:5118
 #, c-format
 msgid "News group \"%s\" didn't match any existing groups"
 msgstr ""
 
-#: alpine/folder.c:5169
+#: alpine/folder.c:5164
 msgid "Subscribe cancelled"
 msgstr ""
 
-#: alpine/folder.c:5199 alpine/folder.c:5247 alpine/folder.c:5264
+#: alpine/folder.c:5194 alpine/folder.c:5242 alpine/folder.c:5259
 #, c-format
 msgid "Error subscribing to \"%s\""
 msgstr ""
 
-#: alpine/folder.c:5230
+#: alpine/folder.c:5225
 msgid "Subscriptions failed, subscribed to no new groups"
 msgstr ""
 
-#: alpine/folder.c:5270
+#: alpine/folder.c:5265
 #, c-format
 msgid "Subscribed to \"%s\""
 msgstr ""
 
-#: alpine/folder.c:5311
+#: alpine/folder.c:5306
 msgid "Can't rename news groups!"
 msgstr ""
 
-#: alpine/folder.c:5324
+#: alpine/folder.c:5319
 #, c-format
 msgid "Can't change special folder name \"%s\""
 msgstr ""
 
-#: alpine/folder.c:5354
+#: alpine/folder.c:5349
 msgid "Rename cancelled: folder not in editable config file"
 msgstr ""
 
-#: alpine/folder.c:5369
+#: alpine/folder.c:5364
 msgid "nickname"
 msgstr ""
 
-#: alpine/folder.c:5371 pith/bldaddr.c:658
+#: alpine/folder.c:5366 pith/bldaddr.c:654
 msgid "directory"
 msgstr ""
 
-#: alpine/folder.c:5371
+#: alpine/folder.c:5366
 msgid "folder"
 msgstr ""
 
-#: alpine/folder.c:5396
+#: alpine/folder.c:5391
 msgid "Config feature \"s\" enables names beginning with dot"
 msgstr ""
 
-#: alpine/folder.c:5405
+#: alpine/folder.c:5400
 #, c-format
 msgid "Folder \"%s\" already exists"
 msgstr ""
 
-#: alpine/folder.c:5414
+#: alpine/folder.c:5409
 #, c-format
 msgid "Can't rename incoming folder to %s"
 msgstr ""
 
-#: alpine/folder.c:5417
+#: alpine/folder.c:5412
 #, c-format
 msgid "Can't rename folder to %s"
 msgstr ""
 
-#: alpine/folder.c:5441
+#: alpine/folder.c:5436
 msgid "Folder rename cancelled"
 msgstr ""
 
-#: alpine/folder.c:5587
+#: alpine/folder.c:5582
 #, c-format
 msgid "Really unsubscribe from \"%s\""
 msgstr ""
 
-#: alpine/folder.c:5608
+#: alpine/folder.c:5603
 #, c-format
 msgid "Error unsubscribing from \"%s\""
 msgstr ""
 
-#: alpine/folder.c:5666
+#: alpine/folder.c:5661
 #, c-format
 msgid "Can't delete special folder \"%s\"."
 msgstr ""
 
-#: alpine/folder.c:5672
+#: alpine/folder.c:5667
 msgid "Deletion cancelled: folder not in editable config file"
 msgstr ""
 
-#: alpine/folder.c:5697
+#: alpine/folder.c:5692
 #, c-format
 msgid "Can't delete non-empty directory \"%s\"%s."
 msgstr ""
 
-#: alpine/folder.c:5709
+#: alpine/folder.c:5704
 msgid "No folder deleted"
 msgstr ""
 
-#: alpine/folder.c:5716
+#: alpine/folder.c:5711
 msgid "Nickname only"
 msgstr ""
 
-#: alpine/folder.c:5717
+#: alpine/folder.c:5712
 msgid "Both Folder and Nickname"
 msgstr ""
 
-#: alpine/folder.c:5720
+#: alpine/folder.c:5715
 msgid "DELETE only Nickname or Both nickname and folder? "
 msgstr ""
 
-#: alpine/folder.c:5748
+#: alpine/folder.c:5743
 msgid "Nothing deleted"
 msgstr ""
 
-#: alpine/folder.c:5878
+#: alpine/folder.c:5873
 msgid "folder list"
 msgstr ""
 
-#: alpine/folder.c:5893
+#: alpine/folder.c:5888
 #, c-format
 msgid "String in folder %s to match : "
 msgstr ""
 
-#: alpine/folder.c:5926
+#: alpine/folder.c:5921
 msgid "Name Select"
 msgstr ""
 
-#: alpine/folder.c:5927
+#: alpine/folder.c:5922
 msgid "Content Select"
 msgstr ""
 
-#: alpine/folder.c:5933
+#: alpine/folder.c:5928
 msgid "Select \"Text\" not supported in Incoming Folders"
 msgstr ""
 
-#: alpine/folder.c:6065
+#: alpine/folder.c:6060
 msgid "Unseen msgs"
 msgstr ""
 
-#: alpine/folder.c:6066
+#: alpine/folder.c:6061
 msgid "New msgs"
 msgstr ""
 
-#: alpine/folder.c:6067
+#: alpine/folder.c:6062
 msgid "msg Count"
 msgstr ""
 
-#: alpine/folder.c:6073
+#: alpine/folder.c:6068
 msgid "Select \"Properties\" not supported in Incoming Folders"
 msgstr ""
 
-#: alpine/folder.c:6141
+#: alpine/folder.c:6136
 msgid "Toggle Comparison"
 msgstr ""
 
-#: alpine/folder.c:6542
+#: alpine/folder.c:6537
 #, c-format
 msgid "Check of folder %s failed. Continue "
 msgstr ""
 
-#: alpine/folder.c:6544 alpine/folder.c:6547
+#: alpine/folder.c:6539 alpine/folder.c:6542
 #, c-format
 msgid "Check of %s failed. Continue "
 msgstr ""
 
-#: alpine/folder.c:6549
+#: alpine/folder.c:6544
 #, c-format
 msgid "Check failed. Continue "
 msgstr ""
 
-#: alpine/folder.c:6608
+#: alpine/folder.c:6603
 msgid "Cannot shuffle INBOX"
 msgstr ""
 
-#: alpine/folder.c:6639
+#: alpine/folder.c:6634
 msgid "Shuffle cancelled: config file not editable"
 msgstr ""
 
-#: alpine/folder.c:6652
+#: alpine/folder.c:6647
 msgid "Back"
 msgstr ""
 
-#: alpine/folder.c:6676
+#: alpine/folder.c:6671
 msgid "Shuffle cancelled: unexpected trouble shuffling"
 msgstr ""
 
-#: alpine/folder.c:6690
+#: alpine/folder.c:6685
 msgid "Cannot shuffle from one config file to another."
 msgstr ""
 
-#: alpine/folder.c:6864
+#: alpine/folder.c:6859
 msgid "Can't post messages, NNTP server needs to be configured"
 msgstr ""
 
-#: alpine/folder.c:6871
+#: alpine/folder.c:6866
 msgid "Getting full list of groups for posting"
 msgstr ""
 
 #. TRANSLATORS: the first %s is the folder type, it may be address book or
 #. configuration. The second %s is the folder name. Of course, the HTML
 #. tags should be left as is.
-#: alpine/remote.c:107
+#: alpine/remote.c:105
 #, c-format
 msgid ""
 "<HTML><P>The data in the remote %s folder<P><CENTER>%s</CENTER><P>looks "
 "suspicious. The reason for the suspicion is<P><CENTER>"
 msgstr ""
 
-#: alpine/remote.c:113
+#: alpine/remote.c:111
 #, c-format
 msgid ""
 "header \"%s\" is missing</CENTER><P>The special header \"%s\" is missing "
@@ -6138,7 +6366,7 @@ msgid ""
 "Then you should investigate further."
 msgstr ""
 
-#: alpine/remote.c:119
+#: alpine/remote.c:117
 msgid ""
 "\"Received\" headers detected</CENTER><P>The last message in the folder "
 "contains \"Received\" headers. This usually indicates that the message was "
@@ -6147,7 +6375,7 @@ msgid ""
 "data. Then you should investigate further."
 msgstr ""
 
-#: alpine/remote.c:122
+#: alpine/remote.c:120
 #, c-format
 msgid ""
 "Unexpected value for header \"%s\"</CENTER><P>The special header \"%s\" in "
@@ -6157,7 +6385,7 @@ msgid ""
 "the corrupt data. Then you should investigate further."
 msgstr ""
 
-#: alpine/remote.c:128
+#: alpine/remote.c:126
 #, c-format
 msgid ""
 "Unexpected value for header \"%s\"</CENTER><P>The special header \"%s\" in "
@@ -6170,7 +6398,7 @@ msgid ""
 "corrupt data. Then you should investigate further."
 msgstr ""
 
-#: alpine/remote.c:134
+#: alpine/remote.c:132
 #, c-format
 msgid ""
 "Unexpected value for header \"%s\"</CENTER><P>The special header \"%s\" in "
@@ -6182,11 +6410,11 @@ msgid ""
 "corrupt data. Then you should investigate further."
 msgstr ""
 
-#: alpine/remote.c:157
+#: alpine/remote.c:155
 msgid "REMOTE DATA FORGERY WARNING"
 msgstr ""
 
-#: alpine/remote.c:182
+#: alpine/remote.c:178
 #, c-format
 msgid ""
 "\n"
@@ -6199,7 +6427,7 @@ msgid ""
 "   "
 msgstr ""
 
-#: alpine/remote.c:188
+#: alpine/remote.c:184
 #, c-format
 msgid ""
 "header \"%s\" is missing\n"
@@ -6211,7 +6439,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: alpine/remote.c:193
+#: alpine/remote.c:189
 #, c-format
 msgid ""
 "\"Received\" headers detected\n"
@@ -6224,7 +6452,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: alpine/remote.c:197
+#: alpine/remote.c:193
 #, c-format
 msgid ""
 "Unexpected value for header \"%s\"\n"
@@ -6237,7 +6465,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: alpine/remote.c:202
+#: alpine/remote.c:198
 #, c-format
 msgid ""
 "Unexpected value for header \"%s\"\n"
@@ -6253,7 +6481,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: alpine/remote.c:207
+#: alpine/remote.c:203
 #, c-format
 msgid ""
 "Unexpected value for header \"%s\"\n"
@@ -6270,68 +6498,68 @@ msgid ""
 "\n"
 msgstr ""
 
-#: alpine/remote.c:214
+#: alpine/remote.c:210
 #, c-format
 msgid "Suspicious data in \"%s\": Continue anyway "
 msgstr ""
 
-#: alpine/remote.c:227
+#: alpine/remote.c:223
 #, c-format
 msgid "Can't open remote %s"
 msgstr ""
 
 #. TRANSLATORS: The argument is the command name being piped to.
-#: alpine/pipe.c:145
+#: alpine/pipe.c:142
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr ""
 
-#: alpine/setup.c:49
+#: alpine/setup.c:45
 msgid "SETUP CONFIGURATION"
 msgstr ""
 
-#: alpine/setup.c:50
+#: alpine/setup.c:46
 msgid "SETUP CONFIGURATION EXCEPTIONS"
 msgstr ""
 
 #. TRANSLATORS: Print something1 using something2.
 #. configuration is something1
-#: 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
+#: alpine/setup.c:437 alpine/flagmaint.c:164 alpine/colorconf.c:105
+#: alpine/colorconf.c:2918 alpine/smime.c:718 alpine/smime.c:1503
+#: alpine/smime.c:1778
 msgid "configuration"
 msgstr ""
 
-#: alpine/setup.c:533 alpine/confscroll.c:1878
+#: alpine/setup.c:528 alpine/confscroll.c:1902
 msgid "Leave unset and use default "
 msgstr ""
 
-#: alpine/setup.c:695 alpine/setup.c:842
+#: alpine/setup.c:690 alpine/setup.c:837
 #, c-format
 msgid "Turn on incoming folders with Config feature \"%s\""
 msgstr ""
 
-#: alpine/setup.c:714 alpine/setup.c:735 alpine/setup.c:747
+#: alpine/setup.c:709 alpine/setup.c:730 alpine/setup.c:742
 msgid "Using default, monitor all incoming folders"
 msgstr ""
 
-#: alpine/setup.c:733
+#: alpine/setup.c:728
 msgid "List is unchanged"
 msgstr ""
 
-#: alpine/setup.c:830
+#: alpine/setup.c:825
 msgid "Incoming folders to be monitored"
 msgstr ""
 
-#: alpine/setup.c:848
+#: alpine/setup.c:843
 msgid "SELECT FOLDERS TO MONITOR"
 msgstr ""
 
-#: alpine/setup.c:848
+#: alpine/setup.c:843
 msgid "folders"
 msgstr ""
 
-#: alpine/setup.c:850
+#: alpine/setup.c:845
 msgid "HELP FOR SELECTING FOLDERS"
 msgstr ""
 
@@ -6340,32 +6568,32 @@ msgstr ""
 #. will be a column where one possibility is turned on (is Set).
 #. The other column will be very short descriptions of what
 #. the possibilities are (the Rule Values).
-#: alpine/flagmaint.c:117 alpine/confscroll.c:249
+#: alpine/flagmaint.c:113 alpine/confscroll.c:246
 msgid "Set"
 msgstr ""
 
-#: alpine/flagmaint.c:117
+#: alpine/flagmaint.c:113
 msgid "Flag/Keyword Name"
 msgstr ""
 
-#: alpine/flagmaint.c:167
+#: alpine/flagmaint.c:163
 msgid "FLAG MAINTENANCE"
 msgstr ""
 
-#: alpine/flagmaint.c:195
+#: alpine/flagmaint.c:191
 msgid "Keyword to be added : "
 msgstr ""
 
-#: alpine/flagmaint.c:213
+#: alpine/flagmaint.c:209
 msgid "Keyword already configured, changing nickname"
 msgstr ""
 
-#: alpine/flagmaint.c:218
+#: alpine/flagmaint.c:214
 #, c-format
 msgid "Optional nickname for \"%s\" : "
 msgstr ""
 
-#: alpine/confscroll.c:56
+#: alpine/confscroll.c:53
 msgid "HELP FOR SETUP CONFIGURATION"
 msgstr ""
 
@@ -6373,18 +6601,18 @@ msgstr ""
 #. screen when the user not only does not set an option but also
 #. wants to explicitly not use the default value. Empty value means
 #. an option with no value.
-#: alpine/confscroll.c:62
+#: alpine/confscroll.c:59
 msgid "Empty Value"
 msgstr ""
 
-#: alpine/confscroll.c:63
+#: alpine/confscroll.c:60
 msgid "<Empty Value>"
 msgstr ""
 
 #. TRANSLATORS: No Value set is similar to Empty Value, but the
 #. user has not explicitly decided to not use the default. It is
 #. just an option which the user has left at the default value.
-#: alpine/confscroll.c:67
+#: alpine/confscroll.c:64
 msgid "No Value Set"
 msgstr ""
 
@@ -6393,418 +6621,423 @@ msgstr ""
 #. value and they don't allow the user to change it. The value
 #. is fixed to a certain value. This isn't the same word as
 #. Repaired, it means Unchanging.
-#: alpine/confscroll.c:73
+#: alpine/confscroll.c:70
 msgid "Value is Fixed"
 msgstr ""
 
-#: alpine/confscroll.c:249
+#: alpine/confscroll.c:246
 msgid "Rule Values"
 msgstr ""
 
-#: alpine/confscroll.c:478
+#: alpine/confscroll.c:480
 msgid "Screen too small"
 msgstr ""
 
 #. TRANSLATORS: "Config file not changeable," is what replaces the %s
-#: alpine/confscroll.c:485 alpine/confscroll.c:1335
+#: alpine/confscroll.c:487 alpine/confscroll.c:1359
 #, c-format
 msgid "%s can't change options or settings"
 msgstr ""
 
-#: alpine/confscroll.c:487 alpine/confscroll.c:1337
+#: alpine/confscroll.c:489 alpine/confscroll.c:1361
 msgid "Config file not changeable,"
 msgstr ""
 
-#: alpine/confscroll.c:674 alpine/roleconf.c:6538
+#: alpine/confscroll.c:676 alpine/roleconf.c:6534
 msgid "No help yet."
 msgstr ""
 
-#: alpine/confscroll.c:748 alpine/confscroll.c:834
+#: alpine/confscroll.c:750 alpine/confscroll.c:836
 msgid "Already at end of screen"
 msgstr ""
 
-#: alpine/confscroll.c:790 alpine/confscroll.c:879
+#: alpine/confscroll.c:792 alpine/confscroll.c:881
 msgid "Already at start of screen"
 msgstr ""
 
-#: alpine/confscroll.c:1264
+#: alpine/confscroll.c:1266
 msgid "Current item contains the only match"
 msgstr ""
 
-#: alpine/confscroll.c:1269
+#: alpine/confscroll.c:1271
 msgid "Search wrapped: word found in text above current line"
 msgstr ""
 
-#: alpine/confscroll.c:1270
+#: alpine/confscroll.c:1272
 msgid "Search wrapped: word found in text below current line"
 msgstr ""
 
-#: alpine/confscroll.c:1272
+#: alpine/confscroll.c:1274
 msgid "Search wrapped to beginning: word found"
 msgstr ""
 
-#: alpine/confscroll.c:1275
+#: alpine/confscroll.c:1277
 msgid "Word found in text above current line"
 msgstr ""
 
-#: alpine/confscroll.c:1276
+#: alpine/confscroll.c:1278
 msgid "Word found in text below current line"
 msgstr ""
 
-#: alpine/confscroll.c:1298
+#: alpine/confscroll.c:1300
 msgid "Moved to top"
 msgstr ""
 
-#: alpine/confscroll.c:1313
+#: alpine/confscroll.c:1315
 msgid "Moved to bottom"
 msgstr ""
 
 #. TRANSLATORS: Command <command letter> not defined here.
 #. Leave the trailing %s which might be a parenthetical
 #. remark.
-#: alpine/confscroll.c:1352
+#: alpine/confscroll.c:1376
 #, c-format
 msgid "Command \"%s\" not defined here.%s"
 msgstr ""
 
-#: alpine/confscroll.c:1656
+#: alpine/confscroll.c:1680
 msgid "Decrease"
 msgstr ""
 
-#: alpine/confscroll.c:1660
+#: alpine/confscroll.c:1684
 msgid "Increase"
 msgstr ""
 
-#: alpine/confscroll.c:1679
+#: alpine/confscroll.c:1703
 msgid "Only single value allowed.  Use \"Change\"."
 msgstr ""
 
-#: alpine/confscroll.c:1705
+#: alpine/confscroll.c:1729
 msgid "Enter text to insert before \"%.*w\": "
 msgstr ""
 
-#: alpine/confscroll.c:1719 alpine/print.c:751
+#: alpine/confscroll.c:1743 alpine/print.c:747
 msgid "Add To"
 msgstr ""
 
-#: alpine/confscroll.c:1721 alpine/print.c:753
+#: alpine/confscroll.c:1745 alpine/print.c:749
 msgid "Replace or Add To default value ? "
 msgstr ""
 
-#: alpine/confscroll.c:1742 alpine/confscroll.c:1770
+#: alpine/confscroll.c:1766 alpine/confscroll.c:1794
 #, c-format
 msgid "Enter the numeric text to be added : "
 msgstr ""
 
-#: alpine/confscroll.c:1744 alpine/confscroll.c:1772
+#: alpine/confscroll.c:1768 alpine/confscroll.c:1796
 #, c-format
 msgid "Enter the text to be added : "
 msgstr ""
 
-#: alpine/confscroll.c:1756
+#: alpine/confscroll.c:1780
 #, c-format
 msgid "Enter the  numeric replacement text : "
 msgstr ""
 
-#: alpine/confscroll.c:1758
+#: alpine/confscroll.c:1782
 #, c-format
 msgid "Enter the  replacement text : "
 msgstr ""
 
 #. TRANSLATORS: Insert new item before current item
-#: alpine/confscroll.c:1791 alpine/print.c:804
+#: alpine/confscroll.c:1815 alpine/print.c:800
 msgid "InsertBefore"
 msgstr ""
 
-#: alpine/confscroll.c:1791 alpine/print.c:804
+#: alpine/confscroll.c:1815 alpine/print.c:800
 msgid "InsertAfter"
 msgstr ""
 
-#: alpine/confscroll.c:1852 alpine/confscroll.c:1860 alpine/print.c:893
+#: alpine/confscroll.c:1876 alpine/confscroll.c:1884 alpine/print.c:889
 #, c-format
 msgid "Can't add %s to list"
 msgstr ""
 
-#: alpine/confscroll.c:1868 alpine/confscroll.c:2240
+#: alpine/confscroll.c:1892 alpine/confscroll.c:2264
 msgid "Entry must be numeric"
 msgstr ""
 
-#: alpine/confscroll.c:1912
+#: alpine/confscroll.c:1936
 #, c-format
 msgid "Enter text to insert after \"%.*s\": "
 msgstr ""
 
-#: alpine/confscroll.c:1914
+#: alpine/confscroll.c:1938
 #, c-format
 msgid "Enter text to insert before \"%.*s\": "
 msgstr ""
 
-#: alpine/confscroll.c:1935 alpine/confscroll.c:2272
+#: alpine/confscroll.c:1959 alpine/confscroll.c:2296
 #, c-format
 msgid "Minimum value is %s"
 msgstr ""
 
-#: alpine/confscroll.c:1960 alpine/confscroll.c:2289
+#: alpine/confscroll.c:1984 alpine/confscroll.c:2313
 #, c-format
 msgid "Maximum value is %s"
 msgstr ""
 
-#: alpine/confscroll.c:1986 alpine/confscroll.c:2000 alpine/print.c:920
+#: alpine/confscroll.c:2010 alpine/confscroll.c:2024 alpine/print.c:916
 #, c-format
 msgid "Override default with %s"
 msgstr ""
 
-#: alpine/confscroll.c:2016 alpine/print.c:935
+#: alpine/confscroll.c:2040 alpine/print.c:931
 msgid "No set value to delete"
 msgstr ""
 
-#: alpine/confscroll.c:2020
+#: alpine/confscroll.c:2044
 #, c-format
 msgid "Delete (unused) %s from %s "
 msgstr ""
 
-#: alpine/confscroll.c:2032
+#: alpine/confscroll.c:2056
 #, c-format
 msgid "Really delete %s%s from %s "
 msgstr ""
 
-#: alpine/confscroll.c:2068
+#: alpine/confscroll.c:2092
 msgid "Value not deleted"
 msgstr ""
 
-#: alpine/confscroll.c:2132
+#: alpine/confscroll.c:2156
 #, c-format
 msgid "Change field %s list entry : "
 msgstr ""
 
-#: alpine/confscroll.c:2139
+#: alpine/confscroll.c:2163
 #, c-format
 msgid "Change numeric field %s value : "
 msgstr ""
 
-#: alpine/confscroll.c:2141
+#: alpine/confscroll.c:2165
 #, c-format
 msgid "Change field %s value : "
 msgstr ""
 
-#: alpine/confscroll.c:2311
+#: alpine/confscroll.c:2335
 msgid "Can't shuffle single-valued setting"
 msgstr ""
 
-#: alpine/confscroll.c:2326
+#: alpine/confscroll.c:2350
 msgid "Shuffle only makes sense when there is more than one value defined"
 msgstr ""
 
-#: alpine/confscroll.c:2755 alpine/confscroll.c:2982 alpine/colorconf.c:1277
+#: alpine/confscroll.c:2779 alpine/confscroll.c:3006 alpine/colorconf.c:1274
 msgid "Delete old unused personal option setting"
 msgstr ""
 
-#: alpine/confscroll.c:4290
+#: alpine/confscroll.c:4314
 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:4544 pith/conf.c:7056
+#: alpine/confscroll.c:4568 pith/conf.c:7237
 msgid "Can't change value fixed by sys-admin."
 msgstr ""
 
-#: alpine/confscroll.c:4838
+#: alpine/confscroll.c:4862
 #, c-format
 msgid "Warning: \"%s\" is overridden in your exceptions configuration"
 msgstr ""
 
-#: alpine/confscroll.c:4864
+#: alpine/confscroll.c:4888
 msgid "FIXING PINERC"
 msgstr ""
 
-#: alpine/confscroll.c:4868
+#: alpine/confscroll.c:4892
 msgid "Some of your options conflict with site policy.  Investigate"
 msgstr ""
 
-#: alpine/confscroll.c:4892
+#: alpine/confscroll.c:4916
 #, c-format
 msgid "Your setting for %s is "
 msgstr ""
 
-#: alpine/confscroll.c:4912 alpine/confscroll.c:4921 alpine/confscroll.c:4925
+#: alpine/confscroll.c:4936 alpine/confscroll.c:4945 alpine/confscroll.c:4949
 #, c-format
 msgid "Your setting for %s is %s"
 msgstr ""
 
-#: alpine/confscroll.c:4981 alpine/confscroll.c:4985
+#: alpine/confscroll.c:5005 alpine/confscroll.c:5009
 msgid "ON"
 msgstr ""
 
-#: alpine/confscroll.c:4981 alpine/confscroll.c:4985
+#: alpine/confscroll.c:5005 alpine/confscroll.c:5009
 msgid "OFF"
 msgstr ""
 
-#: alpine/confscroll.c:5069
+#: alpine/confscroll.c:5093
 msgid "Using default value"
 msgstr ""
 
-#: alpine/confscroll.c:5080
+#: alpine/confscroll.c:5104
 #, c-format
 msgid "User-Domain (%s) cannot contain \"@\"; using %s"
 msgstr ""
 
-#: alpine/confscroll.c:5089
+#: alpine/confscroll.c:5113
 #, c-format
 msgid "User-domain (%s) cannot contain \"@\"; deleting"
 msgstr ""
 
-#: alpine/confscroll.c:5160 alpine/confscroll.c:5173 alpine/confscroll.c:5186
-#: alpine/confscroll.c:5193 pith/conf.c:7165
+#: alpine/confscroll.c:5184 alpine/confscroll.c:5197 alpine/confscroll.c:5210
+#: alpine/confscroll.c:5217 pith/conf.c:7346
 msgid "This option has no effect without Enable-Incoming-Folders-Checking"
 msgstr ""
 
-#: alpine/confscroll.c:5228
+#: alpine/confscroll.c:5252
 msgid "Initial command changes will affect your next Alpine session."
 msgstr ""
 
-#: alpine/confscroll.c:5291 alpine/confscroll.c:5307 pith/conf.c:6916
+#: alpine/confscroll.c:5305 alpine/confscroll.c:5321 pith/conf.c:7034
 msgid "This change has no effect because feature Use-System-Translation is on"
 msgstr ""
 
-#: alpine/confscroll.c:5361
+#: alpine/confscroll.c:5375
 #, c-format
 msgid "Ignoring Quote-Suppression-Threshold value of %s, see help"
 msgstr ""
 
-#: alpine/confscroll.c:5386
+#: alpine/confscroll.c:5400
 msgid "Active Example"
 msgstr ""
 
-#: alpine/confscroll.c:5456 alpine/roleconf.c:5208
+#: alpine/confscroll.c:5476 alpine/roleconf.c:5203
 #, c-format
 msgid "Warning: Sig file can't be outside of %s"
 msgstr ""
 
-#: alpine/confscroll.c:5490
+#: alpine/confscroll.c:5510
 msgid ""
 "Warning: automatic new mail checking and mailbox checkpointing is disabled"
 msgstr ""
 
-#: alpine/confscroll.c:5493
+#: alpine/confscroll.c:5513
 msgid ""
 "Warning: Mail-Check-Interval=0 may cause IMAP server connection to time out"
 msgstr ""
 
-#: alpine/confscroll.c:5610
+#: alpine/confscroll.c:5630
 #, c-format
 msgid "\"%s\" can't be Empty, using default"
 msgstr ""
 
-#: alpine/confscroll.c:5661
+#: alpine/confscroll.c:5681
 #, c-format
 msgid "Can't set \"%s\" to that value, see Setup/Printer"
 msgstr ""
 
-#: alpine/confscroll.c:5719
+#: alpine/confscroll.c:5739
 #, c-format
 msgid "Score Value must be in range %s to %s"
 msgstr ""
 
-#: alpine/confscroll.c:5764
+#: alpine/confscroll.c:5773
+#, c-format
+msgid "Invalid value \"%s\". Use \"Authorize\" or \"Device\""
+msgstr ""
+
+#: alpine/confscroll.c:5803
 #, c-format
 msgid "Changes%s%s will affect your next Alpine session."
 msgstr ""
 
-#: alpine/confscroll.c:5775
+#: alpine/confscroll.c:5815
 msgid "Timeout changes will affect your next Alpine session."
 msgstr ""
 
 #. TRANSLATORS: these are some screen titles
-#: alpine/mailindx.c:104
+#: alpine/mailindx.c:100
 msgid "THREAD INDEX"
 msgstr ""
 
-#: alpine/mailindx.c:107
+#: alpine/mailindx.c:103
 msgid "MESSAGE INDEX"
 msgstr ""
 
-#: alpine/mailindx.c:108
+#: alpine/mailindx.c:104
 msgid "ZOOMED MESSAGE INDEX"
 msgstr ""
 
-#: alpine/mailindx.c:110
+#: alpine/mailindx.c:106
 msgid "COMPOSE: SELECT INTERRUPTED"
 msgstr ""
 
-#: alpine/mailindx.c:113
+#: alpine/mailindx.c:109
 msgid "COMPOSE: SELECT FORM LETTER"
 msgstr ""
 
-#: alpine/mailindx.c:114
+#: alpine/mailindx.c:110
 msgid "COMPOSE: SELECT POSTPONED"
 msgstr ""
 
-#: alpine/mailindx.c:132
+#: alpine/mailindx.c:128
 msgid "ThrdIndex"
 msgstr ""
 
-#: alpine/mailindx.c:165
+#: alpine/mailindx.c:161
 msgid "eXclude"
 msgstr ""
 
-#: alpine/mailindx.c:170
+#: alpine/mailindx.c:166
 msgid "eXpunge"
 msgstr ""
 
-#: alpine/mailindx.c:223
+#: alpine/mailindx.c:219
 msgid "No folder is currently open"
 msgstr ""
 
-#: alpine/mailindx.c:626
+#: alpine/mailindx.c:622
 msgid "First Index page"
 msgstr ""
 
-#: alpine/mailindx.c:640
+#: alpine/mailindx.c:636
 msgid "Already at start of Index"
 msgstr ""
 
-#: alpine/mailindx.c:660
+#: alpine/mailindx.c:656
 msgid "Last Index page"
 msgstr ""
 
-#: alpine/mailindx.c:669
+#: alpine/mailindx.c:665
 msgid "Already at end of Index"
 msgstr ""
 
-#: alpine/mailindx.c:698
+#: alpine/mailindx.c:694
 msgid "First Index Page"
 msgstr ""
 
-#: alpine/mailindx.c:719
+#: alpine/mailindx.c:715
 msgid "Last Index Page"
 msgstr ""
 
-#: alpine/mailindx.c:1092
+#: alpine/mailindx.c:1090
 msgid "HELP FOR SELECTING INTERRUPTED MSG"
 msgstr ""
 
-#: alpine/mailindx.c:1093
+#: alpine/mailindx.c:1091
 msgid "HELP FOR SELECTING POSTPONED MSG"
 msgstr ""
 
-#: alpine/mailindx.c:1120
+#: alpine/mailindx.c:1118
 #, c-format
 msgid "Message %s deleted"
 msgstr ""
 
-#: alpine/mailindx.c:1120
+#: alpine/mailindx.c:1118
 #, c-format
 msgid "Message %s already deleted"
 msgstr ""
 
-#: alpine/mailindx.c:1149
+#: alpine/mailindx.c:1147
 #, c-format
 msgid "Message %s UNdeleted"
 msgstr ""
 
-#: alpine/mailindx.c:1149
+#: alpine/mailindx.c:1147
 #, c-format
 msgid "Message %s NOT deleted"
 msgstr ""
@@ -6813,965 +7046,978 @@ msgstr ""
 msgid "Remember the \"O\" command is always optional"
 msgstr ""
 
-#: alpine/mailindx.c:3004
+#: alpine/mailindx.c:3002
+#, c-format
+msgid "Word to search %sfor [%s] : "
+msgstr ""
+
+#: alpine/mailindx.c:3003
+msgid "(backwards) "
+msgstr ""
+
+#: alpine/mailindx.c:3009
 msgid "Select Matches"
 msgstr ""
 
-#: alpine/mailindx.c:3040
+#: alpine/mailindx.c:3033
+msgid "Backward"
+msgstr ""
+
+#: alpine/mailindx.c:3047
 msgid "Searched to First Message."
 msgstr ""
 
-#: alpine/mailindx.c:3056
+#: alpine/mailindx.c:3063
 msgid "Searched to Last Message."
 msgstr ""
 
-#: alpine/mailindx.c:3182
+#: alpine/mailindx.c:3205
 #, c-format
 msgid "Search cancelled.%s"
 msgstr ""
 
-#: alpine/mailindx.c:3183
+#: alpine/mailindx.c:3206
 msgid " Selected set may be incomplete."
 msgstr ""
 
-#: alpine/mailindx.c:3192
+#: alpine/mailindx.c:3215
 #, c-format
 msgid "%s messages found matching word"
 msgstr ""
 
-#: alpine/mailindx.c:3196
+#: alpine/mailindx.c:3219
 #, c-format
 msgid "Word found%s"
 msgstr ""
 
-#: alpine/mailindx.c:3197
+#: alpine/mailindx.c:3220
 msgid ". Search wrapped to beginning"
 msgstr ""
 
-#: alpine/mailindx.c:3198
+#: alpine/mailindx.c:3221
 msgid ". Current line contains only match"
 msgstr ""
 
-#: alpine/kblock.c:46 alpine/kblock.c:65
+#: alpine/kblock.c:42 alpine/kblock.c:61
 msgid "KEYBOARD LOCK"
 msgstr ""
 
-#: alpine/kblock.c:51
+#: alpine/kblock.c:47
 msgid "You may lock this keyboard so that no one else can access your mail"
 msgstr ""
 
-#: alpine/kblock.c:53
+#: alpine/kblock.c:49
 msgid "while you are away.  The screen will be locked after entering the "
 msgstr ""
 
-#: alpine/kblock.c:55
+#: alpine/kblock.c:51
 msgid "password to be used for unlocking the keyboard when you return."
 msgstr ""
 
-#: alpine/kblock.c:69
+#: alpine/kblock.c:65
 #, c-format
 msgid "This keyboard is locked by %s <%s>."
 msgstr ""
 
-#: alpine/kblock.c:70
+#: alpine/kblock.c:66
 msgid "To unlock, enter password used to lock the keyboard."
 msgstr ""
 
-#: alpine/kblock.c:120
+#: alpine/kblock.c:116
 #, c-format
 msgid "Retype password to LOCK keyboard (Yes, again) : "
 msgstr ""
 
-#: alpine/kblock.c:122
+#: alpine/kblock.c:118
 #, c-format
 msgid "Retype password to LOCK keyboard : "
 msgstr ""
 
-#: alpine/kblock.c:124
+#: alpine/kblock.c:120
 #, c-format
 msgid "Enter password to LOCK keyboard : "
 msgstr ""
 
-#: alpine/kblock.c:133 alpine/kblock.c:153
+#: alpine/kblock.c:129 alpine/kblock.c:149
 msgid "Keyboard lock cancelled"
 msgstr ""
 
-#: alpine/kblock.c:146
+#: alpine/kblock.c:142
 msgid "Mismatch with initial password: keyboard lock cancelled"
 msgstr ""
 
-#: alpine/kblock.c:151
+#: alpine/kblock.c:147
 msgid "Really lock keyboard with entered password"
 msgstr ""
 
-#: alpine/kblock.c:167
+#: alpine/kblock.c:163
 msgid "Password to UNLOCK doesn't match password used to LOCK"
 msgstr ""
 
-#: alpine/kblock.c:176
+#: alpine/kblock.c:172
 msgid "Enter password to UNLOCK keyboard : "
 msgstr ""
 
-#: alpine/kblock.c:191
+#: alpine/kblock.c:187
 msgid "Keyboard Unlocked"
 msgstr ""
 
-#: alpine/roleconf.c:54
+#: alpine/roleconf.c:50
 msgid "HELP FOR ARBITRARY HEADER PATTERNS"
 msgstr ""
 
-#: alpine/roleconf.c:55
+#: alpine/roleconf.c:51
 msgid "Add Extra Headers"
 msgstr ""
 
-#: alpine/roleconf.c:158
+#: alpine/roleconf.c:154
 msgid "ForwardAs"
 msgstr ""
 
-#: alpine/roleconf.c:159
+#: alpine/roleconf.c:155
 msgid "ReplyAs"
 msgstr ""
 
-#: alpine/roleconf.c:160
+#: alpine/roleconf.c:156
 msgid "ComposeAs"
 msgstr ""
 
-#: alpine/roleconf.c:160
+#: alpine/roleconf.c:156
 msgid "BounceAs"
 msgstr ""
 
-#: alpine/roleconf.c:174
+#: alpine/roleconf.c:170
 msgid "HELP FOR SELECTING A ROLE TO BOUNCE AS"
 msgstr ""
 
-#: alpine/roleconf.c:176
+#: alpine/roleconf.c:172
 msgid "HELP FOR SELECTING A ROLE TO COMPOSE AS"
 msgstr ""
 
-#: alpine/roleconf.c:178
+#: alpine/roleconf.c:174
 msgid "HELP FOR SELECTING A ROLE"
 msgstr ""
 
 #. TRANSLATORS: Print something1 using something2.
 #. "roles" is something1
-#: alpine/roleconf.c:205
+#: alpine/roleconf.c:201
 msgid "SELECT ROLE"
 msgstr ""
 
 #. TRANSLATORS: Print something1 using something2.
 #. "roles" is something1
-#: alpine/roleconf.c:206 alpine/roleconf.c:4911
+#: alpine/roleconf.c:202 alpine/roleconf.c:4906
 msgid "roles"
 msgstr ""
 
-#: alpine/roleconf.c:243
+#: alpine/roleconf.c:239
 msgid "Default role will be changed to the role you Select"
 msgstr ""
 
-#: alpine/roleconf.c:246
+#: alpine/roleconf.c:242
 msgid "Default role will be set to the role you Select"
 msgstr ""
 
-#: alpine/roleconf.c:249
+#: alpine/roleconf.c:245
 msgid "Default role will be unset"
 msgstr ""
 
-#: alpine/roleconf.c:253
+#: alpine/roleconf.c:249
 msgid "Default role will remain unchanged"
 msgstr ""
 
-#: alpine/roleconf.c:255
+#: alpine/roleconf.c:251
 msgid "Default role will remain unset"
 msgstr ""
 
-#: alpine/roleconf.c:341
+#: alpine/roleconf.c:337
 #, c-format
 msgid "Warning: \"%sRules\" are overridden in your exceptions configuration"
 msgstr ""
 
-#: alpine/roleconf.c:364
+#: alpine/roleconf.c:360
 msgid "Unexpected problem: config file modified externally?"
 msgstr ""
 
-#: alpine/roleconf.c:366
+#: alpine/roleconf.c:362
 #, c-format
 msgid "Perhaps a newer version of pine was used to set variable \"%s\"?"
 msgstr ""
 
-#: alpine/roleconf.c:482
+#: alpine/roleconf.c:478
 msgid "problem getting addresses from message"
 msgstr ""
 
-#: alpine/roleconf.c:530
+#: alpine/roleconf.c:526
 msgid "problem accessing rules"
 msgstr ""
 
-#: alpine/roleconf.c:640 alpine/roleconf.c:1184 alpine/roleconf.c:1338
-#: alpine/roleconf.c:1469
+#: alpine/roleconf.c:636 alpine/roleconf.c:1180 alpine/roleconf.c:1334
+#: alpine/roleconf.c:1465
 msgid "Site policy doesn't allow changing From address so From is ignored"
 msgstr ""
 
-#: alpine/roleconf.c:650 alpine/roleconf.c:1197 alpine/roleconf.c:1351
+#: alpine/roleconf.c:646 alpine/roleconf.c:1193 alpine/roleconf.c:1347
 msgid "Warning: The nickname of the new role is already in use."
 msgstr ""
 
-#: alpine/roleconf.c:998 alpine/roleconf.c:1062
+#: alpine/roleconf.c:994 alpine/roleconf.c:1058
 #, c-format
 msgid "HELP FOR %sRULE CONFIGURATION"
 msgstr ""
 
-#: alpine/roleconf.c:1063
+#: alpine/roleconf.c:1059
 #, c-format
 msgid "Use Add to add a %sRule"
 msgstr ""
 
-#: alpine/roleconf.c:1139
+#: alpine/roleconf.c:1135
 msgid "Nothing to Replicate, use Add"
 msgstr ""
 
-#: alpine/roleconf.c:1172 alpine/roleconf.c:1300
+#: alpine/roleconf.c:1168 alpine/roleconf.c:1296
 msgid "Can't add rule to ReadOnly file"
 msgstr ""
 
-#: alpine/roleconf.c:1454
+#: alpine/roleconf.c:1450
 msgid "Can't change ReadOnly rule"
 msgstr ""
 
-#: alpine/roleconf.c:1479
+#: alpine/roleconf.c:1475
 msgid "Warning: The nickname of this role is also used for another role."
 msgstr ""
 
-#: alpine/roleconf.c:1546
+#: alpine/roleconf.c:1542
 msgid "Can't delete ReadOnly rule"
 msgstr ""
 
-#: alpine/roleconf.c:1550
+#: alpine/roleconf.c:1546
 #, c-format
 msgid "Really delete %srule"
 msgstr ""
 
-#: alpine/roleconf.c:1560
+#: alpine/roleconf.c:1556
 msgid "Rule not deleted"
 msgstr ""
 
-#: alpine/roleconf.c:1677
+#: alpine/roleconf.c:1673
 msgid "Shuffle only makes sense when there is more than one rule defined"
 msgstr ""
 
-#: alpine/roleconf.c:1696
+#: alpine/roleconf.c:1692
 msgid "Before File"
 msgstr ""
 
-#: alpine/roleconf.c:1701
+#: alpine/roleconf.c:1697
 msgid "After File"
 msgstr ""
 
-#: alpine/roleconf.c:1748
+#: alpine/roleconf.c:1744
 msgid "Can't change ReadOnly file"
 msgstr ""
 
-#: alpine/roleconf.c:1768
+#: alpine/roleconf.c:1764
 msgid "BEFORE"
 msgstr ""
 
-#: alpine/roleconf.c:1772
+#: alpine/roleconf.c:1768
 msgid "AFTER"
 msgstr ""
 
-#: alpine/roleconf.c:1789
+#: alpine/roleconf.c:1785
 msgid "Can't shuffle into ReadOnly file"
 msgstr ""
 
-#: alpine/roleconf.c:1900
+#: alpine/roleconf.c:1896
 msgid "Current rule is already part of a file. Move outside any files first."
 msgstr ""
 
-#: alpine/roleconf.c:2058
+#: alpine/roleconf.c:2054
 msgid "Current rule is not part of a file. Use Delete to remove current rule"
 msgstr ""
 
-#: alpine/roleconf.c:2062
+#: alpine/roleconf.c:2058
 #, c-format
 msgid "Really remove rule file \"%s\" from rules config "
 msgstr ""
 
-#: alpine/roleconf.c:2139
+#: alpine/roleconf.c:2135
 msgid "Rule file not removed"
 msgstr ""
 
 #. TRANSLATORS: These next 4 are subheading for sections of a configuration screen.
-#: alpine/roleconf.c:2793
+#: alpine/roleconf.c:2789
 msgid " CURRENT FOLDER CONDITIONS BEGIN HERE "
 msgstr ""
 
-#: alpine/roleconf.c:2795
+#: alpine/roleconf.c:2791
 msgid " ACTIONS BEGIN HERE "
 msgstr ""
 
-#: alpine/roleconf.c:2796
+#: alpine/roleconf.c:2792
 msgid " USES BEGIN HERE "
 msgstr ""
 
-#: alpine/roleconf.c:2797
+#: alpine/roleconf.c:2793
 msgid " OPTIONS BEGIN HERE "
 msgstr ""
 
-#: alpine/roleconf.c:2798
+#: alpine/roleconf.c:2794
 msgid "Subject pattern"
 msgstr ""
 
-#: alpine/roleconf.c:2799
+#: alpine/roleconf.c:2795
 msgid "Use SMTP Server"
 msgstr ""
 
-#: alpine/roleconf.c:2800
+#: alpine/roleconf.c:2796
 msgid "Exit Status Interval"
 msgstr ""
 
-#: alpine/roleconf.c:2910
+#: alpine/roleconf.c:2906
 #, c-format
 msgid "Rule contains unknown %s element, possibly from newer Alpine"
 msgstr ""
 
-#: alpine/roleconf.c:2915
+#: alpine/roleconf.c:2911
 msgid "Editing with this version of Alpine will destroy information"
 msgstr ""
 
 #. TRANSLATORS: Quite a few of the translations to follow are from the
 #. rules editing screens. These are mostly headings of individual categories
 #. of criteria which can be set in a rule.
-#: alpine/roleconf.c:2958
+#: alpine/roleconf.c:2954
 msgid "To pattern"
 msgstr ""
 
-#: alpine/roleconf.c:2960
+#: alpine/roleconf.c:2956
 msgid "From pattern"
 msgstr ""
 
-#: alpine/roleconf.c:2962
+#: alpine/roleconf.c:2958
 msgid "Sender pattern"
 msgstr ""
 
-#: alpine/roleconf.c:2964
+#: alpine/roleconf.c:2960
 msgid "Cc pattern"
 msgstr ""
 
-#: alpine/roleconf.c:2966
+#: alpine/roleconf.c:2962
 msgid "News pattern"
 msgstr ""
 
 #. TRANSLATORS: Recip is an abbreviation for Recipients which stands for
 #. all of the recipients of a message.
-#: alpine/roleconf.c:2972
+#: alpine/roleconf.c:2968
 msgid "Recip pattern"
 msgstr ""
 
 #. TRANSLATORS: Partic is an abbreviation for Participants which stands for
 #. all of the recipients plus the sender of a message.
-#: alpine/roleconf.c:2976
+#: alpine/roleconf.c:2972
 msgid "Partic pattern"
 msgstr ""
 
 #. TRANSLATORS: AllText means all of the text of a message
-#: alpine/roleconf.c:2979
+#: alpine/roleconf.c:2975
 msgid "AllText pattern"
 msgstr ""
 
 #. TRANSLATORS: BdyText means the text of a message but not the text in the headers
-#: alpine/roleconf.c:2982
+#: alpine/roleconf.c:2978
 msgid "BdyText pattern"
 msgstr ""
 
-#: alpine/roleconf.c:2985
+#: alpine/roleconf.c:2981
 msgid "Keyword pattern"
 msgstr ""
 
-#: alpine/roleconf.c:2987
+#: alpine/roleconf.c:2983
 msgid "Charset pattern"
 msgstr ""
 
 #. TRANSLATORS: Age interval is a setting for how old the message is.
-#: alpine/roleconf.c:2992
+#: alpine/roleconf.c:2988
 msgid "Age interval"
 msgstr ""
 
-#: alpine/roleconf.c:3003
+#: alpine/roleconf.c:2999
 msgid "Size interval"
 msgstr ""
 
 #. TRANSLATORS: Score is an alpine concept where the score can be kept for a
 #. message to see if it is a message you want to look at.
-#: alpine/roleconf.c:3016
+#: alpine/roleconf.c:3012
 msgid "Score interval"
 msgstr ""
 
-#: alpine/roleconf.c:3027
+#: alpine/roleconf.c:3023
 msgid "Message is Deleted?"
 msgstr ""
 
-#: alpine/roleconf.c:3035
+#: alpine/roleconf.c:3031
 msgid "Message is New (Unseen)?"
 msgstr ""
 
-#: alpine/roleconf.c:3043
+#: alpine/roleconf.c:3039
 msgid "Message is Important?"
 msgstr ""
 
-#: alpine/roleconf.c:3051
+#: alpine/roleconf.c:3047
 msgid "Message is Answered?"
 msgstr ""
 
-#: alpine/roleconf.c:3059
+#: alpine/roleconf.c:3055
 msgid "Subject contains raw 8-bit?"
 msgstr ""
 
-#: alpine/roleconf.c:3067
+#: alpine/roleconf.c:3063
 msgid "Message is Recent?"
 msgstr ""
 
-#: alpine/roleconf.c:3075
+#: alpine/roleconf.c:3071
 msgid "Beginning of Month?"
 msgstr ""
 
-#: alpine/roleconf.c:3083
+#: alpine/roleconf.c:3079
 msgid "Beginning of Year?"
 msgstr ""
 
 #. TRANSLATORS: these are actions that might be taken by the rule
-#: alpine/roleconf.c:3095
+#: alpine/roleconf.c:3091
 msgid "Set Deleted Status"
 msgstr ""
 
-#: alpine/roleconf.c:3103
+#: alpine/roleconf.c:3099
 msgid "Set New Status"
 msgstr ""
 
-#: alpine/roleconf.c:3111
+#: alpine/roleconf.c:3107
 msgid "Set Important Status"
 msgstr ""
 
-#: alpine/roleconf.c:3119
+#: alpine/roleconf.c:3115
 msgid "Set Answered Status"
 msgstr ""
 
-#: alpine/roleconf.c:3126
+#: alpine/roleconf.c:3122
 msgid "Initialize settings using role"
 msgstr ""
 
-#: alpine/roleconf.c:3135
+#: alpine/roleconf.c:3131
 msgid "Current Folder Type"
 msgstr ""
 
-#: alpine/roleconf.c:3142 alpine/roleconf.c:4404
+#: alpine/roleconf.c:3138 alpine/roleconf.c:4399
 msgid "Folder List"
 msgstr ""
 
-#: alpine/roleconf.c:3157
+#: alpine/roleconf.c:3153
 msgid "Address in address book?"
 msgstr ""
 
 #. TRANSLATORS: Abook is an abbreviation for Address Book
-#: alpine/roleconf.c:3165
+#: alpine/roleconf.c:3161
 msgid "Abook List"
 msgstr ""
 
-#: alpine/roleconf.c:3173
+#: alpine/roleconf.c:3169
 msgid "External Categorizer Commands"
 msgstr ""
 
-#: alpine/roleconf.c:3196
+#: alpine/roleconf.c:3192
 msgid "Character Limit"
 msgstr ""
 
-#: alpine/roleconf.c:3210
+#: alpine/roleconf.c:3206
 msgid "Set From"
 msgstr ""
 
-#: alpine/roleconf.c:3227
+#: alpine/roleconf.c:3223
 msgid "Set Reply-To"
 msgstr ""
 
-#: alpine/roleconf.c:3244
+#: alpine/roleconf.c:3240
 msgid "Set Fcc"
 msgstr ""
 
-#: alpine/roleconf.c:3251
+#: alpine/roleconf.c:3247
 msgid "Set Sort Order"
 msgstr ""
 
-#: alpine/roleconf.c:3265
+#: alpine/roleconf.c:3261
 msgid "Set Index Format"
 msgstr ""
 
-#: alpine/roleconf.c:3278
+#: alpine/roleconf.c:3274
 msgid "Set Startup Rule"
 msgstr ""
 
 #. TRANSLATORS: LiteralSig is a way to keep the signature in the configuration
 #. file instead of in a separate Signature file.
-#: alpine/roleconf.c:3295
+#: alpine/roleconf.c:3291
 msgid "Set LiteralSig"
 msgstr ""
 
-#: alpine/roleconf.c:3302
+#: alpine/roleconf.c:3298
 msgid "Set Signature"
 msgstr ""
 
 #. TRANSLATORS: A template is a skeleton of a message to be used
 #. for composing a new message
-#: alpine/roleconf.c:3311
+#: alpine/roleconf.c:3307
 msgid "Set Template"
 msgstr ""
 
 #. TRANSLATORS: Hdrs is an abbreviation for Headers
-#: alpine/roleconf.c:3319
+#: alpine/roleconf.c:3315
 msgid "Set Other Hdrs"
 msgstr ""
 
-#: alpine/roleconf.c:3335
+#: alpine/roleconf.c:3331
 msgid "Use NNTP Server"
 msgstr ""
 
-#: alpine/roleconf.c:3344
+#: alpine/roleconf.c:3340
 msgid "Score Value"
 msgstr ""
 
-#: alpine/roleconf.c:3361
+#: alpine/roleconf.c:3357
 msgid "Score From Header"
 msgstr ""
 
 #. TRANSLATORS: For these, Use is a now. This part of the rule describes how
 #. it will be used when Replying so it is the Reply Use
-#: alpine/roleconf.c:3374
+#: alpine/roleconf.c:3370
 msgid "Reply Use"
 msgstr ""
 
-#: alpine/roleconf.c:3382
+#: alpine/roleconf.c:3378
 msgid "Forward Use"
 msgstr ""
 
-#: alpine/roleconf.c:3389
+#: alpine/roleconf.c:3385
 msgid "Compose Use"
 msgstr ""
 
-#: alpine/roleconf.c:3436
+#: alpine/roleconf.c:3431
 msgid "HELP FOR NICKNAME"
 msgstr ""
 
-#: alpine/roleconf.c:3459
+#: alpine/roleconf.c:3454
 msgid "HELP FOR COMMENT"
 msgstr ""
 
-#: alpine/roleconf.c:3535
+#: alpine/roleconf.c:3530
 msgid "HELP FOR CURRENT FOLDER TYPE"
 msgstr ""
 
-#: alpine/roleconf.c:3568
+#: alpine/roleconf.c:3563
 msgid "HELP FOR FOLDER LIST"
 msgstr ""
 
 #. TRANSLATORS: The %s is replaced with one of the 4 or 5 words below, CURRENT,
 #. SCORED, and so on.
-#: alpine/roleconf.c:3583
+#: alpine/roleconf.c:3578
 #, c-format
 msgid " %s MESSAGE CONDITIONS BEGIN HERE "
 msgstr ""
 
-#: alpine/roleconf.c:3584 alpine/roleconf.c:3587
+#: alpine/roleconf.c:3579 alpine/roleconf.c:3582
 msgid "CURRENT"
 msgstr ""
 
-#: alpine/roleconf.c:3585
+#: alpine/roleconf.c:3580
 msgid "SCORED"
 msgstr ""
 
-#: alpine/roleconf.c:3586
+#: alpine/roleconf.c:3581
 msgid "COLORED"
 msgstr ""
 
-#: alpine/roleconf.c:3587
+#: alpine/roleconf.c:3582
 msgid "FILTERED"
 msgstr ""
 
-#: alpine/roleconf.c:3611
+#: alpine/roleconf.c:3606
 msgid "HELP FOR TO PATTERN"
 msgstr ""
 
-#: alpine/roleconf.c:3615
+#: alpine/roleconf.c:3610
 msgid "HELP FOR FROM PATTERN"
 msgstr ""
 
-#: alpine/roleconf.c:3619
+#: alpine/roleconf.c:3614
 msgid "HELP FOR SENDER PATTERN"
 msgstr ""
 
-#: alpine/roleconf.c:3623
+#: alpine/roleconf.c:3618
 msgid "HELP FOR CC PATTERN"
 msgstr ""
 
-#: alpine/roleconf.c:3627
+#: alpine/roleconf.c:3622
 msgid "HELP FOR NEWS PATTERN"
 msgstr ""
 
-#: alpine/roleconf.c:3631
+#: alpine/roleconf.c:3626
 msgid "HELP FOR SUBJECT PATTERN"
 msgstr ""
 
-#: alpine/roleconf.c:3635
+#: alpine/roleconf.c:3630
 msgid "HELP FOR RECIPIENT PATTERN"
 msgstr ""
 
-#: alpine/roleconf.c:3639
+#: alpine/roleconf.c:3634
 msgid "HELP FOR PARTICIPANT PATTERN"
 msgstr ""
 
-#: alpine/roleconf.c:3677
+#: alpine/roleconf.c:3672
 msgid "HELP FOR EXTRA HEADERS"
 msgstr ""
 
-#: alpine/roleconf.c:3686
+#: alpine/roleconf.c:3681
 msgid "HELP FOR ALL TEXT PATTERN"
 msgstr ""
 
-#: alpine/roleconf.c:3690
+#: alpine/roleconf.c:3685
 msgid "HELP FOR BODY TEXT PATTERN"
 msgstr ""
 
-#: alpine/roleconf.c:3695
+#: alpine/roleconf.c:3690
 msgid "HELP FOR AGE INTERVAL"
 msgstr ""
 
-#: alpine/roleconf.c:3709
+#: alpine/roleconf.c:3704
 msgid "HELP FOR SIZE INTERVAL"
 msgstr ""
 
-#: alpine/roleconf.c:3724
+#: alpine/roleconf.c:3719
 msgid "HELP FOR SCORE INTERVAL"
 msgstr ""
 
-#: alpine/roleconf.c:3739
+#: alpine/roleconf.c:3734
 msgid "HELP FOR KEYWORD PATTERN"
 msgstr ""
 
-#: alpine/roleconf.c:3745
+#: alpine/roleconf.c:3740
 msgid "HELP FOR CHARACTER SET PATTERN"
 msgstr ""
 
-#: alpine/roleconf.c:3751
+#: alpine/roleconf.c:3746
 msgid "HELP FOR IMPORTANT STATUS"
 msgstr ""
 
-#: alpine/roleconf.c:3754
+#: alpine/roleconf.c:3749
 msgid "HELP FOR NEW STATUS"
 msgstr ""
 
-#: alpine/roleconf.c:3757
+#: alpine/roleconf.c:3752
 msgid "HELP FOR RECENT STATUS"
 msgstr ""
 
-#: alpine/roleconf.c:3760
+#: alpine/roleconf.c:3755
 msgid "HELP FOR DELETED STATUS"
 msgstr ""
 
-#: alpine/roleconf.c:3763
+#: alpine/roleconf.c:3758
 msgid "HELP FOR ANSWERED STATUS"
 msgstr ""
 
-#: alpine/roleconf.c:3766
+#: alpine/roleconf.c:3761
 msgid "HELP FOR 8-BIT SUBJECT"
 msgstr ""
 
-#: alpine/roleconf.c:3769
+#: alpine/roleconf.c:3764
 msgid "HELP FOR BEGINNING OF MONTH"
 msgstr ""
 
-#: alpine/roleconf.c:3772
+#: alpine/roleconf.c:3767
 msgid "HELP FOR BEGINNING OF YEAR"
 msgstr ""
 
-#: alpine/roleconf.c:3820
+#: alpine/roleconf.c:3815
 msgid "HELP FOR ADDRESS IN ADDRESS BOOK"
 msgstr ""
 
-#: alpine/roleconf.c:3844
+#: alpine/roleconf.c:3839
 msgid "HELP FOR ABOOK LIST"
 msgstr ""
 
-#: alpine/roleconf.c:3849
+#: alpine/roleconf.c:3844
 msgid "Types of addresses to check for in address book"
 msgstr ""
 
-#: alpine/roleconf.c:3919
+#: alpine/roleconf.c:3914
 msgid "HELP FOR ADDRESS TYPES"
 msgstr ""
 
-#: alpine/roleconf.c:3971
+#: alpine/roleconf.c:3966
 msgid "HELP FOR CATEGORIZER COMMAND"
 msgstr ""
 
-#: alpine/roleconf.c:4004
+#: alpine/roleconf.c:3999
 msgid "HELP FOR CATEGORIZER EXIT STATUS"
 msgstr ""
 
-#: alpine/roleconf.c:4019
+#: alpine/roleconf.c:4014
 msgid "HELP FOR CHARACTER LIMIT"
 msgstr ""
 
-#: alpine/roleconf.c:4067
+#: alpine/roleconf.c:4062
 msgid "HELP FOR INITIAL SET NICKNAME"
 msgstr ""
 
-#: alpine/roleconf.c:4081
+#: alpine/roleconf.c:4076
 msgid "HELP FOR SET FROM ACTION"
 msgstr ""
 
-#: alpine/roleconf.c:4095
+#: alpine/roleconf.c:4090
 msgid "HELP FOR SET REPLY-TO ACTION"
 msgstr ""
 
-#: alpine/roleconf.c:4109
+#: alpine/roleconf.c:4104
 msgid "HELP FOR SET FCC ACTION"
 msgstr ""
 
-#: alpine/roleconf.c:4123
+#: alpine/roleconf.c:4118
 msgid "HELP FOR SET LITERAL SIGNATURE ACTION"
 msgstr ""
 
-#: alpine/roleconf.c:4137
+#: alpine/roleconf.c:4132
 msgid "HELP FOR SET SIGNATURE ACTION"
 msgstr ""
 
-#: alpine/roleconf.c:4155
+#: alpine/roleconf.c:4150
 msgid "HELP FOR SET TEMPLATE ACTION"
 msgstr ""
 
-#: alpine/roleconf.c:4173
+#: alpine/roleconf.c:4168
 msgid "HELP FOR SET OTHER HEADERS ACTION"
 msgstr ""
 
-#: alpine/roleconf.c:4205
+#: alpine/roleconf.c:4200
 msgid "HELP FOR SMTP SERVER ACTION"
 msgstr ""
 
-#: alpine/roleconf.c:4237
+#: alpine/roleconf.c:4232
 msgid "HELP FOR NNTP SERVER ACTION"
 msgstr ""
 
-#: alpine/roleconf.c:4282
+#: alpine/roleconf.c:4277
 msgid "HELP FOR SCORE VALUE ACTION"
 msgstr ""
 
-#: alpine/roleconf.c:4301
+#: alpine/roleconf.c:4296
 msgid "HELP FOR SCORE VALUE FROM HEADER ACTION"
 msgstr ""
 
-#: alpine/roleconf.c:4337
+#: alpine/roleconf.c:4332
 msgid "Filter Action"
 msgstr ""
 
-#: alpine/roleconf.c:4389
+#: alpine/roleconf.c:4384
 msgid "HELP FOR FILTER ACTION"
 msgstr ""
 
-#: alpine/roleconf.c:4410
+#: alpine/roleconf.c:4405
 msgid "HELP FOR FILTER FOLDER NAME"
 msgstr ""
 
-#: alpine/roleconf.c:4415
+#: alpine/roleconf.c:4410
 msgid "HELP FOR SET IMPORTANT STATUS"
 msgstr ""
 
-#: alpine/roleconf.c:4417
+#: alpine/roleconf.c:4412
 msgid "HELP FOR SET NEW STATUS"
 msgstr ""
 
-#: alpine/roleconf.c:4419
+#: alpine/roleconf.c:4414
 msgid "HELP FOR SET DELETED STATUS"
 msgstr ""
 
-#: alpine/roleconf.c:4421
+#: alpine/roleconf.c:4416
 msgid "HELP FOR SET ANSWERED STATUS"
 msgstr ""
 
-#: alpine/roleconf.c:4428
+#: alpine/roleconf.c:4423
 msgid "Set These Keywords"
 msgstr ""
 
-#: alpine/roleconf.c:4432
+#: alpine/roleconf.c:4427
 msgid "HELP FOR KEYWORDS TO BE SET"
 msgstr ""
 
-#: alpine/roleconf.c:4437
+#: alpine/roleconf.c:4432
 msgid "Clear These Keywords"
 msgstr ""
 
-#: alpine/roleconf.c:4441
+#: alpine/roleconf.c:4436
 msgid "HELP FOR KEYWORDS TO BE CLEARED"
 msgstr ""
 
-#: alpine/roleconf.c:4520
+#: alpine/roleconf.c:4515
 msgid "HELP FOR SET INDEX FORMAT ACTION"
 msgstr ""
 
-#: alpine/roleconf.c:4554
+#: alpine/roleconf.c:4549
 msgid "Index Line Color ="
 msgstr ""
 
-#: alpine/roleconf.c:4668
+#: alpine/roleconf.c:4663
 msgid "HELP FOR FILTER FEATURES"
 msgstr ""
 
-#: alpine/roleconf.c:4759
+#: alpine/roleconf.c:4754
 msgid "HELP FOR ROLE REPLY USE"
 msgstr ""
 
-#: alpine/roleconf.c:4823
+#: alpine/roleconf.c:4818
 msgid "HELP FOR ROLE FORWARD USE"
 msgstr ""
 
-#: alpine/roleconf.c:4887
+#: alpine/roleconf.c:4882
 msgid "HELP FOR ROLE COMPOSE USE"
 msgstr ""
 
-#: alpine/roleconf.c:5216
+#: alpine/roleconf.c:5211
 #, c-format
 msgid "Warning: Template file can't be outside of %s"
 msgstr ""
 
-#: alpine/roleconf.c:5225
+#: alpine/roleconf.c:5220
 #, c-format
 msgid "Warning: Folder can't be outside of %s"
 msgstr ""
 
-#: alpine/roleconf.c:5345
+#: alpine/roleconf.c:5340
 #, c-format
 msgid "Warning: command must be absolute path: \"%s\""
 msgstr ""
 
-#: alpine/roleconf.c:6333 alpine/roleconf.c:6433 alpine/roleconf.c:6690
+#: alpine/roleconf.c:6329 alpine/roleconf.c:6429 alpine/roleconf.c:6686
 msgid "Set a valid Filter Action before Exiting"
 msgstr ""
 
-#: alpine/roleconf.c:6336 alpine/roleconf.c:6435
+#: alpine/roleconf.c:6332 alpine/roleconf.c:6431
 msgid "Set a valid Specific Folder before Exiting"
 msgstr ""
 
-#: alpine/roleconf.c:6365
+#: alpine/roleconf.c:6361
 #, c-format
 msgid "Folder \"%s\" in <%s> doesn't exist. Create"
 msgstr ""
 
-#: alpine/roleconf.c:6376
+#: alpine/roleconf.c:6372
 #, c-format
 msgid "Folder \"%s\" in <%s> doesn't exist. Exit and save anyway"
 msgstr ""
 
-#: alpine/roleconf.c:6385
+#: alpine/roleconf.c:6381
 #, c-format
 msgid "Folder \"%s\" doesn't exist. Create"
 msgstr ""
 
-#: alpine/roleconf.c:6393
+#: alpine/roleconf.c:6389
 #, c-format
 msgid "Folder \"%s\" doesn't exist. Exit and save anyway"
 msgstr ""
 
-#: alpine/roleconf.c:6402
+#: alpine/roleconf.c:6398
 msgid "Folder created"
 msgstr ""
 
-#: alpine/roleconf.c:6412
+#: alpine/roleconf.c:6408
 msgid "Folder not created"
 msgstr ""
 
-#: alpine/roleconf.c:6415 pico/pico.c:820
+#: alpine/roleconf.c:6411 pico/pico.c:816
 msgid "Exit cancelled"
 msgstr ""
 
-#: alpine/roleconf.c:6530
+#: alpine/roleconf.c:6526
 #, c-format
 msgid "Nickname \"%s\" is already in use"
 msgstr ""
 
-#: alpine/roleconf.c:6541
+#: alpine/roleconf.c:6537
 #, c-format
 msgid "Not adding nickname to %s list"
 msgstr ""
 
-#: alpine/roleconf.c:6657
+#: alpine/roleconf.c:6653
 msgid "Commit changes (\"Yes\" means matching messages will be deleted)"
 msgstr ""
 
-#: alpine/roleconf.c:6666 alpine/roleconf.c:6670
+#: alpine/roleconf.c:6662 alpine/roleconf.c:6666
 msgid "Ok, messages matching that Pattern will be deleted"
 msgstr ""
 
-#: alpine/roleconf.c:6713
+#: alpine/roleconf.c:6709
 msgid "No filter changes saved"
 msgstr ""
 
-#: alpine/roleconf.c:6719 alpine/roleconf.c:7151
+#: alpine/roleconf.c:6715 alpine/roleconf.c:7147
 msgid "Changes not yet saved"
 msgstr ""
 
-#: alpine/roleconf.c:7146
+#: alpine/roleconf.c:7142
 msgid "No changes saved"
 msgstr ""
 
-#: alpine/roleconf.c:7402 alpine/colorconf.c:2004
+#: alpine/roleconf.c:7398 alpine/colorconf.c:2001
 msgid "Enter the name of the header field to be added: "
 msgstr ""
 
-#: alpine/roleconf.c:7539
+#: alpine/roleconf.c:7535
 #, c-format
 msgid "Really remove \"%s\" pattern from this rule"
 msgstr ""
 
-#: alpine/listsel.c:234
+#: alpine/listsel.c:231
 msgid "Nothing selected, use Exit to exit without a selection."
 msgstr ""
 
-#: alpine/status.c:1276
+#: alpine/status.c:1288
 #, c-format
 msgid "Command \"%s\" not allowed.  Press RETURN to continue Alpine."
 msgstr ""
 
 #. TRANSLATORS: This is a placeholder for a list of addresses in address book
-#: alpine/addrbook.c:103
+#: alpine/addrbook.c:99
 msgid "[ Address List ]"
 msgstr ""
 
 #. TRANSLATORS: This is an empty address list
-#: alpine/addrbook.c:105
+#: alpine/addrbook.c:101
 msgid "[ Empty ]"
 msgstr ""
 
-#: alpine/addrbook.c:106
+#: alpine/addrbook.c:102
 msgid "[ No Selected Entries in this Address Book ]"
 msgstr ""
 
 #. TRANSLATORS: Move here means to move the cursor to this line of the screen
-#: alpine/addrbook.c:108
+#: alpine/addrbook.c:104
 msgid "    [ Move here to add a Personal Address Book ]"
 msgstr ""
 
 #. TRANSLATORS: A global address book is a shared address book
-#: alpine/addrbook.c:110
+#: alpine/addrbook.c:106
 msgid "    [ Move here to add a Global Address Book ]"
 msgstr ""
 
 #. TRANSLATORS: A heading for an address book distribution list
-#: alpine/addrbook.c:112
+#: alpine/addrbook.c:108
 msgid "DISTRIBUTION LIST:"
 msgstr ""
 
-#: alpine/addrbook.c:113
+#: alpine/addrbook.c:109
 msgid "[ No Address Book Configured ]"
 msgstr ""
 
 #. TRANSLATORS: Select here means to move the cursor to this line and then type
 #. the Select command.
-#: alpine/addrbook.c:116
+#: alpine/addrbook.c:112
 msgid "[ Select Here to See Expanded List ]"
 msgstr ""
 
@@ -8248,361 +8494,361 @@ msgstr ""
 msgid "Alpine ADDRESS_BOOK Help"
 msgstr ""
 
-#: alpine/reply.c:159 alpine/reply.c:202 alpine/reply.c:547 alpine/reply.c:669
+#: alpine/reply.c:155 alpine/reply.c:198 alpine/reply.c:543 alpine/reply.c:665
 #, c-format
 msgid "Error fetching message %s. Can't reply to it."
 msgstr ""
 
-#: alpine/reply.c:419 alpine/mailpart.c:3489
+#: alpine/reply.c:415 alpine/mailpart.c:3909
 #, c-format
 msgid "Replying using role \"%s\" and To as From"
 msgstr ""
 
-#: alpine/reply.c:422 alpine/mailpart.c:3492
+#: alpine/reply.c:418 alpine/mailpart.c:3912
 #, c-format
 msgid "Replying using role \"%s\""
 msgstr ""
 
-#: alpine/reply.c:425 alpine/mailpart.c:3495
+#: alpine/reply.c:421 alpine/mailpart.c:3915
 msgid "Replying using incoming To as outgoing From"
 msgstr ""
 
-#: alpine/reply.c:444 alpine/mailpart.c:3505
+#: alpine/reply.c:440 alpine/mailpart.c:3925
 msgid "Warning: no valid addresses to reply to!"
 msgstr ""
 
-#: 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
+#: alpine/reply.c:450 alpine/reply.c:1542 alpine/reply.c:1940
+#: alpine/mailpart.c:3584 alpine/mailpart.c:3743 alpine/mailpart.c:3982
+#: pith/reply.c:2640
 msgid "Error allocating message text"
 msgstr ""
 
-#: alpine/reply.c:567
+#: alpine/reply.c:563
 msgid "WARNING!  Attachments not included in multiple reply."
 msgstr ""
 
-#: alpine/reply.c:586
+#: alpine/reply.c:582
 msgid "Multipart with no leading text part."
 msgstr ""
 
-#: alpine/reply.c:592
+#: alpine/reply.c:588
 msgid "Non-text message not included."
 msgstr ""
 
-#: alpine/reply.c:700
+#: alpine/reply.c:696
 msgid "COMPOSE MESSAGE REPLY"
 msgstr ""
 
-#: alpine/reply.c:852
+#: alpine/reply.c:848
 msgid "No, use default role"
 msgstr ""
 
-#: alpine/reply.c:854
+#: alpine/reply.c:850
 msgid "No, use default settings"
 msgstr ""
 
-#: alpine/reply.c:856
+#: alpine/reply.c:852
 msgid "To Select Alternate Role"
 msgstr ""
 
 #. TRANSLATORS: This is something like Use role <nickname of role> for Reply?
-#: alpine/reply.c:860
+#: alpine/reply.c:856
 #, c-format
 msgid "Use role \"%s\" for %s? "
 msgstr ""
 
-#: alpine/reply.c:865
+#: alpine/reply.c:861
 #, c-format
 msgid "Use role \"<a role without a nickname>\" for %s? "
 msgstr ""
 
-#: alpine/reply.c:874
+#: alpine/reply.c:870
 msgid "To Select Role"
 msgstr ""
 
-#: alpine/reply.c:876
+#: alpine/reply.c:872
 #, c-format
 msgid "Press Return to %s using %s role, or ^T to select a role "
 msgstr ""
 
-#: alpine/reply.c:877
+#: alpine/reply.c:873
 msgid "default"
 msgstr ""
 
-#: alpine/reply.c:877
+#: alpine/reply.c:873
 msgid "no"
 msgstr ""
 
-#: alpine/reply.c:956
+#: alpine/reply.c:952
 msgid "Not Preserve"
 msgstr ""
 
-#: alpine/reply.c:956
+#: alpine/reply.c:952
 msgid "Preserve"
 msgstr ""
 
-#: alpine/reply.c:957
+#: alpine/reply.c:953
 #, c-format
 msgid "Reply to all recipients%s"
 msgstr ""
 
-#: alpine/reply.c:958
+#: alpine/reply.c:954
 msgid " (preserving fields)? "
 msgstr ""
 
 #. TRANSLATORS: The final five %s's can probably be safely ignored
-#: alpine/reply.c:1051
+#: alpine/reply.c:1046
 #, c-format
 msgid "Include %s%soriginal message%s in Reply%s%s%s%s%s%s? "
 msgstr ""
 
-#: alpine/reply.c:1067 alpine/reply.c:1113
+#: alpine/reply.c:1062 alpine/reply.c:1106
 msgid "Edit Indent String"
 msgstr ""
 
-#: alpine/reply.c:1072
+#: alpine/reply.c:1065
 #, c-format
 msgid "Include %s%soriginal message%s in Reply (using \"%s%s%s\")? "
 msgstr ""
 
-#: alpine/reply.c:1085
+#: alpine/reply.c:1078
 msgid "No Header"
 msgstr ""
 
-#: alpine/reply.c:1085
+#: alpine/reply.c:1078
 msgid "Inc Headr"
 msgstr ""
 
-#: alpine/reply.c:1091
+#: alpine/reply.c:1084
 msgid "No Strip"
 msgstr ""
 
-#: alpine/reply.c:1091
+#: alpine/reply.c:1084
 msgid "Strip Sig"
 msgstr ""
 
-#: alpine/reply.c:1097
+#: alpine/reply.c:1090
 msgid "No Attach"
 msgstr ""
 
-#: alpine/reply.c:1097
+#: alpine/reply.c:1090
 msgid "Inc Attach"
 msgstr ""
 
-#: alpine/reply.c:1103
+#: alpine/reply.c:1096
 msgid "Sig Top"
 msgstr ""
 
-#: alpine/reply.c:1103
+#: alpine/reply.c:1096
 msgid "Sig Bottom"
 msgstr ""
 
-#: alpine/reply.c:1266
+#: alpine/reply.c:1259
 msgid "Replying to Poster as specified in \"Followup-To\""
 msgstr ""
 
-#: alpine/reply.c:1287
+#: alpine/reply.c:1280
 msgid "Follow-up"
 msgstr ""
 
-#: alpine/reply.c:1298
+#: alpine/reply.c:1291
 msgid "Follow-up to news group(s), Reply via email to author or Both? "
 msgstr ""
 
-#: alpine/reply.c:1323
+#: alpine/reply.c:1316
 msgid "Posting to specified Followup-To groups"
 msgstr ""
 
-#: alpine/reply.c:1359
+#: alpine/reply.c:1352
 msgid "Pipes for signatures are administratively disabled"
 msgstr ""
 
-#: alpine/reply.c:1364
+#: alpine/reply.c:1357
 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:1378 pith/smime.c:1379 pith/smime.c:1456 pith/smime.c:1520
+#: alpine/reply.c:1371 pith/smime.c:1389 pith/smime.c:1464 pith/smime.c:1528
 #, c-format
 msgid "Can't read file outside %s: %s"
 msgstr ""
 
-#: alpine/reply.c:1413
+#: alpine/reply.c:1406
 #, c-format
 msgid "Can't get file: %s"
 msgstr ""
 
-#: alpine/reply.c:1422
+#: alpine/reply.c:1415
 #, c-format
 msgid "Error running program \"%s\"%s"
 msgstr ""
 
-#: alpine/reply.c:1451
+#: alpine/reply.c:1444
 #, c-format
 msgid "Error running program \"%s\""
 msgstr ""
 
 #. TRANSLATORS: Arg is a program name
-#: alpine/reply.c:1462
+#: alpine/reply.c:1455
 #, c-format
 msgid "Can't execute \"%s\": Permission denied"
 msgstr ""
 
 #. TRANSLATORS: First arg is error description, 2nd is
 #. filename
-#: alpine/reply.c:1473
+#: alpine/reply.c:1466
 #, c-format
 msgid "Error \"%s\" reading file \"%s\""
 msgstr ""
 
-#: alpine/reply.c:1538 alpine/reply.c:1724 alpine/reply.c:1776
-#: alpine/mailpart.c:3327
+#: alpine/reply.c:1530 alpine/reply.c:1718 alpine/reply.c:1770
+#: alpine/mailpart.c:3747
 #, c-format
 msgid "Error fetching message %s. Can't forward it."
 msgstr ""
 
-#: alpine/reply.c:1557
+#: alpine/reply.c:1549
 msgid "Forward messages as a MIME digest"
 msgstr ""
 
-#: alpine/reply.c:1559 alpine/mailpart.c:3201
+#: alpine/reply.c:1551 alpine/mailpart.c:3619
 msgid "Forward message as an attachment"
 msgstr ""
 
-#: alpine/reply.c:1603 alpine/mailpart.c:3093 alpine/mailpart.c:3219
+#: alpine/reply.c:1595 alpine/mailpart.c:3512 alpine/mailpart.c:3637
 #, c-format
 msgid "Forwarding using role \"%s\""
 msgstr ""
 
-#: alpine/reply.c:1647
+#: alpine/reply.c:1641
 msgid "Insufficient memory for message text"
 msgstr ""
 
-#: alpine/reply.c:1743
+#: alpine/reply.c:1737
 msgid "WARNING!  Attachments not included in multiple forward."
 msgstr ""
 
-#: alpine/reply.c:1761
+#: alpine/reply.c:1755
 msgid "Multipart with no leading text part!"
 msgstr ""
 
-#: alpine/reply.c:1766
+#: alpine/reply.c:1760
 msgid "Non-text message not included!"
 msgstr ""
 
-#: alpine/reply.c:1858 alpine/mailpart.c:3159 alpine/mailpart.c:3318
+#: alpine/reply.c:1852 alpine/mailpart.c:3579 alpine/mailpart.c:3738
 msgid "Error fetching message contents.  Can't forward message."
 msgstr ""
 
-#: alpine/reply.c:1935
+#: alpine/reply.c:1930
 #, c-format
 msgid "Error reading text \"%s\""
 msgstr ""
 
-#: alpine/reply.c:1978
+#: alpine/reply.c:1973
 #, c-format
 msgid "BOUNCE (redirect) %ld messages (using role %s) to : "
 msgstr ""
 
-#: alpine/reply.c:1981
+#: alpine/reply.c:1976
 #, c-format
 msgid "BOUNCE (redirect) %ld messages to : "
 msgstr ""
 
-#: alpine/reply.c:1985
+#: alpine/reply.c:1980
 #, c-format
 msgid "Send %ld messages "
 msgstr ""
 
-#: alpine/reply.c:2000
+#: alpine/reply.c:1995
 msgid "Can't fetch Subject for Bounce"
 msgstr ""
 
-#: alpine/reply.c:2091
+#: alpine/reply.c:2086
 msgid "No signature file defined."
 msgstr ""
 
-#: alpine/reply.c:2096
+#: alpine/reply.c:2091
 msgid "Can't access remote configuration."
 msgstr ""
 
-#: alpine/reply.c:2098
+#: alpine/reply.c:2093
 msgid "Error attempting to edit remote configuration"
 msgstr ""
 
-#: alpine/reply.c:2134
+#: alpine/reply.c:2129
 msgid "Can't access remote sig"
 msgstr ""
 
-#: alpine/reply.c:2142
+#: alpine/reply.c:2137
 msgid "Can't get write permission for remote sig"
 msgstr ""
 
-#: alpine/reply.c:2182
+#: alpine/reply.c:2177
 #, c-format
 msgid "Can't edit file outside of %s"
 msgstr ""
 
-#: alpine/reply.c:2191
+#: alpine/reply.c:2186
 msgid "Error allocating space for file"
 msgstr ""
 
-#: alpine/reply.c:2202
+#: alpine/reply.c:2197
 #, c-format
 msgid "Error editing \"%s\": %s"
 msgstr ""
 
-#: alpine/reply.c:2216
+#: alpine/reply.c:2211
 #, c-format
 msgid "Error reading file: \"%s\""
 msgstr ""
 
-#: alpine/reply.c:2256 alpine/reply.c:2266
+#: alpine/reply.c:2251 alpine/reply.c:2261
 #, c-format
 msgid "Error writing file: \"%s\""
 msgstr ""
 
-#: alpine/reply.c:2282
+#: alpine/reply.c:2277
 #, c-format
 msgid "Error opening temporary sig file %s: %s"
 msgstr ""
 
-#: alpine/reply.c:2290 pith/smime.c:1936 pith/smkeys.c:1046
+#: alpine/reply.c:2285 pith/smime.c:1972 pith/smkeys.c:1091
 #, c-format
 msgid "Error copying to %s: %s"
 msgstr ""
 
-#: alpine/reply.c:2298
+#: alpine/reply.c:2293
 msgid "Copy of sig to remote folder failed, changes NOT saved remotely"
 msgstr ""
 
-#: alpine/reply.c:2312
+#: alpine/reply.c:2307
 #, c-format
 msgid "Error writing \"%s\""
 msgstr ""
 
-#: alpine/reply.c:2405
+#: alpine/reply.c:2400
 msgid "Edit Cancelled"
 msgstr ""
 
-#: alpine/reply.c:2446
+#: alpine/reply.c:2441
 msgid "Save changes"
 msgstr ""
 
-#: alpine/reply.c:2447
+#: alpine/reply.c:2442
 msgid "Don't save changes"
 msgstr ""
 
-#: alpine/reply.c:2455
+#: alpine/reply.c:2450
 msgid "Exit editor? "
 msgstr ""
 
-#: alpine/reply.c:2462
+#: alpine/reply.c:2457
 msgid "No Changes Saved"
 msgstr ""
 
-#: alpine/reply.c:2466
+#: alpine/reply.c:2461
 msgid "Exit Cancelled"
 msgstr ""
 
@@ -8628,264 +8874,376 @@ msgstr ""
 msgid "HELP FOR ATTACHMENT INDEX"
 msgstr ""
 
-#: alpine/mailpart.c:561
+#: alpine/mailpart.c:566
 msgid "Already on last attachment"
 msgstr ""
 
-#: alpine/mailpart.c:569
+#: alpine/mailpart.c:574
 msgid "Already on first attachment"
 msgstr ""
 
-#: alpine/mailpart.c:583
+#: alpine/mailpart.c:588
 msgid "Already on last page of attachments"
 msgstr ""
 
-#: alpine/mailpart.c:603
+#: alpine/mailpart.c:608
 msgid "Already on first page of attachments"
 msgstr ""
 
-#: alpine/mailpart.c:1160
+#: alpine/mailpart.c:1167
 msgid "ATTACHMENT INDEX"
 msgstr ""
 
-#: alpine/mailpart.c:1286
+#: alpine/mailpart.c:1293
 #, c-format
 msgid "Can't Export %s. Use \"Save\" to write file, \"<\" to leave index."
 msgstr ""
 
-#: alpine/mailpart.c:1348
+#: alpine/mailpart.c:1355
 #, c-format
 msgid "Can't save to file outside of %s"
 msgstr ""
 
 #. TRANSLATORS: Error opening destination <filename>: <error text>
-#: alpine/mailpart.c:1470
+#: alpine/mailpart.c:1477
 #, c-format
 msgid "Error opening destination %s: %s"
 msgstr ""
 
 #. TRANSLATORS: <error text>: Error writing attachment to <filename>
-#: alpine/mailpart.c:1497
+#: alpine/mailpart.c:1504
 #, c-format
 msgid "%s: Error writing attachment to \"%s\""
 msgstr ""
 
-#: alpine/mailpart.c:1576
+#: alpine/mailpart.c:1583
 #, c-format
 msgid "Attached Msg (part %s) "
 msgstr ""
 
-#: alpine/mailpart.c:1611
+#: alpine/mailpart.c:1618
 #, c-format
 msgid "Attached message (part %s) saved to \"%s\""
 msgstr ""
 
-#: alpine/mailpart.c:1677
+#: alpine/mailpart.c:1684
 #, c-format
 msgid "Attached digest (part %s) saved to \"%s\""
 msgstr ""
 
 #. TRANSLATORS: Message Attachment (a screen title)
-#: alpine/mailpart.c:1751
+#: alpine/mailpart.c:1758
 msgid "MSG ATTACHMENT"
 msgstr ""
 
-#: alpine/mailpart.c:1777
+#: alpine/mailpart.c:1784
 #, c-format
 msgid "Attached message (part %s) %s to \"%s\""
 msgstr ""
 
-#: alpine/mailpart.c:1780
+#: alpine/mailpart.c:1787
 msgid "overwritten"
 msgstr ""
 
-#: alpine/mailpart.c:1781
+#: alpine/mailpart.c:1788
 msgid "appended"
 msgstr ""
 
-#: alpine/mailpart.c:1781
+#: alpine/mailpart.c:1788
 msgid "written"
 msgstr ""
 
-#: alpine/mailpart.c:1786
+#: alpine/mailpart.c:1793
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: alpine/mailpart.c:1828
+#: alpine/mailpart.c:1835
 msgid "DIGEST ATTACHMENT"
 msgstr ""
 
-#: alpine/mailpart.c:1869
+#: alpine/mailpart.c:1876
 #, c-format
 msgid "Error exporting: %s"
 msgstr ""
 
-#: alpine/mailpart.c:1871
+#: alpine/mailpart.c:1878
 #, c-format
 msgid "%s messages exported before error occurred"
 msgstr ""
 
-#: alpine/mailpart.c:1885
+#: alpine/mailpart.c:1892
 #, c-format
 msgid "Error opening file \"%s\" to export digest: %s"
 msgstr ""
 
-#: alpine/mailpart.c:1951
+#: alpine/mailpart.c:1958
 #, c-format
 msgid "Error printing message %s, part %s"
 msgstr ""
 
-#: alpine/mailpart.c:1979
+#: alpine/mailpart.c:1986
 #, c-format
 msgid "Can't print digest: %s"
 msgstr ""
 
+#: alpine/mailpart.c:2012
+msgid "Attachment has no body!"
+msgstr ""
+
+#: alpine/mailpart.c:2017
+msgid "Not a TEXT/HTML attachment"
+msgstr ""
+
+#: alpine/mailpart.c:2031
+#, c-format
+msgid "Error creating full path for %s"
+msgstr ""
+
+#: alpine/mailpart.c:2034
+#, c-format
+msgid "Error initializing %s"
+msgstr ""
+
+#: alpine/mailpart.c:2045
+#, c-format
+msgid "Error creating temp dir in %s"
+msgstr ""
+
+#: alpine/mailpart.c:2057 alpine/mailpart.c:2327
+#, c-format
+msgid "Error \"%s\", Can't create temporary file"
+msgstr ""
+
+#: alpine/mailpart.c:2064 alpine/mailpart.c:2334
+#, c-format
+msgid "Error \"%s\", Can't write file %s"
+msgstr ""
+
 #. TRANSLATORS: Don't know how to display <certain type> attachments. <might say Try Save.>
-#: alpine/mailpart.c:2019
+#: alpine/mailpart.c:2181
 #, c-format
 msgid "Don't know how to display %s%s%s attachments.%s"
 msgstr ""
 
-#: alpine/mailpart.c:2023
+#: alpine/mailpart.c:2185
 msgid " Try Save."
 msgstr ""
 
-#: alpine/mailpart.c:2026
+#: alpine/mailpart.c:2188
 #, c-format
 msgid "Don't know how to unpack \"%s\" encoding"
 msgstr ""
 
-#: alpine/mailpart.c:2039
+#: alpine/mailpart.c:2201
 #, c-format
 msgid "Can't display Multipart/%s"
 msgstr ""
 
-#: alpine/mailpart.c:2044
+#: alpine/mailpart.c:2206
 msgid "Can't display unknown Multipart Subtype"
 msgstr ""
 
-#: alpine/mailpart.c:2067
+#: alpine/mailpart.c:2231
 msgid "View selected Attachment"
 msgstr ""
 
-#: alpine/mailpart.c:2163
-#, c-format
-msgid "Error \"%s\", Can't create temporary file"
-msgstr ""
-
-#: alpine/mailpart.c:2170
-#, c-format
-msgid "Error \"%s\", Can't write file %s"
-msgstr ""
-
-#: alpine/mailpart.c:2272
+#: alpine/mailpart.c:2436
 #, c-format
 msgid "Cannot display %s attachment"
 msgstr ""
 
-#: alpine/mailpart.c:2331 alpine/mailpart.c:2791
+#: alpine/mailpart.c:2495 alpine/mailpart.c:2976
 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:2372 alpine/mailpart.c:2472 pith/mailview.c:175
+#: alpine/mailpart.c:2536 alpine/mailpart.c:2636 pith/mailview.c:174
 msgid "Full header mode ON.  All header text being included"
 msgstr ""
 
-#: alpine/mailpart.c:2443 alpine/mailpart.c:2455
+#: alpine/mailpart.c:2607 alpine/mailpart.c:2619
 #, c-format
 msgid "Can't format digest: %s"
 msgstr ""
 
-#: alpine/mailpart.c:2474
+#: alpine/mailpart.c:2638
 msgid "ATTACHED MESSAGES"
 msgstr ""
 
-#: alpine/mailpart.c:2498
+#: alpine/mailpart.c:2662
 msgid "HELP FOR ATTACHED TEXT VIEW"
 msgstr ""
 
-#: alpine/mailpart.c:2504
+#: alpine/mailpart.c:2668
 msgid "MsgText"
 msgstr ""
 
-#: alpine/mailpart.c:2507
+#: alpine/mailpart.c:2671
 msgid "AttchIndex"
 msgstr ""
 
-#: alpine/mailpart.c:2564 alpine/smime.c:212
+#: alpine/mailpart.c:2728 alpine/smime.c:211
 msgid "Not a signed or encrypted message"
 msgstr ""
 
-#: alpine/mailpart.c:2784
+#: alpine/mailpart.c:2969
 msgid "Error accessing attachment."
 msgstr ""
 
-#: alpine/mailpart.c:2856
+#: alpine/mailpart.c:3041
 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:2857
+#: alpine/mailpart.c:3042
 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:2866
+#: alpine/mailpart.c:3051
 msgid "ADDRESS BOOK ATTACHMENT"
 msgstr ""
 
-#: alpine/mailpart.c:2879
+#: alpine/mailpart.c:3064 alpine/mailpart.c:3291
 #, c-format
 msgid "Can't format entry : %s"
 msgstr ""
 
-#: alpine/mailpart.c:3036
+#: alpine/mailpart.c:3099
+msgid "Error parsing event"
+msgstr ""
+
+#: alpine/mailpart.c:3105
+msgid "Error allocating space to process Calendar"
+msgstr ""
+
+#: alpine/mailpart.c:3116
+msgid "This event was cancelled"
+msgstr ""
+
+#: alpine/mailpart.c:3122
+msgid "Priority: "
+msgstr ""
+
+#: alpine/mailpart.c:3123
+msgid "(Normal)"
+msgstr ""
+
+#: alpine/mailpart.c:3124
+msgid "(High)"
+msgstr ""
+
+#: alpine/mailpart.c:3125
+msgid "(Low)"
+msgstr ""
+
+#: alpine/mailpart.c:3132
+msgid "Summary: "
+msgstr ""
+
+#: alpine/mailpart.c:3139
+msgid "Sender: "
+msgstr ""
+
+#: alpine/mailpart.c:3146 pith/mailview.c:326
+msgid "Organizer: "
+msgstr ""
+
+#: alpine/mailpart.c:3153 pith/mailview.c:333
+msgid "Location: "
+msgstr ""
+
+#: alpine/mailpart.c:3160 pith/mailview.c:340
+msgid "Start Date: "
+msgstr ""
+
+#: alpine/mailpart.c:3168 pith/mailview.c:350
+msgid "Duration: "
+msgstr ""
+
+#: alpine/mailpart.c:3174 pith/mailview.c:357
+msgid "End Date: "
+msgstr ""
+
+#: alpine/mailpart.c:3181
+msgid "Created on: "
+msgstr ""
+
+#: alpine/mailpart.c:3181
+msgid "Last Revised on; "
+msgstr ""
+
+#: alpine/mailpart.c:3194
+msgid "Description: "
+msgstr ""
+
+#: alpine/mailpart.c:3203
+msgid "[ No description provided ]"
+msgstr ""
+
+#: alpine/mailpart.c:3222
+msgid "List of Attendees:"
+msgstr ""
+
+#: alpine/mailpart.c:3232
+#, c-format
+msgid "This event was tagged as a %s entry by the sender"
+msgstr ""
+
+#: alpine/mailpart.c:3249
+msgid "Error allocating space to write Calendar"
+msgstr ""
+
+#: alpine/mailpart.c:3281
+msgid "CALENDAR EVENT ATTACHMENT"
+msgstr ""
+
+#: alpine/mailpart.c:3456
 msgid "ABOUT ATTACHMENT"
 msgstr ""
 
-#: alpine/mailpart.c:3038
+#: alpine/mailpart.c:3458
 msgid "HELP FOR \"ABOUT ATTACHMENT\""
 msgstr ""
 
-#: alpine/mailpart.c:3554
+#: alpine/mailpart.c:3974
 msgid "Error building message body"
 msgstr ""
 
-#: alpine/mailpart.c:3796
+#: alpine/mailpart.c:4216
 #, c-format
 msgid "Error detaching for pipe: %s"
 msgstr ""
 
-#: alpine/mailpart.c:3800
+#: alpine/mailpart.c:4220
 msgid "PIPE ATTACHMENT (ERROR)"
 msgstr ""
 
-#: alpine/mailpart.c:3801
+#: alpine/mailpart.c:4221
 msgid "PIPE ATTACHMENT"
 msgstr ""
 
-#: alpine/mailpart.c:3835
+#: alpine/mailpart.c:4255
 #, c-format
 msgid "Part %s will be omitted only if message is Saved"
 msgstr ""
 
-#: alpine/mailpart.c:3840
+#: alpine/mailpart.c:4260
 #, c-format
 msgid "Part %s already deleted"
 msgstr ""
 
-#: alpine/mailpart.c:3861
+#: alpine/mailpart.c:4281
 #, c-format
 msgid "Part %s already UNdeleted"
 msgstr ""
 
-#: alpine/signal.c:269
+#: alpine/signal.c:265
 #, c-format
 msgid ""
 "\n"
@@ -8893,7 +9251,7 @@ msgid ""
 "Alpine timed out (No user input for %d %s)\n"
 msgstr ""
 
-#: alpine/signal.c:304
+#: alpine/signal.c:300
 #, c-format
 msgid ""
 "\n"
@@ -8902,376 +9260,774 @@ msgid ""
 "\n"
 msgstr ""
 
-#: alpine/signal.c:421
+#: alpine/signal.c:417
 #, c-format
 msgid "Another email program is accessing %s. Session now Read-Only."
 msgstr ""
 
-#: alpine/signal.c:793
+#: alpine/signal.c:789
 msgid "Alpine suspension not enabled - see help text"
 msgstr ""
 
-#: alpine/signal.c:876
+#: alpine/signal.c:872
 #, c-format
 msgid "Error loading \"%s\""
 msgstr ""
 
-#: alpine/signal.c:882
+#: alpine/signal.c:878
 msgid "Suspended for too long, IMAP connection broken"
 msgstr ""
 
-#: alpine/signal.c:895
+#: alpine/signal.c:891
 #, c-format
 msgid ""
 "\n"
 "Alpine suspended. Give the \"%s\" command to come back.\n"
 msgstr ""
 
-#: alpine/signal.c:905
+#: alpine/signal.c:901
 msgid "Warning: Your IMAP connection will be closed if Alpine"
 msgstr ""
 
-#: alpine/signal.c:906
+#: alpine/signal.c:902
 msgid "is suspended for more than 30 minutes\n"
 msgstr ""
 
-#: alpine/colorconf.c:105 alpine/colorconf.c:2919
+#: alpine/colorconf.c:101 alpine/colorconf.c:2916
 msgid "SETUP COLOR EXCEPTIONS"
 msgstr ""
 
-#: alpine/colorconf.c:106 alpine/colorconf.c:2920
+#: alpine/colorconf.c:102 alpine/colorconf.c:2917
 msgid "SETUP COLOR"
 msgstr ""
 
-#: alpine/colorconf.c:123
+#: alpine/colorconf.c:119
 msgid "conf_scroll_screen bad ret in color_config"
 msgstr ""
 
-#: alpine/colorconf.c:404
+#: alpine/colorconf.c:400
 msgid "Current Indexline Style"
 msgstr ""
 
-#: alpine/colorconf.c:419
+#: alpine/colorconf.c:415
 msgid "Titlebar Color Style"
 msgstr ""
 
-#: alpine/colorconf.c:436
+#: alpine/colorconf.c:432
 msgid "GENERAL COLORS"
 msgstr ""
 
-#: alpine/colorconf.c:465
+#: alpine/colorconf.c:461
 msgid "INDEX COLORS"
 msgstr ""
 
-#: alpine/colorconf.c:710
+#: alpine/colorconf.c:706
 msgid "[ Use Setup/Config command to add Keywords ]"
 msgstr ""
 
-#: alpine/colorconf.c:733
+#: alpine/colorconf.c:729
 msgid " (overridden by exceptions)"
 msgstr ""
 
-#: alpine/colorconf.c:735
+#: alpine/colorconf.c:731
 msgid " (more in exceptions)"
 msgstr ""
 
-#: alpine/colorconf.c:741
+#: alpine/colorconf.c:737
 msgid " (more in main config)"
 msgstr ""
 
-#: alpine/colorconf.c:829
+#: alpine/colorconf.c:825
 msgid "HELP FOR SETTING UP COLOR"
 msgstr ""
 
-#: alpine/colorconf.c:1855
+#: alpine/colorconf.c:1852
 msgid "Really restore all colors to default values"
 msgstr ""
 
-#: alpine/colorconf.c:2005
+#: alpine/colorconf.c:2002
 msgid "Enter the name of the index token to be added: "
 msgstr ""
 
-#: alpine/colorconf.c:2011
+#: alpine/colorconf.c:2008
 #, c-format
 msgid "token \"%s\" not recognized"
 msgstr ""
 
-#: alpine/colorconf.c:2015
+#: alpine/colorconf.c:2012
 #, c-format
 msgid "Color rule for token \"%s\" already exists"
 msgstr ""
 
-#: alpine/colorconf.c:2130
+#: alpine/colorconf.c:2127
 msgid "Can't delete this color setting"
 msgstr ""
 
-#: alpine/colorconf.c:2135
+#: alpine/colorconf.c:2132
 msgid "Really delete header color from config"
 msgstr ""
 
-#: alpine/colorconf.c:2136
+#: alpine/colorconf.c:2133
 msgid "Really delete index token color from config"
 msgstr ""
 
-#: alpine/colorconf.c:2236
+#: alpine/colorconf.c:2233
 msgid "header color deleted"
 msgstr ""
 
-#: alpine/colorconf.c:2242
+#: alpine/colorconf.c:2239
 msgid "Can't shuffle this color setting"
 msgstr ""
 
-#: alpine/colorconf.c:2258
+#: alpine/colorconf.c:2255
 msgid ""
 "Shuffle only makes sense when there is more than one Header Color defined"
 msgstr ""
 
-#: alpine/colorconf.c:2284
+#: alpine/colorconf.c:2281
 #, c-format
 msgid "Shuffle %s%s%s ? "
 msgstr ""
 
-#: alpine/colorconf.c:2381
+#: alpine/colorconf.c:2378
 msgid "Header Colors shuffled"
 msgstr ""
 
-#: alpine/colorconf.c:2828
+#: alpine/colorconf.c:2825
 msgid "Pattern to match ="
 msgstr ""
 
-#: alpine/context.c:203
+#: alpine/context.c:199
 msgid ""
 "No exceptions to edit. First collection exception must be set by editing file"
 msgstr ""
 
-#: alpine/context.c:295
+#: alpine/context.c:291
 msgid "Really delete last exceptional collection"
 msgstr ""
 
-#: alpine/context.c:314 alpine/context.c:338
+#: alpine/context.c:310 alpine/context.c:334
 msgid "Trouble saving change, cancelled"
 msgstr ""
 
-#: alpine/context.c:319
+#: alpine/context.c:315
 msgid "Deleted last Folder-Collection, reverting to default"
 msgstr ""
 
-#: alpine/context.c:325
+#: alpine/context.c:321
 msgid "Deleted default Folder-Collection, reverting back to default"
 msgstr ""
 
-#: alpine/context.c:345
+#: alpine/context.c:341
 msgid "Deleted last News-Collection, reverting to default"
 msgstr ""
 
-#: alpine/context.c:353
+#: alpine/context.c:349
 msgid "Deleted default News-Collection, reverting back to default"
 msgstr ""
 
-#: alpine/context.c:558
+#: alpine/context.c:554
 msgid "Error adding new collection"
 msgstr ""
 
-#: alpine/context.c:567
+#: alpine/context.c:563
 msgid "New collection added.  Use \"$\" to adjust order."
 msgstr ""
 
-#: alpine/context.c:630
+#: alpine/context.c:626
 #, c-format
 msgid "Shuffle selected context %s%s%s? "
 msgstr ""
 
-#: alpine/context.c:695
+#: alpine/context.c:691
 msgid "Error deleting shuffled context"
 msgstr ""
 
-#: alpine/context.c:701
+#: alpine/context.c:697
 msgid "Trouble shuffling, cancelled"
 msgstr ""
 
-#: alpine/context.c:709
+#: alpine/context.c:705
 msgid "Collections shuffled"
 msgstr ""
 
 #. TRANSLATORS: Sorry, can't move news group collections above email collections
-#: alpine/context.c:715
+#: alpine/context.c:711
 msgid "Sorry, cannot Shuffle news to top"
 msgstr ""
 
-#: alpine/context.c:717
+#: alpine/context.c:713
 msgid "Sorry, nothing to Shuffle"
 msgstr ""
 
-#: alpine/context.c:763
+#: alpine/context.c:759
 msgid "Collection list entry updated"
 msgstr ""
 
-#: alpine/context.c:802
+#: alpine/context.c:798
 msgid "Sorry, cannot Delete causing news to move to top"
 msgstr ""
 
-#: alpine/context.c:806
+#: alpine/context.c:802
 #, c-format
 msgid "Delete the collection definition for \"%s\""
 msgstr ""
 
-#: alpine/context.c:839
+#: alpine/context.c:835
 msgid "Error deleting renamed context"
 msgstr ""
 
-#: alpine/context.c:843
+#: alpine/context.c:839
 msgid "Collection deleted"
 msgstr ""
 
-#: alpine/context.c:848
+#: alpine/context.c:844
 msgid "No collections deleted"
 msgstr ""
 
-#: alpine/imap.c:193
+#: alpine/imap.c:146
+msgid ""
+"</P><P> Once you have authorized Alpine, you will be asked if you want to "
+"preserve the Refresh Token and Access Code. If you do "
+msgstr ""
+
+#: alpine/imap.c:147
+msgid ""
+"not wish to repeat this process again, answer 'Y'es. If you did this process "
+"quickly, your connection to the server will still be "
+msgstr ""
+
+#: alpine/imap.c:148
+msgid ""
+"alive at the end of this process, and your connection will proceed from "
+"there."
+msgstr ""
+
+#: alpine/imap.c:151
+msgid "Create a password file in order to save the login information"
+msgstr ""
+
+#: alpine/imap.c:152
+msgid ""
+"</P><P> Although your version of Alpine was compiled with password file "
+"support, this has not been set up yet. "
+msgstr ""
+
+#: alpine/imap.c:153 alpine/imap.c:185
+msgid ""
+"as a result, the next time you open this folder, you will go through this "
+"process once again.\n"
+"\n"
+msgstr ""
+
+#: alpine/imap.c:156
+msgid ""
+"</P><P> Your version of Alpine was not built with password file support, as "
+"a result you will not be able to save your "
+msgstr ""
+
+#: alpine/imap.c:157 alpine/imap.c:193
+msgid ""
+"access token, which means that you will have to repeat this process the next "
+"time you login to this server. "
+msgstr ""
+
+#: alpine/imap.c:158 alpine/imap.c:196
+msgid ""
+"You can fix this by either recompiling alpine with password file support or "
+"by downloading a version of Alpine to your "
+msgstr ""
+
+#: alpine/imap.c:159
+msgid "computer that was compiled with password file support."
+msgstr ""
+
+#: alpine/imap.c:169
+msgid ""
+" Once you have authorized Alpine, you will be asked if you want to preserve "
+"the Refresh Token and Access Code. "
+msgstr ""
+
+#: alpine/imap.c:173
+msgid ""
+"If you do not wish to repeat this process again, answer 'Y'es. If you did "
+"this process quickly, your connection "
+msgstr ""
+
+#: alpine/imap.c:177
+msgid ""
+"to the server will still be alive at the end of this process, and your "
+"connection will proceed from there.\n"
+"\n"
+msgstr ""
+
+#: alpine/imap.c:182
+msgid ""
+" Although your version of Alpine was compiled with password file support, "
+"this has not been set up yet. "
+msgstr ""
+
+#: alpine/imap.c:190
+msgid ""
+"Your version of Alpine was not built with password file support, as a result "
+"you will not be able to save your "
+msgstr ""
+
+#: alpine/imap.c:199
+msgid ""
+"computer that was compiled with password file support.\n"
+"\n"
+msgstr ""
+
+#: alpine/imap.c:256 alpine/imap.c:296
+msgid "Please select below the authorization flow you would like to follow:"
+msgstr ""
+
+#: alpine/imap.c:282
+msgid "SELECT AUTHORIZATION FLOW"
+msgstr ""
+
+#: alpine/imap.c:283
+msgid "xoauth2"
+msgstr ""
+
+#: alpine/imap.c:297
 #, c-format
-msgid "Alert received while accessing \"%s\":  %s"
+msgid ""
+"Please select the client-id to use from the following list.\n"
+"\n"
 msgstr ""
 
-#. TRANSLATORS: when logging in, this text is added to the prompt to show
-#. 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:345
-msgid " (INSECURE)"
+#: alpine/imap.c:305
+msgid "Enter your selection number: "
 msgstr ""
 
-#. TRANSLATORS: Retrying is shown when the user is being asked for a password
-#. after having already failed at least once.
-#: alpine/imap.c:348
-msgid "Retrying - "
+#: alpine/imap.c:385 alpine/imap.c:550
+#, c-format
+msgid "<CENTER>Authorizing Alpine Access to %s Email Services</CENTER>"
+msgstr ""
+
+#: alpine/imap.c:387 alpine/imap.c:552
+#, c-format
+msgid ""
+"<P>Alpine is attempting to log you into your %s account, using the %s method."
+msgstr ""
+
+#: alpine/imap.c:392
+#, c-format
+msgid ""
+"</P><P>To sign in, use a web browser to open the page  <A HREF=\"%s\">%s</A> "
+"and enter the code \"%s\" without the quotes."
+msgstr ""
+
+#: alpine/imap.c:400 alpine/imap.c:576
+msgid ""
+"</P><P> Alpine will try to use your URL Viewers setting to find a browser to "
+"open this URL."
+msgstr ""
+
+#: alpine/imap.c:401 alpine/imap.c:577
+#, c-format
+msgid ""
+" When you open this link, you will be sent to %s's servers to complete this "
+"process."
+msgstr ""
+
+#: alpine/imap.c:403 alpine/imap.c:579
+msgid ""
+" Alternatively, you can copy and paste the previous link and open it with "
+"the browser of your choice."
+msgstr ""
+
+#: alpine/imap.c:405
+msgid ""
+"</P><P> After you open the previous link, please enter the code above, and "
+"then you will be asked to authenticate and later "
+msgstr ""
+
+#: alpine/imap.c:406
+msgid "to grant access to Alpine to your data. "
+msgstr ""
+
+#: alpine/imap.c:410
+msgid ""
+" </P><P>If you do not wish to proceed, cancel at any time by pressing 'E' to "
+"exit"
+msgstr ""
+
+#: alpine/imap.c:411
+msgid "</P></HTML>"
+msgstr ""
+
+#: alpine/imap.c:430 alpine/imap.c:608 alpine/imap.c:2593 alpine/imap.c:2895
+#: alpine/help.c:236
+msgid "help text"
+msgstr ""
+
+#: alpine/imap.c:431 alpine/imap.c:609
+msgid "SETTING UP XOAUTH2 AUTHORIZATION"
+msgstr ""
+
+#: alpine/imap.c:439 alpine/imap.c:617
+msgid "HELP FOR SETTING UP XOAUTH2"
+msgstr ""
+
+#: alpine/imap.c:467
+#, c-format
+msgid ""
+"Authorizing Alpine Access to %s Email Services\n"
+"\n"
+msgstr ""
+
+#: alpine/imap.c:471
+#, c-format
+msgid ""
+"Alpine is attempting to log you into your %s account, using the %s method. "
+msgstr ""
+
+#: alpine/imap.c:476
+#, c-format
+msgid ""
+"To sign in, user a web browser to open the page %s and enter the code \"%s\" "
+"without the quotes.\n"
+"\n"
+msgstr ""
+
+#: alpine/imap.c:487 alpine/imap.c:674
+#, c-format
+msgid ""
+"Copy and paste the previous URL into a web browser that supports javascript, "
+"to take you to %s's servers to complete this process.\n"
+"\n"
+msgstr ""
+
+#: alpine/imap.c:491
+msgid ""
+"After you open the previous link, please enter the code above, and then you "
+"will be asked to authenticate and later "
+msgstr ""
+
+#: alpine/imap.c:495
+msgid ""
+"to grant access to Alpine to your data.\n"
+"\n"
+msgstr ""
+
+#: alpine/imap.c:502 alpine/imap.c:701
+msgid "Alpine would like to get authorization to access your email. Proceed "
+msgstr ""
+
+#: alpine/imap.c:510
+msgid ""
+"After you are done going through the process described above, press 'y' to "
+"continue, or 'n' to cancel\n"
+msgstr ""
+
+#: alpine/imap.c:518
+msgid "Continue waiting"
+msgstr ""
+
+#: alpine/imap.c:556
+msgid ""
+" If this is your first time setting up this type of authentication, please "
+"follow the steps below. "
+msgstr ""
+
+#: alpine/imap.c:557
+msgid ""
+"</P><P> First you must register Alpine with Google and create a client-id "
+"and client-secret. If you already did that, then you can skip to the "
+"authorization step, and continue with the process outlined below."
+msgstr ""
+
+#: alpine/imap.c:558
+msgid "<UL> "
+msgstr ""
+
+#: alpine/imap.c:559
+msgid ""
+"<LI>First, login to <A HREF=\"https://console.developers.google.com"
+"\">https://console.developers.google.com</A> "
+msgstr ""
+
+#: alpine/imap.c:560
+msgid "and create a project. The name of the project is not important."
+msgstr ""
+
+#: alpine/imap.c:561
+msgid ""
+"<LI> Go to the Consent Screen and make your app INTERNAL, if your account is "
+"a G-Suite account, or EXTERNAL if it is a personal gmail.com account."
+msgstr ""
+
+#: alpine/imap.c:562
+msgid "<LI> Create OAUTH Credentials."
+msgstr ""
+
+#: alpine/imap.c:563
+msgid "</UL> "
+msgstr ""
+
+#: alpine/imap.c:564
+msgid ""
+"<P> As a result of this process, you will get a client-id and a client-"
+"secret."
+msgstr ""
+
+#: alpine/imap.c:565
+msgid ""
+" Exit this screen, and from Alpine's Main Screen press S U to save these "
+"values permanently."
+msgstr ""
+
+#: alpine/imap.c:566
+msgid ""
+" Then retry login into Gmail's server, skip these steps, and continue with "
+"the steps below."
+msgstr ""
+
+#: alpine/imap.c:567
+msgid ""
+"</P><P> Cancelling this process will lead to an error in authentication that "
+"can be ignored."
+msgstr ""
+
+#: alpine/imap.c:568
+msgid ""
+"</P><P> If you completed these steps successfully, you are ready to move to "
+"the second part, where you will authorize Gmail to give access to Alpine to "
+"access your email."
+msgstr ""
+
+#: alpine/imap.c:571
+msgid ""
+"</P><P>In order to authorize Alpine to access your email, Alpine needs to "
+"open the following URL:"
+msgstr ""
+
+#: alpine/imap.c:573
+#, c-format
+msgid "<A HREF=\"%s\">%s</A>"
+msgstr ""
+
+#: alpine/imap.c:581
+msgid ""
+"</P><P> After you open the previous link, you will be asked to authenticate "
+"and later to authorize access to Alpine. "
+msgstr ""
+
+#: alpine/imap.c:582
+msgid ""
+" At the end of this process, you will be given an access code or redirected "
+"to a web page."
+msgstr ""
+
+#: alpine/imap.c:583 alpine/imap.c:686
+msgid ""
+" If you see a code, copy it and then press 'C', and enter the code at the "
+"prompt."
+msgstr ""
+
+#: alpine/imap.c:584 alpine/imap.c:690
+msgid ""
+" If you do not see a code, copy the url of the page you were redirected to "
+"and again press 'C' and copy and paste it into the prompt. "
+msgstr ""
+
+#: alpine/imap.c:588
+msgid " If you do not wish to proceed, cancel by pressing 'E' to exit"
+msgstr ""
+
+#: alpine/imap.c:589
+msgid "</P></BODY></HTML>"
+msgstr ""
+
+#. TRANSLATORS: user needs to input an access code from the server
+#: alpine/imap.c:650 alpine/imap.c:2987
+msgid "Copy and Paste Access Code"
+msgstr ""
+
+#: alpine/imap.c:658
+#, c-format
+msgid ""
+"Auhtorizing Alpine Access to %s Email Services\n"
+"\n"
+msgstr ""
+
+#: alpine/imap.c:662
+#, c-format
+msgid ""
+"Alpine is attempting to log you into your %s account, using the %s method."
+msgstr ""
+
+#: alpine/imap.c:666
+msgid " In order to do that, Alpine needs to open the following URL:"
+msgstr ""
+
+#: alpine/imap.c:678
+msgid ""
+"After you open the previous link, you will be asked to authenticate and "
+"later to authorize access to Alpine."
+msgstr ""
+
+#: alpine/imap.c:682
+msgid ""
+" At the end of this process, you will be given an access code or redirected "
+"to a web page.\n"
+msgstr ""
+
+#: alpine/imap.c:696
+msgid ""
+" Once you have completed this process,  Alpine will proceed with "
+"authentication.\n"
 msgstr ""
 
 #. TRANSLATORS: A label for the hostname that the user is logging in on
-#: alpine/imap.c:350
+#: alpine/imap.c:783 alpine/imap.c:1455
 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:353
+#: alpine/imap.c:786 alpine/imap.c:1458
 msgid "USER"
 msgstr ""
 
+#: alpine/imap.c:886
+#, c-format
+msgid "%s does not support or recognize flow type \"%s\". Use %s%s%s"
+msgstr ""
+
+#: alpine/imap.c:1281
+#, c-format
+msgid "Alert received while accessing \"%s\":  %s"
+msgstr ""
+
+#. TRANSLATORS: when logging in, this text is added to the prompt to show
+#. 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:1450
+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:1453
+msgid "Retrying - "
+msgstr ""
+
 #. TRANSLATORS: user is being asked to type in their login name
-#: alpine/imap.c:610
+#: alpine/imap.c:1719
 msgid "ENTER LOGIN NAME"
 msgstr ""
 
 #. TRANSLATORS: An abbreviated form of ENTER LOGIN NAME because
 #. longer version doesn't fit on screen
-#: alpine/imap.c:644
+#: alpine/imap.c:1753
 msgid "LOGIN"
 msgstr ""
 
 #. TRANSLATORS: user is being asked to type in their password
-#: alpine/imap.c:866
+#: alpine/imap.c:1973
 msgid "ENTER PASSWORD"
 msgstr ""
 
 #. TRANSLATORS: An abbreviated form of ENTER PASSWORD
-#: alpine/imap.c:917
+#: alpine/imap.c:2024
 msgid "PASSWORD"
 msgstr ""
 
-#: alpine/imap.c:1216
+#: alpine/imap.c:2332
 #, c-format
 msgid "No reply in %s seconds from server %s. Break connection"
 msgstr ""
 
-#: alpine/imap.c:1280
+#: alpine/imap.c:2406
 #, c-format
 msgid "No reply in %s seconds from server %s. Break connection?"
 msgstr ""
 
-#: alpine/imap.c:1300
+#: alpine/imap.c:2426
 #, c-format
 msgid "No reply in %s seconds from server %s. Still Waiting..."
 msgstr ""
 
-#: alpine/imap.c:1393
+#: alpine/imap.c:2519
 msgid "There was a failure validating the SSL/TLS certificate for the server"
 msgstr ""
 
-#: alpine/imap.c:1400 alpine/imap.c:1661
+#: alpine/imap.c:2526 alpine/imap.c:2789
 msgid "The reason for the failure was"
 msgstr ""
 
-#: alpine/imap.c:1423
+#: alpine/imap.c:2549
 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:1426
+#: alpine/imap.c:2552
 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:1433
+#: alpine/imap.c:2559
 msgid ""
 "to the name of the folder you attempted to access. In other words, wherever "
 "you see the characters"
 msgstr ""
 
-#: alpine/imap.c:1440 alpine/imap.c:1731
+#: alpine/imap.c:2566 alpine/imap.c:2859
 msgid "in your configuration, replace those characters with"
 msgstr ""
 
-#: alpine/imap.c:1448
+#: alpine/imap.c:2574
 msgid ""
 "Answer \"Yes\" to ignore the warning and continue, \"No\" to cancel the open "
 "of this folder."
 msgstr ""
 
-#: alpine/imap.c:1467 alpine/imap.c:1767 alpine/help.c:200
-msgid "help text"
-msgstr ""
-
-#: alpine/imap.c:1468
+#: alpine/imap.c:2594
 msgid "SSL/TLS CERTIFICATE VALIDATION FAILURE"
 msgstr ""
 
-#: alpine/imap.c:1476
+#: alpine/imap.c:2602
 msgid "HELP FOR CERT VALIDATION FAILURE"
 msgstr ""
 
-#: alpine/imap.c:1503
+#: alpine/imap.c:2631
 msgid "SSL/TLS certificate validation failure"
 msgstr ""
 
-#: alpine/imap.c:1506
+#: alpine/imap.c:2634
 msgid ": Continue anyway "
 msgstr ""
 
-#: alpine/imap.c:1513
+#: alpine/imap.c:2641
 #, c-format
 msgid "Open of %s cancelled"
 msgstr ""
 
-#: alpine/imap.c:1535
+#: alpine/imap.c:2663
 #, c-format
 msgid "Rename newsrc \"%s%s\" for use as new host-specific newsrc"
 msgstr ""
 
-#: alpine/imap.c:1555
+#: alpine/imap.c:2683
 msgid "Error allocating space for details."
 msgstr ""
 
-#: alpine/imap.c:1559
+#: alpine/imap.c:2687
 msgid ""
 "Host given by user:\n"
 "\n"
 "  "
 msgstr ""
 
-#: alpine/imap.c:1561
+#: alpine/imap.c:2689
 msgid ""
 "\n"
 "\n"
@@ -9280,7 +10036,7 @@ msgid ""
 "  "
 msgstr ""
 
-#: alpine/imap.c:1563
+#: alpine/imap.c:2691
 msgid ""
 "\n"
 "\n"
@@ -9288,24 +10044,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: alpine/imap.c:1573
+#: alpine/imap.c:2701
 msgid "CERT VALIDATION DETAILS"
 msgstr ""
 
-#: alpine/imap.c:1578
+#: alpine/imap.c:2706
 msgid "HELP FOR CERT VALIDATION DETAILS"
 msgstr ""
 
-#: alpine/imap.c:1625
+#: alpine/imap.c:2753
 #, c-format
 msgid "SSL/TLS failure for %s: %s"
 msgstr ""
 
-#: alpine/imap.c:1638
+#: alpine/imap.c:2766
 msgid "There was an SSL/TLS failure for the server"
 msgstr ""
 
-#: alpine/imap.c:1684
+#: alpine/imap.c:2812
 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 "
@@ -9313,390 +10069,406 @@ msgid ""
 "want to add the option"
 msgstr ""
 
-#: alpine/imap.c:1707
+#: alpine/imap.c:2835
 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:1758
+#: alpine/imap.c:2886
 msgid "Type RETURN to continue."
 msgstr ""
 
-#: alpine/imap.c:1768
+#: alpine/imap.c:2896
 msgid "SSL/TLS FAILURE"
 msgstr ""
 
-#: alpine/imap.c:1776
+#: alpine/imap.c:2904
 msgid "HELP FOR TLS/SSL FAILURE"
 msgstr ""
 
-#: alpine/imap.c:2685
+#: alpine/imap.c:4047
 msgid "Erase previously preserved passwords"
 msgstr ""
 
-#: alpine/imap.c:2750 alpine/imap.c:2764
+#: alpine/imap.c:4120 alpine/imap.c:4145
 msgid "Preserve password for next login"
 msgstr ""
 
-#: alpine/imap.c:2770
+#: alpine/imap.c:4121 alpine/imap.c:4146
+msgid "Preserve Refresh and Access tokens for next login"
+msgstr ""
+
+#: alpine/imap.c:4158
 msgid "Stop \"Preserve passwords?\" prompts by deleting Alpine Keychain entry"
 msgstr ""
 
-#: alpine/imap.c:2777
+#: alpine/imap.c:4165
 msgid ""
 "Restart \"Preserve passwords?\" prompts by deleting Alpine Keychain entry"
 msgstr ""
 
-#: alpine/imap.c:2790
+#: alpine/imap.c:4171
 msgid "Preserve password on DISK for next login"
 msgstr ""
 
-#: alpine/help.c:225 pico/display.c:2236
+#: alpine/imap.c:4172
+msgid "Preserve Refresh and Access tokens on DISK for next login"
+msgstr ""
+
+#: alpine/help.c:137
+msgid "Retrieving help text"
+msgstr ""
+
+#: alpine/help.c:145
+msgid "Failed to retrieve help text. Try again later."
+msgstr ""
+
+#: alpine/help.c:261 pico/display.c:2227
 msgid "HELP"
 msgstr ""
 
-#: alpine/help.c:236
+#: alpine/help.c:272
 msgid "HELP TEXT"
 msgstr ""
 
-#: alpine/help.c:244
+#: alpine/help.c:280
 msgid "HELP FOR HELP TEXT"
 msgstr ""
 
-#: alpine/help.c:253 alpine/help.c:264
+#: alpine/help.c:289 alpine/help.c:300
 msgid "Prev Help"
 msgstr ""
 
-#: alpine/help.c:258 alpine/help.c:273 pico/bind.c:179
+#: alpine/help.c:294 alpine/help.c:309 pico/bind.c:175
 msgid "Exit Help"
 msgstr ""
 
 #. TRANSLATORS: this is the label of a command where
 #. the user is asking for Help about the Help command
-#: alpine/help.c:280
+#: alpine/help.c:316
 msgid "Help Help"
 msgstr ""
 
-#: alpine/help.c:458
+#: alpine/help.c:500
 msgid "View Link"
 msgstr ""
 
-#: alpine/help.c:510
+#: alpine/help.c:552
 #, c-format
 msgid "Printing Error: %s"
 msgstr ""
 
-#: alpine/help.c:523
+#: alpine/help.c:565
 msgid "all 150+ pages of help text"
 msgstr ""
 
-#: alpine/help.c:528
+#: alpine/help.c:570
 msgid "Print of all help cancelled"
 msgstr ""
 
-#: alpine/help.c:619
+#: alpine/help.c:661
 msgid "HELP SUB-SECTION"
 msgstr ""
 
-#: alpine/help.c:627 alpine/help.c:652
+#: alpine/help.c:669 alpine/help.c:694
 #, c-format
 msgid "Unrecognized Internal help: \"%s\""
 msgstr ""
 
 #. TRANSLATORS: Help for configuration
-#: alpine/help.c:642
+#: alpine/help.c:684
 msgid "HELP CONFIG"
 msgstr ""
 
 #. TRANSLATORS: command label asking pine to include time stamps in output
-#: alpine/help.c:671
+#: alpine/help.c:713
 msgid "Timestamps"
 msgstr ""
 
 #. TRANSLATORS: do not include time stamps in output
-#: alpine/help.c:673
+#: alpine/help.c:715
 msgid "NoTimestamps"
 msgstr ""
 
-#: alpine/help.c:692
+#: alpine/help.c:734
 msgid "Failed allocating memory"
 msgstr ""
 
-#: alpine/help.c:696
+#: alpine/help.c:738
 msgid "Turning off new messages while reviewing"
 msgstr ""
 
-#: alpine/help.c:745
+#: alpine/help.c:787
 msgid "**** Journal entries prior to this point have been trimmed. ****\n"
 msgstr ""
 
-#: alpine/help.c:753
+#: alpine/help.c:795
 msgid "**** Debug 0-4 entries prior to this point have been trimmed. ****\n"
 msgstr ""
 
-#: alpine/help.c:761
+#: alpine/help.c:803
 msgid "**** Debug 5-9 entries prior to this point have been trimmed. ****\n"
 msgstr ""
 
-#: alpine/help.c:835
+#: alpine/help.c:877
 msgid "journal"
 msgstr ""
 
 #. TRANSLATORS: these are some screen titles
-#: alpine/help.c:847
+#: alpine/help.c:889
 msgid "HELP FOR DEBUG JOURNAL"
 msgstr ""
 
-#: alpine/help.c:849
+#: alpine/help.c:891
 msgid "REVIEW DEBUGGING"
 msgstr ""
 
-#: alpine/help.c:852 alpine/help.c:859
+#: alpine/help.c:894 alpine/help.c:901
 msgid "HELP FOR JOURNAL"
 msgstr ""
 
-#: alpine/help.c:854 alpine/help.c:861
+#: alpine/help.c:896 alpine/help.c:903
 msgid "REVIEW RECENT MESSAGES"
 msgstr ""
 
 #. TRANSLATORS: shows what numeric level Debug output is displayed at
-#: alpine/help.c:871
+#: alpine/help.c:913
 #, c-format
 msgid "Debug (%d)"
 msgstr ""
 
 #. TRANSLATORS: include debug output in journal
-#: alpine/help.c:874
+#: alpine/help.c:916
 msgid "DebugView"
 msgstr ""
 
-#: alpine/help.c:941
+#: alpine/help.c:983
 msgid "COMPOSE TO LOCAL SUPPORT"
 msgstr ""
 
-#: alpine/help.c:948
+#: alpine/help.c:990
 msgid "REQUEST FOR ASSISTANCE"
 msgstr ""
 
-#: alpine/print.c:68
+#: alpine/print.c:64
 msgid "Exception Setup not implemented for printer"
 msgstr ""
 
-#: alpine/print.c:113
+#: alpine/print.c:109
 msgid "You may \"Select\" a print command as your default printer."
 msgstr ""
 
-#: alpine/print.c:126
+#: alpine/print.c:122
 msgid "You may also add custom print commands to the list in the"
 msgstr ""
 
-#: alpine/print.c:139
+#: alpine/print.c:135
 msgid "\"Personally selected print command\" section below."
 msgstr ""
 
-#: alpine/print.c:172
+#: alpine/print.c:168
 msgid " Printer attached to IBM PC or compatible, Macintosh"
 msgstr ""
 
-#: alpine/print.c:184
+#: alpine/print.c:180
 msgid "This may not work with all attached printers, and will depend on the"
 msgstr ""
 
-#: alpine/print.c:194
+#: alpine/print.c:190
 msgid "terminal emulation/communications software in use. It is known to work"
 msgstr ""
 
-#: alpine/print.c:289
+#: alpine/print.c:285
 msgid " Standard UNIX print command"
 msgstr ""
 
-#: alpine/print.c:306
+#: alpine/print.c:302
 msgid "Using this option may require setting your \"PRINTER\" or \"LPDEST\""
 msgstr ""
 
-#: alpine/print.c:321
+#: alpine/print.c:317
 msgid "environment variable using the standard UNIX utilities."
 msgstr ""
 
-#: alpine/print.c:336 alpine/print.c:463 alpine/print.c:483
+#: alpine/print.c:332 alpine/print.c:459 alpine/print.c:479
 msgid "Printer List:"
 msgstr ""
 
-#: alpine/print.c:369
+#: alpine/print.c:365
 msgid " Personally selected print command"
 msgstr ""
 
-#: alpine/print.c:387
+#: alpine/print.c:383
 msgid "The text to be printed will be piped into the command given here. The"
 msgstr ""
 
-#: alpine/print.c:402
+#: alpine/print.c:398
 msgid ""
 "command is in the 2nd column, the printer name is in the first column. Some"
 msgstr ""
 
-#: alpine/print.c:417
+#: alpine/print.c:413
 msgid ""
 "examples are: \"prt\", \"lpr\", \"lp\", or \"enscript\". The command may be "
 "given"
 msgstr ""
 
-#: alpine/print.c:432
+#: alpine/print.c:428
 msgid "with options, for example \"enscript -2 -r\" or \"lpr -Plpacc170\". The"
 msgstr ""
 
-#: alpine/print.c:447
+#: alpine/print.c:443
 msgid ""
 "commands and options on your system may be different from these examples."
 msgstr ""
 
-#: alpine/print.c:498
+#: alpine/print.c:494
 msgid "SETUP PRINTER EXCEPTIONS"
 msgstr ""
 
-#: alpine/print.c:499
+#: alpine/print.c:495
 msgid "SETUP PRINTER"
 msgstr ""
 
-#: alpine/print.c:500
+#: alpine/print.c:496
 msgid "printer config"
 msgstr ""
 
-#: alpine/print.c:604 alpine/print.c:617 alpine/print.c:630 alpine/print.c:643
-#: alpine/print.c:656
+#: alpine/print.c:600 alpine/print.c:613 alpine/print.c:626 alpine/print.c:639
+#: alpine/print.c:652
 msgid "Trouble setting default printer"
 msgstr ""
 
-#: alpine/print.c:739
+#: alpine/print.c:735
 msgid "Enter printer name : "
 msgstr ""
 
-#: alpine/print.c:771 alpine/print.c:790
+#: alpine/print.c:767 alpine/print.c:786
 msgid "Enter name of printer to be added : "
 msgstr ""
 
-#: alpine/print.c:777
+#: alpine/print.c:773
 msgid "Enter the name for replacement printer : "
 msgstr ""
 
-#: alpine/print.c:838
+#: alpine/print.c:834
 msgid "Enter command for printer : "
 msgstr ""
 
-#: alpine/print.c:878 alpine/print.c:1047
+#: alpine/print.c:874 alpine/print.c:1043
 msgid "No commas allowed in command"
 msgstr ""
 
-#: alpine/print.c:941
+#: alpine/print.c:937
 #, c-format
 msgid "Delete (unused) printer %s "
 msgstr ""
 
-#: alpine/print.c:947
+#: alpine/print.c:943
 #, c-format
 msgid "Really delete item %s from printer list "
 msgstr ""
 
-#: alpine/print.c:959
+#: alpine/print.c:955
 msgid "Printer not deleted"
 msgstr ""
 
-#: alpine/print.c:986 pith/mailcmd.c:130
+#: alpine/print.c:982 pith/mailcmd.c:126
 msgid "Command"
 msgstr ""
 
-#: alpine/print.c:990
+#: alpine/print.c:986
 msgid "Options"
 msgstr ""
 
 #. TRANSLATORS: this is a question with three choices
-#: alpine/print.c:993
+#: alpine/print.c:989
 msgid "Change Name or Command or Options ? "
 msgstr ""
 
-#: alpine/print.c:1008
+#: alpine/print.c:1004
 msgid "Change command : "
 msgstr ""
 
-#: alpine/print.c:1071
+#: alpine/print.c:1067
 msgid "Change name : "
 msgstr ""
 
-#: alpine/print.c:1125
+#: alpine/print.c:1121
 msgid "Init"
 msgstr ""
 
-#: alpine/print.c:1129
+#: alpine/print.c:1125
 msgid "Trailer"
 msgstr ""
 
-#: alpine/print.c:1131
+#: alpine/print.c:1127
 msgid "Change Init string or Trailer string ? "
 msgstr ""
 
-#: alpine/print.c:1147
+#: alpine/print.c:1143
 #, c-format
 msgid "Change INIT string : "
 msgstr ""
 
-#: alpine/print.c:1149
+#: alpine/print.c:1145
 #, c-format
 msgid "Change TRAILER string : "
 msgstr ""
 
-#: alpine/smime.c:85 pith/smime.c:882
+#: alpine/smime.c:83 pith/smime.c:861
 #, c-format
 msgid "Enter passphrase for <%s>: "
 msgstr ""
 
-#: alpine/smime.c:206
+#: alpine/smime.c:205
 msgid "Can't fetch body of message."
 msgstr ""
 
-#: alpine/smime.c:218
+#: alpine/smime.c:217
 msgid "Can only view one message's information at a time."
 msgstr ""
 
-#: alpine/smime.c:249 pith/smime.c:3153 pith/smime.c:3324
+#: alpine/smime.c:248 pith/smime.c:3189 pith/smime.c:3359
 msgid "This message was cryptographically signed."
 msgstr ""
 
-#: alpine/smime.c:258
+#: alpine/smime.c:257
 #, c-format
 msgid "Certificate%s used for signing"
 msgstr ""
 
-#: alpine/smime.c:283 pith/smime.c:3337
+#: alpine/smime.c:282 pith/smime.c:3372
 msgid "This message was encrypted."
 msgstr ""
 
-#: alpine/smime.c:293
+#: alpine/smime.c:292
 msgid "The algorithm used to encrypt was "
 msgstr ""
 
-#: alpine/smime.c:306
+#: alpine/smime.c:305
 #, c-format
 msgid "Certificate%s for decrypting"
 msgstr ""
 
-#: alpine/smime.c:337
+#: alpine/smime.c:336
 msgid "No certificate capable of decrypting could be found."
 msgstr ""
 
-#: alpine/smime.c:715
+#: alpine/smime.c:714
 msgid "SETUP S/MIME EXCEPTIONS"
 msgstr ""
 
-#: alpine/smime.c:716
+#: alpine/smime.c:715
 msgid "SETUP S/MIME"
 msgstr ""
 
-#: alpine/smime.c:733
+#: alpine/smime.c:732
 msgid "conf_scroll_screen bad ret in smime_config"
 msgstr ""
 
-#: alpine/smime.c:882
+#: alpine/smime.c:881
 msgid "Mac OS X specific features"
 msgstr ""
 
@@ -9737,211 +10509,235 @@ msgstr ""
 msgid "Transfer public certs FROM keychain TO container"
 msgstr ""
 
-#: alpine/smime.c:1004
+#: alpine/smime.c:1005
 msgid "Manage your own certificates"
 msgstr ""
 
-#: alpine/smime.c:1018
+#: alpine/smime.c:1019
 msgid "Manage Public Certificates"
 msgstr ""
 
-#: alpine/smime.c:1027
+#: alpine/smime.c:1028
 msgid "Manage Private Keys"
 msgstr ""
 
-#: alpine/smime.c:1036
+#: alpine/smime.c:1037
 msgid "Manage Certificate Authorities"
 msgstr ""
 
-#: alpine/smime.c:1050
+#: alpine/smime.c:1051
 msgid "Manage Key and Certificate for Password File"
 msgstr ""
 
-#: alpine/smime.c:1064
+#: alpine/smime.c:1065
 msgid "Manage Password File Key and Certificate"
 msgstr ""
 
-#: alpine/smime.c:1093 alpine/smime.c:1099
+#: alpine/smime.c:1095 alpine/smime.c:1101
 msgid "No Priv Key"
 msgstr ""
 
-#: alpine/smime.c:1093 alpine/smime.c:1099
+#: alpine/smime.c:1095 alpine/smime.c:1101
 msgid "Pivate Key"
 msgstr ""
 
-#: alpine/smime.c:1130 alpine/smime.c:1323
+#: alpine/smime.c:1132 alpine/smime.c:1392
 msgid "Certificate already deleted"
 msgstr ""
 
-#: alpine/smime.c:1133 alpine/smime.c:1328
+#: alpine/smime.c:1135 alpine/smime.c:1397
 msgid "Certificate marked deleted"
 msgstr ""
 
-#: alpine/smime.c:1140 alpine/smime.c:1339
+#: alpine/smime.c:1142 alpine/smime.c:1409
 msgid "Certificate marked UNdeleted"
 msgstr ""
 
-#: alpine/smime.c:1143 alpine/smime.c:1334
+#: alpine/smime.c:1145 alpine/smime.c:1404
 msgid "Certificate not marked deleted"
 msgstr ""
 
-#: alpine/smime.c:1151
+#: alpine/smime.c:1153
 msgid "Problem Reading Private Certificate Information"
 msgstr ""
 
-#: alpine/smime.c:1158
+#: alpine/smime.c:1160
 msgid "Certificate Information"
 msgstr ""
 
-#: alpine/smime.c:1168
+#: alpine/smime.c:1170
 #, c-format
 msgid "Error validating certificate: %s"
 msgstr ""
 
-#: alpine/smime.c:1170
+#: alpine/smime.c:1172
 msgid "Certificate validated without errors"
 msgstr ""
 
-#: alpine/smime.c:1183
+#: alpine/smime.c:1185
 #, c-format
 msgid "%s information shown at bottom of certificate information"
 msgstr ""
 
-#: alpine/smime.c:1183 alpine/smime.c:1661 pith/smkeys.c:868
+#: alpine/smime.c:1185 alpine/smime.c:1754 pith/smkeys.c:910
 msgid "Public"
 msgstr ""
 
-#: alpine/smime.c:1183 alpine/smime.c:1661 pith/smkeys.c:868
+#: alpine/smime.c:1185 alpine/smime.c:1754 pith/smkeys.c:910
 msgid "Private"
 msgstr ""
 
-#: alpine/smime.c:1207
+#: alpine/smime.c:1209
 msgid "CERTIFICATE INFORMATION"
 msgstr ""
 
-#: alpine/smime.c:1292
+#: alpine/smime.c:1289
+msgid "pathdir for key too long"
+msgstr ""
+
+#: alpine/smime.c:1302
 #, c-format
 msgid "Could not remove private key %s.key"
 msgstr ""
 
-#: alpine/smime.c:1297
+#: alpine/smime.c:1307
 #, c-format
 msgid "Could not remove public certificate %s.crt"
 msgstr ""
 
-#: alpine/smime.c:1300
+#: alpine/smime.c:1310
 #, c-format
 msgid "Could not remove temporary directory %s"
 msgstr ""
 
-#: alpine/smime.c:1312
+#: alpine/smime.c:1324
 msgid "Problem Reading Certificate"
 msgstr ""
 
-#: alpine/smime.c:1352
+#: alpine/smime.c:1346
+msgid "Enter password to unlock key: "
+msgstr ""
+
+#: alpine/smime.c:1353
+msgid "Password deletion cancelled"
+msgstr ""
+
+#: alpine/smime.c:1364
+msgid "Password Removed from private key"
+msgstr ""
+
+#: alpine/smime.c:1372
+msgid "Failed to unlock private key"
+msgstr ""
+
+#: alpine/smime.c:1380
+msgid "Failed to remove password from private key"
+msgstr ""
+
+#: alpine/smime.c:1422
 msgid "No certificates marked deleted"
 msgstr ""
 
-#: alpine/smime.c:1367
+#: alpine/smime.c:1437
 #, c-format
 msgid "Can't import certificate outside of %s"
 msgstr ""
 
-#: alpine/smime.c:1419
+#: alpine/smime.c:1492
 msgid "Failed to initialize password management screen (no key)"
 msgstr ""
 
-#: alpine/smime.c:1426
+#: alpine/smime.c:1500
 msgid "MANAGE PASSWORD FILE CERTS"
 msgstr ""
 
-#: alpine/smime.c:1473
+#: alpine/smime.c:1559
 msgid "Manage Certificates and Keys Used to Encrypt your Password File"
 msgstr ""
 
-#: alpine/smime.c:1505
+#: alpine/smime.c:1593
 msgid "New Public Certificate and Key:"
 msgstr ""
 
-#: alpine/smime.c:1515
+#: alpine/smime.c:1603
 msgid "Press \"RETURN\" to add new personal key"
 msgstr ""
 
-#: alpine/smime.c:1527
+#: alpine/smime.c:1615
 msgid "Current Public Certificate and Key:"
 msgstr ""
 
-#: alpine/smime.c:1575
+#: alpine/smime.c:1665
 #, c-format
 msgid "List of %s certificates"
 msgstr ""
 
-#: alpine/smime.c:1575 pith/smkeys.c:1386
+#: alpine/smime.c:1665 pith/smkeys.c:1451
 msgid "public"
 msgstr ""
 
-#: alpine/smime.c:1576
+#: alpine/smime.c:1666
 msgid "private"
 msgstr ""
 
-#: alpine/smime.c:1577 alpine/smime.c:1661
+#: alpine/smime.c:1667 alpine/smime.c:1754
 msgid "certificate authority"
 msgstr ""
 
-#: alpine/smime.c:1650
+#: alpine/smime.c:1742
 msgid "  \tNo certificates found, press \"RETURN\" to add one."
 msgstr ""
 
-#: alpine/smime.c:1661
+#: alpine/smime.c:1754
 msgid "unknown"
 msgstr ""
 
-#: alpine/smime.c:1682
+#: alpine/smime.c:1775
 msgid "MANAGE CERTIFICATES"
 msgstr ""
 
-#: alpine/smime.c:1703 alpine/smime.c:1781
+#: alpine/smime.c:1796 alpine/smime.c:1874
 msgid "Public certs transferred to container"
 msgstr ""
 
-#: alpine/smime.c:1705 alpine/smime.c:1716 alpine/smime.c:1727
-#: alpine/smime.c:1738 alpine/smime.c:1749 alpine/smime.c:1760
+#: alpine/smime.c:1798 alpine/smime.c:1809 alpine/smime.c:1820
+#: alpine/smime.c:1831 alpine/smime.c:1842 alpine/smime.c:1853
 msgid "Problem transferring certs"
 msgstr ""
 
-#: alpine/smime.c:1714
+#: alpine/smime.c:1807
 msgid "Public certs transferred to directory, delete Container config to use"
 msgstr ""
 
-#: alpine/smime.c:1725
+#: alpine/smime.c:1818
 msgid "Private keys transferred to container"
 msgstr ""
 
-#: alpine/smime.c:1736
+#: alpine/smime.c:1829
 msgid "Private keys transferred to directory, delete Container config to use"
 msgstr ""
 
-#: alpine/smime.c:1747
+#: alpine/smime.c:1840
 msgid "CA certs transferred to container"
 msgstr ""
 
-#: alpine/smime.c:1758
+#: alpine/smime.c:1851
 msgid "CA certs transferred to directory, delete Container config to use"
 msgstr ""
 
-#: alpine/smime.c:1770
+#: alpine/smime.c:1863
 msgid "Public certs transferred to keychain"
 msgstr ""
 
-#: alpine/smime.c:1772 alpine/smime.c:1783
+#: alpine/smime.c:1865 alpine/smime.c:1876
 msgid "Command not implemented yet"
 msgstr ""
 
-#: pico/osdep/getkey.c:112
+#: pico/osdep/getkey.c:108
 msgid "Problem reading from keyboard!"
 msgstr ""
 
-#: pico/osdep/mswin_spell.c:58 pico/osdep/spell.c:99
+#: pico/osdep/mswin_spell.c:58 pico/osdep/spell.c:95
 msgid "Checking spelling..."
 msgstr ""
 
@@ -9953,7 +10749,7 @@ msgstr ""
 msgid "Spelling: initializing Aspell failed"
 msgstr ""
 
-#: pico/osdep/mswin_spell.c:119 pico/osdep/spell.c:258
+#: pico/osdep/mswin_spell.c:119 pico/osdep/spell.c:254
 msgid "Done checking spelling"
 msgstr ""
 
@@ -9965,496 +10761,496 @@ msgstr ""
 msgid "Spelling: speller_check_word() failed"
 msgstr ""
 
-#: pico/osdep/filesys.c:302
+#: pico/osdep/filesys.c:298
 #, c-format
 msgid "File not found: \"%s\""
 msgstr ""
 
-#: pico/osdep/filesys.c:308
+#: pico/osdep/filesys.c:304
 #, c-format
 msgid "File name too long: \"%s\""
 msgstr ""
 
-#: pico/osdep/filesys.c:314
+#: pico/osdep/filesys.c:310
 #, c-format
 msgid "Error getting file info: \"%s\""
 msgstr ""
 
-#: pico/osdep/filesys.c:328 pico/browse.c:1038
+#: pico/osdep/filesys.c:334 pico/browse.c:1055
 #, c-format
 msgid "Not a directory: \"%s\""
 msgstr ""
 
-#: pico/osdep/filesys.c:336
+#: pico/osdep/filesys.c:342
 #, c-format
 msgid "Can't malloc space for file names"
 msgstr ""
 
-#: pico/osdep/filesys.c:345
+#: pico/osdep/filesys.c:351
 #, c-format
 msgid "Can't open \"%s\": %s"
 msgstr ""
 
-#: pico/osdep/filesys.c:401
+#: pico/osdep/filesys.c:407
 #, c-format
 msgid "Can't malloc enough space for file names"
 msgstr ""
 
-#: pico/osdep/filesys.c:443
+#: pico/osdep/filesys.c:449
 #, c-format
 msgid "File \"%s\" not found"
 msgstr ""
 
-#: pico/osdep/filesys.c:446
+#: pico/osdep/filesys.c:452
 #, c-format
 msgid "End of file \"%s\" reached"
 msgstr ""
 
-#: pico/osdep/filesys.c:449
+#: pico/osdep/filesys.c:455
 #, c-format
 msgid "File name \"%s\" too long"
 msgstr ""
 
-#: pico/osdep/filesys.c:452
+#: pico/osdep/filesys.c:458
 #, c-format
 msgid "File \"%s\" is a directory"
 msgstr ""
 
-#: pico/osdep/filesys.c:455 pico/osdep/filesys.c:813
+#: pico/osdep/filesys.c:461 pico/osdep/filesys.c:819
 #, c-format
 msgid "Write permission denied: %s"
 msgstr ""
 
-#: pico/osdep/filesys.c:458 pico/osdep/filesys.c:790
+#: pico/osdep/filesys.c:464 pico/osdep/filesys.c:796
 #, c-format
 msgid "Read permission denied: %s"
 msgstr ""
 
-#: pico/osdep/filesys.c:461
+#: pico/osdep/filesys.c:467
 #, c-format
 msgid "Permission denied: %s"
 msgstr ""
 
-#: pico/osdep/filesys.c:464
+#: pico/osdep/filesys.c:470
 #, c-format
 msgid "Execute permission denied: %s"
 msgstr ""
 
-#: pico/osdep/filesys.c:467
+#: pico/osdep/filesys.c:473
 #, c-format
 msgid "File I/O error: %s"
 msgstr ""
 
-#: pico/osdep/filesys.c:796 pico/osdep/filesys.c:819
+#: pico/osdep/filesys.c:802 pico/osdep/filesys.c:825
 #, c-format
 msgid "Can't copy: %s is a directory"
 msgstr ""
 
-#: pico/osdep/filesys.c:806
+#: pico/osdep/filesys.c:812
 #, c-format
 msgid "Can't Copy: %s"
 msgstr ""
 
-#: pico/osdep/filesys.c:824
+#: pico/osdep/filesys.c:830
 msgid "Identical files.  File not copied"
 msgstr ""
 
-#: pico/osdep/filesys.c:942
+#: pico/osdep/filesys.c:948
 #, c-format
 msgid "Error preparing to close file: %s"
 msgstr ""
 
-#: pico/osdep/filesys.c:948
+#: pico/osdep/filesys.c:954
 #, 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
+#: pico/osdep/spell.c:46 pico/osdep/spell.c:64
 msgid "Spell Check Help"
 msgstr ""
 
-#: pico/osdep/spell.c:52
+#: pico/osdep/spell.c:48
 msgid "        The spell checker examines all words in the text.  It then"
 msgstr ""
 
-#: pico/osdep/spell.c:53
+#: pico/osdep/spell.c:49
 msgid "        offers each misspelled word for correction while simultaneously"
 msgstr ""
 
-#: pico/osdep/spell.c:54
+#: pico/osdep/spell.c:50
 msgid "        highlighting it in the text.  To leave a word unchanged simply"
 msgstr ""
 
-#: pico/osdep/spell.c:55
+#: pico/osdep/spell.c:51
 msgid ""
 "~        hit ~R~e~t~u~r~n at the edit prompt.  If a word has been corrected,"
 msgstr ""
 
-#: pico/osdep/spell.c:56
+#: pico/osdep/spell.c:52
 msgid ""
 "        each occurrence of the incorrect word is offered for replacement."
 msgstr ""
 
-#: pico/osdep/spell.c:58
+#: pico/osdep/spell.c:54
 msgid ""
 "~        Spell checking can be cancelled at any time by typing ~^~C (~F~3)"
 msgstr ""
 
-#: pico/osdep/spell.c:59
+#: pico/osdep/spell.c:55
 msgid "        after exiting help."
 msgstr ""
 
-#: pico/osdep/spell.c:61 pico/osdep/spell.c:79
+#: pico/osdep/spell.c:57 pico/osdep/spell.c:75
 msgid "End of Spell Check Help"
 msgstr ""
 
-#: pico/osdep/spell.c:70
+#: pico/osdep/spell.c:66
 msgid "\tThe spell checker examines all words in the text.  It then"
 msgstr ""
 
-#: pico/osdep/spell.c:71
+#: pico/osdep/spell.c:67
 msgid "\toffers each misspelled word for correction while simultaneously"
 msgstr ""
 
-#: pico/osdep/spell.c:72
+#: pico/osdep/spell.c:68
 msgid "\thighlighting it in the text.  To leave a word unchanged simply"
 msgstr ""
 
-#: pico/osdep/spell.c:73
+#: pico/osdep/spell.c:69
 msgid "\thit Return at the edit prompt.  If a word has been corrected,"
 msgstr ""
 
-#: pico/osdep/spell.c:74
+#: pico/osdep/spell.c:70
 msgid "\teach occurrence of the incorrect word is offered for replacement."
 msgstr ""
 
-#: pico/osdep/spell.c:76
+#: pico/osdep/spell.c:72
 msgid "\tSpell checking can be cancelled at any time by typing ^C (F3)"
 msgstr ""
 
-#: pico/osdep/spell.c:77
+#: pico/osdep/spell.c:73
 msgid "\tafter exiting help."
 msgstr ""
 
-#: pico/osdep/spell.c:105
+#: pico/osdep/spell.c:101
 msgid "Can't write temp file for spell checker"
 msgstr ""
 
-#: pico/osdep/spell.c:145
+#: pico/osdep/spell.c:141
 #, c-format
 msgid "Spell-checking file \"%s\" not found"
 msgstr ""
 
-#: pico/osdep/spell.c:152
+#: pico/osdep/spell.c:148
 msgid "Can't fork spell checker"
 msgstr ""
 
-#: pico/osdep/spell.c:186
+#: pico/osdep/spell.c:182
 #, c-format
 msgid "Replace \"%s\" with \"%s\""
 msgstr ""
 
-#: pico/osdep/spell.c:196
+#: pico/osdep/spell.c:192
 msgid "Edit a replacement: "
 msgstr ""
 
-#: pico/osdep/spell.c:215
+#: pico/osdep/spell.c:211
 msgid "Spell Checking Cancelled"
 msgstr ""
 
-#: pico/osdep/spell.c:225 pico/osdep/spell.c:232
+#: pico/osdep/spell.c:221 pico/osdep/spell.c:228
 msgid "Help with Spelling Checker"
 msgstr ""
 
-#: pico/osdep/altedit.c:292
+#: pico/osdep/altedit.c:288
 #, 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:93 pico/display.c:70 pico/display.c:86
+#: pico/attach.c:89 pico/display.c:66 pico/display.c:82
 msgid "Read File"
 msgstr ""
 
-#: pico/attach.c:93
+#: pico/attach.c:89
 msgid "RcvUpload"
 msgstr ""
 
-#: pico/attach.c:99
+#: pico/attach.c:95
 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:102
+#: pico/attach.c:98
 msgid "File to attach: "
 msgstr ""
 
 #. TRANSLATORS: This is a prompt for a comment about the file
 #. they have attached.
-#: pico/attach.c:108
+#: pico/attach.c:104
 msgid "Attachment comment: "
 msgstr ""
 
-#: pico/attach.c:116
+#: pico/attach.c:112
 msgid "Attach Help"
 msgstr ""
 
-#: pico/attach.c:222 pico/attach.c:346 pico/browse.c:1588 pico/browse.c:2029
-#: pico/composer.c:811 pico/composer.c:1296
+#: pico/attach.c:218 pico/attach.c:342 pico/browse.c:1630 pico/browse.c:2071
+#: pico/composer.c:807 pico/composer.c:1292
 msgid "Can't malloc space for filename"
 msgstr ""
 
-#: pico/attach.c:260
+#: pico/attach.c:256
 msgid "File name too BIG, cannot select!"
 msgstr ""
 
-#: pico/attach.c:271
+#: pico/attach.c:267
 msgid "File name too big, cannot select!"
 msgstr ""
 
-#: pico/attach.c:321 pico/attach.c:331 pico/attach.c:886 pico/attach.c:904
+#: pico/attach.c:317 pico/attach.c:327 pico/attach.c:884 pico/attach.c:902
 msgid "home directory"
 msgstr ""
 
 #. TRANSLATORS: the %s is replaced with the name of a directory
-#: pico/attach.c:324
+#: pico/attach.c:320
 #, c-format
 msgid "Restricted mode allows attachments from %s only: too many ..'s"
 msgstr ""
 
-#: pico/attach.c:333
+#: pico/attach.c:329
 #, c-format
 msgid "Restricted mode allows attachments from %s only"
 msgstr ""
 
-#: pico/attach.c:386 pico/file.c:308
+#: pico/attach.c:382 pico/file.c:304
 msgid "Restricted mode disallows uploaded command"
 msgstr ""
 
-#: pico/attach.c:406
+#: pico/attach.c:402
 msgid "Attach cancelled"
 msgstr ""
 
-#: pico/attach.c:455
+#: pico/attach.c:451
 #, c-format
 msgid "Can't allocate space for %s known attachment array entries"
 msgstr ""
 
-#: pico/attach.c:478
+#: pico/attach.c:474
 #, c-format
 msgid "Can't allocate space for %s build array entries"
 msgstr ""
 
-#: pico/attach.c:491
+#: pico/attach.c:487
 #, c-format
 msgid "Can't resize build array to %s entries"
 msgstr ""
 
-#: pico/attach.c:539
+#: pico/attach.c:535
 msgid "Can't realloc filename space"
 msgstr ""
 
-#: pico/attach.c:553
+#: pico/attach.c:551
 msgid "Can't realloc space for size"
 msgstr ""
 
-#: pico/attach.c:568
+#: pico/attach.c:566
 msgid "Can't realloc description"
 msgstr ""
 
-#: pico/attach.c:851 pico/attach.c:1053
+#: pico/attach.c:849 pico/attach.c:1051
 #, c-format
 msgid "Attchmnt: '%s' not allowed in file name"
 msgstr ""
 
-#: pico/attach.c:888
+#: pico/attach.c:886
 #, c-format
 msgid "Attachments allowed only from %s: too many ..'s"
 msgstr ""
 
-#: pico/attach.c:905
+#: pico/attach.c:903
 #, c-format
 msgid "Attachments allowed only from %s"
 msgstr ""
 
-#: pico/attach.c:951
+#: pico/attach.c:949
 msgid "Attchmnt: Problem displaying real file path"
 msgstr ""
 
-#: pico/attach.c:975
+#: pico/attach.c:973
 #, c-format
 msgid "Attchmnt: Expected ']' after \"%s\""
 msgstr ""
 
-#: pico/attach.c:1004
+#: pico/attach.c:1002
 #, c-format
 msgid "Attchmnt: Unknown reference: %s"
 msgstr ""
 
-#: pico/attach.c:1096
+#: pico/attach.c:1094
 #, c-format
 msgid "Attchmnt: Expected '(' or '\"' after %s"
 msgstr ""
 
-#: pico/attach.c:1155
+#: pico/attach.c:1153
 #, c-format
 msgid "Attchmnt: Size field missing ')': \"%s\""
 msgstr ""
 
-#: pico/attach.c:1174
+#: pico/attach.c:1172
 msgid "Attchmnt: Malformed comment, quotes required"
 msgstr ""
 
-#: pico/attach.c:1196
+#: pico/attach.c:1194
 msgid "Attchmnt: Closing quote required at end of comment"
 msgstr ""
 
-#: pico/attach.c:1240
+#: pico/attach.c:1238
 msgid "Attchmnt: Comma must separate attachments"
 msgstr ""
 
-#: pico/attach.c:1247
+#: pico/attach.c:1245
 msgid "Attchmnt: Weirdness in ParseAttach"
 msgstr ""
 
-#: pico/attach.c:1500
+#: pico/attach.c:1498
 msgid "No end of line???"
 msgstr ""
 
 #. TRANSLATORS: command key labels, Send means send the message
 #. we are currently working on.
-#: pico/display.c:69 pico/display.c:85 pico/display.c:1652 pico/display.c:2072
-#: pico/browse.c:114 pico/composer.c:132
+#: pico/display.c:65 pico/display.c:81 pico/display.c:1643 pico/display.c:2063
+#: pico/browse.c:112 pico/composer.c:128
 msgid "Get Help"
 msgstr ""
 
-#: pico/display.c:69
+#: pico/display.c:65
 msgid "WriteOut"
 msgstr ""
 
 #. TRANSLATORS: Previous Page
-#: pico/display.c:70 pico/display.c:86 pico/browse.c:115 pico/bind.c:246
+#: pico/display.c:66 pico/display.c:82 pico/browse.c:116 pico/bind.c:242
 msgid "Prev Pg"
 msgstr ""
 
-#: pico/display.c:71 pico/display.c:87
+#: pico/display.c:67 pico/display.c:83
 msgid "Cut Text"
 msgstr ""
 
-#: pico/display.c:71
+#: pico/display.c:67
 msgid "Cur Pos"
 msgstr ""
 
-#: pico/display.c:72 pico/display.c:89
+#: pico/display.c:68 pico/display.c:85
 msgid "Justify"
 msgstr ""
 
-#: pico/display.c:73 pico/display.c:1374 pico/browse.c:118
+#: pico/display.c:69 pico/display.c:1369 pico/browse.c:119
 msgid "Where is"
 msgstr ""
 
 #. TRANSLATORS: Next Page, a command key label
-#: pico/display.c:73 pico/display.c:90 pico/browse.c:118 pico/bind.c:238
+#: pico/display.c:69 pico/display.c:86 pico/browse.c:119 pico/bind.c:234
 msgid "Next Pg"
 msgstr ""
 
-#: pico/display.c:76 pico/display.c:93
+#: pico/display.c:72 pico/display.c:89
 msgid "To Spell"
 msgstr ""
 
-#: pico/display.c:78 pico/display.c:95 pico/composer.c:140
+#: pico/display.c:74 pico/display.c:91 pico/composer.c:136
 msgid "Del Char"
 msgstr ""
 
-#: pico/display.c:87 pico/display.c:1371 pico/composer.c:138
-#: pico/composer.c:4444
+#: pico/display.c:83 pico/display.c:1366 pico/composer.c:134
+#: pico/composer.c:4449
 msgid "Postpone"
 msgstr ""
 
 #. TRANSLATORS: UnJustify means undo the previous
 #. Justify command.
-#: pico/display.c:879 pico/display.c:1377
+#: pico/display.c:874 pico/display.c:1372
 msgid "UnJustify"
 msgstr ""
 
-#: pico/display.c:881 pico/display.c:894
+#: pico/display.c:876 pico/display.c:889
 msgid "Can now UnJustify!"
 msgstr ""
 
-#: pico/display.c:886 pico/display.c:1378
+#: pico/display.c:881 pico/display.c:1373
 msgid "UnCut Text"
 msgstr ""
 
-#: pico/display.c:1367 pico/composer.c:132 pico/composer.c:4407
+#: pico/display.c:1362 pico/composer.c:128 pico/composer.c:4412
 msgid "Send"
 msgstr ""
 
-#: pico/display.c:1373
+#: pico/display.c:1368
 msgid "Alt Edit"
 msgstr ""
 
-#: pico/display.c:1613
+#: pico/display.c:1605
 msgid "Choose Dictionary: "
 msgstr ""
 
-#: pico/display.c:1842 pico/display.c:2189 pico/word.c:683
+#: pico/display.c:1833 pico/display.c:2180 pico/word.c:679
 msgid "ABORT"
 msgstr ""
 
-#: pico/basic.c:942
+#: pico/basic.c:938
 msgid "Xterm mouse tracking on!"
 msgstr ""
 
-#: pico/basic.c:943
+#: pico/basic.c:939
 msgid "Xterm mouse tracking off!"
 msgstr ""
 
-#: pico/basic.c:946
+#: pico/basic.c:942
 msgid "Xterm mouse tracking still off ($DISPLAY variable set?)"
 msgstr ""
 
-#: pico/pico.c:378
+#: pico/pico.c:374
 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:689 pico/pico.c:708
+#: pico/pico.c:685 pico/pico.c:704
 msgid "Cancel Cancelled"
 msgstr ""
 
-#: pico/pico.c:698
+#: pico/pico.c:694
 msgid "Cancel message (answering \"Yes\" will abandon your mail message)"
 msgstr ""
 
-#: pico/pico.c:700
+#: pico/pico.c:696
 msgid "Cancel Edit (and abandon changes)"
 msgstr ""
 
-#: pico/pico.c:701
+#: pico/pico.c:697
 msgid "Cancel Edit"
 msgstr ""
 
-#: pico/pico.c:749
+#: pico/pico.c:745
 msgid "Problem with attachments!  Fix errors or delete attachments."
 msgstr ""
 
 #. TRANSLATORS: buffer is the in-memory copy of a file
-#: pico/pico.c:798
+#: pico/pico.c:794
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES)"
 msgstr ""
 
-#: pico/pico.c:1962
+#: pico/pico.c:1978
 #, c-format
 msgid "Attached dropped file \"%s\""
 msgstr ""
 
-#: pico/pico.c:1964
+#: pico/pico.c:1980
 #, c-format
 msgid "Inserted dropped file \"%s\""
 msgstr ""
@@ -10465,771 +11261,787 @@ msgstr ""
 msgid "can't create '%s'\n"
 msgstr ""
 
-#: pico/browse.c:116
+#: pico/browse.c:117
 msgid "Copy"
 msgstr ""
 
+#: pico/browse.c:125
+msgid "One Col"
+msgstr ""
+
+#: pico/browse.c:128
+msgid "Dot files"
+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:174
+#: pico/browse.c:183
 msgid "Help for Browse Command"
 msgstr ""
 
-#: pico/browse.c:176
+#: pico/browse.c:185
 msgid "        Pico's file browser is used to select a file from the"
 msgstr ""
 
-#: pico/browse.c:177
+#: pico/browse.c:186
 msgid "        file system for inclusion in the edited text."
 msgstr ""
 
-#: pico/browse.c:179
+#: pico/browse.c:188
 msgid "~        Both directories and files are displayed.  Press ~S"
 msgstr ""
 
-#: pico/browse.c:180
+#: pico/browse.c:189
 msgid "~        or ~R~e~t~u~r~n to select a file or directory.  When a file"
 msgstr ""
 
-#: pico/browse.c:181
+#: pico/browse.c:190
 msgid "        is selected during the \"Read File\" command, it is"
 msgstr ""
 
-#: pico/browse.c:182
+#: pico/browse.c:191
 msgid "        inserted into edited text.  Answering \"yes\" to the"
 msgstr ""
 
-#: pico/browse.c:183
+#: pico/browse.c:192
 msgid "        verification question after a directory is selected causes"
 msgstr ""
 
-#: pico/browse.c:184
+#: pico/browse.c:193
 msgid "        the contents of that directory to be displayed for selection."
 msgstr ""
 
-#: pico/browse.c:186
+#: pico/browse.c:195
 msgid "        The file named \"..\" is special, and means the \"parent\""
 msgstr ""
 
-#: pico/browse.c:187
+#: pico/browse.c:196
 msgid "        of the directory being displayed.  Select this directory"
 msgstr ""
 
-#: pico/browse.c:188
+#: pico/browse.c:197
 msgid "        to move upward in the directory tree."
 msgstr ""
 
-#: pico/browse.c:190
+#: pico/browse.c:199
 msgid "End of Browser Help."
 msgstr ""
 
 #. TRANSLATORS: Some more help text
-#: pico/browse.c:200
+#: pico/browse.c:209
 msgid "Help for Pilot (PIne's Looker-upper Of Things"
 msgstr ""
 
-#: pico/browse.c:202
+#: pico/browse.c:211
 msgid ""
 "        Pilot is a simple, display-oriented file system browser based on the"
 msgstr ""
 
-#: pico/browse.c:203
+#: pico/browse.c:212
 msgid ""
 "~        Alpine message system composer.  As with Alpine, commands are "
 "displayed at"
 msgstr ""
 
-#: pico/browse.c:204
+#: pico/browse.c:213
 msgid ""
 "~        the bottom of the screen, and context-sensitive help is provided."
 msgstr ""
 
-#: pico/browse.c:206
+#: pico/browse.c:215
 msgid ""
 "~        Pilot displays the current working directory at the top of the "
 "screen."
 msgstr ""
 
-#: pico/browse.c:207
+#: pico/browse.c:216
 msgid ""
 "~        The directory's contents are displayed in columns of file name, file"
 msgstr ""
 
-#: pico/browse.c:208
+#: pico/browse.c:217
 msgid ""
 "~        size pairs.  Names that are directories are indicated by the name"
 msgstr ""
 
-#: pico/browse.c:209
+#: pico/browse.c:218
 msgid ""
 "~        ~(~d~i~r~) in place of the file size.  The parent of the current "
 "working"
 msgstr ""
 
-#: pico/browse.c:210
+#: pico/browse.c:219
 msgid ""
 "~        directory is indicated by the file name ~.~. and size of "
 "~(~p~a~r~e~n~t~ ~d~i~r~)."
 msgstr ""
 
-#: pico/browse.c:211
+#: pico/browse.c:220
 msgid ""
 "~        File names that are symbolic links to other files are displayed "
 "with a"
 msgstr ""
 
-#: pico/browse.c:212
+#: pico/browse.c:221
 msgid "~        file size of ~-~-."
 msgstr ""
 
-#: pico/browse.c:214
+#: pico/browse.c:223
 msgid "        The following function keys are available in Pilot:"
 msgstr ""
 
-#: pico/browse.c:216
+#: pico/browse.c:225
 msgid "~        ~?        Display this help text."
 msgstr ""
 
-#: pico/browse.c:217
+#: pico/browse.c:226
 msgid "~        ~Q        Quit Pilot."
 msgstr ""
 
-#: pico/browse.c:219
+#: pico/browse.c:228
 msgid ""
 "~        ~V        View the currently selected file or open the selected "
 "directory."
 msgstr ""
 
-#: pico/browse.c:220
+#: pico/browse.c:229
 msgid ""
-"~                Note: Pilot invokes ~p~i~n~e ~-~F, or the program defined "
-"by the ~P~A~G~E~R"
+"~                 Note: Pilot invokes ~a~l~p~i~n~e ~-~F, or the program "
+"defined by the ~P~A~G~E~R"
 msgstr ""
 
-#: pico/browse.c:221
-msgid "~                      environment variable, to view the file."
+#: pico/browse.c:230
+msgid "~                       environment variable, to view the file."
 msgstr ""
 
-#: pico/browse.c:222
+#: pico/browse.c:231
 msgid "~        ~L        Launch an external application program."
 msgstr ""
 
-#: pico/browse.c:224
+#: pico/browse.c:233
 msgid "~        ~W        Search for a file by name."
 msgstr ""
 
-#: pico/browse.c:225
+#: pico/browse.c:234
 msgid "~        ~-        Scroll up one page."
 msgstr ""
 
-#: pico/browse.c:226
-msgid "~        ~S~p~a~c~e        Scroll down one page."
+#: pico/browse.c:235
+msgid "~        ~S~p~a~c~e    Scroll down one page."
 msgstr ""
 
-#: pico/browse.c:227
-msgid "~        ~N,~^~F        Move forward (right) one column."
+#: pico/browse.c:236
+msgid "~        ~N,~^~F     Move forward (right) one column."
 msgstr ""
 
-#: pico/browse.c:228
-msgid "~        ~P,~^~B        Move back (left) one column."
+#: pico/browse.c:237
+msgid "~        ~P,~^~B     Move back (left) one column."
 msgstr ""
 
-#: pico/browse.c:229
-msgid "~        ~^~N        Move down one row."
+#: pico/browse.c:238
+msgid "~        ~^~N       Move down one row."
 msgstr ""
 
-#: pico/browse.c:230
-msgid "~        ~^~P        Move up one row."
+#: pico/browse.c:239
+msgid "~        ~^~P       Move up one row."
 msgstr ""
 
-#: pico/browse.c:232
+#: pico/browse.c:240
+msgid "~        ~.        Switch show dot files."
+msgstr ""
+
+#: pico/browse.c:241
+msgid "~        ~1        Switch single column display."
+msgstr ""
+
+#: pico/browse.c:243
 msgid "~        ~D        Delete the selected file."
 msgstr ""
 
-#: pico/browse.c:233
+#: pico/browse.c:244
 msgid "~        ~R        Rename the selected file or directory."
 msgstr ""
 
-#: pico/browse.c:234
+#: pico/browse.c:245
 msgid "~        ~C        Copy the selected file."
 msgstr ""
 
-#: pico/browse.c:235
+#: pico/browse.c:246
 msgid "~        ~E        Edit the selected file."
 msgstr ""
 
-#: pico/browse.c:236
+#: pico/browse.c:247
 msgid ""
-"~                Note: Pilot invokes ~p~i~c~o, or the program defined by the "
-"~E~D~I~T~O~R"
+"~                 Note: Pilot invokes ~p~i~c~o, or the program defined by "
+"the ~E~D~I~T~O~R"
 msgstr ""
 
-#: pico/browse.c:237
-msgid "~                      environment variable, to edit the file."
+#: pico/browse.c:248
+msgid "~                       environment variable, to edit the file."
 msgstr ""
 
-#: pico/browse.c:239
+#: pico/browse.c:250
 msgid "End of Pilot Help."
 msgstr ""
 
-#: pico/browse.c:334
+#: pico/browse.c:345
 #, c-format
 msgid "Can't read outside of %s in restricted mode"
 msgstr ""
 
-#: pico/browse.c:438 pico/main.c:458
+#: pico/browse.c:449 pico/main.c:454
 msgid "You may possibly have new mail."
 msgstr ""
 
-#: pico/browse.c:714
+#: pico/browse.c:726
 msgid "Can't edit non-text file.  Try Launch."
 msgstr ""
 
-#: pico/browse.c:751
+#: pico/browse.c:768
 msgid "Type L command to use ListMode"
 msgstr ""
 
-#: pico/browse.c:759
+#: pico/browse.c:776
 msgid "Can't Set directories"
 msgstr ""
 
-#: pico/browse.c:780
+#: pico/browse.c:797
 msgid "Already in ListMode"
 msgstr ""
 
-#: pico/browse.c:805
+#: pico/browse.c:822
 msgid "Add Name"
 msgstr ""
 
-#: pico/browse.c:817
+#: pico/browse.c:834
 msgid "Command to execute: "
 msgstr ""
 
-#: pico/browse.c:821 pico/browse.c:987 pico/browse.c:1077 pico/browse.c:1216
-#: pico/browse.c:1344 pico/browse.c:1637
+#: pico/browse.c:838 pico/browse.c:1004 pico/browse.c:1116 pico/browse.c:1255
+#: pico/browse.c:1383 pico/browse.c:1679
 msgid "No help yet!"
 msgstr ""
 
-#: pico/browse.c:833
+#: pico/browse.c:850
 msgid "Command cancelled"
 msgstr ""
 
-#: pico/browse.c:841
+#: pico/browse.c:858
 msgid "No command specified"
 msgstr ""
 
-#: pico/browse.c:860
+#: pico/browse.c:877
 msgid "Can't delete a directory"
 msgstr ""
 
-#: pico/browse.c:865
+#: pico/browse.c:882
 msgid "Delete not allowed in restricted mode"
 msgstr ""
 
-#: pico/browse.c:876
+#: pico/browse.c:893
 msgid "File is write protected! OVERRIDE"
 msgstr ""
 
 #. TRANSLATORS: This is a question, Delete file <filename>
-#: pico/browse.c:881
+#: pico/browse.c:898
 #, c-format
 msgid "Delete file \"%.*s\""
 msgstr ""
 
-#: pico/browse.c:884
+#: pico/browse.c:901
 msgid "File CANNOT be UNdeleted!  Really delete"
 msgstr ""
 
-#: pico/browse.c:890
+#: pico/browse.c:907
 msgid "Delete Cancelled"
 msgstr ""
 
-#: pico/browse.c:891
+#: pico/browse.c:908
 msgid "File Not Deleted"
 msgstr ""
 
-#: pico/browse.c:900
+#: pico/browse.c:917
 #, c-format
 msgid "Delete Failed: %s"
 msgstr ""
 
-#: pico/browse.c:953 pico/browse.c:962
+#: pico/browse.c:970 pico/browse.c:979
 msgid "Help for Browsing"
 msgstr ""
 
-#: pico/browse.c:960
+#: pico/browse.c:977
 msgid "Browser Help"
 msgstr ""
 
 #. TRANSLATORS: A prompt asking for a directory to
 #. move into
-#: pico/browse.c:982
+#: pico/browse.c:999
 msgid "Directory to go to: "
 msgstr ""
 
-#: pico/browse.c:995
+#: pico/browse.c:1012
 msgid "Goto cancelled"
 msgstr ""
 
-#: pico/browse.c:1009
+#: pico/browse.c:1026
 #, c-format
 msgid "Invalid Directory: %s"
 msgstr ""
 
-#: pico/browse.c:1014
+#: pico/browse.c:1031
 msgid "Restricted mode browsing limited to home directory"
 msgstr ""
 
-#: pico/browse.c:1020
+#: pico/browse.c:1037
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr ""
 
-#: pico/browse.c:1052
+#: pico/browse.c:1091
 msgid "Add not allowed in restricted mode"
 msgstr ""
 
-#: pico/browse.c:1071
+#: pico/browse.c:1110
 msgid "Add File"
 msgstr ""
 
-#: pico/browse.c:1074
+#: pico/browse.c:1113
 msgid "Name of file to add: "
 msgstr ""
 
-#: pico/browse.c:1074
+#: pico/browse.c:1113
 msgid "Name of directory to add: "
 msgstr ""
 
-#: pico/browse.c:1088
+#: pico/browse.c:1127
 msgid "Add File Cancelled"
 msgstr ""
 
-#: pico/browse.c:1088
+#: pico/browse.c:1127
 msgid "Add Directory Cancelled"
 msgstr ""
 
-#: pico/browse.c:1103
+#: pico/browse.c:1142
 msgid "No file named.  Add Cancelled."
 msgstr ""
 
-#: pico/browse.c:1103
+#: pico/browse.c:1142
 msgid "No directory named. Add Cancelled"
 msgstr ""
 
-#: pico/browse.c:1108 pico/browse.c:1245 pico/browse.c:1365
+#: pico/browse.c:1147 pico/browse.c:1284 pico/browse.c:1404
 msgid "Too many ..'s in name"
 msgstr ""
 
-#: pico/browse.c:1114
+#: pico/browse.c:1153
 #, c-format
 msgid "Restricted mode allows Add in %s only"
 msgstr ""
 
-#: pico/browse.c:1120
+#: pico/browse.c:1159
 #, c-format
 msgid "%s \"%.*s\" already exists!"
 msgstr ""
 
-#: pico/browse.c:1133
+#: pico/browse.c:1172
 #, c-format
 msgid "Error adding Directory \"%s\""
 msgstr ""
 
-#: pico/browse.c:1145
+#: pico/browse.c:1184
 #, c-format
 msgid "Added File \"%s\""
 msgstr ""
 
-#: pico/browse.c:1151 pico/browse.c:1285 pico/browse.c:1400
+#: pico/browse.c:1190 pico/browse.c:1324 pico/browse.c:1439
 msgid "Problems refiguring browser"
 msgstr ""
 
-#: pico/browse.c:1199
+#: pico/browse.c:1238
 msgid "Can't copy a directory"
 msgstr ""
 
-#: pico/browse.c:1204
+#: pico/browse.c:1243
 msgid "Copy not allowed in restricted mode"
 msgstr ""
 
-#: pico/browse.c:1213
+#: pico/browse.c:1252
 msgid "Name of new copy: "
 msgstr ""
 
-#: pico/browse.c:1224
+#: pico/browse.c:1263
 msgid "Make Copy Cancelled"
 msgstr ""
 
-#: pico/browse.c:1235
+#: pico/browse.c:1274
 msgid "No destination, file not copied"
 msgstr ""
 
-#: pico/browse.c:1240
+#: pico/browse.c:1279
 msgid "Can't copy file on to itself!"
 msgstr ""
 
-#: pico/browse.c:1251
+#: pico/browse.c:1290
 #, c-format
 msgid "Restricted mode allows Copy in %s only"
 msgstr ""
 
 #. TRANSLATORS: A question: File <filename> exists! Replace?
-#: pico/browse.c:1258 pico/browse.c:1379
+#: pico/browse.c:1297 pico/browse.c:1418
 #, c-format
 msgid "File \"%.*s\" exists! OVERWRITE"
 msgstr ""
 
-#: pico/browse.c:1262
+#: pico/browse.c:1301
 msgid "Make copy cancelled"
 msgstr ""
 
-#: pico/browse.c:1263
+#: pico/browse.c:1302
 msgid "File Not Renamed"
 msgstr ""
 
-#: pico/browse.c:1282
+#: pico/browse.c:1321
 #, c-format
 msgid "File copied to %s"
 msgstr ""
 
-#: pico/browse.c:1327
+#: pico/browse.c:1366
 msgid "Can't rename \"..\""
 msgstr ""
 
-#: pico/browse.c:1332
+#: pico/browse.c:1371
 msgid "Rename not allowed in restricted mode"
 msgstr ""
 
-#: pico/browse.c:1341
+#: pico/browse.c:1380
 msgid "Rename file to: "
 msgstr ""
 
-#: pico/browse.c:1352 pico/browse.c:1384
+#: pico/browse.c:1391 pico/browse.c:1423
 msgid "Rename cancelled"
 msgstr ""
 
-#: pico/browse.c:1371
+#: pico/browse.c:1410
 #, c-format
 msgid "Restricted mode allows Rename in %s only"
 msgstr ""
 
-#: pico/browse.c:1385
+#: pico/browse.c:1424
 msgid "Not Renamed"
 msgstr ""
 
-#: pico/browse.c:1396
+#: pico/browse.c:1435
 #, c-format
 msgid "Rename Failed: %s"
 msgstr ""
 
-#: pico/browse.c:1458
+#: pico/browse.c:1497
 #, c-format
 msgid "Can't visit %s in restricted mode"
 msgstr ""
 
-#: pico/browse.c:1485
+#: pico/browse.c:1524
 msgid "Can't move up a directory"
 msgstr ""
 
-#: pico/browse.c:1533
+#: pico/browse.c:1572
 #, c-format
 msgid "Problem finding dir \"%s\""
 msgstr ""
 
-#: pico/browse.c:1574
+#: pico/browse.c:1616
 msgid "No files are selected, use \"X\" to mark files for selection"
 msgstr ""
 
-#: pico/browse.c:1635
+#: pico/browse.c:1677
 msgid "File name to find"
 msgstr ""
 
-#: pico/browse.c:1677
+#: pico/browse.c:1719
 msgid "Searched to end of directory"
 msgstr ""
 
-#: pico/browse.c:1680
+#: pico/browse.c:1722
 msgid "Searched to start of directory"
 msgstr ""
 
-#: pico/browse.c:1699
+#: pico/browse.c:1741
 msgid "Whereis cancelled"
 msgstr ""
 
-#: pico/browse.c:1730 pico/search.c:433
+#: pico/browse.c:1772 pico/search.c:429
 #, c-format
 msgid "\"%s\" not found"
 msgstr ""
 
-#: pico/browse.c:1796
+#: pico/browse.c:1838
 msgid "Can't malloc space for master filename cell"
 msgstr ""
 
-#: pico/browse.c:1845
+#: pico/browse.c:1887
 msgid "Can't malloc space for name array"
 msgstr ""
 
-#: pico/browse.c:1900
+#: pico/browse.c:1942
 msgid "Can't malloc cells for browser!"
 msgstr ""
 
-#: pico/browse.c:1931
+#: pico/browse.c:1973
 msgid "Can't malloc cells for temp buffer!"
 msgstr ""
 
+#: pico/browse.c:2311
+msgid "Goto"
+msgstr ""
+
 #. TRANSLATORS: Brwsr is an abbreviation for Browser, which is
 #. a command used to look through something
-#: pico/browse.c:2237
+#: pico/browse.c:2318
 msgid "Quit"
 msgstr ""
 
-#: pico/browse.c:2237
+#: pico/browse.c:2318
 msgid "Exit Brwsr"
 msgstr ""
 
-#: pico/browse.c:2239
-msgid "Goto"
-msgstr ""
-
-#: pico/browse.c:2242
+#: pico/browse.c:2321
 msgid "Launch"
 msgstr ""
 
-#: pico/browse.c:2380
+#: pico/browse.c:2459
 msgid "Internal error: can't find fname cell"
 msgstr ""
 
-#: pico/browse.c:2900
+#: pico/browse.c:2979
 msgid "Can't display non-text file.  Try \"Launch\"."
 msgstr ""
 
-#: pico/browse.c:2907
+#: pico/browse.c:2986
 #, c-format
 msgid "Can't read file: %s"
 msgstr ""
 
-#: pico/browse.c:2914
+#: pico/browse.c:2993
 #, c-format
 msgid "Can't open file: %s"
 msgstr ""
 
-#: pico/search.c:66
+#: pico/search.c:62
 msgid "FirstLine"
 msgstr ""
 
-#: pico/search.c:67
+#: pico/search.c:63
 msgid "LastLine"
 msgstr ""
 
-#: pico/search.c:68 pico/search.c:85 pico/search.c:811 pico/search.c:824
+#: pico/search.c:64 pico/search.c:81 pico/search.c:807 pico/search.c:820
 msgid "No Replace"
 msgstr ""
 
-#: pico/search.c:69
+#: pico/search.c:65
 msgid "Optns Menu"
 msgstr ""
 
-#: pico/search.c:70
+#: pico/search.c:66
 msgid "LineNumber"
 msgstr ""
 
-#: pico/search.c:71
+#: pico/search.c:67
 msgid "Start of Para"
 msgstr ""
 
-#: pico/search.c:72
+#: pico/search.c:68
 msgid "End of Para"
 msgstr ""
 
-#: pico/search.c:73
+#: pico/search.c:69
 msgid "FullJustify"
 msgstr ""
 
-#: pico/search.c:83
+#: pico/search.c:79
 msgid "Orig Menu"
 msgstr ""
 
-#: pico/search.c:84 pico/search.c:821 pico/search.c:1022
+#: pico/search.c:80 pico/search.c:817 pico/search.c:1018
 msgid "Exact"
 msgstr ""
 
-#: pico/search.c:86 pico/search.c:833 pico/search.c:1030
+#: pico/search.c:82 pico/search.c:829 pico/search.c:1026
 msgid "Bgn Line"
 msgstr ""
 
-#: pico/search.c:87 pico/search.c:837 pico/search.c:1034
+#: pico/search.c:83 pico/search.c:833 pico/search.c:1030
 msgid "End Line"
 msgstr ""
 
-#: pico/search.c:88
+#: pico/search.c:84
 msgid "BackSearch"
 msgstr ""
 
 #. TRANSLATORS: Some help text that goes together in a group.
-#: pico/search.c:111
+#: pico/search.c:107
 msgid "Help for Search Command"
 msgstr ""
 
-#: pico/search.c:113
+#: pico/search.c:109
 msgid "        Enter the words or characters you would like to search"
 msgstr ""
 
-#: pico/search.c:114
+#: pico/search.c:110
 msgid "~        for, then press ~R~e~t~u~r~n.  The search then takes place."
 msgstr ""
 
-#: pico/search.c:115
+#: pico/search.c:111
 msgid "        When the characters or words that you entered "
 msgstr ""
 
-#: pico/search.c:116
+#: pico/search.c:112
 msgid "        are found, the buffer will be redisplayed with the cursor "
 msgstr ""
 
-#: pico/search.c:117
+#: pico/search.c:113
 msgid "        at the beginning of the selected text."
 msgstr ""
 
-#: pico/search.c:119
+#: pico/search.c:115
 msgid "        The most recent string for which a search was made is"
 msgstr ""
 
-#: pico/search.c:120
+#: pico/search.c:116
 msgid "        displayed in the \"Search\" prompt between the square"
 msgstr ""
 
-#: pico/search.c:121
+#: pico/search.c:117
 msgid "        brackets.  This string is the default search prompt."
 msgstr ""
 
-#: pico/search.c:122
+#: pico/search.c:118
 msgid "~        Hitting only ~R~e~t~u~r~n or at the prompt will cause the"
 msgstr ""
 
-#: pico/search.c:123
+#: pico/search.c:119
 msgid "        search to be made with the default value."
 msgstr ""
 
-#: pico/search.c:125
+#: pico/search.c:121
 msgid "        The text search is not case sensitive, and will examine the"
 msgstr ""
 
-#: pico/search.c:126
+#: pico/search.c:122
 msgid "        entire message."
 msgstr ""
 
-#: pico/search.c:128
+#: pico/search.c:124
 msgid "        Should the search fail, a message will be displayed."
 msgstr ""
 
-#: pico/search.c:130
+#: pico/search.c:126
 msgid "End of Search Help."
 msgstr ""
 
-#: pico/search.c:206 pico/search.c:213 pico/search.c:606 pico/search.c:613
+#: pico/search.c:202 pico/search.c:209 pico/search.c:602 pico/search.c:609
 msgid "Help for Searching"
 msgstr ""
 
-#: pico/search.c:299
+#: pico/search.c:295
 msgid "Search to Line Number : "
 msgstr ""
 
-#: pico/search.c:301
+#: pico/search.c:297
 msgid "Search to Line Number Cancelled"
 msgstr ""
 
-#: pico/search.c:305
+#: pico/search.c:301
 msgid "Line number must be greater than zero"
 msgstr ""
 
-#: pico/search.c:309
+#: pico/search.c:305
 msgid "Line number must contain only digits"
 msgstr ""
 
-#: pico/search.c:373
+#: pico/search.c:369
 msgid "Search Cancelled"
 msgstr ""
 
 #. TRANSLATORS: abbreviation for Replace All occurrences
-#: pico/search.c:487 pico/search.c:624
+#: pico/search.c:483 pico/search.c:620
 msgid "Repl All"
 msgstr ""
 
 #. TRANSLATORS: Replace just one occurence
-#: pico/search.c:629
+#: pico/search.c:625
 msgid "Repl One"
 msgstr ""
 
-#: pico/search.c:636
+#: pico/search.c:632
 msgid "Replacement Cancelled"
 msgstr ""
 
-#: pico/search.c:773
+#: pico/search.c:769
 #, c-format
 msgid "No more matches for \"%s\""
 msgstr ""
 
-#: pico/search.c:777
+#: pico/search.c:773
 msgid "No more matches"
 msgstr ""
 
-#: pico/search.c:820 pico/search.c:1021
+#: pico/search.c:816 pico/search.c:1017
 msgid "No Exact"
 msgstr ""
 
-#: pico/search.c:828 pico/search.c:1025
+#: pico/search.c:824 pico/search.c:1021
 msgid "Srch Fwd"
 msgstr ""
 
-#: pico/search.c:829 pico/search.c:1026
+#: pico/search.c:825 pico/search.c:1022
 msgid "Srch Back"
 msgstr ""
 
-#: pico/search.c:832 pico/search.c:836 pico/search.c:1029 pico/search.c:1033
+#: pico/search.c:828 pico/search.c:832 pico/search.c:1025 pico/search.c:1029
 msgid "Anywhere"
 msgstr ""
 
-#: pico/search.c:851 pico/search.c:1049
+#: pico/search.c:847 pico/search.c:1045
 msgid " backward"
 msgstr ""
 
-#: pico/search.c:857 pico/search.c:1055
+#: pico/search.c:853 pico/search.c:1051
 msgid " at start of line"
 msgstr ""
 
-#: pico/search.c:862 pico/search.c:1060
+#: pico/search.c:858 pico/search.c:1056
 msgid " at end of line"
 msgstr ""
 
-#: pico/search.c:868 pico/search.c:1066
+#: pico/search.c:864 pico/search.c:1062
 msgid " exactly for"
 msgstr ""
 
-#: pico/search.c:950
+#: pico/search.c:946
 msgid "No Line Number"
 msgstr ""
 
-#: pico/fileio.c:76
+#: pico/fileio.c:72
 #, 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
+#: pico/buffer.c:151
 msgid "Discard changes"
 msgstr ""
 
-#: pico/word.c:660 pico/word.c:692
+#: pico/word.c:656 pico/word.c:688
 msgid "Region"
 msgstr ""
 
-#: pico/word.c:664 pico/word.c:699
+#: pico/word.c:660 pico/word.c:695
 msgid "Paragraph"
 msgstr ""
 
-#: pico/word.c:666 pico/word.c:708
+#: pico/word.c:662 pico/word.c:704
 msgid "Quotelevel"
 msgstr ""
 
@@ -11237,273 +12049,273 @@ msgstr ""
 #. Leave the ~ characters where they are, they cause the following
 #. character to be printed in boldface as long as the first character
 #. of the line is also a ~.
-#: pico/bind.c:44
+#: pico/bind.c:40
 msgid "        Pico Help Text"
 msgstr ""
 
-#: pico/bind.c:46
+#: pico/bind.c:42
 msgid "        Pico is designed to be a simple, easy-to-use text editor with a"
 msgstr ""
 
-#: pico/bind.c:47
+#: pico/bind.c:43
 msgid ""
 "        layout very similar to the Alpine mailer.  The status line at the"
 msgstr ""
 
-#: pico/bind.c:48
+#: pico/bind.c:44
 msgid "        top of the display shows pico's version, the current file being"
 msgstr ""
 
-#: pico/bind.c:49
+#: pico/bind.c:45
 msgid "        edited and whether or not there are outstanding modifications"
 msgstr ""
 
-#: pico/bind.c:50
+#: pico/bind.c:46
 msgid ""
 "        that have not been saved.  The third line from the bottom is used"
 msgstr ""
 
-#: pico/bind.c:51
+#: pico/bind.c:47
 msgid ""
 "        to report informational messages and for additional command input."
 msgstr ""
 
-#: pico/bind.c:52
+#: pico/bind.c:48
 msgid "        The bottom two lines list the available editing commands."
 msgstr ""
 
-#: pico/bind.c:54
+#: pico/bind.c:50
 msgid "        Each character typed is automatically inserted into the buffer"
 msgstr ""
 
-#: pico/bind.c:55
+#: pico/bind.c:51
 msgid "        at the current cursor position.  Editing commands and cursor"
 msgstr ""
 
-#: pico/bind.c:56
+#: pico/bind.c:52
 msgid "        movement (besides arrow keys) are given to pico by typing"
 msgstr ""
 
-#: pico/bind.c:57
+#: pico/bind.c:53
 msgid "        special control-key sequences.  A caret, '^', is used to denote"
 msgstr ""
 
-#: pico/bind.c:58
+#: pico/bind.c:54
 msgid ""
 "~        the control key, sometimes marked \"CTRL\", so the ~C~T~R~L~-~q key"
 msgstr ""
 
-#: pico/bind.c:59
+#: pico/bind.c:55
 msgid "~        combination is written as ~^~Q."
 msgstr ""
 
-#: pico/bind.c:61
+#: pico/bind.c:57
 msgid ""
 "        The following functions are available in pico (where applicable,"
 msgstr ""
 
-#: pico/bind.c:62
+#: pico/bind.c:58
 msgid "        corresponding function key commands are in parentheses)."
 msgstr ""
 
-#: pico/bind.c:64
+#: pico/bind.c:60
 msgid "~        ~^~G (~F~1)   Display this help text."
 msgstr ""
 
-#: pico/bind.c:66
+#: pico/bind.c:62
 msgid "~        ~^~F        move Forward a character."
 msgstr ""
 
-#: pico/bind.c:67
+#: pico/bind.c:63
 msgid "~        ~^~B        move Backward a character."
 msgstr ""
 
-#: pico/bind.c:68
+#: pico/bind.c:64
 msgid "~        ~^~P        move to the Previous line."
 msgstr ""
 
-#: pico/bind.c:69
+#: pico/bind.c:65
 msgid "~        ~^~N        move to the Next line."
 msgstr ""
 
-#: pico/bind.c:70
+#: pico/bind.c:66
 msgid "~        ~^~A        move to the beginning of the current line."
 msgstr ""
 
-#: pico/bind.c:71
+#: pico/bind.c:67
 msgid "~        ~^~E        move to the End of the current line."
 msgstr ""
 
-#: pico/bind.c:72
+#: pico/bind.c:68
 msgid "~        ~^~V (~F~8)   move forward a page of text."
 msgstr ""
 
-#: pico/bind.c:73
+#: pico/bind.c:69
 msgid "~        ~^~Y (~F~7)   move backward a page of text."
 msgstr ""
 
-#: pico/bind.c:75
+#: pico/bind.c:71
 msgid "~        ~^~W (~F~6)   Search for (where is) text, neglecting case."
 msgstr ""
 
-#: pico/bind.c:76
+#: pico/bind.c:72
 msgid "~        ~^~L        Refresh the display."
 msgstr ""
 
-#: pico/bind.c:78
+#: pico/bind.c:74
 msgid "~        ~^~D        Delete the character at the cursor position."
 msgstr ""
 
-#: pico/bind.c:79
+#: pico/bind.c:75
 msgid ""
 "~        ~^~^        Mark cursor position as beginning of selected text."
 msgstr ""
 
-#: pico/bind.c:80
+#: pico/bind.c:76
 msgid "                  Note: Setting mark when already set unselects text."
 msgstr ""
 
-#: pico/bind.c:81
+#: pico/bind.c:77
 msgid ""
 "~        ~^~K (~F~9)   Cut selected text (displayed in inverse characters)."
 msgstr ""
 
-#: pico/bind.c:82
+#: pico/bind.c:78
 msgid "                  Note: The selected text's boundary on the cursor side"
 msgstr ""
 
-#: pico/bind.c:83
+#: pico/bind.c:79
 msgid "                        ends at the left edge of the cursor.  So, with "
 msgstr ""
 
-#: pico/bind.c:84
+#: pico/bind.c:80
 msgid "                        selected text to the left of the cursor, the "
 msgstr ""
 
-#: pico/bind.c:85
+#: pico/bind.c:81
 msgid "                        character under the cursor is not selected."
 msgstr ""
 
-#: pico/bind.c:86
+#: pico/bind.c:82
 msgid "~        ~^~U (~F~1~0)  Uncut (paste) last cut text inserting it at the"
 msgstr ""
 
-#: pico/bind.c:87
+#: pico/bind.c:83
 msgid "                  current cursor position."
 msgstr ""
 
-#: pico/bind.c:88
+#: pico/bind.c:84
 msgid "~        ~^~I        Insert a tab at the current cursor position."
 msgstr ""
 
-#: pico/bind.c:90
+#: pico/bind.c:86
 msgid "~        ~^~J (~F~4)   Format (justify) the current paragraph."
 msgstr ""
 
-#: pico/bind.c:91
+#: pico/bind.c:87
 msgid ""
 "                  Note: paragraphs delimited by blank lines or indentation."
 msgstr ""
 
-#: pico/bind.c:92
+#: pico/bind.c:88
 msgid "~        ~^~T (~F~1~2)  To invoke the spelling checker"
 msgstr ""
 
-#: pico/bind.c:93
+#: pico/bind.c:89
 msgid "~        ~^~C (~F~1~1)  Report current cursor position"
 msgstr ""
 
-#: pico/bind.c:95
+#: pico/bind.c:91
 msgid ""
 "~        ~^~R (~F~5)   Insert an external file at the current cursor "
 "position."
 msgstr ""
 
-#: pico/bind.c:96
+#: pico/bind.c:92
 msgid "~        ~^~O (~F~3)   Output the current buffer to a file, saving it."
 msgstr ""
 
-#: pico/bind.c:97
+#: pico/bind.c:93
 msgid "~        ~^~X (~F~2)   Exit pico, saving buffer."
 msgstr ""
 
-#: pico/bind.c:99
+#: pico/bind.c:95
 msgid "    End of Help."
 msgstr ""
 
-#: pico/bind.c:141
+#: pico/bind.c:137
 msgid "Help for the Alpine Composer"
 msgstr ""
 
-#: pico/bind.c:142
+#: pico/bind.c:138
 msgid "Help for Signature Editor"
 msgstr ""
 
 #. TRANSLATORS: Pico is the name of a program
-#: pico/bind.c:165
+#: pico/bind.c:161
 msgid "Help for Pico"
 msgstr ""
 
-#: pico/file.c:51
+#: pico/file.c:47
 msgid "Read file: "
 msgstr ""
 
-#: pico/file.c:55
+#: pico/file.c:51
 msgid "File reading disabled in secure mode"
 msgstr ""
 
-#: pico/file.c:60
+#: pico/file.c:56
 msgid "No file name entered"
 msgstr ""
 
-#: pico/file.c:66 pico/main.c:366
+#: pico/file.c:62 pico/main.c:362
 #, c-format
 msgid "Can't read file from outside of %s"
 msgstr ""
 
 #. TRANSLATORS: several lines of help text
-#: pico/file.c:77
+#: pico/file.c:73
 msgid "Insert File Help Text"
 msgstr ""
 
-#: pico/file.c:79
+#: pico/file.c:75
 msgid "        Type in a file name to have it inserted into your editing"
 msgstr ""
 
-#: pico/file.c:80
+#: pico/file.c:76
 msgid "        buffer between the line that the cursor is currently on"
 msgstr ""
 
-#: pico/file.c:81
+#: pico/file.c:77
 msgid "        and the line directly below it.  You may abort this by "
 msgstr ""
 
-#: pico/file.c:82
+#: pico/file.c:78
 msgid "~        typing the ~F~2 (~^~C) key after exiting help."
 msgstr ""
 
-#: pico/file.c:84
+#: pico/file.c:80
 msgid "End of Insert File Help"
 msgstr ""
 
 #. TRANSLATORS: several lines of help text
-#: pico/file.c:91
+#: pico/file.c:87
 msgid "Write File Help Text"
 msgstr ""
 
-#: pico/file.c:93
+#: pico/file.c:89
 msgid "        Type in a file name to have it written out, thus saving"
 msgstr ""
 
-#: pico/file.c:94
+#: pico/file.c:90
 msgid "        your buffer, to a file.  You can abort this by typing "
 msgstr ""
 
-#: pico/file.c:95
+#: pico/file.c:91
 msgid "~        the ~F~2 (~^~C) key after exiting help."
 msgstr ""
 
-#: pico/file.c:97
+#: pico/file.c:93
 msgid "End of Write File Help"
 msgstr ""
 
@@ -11511,522 +12323,522 @@ 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:143
+#: pico/file.c:139
 msgid "InsertFile"
 msgstr ""
 
-#: pico/file.c:143
+#: pico/file.c:139
 msgid "InsertMsg"
 msgstr ""
 
-#: pico/file.c:180
+#: pico/file.c:176
 #, c-format
 msgid "Message %s included"
 msgstr ""
 
-#: pico/file.c:186
+#: pico/file.c:182
 msgid "Can't insert file in restricted mode"
 msgstr ""
 
-#: pico/file.c:193
+#: pico/file.c:189
 #, c-format
 msgid "Can't insert file from outside of %s: too many ..'s"
 msgstr ""
 
-#: pico/file.c:200
+#: pico/file.c:196
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr ""
 
-#: pico/file.c:227
+#: pico/file.c:223
 msgid "Can't select messages yet!"
 msgstr ""
 
-#: pico/file.c:263
+#: pico/file.c:259
 msgid "Can't insert in restricted mode"
 msgstr ""
 
-#: pico/file.c:341 pico/file.c:348
+#: pico/file.c:337 pico/file.c:344
 msgid "Help for Insert File"
 msgstr ""
 
-#: pico/file.c:496
+#: pico/file.c:492
 msgid "New file"
 msgstr ""
 
-#: pico/file.c:503
+#: pico/file.c:499
 msgid "Reading file"
 msgstr ""
 
-#: pico/file.c:513
+#: pico/file.c:509
 #, c-format
 msgid "Read %ld lines"
 msgstr ""
 
-#: pico/file.c:515
+#: pico/file.c:511
 #, c-format
 msgid "Read 1 line"
 msgstr ""
 
 #. TRANSLATORS: Asking for name of file to write data into
-#: pico/file.c:590
+#: pico/file.c:586
 msgid "File Name to write : "
 msgstr ""
 
-#: pico/file.c:602
+#: pico/file.c:598
 #, c-format
 msgid "Can't write outside of %s: too many ..'s"
 msgstr ""
 
-#: pico/file.c:610
+#: pico/file.c:606
 #, c-format
 msgid "Can't write outside of %s"
 msgstr ""
 
-#: pico/file.c:754
+#: pico/file.c:750
 #, c-format
 msgid "File \"%s\" exists, OVERWRITE"
 msgstr ""
 
-#: pico/file.c:786 pico/file.c:833
+#: pico/file.c:782 pico/file.c:829
 #, c-format
 msgid "Wrote %s lines"
 msgstr ""
 
-#: pico/file.c:789 pico/file.c:836
+#: pico/file.c:785 pico/file.c:832
 msgid "Wrote 1 line"
 msgstr ""
 
-#: pico/file.c:816
+#: pico/file.c:812
 msgid "No file name"
 msgstr ""
 
-#: pico/file.c:961
+#: pico/file.c:957
 #, c-format
 msgid "Inserting %s."
 msgstr ""
 
-#: pico/file.c:974
+#: pico/file.c:970
 #, c-format
 msgid "Inserted %ld lines"
 msgstr ""
 
-#: pico/file.c:976
+#: pico/file.c:972
 #, c-format
 msgid "Inserted 1 line"
 msgstr ""
 
 #. TRANSLATORS: error message about command line
-#: pico/main.c:91 pico/pilot.c:53
+#: pico/main.c:87 pico/pilot.c:49
 #, c-format
 msgid "missing or empty argument to \"%c\" flag"
 msgstr ""
 
-#: pico/main.c:92
+#: pico/main.c:88
 #, c-format
 msgid "missing or empty argument to \"%s\" flag"
 msgstr ""
 
-#: pico/main.c:93 pico/pilot.c:54
+#: pico/main.c:89 pico/pilot.c:50
 #, c-format
 msgid "non numeric argument for \"%c\" flag"
 msgstr ""
 
-#: pico/main.c:94 pico/pilot.c:55
+#: pico/main.c:90 pico/pilot.c:51
 #, c-format
 msgid "missing color for \"%s\" flag"
 msgstr ""
 
-#: pico/main.c:95 pico/pilot.c:56
+#: pico/main.c:91 pico/pilot.c:52
 #, c-format
 msgid "missing character set for \"%s\" flag"
 msgstr ""
 
-#: pico/main.c:96 pico/pilot.c:57
+#: pico/main.c:92 pico/pilot.c:53
 #, c-format
 msgid "input character set \"%s\" is unsupported"
 msgstr ""
 
-#: pico/main.c:97 pico/pilot.c:58
+#: pico/main.c:93 pico/pilot.c:54
 #, 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:102
+#: pico/main.c:98
 msgid "Possible Starting Arguments for Pico editor:"
 msgstr ""
 
-#: pico/main.c:104 pico/pilot.c:65
+#: pico/main.c:100 pico/pilot.c:61
 msgid "\tArgument\t\tMeaning"
 msgstr ""
 
-#: pico/main.c:105
+#: pico/main.c:101
 msgid "\t -e \t\tComplete - allow file name completion"
 msgstr ""
 
-#: pico/main.c:106
+#: pico/main.c:102
 msgid "\t -k \t\tCut - let ^K cut from cursor position to end of line"
 msgstr ""
 
-#: pico/main.c:107 pico/pilot.c:66
+#: pico/main.c:103 pico/pilot.c:62
 msgid "\t -a \t\tShowDot - show dot files in file browser"
 msgstr ""
 
-#: pico/main.c:108 pico/pilot.c:67
+#: pico/main.c:104 pico/pilot.c:63
 msgid "\t -j \t\tGoto - allow 'Goto' command in file browser"
 msgstr ""
 
-#: pico/main.c:109 pico/pilot.c:68
+#: pico/main.c:105 pico/pilot.c:64
 msgid "\t -g \t\tShow - show cursor in file browser"
 msgstr ""
 
-#: pico/main.c:110 pico/pilot.c:69
+#: pico/main.c:106 pico/pilot.c:65
 msgid "\t -m \t\tMouse - turn on mouse support"
 msgstr ""
 
-#: pico/main.c:111 pico/pilot.c:71
+#: pico/main.c:107 pico/pilot.c:67
 msgid "\t -x \t\tNoKeyhelp - suppress keyhelp"
 msgstr ""
 
-#: pico/main.c:112
+#: pico/main.c:108
 msgid ""
 "\t -p \t\tPreserveStartStop - preserve \"start\"(^Q) and \"stop\"(^S) "
 "characters"
 msgstr ""
 
-#: pico/main.c:113 pico/pilot.c:72
+#: pico/main.c:109 pico/pilot.c:68
 msgid ""
 "\t -q \t\tTermdefWins - termcap or terminfo takes precedence over defaults"
 msgstr ""
 
-#: pico/main.c:114
+#: pico/main.c:110
 msgid ""
 "\t -Q <quotestr> \tSet quote string (eg. \"> \") esp. for composing email"
 msgstr ""
 
-#: pico/main.c:115
+#: pico/main.c:111
 msgid "\t -d \t\tRebind - let delete key delete current character"
 msgstr ""
 
-#: pico/main.c:116 pico/pilot.c:73
+#: pico/main.c:112 pico/pilot.c:69
 msgid "\t -f \t\tKeys - force use of function keys"
 msgstr ""
 
-#: pico/main.c:117
+#: pico/main.c:113
 msgid "\t -b \t\tReplace - allow search and replace"
 msgstr ""
 
-#: pico/main.c:118 pico/pilot.c:74
+#: pico/main.c:114 pico/pilot.c:70
 msgid "\t -h \t\tHelp - give this list of options"
 msgstr ""
 
-#: pico/main.c:119
+#: pico/main.c:115
 msgid "\t -r[#cols] \tFill - set fill column to #cols columns, default=72"
 msgstr ""
 
-#: pico/main.c:120 pico/pilot.c:80
+#: pico/main.c:116 pico/pilot.c:76
 msgid "\t -n[#s] \tMail - notify about new mail every #s seconds, default=180"
 msgstr ""
 
-#: pico/main.c:121
+#: pico/main.c:117
 msgid "\t -s <speller> \tSpeller - specify alternative speller"
 msgstr ""
 
-#: pico/main.c:122 pico/pilot.c:81
+#: pico/main.c:118 pico/pilot.c:77
 msgid "\t -t \t\tShutdown - enable special shutdown mode"
 msgstr ""
 
-#: pico/main.c:123 pico/pilot.c:82
+#: pico/main.c:119 pico/pilot.c:78
 msgid "\t -o <dir>\tOperation - specify the operating directory"
 msgstr ""
 
-#: pico/main.c:124 pico/pilot.c:83
+#: pico/main.c:120 pico/pilot.c:79
 msgid "\t -z \t\tSuspend - allow use of ^Z suspension"
 msgstr ""
 
-#: pico/main.c:125
+#: pico/main.c:121
 msgid "\t -w \t\tNoWrap - turn off word wrap"
 msgstr ""
 
-#: pico/main.c:126
+#: pico/main.c:122
 msgid "\t -W <wordseps> \tSet word separators other than whitespace"
 msgstr ""
 
-#: pico/main.c:128 pico/pilot.c:76
+#: pico/main.c:124 pico/pilot.c:72
 msgid ""
 "\t -dcs <display_character_set> \tdefault uses LANG or LC_CTYPE from "
 "environment"
 msgstr ""
 
-#: pico/main.c:129 pico/pilot.c:77
+#: pico/main.c:125 pico/pilot.c:73
 msgid "\t -kcs <keyboard_character_set> \tdefaults to display_character_set"
 msgstr ""
 
-#: pico/main.c:130 pico/pilot.c:78
+#: pico/main.c:126 pico/pilot.c:74
 msgid "\t -syscs\t\tuse system-supplied translation routines"
 msgstr ""
 
-#: pico/main.c:133
+#: pico/main.c:129
 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
+#: pico/main.c:130 pico/pilot.c:81
 msgid "\t -cnf color \tforeground color"
 msgstr ""
 
-#: pico/main.c:135 pico/pilot.c:86
+#: pico/main.c:131 pico/pilot.c:82
 msgid "\t -cnb color \tbackground color"
 msgstr ""
 
-#: pico/main.c:136 pico/pilot.c:87
+#: pico/main.c:132 pico/pilot.c:83
 msgid "\t -crf color \treverse foreground color"
 msgstr ""
 
-#: pico/main.c:137 pico/pilot.c:88
+#: pico/main.c:133 pico/pilot.c:84
 msgid "\t -crb color \treverse background color"
 msgstr ""
 
-#: pico/main.c:140
+#: pico/main.c:136
 msgid "\t -color_code  \tdisplay number codes for different colors"
 msgstr ""
 
-#: pico/main.c:141
+#: pico/main.c:137
 msgid "\t -ncolors number \tnumber of colors for screen (8, 16, or 256)"
 msgstr ""
 
-#: pico/main.c:142
+#: pico/main.c:138
 msgid "\t -ntfc number \tnumber of color of foreground text"
 msgstr ""
 
-#: pico/main.c:143
+#: pico/main.c:139
 msgid "\t -ntbc number \tnumber of color of the background"
 msgstr ""
 
-#: pico/main.c:144
+#: pico/main.c:140
 msgid "\t -rtfc number \tnumber of color of reverse text"
 msgstr ""
 
-#: pico/main.c:145
+#: pico/main.c:141
 msgid "\t -rtbc number \tnumber of color of reverse background"
 msgstr ""
 
-#: pico/main.c:146
+#: pico/main.c:142
 msgid "\t -tbfc number \tnumber of color of foreground (text) of the title bar"
 msgstr ""
 
-#: pico/main.c:147
+#: pico/main.c:143
 msgid "\t -tbbc number \tnumber of color of background of the title bar"
 msgstr ""
 
-#: pico/main.c:148
+#: pico/main.c:144
 msgid "\t -klfc number \tnumber of color of foreground (text) of the key label"
 msgstr ""
 
-#: pico/main.c:149
+#: pico/main.c:145
 msgid "\t -klbc number \tnumber of color of background of the key label"
 msgstr ""
 
-#: pico/main.c:150
+#: pico/main.c:146
 msgid "\t -knfc number \tnumber of color of foreground (text) of the key name"
 msgstr ""
 
-#: pico/main.c:151
+#: pico/main.c:147
 msgid "\t -knbc number \tnumber of color of background of the key name"
 msgstr ""
 
-#: pico/main.c:152
+#: pico/main.c:148
 msgid ""
 "\t -stfc number \tnumber of color of foreground (text) of the status line"
 msgstr ""
 
-#: pico/main.c:153
+#: pico/main.c:149
 msgid "\t -stbc number \tnumber of color of background of the status line"
 msgstr ""
 
-#: pico/main.c:154
+#: pico/main.c:150
 msgid "\t -prfc number \tnumber of color of foreground (text) of a prompt"
 msgstr ""
 
-#: pico/main.c:155
+#: pico/main.c:151
 msgid "\t -prbc number \tnumber of color of background of a prompt"
 msgstr ""
 
-#: pico/main.c:156
+#: pico/main.c:152
 msgid ""
 "\t -q1fc number \tnumber of color of foreground (text) of level one of "
 "quoted text"
 msgstr ""
 
-#: pico/main.c:157
+#: pico/main.c:153
 msgid ""
 "\t -q1bc number \tnumber of color of background of level one of quoted text"
 msgstr ""
 
-#: pico/main.c:158
+#: pico/main.c:154
 msgid ""
 "\t -q2fc number \tnumber of color of foreground (text) of level two of "
 "quoted text"
 msgstr ""
 
-#: pico/main.c:159
+#: pico/main.c:155
 msgid ""
 "\t -q2bc number \tnumber of color of background of level two of quoted text"
 msgstr ""
 
-#: pico/main.c:160
+#: pico/main.c:156
 msgid ""
 "\t -q3fc number \tnumber of color of foreground (text) of level three of "
 "quoted text"
 msgstr ""
 
-#: pico/main.c:161
+#: pico/main.c:157
 msgid ""
 "\t -q3bc number \tnumber of color of background of level three of quoted text"
 msgstr ""
 
-#: pico/main.c:162
+#: pico/main.c:158
 msgid "\t -sbfc number \tnumber of color of foreground of signature block text"
 msgstr ""
 
-#: pico/main.c:163
+#: pico/main.c:159
 msgid "\t -sbbc number \tnumber of color of background of signature block text"
 msgstr ""
 
-#: pico/main.c:165
+#: pico/main.c:161
 msgid "\t +[line#] \tLine - start on line# line, default=1"
 msgstr ""
 
-#: pico/main.c:166
+#: pico/main.c:162
 msgid "\t -v \t\tView - view file"
 msgstr ""
 
-#: pico/main.c:167 pico/pilot.c:90
+#: pico/main.c:163 pico/pilot.c:86
 msgid "\t -no_setlocale_collate\tdo not do setlocale(LC_COLLATE)"
 msgstr ""
 
-#: pico/main.c:168
+#: pico/main.c:164
 msgid "\t -version\tPico version number"
 msgstr ""
 
-#: pico/main.c:170
+#: pico/main.c:166
 msgid "\t All arguments may be followed by a file name to display."
 msgstr ""
 
-#: pico/main.c:397 pico/pilot.c:216
+#: pico/main.c:393 pico/pilot.c:212
 #, c-format
 msgid "Checking for new mail every %s seconds"
 msgstr ""
 
-#: pico/main.c:757
+#: pico/main.c:750
 #, c-format
 msgid "Unsupported number of colors: %d"
 msgstr ""
 
-#: pico/main.c:1277 pico/pilot.c:463
+#: pico/main.c:1270 pico/pilot.c:459
 #, c-format
 msgid "Argument Error: %.200s"
 msgstr ""
 
 #. TRANSLATORS: little help printed out when incorrect arguments are
 #. given for pilot program.
-#: pico/pilot.c:63
+#: pico/pilot.c:59
 msgid "Possible Starting Arguments for Pilot file browser:"
 msgstr ""
 
-#: pico/pilot.c:70
+#: pico/pilot.c:66
 msgid "\t -v \t\tOneColumn - use single column display"
 msgstr ""
 
-#: pico/pilot.c:92
+#: pico/pilot.c:88
 msgid "\t All arguments may be followed by a directory name to start in."
 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:4428
+#: pico/composer.c:131 pico/composer.c:4433
 msgid "Rich Hdr"
 msgstr ""
 
-#: pico/composer.c:135
+#: pico/composer.c:131
 msgid "PrvPg/Top"
 msgstr ""
 
 #. TRANSLATORS: Cut Line means remove a line. Postpone means to save
 #. a message being composed so that it can be worked on later.
-#: pico/composer.c:138
+#: pico/composer.c:134
 msgid "Cut Line"
 msgstr ""
 
 #. TRANSLATORS: Next Page
-#: pico/composer.c:142
+#: pico/composer.c:138
 msgid "Attach"
 msgstr ""
 
-#: pico/composer.c:142
+#: pico/composer.c:138
 msgid "NxtPg/End"
 msgstr ""
 
 #. TRANSLATORS: Undelete a line that was just deleted
-#: pico/composer.c:144
+#: pico/composer.c:140
 msgid "UnDel Line"
 msgstr ""
 
-#: pico/composer.c:268
+#: pico/composer.c:264
 #, c-format
 msgid "Can't realloc addrbuf to %d bytes"
 msgstr ""
 
-#: pico/composer.c:754
+#: pico/composer.c:750
 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
+#: pico/composer.c:755 pico/composer.c:1003 pico/composer.c:1316
+#: pico/composer.c:1650 pico/composer.c:1752 pico/composer.c:1865
 msgid "Format lines failed!"
 msgstr ""
 
-#: pico/composer.c:1726
+#: pico/composer.c:1722
 #, c-format
 msgid "Can't move beyond top of %s"
 msgstr ""
 
-#: pico/composer.c:1840
+#: pico/composer.c:1836
 msgid "Can't allocate line for new attachment!"
 msgstr ""
 
-#: pico/composer.c:1863
+#: pico/composer.c:1859
 #, c-format
 msgid "Problem attaching: %s"
 msgstr ""
 
-#: pico/composer.c:1952
+#: pico/composer.c:1948
 msgid "Please make the screen larger."
 msgstr ""
 
-#: pico/composer.c:2026 pico/composer.c:2248 pico/composer.c:2262
+#: pico/composer.c:2022 pico/composer.c:2244 pico/composer.c:2258
 msgid "Can't edit attachment number!"
 msgstr ""
 
 #. TRANSLATORS: Killing text is deleting it and
 #. Unkilling text is undeleting killed text.
-#: pico/composer.c:2199
+#: pico/composer.c:2195
 msgid "Problem Unkilling text"
 msgstr ""
 
-#: pico/composer.c:4435
+#: pico/composer.c:4440
 msgid "Edit File"
 msgstr ""
 
-#: pith/charconv/utf8.c:1947
+#: pith/charconv/utf8.c:1999
 #, c-format
 msgid "Display character set \"%s\" is ignored when using system translation"
 msgstr ""
 
-#: pith/charconv/utf8.c:1959
+#: pith/charconv/utf8.c:2011
 #, c-format
 msgid "Keyboard character set \"%s\" is ignored when using system translation"
 msgstr ""
@@ -12035,417 +12847,457 @@ 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:2007 pith/charconv/utf8.c:2045
+#: pith/charconv/utf8.c:2059 pith/charconv/utf8.c:2097
 #, c-format
 msgid "Character set \"%s\" is unsupported%s, using US-ASCII"
 msgstr ""
 
-#: pith/charconv/utf8.c:2009 pith/charconv/utf8.c:2047
+#: pith/charconv/utf8.c:2061 pith/charconv/utf8.c:2099
 msgid " (except for posting)"
 msgstr ""
 
-#: pith/charconv/utf8.c:2061
+#: pith/charconv/utf8.c:2113
 msgid "Help, can't figure out display character set or even use US-ASCII."
 msgstr ""
 
-#: pith/osdep/debugtime.c:48
+#: pith/osdep/debugtime.c:44
 msgid "Time Unavailable"
 msgstr ""
 
 #. TRANSLATORS: User is viewing a message and all the quoted text is
 #. being shown.
-#: pith/mailview.c:170
+#: pith/mailview.c:169
 msgid "All quoted text being included"
 msgstr ""
 
-#: pith/mailview.c:207
+#: pith/mailview.c:213
 #, c-format
 msgid "Error writing message: %s"
 msgstr ""
 
+#: pith/mailview.c:265 pith/mailview.c:274
+msgid "Calendar Entry:"
+msgstr ""
+
+#: pith/mailview.c:308
+msgid "This event was cancelled!"
+msgstr ""
+
+#: pith/mailview.c:320
+msgid "Sent-by: "
+msgstr ""
+
+#: pith/mailview.c:362
+msgid "No duration nor end time found for this event"
+msgstr ""
+
+#: pith/mailview.c:377
+msgid "Attendee: "
+msgstr ""
+
+#: pith/mailview.c:411
+msgid "More Details"
+msgstr ""
+
+#: pith/mailview.c:507
+msgid "Error fetching calendar body part"
+msgstr ""
+
+#: pith/mailview.c:514
+msgid "Error fetching calendar text"
+msgstr ""
+
+#: pith/mailview.c:523
+msgid "Error in calendar base64 encoding"
+msgstr ""
+
+#: pith/mailview.c:533
+msgid "Error in calendar quoted printable encoding"
+msgstr ""
+
 #. TRANSLATORS: There was an error putting together a message for
 #. viewing. The arg is the description of the error.
-#: pith/mailview.c:315 pith/mailview.c:2153
+#: pith/mailview.c:665 pith/mailview.c:2514
 #, c-format
 msgid "Formatting error: %s"
 msgstr ""
 
-#: pith/mailview.c:328 pith/reply.c:2686
+#: pith/mailview.c:678 pith/reply.c:2778
 msgid "    [ERROR fetching text of message]"
 msgstr ""
 
 #. TRANSLATORS: A label
-#: pith/mailview.c:585 pith/mailview.c:598
+#: pith/mailview.c:941 pith/mailview.c:954
 msgid "Parts/Attachments:"
 msgstr ""
 
-#: pith/init.c:139
+#: pith/init.c:135
 #, c-format
 msgid "Folders directory name is longer than %d\n"
 msgstr ""
 
-#: pith/init.c:140
+#: pith/init.c:136
 #, c-format
 msgid "Directory name: \"%s/%s\"\n"
 msgstr ""
 
-#: pith/init.c:265
+#: pith/init.c:261
 #, c-format
 msgid "Incomplete maildomain \"%s\"."
 msgstr ""
 
-#: pith/init.c:269
+#: pith/init.c:265
 msgid "Return address in mail you send may be incorrect."
 msgstr ""
 
-#: pith/init.c:289
+#: pith/init.c:285
 #, c-format
 msgid "No host name or domain name set\n"
 msgstr ""
 
 #. TRANSLATORS: arg is a filename
-#: pith/init.c:527
+#: pith/init.c:523
 #, c-format
 msgid "Renaming \"%s\" at start of month"
 msgstr ""
 
 #. TRANSLATORS: 1st arg is filename, 2nd is error message
-#: pith/init.c:533
+#: pith/init.c:529
 #, c-format
 msgid "Error renaming \"%s\": %s"
 msgstr ""
 
 #. TRANSLATORS: This is a heading describing some addresses the
 #. user will have the chance to choose from.
-#: pith/takeaddr.c:563
+#: pith/takeaddr.c:559
 msgid " These entries are taken from the attachments "
 msgstr ""
 
-#: pith/takeaddr.c:574 pith/takeaddr.c:626
+#: pith/takeaddr.c:570 pith/takeaddr.c:622
 msgid "Can't take address into address book. Error accessing folder"
 msgstr ""
 
 #. TRANSLATORS: msg is message
-#: pith/takeaddr.c:599
+#: pith/takeaddr.c:595
 msgid " These entries are taken from the msg headers "
 msgstr ""
 
-#: pith/takeaddr.c:683
+#: pith/takeaddr.c:679
 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:1806
+#: pith/conf.c:1900
 msgid "Exiting because -bail option is set and config file doesn't exist."
 msgstr ""
 
-#: pith/conf.c:2588
+#: pith/conf.c:2695
 msgid "Only using first character of threading-indicator-character option"
 msgstr ""
 
-#: pith/conf.c:2595
+#: pith/conf.c:2702
 msgid "Only using first character of threading-expanded-character option"
 msgstr ""
 
-#: pith/conf.c:2605
+#: pith/conf.c:2712
 msgid "Only using first character of threading-lastreply-character option"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2732
+#: pith/conf.c:2839
 msgid "Advanced User Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2735
+#: pith/conf.c:2842
 msgid "Folder Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2738
+#: pith/conf.c:2845
 msgid "Address Book Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2741
+#: pith/conf.c:2848
 msgid "Composer Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2744
+#: pith/conf.c:2851
 msgid "News Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2747
+#: pith/conf.c:2854
 msgid "Viewer Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2750
+#: pith/conf.c:2857
 msgid "Advanced Command Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2753
+#: pith/conf.c:2860
 msgid "Printer Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2756
+#: pith/conf.c:2863
 msgid "Reply Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2759
+#: pith/conf.c:2866
 msgid "Sending Preferences"
 msgstr ""
 
 #. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2762
+#: pith/conf.c:2869
 msgid "Message Index Preferences"
 msgstr ""
 
-#: pith/conf.c:5082
+#: pith/conf.c:5193
 msgid "Unable to read or write remote configuration"
 msgstr ""
 
-#: pith/conf.c:5612
+#: pith/conf.c:5722
 msgid "Can't access remote config, changes NOT saved!"
 msgstr ""
 
-#: pith/conf.c:5638
+#: pith/conf.c:5748
 #, c-format
 msgid "No write permission for remote config %.200s, changes NOT saved!"
 msgstr ""
 
-#: pith/conf.c:5644
+#: pith/conf.c:5754
 msgid "Remote config changed, aborting our change to avoid damage..."
 msgstr ""
 
-#: pith/conf.c:5696
+#: pith/conf.c:5806
 #, 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:5726
+#: pith/conf.c:5836
 #, c-format
 msgid "Error creating \"%.200s\" : %.200s"
 msgstr ""
 
-#: pith/conf.c:5995
+#: pith/conf.c:6113
 msgid "Copying to remote config"
 msgstr ""
 
-#: pith/conf.c:6003 pith/adrbklib.c:3413
+#: pith/conf.c:6121 pith/adrbklib.c:3411
 #, c-format
 msgid "Error copying to %.200s: %.200s"
 msgstr ""
 
-#: pith/conf.c:6007
+#: pith/conf.c:6125
 msgid "Copy of config to remote folder failed, changes NOT saved remotely"
 msgstr ""
 
-#: pith/conf.c:6045
+#: pith/conf.c:6163
 #, 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:6168
+#: pith/conf.c:6286
 #, c-format
 msgid "Must quit Alpine to change %sconfig file."
 msgstr ""
 
-#: pith/conf.c:6927
+#: pith/conf.c:7045
 #, c-format
 msgid "Posting-Character set \"%s\" is unsupported, using UTF-8"
 msgstr ""
 
-#: pith/conf.c:6942
+#: pith/conf.c:7060
 msgid "(fixed)"
 msgstr ""
 
-#: pith/conf.c:6943
+#: pith/conf.c:7061
 msgid "(default)"
 msgstr ""
 
-#: pith/conf.c:6944
+#: pith/conf.c:7062
 msgid "(overridden)"
 msgstr ""
 
-#: pith/conf.c:7157
+#: pith/conf.c:7338
 msgid "This option has no effect without Enable-Incoming-Folders"
 msgstr ""
 
-#: pith/conf.c:7336
+#: pith/conf.c:7517
 #, c-format
 msgid "Posting-Character-Set \"%s\" is unsupported, using UTF-8"
 msgstr ""
 
-#: pith/conf.c:7349
+#: pith/conf.c:7530
 msgid "Posting-Character-Set is ignored with Use-System-Translation turned on"
 msgstr ""
 
-#: pith/conf.c:7507
+#: pith/conf.c:7688
 #, c-format
 msgid "No local file specified"
 msgstr ""
 
-#: pith/conf.c:7512
+#: pith/conf.c:7693
 #, c-format
 msgid "No remote folder specified"
 msgstr ""
 
-#: pith/conf.c:7517
+#: pith/conf.c:7698
 #, c-format
 msgid "Remote folder name \"%s\" %s"
 msgstr ""
 
-#: pith/conf.c:7518
+#: pith/conf.c:7699
 msgid "must begin with \"{\""
 msgstr ""
 
-#: pith/conf.c:7518
+#: pith/conf.c:7699
 msgid "not valid"
 msgstr ""
 
-#: pith/conf.c:7523
+#: pith/conf.c:7704
 #, c-format
 msgid "First argument \"%s\" must be a local filename"
 msgstr ""
 
-#: pith/conf.c:7529
+#: pith/conf.c:7710
 #, c-format
 msgid "Local file \"%s\" does not exist"
 msgstr ""
 
-#: pith/conf.c:7534
+#: pith/conf.c:7715
 #, c-format
 msgid "Can't read local file \"%s\": %s"
 msgstr ""
 
-#: pith/conf.c:7544 pith/remote.c:98 pith/reply.c:3534
+#: pith/conf.c:7725 pith/remote.c:94 pith/reply.c:3605
 msgid "Error: "
 msgstr ""
 
-#: pith/conf.c:7544
+#: pith/conf.c:7725
 msgid "Can't copy to remote folder."
 msgstr ""
 
-#: pith/conf.c:7547
+#: pith/conf.c:7728
 #, c-format
 msgid "Can't create \"%s\""
 msgstr ""
 
-#: pith/conf.c:7562
+#: pith/conf.c:7743
 #, c-format
 msgid "Can't open remote folder \"%s\""
 msgstr ""
 
-#: pith/conf.c:7568
+#: pith/conf.c:7749
 #, c-format
 msgid "Remote folder \"%s\" is readonly"
 msgstr ""
 
-#: pith/conf.c:7581
+#: pith/conf.c:7762
 #, c-format
 msgid "Failed initializing remote folder \"%s\", check debug file"
 msgstr ""
 
-#: pith/conf.c:7602
+#: pith/conf.c:7783
 #, c-format
 msgid "Error copying to remote folder \"%s\""
 msgstr ""
 
-#: pith/conf.c:8130
+#: pith/conf.c:8333
 msgid "Supported features in this Alpine"
 msgstr ""
 
 #. TRANSLATORS: headings
-#: pith/conf.c:8168
+#: pith/conf.c:8371
 msgid "Encryption:"
 msgstr ""
 
-#: pith/conf.c:8171
+#: pith/conf.c:8374
 msgid "  TLS and SSL"
 msgstr ""
 
-#: pith/conf.c:8173
+#: pith/conf.c:8423
 msgid "  None (no TLS or SSL)"
 msgstr ""
 
-#: pith/conf.c:8187
+#: pith/conf.c:8436
 msgid "Authenticators:"
 msgstr ""
 
-#: pith/conf.c:8201
+#: pith/conf.c:8450
 msgid "Mailbox drivers:"
 msgstr ""
 
-#: pith/conf.c:8216
+#: pith/conf.c:8465
 msgid "Directories:"
 msgstr ""
 
-#: pith/conf.c:8232
+#: pith/conf.c:8481
 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:8236
+#: pith/conf.c:8485
 msgid ""
 "Authenticators may be disabled because of the \"disable-these-authenticators"
 "\""
 msgstr ""
 
-#: pith/conf.c:8238
+#: pith/conf.c:8487
 msgid "hidden config option. Mailbox drivers may be disabled because of the"
 msgstr ""
 
-#: pith/conf.c:8240
+#: pith/conf.c:8489
 msgid "\"disable-these-drivers\" hidden config option."
 msgstr ""
 
-#: pith/detach.c:166
+#: pith/detach.c:162
 msgid "Can't find body for requested message"
 msgstr ""
 
-#: pith/detach.c:281
+#: pith/detach.c:293
 msgid "Formatting error: no space to make copy, no display filters used"
 msgstr ""
 
-#: pith/detach.c:639 pith/detach.c:791
+#: pith/detach.c:651 pith/detach.c:803
 msgid "Message size does not match expected size, continuing..."
 msgstr ""
 
 #. TRANSLATORS: data transfer was interrupted by something
-#: pith/detach.c:705
+#: pith/detach.c:717
 msgid "Transfer interrupted!"
 msgstr ""
 
-#: pith/detach.c:795
+#: pith/detach.c:807
 msgid "Server returns zero bytes, Quell-Partial-Fetch feature may help"
 msgstr ""
 
 #. TRANSLATORS: a label
-#: pith/folder.c:568
+#: pith/folder.c:564
 msgid "Incoming Message Folders"
 msgstr ""
 
-#: pith/folder.c:595
+#: pith/folder.c:591
 msgid "No folder collections defined"
 msgstr ""
 
-#: pith/folder.c:2355 pith/mailcmd.c:1971
+#: pith/folder.c:2351 pith/mailcmd.c:1981
 msgid "new"
 msgstr ""
 
-#: pith/folder.c:2359 pith/mailcmd.c:1968
+#: pith/folder.c:2355 pith/mailcmd.c:1978
 msgid "unseen"
 msgstr ""
 
@@ -12466,91 +13318,91 @@ msgid "Unable to print this part."
 msgstr ""
 
 #. TRANSLATORS: tell user they are waiting for Sorting of %s, the foldername
-#: pith/sort.c:188 pith/sort.c:246
+#: pith/sort.c:184 pith/sort.c:242
 #, c-format
 msgid "Sorting \"%s\""
 msgstr ""
 
-#: pith/bldaddr.c:338
+#: pith/bldaddr.c:334
 msgid "Loop or Duplicate detected in addressbook!"
 msgstr ""
 
 #. TRANSLATORS: The first %s is a mailbox, the second is either
 #. directory or addressbook
-#: pith/bldaddr.c:656
+#: pith/bldaddr.c:652
 #, c-format
 msgid "Address for \"%s\" not in %s"
 msgstr ""
 
-#: pith/bldaddr.c:659
+#: pith/bldaddr.c:655
 msgid "addressbook"
 msgstr ""
 
-#: pith/mailindx.c:669
+#: pith/mailindx.c:666
 #, c-format
 msgid "Unrecognized word in index-format: %s"
 msgstr ""
 
-#: pith/mailindx.c:918
+#: pith/mailindx.c:915
 msgid "Configured \"index-format\" unrecognizable. Using default."
 msgstr ""
 
-#: pith/mailindx.c:2073 pith/mailindx.c:3283
+#: pith/mailindx.c:2070 pith/mailindx.c:3279
 msgid "[ No Message Text Available ]"
 msgstr ""
 
-#: pith/mailindx.c:4203
+#: pith/mailindx.c:4226
 msgid "Today"
 msgstr ""
 
-#: pith/mailindx.c:4706
+#: pith/mailindx.c:4729
 msgid "Yesterday"
 msgstr ""
 
-#: pith/mailindx.c:4710
+#: pith/mailindx.c:4733
 msgid "Tomorrow"
 msgstr ""
 
-#: pith/mailindx.c:4712
+#: pith/mailindx.c:4735
 #, c-format
 msgid "Next %.3s!"
 msgstr ""
 
-#: pith/thread.c:870
+#: pith/thread.c:866
 msgid "No thread to collapse or expand on this line"
 msgstr ""
 
-#: pith/thread.c:928
+#: pith/thread.c:924
 #, c-format
 msgid "Unselected %s messages in thread"
 msgstr ""
 
-#: pith/thread.c:931
+#: pith/thread.c:927
 #, c-format
 msgid "Selected %s messages in thread"
 msgstr ""
 
-#: pith/thread.c:935
+#: pith/thread.c:931
 #, c-format
 msgid "Selected %s more messages in thread"
 msgstr ""
 
-#: pith/pattern.c:1864
+#: pith/pattern.c:1861
 #, c-format
 msgid "Error: Interval \"%s\", min > max"
 msgstr ""
 
-#: pith/pattern.c:1867
+#: pith/pattern.c:1864
 #, c-format
 msgid "Error: Interval \"%s\": syntax is (min,max)"
 msgstr ""
 
-#: pith/pattern.c:3449
+#: pith/pattern.c:3446
 #, c-format
 msgid "Error renaming \"%s\" to \"%s\": %s"
 msgstr ""
 
-#: pith/pattern.c:3500
+#: pith/pattern.c:3497
 msgid "Unknown error saving pattern variable"
 msgstr ""
 
@@ -12578,233 +13430,236 @@ msgstr ""
 msgid "Can't set flags in readonly folder \"%s\""
 msgstr ""
 
-#: pith/abdlc.c:43
+#: pith/abdlc.c:39
 msgid "[ Permission Denied ]"
 msgstr ""
 
 #. TRANSLATORS: This is a heading referring to something that is readable
 #. but not writeable.
-#: pith/abdlc.c:46
+#: pith/abdlc.c:42
 msgid " (ReadOnly)"
 msgstr ""
 
 #. TRANSLATORS: Not readable
-#: pith/abdlc.c:48
+#: pith/abdlc.c:44
 msgid " (Un-readable)"
 msgstr ""
 
 #. TRANSLATORS: Directories, as in LDAP Directories. A heading.
-#: pith/abdlc.c:50
+#: pith/abdlc.c:46
 msgid "Directories"
 msgstr ""
 
-#: pith/abdlc.c:450
+#: pith/abdlc.c:446
 msgid "Addrbook changed unexpectedly, re-syncing..."
 msgstr ""
 
-#: pith/abdlc.c:452
+#: pith/abdlc.c:448
 msgid "addrbook changed while we had it open?, re-sync\n"
 msgstr ""
 
-#: pith/abdlc.c:810 pith/abdlc.c:1181 pith/abdlc.c:1939 pith/abdlc.c:2042
+#: pith/abdlc.c:806 pith/abdlc.c:1177 pith/abdlc.c:1935 pith/abdlc.c:2038
 msgid "Bug in addrbook, not supposed to happen, re-syncing..."
 msgstr ""
 
-#: pith/send.c:297
+#: pith/send.c:286
 #, c-format
 msgid "Can't open %s mailbox: %s"
 msgstr ""
 
-#: pith/send.c:309
+#: pith/send.c:298
 #, c-format
 msgid "%s message folder doesn't exist!"
 msgstr ""
 
-#: pith/send.c:888 pith/reply.c:1140 pith/reply.c:1195
+#: pith/send.c:877 pith/reply.c:1156 pith/reply.c:1233 pith/reply.c:1288
 msgid "Error including all message parts"
 msgstr ""
 
 #. TRANSLATORS: Arg is a mailbox name
-#: pith/send.c:1007
+#: pith/send.c:996
 #, 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:1506
+#: pith/send.c:1497
 #, c-format
 msgid "Can't send to address %s: %s"
 msgstr ""
 
-#: pith/send.c:1510
+#: pith/send.c:1501
 msgid "not in addressbook"
 msgstr ""
 
-#. TRANSLATORS: program is busy updating the Answered flags so warns user
-#: pith/send.c:1624
+#: pith/send.c:1604
+msgid "Setting \"Forwarded\" Keyword"
+msgstr ""
+
+#: pith/send.c:1605
 msgid "Updating \"Answered\" Flags"
 msgstr ""
 
-#: pith/send.c:1761
+#: pith/send.c:1700
 msgid "Can't send message. No recipients specified!"
 msgstr ""
 
-#: pith/send.c:1795
+#: pith/send.c:1734
 msgid "Sending mail"
 msgstr ""
 
-#: pith/send.c:2027
+#: pith/send.c:1966
 msgid "Delivery Status Notification not available from this server."
 msgstr ""
 
-#: pith/send.c:2034
+#: pith/send.c:1973
 #, c-format
 msgid "Mail not sent. Sending error%s%s"
 msgstr ""
 
-#: pith/send.c:2057 pith/send.c:2076
+#: pith/send.c:1996 pith/send.c:2015
 #, c-format
 msgid "Mail not sent: %.80s"
 msgstr ""
 
-#: pith/send.c:2102
+#: pith/send.c:2041
 #, c-format
 msgid "Error sending%.2s%.80s"
 msgstr ""
 
-#: pith/send.c:2442
+#: pith/send.c:2381
 msgid "Fcc creation error. Message NOT sent or copied."
 msgstr ""
 
-#: pith/send.c:2445
+#: pith/send.c:2384
 msgid "Fcc creation rejected. Message NOT sent or copied."
 msgstr ""
 
-#: pith/send.c:4409
+#: pith/send.c:4381
 #, c-format
 msgid "Encoding Error \"%s\""
 msgstr ""
 
-#: pith/send.c:4426
-msgid "The following attachment was sent,"
+#: pith/send.c:4398
+msgid "The following attachment was sent,\r\n"
 msgstr ""
 
-#: pith/send.c:4427
-msgid "but NOT saved in the Fcc copy:"
+#: pith/send.c:4399
+msgid "but NOT saved in the Fcc copy:\r\n"
 msgstr ""
 
-#: pith/send.c:5039
+#: pith/send.c:5014
 #, c-format
 msgid "Space not allowed in header name (%s)"
 msgstr ""
 
-#: pith/send.c:5050
+#: pith/send.c:5025
 #, c-format
 msgid "Not allowed to change header \"%s\""
 msgstr ""
 
-#: pith/send.c:5418
+#: pith/send.c:5401
 #, c-format
 msgid "Error posting message: %s"
 msgstr ""
 
-#: pith/send.c:5438
+#: pith/send.c:5421
 #, c-format
 msgid "Error connecting to news server: %s"
 msgstr ""
 
-#: pith/send.c:5451 pith/send.c:5639
+#: pith/send.c:5434 pith/send.c:5626
 #, c-format
 msgid "Can't post, NNTP-server must be defined!"
 msgstr ""
 
-#: pith/send.c:5488
+#: pith/send.c:5471
 msgid "SMTP-server must be defined!"
 msgstr ""
 
-#: pith/send.c:5500
+#: pith/send.c:5483
 msgid "No default posting command."
 msgstr ""
 
-#: pith/send.c:5631
+#: pith/send.c:5618
 #, c-format
 msgid "News not posted: \"%s\": %s"
 msgstr ""
 
-#: pith/send.c:5671
+#: pith/send.c:5658
 msgid "Error posting."
 msgstr ""
 
-#: pith/send.c:5676
+#: pith/send.c:5663
 #, c-format
 msgid "Posting program %s returned error"
 msgstr ""
 
-#: pith/send.c:5682
+#: pith/send.c:5669
 #, c-format
 msgid "Error running \"%s\""
 msgstr ""
 
-#: pith/send.c:5755
+#: pith/send.c:5742
 #, c-format
 msgid "Unexpected hostname for piped SMTP: %.*s"
 msgstr ""
 
 #. TRANSLATORS: Arg is replaced with the command name or the word Command
-#: pith/mailcmd.c:130
+#: pith/mailcmd.c:126
 #, c-format
 msgid "%s cancelled"
 msgstr ""
 
-#: pith/mailcmd.c:265
+#: pith/mailcmd.c:261
 msgid "Deletion mark removed, message won't be deleted"
 msgstr ""
 
-#: pith/mailcmd.c:266
+#: pith/mailcmd.c:262
 msgid "Message not marked for deletion; no action taken"
 msgstr ""
 
-#: pith/mailcmd.c:270
+#: pith/mailcmd.c:266
 #, c-format
 msgid "Deletion mark removed from %s message%s"
 msgstr ""
 
-#: pith/mailcmd.c:675
+#: pith/mailcmd.c:671
 #, c-format
 msgid "Opened folder \"%s\" with %s messages%s"
 msgstr ""
 
-#: pith/mailcmd.c:676
+#: pith/mailcmd.c:672
 #, c-format
 msgid "Opened folder \"%s\" with %s message%s"
 msgstr ""
 
-#: pith/mailcmd.c:1964
+#: pith/mailcmd.c:1974
 msgid "recent"
 msgstr ""
 
 #. TRANSLATORS: warning to user that we're busy selecting messages
-#: pith/mailcmd.c:2454
+#: pith/mailcmd.c:2470
 msgid "Busy Selecting"
 msgstr ""
 
-#: pith/adrbklib.c:275
+#: pith/adrbklib.c:271
 msgid "Can't contact remote address book server, using cached copy"
 msgstr ""
 
 #. TRANSLATORS: A temporary file for the address book can't
 #. be opened.
-#: pith/adrbklib.c:489
+#: pith/adrbklib.c:485
 #, c-format
 msgid "Temp addrbook file can't be opened: %s"
 msgstr ""
 
-#: pith/adrbklib.c:494
+#: pith/adrbklib.c:490
 msgid "Address book doesn't exist"
 msgstr ""
 
-#: pith/adrbklib.c:503
+#: pith/adrbklib.c:499
 #, c-format
 msgid "Address book %.200s doesn't exist, creating"
 msgstr ""
@@ -12812,284 +13667,284 @@ msgstr ""
 #. TRANSLATORS: The address book was changed by something else so alpine
 #. is not making the change the user wanted to make to avoid damaging
 #. the address book.
-#: pith/adrbklib.c:2941
+#: pith/adrbklib.c:2939
 msgid ""
 "Addrbook changed by another process, aborting our change to avoid damage..."
 msgstr ""
 
-#: pith/adrbklib.c:2970
+#: pith/adrbklib.c:2968
 msgid "Can't access remote addrbook, aborting change..."
 msgstr ""
 
-#: pith/adrbklib.c:2998
+#: pith/adrbklib.c:2996
 msgid "No write permission for remote addrbook, aborting change..."
 msgstr ""
 
-#: pith/adrbklib.c:3002
+#: pith/adrbklib.c:3000
 msgid "Remote addrbook changed, aborting our change to avoid damage..."
 msgstr ""
 
-#: pith/adrbklib.c:3059
+#: pith/adrbklib.c:3057
 msgid "Saving address book"
 msgstr ""
 
-#: pith/adrbklib.c:3262
+#: pith/adrbklib.c:3260
 #, c-format
 msgid "Can't replace address book %.200sfile \"%.200s\""
 msgstr ""
 
-#: pith/adrbklib.c:3266
+#: pith/adrbklib.c:3264
 msgid ""
 "If another Alpine is running, quit that Alpine before updating address book."
 msgstr ""
 
-#: pith/adrbklib.c:3341
+#: pith/adrbklib.c:3339
 #, c-format
 msgid "Replace of \"%.200s\" failed, trying %.200s"
 msgstr ""
 
-#: pith/adrbklib.c:3356
+#: pith/adrbklib.c:3354
 #, c-format
 msgid "Copy of addrbook to \"%.200s\" failed, changes NOT saved!"
 msgstr ""
 
-#: pith/adrbklib.c:3394
+#: pith/adrbklib.c:3392
 msgid "Copying to remote addressbook"
 msgstr ""
 
-#: pith/adrbklib.c:3405
+#: pith/adrbklib.c:3403
 #, c-format
 msgid "Error opening temporary addrbook file %.200s: %.200s"
 msgstr ""
 
-#: pith/adrbklib.c:3422
+#: pith/adrbklib.c:3420
 msgid "Copy of addrbook to remote folder failed, changes NOT saved remotely"
 msgstr ""
 
-#: pith/adrbklib.c:3460
+#: pith/adrbklib.c:3458
 msgid "Interrupt!  Reverting to previous version"
 msgstr ""
 
-#: pith/adrbklib.c:4762
+#: pith/adrbklib.c:4760
 msgid "Sorting address book"
 msgstr ""
 
-#: pith/adrbklib.c:4784
+#: pith/adrbklib.c:4782
 msgid "Address book sort cancelled, using old order for now"
 msgstr ""
 
-#: pith/adrbklib.c:5458
+#: pith/adrbklib.c:5456
 #, c-format
 msgid "Error opening/creating address book %.200s"
 msgstr ""
 
 #. TRANSLATORS: groups refers to news groups
-#: pith/news.c:243
+#: pith/news.c:239
 msgid "Can't validate groups.  No servers defined"
 msgstr ""
 
 #. TRANSLATORS: groups refers to news groups
-#: pith/news.c:245 pith/news.c:252
+#: pith/news.c:241 pith/news.c:248
 msgid "Can't validate groups.  No servers responding"
 msgstr ""
 
-#: pith/news.c:250
+#: pith/news.c:246
 msgid "No servers defined for posting to newsgroups"
 msgstr ""
 
-#: pith/filter.c:1136 pith/filter.c:1144
+#: pith/filter.c:1132 pith/filter.c:1140
 msgid "Pipe command returned error."
 msgstr ""
 
-#: pith/filter.c:1149
+#: pith/filter.c:1145
 msgid "Error setting up pipe command."
 msgstr ""
 
-#: pith/filter.c:1543 pith/filter.c:1568
+#: pith/filter.c:1539 pith/filter.c:1564
 msgid "Warning: Non-hexadecimal character in QP encoding!"
 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:11076
+#: pith/filter.c:1849 pith/filter.c:11299
 msgid "translation error"
 msgstr ""
 
-#: pith/remote.c:99
+#: pith/remote.c:95
 msgid " Can't fetch remote configuration."
 msgstr ""
 
-#: pith/remote.c:858
+#: pith/remote.c:854
 #, c-format
 msgid "can't open metadata file %s, continuing (%s)"
 msgstr ""
 
-#: pith/remote.c:898
+#: pith/remote.c:894
 #, c-format
 msgid "can't create metadata file %s, continuing (%s)"
 msgstr ""
 
-#: pith/remote.c:1288
+#: pith/remote.c:1284
 #, c-format
 msgid "Can't initialize folder \"%s\" (write permission)"
 msgstr ""
 
-#: pith/remote.c:1291
+#: pith/remote.c:1287
 msgid "Choose a new, unused folder for the remote data"
 msgstr ""
 
-#: pith/remote.c:1307
+#: pith/remote.c:1303
 msgid "Initializing remote data"
 msgstr ""
 
-#: pith/remote.c:1332
+#: pith/remote.c:1328
 #, c-format
 msgid "\"%s\" has invalid format, can't initialize"
 msgstr ""
 
-#: pith/remote.c:1361 pith/remote.c:1947
+#: pith/remote.c:1357 pith/remote.c:1943
 #, c-format
 msgid "Error opening temporary file: %s"
 msgstr ""
 
-#: pith/remote.c:1398
+#: pith/remote.c:1394
 #, c-format
 msgid "Error copying to remote folder: %s"
 msgstr ""
 
-#: pith/remote.c:1518
+#: pith/remote.c:1514
 #, c-format
 msgid "Can't open remote address book \"%s\""
 msgstr ""
 
-#: pith/remote.c:1524
+#: pith/remote.c:1520
 #, c-format
 msgid "Error: no messages in remote address book \"%s\"!"
 msgstr ""
 
-#: pith/remote.c:1538
+#: pith/remote.c:1534
 #, c-format
 msgid "Suspicious Received headers in first msg in \"%s\""
 msgstr ""
 
-#: pith/remote.c:1924
+#: pith/remote.c:1920
 #, c-format
 msgid "Can't initialize \"%s\" (invalid format)"
 msgstr ""
 
-#: pith/remote.c:1938
+#: pith/remote.c:1934
 msgid "Copying remote data"
 msgstr ""
 
-#: pith/remote.c:1959
+#: pith/remote.c:1955
 #, c-format
 msgid "Error opening temporary file %s: %s"
 msgstr ""
 
-#: pith/remote.c:1977
+#: pith/remote.c:1973
 msgid "Can't access remote IMAP data"
 msgstr ""
 
-#: pith/remote.c:1998
+#: pith/remote.c:1994
 msgid "Remote IMAP folder has wrong contents"
 msgstr ""
 
-#: pith/remote.c:2018
+#: pith/remote.c:2014
 msgid "Can't access check date in remote data"
 msgstr ""
 
-#: pith/remote.c:2088
+#: pith/remote.c:2084
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: pith/remote.c:2096
+#: pith/remote.c:2092
 #, c-format
 msgid "%s: Error copying remote IMAP data"
 msgstr ""
 
-#: pith/remote.c:2111
+#: pith/remote.c:2107
 #, c-format
 msgid "Error updating local file: %s: %s"
 msgstr ""
 
-#: pith/remote.c:2114
+#: pith/remote.c:2110
 msgid "Perhaps another process has the file open?"
 msgstr ""
 
-#: pith/remote.c:2125
+#: pith/remote.c:2121
 #, c-format
 msgid "Error updating cache file %s: %s"
 msgstr ""
 
-#: pith/remote.c:2155
+#: pith/remote.c:2151
 #, c-format
 msgid "Can't open remote IMAP folder \"%s\""
 msgstr ""
 
-#: pith/remote.c:2223
+#: pith/remote.c:2219
 #, c-format
 msgid "Can't open \"%s\" for copying"
 msgstr ""
 
-#: pith/remote.c:2234
+#: pith/remote.c:2230
 #, c-format
 msgid "\"%s\" has invalid format"
 msgstr ""
 
-#: pith/ldap.c:116
+#: pith/ldap.c:112
 msgid "Directory lookup failed, using backup email address"
 msgstr ""
 
-#: pith/ldap.c:128
+#: pith/ldap.c:124
 msgid "Directory lookup failed, no backup email address available"
 msgstr ""
 
-#: pith/ldap.c:168
+#: pith/ldap.c:164
 #, c-format
 msgid "Warning: current address different from saved address (%s)"
 msgstr ""
 
-#: pith/ldap.c:211
+#: pith/ldap.c:207
 msgid "Missing username in LDAP address"
 msgstr ""
 
 #. TRANSLATORS: All of the three args together are an error message
-#: pith/ldap.c:541
+#: pith/ldap.c:556
 #, c-format
 msgid "Access to LDAP server failed: %s%s(%s)"
 msgstr ""
 
-#: pith/ldap.c:667
+#: pith/ldap.c:683
 msgid "Invalid password"
 msgstr ""
 
-#: pith/ldap.c:671
+#: pith/ldap.c:687
 #, c-format
 msgid "LDAP server failed: %s%s%s%s"
 msgstr ""
 
-#: pith/ldap.c:1056 pith/ldap.c:1142
+#: pith/ldap.c:1072 pith/ldap.c:1158
 #, c-format
 msgid "LDAP search failed: %s%s%s%s"
 msgstr ""
 
-#: pith/ldap.c:1097
+#: pith/ldap.c:1113
 #, c-format
 msgid "LDAP partial results: %s%s%s%s"
 msgstr ""
 
-#: pith/ldap.c:1236
+#: pith/ldap.c:1254
 #, c-format
 msgid "SELECT ONE ADDRESS%s%s%s"
 msgstr ""
 
-#: pith/ldap.c:1269
+#: pith/ldap.c:1287
 msgid "None of the names matched on directory server has an email address"
 msgstr ""
 
-#: pith/ldap.c:1281
+#: pith/ldap.c:1299
 msgid "No matches on directory server"
 msgstr ""
 
@@ -13097,513 +13952,550 @@ msgstr ""
 #. 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
+#: pith/ldap.c:1880 pith/ldap.c:1888
 msgid "Email Address"
 msgstr ""
 
-#: pith/ldap.c:1864
+#: pith/ldap.c:1882
 msgid "Surname"
 msgstr ""
 
-#: pith/ldap.c:1866
+#: pith/ldap.c:1884
 msgid "Given Name"
 msgstr ""
 
-#: pith/ldap.c:1872
+#: pith/ldap.c:1890
 msgid "Organization"
 msgstr ""
 
-#: pith/ldap.c:1873
+#: pith/ldap.c:1891
 msgid "Unit"
 msgstr ""
 
-#: pith/ldap.c:1874
+#: pith/ldap.c:1892
 msgid "Country"
 msgstr ""
 
-#: pith/ldap.c:1875
+#: pith/ldap.c:1893
 msgid "State or Province"
 msgstr ""
 
-#: pith/ldap.c:1876
+#: pith/ldap.c:1894
 msgid "Locality"
 msgstr ""
 
-#: pith/ldap.c:1877
+#: pith/ldap.c:1895
 msgid "Object Class"
 msgstr ""
 
-#: pith/ldap.c:1878
+#: pith/ldap.c:1896
 msgid "Title"
 msgstr ""
 
-#: pith/ldap.c:1879
+#: pith/ldap.c:1897
 msgid "Department"
 msgstr ""
 
-#: pith/ldap.c:1880
+#: pith/ldap.c:1898
 msgid "Postal Address"
 msgstr ""
 
-#: pith/ldap.c:1881
+#: pith/ldap.c:1899
 msgid "Home Address"
 msgstr ""
 
-#: pith/ldap.c:1882
+#: pith/ldap.c:1900
 msgid "Mail Stop"
 msgstr ""
 
-#: pith/ldap.c:1883
+#: pith/ldap.c:1901
 msgid "Voice Telephone"
 msgstr ""
 
-#: pith/ldap.c:1884
+#: pith/ldap.c:1902
 msgid "Home Telephone"
 msgstr ""
 
-#: pith/ldap.c:1885
+#: pith/ldap.c:1903
 msgid "Office Telephone"
 msgstr ""
 
-#: pith/ldap.c:1886
+#: pith/ldap.c:1904
 msgid "FAX Telephone"
 msgstr ""
 
-#: pith/ldap.c:1887
+#: pith/ldap.c:1905
 msgid "Mobile Telephone"
 msgstr ""
 
-#: pith/ldap.c:1888
+#: pith/ldap.c:1906
+msgid "Voice Mail"
+msgstr ""
+
+#: pith/ldap.c:1907
 msgid "Pager"
 msgstr ""
 
-#: pith/ldap.c:1889
+#: pith/ldap.c:1908
 msgid "Room Number"
 msgstr ""
 
-#: pith/ldap.c:1890
+#: pith/ldap.c:1909
 msgid "User ID"
 msgstr ""
 
+#: pith/ldap.c:1910
+msgid "User Certificate"
+msgstr ""
+
 #. TRANSLATORS: an informative error message
-#: pith/addrbook.c:160
+#: pith/addrbook.c:156
 #, c-format
 msgid "Ignoring unrecognized word \"%s\" in Address-Book-Formats"
 msgstr ""
 
-#: pith/addrbook.c:232
+#: pith/addrbook.c:228
 msgid "Address-Book-Formats has no recognizable words, using default format"
 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:2138
+#: pith/reply.c:2231
 msgid "---------- Forwarded message ----------"
 msgstr ""
 
-#: pith/reply.c:2582
+#: pith/reply.c:2674
 msgid "Error fetching message contents. Can't Bounce message"
 msgstr ""
 
-#: pith/reply.c:3063 pith/reply.c:3084
+#: pith/reply.c:3158 pith/reply.c:3179
 #, c-format
 msgid "Error fetching part %s"
 msgstr ""
 
-#: pith/reply.c:3534
+#: pith/reply.c:3605
 msgid "Can't fetch remote configuration."
 msgstr ""
 
-#: pith/stream.c:3278
+#: pith/stream.c:3279
 #, c-format
 msgid "MAIL FOLDER \"%s\" CLOSED DUE TO ACCESS ERROR"
 msgstr ""
 
-#: pith/stream.c:3284
+#: pith/stream.c:3285
 #, c-format
 msgid "Folder \"%s\" is Closed"
 msgstr ""
 
 #. TRANSLATORS: The argument is the number of new messages
-#: pith/newmail.c:678
+#: pith/newmail.c:703
 #, c-format
 msgid "%ld new messages!"
 msgstr ""
 
 #. TRANSLATORS: The argument is either " to you" or nothing
-#: pith/newmail.c:681
+#: pith/newmail.c:706
 #, c-format
 msgid "New mail%s!"
 msgstr ""
 
-#: pith/newmail.c:682
+#: pith/newmail.c:707
 msgid " to you"
 msgstr ""
 
-#: pith/newmail.c:689
+#: pith/newmail.c:714
 #, c-format
 msgid "%ld messages saved to folder \"%.80s\""
 msgstr ""
 
-#: pith/newmail.c:692
+#: pith/newmail.c:717
 #, c-format
 msgid "Mail saved to folder \"%.80s\""
 msgstr ""
 
-#: pith/newmail.c:701
+#: pith/newmail.c:726
 #, c-format
 msgid "%ld messages saved to folder \"...%.80s\""
 msgstr ""
 
-#: pith/newmail.c:703
+#: pith/newmail.c:728
 #, c-format
 msgid "Mail saved to folder \"...%.80s\""
 msgstr ""
 
-#: pith/save.c:763 pith/save.c:894 pith/save.c:1373
+#: pith/save.c:760 pith/save.c:891 pith/save.c:1370
 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:1273
+#: pith/save.c:1122 pith/save.c:1270
 msgid "NOTE: Deleted message parts NOT included in saved copy!"
 msgstr ""
 
-#: pith/save.c:1145 pith/save.c:1333
+#: pith/save.c:1142 pith/save.c:1330
 #, c-format
 msgid "Cannot save because current folder is Closed"
 msgstr ""
 
-#: pith/save.c:1593
+#: pith/save.c:1590
 msgid "The following attachment was DELETED when this message was saved:"
 msgstr ""
 
+#: pith/save.c:1634 pith/save.c:1641 pith/save.c:1649 pith/save.c:1655
+#: pith/save.c:1678 pith/save.c:1690
+msgid "A "
+msgstr ""
+
+#: pith/save.c:1638 pith/save.c:1644
+msgid " segment described as "
+msgstr ""
+
+#: pith/save.c:1639 pith/save.c:1644
+msgid " containing:"
+msgstr ""
+
+#: pith/save.c:1653 pith/save.c:1658
+msgid " segment containing:"
+msgstr ""
+
+#: pith/save.c:1682 pith/save.c:1694
+msgid " segment of about "
+msgstr ""
+
+#: pith/save.c:1683 pith/save.c:1696
+msgid " bytes"
+msgstr ""
+
+#: pith/save.c:1684
+msgid " described as \""
+msgstr ""
+
 #. TRANSLATORS: User is restricted to operating within a certain directory
-#: pith/context.c:337
+#: pith/context.c:333
 #, c-format
 msgid "Not allowed outside of %.150s"
 msgstr ""
 
-#: pith/smime.c:161 pith/smime.c:331
+#: pith/smime.c:139 pith/smime.c:309
 #, c-format
 msgid "Enter password of key <%s> to unlock password file: "
 msgstr ""
 
-#: pith/smime.c:170
+#: pith/smime.c:148
 #, c-format
 msgid "Cannot find certificate that matches key <%s>. Continuing..."
 msgstr ""
 
-#: pith/smime.c:504
+#: pith/smime.c:482
 #, c-format
 msgid "Error removing certificate %s"
 msgstr ""
 
-#: pith/smime.c:543
+#: pith/smime.c:521
 msgid "Error expunging certificate"
 msgstr ""
 
-#: pith/smime.c:557
+#: pith/smime.c:535
 #, c-format
 msgid "Removed %s certificate%s"
 msgstr ""
 
-#: pith/smime.c:560
+#: pith/smime.c:538
 msgid "Error: No certificates were removed"
 msgstr ""
 
-#: pith/smime.c:633
+#: pith/smime.c:611
 msgid "import of certificates not implemented yet!"
 msgstr ""
 
-#: pith/smime.c:676
+#: pith/smime.c:654
 msgid "Error in key name. Check file extension"
 msgstr ""
 
-#: pith/smime.c:680
+#: pith/smime.c:658
 #, c-format
 msgid "Enter passphrase to unlock new key <%s>: "
 msgstr ""
 
-#: pith/smime.c:747
+#: pith/smime.c:725
 msgid "Error parsing certificate"
 msgstr ""
 
-#: pith/smime.c:750
+#: pith/smime.c:728
 msgid "Error reading certificate"
 msgstr ""
 
-#: pith/smime.c:758
+#: pith/smime.c:736
 msgid "Certificate does not match key"
 msgstr ""
 
-#: pith/smime.c:764 pith/smime.c:928 pith/smime.c:960
+#: pith/smime.c:742 pith/smime.c:907 pith/smime.c:939
 msgid "Error in certificate file (not a certificate?)"
 msgstr ""
 
-#: pith/smime.c:769 pith/smime.c:896
+#: pith/smime.c:747 pith/smime.c:875
 msgid "Private key saved"
 msgstr ""
 
-#: pith/smime.c:776
+#: pith/smime.c:754
 msgid "Error reading password file!"
 msgstr ""
 
-#: pith/smime.c:820
+#: pith/smime.c:799
 msgid "Failed to remove old key"
 msgstr ""
 
-#: pith/smime.c:825
+#: pith/smime.c:804
 msgid "Failed to remove old certificate"
 msgstr ""
 
-#: pith/smime.c:830
+#: pith/smime.c:809
 msgid "Password file reencrypted"
 msgstr ""
 
-#: pith/smime.c:832
+#: pith/smime.c:811
 msgid "Failed to reencrypt password file"
 msgstr ""
 
-#: pith/smime.c:836
+#: pith/smime.c:815
 msgid "Error decrypting Password file"
 msgstr ""
 
-#: pith/smime.c:839
-msgid "Password file not encrypted and coulr not encrypt"
+#: pith/smime.c:818
+msgid "Password file not encrypted and could not encrypt"
 msgstr ""
 
-#: pith/smime.c:845
+#: pith/smime.c:824
 msgid "Error saving public certificate"
 msgstr ""
 
-#: pith/smime.c:847
+#: pith/smime.c:826
 msgid "Error while cleaning private key"
 msgstr ""
 
-#: pith/smime.c:853 pith/smime.c:898
+#: pith/smime.c:832 pith/smime.c:877
 msgid "Error saving private key"
 msgstr ""
 
-#: pith/smime.c:860
+#: pith/smime.c:839
 msgid "Error unlocking private key"
 msgstr ""
 
-#: pith/smime.c:903
+#: pith/smime.c:882
 msgid "Problem unlocking key (not a certificate or wrong password)"
 msgstr ""
 
-#: pith/smime.c:922
+#: pith/smime.c:901
 msgid "Certificate saved"
 msgstr ""
 
-#: pith/smime.c:924
+#: pith/smime.c:903
 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
+#: pith/smime.c:1423 pith/smime.c:1498 pith/smime.c:1559 pith/smime.c:2057
+#: pith/smime.c:2087 pith/smime.c:2117
 #, c-format
 msgid "Can't create directory %s"
 msgstr ""
 
-#: pith/smime.c:1725 pith/smime.c:2091
+#: pith/smime.c:1746 pith/smime.c:2127
 msgid "Directory not defined"
 msgstr ""
 
-#: pith/smime.c:1732 pith/smime.c:2002
+#: pith/smime.c:1753 pith/smime.c:2038
 msgid "Turn off the Keychain feature above first"
 msgstr ""
 
-#: pith/smime.c:1736 pith/smime.c:2006 pith/smime.c:2036 pith/smime.c:2066
-#: pith/smime.c:2096
+#: pith/smime.c:1757 pith/smime.c:2042 pith/smime.c:2072 pith/smime.c:2102
+#: pith/smime.c:2132
 msgid "Container path is not defined"
 msgstr ""
 
-#: pith/smime.c:1754 pith/smkeys.c:939
+#: pith/smime.c:1775 pith/smkeys.c:981
 msgid "Can't access remote smime configuration."
 msgstr ""
 
-#: pith/smime.c:1908 pith/smime.c:1919 pith/smime.c:2150 pith/smkeys.c:1023
+#: pith/smime.c:1944 pith/smime.c:1955 pith/smime.c:2186 pith/smkeys.c:1068
 #, c-format
 msgid "Can't rename %s to %s"
 msgstr ""
 
-#: pith/smime.c:1911
+#: pith/smime.c:1947
 #, c-format
 msgid "saved container to %s"
 msgstr ""
 
-#: pith/smime.c:1928 pith/smkeys.c:1038
+#: pith/smime.c:1964 pith/smkeys.c:1083
 #, c-format
 msgid "Error opening temporary smime file %s: %s"
 msgstr ""
 
-#: pith/smime.c:1944
+#: pith/smime.c:1980
 msgid "Copy of smime key to remote folder failed, NOT saved remotely"
 msgstr ""
 
-#: pith/smime.c:2015 pith/smime.c:2045 pith/smime.c:2075
+#: pith/smime.c:2051 pith/smime.c:2081 pith/smime.c:2111
 msgid "Directory is not defined"
 msgstr ""
 
-#: pith/smime.c:2313
+#: pith/smime.c:2349
 msgid "Incorrect passphrase"
 msgstr ""
 
-#: pith/smime.c:2315
+#: pith/smime.c:2351
 #, c-format
 msgid "Couldn't read key: %s"
 msgstr ""
 
-#: pith/smime.c:2567
+#: pith/smime.c:2607
 #, c-format
 msgid "Unable to find certificate for <%s@%s>"
 msgstr ""
 
-#: pith/smime.c:2780
+#: pith/smime.c:2837
 msgid "Couldn't verify S/MIME signature: No CA Certs were loaded"
 msgstr ""
 
-#: pith/smime.c:2811
+#: pith/smime.c:2866
 msgid "S/MIME signature verified ok"
 msgstr ""
 
-#: pith/smime.c:2824
+#: pith/smime.c:2884
 #, c-format
 msgid "Couldn't verify S/MIME signature: %s"
 msgstr ""
 
-#: pith/smime.c:3154 pith/smime.c:3325
+#: pith/smime.c:3190 pith/smime.c:3360
 msgid ""
 "This message was cryptographically signed but the signature could not be "
 "verified."
 msgstr ""
 
-#: pith/smime.c:3263 pith/smime.c:3375
+#: pith/smime.c:3298 pith/smime.c:3410
 #, c-format
 msgid "Error decrypting: %s"
 msgstr ""
 
-#: pith/smime.c:3343
+#: pith/smime.c:3378
 msgid "Couldn't find the certificate needed to decrypt."
 msgstr ""
 
-#: pith/smime.c:3403
+#: pith/smime.c:3464
 msgid "Encrypted data couldn't be parsed."
 msgstr ""
 
-#: pith/smime.c:3426
+#: pith/smime.c:3487
 msgid "Couldn't find cookie in attachment list."
 msgstr ""
 
-#: pith/smime.c:3679
+#: pith/smime.c:3742
 msgid "Couldn't find the certificate needed to sign."
 msgstr ""
 
-#: pith/smime.c:3702
+#: pith/smime.c:3765
 msgid ""
 "Not all certificates needed to verify signature included in signed message"
 msgstr ""
 
-#: pith/smime.c:3743
+#: pith/smime.c:3806
 msgid "Error creating signed object."
 msgstr ""
 
-#: pith/smkeys.c:66
+#: pith/smkeys.c:61
 msgid "Password cannot be blank"
 msgstr ""
 
-#: pith/smkeys.c:69
+#: pith/smkeys.c:64
 msgid "Password is too short"
 msgstr ""
 
-#: pith/smkeys.c:73
+#: pith/smkeys.c:68
 msgid ". Enter password again"
 msgstr ""
 
-#: pith/smkeys.c:91
+#: pith/smkeys.c:86
 msgid " Creating a Master Password for your Password file "
 msgstr ""
 
-#: pith/smkeys.c:94
+#: pith/smkeys.c:89
 msgid " Retrying to create a Master Password for your Password file "
 msgstr ""
 
-#: pith/smkeys.c:98
+#: pith/smkeys.c:93
 #, c-format
 msgid "Create master password (attempt %d of %d): "
 msgstr ""
 
-#: pith/smkeys.c:110
+#: pith/smkeys.c:105
 #, c-format
 msgid "Confirm master password (attempt %d of %d): "
 msgstr ""
 
-#: pith/smkeys.c:119
+#: pith/smkeys.c:114
 msgid "Passwords do not match, try again."
 msgstr ""
 
-#: pith/smkeys.c:121
+#: pith/smkeys.c:116
 msgid "Passwords do not match, too many failures."
 msgstr ""
 
-#: pith/smkeys.c:163
+#: pith/smkeys.c:158
 msgid "Problem reading configuration file"
 msgstr ""
 
-#: pith/smkeys.c:174
+#: pith/smkeys.c:169
 msgid "Problem loading openssl configuration"
 msgstr ""
 
-#: pith/smkeys.c:627
+#: pith/smkeys.c:640
 msgid "Invalid"
 msgstr ""
 
-#: pith/smkeys.c:685
+#: pith/smkeys.c:715
 #, c-format
 msgid "Error loading file %s"
 msgstr ""
 
-#: pith/smkeys.c:1034
+#: pith/smkeys.c:1079
 msgid "Copying to remote smime container"
 msgstr ""
 
-#: pith/smkeys.c:1054
+#: pith/smkeys.c:1099
 msgid "Copy of smime cert to remote folder failed, changes NOT saved remotely"
 msgstr ""
 
-#: pith/smkeys.c:1083
+#: pith/smkeys.c:1128
 #, c-format
 msgid "Saved certificate for <%s>"
 msgstr ""
 
-#: pith/smkeys.c:1086
+#: pith/smkeys.c:1131
 #, c-format
 msgid "Couldn't save certificate for <%s>"
 msgstr ""
 
-#: pith/smkeys.c:1319
+#: pith/smkeys.c:1384
 msgid "Error in privatekey container, missing END"
 msgstr ""
 
-#: pith/smkeys.c:1386
+#: pith/smkeys.c:1451
 #, c-format
 msgid "Error in %scert container, missing BEGIN, certtext=%s"
 msgstr ""
 
-#: pith/smkeys.c:1386
+#: pith/smkeys.c:1451
 msgid "ca"
 msgstr ""
 
-#: pith/smkeys.c:1478
+#: pith/smkeys.c:1543
 #, c-format
 msgid "Error in cacert container, missing BEGIN, certtext=%s"
 msgstr ""
 
-#: pith/smkeys.c:1483
+#: pith/smkeys.c:1548
 #, c-format
 msgid "Error in cacert container, missing separator, line=%s"
 msgstr ""
author	Eduardo Chappa <chappa@washington.edu>	2022-03-07 02:07:25 -0700
committer	Eduardo Chappa <chappa@washington.edu>	2022-03-07 02:07:25 -0700
commit	20dd136ff32a3879a5f36bbd463cf38ff1f9c087 (patch)
tree	cd7b2be5b54ab9406b063b8f1648b75179ea43d2 /po
parent	9a7f8440acfa23764cf3227dee3051ea96f09d8e (diff)
download	alpine-20dd136ff32a3879a5f36bbd463cf38ff1f9c087.tar.xz