Translate help strings.

5 files changed, 489 insertions, 445 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 669a1d03..9e7f0e60 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -54,5 +54,7 @@ clean:
 clean-real:
 	rm -f manual.txt
 
+maintainer-clean: clean clean-real
+
 distclean: clean
 	rm -f Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c4540211..cdd3303b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,46 +1,100 @@
+acconfig.h
 addrbook.c
 alias.c
 attach.c
+attach.h
 browser.c
 buffy.c
+buffy.h
+charset.c
+charset.h
 color.c
 commands.c
+complete.c
 compose.c
+config.h
 copy.c
+copy.h
 curs_lib.c
 curs_main.c
 date.c
+dotlock.c
+dotlock.h
 edit.c
+enter.c
+filter.c
 flags.c
+from.c
+functions.h
+getdomain.c
+globals.h
+gnupgparse.c
 handler.c
+hash.c
+hash.h
+hdrline.c
 headers.c
 help.c
+history.c
+history.h
 hook.c
 imap.c
+imap.h
 init.c
+init.h
 keymap.c
+keymap.h
 keymap_defs.h
 lib.c
+mailbox.h
 main.c
+mapping.h
 mbox.c
 menu.c
 mh.c
+mime.h
+mutt.h
+mutt_curses.h
+mutt_menu.h
+mutt_regex.h
+mutt_socket.h
 mx.c
+mx.h
 pager.c
+pager.h
 parse.c
+parse.h
 pattern.c
 pgp.c
+pgp.h
+pgpinvoke.c
 pgpkey.c
 pgppubring.c
 pop.c
 postpone.c
+protos.h
 query.c
 recvattach.c
+reldate.h
+resize.c
 rfc1524.c
+rfc1524.h
+rfc2047.c
+rfc2047.h
+rfc822.c
+rfc822.h
 score.c
 send.c
 sendlib.c
+sha.h
+sha1dgst.c
+sha_locl.h
 signal.c
+snprintf.c
+socket.c
 sort.c
+sort.h
 status.c
+strcasecmp.c
+system.c
 thread.c
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index b901fc0e..208f41c1 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -91,7 +91,7 @@ Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: ", 66},
   {"Messages printed", 80},
   {"Send", 81},
   {"Abort", 82},
-  {"Attach", 83},
+  {"Attach file", 83},
   {"Descrip", 84},
   {"\
 (e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget \
@@ -112,74 +112,73 @@ it? ", 85},
   {"<default>", 99},
   {"You may not delete the only attachment.", 100},
   {"Compose", 101},
-  {"Attach file", 102},
-  {"Open mailbox to attach message from", 103},
-  {"No messages in that folder.", 104},
-  {"Tag the messages you want to attach!", 105},
-  {"Unable to attach!", 106},
-  {"Invalid encoding.", 107},
-  {"Save a copy of this message?", 108},
-  {"Rename to: ", 109},
-  {"Can't stat: %s", 110},
-  {"New file: ", 111},
-  {"Content-Type is of the form base/sub", 112},
-  {"Unknown Content-Type %s", 113},
-  {"Can't create file %s", 114},
-  {"What we have here is a failure to make an attachment", 115},
-  {"Postpone this message?", 116},
-  {"Write message to mailbox", 117},
-  {"Writing message to %s ...", 118},
-  {"Message written.", 119},
-  {"Confused when attempting to delete attachment, h & m can't be NULL", 120},
-  {"Deleting non-multipart messages not yet supported", 121},
-  {"yes", 122},
-  {"no", 123},
-  {"Exit Mutt?", 124},
-  {"unknown error", 125},
-  {"Press any key to continue...", 126},
-  {" ('?' for list): ", 127},
-  {"Cannot toggle write on a readonly mailbox!", 128},
-  {"Changes to folder will be written on folder exit.", 129},
-  {"Changes to folder will not be written.", 130},
-  {"Quit", 131},
-  {"Del", 132},
-  {"Undel", 133},
-  {"Mail", 134},
-  {"Reply", 135},
-  {"Group", 136},
-  {"Mailbox was externally modified.  Flags may be wrong.", 137},
-  {"New mail in this mailbox.", 138},
-  {"No mailbox is open.", 139},
-  {"No tagged messages.", 140},
-  {"Jump to message: ", 141},
-  {"Argument must be a message number.", 142},
-  {"That message is not visible.", 143},
-  {"Invalid message number.", 144},
-  {"Delete messages matching: ", 145},
-  {"No limit pattern is in effect.", 146},
-  {"Limit: %s", 147},
-  {"Limit to messages matching: ", 148},
-  {"Quit Mutt?", 149},
-  {"Tag messages matching: ", 150},
-  {"Undelete messages matching: ", 151},
-  {"Untag messages matching: ", 152},
-  {"Open mailbox", 153},
-  {"Open mailbox in read-only mode", 154},
-  {"%s is not a mailbox.", 155},
-  {"Exit Mutt without saving?", 156},
-  {"You are on the last message.", 157},
-  {"No undeleted messages.", 158},
-  {"You are on the first message.", 159},
-  {"Search wrapped to top.", 160},
-  {"Search wrapped to bottom.", 161},
-  {"No new messages", 162},
-  {"No unread messages", 163},
-  {" in this limited view", 164},
-  {"No more threads.", 165},
-  {"You are on the first thread.", 166},
-  {"Thread contains unread messages.", 167},
-  {"Threading is not enabled.", 168},
-  {"Please report this program error in the function mutt_mktime.", 169},
+  {"Open mailbox to attach message from", 102},
+  {"No messages in that folder.", 103},
+  {"Tag the messages you want to attach!", 104},
+  {"Unable to attach!", 105},
+  {"Invalid encoding.", 106},
+  {"Save a copy of this message?", 107},
+  {"Rename to: ", 108},
+  {"Can't stat: %s", 109},
+  {"New file: ", 110},
+  {"Content-Type is of the form base/sub", 111},
+  {"Unknown Content-Type %s", 112},
+  {"Can't create file %s", 113},
+  {"What we have here is a failure to make an attachment", 114},
+  {"Postpone this message?", 115},
+  {"Write message to mailbox", 116},
+  {"Writing message to %s ...", 117},
+  {"Message written.", 118},
+  {"Confused when attempting to delete attachment, h & m can't be NULL", 119},
+  {"Deleting non-multipart messages not yet supported", 120},
+  {"yes", 121},
+  {"no", 122},
+  {"Exit Mutt?", 123},
+  {"unknown error", 124},
+  {"Press any key to continue...", 125},
+  {" ('?' for list): ", 126},
+  {"Cannot toggle write on a readonly mailbox!", 127},
+  {"Changes to folder will be written on folder exit.", 128},
+  {"Changes to folder will not be written.", 129},
+  {"Quit", 130},
+  {"Del", 131},
+  {"Undel", 132},
+  {"Mail", 133},
+  {"Reply", 134},
+  {"Group", 135},
+  {"Mailbox was externally modified.  Flags may be wrong.", 136},
+  {"New mail in this mailbox.", 137},
+  {"No mailbox is open.", 138},
+  {"No tagged messages.", 139},
+  {"Jump to message: ", 140},
+  {"Argument must be a message number.", 141},
+  {"That message is not visible.", 142},
+  {"Invalid message number.", 143},
+  {"Delete messages matching: ", 144},
+  {"No limit pattern is in effect.", 145},
+  {"Limit: %s", 146},
+  {"Limit to messages matching: ", 147},
+  {"Quit Mutt?", 148},
+  {"Tag messages matching: ", 149},
+  {"Undelete messages matching: ", 150},
+  {"Untag messages matching: ", 151},
+  {"Open mailbox", 152},
+  {"Open mailbox in read-only mode", 153},
+  {"%s is not a mailbox.", 154},
+  {"Exit Mutt without saving?", 155},
+  {"You are on the last message.", 156},
+  {"No undeleted messages.", 157},
+  {"You are on the first message.", 158},
+  {"Search wrapped to top.", 159},
+  {"Search wrapped to bottom.", 160},
+  {"No new messages", 161},
+  {"No unread messages", 162},
+  {" in this limited view", 163},
+  {"No more threads.", 164},
+  {"You are on the first thread.", 165},
+  {"Thread contains unread messages.", 166},
+  {"Threading is not enabled.", 167},
+  {"Please report this program error in the function mutt_mktime.", 168},
   {"\
 ~~\t\tinsert a line begining with a single ~\n\
 ~b users\tadd users to the Bcc: field\n\
@@ -198,263 +197,263 @@ it? ", 85},
 ~w file\t\twrite message to file\n\
 ~x\t\tabort changes and quit editor\n\
 ~?\t\tthis message\n\
-.\t\ton a line by itself ends input\n", 170},
-  {"%d: invalid message number.\n", 171},
-  {"(End message with a . on a line by itself)\n", 172},
-  {"No mailbox.\n", 173},
-  {"Message contains:\n", 174},
-  {"(continue)\n", 175},
-  {"missing filename.\n", 176},
-  {"No lines in message.\n", 177},
-  {"%s: unknown editor command (~? for help)\n", 178},
-  {"Set %s flag", 179},
-  {"Clear %s flag", 180},
-  {"[-- Error: unexpected end of file! --]\n", 181},
-  {"[-- Error:  Could not display any parts of Multipart/Alternative! --]\n", 182},
-  {"[-- Attachment #%d", 183},
-  {"[-- Type: %s/%s, Encoding: %s, Size: %s --]\n", 184},
-  {"[-- Autoview using %s --]\n", 185},
-  {"Invoking autoview command: %s", 186},
-  {"[-- Autoview stderr of %s --]\n", 187},
-  {"Error: multipart/signed has no protocol.", 188},
-  {"Error: multipart/encrypted has no protocol parameter!", 189},
-  {"Unable to open temporary file!", 190},
-  {"[-- %s/%s is unsupported ", 191},
-  {"(use '%s' to view this part)", 192},
-  {"(need 'view-attachments' bound to key!)", 193},
-  {"%s: unable to attach file", 194},
-  {"ERROR: please report this bug", 195},
-  {"<UNKNOWN>", 196},
+.\t\ton a line by itself ends input\n", 169},
+  {"%d: invalid message number.\n", 170},
+  {"(End message with a . on a line by itself)\n", 171},
+  {"No mailbox.\n", 172},
+  {"Message contains:\n", 173},
+  {"(continue)\n", 174},
+  {"missing filename.\n", 175},
+  {"No lines in message.\n", 176},
+  {"%s: unknown editor command (~? for help)\n", 177},
+  {"Set %s flag", 178},
+  {"Clear %s flag", 179},
+  {"[-- Error: unexpected end of file! --]\n", 180},
+  {"[-- Error:  Could not display any parts of Multipart/Alternative! --]\n", 181},
+  {"[-- Attachment #%d", 182},
+  {"[-- Type: %s/%s, Encoding: %s, Size: %s --]\n", 183},
+  {"[-- Autoview using %s --]\n", 184},
+  {"Invoking autoview command: %s", 185},
+  {"[-- Autoview stderr of %s --]\n", 186},
+  {"Error: multipart/signed has no protocol.", 187},
+  {"Error: multipart/encrypted has no protocol parameter!", 188},
+  {"Unable to open temporary file!", 189},
+  {"[-- %s/%s is unsupported ", 190},
+  {"(use '%s' to view this part)", 191},
+  {"(need 'view-attachments' bound to key!)", 192},
+  {"%s: unable to attach file", 193},
+  {"ERROR: please report this bug", 194},
+  {"<UNKNOWN>", 195},
   {"\
 \n\
 Generic bindings:\n\
-\n", 197},
+\n", 196},
   {"\
 \n\
 Unbound functions:\n\
-\n", 198},
-  {"Help for %s", 199},
-  {"imap_error(): unexpected response in %s: %s\n", 200},
-  {"Fatal error.  Message count is out of sync!", 201},
-  {"Fetching message headers... [%d/%d]", 202},
-  {"Connecting to %s...", 203},
-  {"IMAP Username: ", 204},
-  {"Password for %s@%s: ", 205},
-  {"Logging in...", 206},
-  {"Selecting %s...", 207},
-  {"Create %s?", 208},
-  {"Fetching message...", 209},
-  {"Sending APPEND command ...", 210},
-  {"Uploading message ...", 211},
-  {"Closing connection to IMAP server...", 212},
-  {"Saving message status flags... [%d/%d]", 213},
-  {"Expunging messages from server...", 214},
-  {"Closing mailbox...", 215},
-  {"BUG! Untagged IMAP Response during BUFFY Check", 216},
-  {"alias: no address", 217},
-  {"invalid header field", 218},
-  {"ignoring empty header field: %s", 219},
-  {"%s: unknown sorting method", 220},
-  {"mutt_restore_default: error in regexp: %s\n", 221},
-  {"%s: unknown variable", 222},
-  {"prefix is illegal with reset", 223},
-  {"value is illegal with reset", 224},
-  {"%s is a boolean var!", 225},
-  {"%s is set", 226},
-  {"%s is unset", 227},
-  {"%s: invalid mailbox type", 228},
-  {"%s: invalid value", 229},
-  {"%s: unknown type", 230},
-  {"Error in %s, line %d: %s", 231},
-  {"source: errors in %s", 232},
-  {"source: error at %s", 233},
-  {"source: too many arguments", 234},
-  {"%s: unknown command", 235},
-  {"Error in command line: %s\n", 236},
-  {"unable to determine home directory", 237},
-  {"unable to determine username", 238},
-  {"Macro loop detected.", 239},
-  {"Key is not bound.  Press '%s' for help.", 240},
-  {"Key is not bound.  See the manual.", 241},
-  {"push: too many arguments", 242},
-  {"%s: no such menu", 243},
-  {"null key sequence", 244},
-  {"bind: too many arguments", 245},
-  {"%s: no such function in map", 246},
-  {"macro: empty key sequence", 247},
-  {"macro: too many arguments", 248},
-  {"null operation", 249},
-  {"force viewing of attachment using mailcap", 250},
-  {"view attachment as text", 251},
-  {"move to the bottom of the page", 252},
-  {"remail a message to another user", 253},
-  {"select a new file in this directory", 254},
-  {"view file", 255},
-  {"display the currently selected file's name", 256},
-  {"change directories", 257},
-  {"check mailboxes for new mail", 258},
-  {"attach a file(s) to this message", 259},
-  {"attach message(s) to this message", 260},
-  {"edit the BCC list", 261},
-  {"edit the CC list", 262},
-  {"edit attachment description", 263},
-  {"edit attachment transfer-encoding", 264},
-  {"enter a file to save a copy of this message in", 265},
-  {"edit the file to be attached", 266},
-  {"edit the from field", 267},
-  {"edit the message with headers", 268},
-  {"edit the message", 269},
-  {"edit attachment using mailcap entry", 270},
-  {"edit the Reply-To field", 271},
-  {"edit the subject of this message", 272},
-  {"edit the TO list", 273},
-  {"edit attachment type", 274},
-  {"get a temporary copy of an attachment", 275},
-  {"run ispell on the message", 276},
-  {"compose new attachment using mailcap entry", 277},
-  {"save this message to send later", 278},
-  {"rename/move an attached file", 279},
-  {"send the message", 280},
-  {"toggle whether to delete file after sending it", 281},
-  {"update an attachment's encoding info", 282},
-  {"write the message to a folder", 283},
-  {"copy a message to a file/mailbox", 284},
-  {"create an alias from a message sender", 285},
-  {"move entry to bottom of screen", 286},
-  {"move entry to middle of screen", 287},
-  {"move entry to top of screen", 288},
-  {"make decoded (text/plain) copy", 289},
-  {"make decoded copy (text/plain) and delete", 290},
-  {"delete the current entry", 291},
-  {"delete all messages in subthread", 292},
-  {"delete all messages in thread", 293},
-  {"display full address of sender", 294},
-  {"display message with full headers", 295},
-  {"display a message", 296},
-  {"edit the current message for resending", 297},
-  {"delete the char in front of the cursor", 298},
-  {"move the cursor one character to the left", 299},
-  {"jump to the beginning of the line", 300},
-  {"cycle among incoming mailboxes", 301},
-  {"complete filename or alias", 302},
-  {"complete address with query", 303},
-  {"delete the char under the cursor", 304},
-  {"jump to the end of the line", 305},
-  {"move the cursor one character to the right", 306},
-  {"scroll up through the history list", 307},
-  {"delete chars from cursor to end of line", 308},
-  {"delete all chars on the line", 309},
-  {"delete the word in front of the cursor", 310},
-  {"quote the next typed key", 311},
-  {"enter a muttrc command", 312},
-  {"enter a file mask", 313},
-  {"exit this menu", 314},
-  {"filter attachment through a shell command", 315},
-  {"move to the first entry", 316},
-  {"toggle a message's 'important' flag", 317},
-  {"forward a message with comments", 318},
-  {"select the current entry", 319},
-  {"reply to all recipients", 320},
-  {"scroll down 1/2 page", 321},
-  {"scroll up 1/2 page", 322},
-  {"this screen", 323},
-  {"jump to an index number", 324},
-  {"move to the last entry", 325},
-  {"reply to specified mailing list", 326},
-  {"execute a macro", 327},
-  {"compose a new mail message", 328},
-  {"open a different folder", 329},
-  {"open a different folder in read only mode", 330},
-  {"clear a status flag from a message", 331},
-  {"delete messages matching a pattern", 332},
-  {"retrieve mail from POP server", 333},
-  {"move to the first message", 334},
-  {"move to the last message", 335},
-  {"show only messages matching a pattern", 336},
-  {"jump to the next new message", 337},
-  {"jump to the next subthread", 338},
-  {"jump to the next thread", 339},
-  {"move to the next undeleted message", 340},
-  {"jump to the next unread message", 341},
-  {"jump to previous thread", 342},
-  {"jump to previous subthread", 343},
-  {"move to the last undelete message", 344},
-  {"jump to the previous new message", 345},
-  {"jump to the previous unread message", 346},
-  {"mark the current thread as read", 347},
-  {"mark the current subthread as read", 348},
-  {"set a status flag on a message", 349},
-  {"save changes to mailbox", 350},
-  {"tag messages matching a pattern", 351},
-  {"undelete messages matching a pattern", 352},
-  {"untag messages matching a pattern", 353},
-  {"move to the middle of the page", 354},
-  {"move to the next entry", 355},
-  {"scroll down one line", 356},
-  {"move to the next page", 357},
-  {"jump to the bottom of the message", 358},
-  {"return to the main-menu", 359},
-  {"toggle display of quoted text", 360},
-  {"skip beyond quoted text", 361},
-  {"jump to the top of the message", 362},
-  {"pipe message/attachment to a shell command", 363},
-  {"move to the previous entry", 364},
-  {"scroll up one line", 365},
-  {"move to the previous page", 366},
-  {"print the current entry", 367},
-  {"query external program for addresses", 368},
-  {"append new query results to current results", 369},
-  {"save changes to mailbox and quit", 370},
-  {"recall a postponed message", 371},
-  {"clear and redraw the screen", 372},
-  {"reply to a message", 373},
-  {"save message/attachment to a file", 374},
-  {"search for a regular expression", 375},
-  {"search backwards for a regular expression", 376},
-  {"search for next match", 377},
-  {"search for next match in opposite direction", 378},
-  {"toggle search pattern coloring", 379},
-  {"invoke a command in a subshell", 380},
-  {"sort messages", 381},
-  {"sort messages in reverse order", 382},
-  {"tag the current entry", 383},
-  {"apply next function to tagged messages", 384},
-  {"tag the current subthread", 385},
-  {"tag the current thread", 386},
-  {"toggle a message's 'new' flag", 387},
-  {"toggle whether the mailbox will be rewritten", 388},
-  {"toggle wether to browse mailboxes or all files", 389},
-  {"move to the top of the page", 390},
-  {"undelete the current entry", 391},
-  {"undelete all messages in thread", 392},
-  {"undelete all messages in subthread", 393},
-  {"show the Mutt version number and date", 394},
-  {"view attachment using mailcap entry if necessary", 395},
-  {"show MIME attachments", 396},
-  {"show currently active limit pattern", 397},
-  {"collapse/uncollapse current thread", 398},
-  {"collapse/uncollapse all threads", 399},
-  {"attach a PGP public key", 400},
-  {"show PGP options", 401},
-  {"extract PGP public keys", 402},
-  {"wipe PGP passphrase from memory", 403},
-  {"mail a PGP public key", 404},
-  {"verify a PGP public key", 405},
-  {"view the key's user id", 406},
-  {"make decrypted copy and delete", 407},
-  {"make decrypted copy", 408},
-  {"Out of memory!", 409},
-  {"File is a directory, save under it?", 410},
-  {"File under directory: ", 411},
-  {"File exists, overwrite?", 412},
-  {"%s is not a mailbox!", 413},
-  {"Append messages to %s?", 414},
-  {"To contact the developers, please mail to <mutt-dev@mutt.org>.\n", 415},
+\n", 197},
+  {"Help for %s", 198},
+  {"imap_error(): unexpected response in %s: %s\n", 199},
+  {"Fatal error.  Message count is out of sync!", 200},
+  {"Fetching message headers... [%d/%d]", 201},
+  {"Connecting to %s...", 202},
+  {"IMAP Username: ", 203},
+  {"Password for %s@%s: ", 204},
+  {"Logging in...", 205},
+  {"Selecting %s...", 206},
+  {"Create %s?", 207},
+  {"Fetching message...", 208},
+  {"Sending APPEND command ...", 209},
+  {"Uploading message ...", 210},
+  {"Closing connection to IMAP server...", 211},
+  {"Saving message status flags... [%d/%d]", 212},
+  {"Expunging messages from server...", 213},
+  {"Closing mailbox...", 214},
+  {"BUG! Untagged IMAP Response during BUFFY Check", 215},
+  {"alias: no address", 216},
+  {"invalid header field", 217},
+  {"ignoring empty header field: %s", 218},
+  {"%s: unknown sorting method", 219},
+  {"mutt_restore_default: error in regexp: %s\n", 220},
+  {"%s: unknown variable", 221},
+  {"prefix is illegal with reset", 222},
+  {"value is illegal with reset", 223},
+  {"%s is a boolean var!", 224},
+  {"%s is set", 225},
+  {"%s is unset", 226},
+  {"%s: invalid mailbox type", 227},
+  {"%s: invalid value", 228},
+  {"%s: unknown type", 229},
+  {"Error in %s, line %d: %s", 230},
+  {"source: errors in %s", 231},
+  {"source: error at %s", 232},
+  {"source: too many arguments", 233},
+  {"%s: unknown command", 234},
+  {"Error in command line: %s\n", 235},
+  {"unable to determine home directory", 236},
+  {"unable to determine username", 237},
+  {"Macro loop detected.", 238},
+  {"Key is not bound.  Press '%s' for help.", 239},
+  {"Key is not bound.  See the manual.", 240},
+  {"push: too many arguments", 241},
+  {"%s: no such menu", 242},
+  {"null key sequence", 243},
+  {"bind: too many arguments", 244},
+  {"%s: no such function in map", 245},
+  {"macro: empty key sequence", 246},
+  {"macro: too many arguments", 247},
+  {"null operation", 248},
+  {"force viewing of attachment using mailcap", 249},
+  {"view attachment as text", 250},
+  {"move to the bottom of the page", 251},
+  {"remail a message to another user", 252},
+  {"select a new file in this directory", 253},
+  {"view file", 254},
+  {"display the currently selected file's name", 255},
+  {"change directories", 256},
+  {"check mailboxes for new mail", 257},
+  {"attach a file(s) to this message", 258},
+  {"attach message(s) to this message", 259},
+  {"edit the BCC list", 260},
+  {"edit the CC list", 261},
+  {"edit attachment description", 262},
+  {"edit attachment transfer-encoding", 263},
+  {"enter a file to save a copy of this message in", 264},
+  {"edit the file to be attached", 265},
+  {"edit the from field", 266},
+  {"edit the message with headers", 267},
+  {"edit the message", 268},
+  {"edit attachment using mailcap entry", 269},
+  {"edit the Reply-To field", 270},
+  {"edit the subject of this message", 271},
+  {"edit the TO list", 272},
+  {"edit attachment type", 273},
+  {"get a temporary copy of an attachment", 274},
+  {"run ispell on the message", 275},
+  {"compose new attachment using mailcap entry", 276},
+  {"save this message to send later", 277},
+  {"rename/move an attached file", 278},
+  {"send the message", 279},
+  {"toggle whether to delete file after sending it", 280},
+  {"update an attachment's encoding info", 281},
+  {"write the message to a folder", 282},
+  {"copy a message to a file/mailbox", 283},
+  {"create an alias from a message sender", 284},
+  {"move entry to bottom of screen", 285},
+  {"move entry to middle of screen", 286},
+  {"move entry to top of screen", 287},
+  {"make decoded (text/plain) copy", 288},
+  {"make decoded copy (text/plain) and delete", 289},
+  {"delete the current entry", 290},
+  {"delete all messages in subthread", 291},
+  {"delete all messages in thread", 292},
+  {"display full address of sender", 293},
+  {"display message with full headers", 294},
+  {"display a message", 295},
+  {"edit the current message for resending", 296},
+  {"delete the char in front of the cursor", 297},
+  {"move the cursor one character to the left", 298},
+  {"jump to the beginning of the line", 299},
+  {"cycle among incoming mailboxes", 300},
+  {"complete filename or alias", 301},
+  {"complete address with query", 302},
+  {"delete the char under the cursor", 303},
+  {"jump to the end of the line", 304},
+  {"move the cursor one character to the right", 305},
+  {"scroll up through the history list", 306},
+  {"delete chars from cursor to end of line", 307},
+  {"delete all chars on the line", 308},
+  {"delete the word in front of the cursor", 309},
+  {"quote the next typed key", 310},
+  {"enter a muttrc command", 311},
+  {"enter a file mask", 312},
+  {"exit this menu", 313},
+  {"filter attachment through a shell command", 314},
+  {"move to the first entry", 315},
+  {"toggle a message's 'important' flag", 316},
+  {"forward a message with comments", 317},
+  {"select the current entry", 318},
+  {"reply to all recipients", 319},
+  {"scroll down 1/2 page", 320},
+  {"scroll up 1/2 page", 321},
+  {"this screen", 322},
+  {"jump to an index number", 323},
+  {"move to the last entry", 324},
+  {"reply to specified mailing list", 325},
+  {"execute a macro", 326},
+  {"compose a new mail message", 327},
+  {"open a different folder", 328},
+  {"open a different folder in read only mode", 329},
+  {"clear a status flag from a message", 330},
+  {"delete messages matching a pattern", 331},
+  {"retrieve mail from POP server", 332},
+  {"move to the first message", 333},
+  {"move to the last message", 334},
+  {"show only messages matching a pattern", 335},
+  {"jump to the next new message", 336},
+  {"jump to the next subthread", 337},
+  {"jump to the next thread", 338},
+  {"move to the next undeleted message", 339},
+  {"jump to the next unread message", 340},
+  {"jump to previous thread", 341},
+  {"jump to previous subthread", 342},
+  {"move to the last undelete message", 343},
+  {"jump to the previous new message", 344},
+  {"jump to the previous unread message", 345},
+  {"mark the current thread as read", 346},
+  {"mark the current subthread as read", 347},
+  {"set a status flag on a message", 348},
+  {"save changes to mailbox", 349},
+  {"tag messages matching a pattern", 350},
+  {"undelete messages matching a pattern", 351},
+  {"untag messages matching a pattern", 352},
+  {"move to the middle of the page", 353},
+  {"move to the next entry", 354},
+  {"scroll down one line", 355},
+  {"move to the next page", 356},
+  {"jump to the bottom of the message", 357},
+  {"return to the main-menu", 358},
+  {"toggle display of quoted text", 359},
+  {"skip beyond quoted text", 360},
+  {"jump to the top of the message", 361},
+  {"pipe message/attachment to a shell command", 362},
+  {"move to the previous entry", 363},
+  {"scroll up one line", 364},
+  {"move to the previous page", 365},
+  {"print the current entry", 366},
+  {"query external program for addresses", 367},
+  {"append new query results to current results", 368},
+  {"save changes to mailbox and quit", 369},
+  {"recall a postponed message", 370},
+  {"clear and redraw the screen", 371},
+  {"reply to a message", 372},
+  {"save message/attachment to a file", 373},
+  {"search for a regular expression", 374},
+  {"search backwards for a regular expression", 375},
+  {"search for next match", 376},
+  {"search for next match in opposite direction", 377},
+  {"toggle search pattern coloring", 378},
+  {"invoke a command in a subshell", 379},
+  {"sort messages", 380},
+  {"sort messages in reverse order", 381},
+  {"tag the current entry", 382},
+  {"apply next function to tagged messages", 383},
+  {"tag the current subthread", 384},
+  {"tag the current thread", 385},
+  {"toggle a message's 'new' flag", 386},
+  {"toggle whether the mailbox will be rewritten", 387},
+  {"toggle wether to browse mailboxes or all files", 388},
+  {"move to the top of the page", 389},
+  {"undelete the current entry", 390},
+  {"undelete all messages in thread", 391},
+  {"undelete all messages in subthread", 392},
+  {"show the Mutt version number and date", 393},
+  {"view attachment using mailcap entry if necessary", 394},
+  {"show MIME attachments", 395},
+  {"show currently active limit pattern", 396},
+  {"collapse/uncollapse current thread", 397},
+  {"collapse/uncollapse all threads", 398},
+  {"attach a PGP public key", 399},
+  {"show PGP options", 400},
+  {"extract PGP public keys", 401},
+  {"wipe PGP passphrase from memory", 402},
+  {"mail a PGP public key", 403},
+  {"verify a PGP public key", 404},
+  {"view the key's user id", 405},
+  {"make decrypted copy and delete", 406},
+  {"make decrypted copy", 407},
+  {"Out of memory!", 408},
+  {"File is a directory, save under it?", 409},
+  {"File under directory: ", 410},
+  {"File exists, overwrite?", 411},
+  {"%s is not a mailbox!", 412},
+  {"Append messages to %s?", 413},
+  {"To contact the developers, please mail to <mutt-dev@mutt.org>.\n", 414},
   {"\
 Copyright (C) 1996-8 Michael R. Elkins and others.\n\
 Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n\
 Mutt is free software, and you are welcome to redistribute it\n\
-under certain conditions; type `mutt -vv' for details.\n", 416},
+under certain conditions; type `mutt -vv' for details.\n", 415},
   {"\
 Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>\n\
 Copyright (C) 1997-8 Thomas Roessler <roessler@guug.de>\n\
@@ -473,7 +472,7 @@ Copyright (C) 1998   Ruslan Ermilov <ru@ucb.crimea.ua>\n\
 \n\
     You should have received a copy of the GNU General Public License\n\
     along with this program; if not, write to the Free Software\n\
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n", 417},
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n", 416},
   {"\
 \n\
 SHA1 implementation Copyright (C) 1995-7 Eric A. Young <eay@cryptsoft.com>\n\
@@ -486,7 +485,7 @@ SHA1 implementation Copyright (C) 1995-7 Eric A. Young <eay@cryptsoft.com>\n\
     merchantability and fitness for a particular purpose ARE DISCLAIMED.\n\
 \n\
     You should have received a copy of the full distribution terms\n\
-    along with this program; if not, write to the program's developers.\n", 418},
+    along with this program; if not, write to the program's developers.\n", 417},
   {"\
 usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> \
 ]\n\
@@ -514,62 +513,63 @@ options:\n\
   -y\t\tselect a mailbox specified in your `mailboxes' list\n\
   -z\t\texit immediately if there are no messages in the mailbox\n\
   -Z\t\topen the first folder with new message, exit immediately if none\n\
-  -h\t\tthis help message", 419},
-  {"Error initializing terminal.", 420},
-  {"Debugging at level %d.\n", 421},
-  {"DEBUG was not defined during compilation.  Ignored.\n", 422},
-  {"No recipients specified.\n", 423},
-  {"%s: unable to attach file.\n", 424},
-  {"No mailbox with new mail.", 425},
-  {"Mailbox is empty.", 426},
-  {"Mailbox is corrupt!", 427},
-  {"Reading %s... %d (%d%%)", 428},
-  {"Mailbox was corrupted!", 429},
-  {"Fatal error!  Could not reopen mailbox!", 430},
-  {"Unable to lock mailbox!", 431},
-  {"sync: mbox modified, but no modified messages! (report this bug)", 432},
-  {"Writing messages... %d (%d%%)", 433},
-  {"Write failed!  Saved partial mailbox to %s", 434},
-  {"Could not reopen mailbox!", 435},
-  {"Reopening mailbox...", 436},
-  {"Jump to: ", 437},
-  {"Invalid index number.", 438},
-  {"No entries.", 439},
-  {"You cannot scroll down farther.", 440},
-  {"You cannot scroll up farther.", 441},
-  {"You are on the last page.", 442},
-  {"You are on the first page.", 443},
-  {"First entry is shown.", 444},
-  {"Last entry is shown.", 445},
-  {"You are on the last entry.", 446},
-  {"You are on the first entry.", 447},
-  {"Search for: ", 448},
-  {"Reverse search for: ", 449},
-  {"No search pattern.", 450},
-  {"Not found.", 451},
-  {"Search is not implemented for this menu.", 452},
-  {"Tagging is not supported.", 453},
-  {"Reading %s... %d", 454},
-  {"Lock count exceeded, remove lock for %s?", 455},
-  {"Timeout exceeded while attempting fcntl lock!", 456},
-  {"Waiting for fcntl lock... %d", 457},
-  {"Timeout exceeded while attempting flock lock!", 458},
-  {"Waiting for flock attempt... %d", 459},
-  {"Reading %s...", 460},
-  {"Writing %s...", 461},
-  {"Move read messages to %s?", 462},
-  {"Purge %d deleted message?", 463},
-  {"Purge %d deleted messages?", 464},
-  {"Moving read messages to %s...", 465},
-  {"Mailbox is unchanged.", 466},
-  {"%d kept, %d moved, %d deleted.", 467},
-  {"%d kept, %d deleted.", 468},
-  {" Press '%s' to toggle write", 469},
-  {"Use 'toggle-write' to re-enable write!", 470},
-  {"Mailbox is marked unwritable. %s", 471},
-  {"Mailbox is read-only.", 472},
-  {"PrevPg", 473},
-  {"NextPg", 474},
+  -h\t\tthis help message", 418},
+  {"Error initializing terminal.", 419},
+  {"Debugging at level %d.\n", 420},
+  {"DEBUG was not defined during compilation.  Ignored.\n", 421},
+  {"No recipients specified.\n", 422},
+  {"%s: unable to attach file.\n", 423},
+  {"No mailbox with new mail.", 424},
+  {"Mailbox is empty.", 425},
+  {"Mailbox is corrupt!", 426},
+  {"Reading %s... %d (%d%%)", 427},
+  {"Mailbox was corrupted!", 428},
+  {"Fatal error!  Could not reopen mailbox!", 429},
+  {"Unable to lock mailbox!", 430},
+  {"sync: mbox modified, but no modified messages! (report this bug)", 431},
+  {"Writing messages... %d (%d%%)", 432},
+  {"Write failed!  Saved partial mailbox to %s", 433},
+  {"Could not reopen mailbox!", 434},
+  {"Reopening mailbox...", 435},
+  {"Jump to: ", 436},
+  {"Invalid index number.", 437},
+  {"No entries.", 438},
+  {"You cannot scroll down farther.", 439},
+  {"You cannot scroll up farther.", 440},
+  {"You are on the last page.", 441},
+  {"You are on the first page.", 442},
+  {"First entry is shown.", 443},
+  {"Last entry is shown.", 444},
+  {"You are on the last entry.", 445},
+  {"You are on the first entry.", 446},
+  {"Search for: ", 447},
+  {"Reverse search for: ", 448},
+  {"No search pattern.", 449},
+  {"Not found.", 450},
+  {"Search is not implemented for this menu.", 451},
+  {"Tagging is not supported.", 452},
+  {"Reading %s... %d", 453},
+  {"Lock count exceeded, remove lock for %s?", 454},
+  {"Timeout exceeded while attempting fcntl lock!", 455},
+  {"Waiting for fcntl lock... %d", 456},
+  {"Timeout exceeded while attempting flock lock!", 457},
+  {"Waiting for flock attempt... %d", 458},
+  {"Reading %s...", 459},
+  {"Writing %s...", 460},
+  {"Move read messages to %s?", 461},
+  {"Purge %d deleted message?", 462},
+  {"Purge %d deleted messages?", 463},
+  {"Moving read messages to %s...", 464},
+  {"Mailbox is unchanged.", 465},
+  {"%d kept, %d moved, %d deleted.", 466},
+  {"%d kept, %d deleted.", 467},
+  {" Press '%s' to toggle write", 468},
+  {"Use 'toggle-write' to re-enable write!", 469},
+  {"Mailbox is marked unwritable. %s", 470},
+  {"Mailbox is read-only.", 471},
+  {"PrevPg", 472},
+  {"NextPg", 473},
+  {"View Attachm.", 474},
   {"Next", 475},
   {"Bottom of message is shown.", 476},
   {"Top of message is shown.", 477},
diff --git a/po/de.po b/po/de.po
index b8754ef5..bc420b18 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,31 +1,25 @@
-# German messages for Mutt.
-# Copyright (C) 1998 Thomas Roessler <roessler@guug.de>
-# Thomas Roessler <roessler@guug.de>, 1998
-#
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-10-01 19:00+0200\n"
-"PO-Revision-Date: 1998-10-01 10:20 MET DST\n"
-"Last-Translator: Thomas Roessler <roessler@guug.de>\n"
-"Language-Team: mutt-dev <mutt-dev@mutt.org>\n"
+"POT-Creation-Date: 1998-10-01 21:57+0200\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
 
-#: addrbook.c:31 browser.c:53 pager.c:1396 query.c:43 recvattach.c:47
-#, fuzzy
+#: addrbook.c:31 browser.c:53 pager.c:1358 postpone.c:32 query.c:43
+#: recvattach.c:47
 msgid "Exit"
-msgstr "Ende"
+msgstr "Verlassen"
 
 #: addrbook.c:32
-#, fuzzy
 msgid "Select"
 msgstr "Auswählen"
 
-#: addrbook.c:33 browser.c:56 compose.c:70 curs_main.c:234 pager.c:1451
-#: pgpkey.c:180 query.c:48 recvattach.c:51
+#: addrbook.c:33 browser.c:56 compose.c:70 curs_main.c:234 pager.c:1454
+#: pgpkey.c:180 postpone.c:35 query.c:48 recvattach.c:51
 msgid "Help"
 msgstr