Clean-up commit.

2 files changed, 250 insertions, 255 deletions

diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index 225585dd..1f1257fe 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -236,20 +236,20 @@ Unbound functions:\n\
   {"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},
+  {"Reopening mailbox...", 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},
   {"alias: no address", 216},
   {"invalid header field", 217},
   {"ignoring empty header field: %s", 218},
@@ -532,221 +532,220 @@ options:\n\
   {"Writing messages... %d (%d%%)", 434},
   {"Write failed!  Saved partial mailbox to %s", 435},
   {"Could not reopen mailbox!", 436},
-  {"Reopening mailbox...", 437},
-  {"Jump to: ", 438},
-  {"Invalid index number.", 439},
-  {"No entries.", 440},
-  {"You cannot scroll down farther.", 441},
-  {"You cannot scroll up farther.", 442},
-  {"You are on the last page.", 443},
-  {"You are on the first page.", 444},
-  {"First entry is shown.", 445},
-  {"Last entry is shown.", 446},
-  {"You are on the last entry.", 447},
-  {"You are on the first entry.", 448},
-  {"Search for: ", 449},
-  {"Reverse search for: ", 450},
-  {"No search pattern.", 451},
-  {"Not found.", 452},
-  {"Search is not implemented for this menu.", 453},
-  {"Tagging is not supported.", 454},
-  {"Reading %s... %d", 455},
-  {"Lock count exceeded, remove lock for %s?", 456},
-  {"Timeout exceeded while attempting fcntl lock!", 457},
-  {"Waiting for fcntl lock... %d", 458},
-  {"Timeout exceeded while attempting flock lock!", 459},
-  {"Waiting for flock attempt... %d", 460},
-  {"Reading %s...", 461},
-  {"Writing %s...", 462},
-  {"Move read messages to %s?", 463},
-  {"Purge %d deleted message?", 464},
-  {"Purge %d deleted messages?", 465},
-  {"Moving read messages to %s...", 466},
-  {"Mailbox is unchanged.", 467},
-  {"%d kept, %d moved, %d deleted.", 468},
-  {"%d kept, %d deleted.", 469},
-  {" Press '%s' to toggle write", 470},
-  {"Use 'toggle-write' to re-enable write!", 471},
-  {"Mailbox is marked unwritable. %s", 472},
-  {"Mailbox is read-only.", 473},
-  {"PrevPg", 474},
-  {"NextPg", 475},
-  {"View Attachm.", 476},
-  {"Next", 477},
-  {"Bottom of message is shown.", 478},
-  {"Top of message is shown.", 479},
-  {"Reverse search: ", 480},
-  {"Search: ", 481},
-  {"Help is currently being shown.", 482},
-  {"No more quoted text.", 483},
-  {"No more unquoted text after quoted text.", 484},
-  {"multipart message has no boundary parameter!", 485},
-  {"Error in expression: %s", 486},
-  {"Invalid day of month: %s", 487},
-  {"Invalid month: %s", 488},
-  {"error in expression", 489},
-  {"error in pattern at: %s", 490},
-  {"%c: invalid command", 491},
-  {"%c: not supported in this mode", 492},
-  {"missing parameter", 493},
-  {"mismatched parenthesis: %s", 494},
-  {"empty pattern", 495},
-  {"error: unknown op %d (report this error).", 496},
-  {"Compiling search pattern...", 497},
-  {"Executing command on matching messages...", 498},
-  {"No messages matched criteria.", 499},
-  {"Search hit bottom without finding match", 500},
-  {"Search hit top without finding match", 501},
-  {"Search interrupted.", 502},
-  {"Enter PGP passphrase:", 503},
-  {"PGP passphrase forgotten.", 504},
-  {"Unknown PGP version \"%s\".", 505},
-  {"[-- PGP output follows (current time: ", 506},
-  {"[-- Error: unable to create PGP subprocess! --]\n", 507},
+  {"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},
+  {"View Attachm.", 475},
+  {"Next", 476},
+  {"Bottom of message is shown.", 477},
+  {"Top of message is shown.", 478},
+  {"Reverse search: ", 479},
+  {"Search: ", 480},
+  {"Help is currently being shown.", 481},
+  {"No more quoted text.", 482},
+  {"No more unquoted text after quoted text.", 483},
+  {"multipart message has no boundary parameter!", 484},
+  {"Error in expression: %s", 485},
+  {"Invalid day of month: %s", 486},
+  {"Invalid month: %s", 487},
+  {"error in expression", 488},
+  {"error in pattern at: %s", 489},
+  {"%c: invalid command", 490},
+  {"%c: not supported in this mode", 491},
+  {"missing parameter", 492},
+  {"mismatched parenthesis: %s", 493},
+  {"empty pattern", 494},
+  {"error: unknown op %d (report this error).", 495},
+  {"Compiling search pattern...", 496},
+  {"Executing command on matching messages...", 497},
+  {"No messages matched criteria.", 498},
+  {"Search hit bottom without finding match", 499},
+  {"Search hit top without finding match", 500},
+  {"Search interrupted.", 501},
+  {"Enter PGP passphrase:", 502},
+  {"PGP passphrase forgotten.", 503},
+  {"Unknown PGP version \"%s\".", 504},
+  {"[-- PGP output follows (current time: ", 505},
+  {"[-- Error: unable to create PGP subprocess! --]\n", 506},
   {"\
 \n\
 [-- End of PGP output --]\n\
-\n", 508},
+\n", 507},
   {"\
 [-- Error: could not find beginning of PGP message! --]\n\
-\n", 509},
+\n", 508},
   {"\
 [-- End of PGP output --]\n\
-\n", 510},
+\n", 509},
   {"\
 [-- The following data is PGP/MIME signed --]\n\
-\n", 511},
+\n", 510},
   {"\
 \n\
-[-- End of PGP/MIME signed data --]\n", 512},
+[-- End of PGP/MIME signed data --]\n", 511},
   {"\
 [-- Error: this message does not comply with the PGP/MIME specification! \
 --]\n\
-\n", 513},
-  {"Internal error. Inform <roessler@guug.de>.", 514},
+\n", 512},
+  {"Internal error. Inform <roessler@guug.de>.", 513},
   {"\
 [-- Error: could not create a PGP subprocess! --]\n\
-\n", 515},
+\n", 514},
   {"\
 [-- Error: malformed PGP/MIME message! --]\n\
-\n", 516},
-  {"[-- Error: could not create temporary file! --]\n", 517},
+\n", 515},
+  {"[-- Error: could not create temporary file! --]\n", 516},
   {"\
 [-- The following data is PGP/MIME encrypted --]\n\
-\n", 518},
+\n", 517},
   {"\
 \n\
-[-- End of PGP/MIME encrypted data --]\n", 519},
-  {"Can't open PGP subprocess!", 520},
-  {"Use keyID = \"%s\" for %s?", 521},
-  {"Enter keyID for %s: ", 522},
-  {"Exit  ", 523},
-  {"Select  ", 524},
-  {"Check key  ", 525},
-  {"PGP keys matching ", 526},
-  {"Can't open /dev/null", 527},
-  {"Can't create temporary file", 528},
-  {"Can't create filter", 529},
-  {"Key ID: 0x%s", 530},
-  {"This ID's trust level is undefined.", 531},
-  {"This ID is not trusted.", 532},
-  {"This ID is only marginally trusted.", 533},
-  {"%s Do you really want to use it?", 534},
-  {"Please enter the key ID: ", 535},
-  {"PGP Key 0x%s.", 536},
-  {"reserved", 537},
-  {"Encrypted Session Key", 538},
-  {"Signature Packet", 539},
-  {"Conventionally Encrypted Session Key Packet", 540},
-  {"One-Pass Signature Packet", 541},
-  {"Secret Key Packet", 542},
-  {"Public Key Packet", 543},
-  {"Secret Subkey Packet", 544},
-  {"Compressed Data Packet", 545},
-  {"Symmetrically Encrypted Data Packet", 546},
-  {"Marker Packet", 547},
-  {"Literal Data Packet", 548},
-  {"Trust Packet", 549},
-  {"Name Packet", 550},
-  {"Subkey Packet", 551},
-  {"Reserved", 552},
-  {"Comment Packet", 553},
-  {"POP Password: ", 554},
-  {"POP host is not defined.", 555},
-  {"No POP username is defined.", 556},
-  {"Could not find address for host %s.", 557},
-  {"Connecting to %s", 558},
-  {"Server closed connection!", 559},
-  {"No new mail in POP mailbox.", 560},
-  {"Reading %d new message (%d bytes)...", 561},
-  {"Error reading message!", 562},
-  {"Error while writing mailbox!", 563},
-  {"%s [%d messages read]", 564},
-  {"Postponed Messages", 565},
-  {"No postponed messages.", 566},
-  {"Illegal PGP header", 567},
-  {"New Query", 568},
-  {"Make Alias", 569},
-  {"Search", 570},
-  {"Waiting for response...", 571},
-  {"Query command not defined.", 572},
-  {"Query", 573},
-  {"Query: ", 574},
-  {"Query '%s'", 575},
-  {"Pipe", 576},
-  {"Print", 577},
-  {"Saving...", 578},
-  {"Attachment saved", 579},
-  {"WARNING!  You are about to overwrite %s, continue?", 580},
-  {"Attachment filtered.", 581},
-  {"Filter through: ", 582},
-  {"Pipe to: ", 583},
-  {"I dont know how to print %s attachments!", 584},
-  {"Print tagged attachment(s)?", 585},
-  {"Print attachment?", 586},
-  {"You may only bounce message/rfc822 parts.", 587},
-  {"Bounce messages to %s...?", 588},
-  {"Bounce message to %s...?", 589},
-  {"Attachments", 590},
-  {"Only deletion of multipart attachments is supported.", 591},
-  {"Deletion of attachments from PGP messages is unsupported.", 592},
-  {"This operation is not currently supported for PGP messages.", 593},
-  {"Improperly formated entry for type %s in \"%s\" line %d", 594},
-  {"No mailcap path specified", 595},
-  {"mailcap entry for type %s not found", 596},
-  {"score: too few arguments", 597},
-  {"score: too many arguments", 598},
-  {"No subject, abort?", 599},
-  {"No subject, aborting.", 600},
-  {"Reply to %s?", 601},
-  {"No tagged messages are visible!", 602},
-  {"No mailing lists found!", 603},
-  {"Include message in reply?", 604},
-  {"Could not include all requested messages!", 605},
-  {"Forward MIME encapsulated?", 606},
-  {"Recall postponed message?", 607},
-  {"Abort unmodified message?", 608},
-  {"Aborted unmodified message.", 609},
-  {"Mail not sent.", 610},
-  {"Message postponed.", 611},
-  {"No recipients are specified!", 612},
-  {"No recipients were specified.", 613},
-  {"No subject, abort sending?", 614},
-  {"No subject specified.", 615},
-  {"Message edited. Really send?", 616},
-  {"Sending message...", 617},
-  {"Mail sent.", 618},
-  {"No boundary parameter found! [report this error]", 619},
-  {"%s no longer exists!", 620},
-  {"Could not open %s", 621},
-  {"Error sending message, child exited %d (%s).\n", 622},
-  {"Saved output of child process to %s.\n", 623},
-  {"Error sending message.", 624},
-  {"Caught %s...  Exiting.\n", 625},
-  {"Caught signal %d...  Exiting.\n", 626},
-  {"Sorting mailbox...", 627},
-  {"Could not find sorting function! [report this bug]", 628},
-  {"(no mailbox)", 629},
+[-- End of PGP/MIME encrypted data --]\n", 518},
+  {"Can't open PGP subprocess!", 519},
+  {"Use keyID = \"%s\" for %s?", 520},
+  {"Enter keyID for %s: ", 521},
+  {"Exit  ", 522},
+  {"Select  ", 523},
+  {"Check key  ", 524},
+  {"PGP keys matching ", 525},
+  {"Can't open /dev/null", 526},
+  {"Can't create temporary file", 527},
+  {"Can't create filter", 528},
+  {"Key ID: 0x%s", 529},
+  {"This ID's trust level is undefined.", 530},
+  {"This ID is not trusted.", 531},
+  {"This ID is only marginally trusted.", 532},
+  {"%s Do you really want to use it?", 533},
+  {"Please enter the key ID: ", 534},
+  {"PGP Key 0x%s.", 535},
+  {"reserved", 536},
+  {"Encrypted Session Key", 537},
+  {"Signature Packet", 538},
+  {"Conventionally Encrypted Session Key Packet", 539},
+  {"One-Pass Signature Packet", 540},
+  {"Secret Key Packet", 541},
+  {"Public Key Packet", 542},
+  {"Secret Subkey Packet", 543},
+  {"Compressed Data Packet", 544},
+  {"Symmetrically Encrypted Data Packet", 545},
+  {"Marker Packet", 546},
+  {"Literal Data Packet", 547},
+  {"Trust Packet", 548},
+  {"Name Packet", 549},
+  {"Subkey Packet", 550},
+  {"Reserved", 551},
+  {"Comment Packet", 552},
+  {"POP Password: ", 553},
+  {"POP host is not defined.", 554},
+  {"No POP username is defined.", 555},
+  {"Could not find address for host %s.", 556},
+  {"Connecting to %s", 557},
+  {"Server closed connection!", 558},
+  {"No new mail in POP mailbox.", 559},
+  {"Reading %d new message (%d bytes)...", 560},
+  {"Error reading message!", 561},
+  {"Error while writing mailbox!", 562},
+  {"%s [%d messages read]", 563},
+  {"Postponed Messages", 564},
+  {"No postponed messages.", 565},
+  {"Illegal PGP header", 566},
+  {"New Query", 567},
+  {"Make Alias", 568},
+  {"Search", 569},
+  {"Waiting for response...", 570},
+  {"Query command not defined.", 571},
+  {"Query", 572},
+  {"Query: ", 573},
+  {"Query '%s'", 574},
+  {"Pipe", 575},
+  {"Print", 576},
+  {"Saving...", 577},
+  {"Attachment saved", 578},
+  {"WARNING!  You are about to overwrite %s, continue?", 579},
+  {"Attachment filtered.", 580},
+  {"Filter through: ", 581},
+  {"Pipe to: ", 582},
+  {"I dont know how to print %s attachments!", 583},
+  {"Print tagged attachment(s)?", 584},
+  {"Print attachment?", 585},
+  {"You may only bounce message/rfc822 parts.", 586},
+  {"Bounce messages to %s...?", 587},
+  {"Bounce message to %s...?", 588},
+  {"Attachments", 589},
+  {"Only deletion of multipart attachments is supported.", 590},
+  {"Deletion of attachments from PGP messages is unsupported.", 591},
+  {"This operation is not currently supported for PGP messages.", 592},
+  {"Improperly formated entry for type %s in \"%s\" line %d", 593},
+  {"No mailcap path specified", 594},
+  {"mailcap entry for type %s not found", 595},
+  {"score: too few arguments", 596},
+  {"score: too many arguments", 597},
+  {"No subject, abort?", 598},
+  {"No subject, aborting.", 599},
+  {"Reply to %s?", 600},
+  {"No tagged messages are visible!", 601},
+  {"No mailing lists found!", 602},
+  {"Include message in reply?", 603},
+  {"Could not include all requested messages!", 604},
+  {"Forward MIME encapsulated?", 605},
+  {"Recall postponed message?", 606},
+  {"Abort unmodified message?", 607},
+  {"Aborted unmodified message.", 608},
+  {"Mail not sent.", 609},
+  {"Message postponed.", 610},
+  {"No recipients are specified!", 611},
+  {"No recipients were specified.", 612},
+  {"No subject, abort sending?", 613},
+  {"No subject specified.", 614},
+  {"Message edited. Really send?", 615},
+  {"Sending message...", 616},
+  {"Mail sent.", 617},
+  {"No boundary parameter found! [report this error]", 618},
+  {"%s no longer exists!", 619},
+  {"Could not open %s", 620},
+  {"Error sending message, child exited %d (%s).\n", 621},
+  {"Saved output of child process to %s.\n", 622},
+  {"Error sending message.", 623},
+  {"Caught %s...  Exiting.\n", 624},
+  {"Caught signal %d...  Exiting.\n", 625},
+  {"Sorting mailbox...", 626},
+  {"Could not find sorting function! [report this bug]", 627},
+  {"(no mailbox)", 628},
 };
 
-int _msg_tbl_length = 629;
+int _msg_tbl_length = 628;
diff --git a/po/mutt.pot b/po/mutt.pot
index 7dd72001..f7f1add9 100644
--- a/po/mutt.pot
+++ b/po/mutt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-10-06 08:02+0200\n"
+"POT-Creation-Date: 1998-10-08 00:03+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"
@@ -145,7 +145,7 @@ msgstr ""
 msgid "Directory [%s], File mask: %s"
 msgstr ""
 
-#: browser.c:537 browser.c:730 browser.c:825
+#: browser.c:537 browser.c:730 browser.c:830
 msgid "No files match the file mask"
 msgstr ""
 
@@ -169,15 +169,15 @@ msgstr ""
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 
-#: browser.c:811
+#: browser.c:816
 msgid "New file name: "
 msgstr ""
 
-#: browser.c:833
+#: browser.c:838
 msgid "Can't view a directory"
 msgstr ""
 
-#: browser.c:851
+#: browser.c:856
 msgid "Error trying to view file"
 msgstr ""
 
@@ -228,7 +228,7 @@ msgstr ""
 msgid "%s: no such attribute"
 msgstr ""
 
-#: color.c:662 hook.c:61 hook.c:69 keymap.c:655
+#: color.c:662 hook.c:61 hook.c:69 keymap.c:649
 msgid "too few arguments"
 msgstr ""
 
@@ -879,7 +879,7 @@ msgstr ""
 msgid "Help for %s"
 msgstr ""
 
-#: imap.c:100
+#: imap.c:102
 #, c-format
 msgid "imap_error(): unexpected response in %s: %s\n"
 msgstr ""
@@ -887,77 +887,77 @@ msgstr ""
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap.c:353
+#: imap.c:354
 msgid "Fatal error.  Message count is out of sync!"
 msgstr ""
 
-#: imap.c:428
+#: imap.c:424
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr ""
 
-#: imap.c:662
+#: imap.c:622 mbox.c:925
+msgid "Reopening mailbox..."
+msgstr ""
+
+#: imap.c:857
 #, c-format
 msgid "Connecting to %s..."
 msgstr ""
 
-#: imap.c:681
+#: imap.c:876
 msgid "IMAP Username: "
 msgstr ""
 
-#: imap.c:694
+#: imap.c:889
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: imap.c:707
+#: imap.c:902
 msgid "Logging in..."
 msgstr ""
 
-#: imap.c:759
+#: imap.c:957
 #, c-format
 msgid "Selecting %s..."
 msgstr ""
 
-#: imap.c:854 lib.c:1164
+#: imap.c:1053 lib.c:1164
 #, c-format
 msgid "Create %s?"
 msgstr ""
 
-#: imap.c:898
+#: imap.c:1097
 msgid "Fetching message..."
 msgstr ""
 
-#: imap.c:1006
+#: imap.c:1205
 msgid "Sending APPEND command ..."
 msgstr ""
 
-#: imap.c:1044
+#: imap.c:1244
 msgid "Uploading message ..."
 msgstr ""
 
-#: imap.c:1099
+#: imap.c:1299
 msgid "Closing connection to IMAP server..."
 msgstr ""
 
-#: imap.c:1128
+#: imap.c:1329
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr ""
 
-#: imap.c:1154
+#: imap.c:1355
 msgid "Expunging messages from server..."
 msgstr ""
 
 #. tell the server to commit changes
-#: imap.c:1205
+#: imap.c:1406
 msgid "Closing mailbox..."
 msgstr ""
 
-#: imap.c:1306
-msgid "BUG! Untagged IMAP Response during BUFFY Check"
-msgstr ""
-
 #: init.c:432
 msgid "alias: no address"
 msgstr ""
@@ -1062,54 +1062,54 @@ msgstr ""
 msgid "unable to determine username"
 msgstr ""
 
-#: keymap.c:410
+#: keymap.c:413
 msgid "Macro loop detected."
 msgstr ""
 
-#: keymap.c:605
+#: keymap.c:599
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr ""
 
-#: keymap.c:607
+#: keymap.c:601
 msgid "Key is not bound.  See the manual."
 msgstr ""
 
-#: keymap.c:617
+#: keymap.c:611
 msgid "push: too many arguments"
 msgstr ""
 
-#: keymap.c:638
+#: keymap.c:632
 #, c-format
 msgid "%s: no such menu"
 msgstr ""
 
-#: keymap.c:647
+#: keymap.c:641
 msgid "null key sequence"
 msgstr ""
 
-#: keymap.c:725
+#: keymap.c:719
 msgid "bind: too many arguments"
 msgstr ""
 
-#: keymap.c:740
+#: keymap.c:734
 #, c-format
 msgid "%s: no such function in map"
 msgstr ""
 
-#: keymap.c:763
+#: keymap.c:757
 msgid "macro: empty key sequence"
 msgstr ""
 
-#: keymap.c:774
+#: keymap.c:768
 msgid "macro: too many arguments"
 msgstr ""
 
-#: keymap.c:804
+#: keymap.c:798
 msgid "exec: too few arguments"
 msgstr ""
 
-#: keymap.c:823
+#: keymap.c:818
 #, c-format
 msgid "%s: no such command"
 msgstr ""
@@ -1932,10 +1932,6 @@ msgstr ""
 msgid "Could not reopen mailbox!"
 msgstr ""
 
-#: mbox.c:925
-msgid "Reopening mailbox..."
-msgstr ""
-
 #: menu.c:297
 msgid "Jump to: "
 msgstr ""
@@ -2475,7 +2471,7 @@ msgstr ""
 msgid "Connecting to %s"
 msgstr ""
 
-#: pop.c:166 pop.c:317
+#: pop.c:166 pop.c:331
 msgid "Server closed connection!"
 msgstr ""
 
@@ -2483,20 +2479,20 @@ msgstr ""
 msgid "No new mail in POP mailbox."
 msgstr ""
 
-#: pop.c:195
+#: pop.c:209
 #, c-format
 msgid "Reading %d new message (%d bytes)..."
 msgstr ""
 
-#: pop.c:231
+#: pop.c:245
 msgid "Error reading message!"
 msgstr ""
 
-#: pop.c:267
+#: pop.c:281
 msgid "Error while writing mailbox!"
 msgstr ""
 
-#: pop.c:291
+#: pop.c:305
 #, c-format
 msgid "%s [%d messages read]"
 msgstr ""