Minor fix

@@ -311,9 +311,9 @@ int
 mu_folder_list (mu_folder_t folder, const char *dirname, const char *basename,
 	     struct mu_folder_list *pflist)
 {
-  if (folder == NULL || folder->_mu_list == NULL)
+  if (folder == NULL || folder->_list == NULL)
     return EINVAL;
-  return folder->_mu_list (folder, dirname, basename, pflist);
+  return folder->_list (folder, dirname, basename, pflist);
 }
 
 int

@@ -416,7 +416,7 @@ _folder_imap_init (mu_folder_t folder)
   folder->_open = folder_imap_open;
   folder->_close = folder_imap_close;
 
-  folder->_mu_list = folder_imap_list;
+  folder->_list = folder_imap_list;
   folder->_lsub = folder_imap_lsub;
   folder->_subscribe = folder_imap_subscribe;
   folder->_unsubscribe = folder_imap_unsubscribe;

@@ -55,7 +55,7 @@ struct _mu_folder
 
   int  (*_open)        (mu_folder_t, int flag);
   int  (*_close)       (mu_folder_t);
-  int  (*_mu_list)        (mu_folder_t, const char *, const char *,
+  int  (*_list)        (mu_folder_t, const char *, const char *,
 		        struct mu_folder_list *);
   int  (*_lsub)        (mu_folder_t, const char *, const char *,
 		        struct mu_folder_list *);

@@ -165,7 +165,7 @@ _folder_mbox_init (mu_folder_t folder)
   folder->_open = folder_mbox_open;
   folder->_close = folder_mbox_close;
 
-  folder->_mu_list = folder_mbox_list;
+  folder->_list = folder_mbox_list;
   folder->_lsub = folder_mbox_lsub;
   folder->_subscribe = folder_mbox_subscribe;
   folder->_unsubscribe = folder_mbox_unsubscribe;

@@ -80,7 +80,7 @@ _nntp_folder_init (mu_folder_t folder)
   folder->_open = nntp_folder_open;
   folder->_close = nntp_folder_close;
 
-  folder->_mu_list = nntp_folder_list;
+  folder->_list = nntp_folder_list;
   /* Not supported.
     folder->_lsub = folder_nntp_lsub;
     folder->_subscribe = folder_nntp_subscribe;

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mailutils 0.6.90\n"
 "Report-Msgid-Bugs-To: bug-mailutils@gnu.org\n"
-"POT-Creation-Date: 2005-08-16 13:23+0300\n"
+"POT-Creation-Date: 2005-08-26 17:10+0300\n"
 "PO-Revision-Date: 2005-05-21 04:10+0200\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -54,7 +54,7 @@ msgstr ""
 "llista que estan definides. Ix amb estat zero si totes les opcions "
 "especificades estan definides. Si no, l'estat d'eixida s 1."
 
-#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:569
+#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:570
 msgid "Too many arguments"
 msgstr "S'han donat massa arguments"
 
@@ -117,8 +117,8 @@ msgid "Name of the database to connect to"
 msgstr "Nom de la base de dades a la qual connectar"
 
 #: auth/sql.c:201 mailbox/mu_argp.c:80 mailbox/mu_argp.c:115
-#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
-#: mh/repl.c:65 mh/scan.c:50 mh/send.c:75
+#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:51 mh/mhl.c:44 mh/mhl.c:46
+#: mh/repl.c:65 mh/scan.c:51 mh/send.c:75
 msgid "NUMBER"
 msgstr "NMERO"
 
@@ -166,8 +166,8 @@ msgstr "Opcions de xifrat"
 #: auth/tls.c:59 auth/tls.c:61 auth/tls.c:63 comsat/comsat.c:59
 #: dotlock/dotlock.c:43 frm/from.c:32 mail.local/main.c:83
 #: mailbox/mu_argp.c:125 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
-#: mh/inc.c:32 mh/inc.c:36 mh/inc.c:43 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
-#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:44 mh/scan.c:55 mh/send.c:38
+#: mh/inc.c:33 mh/inc.c:37 mh/inc.c:44 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
+#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:45 mh/scan.c:56 mh/send.c:38
 #: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:81 pop3d/popauth.c:82
 #: mimeview/mimeview.c:48 mimeview/mimeview.c:52
 msgid "FILE"
@@ -189,17 +189,17 @@ msgstr "Especifica el fitxer de autoritats de certificaci de confiana"
 msgid "INTERNAL ERROR: cannot register argp capability tls"
 msgstr "ERROR INTERN: no es pot registrar la capacitat d'argp tls"
 
-#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:63 mh/folder.c:66
-#: mh/folder.c:69 mh/folder.c:72 mh/folder.c:75 mh/forw.c:33 mh/forw.c:49
-#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:40 mh/inc.c:47
+#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:64 mh/folder.c:67
+#: mh/folder.c:70 mh/folder.c:73 mh/folder.c:76 mh/forw.c:33 mh/forw.c:49
+#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:41 mh/inc.c:48
 #: mh/mark.c:40 mh/mark.c:43 mh/mhl.c:36 mh/mhl.c:39 mh/mhn.c:43 mh/mhn.c:48
 #: mh/mhn.c:51 mh/mhn.c:54 mh/mhn.c:59 mh/mhn.c:62 mh/mhn.c:67 mh/mhn.c:72
 #: mh/mhn.c:75 mh/mhn.c:84 mh/pick.c:84 mh/pick.c:89 mh/pick.c:92
 #: mh/refile.c:42 mh/refile.c:45 mh/repl.c:36 mh/repl.c:51 mh/repl.c:59
-#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:41
-#: mh/scan.c:48 mh/scan.c:52 mh/send.c:52 mh/send.c:55 mh/send.c:58
+#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:42
+#: mh/scan.c:49 mh/scan.c:53 mh/send.c:52 mh/send.c:55 mh/send.c:58
 #: mh/send.c:61 mh/send.c:64 mh/send.c:69 mh/send.c:72 mh/whom.c:40
-#: sieve/sieve.c:92
+#: sieve/sieve.c:93
 msgid "BOOL"
 msgstr "BOOL"
 
@@ -365,8 +365,8 @@ msgid "Cannot open device %s: %m"
 msgstr "No es pot obrir el dispositiu %s: %m"
 
 #: comsat/comsat.c:456 mail/copy.c:76 mail/file.c:95 mail/mail.c:438
-#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:218
-#: mh/mh_init.c:379 pop3d/apop.c:240
+#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:219
+#: mh/mh_init.c:380 pop3d/apop.c:240
 #, c-format
 msgid "Cannot open mailbox %s: %s"
 msgstr "No es pot obrir la bstia %s: %s"
@@ -633,7 +633,7 @@ msgstr "GNU from -- mostra el remitent i l'assumpte"
 msgid "Just print a count of messages and exit"
 msgstr "Mostra un compte de missatges i ix"
 
-#: frm/from.c:30 sieve/sieve.c:95
+#: frm/from.c:30 sieve/sieve.c:96
 msgid "ADDRESS"
 msgstr "ADREA"
 
@@ -677,13 +677,13 @@ msgid "Could not close mailbox `%s': %s"
 msgstr "No s'ha pogut tancar la bstia %s: %s"
 
 #: frm/common.c:545 messages/messages.c:142 movemail/movemail.c:189
-#: sieve/sieve.c:457
+#: sieve/sieve.c:458
 #, c-format
 msgid "Could not create mailbox `%s': %s"
 msgstr "No s'ha pogut crear la bstia %s: %s"
 
 #: frm/common.c:548 messages/messages.c:145 movemail/movemail.c:193
-#: sieve/sieve.c:460
+#: sieve/sieve.c:461
 #, c-format
 msgid "Could not create default mailbox: %s"
 msgstr "No es pot crear la bstia per defecte: %s"
@@ -728,9 +728,9 @@ msgid "Cannot open output mailbox %s: %s\n"
 msgstr "No es pot obrir la bstia d'eixida %s: %s\n"
 
 #: guimb/main.c:45 imap4d/auth_gss.c:267 libsieve/sieve.l:132
-#: libsieve/sieve.l:603 libsieve/sieve.l:667 libsieve/sieve.l:721
-#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:111
-#: mh/mh_init.c:316 mh/mh_msgset.c:606
+#: libsieve/sieve.l:604 libsieve/sieve.l:668 libsieve/sieve.l:722
+#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:112
+#: mh/mh_init.c:317 mh/mh_msgset.c:606
 msgid "Not enough memory"
 msgstr "No hi ha memria suficient"
 
@@ -844,65 +844,65 @@ msgstr "l'usuari de GSSAPI %s est autoritzat com %s"
 msgid "User `%s' logged in"
 msgstr "L'usuari %s ha entrat"
 
-#: imap4d/imap4d.c:46
+#: imap4d/imap4d.c:47
 msgid "GNU imap4d -- the IMAP4D daemon"
 msgstr "GNU imap4d -- el dimoni d'IMAP4D"
 
-#: imap4d/imap4d.c:52 imap4d/imap4d.c:54
+#: imap4d/imap4d.c:53 imap4d/imap4d.c:55
 msgid "PATHLIST"
 msgstr "LLISTA-CAMINS"
 
-#: imap4d/imap4d.c:53
+#: imap4d/imap4d.c:54
 msgid "Set the `other' namespace"
 msgstr "Estableix l'altre espai de noms"
 
-#: imap4d/imap4d.c:55
+#: imap4d/imap4d.c:56
 msgid "Set the `shared' namespace"
 msgstr "Estableix l'espai de noms compartit"
 
-#: imap4d/imap4d.c:57
+#: imap4d/imap4d.c:58
 msgid "Disable LOGIN command"
 msgstr "Inhabilita l'ordre LOGIN"
 
-#: imap4d/imap4d.c:60
+#: imap4d/imap4d.c:61
 msgid "Always require STARTTLS before entering authentication phase"
 msgstr "Requereix sempre STARTTLS abans d'iniciar la fase d'autenticaci"
 
-#: imap4d/imap4d.c:175 pop3d/pop3d.c:201
+#: imap4d/imap4d.c:176 pop3d/pop3d.c:202
 msgid "Error getting mail group"
 msgstr "S'ha produt un error a l'obtindre el grup mail"
 
-#: imap4d/imap4d.c:181 pop3d/pop3d.c:207
+#: imap4d/imap4d.c:182 pop3d/pop3d.c:208
 msgid "Error setting mail group"
 msgstr "S'ha produt un error a l'establir el grup mail"
 
-#: imap4d/imap4d.c:260 pop3d/pop3d.c:298
+#: imap4d/imap4d.c:261 pop3d/pop3d.c:299
 msgid "Incoming connection opened"
 msgstr "Connexi entrant oberta"
 
-#: imap4d/imap4d.c:262 pop3d/pop3d.c:310
+#: imap4d/imap4d.c:263 pop3d/pop3d.c:311
 #, c-format
 msgid "Cannot obtain IP address of client: %s"
 msgstr "No es pot obtindre l'adrea IP del client: %s"
 
-#: imap4d/imap4d.c:265
+#: imap4d/imap4d.c:266
 #, c-format
 msgid "Connect from %s"
 msgstr "Connexi des de %s"
 
-#: imap4d/imap4d.c:270 pop3d/pop3d.c:303
+#: imap4d/imap4d.c:271 pop3d/pop3d.c:304
 msgid "Started in debugging mode"
 msgstr "S'ha iniciat en mode de depuraci"
 
-#: imap4d/imap4d.c:302
+#: imap4d/imap4d.c:303
 msgid "could not become daemon"
 msgstr "no s'ha pogut convertir en dimoni"
 
-#: imap4d/imap4d.c:358
+#: imap4d/imap4d.c:359
 msgid "GNU imap4d started"
 msgstr "s'ha iniciat el GNU imap4d"
 
-#: imap4d/imap4d.c:364
+#: imap4d/imap4d.c:365
 #, c-format
 msgid "Too many children (%lu)"
 msgstr "Massa fills (%lu)"
@@ -942,7 +942,7 @@ msgstr "La sessi est finalitzant per l'usuari: %s"
 msgid "Quitting (numeric reason %d)"
 msgstr "S'est eixint (ra numrica %d)"
 
-#: imap4d/list.c:247 mh/folder.c:326 mh/mh_init.c:225 mh/mh_init.c:704
+#: imap4d/list.c:247 mh/folder.c:327 mh/mh_init.c:226 mh/mh_init.c:705
 #: mh/rmf.c:147 pop3d/popauth.c:246
 #, c-format
 msgid "Cannot stat %s: %s"
@@ -972,25 +972,25 @@ msgstr "S'ha rebut el senyal %s"
 msgid "MASTER: exiting on signal"
 msgstr "MESTRE: s'est eixint en el senyal"
 
-#: imap4d/util.c:509
+#: imap4d/util.c:510
 msgid "Unexpected eof on input"
 msgstr "eof inesperat en l'entrada"
 
-#: imap4d/util.c:518
+#: imap4d/util.c:519
 #, c-format
 msgid "Error reading from input file: %s"
 msgstr "Error en llegir des del fitxer d'entrada: %s"
 
-#: imap4d/util.c:1005
+#: imap4d/util.c:1006
 msgid "Cannot find out my own hostname"
 msgstr "No es pot trobar el nostre propi nom de l'ordinador"
 
-#: imap4d/util.c:1152
+#: imap4d/util.c:1153
 #, c-format
 msgid "Cannot poll input stream: %s"
 msgstr "No es pot sondejar el flux d'entrada: %s"
 
-#: imap4d/util.c:1186
+#: imap4d/util.c:1187
 #, c-format
 msgid "Cannot open TLS stream: %s"
 msgstr "No es pot obrir el flux de TLS: %s"
@@ -1113,109 +1113,109 @@ msgstr "%d: no es pot copiar el missatge: %s"
 msgid "%d: cannot get my email address"
 msgstr "%d: no es pot determinar la nostra adrea de correu"
 
-#: libsieve/comparator.c:171
+#: libsieve/comparator.c:172
 #, c-format
 msgid "Regex error: %s"
 msgstr "S'ha produt un error d'expreg: %s"
 
-#: libsieve/comparator.c:176
+#: libsieve/comparator.c:177
 msgid "Regex error"
 msgstr "Error d'expreg"
 
-#: libsieve/comparator.c:238
+#: libsieve/comparator.c:239
 #, c-format
 msgid "match type specified twice in call to `%s'"
 msgstr ""
 "s'ha especificat dos vegades el tipus de coincidncia en la crida a %s"
 
 #. TRANSLATORS: Do not translate ':count'. It is the name of a Sieve tag
-#: libsieve/comparator.c:275
+#: libsieve/comparator.c:276
 #, c-format
 msgid "comparator %s is incompatible with :count in call to `%s'"
 msgstr "el comparador %s s incompatible amb :count en la crida a %s"
 
-#: libsieve/comparator.c:291
+#: libsieve/comparator.c:292
 msgid "second argument must be a list of one element"
 msgstr "el segon argument ha de ser una lista d'un element"
 
-#: libsieve/comparator.c:299
+#: libsieve/comparator.c:300
 msgid "second argument cannot be converted to number"
 msgstr "el segon argument no es pot convertir a nmero"
 
-#: libsieve/comparator.c:309
+#: libsieve/comparator.c:310
 #, c-format
 msgid "invalid relational match `%s' in call to `%s'"
 msgstr "coincidncia relacional %s no vlida en la crida a %s"
 
-#: libsieve/comparator.c:322
+#: libsieve/comparator.c:323
 #, c-format
 msgid "comparator `%s' is incompatible with match type `%s' in call to `%s'"
 msgstr ""
 "el comparador %s s incompatible amb el tipus de coincidncia %s en la "
 "crida a %s"
 
-#: libsieve/prog.c:39
+#: libsieve/prog.c:40
 msgid "out of memory!"
 msgstr "memria exhaurida!"
 
-#: libsieve/prog.c:158 libsieve/require.c:39
+#: libsieve/prog.c:159 libsieve/require.c:40
 #, c-format
 msgid "cannot create iterator: %s"
 msgstr "no es pot crear l'iterador: %s"
 
-#: libsieve/prog.c:177
+#: libsieve/prog.c:178
 #, c-format
 msgid "invalid tag name `%s' for `%s'"
 msgstr "nom de marcador %s no vlid per a %s"
 
-#: libsieve/prog.c:186
+#: libsieve/prog.c:187
 #, c-format
 msgid "%s:%d: cannot create tag list: %s"
 msgstr "%s:%d: no es pot crear la llista de marcadors: %s"
 
-#: libsieve/prog.c:210
+#: libsieve/prog.c:211
 #, c-format
 msgid "%s:%d: cannot create check list: %s"
 msgstr "%s:%d: no es pot crear la llista de comprovacions: %s"
 
-#: libsieve/prog.c:222 mimeview/mimetypes.y:561
+#: libsieve/prog.c:223 mimeview/mimetypes.y:561
 #, c-format
 msgid "too many arguments in call to `%s'"
 msgstr "massa arguments en la crida a %s"
 
-#: libsieve/prog.c:243
+#: libsieve/prog.c:244
 #, c-format
 msgid "type mismatch in argument %d to `%s'"
 msgstr "els tipus no coincideixen en l'argument %d de %s"
 
-#: libsieve/prog.c:247
+#: libsieve/prog.c:248
 #, c-format
 msgid "expected %s but passed %s"
 msgstr "S'esperava %s per s'ha passat %s"
 
-#: libsieve/prog.c:258
+#: libsieve/prog.c:259
 #, c-format
 msgid "cannot create arg list: %s"
 msgstr "no es pot crear la llista d'arguments: %s"
 
-#: libsieve/prog.c:276 mimeview/mimetypes.y:553
+#: libsieve/prog.c:277 mimeview/mimetypes.y:553
 #, c-format
 msgid "too few arguments in call to `%s'"
 msgstr "arguments insuficients en la crida a %s"
 
-#: libsieve/require.c:56
+#: libsieve/require.c:57
 msgid "required comparator"
 msgstr "comparador requerit"
 
-#: libsieve/require.c:62
+#: libsieve/require.c:63
 msgid "required test"
 msgstr "prova requerida"
 
-#: libsieve/require.c:72
+#: libsieve/require.c:73
 msgid "required action"
 msgstr "acci requerida"
 
-#: libsieve/require.c:78
+#: libsieve/require.c:79
 #, c-format
 msgid "source for the %s %s is not available"
 msgstr "els fonts per al %s %s no estan disponibles"
@@ -1230,8 +1230,8 @@ msgid "stack underflow"
 msgstr "pila buida"
 
 #: libsieve/runtime.c:341
-#, c-format
-msgid "mailbox_scan: %s"
+#, fuzzy, c-format
+msgid "mu_mailbox_scan: %s"
 msgstr "mailbox_scan: %s"
 
 #: libsieve/sieve.l:234
@@ -1337,7 +1337,7 @@ msgstr ""
 msgid "\"%s\": not a group"
 msgstr "%s: no s un grup"
 
-#: mail/alt.c:64 mh/mh_init.c:127
+#: mail/alt.c:64 mh/mh_init.c:128
 msgid "Cannot determine my username"
 msgstr "No es pot determinar el nostre nom d'usuari"
 
@@ -1351,13 +1351,13 @@ msgstr "No es pot determinar la nostra adrea de correu: %s"
 msgid "cannot change to '%s': %s"
 msgstr "no es pot fer stat de %s: %s"
 
-#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:541 mh/inc.c:209
-#: mh/mh_init.c:369
+#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:542 mh/inc.c:210
+#: mh/mh_init.c:370
 #, c-format
 msgid "Cannot create mailbox %s: %s"
 msgstr "No es pot crear la bstia %s: %s"
 
-#: mail/copy.c:92 mail/quit.c:126 mail/send.c:534
+#: mail/copy.c:92 mail/quit.c:126 mail/send.c:535
 #, c-format
 msgid "Cannot append message: %s"
 msgstr "No es pot agregar el missatge: %s"
@@ -1385,7 +1385,7 @@ msgstr ""
 "\n"
 "Interrupci"
 
-#: mail/escape.c:59 mail/send.c:225 mh/mhn.c:2059 mimeview/mimeview.c:217
+#: mail/escape.c:59 mail/send.c:226 mh/mhn.c:2059 mimeview/mimeview.c:217
 #, c-format
 msgid "Cannot create header: %s"
 msgstr "No es pot crear la capalera: %s"
@@ -1731,21 +1731,21 @@ msgstr "Cap camp est sent desdoblat actualment\n"
 msgid "Sender address is obtained from the envelope\n"
 msgstr "L'adrea del remitent s'obt del sobre\n"
 
-#: mail/send.c:73
+#: mail/send.c:74
 #, c-format
 msgid "Cannot create header list: %s"
 msgstr "No es pot crear la llista de capaleres: %s"
 
-#: mail/send.c:95
+#: mail/send.c:96
 #, c-format
 msgid "Invalid header: %s"
 msgstr "La capalera s invlida: %s"
 
-#: mail/send.c:308
+#: mail/send.c:309
 msgid "Cannot open temporary file"
 msgstr "No es pot obrir un fitxer temporal"
 
-#: mail/send.c:337
+#: mail/send.c:338
 msgid ""
 "\n"
 "(Interrupt -- one more to kill letter)"
@@ -1753,43 +1753,43 @@ msgstr ""
 "\n"
 "(Interrupci -- una ms per a avortar la carta)"
 
-#: mail/send.c:348
+#: mail/send.c:349
 msgid "Use \".\" to terminate letter."
 msgstr "Useu . per a finalitzar la carta."
 
-#: mail/send.c:349
+#: mail/send.c:350
 msgid "Use \"~.\" to terminate letter."
 msgstr "Useu ~. per a finalitzar la carta."
 
-#: mail/send.c:391
+#: mail/send.c:392
 #, c-format
 msgid "Unknown escape %s"
 msgstr "L'escapada %s no s coneguda."
 
-#: mail/send.c:394
+#: mail/send.c:395
 msgid "Unfinished escape"
 msgstr "L'escapada no est acabada"
 
-#: mail/send.c:398
+#: mail/send.c:399
 msgid "Cannot parse escape sequence"
 msgstr "No es pot analitzar la seqncia d'escapada"
 
-#: mail/send.c:423 mh/mh_init.c:668 mh/mh_list.c:264
+#: mail/send.c:424 mh/mh_init.c:669 mh/mh_list.c:264
 #, c-format
 msgid "Cannot open file %s: %s"
 msgstr "No es pot obrir el fitxer %s: %s"
 
-#: mail/send.c:484
+#: mail/send.c:485
 msgid "Null message body; hope that's ok\n"
 msgstr "El cos del missatge s nul, s'espera que siga correcte\n"
 
 # mailer -> servidor de correu: algo millor? jm
 # enviador, proposat per Sergey. jm
-#: mail/send.c:578
+#: mail/send.c:579
 msgid "Variable sendmail not set: no mailer"
 msgstr "La variable sendmail no est fixada: no hi ha enviador de correu"
 
-#: mail/send.c:626
+#: mail/send.c:627
 #, c-format
 msgid "Piping %s failed"
 msgstr "La conducci de %s ha fallat"
@@ -2021,7 +2021,7 @@ msgid "Set name pattern for user-defined Scheme mail filters"
 msgstr ""
 "Estableix el patr de noms per filtres de correu Scheme definits per l'usuari"
 
-#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:86
+#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:87
 #: mimeview/mimeview.c:46
 msgid "FLAGS"
 msgstr "SENYALADORS"
@@ -2034,7 +2034,7 @@ msgstr "Habilita la depuraci"
 msgid "Multiple --from options"
 msgstr "Mltiples opcions --from"
 
-#: mail.local/main.c:215 sieve/sieve.c:208
+#: mail.local/main.c:215 sieve/sieve.c:209
 #, c-format
 msgid "%c is not a valid debug flag"
 msgstr "%c no s un senyalador de depuraci vlid"
@@ -2084,7 +2084,7 @@ msgstr "Manquen arguments. Proveu --help per a obtindre ms informaci."
 msgid "Access to %s failed: %m"
 msgstr "No s'ha pogut accedir a %s: %m"
 
-#: mail.local/main.c:427 sieve/sieve.c:375
+#: mail.local/main.c:427 sieve/sieve.c:376
 #, c-format
 msgid "Cannot initialize sieve machine: %s"
 msgstr "No es pot iniciar la mquina de sieve: %s"
@@ -2308,80 +2308,80 @@ msgstr "L'enviament del missatge ha fallat: %s"
 msgid "Closing mailer failed: %s"
 msgstr "El tancament de l'enviador de correu ha fallat: %s"
 
-#: mailbox/getopt.c:552 mailbox/getopt.c:571
+#: mailbox/getopt.c:551 mailbox/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: l'opci %s s ambigua\n"
 
-#: mailbox/getopt.c:604 mailbox/getopt.c:608
+#: mailbox/getopt.c:603 mailbox/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: l'opci --%s no accepta arguments\n"
 
-#: mailbox/getopt.c:617 mailbox/getopt.c:622
+#: mailbox/getopt.c:616 mailbox/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: l'opci %c%s no accepta arguments\n"
 
-#: mailbox/getopt.c:668 mailbox/getopt.c:690 mailbox/getopt.c:1021
-#: mailbox/getopt.c:1043
+#: mailbox/getopt.c:667 mailbox/getopt.c:689 mailbox/getopt.c:1020
+#: mailbox/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: l'opci %s requereix un argument\n"
 
-#: mailbox/getopt.c:728 mailbox/getopt.c:731
+#: mailbox/getopt.c:727 mailbox/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: l'opci --%s no es reconeix\n"
 
-#: mailbox/getopt.c:739 mailbox/getopt.c:742
+#: mailbox/getopt.c:738 mailbox/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: l'opci %c%s no es reconeix\n"
 
-#: mailbox/getopt.c:797 mailbox/getopt.c:800
+#: mailbox/getopt.c:796 mailbox/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: l'opci s illegal -- %c\n"
 
-#: mailbox/getopt.c:806 mailbox/getopt.c:809
+#: mailbox/getopt.c:805 mailbox/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: l'opci no s vlida -- %c\n"
 
-#: mailbox/getopt.c:864 mailbox/getopt.c:883 mailbox/getopt.c:1096
-#: mailbox/getopt.c:1117
+#: mailbox/getopt.c:863 mailbox/getopt.c:882 mailbox/getopt.c:1095
+#: mailbox/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: l'opci requereix un argument -- %c\n"
 
-#: mailbox/getopt.c:936 mailbox/getopt.c:955
+#: mailbox/getopt.c:935 mailbox/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: l'opci -W %s s ambigua\n"
 
-#: mailbox/getopt.c:979 mailbox/getopt.c:1000
+#: mailbox/getopt.c:978 mailbox/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'opci -W %s no accepta arguments\n"
 
-#: mailbox/argp-help.c:195
+#: mailbox/argp-help.c:194
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: El parmetre ARGP_HELP_FMT requereix un valor"
 
-#: mailbox/argp-help.c:204
+#: mailbox/argp-help.c:203
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: El parmetre d'ARGP_HELP_FMT s desconegut"
 
 # pfft, escombraries... jm
-#: mailbox/argp-help.c:216
+#: mailbox/argp-help.c:215
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Hi ha escombraries en ARGP_HELP_FMT: %s"
 
-#: mailbox/argp-help.c:1195
+#: mailbox/argp-help.c:1194
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
@@ -2389,66 +2389,66 @@ msgstr ""
 "Els arguments necessaris o opcionals per a les opcions llargues tamb sn "
 "necessaris o opcionals per a qualsevol opci curta corresponent."
 
-#: mailbox/argp-help.c:1582
+#: mailbox/argp-help.c:1581
 msgid "Usage:"
 msgstr "Forma d's:"
 
-#: mailbox/argp-help.c:1586
+#: mailbox/argp-help.c:1585
 msgid "  or: "
 msgstr "  : "
 
-#: mailbox/argp-help.c:1598
+#: mailbox/argp-help.c:1597
 msgid " [OPTION...]"
 msgstr " [OPCI...]"
 
-#: mailbox/argp-help.c:1625
+#: mailbox/argp-help.c:1624
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Proveu %s --help o %s --usage per a obtindre ms informaci.\n"
 
-#: mailbox/argp-help.c:1653
+#: mailbox/argp-help.c:1652
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Informeu dels errors a %s.\n"
 
-#: mailbox/argp-help.c:1873
+#: mailbox/argp-help.c:1872
 msgid "Unknown system error"
 msgstr "S'ha produt un error desconegut del sistema"
 
-#: mailbox/argp-parse.c:83
+#: mailbox/argp-parse.c:82
 msgid "Give this help list"
 msgstr "Mostra aquesta llista d'ajuda"
 
-#: mailbox/argp-parse.c:84
+#: mailbox/argp-parse.c:83
 msgid "Give a short usage message"
 msgstr "Mostra un curt missatge sobre l's"
 
-#: mailbox/argp-parse.c:85
+#: mailbox/argp-parse.c:84
 msgid "Set the program name"
 msgstr "Estableix el nom del programa"
 
-#: mailbox/argp-parse.c:87
+#: mailbox/argp-parse.c:86
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "Penja durant SEGS segons (per defecte 3600)"
 
-#: mailbox/argp-parse.c:148
+#: mailbox/argp-parse.c:147
 msgid "Print program version"
 msgstr "Mostra la versi del programa"
 
-#: mailbox/argp-parse.c:164
+#: mailbox/argp-parse.c:163
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(ERROR DEL PROGRAMA) Cap versi coneguda!?"
 
-#: mailbox/argp-parse.c:620
+#: mailbox/argp-parse.c:619
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Massa arguments\n"
 
-#: mailbox/argp-parse.c:763
+#: mailbox/argp-parse.c:762
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(ERROR DEL PROGRAMA) L'opci s'hauria d'haver reconegut!?"
 
-#: mailbox/file_stream.c:479
+#: mailbox/file_stream.c:480
 #, c-format
 msgid "%s must be a plain file with one link\n"
 msgstr "%s ha de ser un fitxer pla amb un enlla\n"
@@ -2472,24 +2472,24 @@ msgstr "S'ha produt un error d'iconv: %s"
 msgid "Stream is closed"
 msgstr "El flux est tancat"
 
-#: mailbox/message.c:1092
-#, c-format
-msgid "mailbox_create_default (%s) failed: %s\n"
+#: mailbox/message.c:1093
+#, fuzzy, c-format
+msgid "mu_mailbox_create_default (%s) failed: %s\n"
 msgstr "mailbox_create_default (%s) ha fallat: %s\n"
 
-#: mailbox/message.c:1123
-#, c-format
-msgid "mailbox_open (%s) failed: %s\n"
+#: mailbox/message.c:1124
+#, fuzzy, c-format
+msgid "mu_mailbox_open (%s) failed: %s\n"
 msgstr "mailbox_open (%s) ha fallat: %s\n"
 
-#: mailbox/message.c:1131
-#, c-format
-msgid "mailbox_append_message (%s) failed: %s\n"
+#: mailbox/message.c:1132
+#, fuzzy, c-format
+msgid "mu_mailbox_append_message (%s) failed: %s\n"
 msgstr "mailbox_append_message (%s) ha fallat: %s\n"
 
-#: mailbox/message.c:1143
-#, c-format
-msgid "mailbox_close (%s) failed: %s\n"
+#: mailbox/message.c:1144
+#, fuzzy, c-format
+msgid "mu_mailbox_close (%s) failed: %s\n"
 msgstr "mailbox_close (%s) ha fallat: %s\n"
 
 #: mailbox/mu_argp.c:60
@@ -2514,7 +2514,7 @@ msgstr ""
 "Senyals per defecte del programa blocador (E=extern, R=reintenta, T=temps, "
 "P=pid)"
 
-#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:76
+#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:77
 msgid "SECONDS"
 msgstr "SEGONS"
 
@@ -2952,15 +2952,15 @@ msgstr ""
 msgid "[msg [msg...]]"
 msgstr "[msg [msg...]]"
 
-#: mh/anno.c:33 mh/folder.c:49 mh/folder.c:59 mh/forw.c:37 mh/forw.c:43
-#: mh/inc.c:34 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
+#: mh/anno.c:33 mh/folder.c:50 mh/folder.c:60 mh/forw.c:37 mh/forw.c:43
+#: mh/inc.c:35 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
 #: mh/mhpath.c:32 mh/pick.c:39 mh/refile.c:38 mh/refile.c:47 mh/repl.c:40
-#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:39 mh/send.c:42
+#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:40 mh/send.c:42
 #: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:43
 msgid "FOLDER"
 msgstr "CARPETA"
 
-#: mh/anno.c:34 mh/folder.c:60 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
+#: mh/anno.c:34 mh/folder.c:61 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
 #: mh/mhn.c:38 mh/mhpath.c:33 mh/pick.c:40 mh/refile.c:39 mh/repl.c:50
 #: mh/rmm.c:33
 msgid "Specify folder to operate upon"
@@ -2986,10 +2986,10 @@ msgstr "Afegeix aquest CAMP a la capalera del missatge"
 msgid "Field value for the component"
 msgstr "Valor del camp per al component"
 
-#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:80 mh/forw.c:75 mh/inc.c:55
+#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:81 mh/forw.c:75 mh/inc.c:56
 #: mh/install-mh.c:33 mh/mark.c:47 mh/mhl.c:53 mh/mhn.c:90 mh/mhpath.c:35
 #: mh/pick.c:96 mh/refile.c:52 mh/repl.c:72 mh/rmf.c:50 mh/rmm.c:35
-#: mh/scan.c:59 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
+#: mh/scan.c:60 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
 msgid "Display software license"
 msgstr "Mostra la llicncia del programari"
 
@@ -3006,16 +3006,16 @@ msgstr ""
 "GNU MH fmtcheckUtilitzeu el commutador -help per a obtindre la llista de les "
 "opcions tradicionals d'MH."
 
-#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:44 mh/mhl.c:43 mh/repl.c:58
-#: mh/scan.c:45
+#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:45 mh/mhl.c:43 mh/repl.c:58
+#: mh/scan.c:46
 msgid "Read format from given file"
 msgstr "Llig el format des del fitxer donat"
 
-#: mh/fmtcheck.c:34 mh/inc.c:45 mh/scan.c:46
+#: mh/fmtcheck.c:34 mh/inc.c:46 mh/scan.c:47
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: mh/fmtcheck.c:35 mh/inc.c:46 mh/scan.c:47
+#: mh/fmtcheck.c:35 mh/inc.c:47 mh/scan.c:48
 msgid "Use this format string"
 msgstr "Usa aquesta cadena de format"
 
@@ -3031,35 +3031,35 @@ msgstr "Habilita l'eixida de depuraci de l'analitzador"
 msgid "Format string not specified"
 msgstr "No s'ha especificat la cadena de format"
 
-#: mh/fmtcheck.c:115 mh/inc.c:191 mh/repl.c:373 mh/scan.c:188
+#: mh/fmtcheck.c:115 mh/inc.c:192 mh/repl.c:373 mh/scan.c:189
 msgid "Bad format string"
 msgstr "La cadena de format s errnia"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/folder.c:39
+#: mh/folder.c:40
 msgid "GNU MH folderUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH folderUtilitzeu el commutador -help per a obtindre la llista de les "
 "opcions tradicionals d'MH."
 
-#: mh/folder.c:41
+#: mh/folder.c:42
 msgid "[action] [msg]"
 msgstr "[acci] [msg]"
 
-#: mh/folder.c:44 pop3d/popauth.c:68
+#: mh/folder.c:45 pop3d/popauth.c:68
 msgid "Actions are:"
 msgstr "Les accions sn:"
 
-#: mh/folder.c:46
+#: mh/folder.c:47
 msgid "List the folders (default)"
 msgstr "Llista les carpetes (per defecte)"
 
-#: mh/folder.c:48
+#: mh/folder.c:49
 msgid "List the contents of the folder stack"
 msgstr "Llista els continguts de la pila de carpetes"
 
-#: mh/folder.c:50
+#: mh/folder.c:51
 msgid ""
 "Push the folder on the folder stack. If FOLDER is specified, it is pushed. "
 "Otherwise, if a folder is given in the command line (via + or --folder), it "
@@ -3071,61 +3071,61 @@ msgstr ""
 "--folder), s'empila en la pila. Si no, s'intercanvien la carpeta actual i "
 "l'ltim element de la pila de carpetes."
 
-#: mh/folder.c:55
+#: mh/folder.c:56
 msgid "Pop the folder off the folder stack"
 msgstr "Desempila la carpeta de la pila de carpetes"
 
-#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:80
+#: mh/folder.c:58 mh/mh_whatnow.c:153 pop3d/popauth.c:80
 msgid "Options are:"
 msgstr "Les opcions sn:"
 
-#: mh/folder.c:62
+#: mh/folder.c:63
 msgid "List all folders"
 msgstr "Llistat totes les carpetes"
 
-#: mh/folder.c:64
+#: mh/folder.c:65
 msgid "Create non-existing folders"
 msgstr "Crea les carpetes no existents"
 
-#: mh/folder.c:67
+#: mh/folder.c:68
 msgid "List only the folder names"
 msgstr "Llista noms els noms de les carpetes"
 
-#: mh/folder.c:70
+#: mh/folder.c:71
 msgid "Print the header line"
 msgstr "Mostra la lnia de capalera"
 
-#: mh/folder.c:73
+#: mh/folder.c:74
 msgid "Scan folders recursively"
 msgstr "Analitza les carpetes recursivament"
 
-#: mh/folder.c:76
+#: mh/folder.c:77
 msgid "Output the total statistics"
 msgstr "Mostra les estadstiques totals"
 
-#: mh/folder.c:309 mh/rmf.c:128
+#: mh/folder.c:310 mh/rmf.c:128
 #, c-format
 msgid "Cannot scan folder %s: %s"
 msgstr "No es pot analitzar la carpeta %s: %s"
 
-#: mh/folder.c:382
+#: mh/folder.c:383
 #, c-format
 msgid " has %4lu message  (%4lu-%4lu)"
 msgid_plural " has %4lu messages (%4lu-%4lu)"
 msgstr[0] " t %4lu missatge (%4lu-%4lu)"
 msgstr[1] " t %4lu missatges (%4lu-%4lu)"
 
-#: mh/folder.c:393
+#: mh/folder.c:394
 #, c-format
 msgid " has no messages"
 msgstr " no t missatges"
 
-#: mh/folder.c:402
+#: mh/folder.c:403
 #, c-format
 msgid "(others)"
 msgstr "(altres)"
 
-#: mh/folder.c:450
+#: mh/folder.c:451
 #, c-format
 msgid ""
 "Folder                  # of messages     (  range  )  cur msg   (other "
@@ -3134,18 +3134,18 @@ msgstr ""
 "Carpeta                 # de missatges    ( rang )   mis act  (altres "
 "fitxers)\n"
 
-#: mh/folder.c:456
+#: mh/folder.c:457
 msgid "TOTAL"
 msgstr "TOTAL"
 
-#: mh/folder.c:457
+#: mh/folder.c:458
 #, c-format
 msgid "%4lu message  "
 msgid_plural "%4lu messages "
 msgstr[0] "%4lu missatge"
 msgstr[1] "%4lu missatges"
 
-#: mh/folder.c:460
+#: mh/folder.c:461
 #, c-format
 msgid "in %4lu folder"
 msgid_plural "in %4lu folders"
@@ -3220,7 +3220,7 @@ msgstr "Desfs l'efecte de la ltima opci --filter"
 msgid "Use MIME encapsulation"
 msgstr "Utilitza l'encapsulaci MIME"
 
-#: mh/forw.c:65 mh/inc.c:51 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:51
+#: mh/forw.c:65 mh/inc.c:52 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:52
 msgid "Set output width"
 msgstr "Estableix l'amplria de l'eixida"
 
@@ -3238,15 +3238,15 @@ msgstr ""
 msgid "Use draft file preserved after the last session"
 msgstr "Usa el fitxer d'esborrany preservat desprs de la ltima sessi"
 
-#: mh/forw.c:147 mh/inc.c:137 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:124
+#: mh/forw.c:147 mh/inc.c:138 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:125
 msgid "Invalid width"
 msgstr "Amplria no vlida"
 
-#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:138
+#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:139
 msgid "Option is not yet implemented"
 msgstr "L'opci encara no est implementada"
 
-#: mh/forw.c:285 mh/mh_init.c:536
+#: mh/forw.c:285 mh/mh_init.c:537
 #, c-format
 msgid "Cannot open output file `%s': %s"
 msgstr "No es pot obrir el fitxer d'eixida %s: %s"
@@ -3269,64 +3269,64 @@ msgstr "Final dels missatges reenviats"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/inc.c:26
+#: mh/inc.c:27
 msgid "GNU MH incUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH incUtilitzeu el commutador -help per a obtindre la llista de les "
 "opcions tradicionals d'MH."
 
-#: mh/inc.c:28 mh/rmf.c:37
+#: mh/inc.c:29 mh/rmf.c:37
 msgid "[+folder]"
 msgstr "[+carpeta]"
 
-#: mh/inc.c:33
+#: mh/inc.c:34
 msgid "Incorporate mail from named file"
 msgstr "Incorpora el correu del fitxer anomenat"
 
-#: mh/inc.c:35
+#: mh/inc.c:36
 msgid "Specify folder to incorporate mail to"
 msgstr "Especifica la carpeta on incorporar el correu"
 
-#: mh/inc.c:37
+#: mh/inc.c:38
 msgid "Enable audit"
 msgstr "Habilita l'auditoria"
 
-#: mh/inc.c:39
+#: mh/inc.c:40
 msgid "Disable audit"
 msgstr "Inhabilita l'auditoria"
 
-#: mh/inc.c:41
+#: mh/inc.c:42
 msgid "Mark first incorporated message as current (default)"
 msgstr "Marca el primer missatge incorporat com l'actual (per defecte)"
 
-#: mh/inc.c:48
+#: mh/inc.c:49
 msgid "Truncate source mailbox after incorporating (default)"
 msgstr "Trunca la bstia d'origen desprs d'incorporar-la (per defecte)"
 
-#: mh/inc.c:53 mh/mhn.c:88
+#: mh/inc.c:54 mh/mhn.c:88
 msgid "Be quiet"
 msgstr "Sigues silencis"
 
-#: mh/inc.c:200
+#: mh/inc.c:201
 msgid "Cannot create default mailbox"
 msgstr "No es pot crear la bstia per defecte"
 
-#: mh/inc.c:226
+#: mh/inc.c:227
 #, c-format
 msgid "Cannot read input mailbox: %s"
 msgstr "No es pot llegir la bstia d'entrada: %s"
 
-#: mh/inc.c:233
+#: mh/inc.c:234
 #, c-format
 msgid "Cannot read output mailbox: %s"
 msgstr "No es pot llegir la bstia d'eixida: %s"
 
-#: mh/inc.c:254
+#: mh/inc.c:255
 #, c-format
 msgid "%d: cannot get message: %s"
 msgstr "%d: no es pot obtindre el missatge: %s"
 
-#: mh/inc.c:261
+#: mh/inc.c:262
 #, c-format
 msgid "%d: error appending message: %s"
 msgstr "%d: s'ha produt un error en agregar el missatge: %s"
@@ -3405,12 +3405,12 @@ msgstr ""
 "A s %s\n"
 "\n"
 
-#: mh/mh_ctx.c:92
+#: mh/mh_ctx.c:93
 #, c-format
 msgid "Cannot open context file %s: %s"
 msgstr "No es pot obrir el fitxer d'entrada %s: %s"
 
-#: mh/mh_ctx.c:142
+#: mh/mh_ctx.c:143
 #, c-format
 msgid "Cannot create context %s: %s"
 msgstr "No es pot crear el context %s: %s"
@@ -3437,17 +3437,17 @@ msgstr "Manca un argument per a %s"
 msgid "Extra arguments to %s"
 msgstr "Sobren arguments per a %s"
 
-#: mh/mh_format.c:603
+#: mh/mh_format.c:604
 #, c-format
 msgid "INTERNAL ERROR: Unknown opcode: %x"
 msgstr "ERROR INTERN: Opcode desconegut: %x"
 
 #. TRANSLATORS: Do not translate the word 'format'!
-#: mh/mh_format.c:946 mh/mh_format.c:958
+#: mh/mh_format.c:947 mh/mh_format.c:959
 msgid "format: divide by zero"
 msgstr "format: divisi per zero"
 
-#: mh/mh_format.c:1874
+#: mh/mh_format.c:1875
 msgid "Invalid recipient mask"
 msgstr "Mscara de destinatari no vlida"
 
@@ -3477,73 +3477,73 @@ msgstr ""
 "Si us plau, useu les opcions llargues GNU en el seu lloc.\n"
 "Executeu %s --help per a obtindre ms informaci sobre aquestes.\n"
 
-#: mh/mh_init.c:69
+#: mh/mh_init.c:70
 #, c-format
 msgid "Cannot stat format file %s: %s"
 msgstr "No es pot fer stat del fitxer de format %s: %s"
 
-#: mh/mh_init.c:76
+#: mh/mh_init.c:77
 #, c-format
 msgid "Cannot open format file %s: %s"
 msgstr "No es pot obrir el fitxer de format %s: %s"
 
-#: mh/mh_init.c:206
+#: mh/mh_init.c:207
 #, c-format
 msgid "Create folder \"%s\""
 msgstr "Crea la carpeta %s"
 
-#: mh/mh_init.c:214
+#: mh/mh_init.c:215
 #, c-format
 msgid "Cannot create directory %s: %s"
 msgstr "No es pot crear el directori %s: %s"
 
 #. TRANSLATORS: See msgids "nN" and "yY".
-#: mh/mh_init.c:267
+#: mh/mh_init.c:268
 #, c-format
 msgid "Please answer yes or no: "
 msgstr "Si us plau, contesteu s o no: "
 
-#: mh/mh_init.c:326
+#: mh/mh_init.c:327
 #, c-format
 msgid "Cannot open audit file %s: %s"
 msgstr "No es pot obrir el fitxer d'auditoria %s: %s"
 
-#: mh/mh_init.c:457 mh/mh_msgset.c:165
+#: mh/mh_init.c:458 mh/mh_msgset.c:165
 #, c-format
 msgid "Cannot get message %d: %s"
 msgstr "No es pot obtindre el missatge %d: %s"
 
-#: mh/mh_init.c:475
+#: mh/mh_init.c:476
 #, c-format
 msgid "Cannot split line %s"
 msgstr "No es pot tallar la lnia %s"
 
-#: mh/mh_init.c:527
+#: mh/mh_init.c:528
 #, c-format
 msgid "Cannot open input file `%s': %s"
 msgstr "No es pot obrir el fitxer d'entrada %s: %s"
 
-#: mh/mh_init.c:550
+#: mh/mh_init.c:551
 #, c-format
 msgid "Write error on `%s': %s"
 msgstr "Error d'escriptura en %s: %s"
 
-#: mh/mh_init.c:579
+#: mh/mh_init.c:580
 #, c-format
 msgid "Cannot stat file %s: %s"
 msgstr "No es pot fer stat del fitxer %s: %s"
 
-#: mh/mh_init.c:585 mh/mhn.c:2267
+#: mh/mh_init.c:586 mh/mhn.c:2267
 #, c-format
 msgid "Cannot create input stream (file %s): %s"
 msgstr "No es pot crear un flux d'entrada (fitxer %s): %s"
 
-#: mh/mh_init.c:592 mh/mhn.c:2274
+#: mh/mh_init.c:593 mh/mhn.c:2274
 #, c-format
 msgid "Cannot open input stream (file %s): %s"
 msgstr "No es pot obrir el flux d'entrada (fitxer %s): %s"
 
-#: mh/mh_init.c:605
+#: mh/mh_init.c:606
 #, c-format
 msgid ""
 "Prior to using MH, it is necessary to have a file in your login\n"
@@ -3558,39 +3558,39 @@ msgstr ""
 "s el cam a utilitzar en totes les operacions de carpeta MH. El cam\n"
 "d'MH suggerit s %s...\n"
 
-#: mh/mh_init.c:628
+#: mh/mh_init.c:629
 msgid "Do you need help"
 msgstr "Necessiteu ajuda"
 
-#: mh/mh_init.c:631
+#: mh/mh_init.c:632
 #, c-format
 msgid "Do you want the standard MH path \"%s\""
 msgstr "Voleu el cam d'MH estndard %s"
 
-#: mh/mh_init.c:636
+#: mh/mh_init.c:637
 msgid "Do you want a path below your login directory"
 msgstr "Voleu un cam sota el vostre directori d'entrada"
 
-#: mh/mh_init.c:638
+#: mh/mh_init.c:639
 #, c-format
 msgid "What is the path? "
 msgstr "Quin s el cam? "
 
-#: mh/mh_init.c:640
+#: mh/mh_init.c:641
 #, c-format
 msgid "What is the full path? "
 msgstr "Quin s el cam sencer? "
 
-#: mh/mh_init.c:699
+#: mh/mh_init.c:700
 #, c-format
 msgid "I'm going to create the standard MH path for you.\n"
 msgstr "Es va a crear el cam d'MH estndard.\n"
 
-#: mh/mh_init.c:710
+#: mh/mh_init.c:711
 msgid "You already have an MH profile, use an editor to modify it"
 msgstr "Ja teniu un perfil d'MH, utilitzeu un editor per a modificar-lo"
 
-#: mh/mh_init.c:715
+#: mh/mh_init.c:716
 #, c-format
 msgid ""
 "You already have file %s which is not a regular file or a symbolic link.\n"
@@ -4104,7 +4104,7 @@ msgstr ""
 "GNU MH mhpathUtilitzeu el commutador -help per a obtindre la llista de les "
 "opcions tradicionals d'MH."
 
-#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:35
+#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:36
 msgid "[+folder] [msgs]"
 msgstr "[+carpeta] [msgs]"
 
@@ -4430,38 +4430,38 @@ msgstr ""
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/scan.c:33
+#: mh/scan.c:34
 msgid "GNU MH scanUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH scanUtilitzeu el commutador -help per a obtindre la llista de les "
 "opcions tradicionals d'MH."
 
-#: mh/scan.c:40
+#: mh/scan.c:41
 msgid "Specify folder to scan"
 msgstr "Especifica la carpeta a analitzar"
 
-#: mh/scan.c:42
+#: mh/scan.c:43
 msgid "Clear screen after displaying the list"
 msgstr "Neteja la pantalla desprs de mostrar la llista"
 
-#: mh/scan.c:49
+#: mh/scan.c:50
 msgid "Display header"
 msgstr "Mostra la capalera"
 
-#: mh/scan.c:53
+#: mh/scan.c:54
 msgid "List messages in reverse order"
 msgstr "Llista els missatges en ordre invers"
 
-#: mh/scan.c:56
+#: mh/scan.c:57
 msgid "[Not yet implemented]"
 msgstr "[Encara no implementat]"
 
-#: mh/scan.c:228
+#: mh/scan.c:229
 #, c-format
 msgid "no messages in %s"
 msgstr "no hi ha missatges en %s"
 
-#: mh/scan.c:249
+#: mh/scan.c:250
 #, c-format
 msgid "Folder %s  %s\n"
 msgstr "Carpeta %s  %s\n"
@@ -4548,7 +4548,7 @@ msgstr ""
 "* Fes que els camps de les capaleres no siguen ms llargs que NMERO "
 "columnes"
 
-#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:134 pop3d/pop3d.c:148
+#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:135 pop3d/pop3d.c:149
 msgid "Invalid number"
 msgstr "El nmero no s vlid"
 
@@ -4669,15 +4669,18 @@ msgid "Cannot lock"
 msgstr "No es pot blocar"
 
 #: movemail/movemail.c:169
-msgid "mailbox_get_folder failed"
+#, fuzzy
+msgid "mu_mailbox_get_folder failed"
 msgstr "mailbox_get_folder ha fallat"
 
 #: movemail/movemail.c:172
-msgid "folder_get_authority failed"
+#, fuzzy
+msgid "mu_folder_get_authority failed"
 msgstr "folder_get_authority ha fallat"
 
 #: movemail/movemail.c:175
-msgid "authority_set_ticket failed"
+#, fuzzy
+msgid "mu_authority_set_ticket failed"
 msgstr "authority_set_ticket ha fallat"
 
 #: movemail/movemail.c:202
@@ -4779,60 +4782,60 @@ msgstr "eof inesperat en l'entrada"
 msgid "Locking mailbox `%s' failed: %s"
 msgstr "Ha fallat l'obertura de %s: %s"
 
-#: pop3d/pop3d.c:64
+#: pop3d/pop3d.c:65
 msgid "GNU pop3d -- the POP3 daemon"
 msgstr "GNU pop4d -- el dimoni POP3"
 
-#: pop3d/pop3d.c:74
+#: pop3d/pop3d.c:75
 msgid "Undelete all messages on startup"
 msgstr "Lleva la marca d'eliminaci de tots els missatges en iniciar"
 
-#: pop3d/pop3d.c:77
+#: pop3d/pop3d.c:78
 msgid "Allowed delay between the two successive logins"
 msgstr "Retard perms entre les dos entrades consecutives"
 
-#: pop3d/pop3d.c:78
+#: pop3d/pop3d.c:79
 msgid "FILENAME"
 msgstr "FITXER"
 
-#: pop3d/pop3d.c:79
+#: pop3d/pop3d.c:80
 msgid "Name of login statistics file"
 msgstr "Nom del fitxer d'estadstiques d'entrades"
 
-#: pop3d/pop3d.c:81
+#: pop3d/pop3d.c:82
 msgid "DAYS"
 msgstr "DIES"
 
-#: pop3d/pop3d.c:82
+#: pop3d/pop3d.c:83
 msgid "Expire read messages after the given number of days"
 msgstr "Fes caducar els missatges llegits posteriors a la data donada"
 
-#: pop3d/pop3d.c:84
+#: pop3d/pop3d.c:85
 msgid "Delete expired messages upon closing the mailbox"
 msgstr "Elimina els missatges caducats quan es tanca la bstia"
 
-#: pop3d/pop3d.c:87
+#: pop3d/pop3d.c:88
 msgid "Always require STLS before entering authentication phase"
 msgstr "Requereix sempre STLS abans d'iniciar la fase d'autenticaci"
 
-#: pop3d/pop3d.c:277
+#: pop3d/pop3d.c:278
 msgid "Failed to become a daemon:"
 msgstr "No s'ha pogut convertir en dimoni:"
 
-#: pop3d/pop3d.c:313
+#: pop3d/pop3d.c:314
 #, c-format
 msgid "connect from %s"
 msgstr "connexi des de %s"
 
-#: pop3d/pop3d.c:437
+#: pop3d/pop3d.c:438
 msgid "Session terminated"
 msgstr "La sessi ha finalitzat"
 
-#: pop3d/pop3d.c:523
+#: pop3d/pop3d.c:524
 msgid "GNU pop3d started"
 msgstr "S'ha iniciat el GNU comsat"
 
-#: pop3d/pop3d.c:530
+#: pop3d/pop3d.c:531
 #, c-format
 msgid "too many children (%lu)"
 msgstr "massa fills (%lu)"
@@ -5080,7 +5083,7 @@ msgstr "No s'ha pogut obrir la bstia %s: %s\n"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: sieve/sieve.c:53
+#: sieve/sieve.c:54
 msgid ""
 "GNU sieve -- a mail filtering tool\n"
 "Debug flags:\n"
@@ -5098,152 +5101,152 @@ msgstr ""
 "  t - traces de sieve (MU_SIEVE_DEBUG_TRACE)\n"
 "  i - traces d'instruccions de sieve (MU_SIEVE_DEBUG_INSTR)\n"
 
-#: sieve/sieve.c:69
+#: sieve/sieve.c:70
 msgid "Do not execute any actions, just print what would be done"
 msgstr "No executes cap acci, noms mostra el que es faria"
 
-#: sieve/sieve.c:72
+#: sieve/sieve.c:73
 msgid "Keep on going if execution fails on a message"
 msgstr "Contina si l'execuci falla en un missatge"
 
-#: sieve/sieve.c:75
+#: sieve/sieve.c:76
 msgid "Compile script and exit"
 msgstr "Compila l'script i ix"
 
-#: sieve/sieve.c:78
+#: sieve/sieve.c:79
 msgid "Compile script, dump disassembled sieve code to terminal and exit"
 msgstr ""
 "Compila l'script, bolca el codi de sieve desassemblat en el terminal i ix"
 
-#: sieve/sieve.c:80
+#: sieve/sieve.c:81
 msgid "MBOX"
 msgstr "MBOX"
 
-#: sieve/sieve.c:81
+#: sieve/sieve.c:82
 msgid "Mailbox to sieve (defaults to user's mail spool)"
 msgstr "Bstia on fer sieve (per defecte, la bstia de l'usuari)"
 
-#: sieve/sieve.c:83
+#: sieve/sieve.c:84
 msgid "TICKET"
 msgstr "CREDENCIAL"
 
-#: sieve/sieve.c:84
+#: sieve/sieve.c:85
 msgid "Ticket file for mailbox authentication"
 msgstr "El fitxer de credencials per a l'autentificaci de la bstia"
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "Debug flags (defaults to \""
 msgstr "Opcions de depuraci (per defecte "
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "\")"
 msgstr ")"
 
-#: sieve/sieve.c:90
+#: sieve/sieve.c:91
 msgid "Log all actions"
 msgstr "Registra totes les accions"
 
-#: sieve/sieve.c:93
+#: sieve/sieve.c:94
 msgid "Print source location along with action logs (default)"
 msgstr "Mostra la ubicaci d'origen amb registres d'origen (per defecte)"
 
-#: sieve/sieve.c:96
+#: sieve/sieve.c:97
 msgid "Override user email address"
 msgstr "Substitueix l'adrea de correu electrnic de l'usuari"
 
-#: sieve/sieve.c:149
+#: sieve/sieve.c:150
 #, c-format
 msgid "Invalid email: %s"
 msgstr "Correu-e no vlid: %s"
 
-#: sieve/sieve.c:170
+#: sieve/sieve.c:171
 msgid "Only one MBOX can be specified"
 msgstr "Noms es pot especificar un MBOX"
 
-#: sieve/sieve.c:224
+#: sieve/sieve.c:225
 msgid "Only one SCRIPT can be specified"
 msgstr "Noms es pot especificar un SCRIPT"
 
-#: sieve/sieve.c:229
+#: sieve/sieve.c:230
 msgid "SCRIPT must be specified"
 msgstr "s'ha d'especificar SCRIPT"
 
-#: sieve/sieve.c:242
+#: sieve/sieve.c:243
 msgid "SCRIPT"
 msgstr "SCRIPT"
 
-#: sieve/sieve.c:300 sieve/sieve.c:325
+#: sieve/sieve.c:301 sieve/sieve.c:326
 #, c-format
 msgid "%s:%lu: %s on msg uid %lu"
 msgstr "%s:%lu: %s sobre el msg amb l'uid %lu"
 
-#: sieve/sieve.c:304 sieve/sieve.c:329
+#: sieve/sieve.c:305 sieve/sieve.c:330
 #, c-format
 msgid "%s on msg uid %lu"
 msgstr "%s: sobre el msg amb l'uid %lu"
 
 # obtenci de credencials. jm
-#: sieve/sieve.c:415
+#: sieve/sieve.c:416
 #, c-format
 msgid "ticket_get failed: %s"
 msgstr "Ha fallat ticket_get: %s"
 
-#: sieve/sieve.c:421
-#, c-format
-msgid "wicket_create `%s' failed: %s"
+#: sieve/sieve.c:422
+#, fuzzy, c-format
+msgid "mu_wicket_create `%s' failed: %s"
 msgstr "Ha fallat wicket_create %s: %s"
 
-#: sieve/sieve.c:434
+#: sieve/sieve.c:435
 #, c-format
 msgid "mu_debug_create failed: %s"
 msgstr "Ha fallat mu_debug_create: %s"
 
-#: sieve/sieve.c:439
+#: sieve/sieve.c:440
 #, c-format
 msgid "mu_debug_set_level failed: %s"
 msgstr "Ha fallat mu_debug_set_level: %s"
 
-#: sieve/sieve.c:445
+#: sieve/sieve.c:446
 #, c-format
 msgid "mu_debug_set_print failed: %s"
 msgstr "Ha fallat mu_debug_set_print: %s"
 
-#: sieve/sieve.c:467
-#, c-format
-msgid "mailbox_set_debug failed: %s"
+#: sieve/sieve.c:468
+#, fuzzy, c-format
+msgid "mu_mailbox_set_debug failed: %s"
 msgstr "Ha fallat mailbox_set_debug: %s"
 
-#: sieve/sieve.c:478
-#, c-format
-msgid "mailbox_get_folder failed: %s"
+#: sieve/sieve.c:479
+#, fuzzy, c-format
+msgid "mu_mailbox_get_folder failed: %s"
 msgstr "Ha fallat mailbox_get_folder: %s"
 
-#: sieve/sieve.c:485
-#, c-format
-msgid "folder_get_authority failed: %s"
+#: sieve/sieve.c:486
+#, fuzzy, c-format
+msgid "mu_folder_get_authority failed: %s"
 msgstr "Ha fallat folder_get_authority: %s"
 
-#: sieve/sieve.c:493
-#, c-format
-msgid "authority_set_ticket failed: %s"
+#: sieve/sieve.c:494
+#, fuzzy, c-format
+msgid "mu_authority_set_ticket failed: %s"
 msgstr "Ha fallat authority_set_ticket: %s"
 
-#: sieve/sieve.c:508
+#: sieve/sieve.c:509
 #, c-format
 msgid "Opening mailbox `%s' failed: %s"
 msgstr "Ha fallat l'obertura de %s: %s"
 
-#: sieve/sieve.c:511
+#: sieve/sieve.c:512
 #, c-format
 msgid "Opening default mailbox failed: %s"
 msgstr "Ha fallat l'obertura de la bstia per defecte: %s"
 
-#: sieve/sieve.c:532
+#: sieve/sieve.c:533
 #, c-format
 msgid "Expunge on mailbox `%s' failed: %s"
 msgstr "Ha fallat l'eliminaci en la bstia %s: %s"
 
-#: sieve/sieve.c:535
+#: sieve/sieve.c:536
 #, c-format
 msgid "Expunge on default mailbox failed: %s"
 msgstr "Ha fallat l'eliminaci a la bstia per defecte: %s"

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mailutils 0.6.90\n"
 "Report-Msgid-Bugs-To: bug-mailutils@gnu.org\n"
-"POT-Creation-Date: 2005-08-16 13:23+0300\n"
+"POT-Creation-Date: 2005-08-26 17:10+0300\n"
 "PO-Revision-Date: 2005-05-23 18:04-0500\n"
 "Last-Translator: Cristian Othón Martínez Vera <cfuga@itam.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -58,7 +58,7 @@ msgstr ""
 "las opciones especificadas están definidas. De otra manera, el estado de "
 "salida es 1."
 
-#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:569
+#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:570
 msgid "Too many arguments"
 msgstr "Demasiados argumentos"
 
@@ -129,8 +129,8 @@ msgid "Name of the database to connect to"
 msgstr "Nombre de la base de datos a conectarse"
 
 #: auth/sql.c:201 mailbox/mu_argp.c:80 mailbox/mu_argp.c:115
-#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
-#: mh/repl.c:65 mh/scan.c:50 mh/send.c:75
+#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:51 mh/mhl.c:44 mh/mhl.c:46
+#: mh/repl.c:65 mh/scan.c:51 mh/send.c:75
 msgid "NUMBER"
 msgstr "NÚMERO"
 
@@ -182,8 +182,8 @@ msgstr "Opciones de cifrado"
 #: auth/tls.c:59 auth/tls.c:61 auth/tls.c:63 comsat/comsat.c:59
 #: dotlock/dotlock.c:43 frm/from.c:32 mail.local/main.c:83
 #: mailbox/mu_argp.c:125 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
-#: mh/inc.c:32 mh/inc.c:36 mh/inc.c:43 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
-#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:44 mh/scan.c:55 mh/send.c:38
+#: mh/inc.c:33 mh/inc.c:37 mh/inc.c:44 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
+#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:45 mh/scan.c:56 mh/send.c:38
 #: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:81 pop3d/popauth.c:82
 #: mimeview/mimeview.c:48 mimeview/mimeview.c:52
 msgid "FILE"
@@ -207,17 +207,17 @@ msgstr "Especifica el fichero de ACs confiables"
 msgid "INTERNAL ERROR: cannot register argp capability tls"
 msgstr "ERROR INTERNO: no se puede registrar la capacidad tls de argp"
 
-#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:63 mh/folder.c:66
-#: mh/folder.c:69 mh/folder.c:72 mh/folder.c:75 mh/forw.c:33 mh/forw.c:49
-#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:40 mh/inc.c:47
+#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:64 mh/folder.c:67
+#: mh/folder.c:70 mh/folder.c:73 mh/folder.c:76 mh/forw.c:33 mh/forw.c:49
+#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:41 mh/inc.c:48
 #: mh/mark.c:40 mh/mark.c:43 mh/mhl.c:36 mh/mhl.c:39 mh/mhn.c:43 mh/mhn.c:48
 #: mh/mhn.c:51 mh/mhn.c:54 mh/mhn.c:59 mh/mhn.c:62 mh/mhn.c:67 mh/mhn.c:72
 #: mh/mhn.c:75 mh/mhn.c:84 mh/pick.c:84 mh/pick.c:89 mh/pick.c:92
 #: mh/refile.c:42 mh/refile.c:45 mh/repl.c:36 mh/repl.c:51 mh/repl.c:59
-#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:41
-#: mh/scan.c:48 mh/scan.c:52 mh/send.c:52 mh/send.c:55 mh/send.c:58
+#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:42
+#: mh/scan.c:49 mh/scan.c:53 mh/send.c:52 mh/send.c:55 mh/send.c:58
 #: mh/send.c:61 mh/send.c:64 mh/send.c:69 mh/send.c:72 mh/whom.c:40
-#: sieve/sieve.c:92
+#: sieve/sieve.c:93
 msgid "BOOL"
 msgstr "BOOL"
 
@@ -395,8 +395,8 @@ msgid "Cannot open device %s: %m"
 msgstr "No se puede abrir el dispositivo %s: %m"
 
 #: comsat/comsat.c:456 mail/copy.c:76 mail/file.c:95 mail/mail.c:438
-#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:218
-#: mh/mh_init.c:379 pop3d/apop.c:240
+#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:219
+#: mh/mh_init.c:380 pop3d/apop.c:240
 #, c-format
 msgid "Cannot open mailbox %s: %s"
 msgstr "No se puede abrir el buzón %s: %s"
@@ -684,7 +684,7 @@ msgstr "GNU from -- muestra el remitente y el asunto"
 msgid "Just print a count of messages and exit"
 msgstr "Sólo muestra una cuenta de los mensajes y termina"
 
-#: frm/from.c:30 sieve/sieve.c:95
+#: frm/from.c:30 sieve/sieve.c:96
 msgid "ADDRESS"
 msgstr "DIRECCIÓN"
 
@@ -729,13 +729,13 @@ msgid "Could not close mailbox `%s': %s"
 msgstr "No se puede cerrar el buzón `%s': %s"
 
 #: frm/common.c:545 messages/messages.c:142 movemail/movemail.c:189
-#: sieve/sieve.c:457
+#: sieve/sieve.c:458
 #, c-format
 msgid "Could not create mailbox `%s': %s"
 msgstr "No se puede crear el buzón `%s': %s"
 
 #: frm/common.c:548 messages/messages.c:145 movemail/movemail.c:193
-#: sieve/sieve.c:460
+#: sieve/sieve.c:461
 #, c-format
 msgid "Could not create default mailbox: %s"
 msgstr "No se puede crear el buzón por defecto: %s"
@@ -780,9 +780,9 @@ msgid "Cannot open output mailbox %s: %s\n"
 msgstr "No se puede abrir el buzón %s: %s\n"
 
 #: guimb/main.c:45 imap4d/auth_gss.c:267 libsieve/sieve.l:132
-#: libsieve/sieve.l:603 libsieve/sieve.l:667 libsieve/sieve.l:721
-#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:111
-#: mh/mh_init.c:316 mh/mh_msgset.c:606
+#: libsieve/sieve.l:604 libsieve/sieve.l:668 libsieve/sieve.l:722
+#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:112
+#: mh/mh_init.c:317 mh/mh_msgset.c:606
 msgid "Not enough memory"
 msgstr "No hay suficiente memoria"
 
@@ -905,65 +905,65 @@ msgstr "el usuario GSSAPI %s est autorizado como %s"
 msgid "User `%s' logged in"
 msgstr "El usuario '%s' está conectado"
 
-#: imap4d/imap4d.c:46
+#: imap4d/imap4d.c:47
 msgid "GNU imap4d -- the IMAP4D daemon"
 msgstr "GNU imap4d -- el demonio IMAP4D"
 
-#: imap4d/imap4d.c:52 imap4d/imap4d.c:54
+#: imap4d/imap4d.c:53 imap4d/imap4d.c:55
 msgid "PATHLIST"
 msgstr "LISTADERUTAS"
 
-#: imap4d/imap4d.c:53
+#: imap4d/imap4d.c:54
 msgid "Set the `other' namespace"
 msgstr "Establece el `otro' espacio de nombres"
 
-#: imap4d/imap4d.c:55
+#: imap4d/imap4d.c:56
 msgid "Set the `shared' namespace"
 msgstr "Establece el espacio de nombres `compartido'"
 
-#: imap4d/imap4d.c:57
+#: imap4d/imap4d.c:58
 msgid "Disable LOGIN command"
 msgstr "Desactiva la orden LOGIN"
 
-#: imap4d/imap4d.c:60
+#: imap4d/imap4d.c:61
 msgid "Always require STARTTLS before entering authentication phase"
 msgstr "Requiere siempre STARTTLS antes de entrar a la fase de autenticación"
 
-#: imap4d/imap4d.c:175 pop3d/pop3d.c:201
+#: imap4d/imap4d.c:176 pop3d/pop3d.c:202
 msgid "Error getting mail group"
 msgstr "Error al obtener el grupo mail"
 
-#: imap4d/imap4d.c:181 pop3d/pop3d.c:207
+#: imap4d/imap4d.c:182 pop3d/pop3d.c:208
 msgid "Error setting mail group"
 msgstr "Error al establecer el grupo mail"
 
-#: imap4d/imap4d.c:260 pop3d/pop3d.c:298
+#: imap4d/imap4d.c:261 pop3d/pop3d.c:299
 msgid "Incoming connection opened"
 msgstr "Conexión de entrada abierta"
 
-#: imap4d/imap4d.c:262 pop3d/pop3d.c:310
+#: imap4d/imap4d.c:263 pop3d/pop3d.c:311
 #, c-format
 msgid "Cannot obtain IP address of client: %s"
 msgstr "No se puede obtener la dirección IP del cliente: %s"
 
-#: imap4d/imap4d.c:265
+#: imap4d/imap4d.c:266
 #, c-format
 msgid "Connect from %s"
 msgstr "Conectado desde %s"
 
-#: imap4d/imap4d.c:270 pop3d/pop3d.c:303
+#: imap4d/imap4d.c:271 pop3d/pop3d.c:304
 msgid "Started in debugging mode"
 msgstr "Iniciado en modo de depuración"
 
-#: imap4d/imap4d.c:302
+#: imap4d/imap4d.c:303
 msgid "could not become daemon"
 msgstr "no se puede volver un demonio"
 
-#: imap4d/imap4d.c:358
+#: imap4d/imap4d.c:359
 msgid "GNU imap4d started"
 msgstr "GNU imap4d iniciado"
 
-#: imap4d/imap4d.c:364
+#: imap4d/imap4d.c:365
 #, c-format
 msgid "Too many children (%lu)"
 msgstr "Demasiados hijos (%lu)"
@@ -1006,7 +1006,7 @@ msgstr "Terminando sesin para el usuario: %s"
 msgid "Quitting (numeric reason %d)"
 msgstr "Saliendo (razón numérica %d)"
 
-#: imap4d/list.c:247 mh/folder.c:326 mh/mh_init.c:225 mh/mh_init.c:704
+#: imap4d/list.c:247 mh/folder.c:327 mh/mh_init.c:226 mh/mh_init.c:705
 #: mh/rmf.c:147 pop3d/popauth.c:246
 #, c-format
 msgid "Cannot stat %s: %s"
@@ -1036,27 +1036,27 @@ msgstr "Se recibi la seal %s"
 msgid "MASTER: exiting on signal"
 msgstr "MAESTRO: terminando con la señal"
 
-#: imap4d/util.c:509
+#: imap4d/util.c:510
 msgid "Unexpected eof on input"
 msgstr "Fin-de-fichero inesperado en la entrada"
 
-#: imap4d/util.c:518
+#: imap4d/util.c:519
 #, c-format
 msgid "Error reading from input file: %s"
 msgstr "Error al leer del fichero de entrada: %s"
 
-#: imap4d/util.c:1005
+#: imap4d/util.c:1006
 msgid "Cannot find out my own hostname"
 msgstr "No se puede encontrar el nombre de anfitrión propio"
 
 # La traducción de poll se basa en la empleada en la traducción de
 # fetchmail. - cfuga 
-#: imap4d/util.c:1152
+#: imap4d/util.c:1153
 #, c-format
 msgid "Cannot poll input stream: %s"
 msgstr "No se puede recibir del flujo de entrada: %s"
 
-#: imap4d/util.c:1186
+#: imap4d/util.c:1187
 #, c-format
 msgid "Cannot open TLS stream: %s"
 msgstr "no se puede abrir el flujo TLS: %s"
@@ -1178,108 +1178,108 @@ msgstr "%d: no se puede copiar el mensaje: %s"
 msgid "%d: cannot get my email address"
 msgstr "%d: no se puede obtener la dirección de correo electrónico propia"
 
-#: libsieve/comparator.c:171
+#: libsieve/comparator.c:172
 #, c-format
 msgid "Regex error: %s"
 msgstr "Error de expresión regular: %s"
 
-#: libsieve/comparator.c:176
+#: libsieve/comparator.c:177
 msgid "Regex error"
 msgstr "Error de expresión regular"
 
-#: libsieve/comparator.c:238
+#: libsieve/comparator.c:239
 #, c-format
 msgid "match type specified twice in call to `%s'"
 msgstr "se especificó dos veces el tipo de coincidencia en la llamada a `%s'"
 
 #. TRANSLATORS: Do not translate ':count'. It is the name of a Sieve tag
-#: libsieve/comparator.c:275
+#: libsieve/comparator.c:276
 #, c-format
 msgid "comparator %s is incompatible with :count in call to `%s'"
 msgstr "el comparador %s es incompatible con :count en la llamada a `%s'"
 
-#: libsieve/comparator.c:291
+#: libsieve/comparator.c:292
 msgid "second argument must be a list of one element"
 msgstr "el segundo argumento debe ser una lista de un elemento"
 
-#: libsieve/comparator.c:299
+#: libsieve/comparator.c:300
 msgid "second argument cannot be converted to number"
 msgstr "el segundo argumento no se puede convertir a número"
 
-#: libsieve/comparator.c:309
+#: libsieve/comparator.c:310
 #, c-format
 msgid "invalid relational match `%s' in call to `%s'"
 msgstr "coincidencia relacional `%s' inválida en la llamada a `%s'"
 
-#: libsieve/comparator.c:322
+#: libsieve/comparator.c:323
 #, c-format
 msgid "comparator `%s' is incompatible with match type `%s' in call to `%s'"
 msgstr ""
 "el comparador `%s' es incompatible con el tipo de coincidencia `%s' en la "
 "llamada a `%s'"
 
-#: libsieve/prog.c:39
+#: libsieve/prog.c:40
 msgid "out of memory!"
 msgstr "¡Memoria agotada!"
 
-#: libsieve/prog.c:158 libsieve/require.c:39
+#: libsieve/prog.c:159 libsieve/require.c:40
 #, c-format
 msgid "cannot create iterator: %s"
 msgstr "no se puede crear un iterador: %s"
 
-#: libsieve/prog.c:177
+#: libsieve/prog.c:178
 #, c-format
 msgid "invalid tag name `%s' for `%s'"
 msgstr "nombre de etiqueta `%s' inválido para `%s'"
 
-#: libsieve/prog.c:186
+#: libsieve/prog.c:187
 #, c-format
 msgid "%s:%d: cannot create tag list: %s"
 msgstr "%s:%d: no se puede crear la lista de etiquetas: %s"
 
-#: libsieve/prog.c:210
+#: libsieve/prog.c:211
 #, c-format
 msgid "%s:%d: cannot create check list: %s"
 msgstr "%s:%d: no se puede crear la lista de revisión: %s"
 
-#: libsieve/prog.c:222 mimeview/mimetypes.y:561
+#: libsieve/prog.c:223 mimeview/mimetypes.y:561
 #, c-format
 msgid "too many arguments in call to `%s'"
 msgstr "demasiados argumentos en la llamada a `%s'"
 
-#: libsieve/prog.c:243
+#: libsieve/prog.c:244
 #, c-format
 msgid "type mismatch in argument %d to `%s'"
 msgstr "no coincide el tipo en el argumento %d de `%s'"
 
-#: libsieve/prog.c:247
+#: libsieve/prog.c:248
 #, c-format
 msgid "expected %s but passed %s"
 msgstr "se esperaba %s pero pasó %s"
 
-#: libsieve/prog.c:258
+#: libsieve/prog.c:259
 #, c-format
 msgid "cannot create arg list: %s"
 msgstr "no se puede crear la lista de argumentos: %s"
 
-#: libsieve/prog.c:276 mimeview/mimetypes.y:553
+#: libsieve/prog.c:277 mimeview/mimetypes.y:553
 #, c-format
 msgid "too few arguments in call to `%s'"
 msgstr "muy pocos argumentos en la llamada a `%s'"
 
-#: libsieve/require.c:56
+#: libsieve/require.c:57
 msgid "required comparator"
 msgstr "se requiere un comparador"
 
-#: libsieve/require.c:62
+#: libsieve/require.c:63
 msgid "required test"
 msgstr "se requiere una prueba"
 
-#: libsieve/require.c:72
+#: libsieve/require.c:73
 msgid "required action"
 msgstr "se requiere una acción"
 
-#: libsieve/require.c:78
+#: libsieve/require.c:79
 #, c-format
 msgid "source for the %s %s is not available"
 msgstr "la fuente para el %s %s no está disponible"
@@ -1293,8 +1293,8 @@ msgid "stack underflow"
 msgstr "desbordamiento por debajo de la pila"
 
 #: libsieve/runtime.c:341
-#, c-format
-msgid "mailbox_scan: %s"
+#, fuzzy, c-format
+msgid "mu_mailbox_scan: %s"
 msgstr "mailbox_scan: %s"
 
 #: libsieve/sieve.l:234
@@ -1401,7 +1401,7 @@ msgstr ""
 msgid "\"%s\": not a group"
 msgstr "\"%s\": no es un grupo"
 
-#: mail/alt.c:64 mh/mh_init.c:127
+#: mail/alt.c:64 mh/mh_init.c:128
 msgid "Cannot determine my username"
 msgstr "No se puede determinar el nombre de usuario propio"
 
@@ -1415,13 +1415,13 @@ msgstr "no se puede determinar la direccin de correo electrnico propia: %s"
 msgid "cannot change to '%s': %s"
 msgstr "no se puede hacer stat a `%s': %s"
 
-#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:541 mh/inc.c:209
-#: mh/mh_init.c:369
+#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:542 mh/inc.c:210
+#: mh/mh_init.c:370
 #, c-format
 msgid "Cannot create mailbox %s: %s"
 msgstr "No se puede crear el buzón %s: %s"
 
-#: mail/copy.c:92 mail/quit.c:126 mail/send.c:534
+#: mail/copy.c:92 mail/quit.c:126 mail/send.c:535
 #, c-format
 msgid "Cannot append message: %s"
 msgstr "No se puede agregar al mensaje: %s"
@@ -1449,7 +1449,7 @@ msgstr ""
 "\n"
 "Interrumpir"
 
-#: mail/escape.c:59 mail/send.c:225 mh/mhn.c:2059 mimeview/mimeview.c:217
+#: mail/escape.c:59 mail/send.c:226 mh/mhn.c:2059 mimeview/mimeview.c:217
 #, c-format
 msgid "Cannot create header: %s"
 msgstr "no se puede crear el encabezado: %s"
@@ -1796,21 +1796,21 @@ msgstr "Ningn campo ha sido mostrado\n"
 msgid "Sender address is obtained from the envelope\n"
 msgstr "La dirección del remitente se obtiene del sobre\n"
 
-#: mail/send.c:73
+#: mail/send.c:74
 #, c-format
 msgid "Cannot create header list: %s"
 msgstr "No se puede crear la lista de encabezado: %s"
 
-#: mail/send.c:95
+#: mail/send.c:96
 #, c-format
 msgid "Invalid header: %s"
 msgstr "Encabezado inválido: %s"
 
-#: mail/send.c:308
+#: mail/send.c:309
 msgid "Cannot open temporary file"
 msgstr "No se puede abrir el fichero temporal"
 
-#: mail/send.c:337
+#: mail/send.c:338
 msgid ""
 "\n"
 "(Interrupt -- one more to kill letter)"
@@ -1818,41 +1818,41 @@ msgstr ""
 "\n"
 "(Interrupción -- una más para cancelar el mensaje)"
 
-#: mail/send.c:348
+#: mail/send.c:349
 msgid "Use \".\" to terminate letter."
 msgstr "Utilice \".\" para terminar el mensaje."
 
-#: mail/send.c:349
+#: mail/send.c:350
 msgid "Use \"~.\" to terminate letter."
 msgstr "Utilice \"~.\" para terminar el mensaje."
 
-#: mail/send.c:391
+#: mail/send.c:392
 #, c-format
 msgid "Unknown escape %s"
 msgstr "Escape %s desconocido"
 
-#: mail/send.c:394
+#: mail/send.c:395
 msgid "Unfinished escape"
 msgstr "Escape sin terminar"
 
-#: mail/send.c:398
+#: mail/send.c:399
 msgid "Cannot parse escape sequence"
 msgstr "No se puede decodificar la secuencia de escape"
 
-#: mail/send.c:423 mh/mh_init.c:668 mh/mh_list.c:264
+#: mail/send.c:424 mh/mh_init.c:669 mh/mh_list.c:264
 #, c-format
 msgid "Cannot open file %s: %s"
 msgstr "No se puede abrir el fichero %s: %s"
 
-#: mail/send.c:484
+#: mail/send.c:485
 msgid "Null message body; hope that's ok\n"
 msgstr "Cuerpo del mensaje nulo; se espera que esté bien\n"
 
-#: mail/send.c:578
+#: mail/send.c:579
 msgid "Variable sendmail not set: no mailer"
 msgstr "La variable sendmail no se ha establecido: no hay programa de correo"
 
-#: mail/send.c:626
+#: mail/send.c:627
 #, c-format
 msgid "Piping %s failed"
 msgstr "Falló la tubería para %s"
@@ -2085,7 +2085,7 @@ msgstr ""
 "Establece el nombre del patrón para los filtros de correo Scheme definidos "
 "por el usuario"
 
-#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:86
+#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:87
 #: mimeview/mimeview.c:46
 msgid "FLAGS"
 msgstr "OPTS"
@@ -2098,7 +2098,7 @@ msgstr "Activa la depuracin"
 msgid "Multiple --from options"
 msgstr "Opciones --from múltiples"
 
-#: mail.local/main.c:215 sieve/sieve.c:208
+#: mail.local/main.c:215 sieve/sieve.c:209
 #, c-format
 msgid "%c is not a valid debug flag"
 msgstr "%c no es una opción válida de depuración"
@@ -2147,7 +2147,7 @@ msgstr "Faltan argumentos. Pruebe --help para ms informacin."
 msgid "Access to %s failed: %m"
 msgstr "Falló el acceso a %s: %m"
 
-#: mail.local/main.c:427 sieve/sieve.c:375
+#: mail.local/main.c:427 sieve/sieve.c:376
 #, c-format
 msgid "Cannot initialize sieve machine: %s"
 msgstr "No se puede inicializar el motor sieve: %s"
@@ -2367,79 +2367,79 @@ msgstr "Fall al enviar el mensaje: %s"
 msgid "Closing mailer failed: %s"
 msgstr "Falló al cerrar el programa de correo: %s"
 
-#: mailbox/getopt.c:552 mailbox/getopt.c:571
+#: mailbox/getopt.c:551 mailbox/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción `%s' es ambigua\n"
 
-#: mailbox/getopt.c:604 mailbox/getopt.c:608
+#: mailbox/getopt.c:603 mailbox/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: la opción `--%s' no admite un argumento\n"
 
-#: mailbox/getopt.c:617 mailbox/getopt.c:622
+#: mailbox/getopt.c:616 mailbox/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: la opción `%c%s' no admite un argumento\n"
 
-#: mailbox/getopt.c:668 mailbox/getopt.c:690 mailbox/getopt.c:1021
-#: mailbox/getopt.c:1043
+#: mailbox/getopt.c:667 mailbox/getopt.c:689 mailbox/getopt.c:1020
+#: mailbox/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción `%s' requiere de un argumento\n"
 
-#: mailbox/getopt.c:728 mailbox/getopt.c:731
+#: mailbox/getopt.c:727 mailbox/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción `--%s' no reconocida\n"
 
-#: mailbox/getopt.c:739 mailbox/getopt.c:742
+#: mailbox/getopt.c:738 mailbox/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción `%c%s' no reconocida\n"
 
-#: mailbox/getopt.c:797 mailbox/getopt.c:800
+#: mailbox/getopt.c:796 mailbox/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción ilegal -- %c\n"
 
-#: mailbox/getopt.c:806 mailbox/getopt.c:809
+#: mailbox/getopt.c:805 mailbox/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción inválida -- %c\n"
 
-#: mailbox/getopt.c:864 mailbox/getopt.c:883 mailbox/getopt.c:1096
-#: mailbox/getopt.c:1117
+#: mailbox/getopt.c:863 mailbox/getopt.c:882 mailbox/getopt.c:1095
+#: mailbox/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción requiere de un argumento -- %c\n"
 
-#: mailbox/getopt.c:936 mailbox/getopt.c:955
+#: mailbox/getopt.c:935 mailbox/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción `-W %s' es ambigua\n"
 
-#: mailbox/getopt.c:979 mailbox/getopt.c:1000
+#: mailbox/getopt.c:978 mailbox/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `-W %s' no admite un argumento\n"
 
-#: mailbox/argp-help.c:195
+#: mailbox/argp-help.c:194
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: El parámetro ARGP_HELP_FMT requiere de un valor"
 
-#: mailbox/argp-help.c:204
+#: mailbox/argp-help.c:203
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Parámetro de ARGP_HELP_FMT desconocido"
 
-#: mailbox/argp-help.c:216
+#: mailbox/argp-help.c:215
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Basura en ARGP_HELP_FMT: %s"
 
-#: mailbox/argp-help.c:1195
+#: mailbox/argp-help.c:1194
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
@@ -2447,66 +2447,66 @@ msgstr ""
 "Los argumentos obligatorios u opcionales para las opciones largas también "
 "son obligatorios u opcionales para cualquier opción corta correspondiente."
 
-#: mailbox/argp-help.c:1582
+#: mailbox/argp-help.c:1581
 msgid "Usage:"
 msgstr "Modo de empleo:"
 
-#: mailbox/argp-help.c:1586
+#: mailbox/argp-help.c:1585
 msgid "  or: "
 msgstr "  o:"
 
-#: mailbox/argp-help.c:1598
+#: mailbox/argp-help.c:1597
 msgid " [OPTION...]"
 msgstr " [OPCIÓN...]"
 
-#: mailbox/argp-help.c:1625
+#: mailbox/argp-help.c:1624
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Pruebe `%s --help' ó `%s --usage' para más información.\n"
 
-#: mailbox/argp-help.c:1653
+#: mailbox/argp-help.c:1652
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Reporte bichos a %s.\n"
 
-#: mailbox/argp-help.c:1873
+#: mailbox/argp-help.c:1872
 msgid "Unknown system error"
 msgstr "Error desconocido de sistema"
 
-#: mailbox/argp-parse.c:83
+#: mailbox/argp-parse.c:82
 msgid "Give this help list"
 msgstr "Da esta lista de ayuda"
 
-#: mailbox/argp-parse.c:84
+#: mailbox/argp-parse.c:83
 msgid "Give a short usage message"
 msgstr "Da un mensaje corto de modo de empleo"
 
-#: mailbox/argp-parse.c:85
+#: mailbox/argp-parse.c:84
 msgid "Set the program name"
 msgstr "Establece el nombre del programa"
 
-#: mailbox/argp-parse.c:87
+#: mailbox/argp-parse.c:86
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "Espera por SECS segundos (3600 por defecto)"
 
-#: mailbox/argp-parse.c:148
+#: mailbox/argp-parse.c:147
 msgid "Print program version"
 msgstr "Muestra la versión del programa"
 
-#: mailbox/argp-parse.c:164
+#: mailbox/argp-parse.c:163
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(ERROR DEL PROGRAMA) ¿¡Sin versión conocida!?"
 
-#: mailbox/argp-parse.c:620
+#: mailbox/argp-parse.c:619
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Demasiados argumentos\n"
 
-#: mailbox/argp-parse.c:763
+#: mailbox/argp-parse.c:762
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(ERROR DEL PROGRAMA) ¿¡La opción debería reconocerse!?"
 
-#: mailbox/file_stream.c:479
+#: mailbox/file_stream.c:480
 #, c-format
 msgid "%s must be a plain file with one link\n"
 msgstr "%s debe ser un fichero plano con un enlace\n"
@@ -2530,24 +2530,24 @@ msgstr "Error de iconv: %s"
 msgid "Stream is closed"
 msgstr "El flujo está cerrado"
 
-#: mailbox/message.c:1092
-#, c-format
-msgid "mailbox_create_default (%s) failed: %s\n"
+#: mailbox/message.c:1093
+#, fuzzy, c-format
+msgid "mu_mailbox_create_default (%s) failed: %s\n"
 msgstr "falló mailbox_create_default (%s): %s\n"
 
-#: mailbox/message.c:1123
-#, c-format
-msgid "mailbox_open (%s) failed: %s\n"
+#: mailbox/message.c:1124
+#, fuzzy, c-format
+msgid "mu_mailbox_open (%s) failed: %s\n"
 msgstr "falló mailbox_open (%s): %s\n"
 
-#: mailbox/message.c:1131
-#, c-format
-msgid "mailbox_append_message (%s) failed: %s\n"
+#: mailbox/message.c:1132
+#, fuzzy, c-format
+msgid "mu_mailbox_append_message (%s) failed: %s\n"
 msgstr "falló mailbox_append_message (%s): %s\n"
 
-#: mailbox/message.c:1143
-#, c-format
-msgid "mailbox_close (%s) failed: %s\n"
+#: mailbox/message.c:1144
+#, fuzzy, c-format
+msgid "mu_mailbox_close (%s) failed: %s\n"
 msgstr "falló mailbox_close (%s): %s\n"
 
 #: mailbox/mu_argp.c:60
@@ -2571,7 +2571,7 @@ msgid "Default locker flags (E=external, R=retry, T=time, P=pid)"
 msgstr ""
 "Opciones por defecto de bloqueo (E=externa, R=reintentar, T=tiempo, P=pid)"
 
-#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:76
+#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:77
 msgid "SECONDS"
 msgstr "SEGUNDOS"
 
@@ -3008,15 +3008,15 @@ msgstr ""
 msgid "[msg [msg...]]"
 msgstr "[msg [msg...]]"
 
-#: mh/anno.c:33 mh/folder.c:49 mh/folder.c:59 mh/forw.c:37 mh/forw.c:43
-#: mh/inc.c:34 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
+#: mh/anno.c:33 mh/folder.c:50 mh/folder.c:60 mh/forw.c:37 mh/forw.c:43
+#: mh/inc.c:35 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
 #: mh/mhpath.c:32 mh/pick.c:39 mh/refile.c:38 mh/refile.c:47 mh/repl.c:40
-#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:39 mh/send.c:42
+#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:40 mh/send.c:42
 #: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:43
 msgid "FOLDER"
 msgstr "CARPETA"
 
-#: mh/anno.c:34 mh/folder.c:60 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
+#: mh/anno.c:34 mh/folder.c:61 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
 #: mh/mhn.c:38 mh/mhpath.c:33 mh/pick.c:40 mh/refile.c:39 mh/repl.c:50
 #: mh/rmm.c:33
 msgid "Specify folder to operate upon"
@@ -3042,10 +3042,10 @@ msgstr "Agrega este CAMPO al encabezado del mensaje"
 msgid "Field value for the component"
 msgstr "Valor del campo para el componente"
 
-#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:80 mh/forw.c:75 mh/inc.c:55
+#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:81 mh/forw.c:75 mh/inc.c:56
 #: mh/install-mh.c:33 mh/mark.c:47 mh/mhl.c:53 mh/mhn.c:90 mh/mhpath.c:35
 #: mh/pick.c:96 mh/refile.c:52 mh/repl.c:72 mh/rmf.c:50 mh/rmm.c:35
-#: mh/scan.c:59 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
+#: mh/scan.c:60 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
 msgid "Display software license"
 msgstr "Muestra la licencia del software"
 
@@ -3062,16 +3062,16 @@ msgstr ""
 "GNU MH fmtcheckUtilice la opción -help para obtener la lista de las opciones "
 "tradicionales de MH. "
 
-#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:44 mh/mhl.c:43 mh/repl.c:58
-#: mh/scan.c:45
+#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:45 mh/mhl.c:43 mh/repl.c:58
+#: mh/scan.c:46
 msgid "Read format from given file"
 msgstr "Lee el formato del fichero dado"
 
-#: mh/fmtcheck.c:34 mh/inc.c:45 mh/scan.c:46
+#: mh/fmtcheck.c:34 mh/inc.c:46 mh/scan.c:47
 msgid "FORMAT"
 msgstr "FORMATO"
 
-#: mh/fmtcheck.c:35 mh/inc.c:46 mh/scan.c:47
+#: mh/fmtcheck.c:35 mh/inc.c:47 mh/scan.c:48
 msgid "Use this format string"
 msgstr "Utiliza esta cadena de formato"
 
@@ -3087,35 +3087,35 @@ msgstr "Activa la salida de depuracin del decodificador"
 msgid "Format string not specified"
 msgstr "No se especificó la cadena de formato"
 
-#: mh/fmtcheck.c:115 mh/inc.c:191 mh/repl.c:373 mh/scan.c:188
+#: mh/fmtcheck.c:115 mh/inc.c:192 mh/repl.c:373 mh/scan.c:189
 msgid "Bad format string"
 msgstr "Cadena de formato errónea"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/folder.c:39
+#: mh/folder.c:40
 msgid "GNU MH folderUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH folderUtilice la opción -help para obtener la lista de las opciones "
 "tradicionales de MH. "
 
-#: mh/folder.c:41
+#: mh/folder.c:42
 msgid "[action] [msg]"
 msgstr "[acción] [msg]"
 
-#: mh/folder.c:44 pop3d/popauth.c:68
+#: mh/folder.c:45 pop3d/popauth.c:68
 msgid "Actions are:"
 msgstr "Las acciones son:"
 
-#: mh/folder.c:46
+#: mh/folder.c:47
 msgid "List the folders (default)"
 msgstr "Enlista las carpetas (por defecto)"
 
-#: mh/folder.c:48
+#: mh/folder.c:49
 msgid "List the contents of the folder stack"
 msgstr "Enlista los contenidos de la pila de carpetas"
 
-#: mh/folder.c:50
+#: mh/folder.c:51
 msgid ""
 "Push the folder on the folder stack. If FOLDER is specified, it is pushed. "
 "Otherwise, if a folder is given in the command line (via + or --folder), it "
@@ -3127,61 +3127,61 @@ msgstr ""
 "de + ó --folder), se agrega a la pila. De otra forma, se intercambian la "
 "carpeta actual y la carpeta del tope de la pila"
 
-#: mh/folder.c:55
+#: mh/folder.c:56
 msgid "Pop the folder off the folder stack"
 msgstr "Saca la carpeta de la pila de carpetas"
 
-#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:80
+#: mh/folder.c:58 mh/mh_whatnow.c:153 pop3d/popauth.c:80
 msgid "Options are:"
 msgstr "Las opciones son:"
 
-#: mh/folder.c:62
+#: mh/folder.c:63
 msgid "List all folders"
 msgstr "Muestra todas las carpetas"
 
-#: mh/folder.c:64
+#: mh/folder.c:65
 msgid "Create non-existing folders"
 msgstr "Crea carpetas no existentes"
 
-#: mh/folder.c:67
+#: mh/folder.c:68
 msgid "List only the folder names"
 msgstr "Muestra sólo los nombres de las carpetas"
 
-#: mh/folder.c:70
+#: mh/folder.c:71
 msgid "Print the header line"
 msgstr "Muestra la línea de encabezado"
 
-#: mh/folder.c:73
+#: mh/folder.c:74
 msgid "Scan folders recursively"
 msgstr "Revisa las carpetas recursivamente"
 
-#: mh/folder.c:76
+#: mh/folder.c:77
 msgid "Output the total statistics"
 msgstr "Muestra las estadísticas totales"
 
-#: mh/folder.c:309 mh/rmf.c:128
+#: mh/folder.c:310 mh/rmf.c:128
 #, c-format
 msgid "Cannot scan folder %s: %s"
 msgstr "No se puede revisar la carpeta %s: %s"
 
-#: mh/folder.c:382
+#: mh/folder.c:383
 #, c-format
 msgid " has %4lu message  (%4lu-%4lu)"
 msgid_plural " has %4lu messages (%4lu-%4lu)"
 msgstr[0] " tiene %4lu mensaje  (%4lu-%4lu)"
 msgstr[1] " tiene %4lu mensajes  (%4lu-%4lu)"
 
-#: mh/folder.c:393
+#: mh/folder.c:394
 #, c-format
 msgid " has no messages"
 msgstr " no tiene mensajes"
 
-#: mh/folder.c:402
+#: mh/folder.c:403
 #, c-format
 msgid "(others)"
 msgstr "(otros)"
 
-#: mh/folder.c:450
+#: mh/folder.c:451
 #, c-format
 msgid ""
 "Folder                  # of messages     (  range  )  cur msg   (other "
@@ -3190,18 +3190,18 @@ msgstr ""
 "Carpeta                 # de mensajes     (  rango  )  msg act   (otros "
 "fich)\n"
 
-#: mh/folder.c:456
+#: mh/folder.c:457
 msgid "TOTAL"
 msgstr "TOTAL"
 
-#: mh/folder.c:457
+#: mh/folder.c:458
 #, c-format
 msgid "%4lu message  "
 msgid_plural "%4lu messages "
 msgstr[0] "%4lu mensaje  "
 msgstr[1] "%4lu mensajes "
 
-#: mh/folder.c:460
+#: mh/folder.c:461
 #, c-format
 msgid "in %4lu folder"
 msgid_plural "in %4lu folders"
@@ -3276,7 +3276,7 @@ msgstr "Deshace el efecto de la ltima opcin --filter"
 msgid "Use MIME encapsulation"
 msgstr "Utiliza encapsulamiento MIME"
 
-#: mh/forw.c:65 mh/inc.c:51 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:51
+#: mh/forw.c:65 mh/inc.c:52 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:52
 msgid "Set output width"
 msgstr "Establece la anchura de la salida"
 
@@ -3294,15 +3294,15 @@ msgstr ""
 msgid "Use draft file preserved after the last session"
 msgstr "Usa el último fichero borrador conservado después de la última sesión"
 
-#: mh/forw.c:147 mh/inc.c:137 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:124
+#: mh/forw.c:147 mh/inc.c:138 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:125
 msgid "Invalid width"
 msgstr "Anchura inválida"
 
-#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:138
+#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:139
 msgid "Option is not yet implemented"
 msgstr "La opción aún no está implementada"
 
-#: mh/forw.c:285 mh/mh_init.c:536
+#: mh/forw.c:285 mh/mh_init.c:537
 #, c-format
 msgid "Cannot open output file `%s': %s"
 msgstr "No se puede abrir el fichero de salida `%s': %s"
@@ -3325,64 +3325,64 @@ msgstr "Final de los Mensajes reenviados"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/inc.c:26
+#: mh/inc.c:27
 msgid "GNU MH incUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH incUtilice la opción -help para obtener la lista de las opciones "
 "tradicionales de MH."
 
-#: mh/inc.c:28 mh/rmf.c:37
+#: mh/inc.c:29 mh/rmf.c:37
 msgid "[+folder]"
 msgstr "[+carpeta]"
 
-#: mh/inc.c:33
+#: mh/inc.c:34
 msgid "Incorporate mail from named file"
 msgstr "Incorpora el correo del fichero dado"
 
-#: mh/inc.c:35
+#: mh/inc.c:36
 msgid "Specify folder to incorporate mail to"
 msgstr "Especifica la carpeta a incorporar correo"
 
-#: mh/inc.c:37
+#: mh/inc.c:38
 msgid "Enable audit"
 msgstr "Activa la auditoría"
 
-#: mh/inc.c:39
+#: mh/inc.c:40
 msgid "Disable audit"
 msgstr "Desactiva la auditoría"
 
-#: mh/inc.c:41
+#: mh/inc.c:42
 msgid "Mark first incorporated message as current (default)"
 msgstr "Marca el primer mensaje incorporado como actual (por defecto)"
 
-#: mh/inc.c:48
+#: mh/inc.c:49
 msgid "Truncate source mailbox after incorporating (default)"
 msgstr "Trunca el buzón fuente después de incorporar (por defecto)"
 
-#: mh/inc.c:53 mh/mhn.c:88
+#: mh/inc.c:54 mh/mhn.c:88
 msgid "Be quiet"
 msgstr "Estar callado"
 
-#: mh/inc.c:200
+#: mh/inc.c:201
 msgid "Cannot create default mailbox"
 msgstr "No se puede crear el buzón por defecto"
 
-#: mh/inc.c:226
+#: mh/inc.c:227
 #, c-format
 msgid "Cannot read input mailbox: %s"
 msgstr "No se puede leer el buzón de entrada: %s"
 
-#: mh/inc.c:233
+#: mh/inc.c:234
 #, c-format
 msgid "Cannot read output mailbox: %s"
 msgstr "No se puede leer el buzón de salida: %s"
 
-#: mh/inc.c:254
+#: mh/inc.c:255
 #, c-format
 msgid "%d: cannot get message: %s"
 msgstr "%d: no se puede obtener el mensaje: %s"
 
-#: mh/inc.c:261
+#: mh/inc.c:262
 #, c-format
 msgid "%d: error appending message: %s"
 msgstr "%d: error al agregar el mensaje: %s"
@@ -3461,12 +3461,12 @@ msgstr ""
 "Este es %s\n"
 "\n"
 
-#: mh/mh_ctx.c:92
+#: mh/mh_ctx.c:93
 #, c-format
 msgid "Cannot open context file %s: %s"
 msgstr "No se puede abrir el fichero de contexto %s: %s"
 
-#: mh/mh_ctx.c:142
+#: mh/mh_ctx.c:143
 #, c-format
 msgid "Cannot create context %s: %s"
 msgstr "No se puede crear el contexto %s: %s"
@@ -3493,17 +3493,17 @@ msgstr "Falta el argumento para %s"
 msgid "Extra arguments to %s"
 msgstr "Argumentos extra para %s"
 
-#: mh/mh_format.c:603
+#: mh/mh_format.c:604
 #, c-format
 msgid "INTERNAL ERROR: Unknown opcode: %x"
 msgstr "ERROR INTERNO: Código de operación desconocido: %x"
 
 #. TRANSLATORS: Do not translate the word 'format'!
-#: mh/mh_format.c:946 mh/mh_format.c:958
+#: mh/mh_format.c:947 mh/mh_format.c:959
 msgid "format: divide by zero"
 msgstr "format: división entre cero"
 
-#: mh/mh_format.c:1874
+#: mh/mh_format.c:1875
 msgid "Invalid recipient mask"
 msgstr "Máscara de destinatario inválida"
 
@@ -3533,22 +3533,22 @@ msgstr ""
 "Por favor utilice en su lugar las opciones largas de GNU.\n"
 "Ejecute %s --help para más información al respecto.\n"
 
-#: mh/mh_init.c:69
+#: mh/mh_init.c:70
 #, c-format
 msgid "Cannot stat format file %s: %s"
 msgstr "No se puede hacer stat sobre el fichero de formato %s: %s"
 
-#: mh/mh_init.c:76
+#: mh/mh_init.c:77
 #, c-format
 msgid "Cannot open format file %s: %s"
 msgstr "No se puede abrir el fichero de formato %s: %s"
 
-#: mh/mh_init.c:206
+#: mh/mh_init.c:207
 #, c-format
 msgid "Create folder \"%s\""
 msgstr "Crear carpeta \"%s\""
 
-#: mh/mh_init.c:214
+#: mh/mh_init.c:215
 #, c-format
 msgid "Cannot create directory %s: %s"
 msgstr "No se puede crear el directorio %s: %s"
@@ -3556,52 +3556,52 @@ msgstr "No se puede crear el directorio %s: %s"
 # Creo que debería ser "sí o no". sv
 # Tienes toda la razón. cfuga
 #. TRANSLATORS: See msgids "nN" and "yY".
-#: mh/mh_init.c:267
+#: mh/mh_init.c:268
 #, c-format
 msgid "Please answer yes or no: "
 msgstr "Por favor responda sí o no:"
 
-#: mh/mh_init.c:326
+#: mh/mh_init.c:327
 #, c-format
 msgid "Cannot open audit file %s: %s"
 msgstr "No se puede abrir el fichero de auditoría %s: %s"
 
-#: mh/mh_init.c:457 mh/mh_msgset.c:165
+#: mh/mh_init.c:458 mh/mh_msgset.c:165
 #, c-format
 msgid "Cannot get message %d: %s"
 msgstr "No se puede obtener el mensaje %d: %s"
 
-#: mh/mh_init.c:475
+#: mh/mh_init.c:476
 #, c-format
 msgid "Cannot split line %s"
 msgstr "No se puede dividir la línea %s"
 
-#: mh/mh_init.c:527
+#: mh/mh_init.c:528
 #, c-format
 msgid "Cannot open input file `%s': %s"
 msgstr "no se puede abrir el fichero de entrada `%s': %s"
 
-#: mh/mh_init.c:550
+#: mh/mh_init.c:551
 #, c-format
 msgid "Write error on `%s': %s"
 msgstr "Error de escritura en `%s': %s"
 
-#: mh/mh_init.c:579
+#: mh/mh_init.c:580
 #, c-format
 msgid "Cannot stat file %s: %s"
 msgstr "No se puede hacer stat sobre el fichero %s: %s"
 
-#: mh/mh_init.c:585 mh/mhn.c:2267
+#: mh/mh_init.c:586 mh/mhn.c:2267
 #, c-format
 msgid "Cannot create input stream (file %s): %s"
 msgstr "No se puede crear el flujo de entrada (fichero %s): %s"
 
-#: mh/mh_init.c:592 mh/mhn.c:2274
+#: mh/mh_init.c:593 mh/mhn.c:2274
 #, c-format
 msgid "Cannot open input stream (file %s): %s"
 msgstr "no se puede abrir el flujo de entrada (fichero %s): %s"
 
-#: mh/mh_init.c:605
+#: mh/mh_init.c:606
 #, c-format
 msgid ""
 "Prior to using MH, it is necessary to have a file in your login\n"
@@ -3616,39 +3616,39 @@ msgstr ""
 "requiere es la ruta a utilizar para todas las operaciones de carpetas\n"
 "de MH.  La ruta MH sugerida para usted es %s...\n"
 
-#: mh/mh_init.c:628
+#: mh/mh_init.c:629
 msgid "Do you need help"
 msgstr "Necesita ayuda"
 
-#: mh/mh_init.c:631
+#: mh/mh_init.c:632
 #, c-format
 msgid "Do you want the standard MH path \"%s\""
 msgstr "Quiere la ruta MH estándar \"%s\""
 
-#: mh/mh_init.c:636
+#: mh/mh_init.c:637
 msgid "Do you want a path below your login directory"
 msgstr "Quiere una ruta abajo de su directorio de entrada"
 
-#: mh/mh_init.c:638
+#: mh/mh_init.c:639
 #, c-format
 msgid "What is the path? "
 msgstr "¿Cuál es la ruta? "
 
-#: mh/mh_init.c:640
+#: mh/mh_init.c:641
 #, c-format
 msgid "What is the full path? "
 msgstr "¿Cuál es la ruta completa? "
 
-#: mh/mh_init.c:699
+#: mh/mh_init.c:700
 #, c-format
 msgid "I'm going to create the standard MH path for you.\n"
 msgstr "Se creará la ruta MH estándar para su uso.\n"
 
-#: mh/mh_init.c:710
+#: mh/mh_init.c:711
 msgid "You already have an MH profile, use an editor to modify it"
 msgstr "Ya tiene un perfil MH, utilice un editor para modificarlo"
 
-#: mh/mh_init.c:715
+#: mh/mh_init.c:716
 #, c-format
 msgid ""
 "You already have file %s which is not a regular file or a symbolic link.\n"
@@ -4160,7 +4160,7 @@ msgstr ""
 "GNU MH mhpathUtilice la opción -help para obtener la lista de las opciones "
 "tradicionales de MH. "
 
-#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:35
+#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:36
 msgid "[+folder] [msgs]"
 msgstr "[+carpeta] [msgs]"
 
@@ -4484,38 +4484,38 @@ msgstr ""
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/scan.c:33
+#: mh/scan.c:34
 msgid "GNU MH scanUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH scanUtilice la opción -help para obtener la lista de las opciones "
 "tradicionales de MH. "
 
-#: mh/scan.c:40
+#: mh/scan.c:41
 msgid "Specify folder to scan"
 msgstr "Especifica la carpeta a revisar"
 
-#: mh/scan.c:42
+#: mh/scan.c:43
 msgid "Clear screen after displaying the list"
 msgstr "Limpia la pantalla antes de mostrar la lista"
 
-#: mh/scan.c:49
+#: mh/scan.c:50
 msgid "Display header"
 msgstr "Muestra el encabezado"
 
-#: mh/scan.c:53
+#: mh/scan.c:54
 msgid "List messages in reverse order"
 msgstr "Enlista los mensajes en orden inverso"
 
-#: mh/scan.c:56
+#: mh/scan.c:57
 msgid "[Not yet implemented]"
 msgstr "[Aún no está implementado]"
 
-#: mh/scan.c:228
+#: mh/scan.c:229
 #, c-format
 msgid "no messages in %s"
 msgstr "no hay mensajes en %s"
 
-#: mh/scan.c:249
+#: mh/scan.c:250
 #, c-format
 msgid "Folder %s  %s\n"
 msgstr "Carpeta %s %s\n"
@@ -4603,7 +4603,7 @@ msgid "* Make header fields no longer than NUMBER columns"
 msgstr ""
 "* Hace que los campos de encabezados no sean más largos que NÚMERO columnas"
 
-#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:134 pop3d/pop3d.c:148
+#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:135 pop3d/pop3d.c:149
 msgid "Invalid number"
 msgstr "Número inválido"
 
@@ -4722,15 +4722,18 @@ msgid "Cannot lock"
 msgstr "No se puede bloquear"
 
 #: movemail/movemail.c:169
-msgid "mailbox_get_folder failed"
+#, fuzzy
+msgid "mu_mailbox_get_folder failed"
 msgstr "falló mailbox_get_folder"
 
 #: movemail/movemail.c:172
-msgid "folder_get_authority failed"
+#, fuzzy
+msgid "mu_folder_get_authority failed"
 msgstr "falló folder_get_authority"
 
 #: movemail/movemail.c:175
-msgid "authority_set_ticket failed"
+#, fuzzy
+msgid "mu_authority_set_ticket failed"
 msgstr "falló authority_set_ticket"
 
 #: movemail/movemail.c:202
@@ -4832,60 +4835,60 @@ msgstr "fin-de-fichero inesperado en la entrada"
 msgid "Locking mailbox `%s' failed: %s"
 msgstr "Falló al bloquear el buzón `%s': %s"
 
-#: pop3d/pop3d.c:64
+#: pop3d/pop3d.c:65
 msgid "GNU pop3d -- the POP3 daemon"
 msgstr "GNU pop3d -- el demonio POP3"
 
-#: pop3d/pop3d.c:74
+#: pop3d/pop3d.c:75
 msgid "Undelete all messages on startup"
 msgstr "Recupera todos los mensajes borrados al inicio"
 
-#: pop3d/pop3d.c:77
+#: pop3d/pop3d.c:78
 msgid "Allowed delay between the two successive logins"
 msgstr "Pausa permitida entre dos accesos sucesivos"
 
-#: pop3d/pop3d.c:78
+#: pop3d/pop3d.c:79
 msgid "FILENAME"
 msgstr "NOMBREFICHERO"
 
-#: pop3d/pop3d.c:79
+#: pop3d/pop3d.c:80
 msgid "Name of login statistics file"
 msgstr "Nombre del fichero de estadísticas de accesos"
 
-#: pop3d/pop3d.c:81
+#: pop3d/pop3d.c:82
 msgid "DAYS"
 msgstr "DÍAS"
 
-#: pop3d/pop3d.c:82
+#: pop3d/pop3d.c:83
 msgid "Expire read messages after the given number of days"
 msgstr "Expira los mensajes leídos después del número de días dado"
 
-#: pop3d/pop3d.c:84
+#: pop3d/pop3d.c:85
 msgid "Delete expired messages upon closing the mailbox"
 msgstr "Borra mensajes expirados al cerrar el buzón"
 
-#: pop3d/pop3d.c:87
+#: pop3d/pop3d.c:88
 msgid "Always require STLS before entering authentication phase"
 msgstr "Siempre requiere STLS antes de entrar a la fase de autenticación"
 
-#: pop3d/pop3d.c:277
+#: pop3d/pop3d.c:278
 msgid "Failed to become a daemon:"
 msgstr "Falló al convertirse en demonio:"
 
-#: pop3d/pop3d.c:313
+#: pop3d/pop3d.c:314
 #, c-format
 msgid "connect from %s"
 msgstr "conectado desde %s"
 
-#: pop3d/pop3d.c:437
+#: pop3d/pop3d.c:438
 msgid "Session terminated"
 msgstr "Sesión terminada"
 
-#: pop3d/pop3d.c:523
+#: pop3d/pop3d.c:524
 msgid "GNU pop3d started"
 msgstr "GNU pop3d iniciado"
 
-#: pop3d/pop3d.c:530
+#: pop3d/pop3d.c:531
 #, c-format
 msgid "too many children (%lu)"
 msgstr "demasiados hijos (%lu)"
@@ -5132,7 +5135,7 @@ msgstr "No se puede abrir el buzn `%s': %s\n"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: sieve/sieve.c:53
+#: sieve/sieve.c:54
 msgid ""
 "GNU sieve -- a mail filtering tool\n"
 "Debug flags:\n"
@@ -5150,152 +5153,152 @@ msgstr ""
 "  t - rastreo de sieve (MU_SIEVE_DEBUG_TRACE)\n"
 "  i - rastreo de instrucciones sieve (MU_SIEVE_DEBUG_INSTR)\n"
 
-#: sieve/sieve.c:69
+#: sieve/sieve.c:70
 msgid "Do not execute any actions, just print what would be done"
 msgstr "No se ejecutan acciones, sólo se muestra lo que se haría"
 
-#: sieve/sieve.c:72
+#: sieve/sieve.c:73
 msgid "Keep on going if execution fails on a message"
 msgstr "Continuar si la ejecución falla en un mensaje"
 
-#: sieve/sieve.c:75
+#: sieve/sieve.c:76
 msgid "Compile script and exit"
 msgstr "Compilar el guión y terminar"
 
-#: sieve/sieve.c:78
+#: sieve/sieve.c:79
 msgid "Compile script, dump disassembled sieve code to terminal and exit"
 msgstr ""
 "Compilar el guión, volcar el código sieve desensamblado a la terminal y salir"
 
-#: sieve/sieve.c:80
+#: sieve/sieve.c:81
 msgid "MBOX"
 msgstr "BUZON"
 
-#: sieve/sieve.c:81
+#: sieve/sieve.c:82
 msgid "Mailbox to sieve (defaults to user's mail spool)"
 msgstr "Buzón a filtrar (por defecto es el buzón de correo del usuario)"
 
-#: sieve/sieve.c:83
+#: sieve/sieve.c:84
 msgid "TICKET"
 msgstr "BOLETO"
 
-#: sieve/sieve.c:84
+#: sieve/sieve.c:85
 msgid "Ticket file for mailbox authentication"
 msgstr "Fichero boleto para la autenticación del buzón"
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "Debug flags (defaults to \""
 msgstr "Opciones de depuración (por defecto son \""
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "\")"
 msgstr "\")"
 
-#: sieve/sieve.c:90
+#: sieve/sieve.c:91
 msgid "Log all actions"
 msgstr "Registrar todas las acciones"
 
-#: sieve/sieve.c:93
+#: sieve/sieve.c:94
 msgid "Print source location along with action logs (default)"
 msgstr ""
 "Mostrar la ubicación fuente junto con los registros de acciones (por defecto)"
 
-#: sieve/sieve.c:96
+#: sieve/sieve.c:97
 msgid "Override user email address"
 msgstr "Sobreponer la dirección de correo electrónico del usuario"
 
-#: sieve/sieve.c:149
+#: sieve/sieve.c:150
 #, c-format
 msgid "Invalid email: %s"
 msgstr "Dirección de correo inválida: %s"
 
-#: sieve/sieve.c:170
+#: sieve/sieve.c:171
 msgid "Only one MBOX can be specified"
 msgstr "Sólo se puede especificar un BUZÓN"
 
-#: sieve/sieve.c:224
+#: sieve/sieve.c:225
 msgid "Only one SCRIPT can be specified"
 msgstr "Sólo se puede especificar un GUIÓN"
 
-#: sieve/sieve.c:229
+#: sieve/sieve.c:230
 msgid "SCRIPT must be specified"
 msgstr "se debe especificar el GUIÓN"
 
-#: sieve/sieve.c:242
+#: sieve/sieve.c:243
 msgid "SCRIPT"
 msgstr "GUIÓN"
 
-#: sieve/sieve.c:300 sieve/sieve.c:325
+#: sieve/sieve.c:301 sieve/sieve.c:326
 #, c-format
 msgid "%s:%lu: %s on msg uid %lu"
 msgstr "%s:%lu: %s en el mensaje con uid %lu"
 
-#: sieve/sieve.c:304 sieve/sieve.c:329
+#: sieve/sieve.c:305 sieve/sieve.c:330
 #, c-format
 msgid "%s on msg uid %lu"
 msgstr "%s en el mensaje con uid %lu"
 
-#: sieve/sieve.c:415
+#: sieve/sieve.c:416
 #, c-format
 msgid "ticket_get failed: %s"
 msgstr "falló ticket_get: %s"
 
-#: sieve/sieve.c:421
-#, c-format
-msgid "wicket_create `%s' failed: %s"
+#: sieve/sieve.c:422
+#, fuzzy, c-format
+msgid "mu_wicket_create `%s' failed: %s"
 msgstr "falló wicket_create `%s': %s"
 
-#: sieve/sieve.c:434
+#: sieve/sieve.c:435
 #, c-format
 msgid "mu_debug_create failed: %s"
 msgstr "falló mu_debug_create: %s"
 
-#: sieve/sieve.c:439
+#: sieve/sieve.c:440
 #, c-format
 msgid "mu_debug_set_level failed: %s"
 msgstr "falló mu_debug_set_level: %s"
 
-#: sieve/sieve.c:445
+#: sieve/sieve.c:446
 #, c-format
 msgid "mu_debug_set_print failed: %s"
 msgstr "falló mu_debug_set_print: %s"
 
-#: sieve/sieve.c:467
-#, c-format
-msgid "mailbox_set_debug failed: %s"
+#: sieve/sieve.c:468
+#, fuzzy, c-format
+msgid "mu_mailbox_set_debug failed: %s"
 msgstr "falló mailbox_set_debug: %s"
 
-#: sieve/sieve.c:478
-#, c-format
-msgid "mailbox_get_folder failed: %s"
+#: sieve/sieve.c:479
+#, fuzzy, c-format
+msgid "mu_mailbox_get_folder failed: %s"
 msgstr "falló mailbox_get_folder: %s"
 
-#: sieve/sieve.c:485
-#, c-format
-msgid "folder_get_authority failed: %s"
+#: sieve/sieve.c:486
+#, fuzzy, c-format
+msgid "mu_folder_get_authority failed: %s"
 msgstr "falló folder_get_authority: %s"
 
-#: sieve/sieve.c:493
-#, c-format
-msgid "authority_set_ticket failed: %s"
+#: sieve/sieve.c:494
+#, fuzzy, c-format
+msgid "mu_authority_set_ticket failed: %s"
 msgstr "falló authority_set_ticket: %s"
 
-#: sieve/sieve.c:508
+#: sieve/sieve.c:509
 #, c-format
 msgid "Opening mailbox `%s' failed: %s"
 msgstr "Falló al abrir el buzón '%s': %s"
 
-#: sieve/sieve.c:511
+#: sieve/sieve.c:512
 #, c-format
 msgid "Opening default mailbox failed: %s"
 msgstr "Falló al abrir el buzón por defecto: %s"
 
-#: sieve/sieve.c:532
+#: sieve/sieve.c:533
 #, c-format
 msgid "Expunge on mailbox `%s' failed: %s"
 msgstr "Falló al vaciar el buzón `%s': %s"
 
-#: sieve/sieve.c:535
+#: sieve/sieve.c:536
 #, c-format
 msgid "Expunge on default mailbox failed: %s"
 msgstr "Falló al vaciar el buzón por defecto: %s"

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU mailutils 0.6.1\n"
 "Report-Msgid-Bugs-To: bug-mailutils@gnu.org\n"
-"POT-Creation-Date: 2005-08-16 13:23+0300\n"
+"POT-Creation-Date: 2005-08-26 17:10+0300\n"
 "PO-Revision-Date: 2005-04-05 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
 "statut de fin d'exécution à zéro si toutes les options spécifiées ont été "
 "définies. Autrement le statut de fin d'exécution vaut 1."
 
-#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:569
+#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:570
 msgid "Too many arguments"
 msgstr "Trop d'arguments"
 
@@ -120,8 +120,8 @@ msgid "Name of the database to connect to"
 msgstr "Nom de la base de données de connexion"
 
 #: auth/sql.c:201 mailbox/mu_argp.c:80 mailbox/mu_argp.c:115
-#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
-#: mh/repl.c:65 mh/scan.c:50 mh/send.c:75
+#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:51 mh/mhl.c:44 mh/mhl.c:46
+#: mh/repl.c:65 mh/scan.c:51 mh/send.c:75
 msgid "NUMBER"
 msgstr "NOMBRE"
 
@@ -169,8 +169,8 @@ msgstr "Option d'encryption"
 #: auth/tls.c:59 auth/tls.c:61 auth/tls.c:63 comsat/comsat.c:59
 #: dotlock/dotlock.c:43 frm/from.c:32 mail.local/main.c:83
 #: mailbox/mu_argp.c:125 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
-#: mh/inc.c:32 mh/inc.c:36 mh/inc.c:43 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
-#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:44 mh/scan.c:55 mh/send.c:38
+#: mh/inc.c:33 mh/inc.c:37 mh/inc.c:44 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
+#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:45 mh/scan.c:56 mh/send.c:38
 #: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:81 pop3d/popauth.c:82
 #: mimeview/mimeview.c:48 mimeview/mimeview.c:52
 msgid "FILE"
@@ -192,17 +192,17 @@ msgstr "Spcifier le fichier fiable CAS"
 msgid "INTERNAL ERROR: cannot register argp capability tls"
 msgstr "ERREUR INTERNE: ne peut enregistrer la capacité argp tls"
 
-#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:63 mh/folder.c:66
-#: mh/folder.c:69 mh/folder.c:72 mh/folder.c:75 mh/forw.c:33 mh/forw.c:49
-#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:40 mh/inc.c:47
+#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:64 mh/folder.c:67
+#: mh/folder.c:70 mh/folder.c:73 mh/folder.c:76 mh/forw.c:33 mh/forw.c:49
+#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:41 mh/inc.c:48
 #: mh/mark.c:40 mh/mark.c:43 mh/mhl.c:36 mh/mhl.c:39 mh/mhn.c:43 mh/mhn.c:48
 #: mh/mhn.c:51 mh/mhn.c:54 mh/mhn.c:59 mh/mhn.c:62 mh/mhn.c:67 mh/mhn.c:72
 #: mh/mhn.c:75 mh/mhn.c:84 mh/pick.c:84 mh/pick.c:89 mh/pick.c:92
 #: mh/refile.c:42 mh/refile.c:45 mh/repl.c:36 mh/repl.c:51 mh/repl.c:59
-#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:41
-#: mh/scan.c:48 mh/scan.c:52 mh/send.c:52 mh/send.c:55 mh/send.c:58
+#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:42
+#: mh/scan.c:49 mh/scan.c:53 mh/send.c:52 mh/send.c:55 mh/send.c:58
 #: mh/send.c:61 mh/send.c:64 mh/send.c:69 mh/send.c:72 mh/whom.c:40
-#: sieve/sieve.c:92
+#: sieve/sieve.c:93
 msgid "BOOL"
 msgstr "BOOL"
 
@@ -368,8 +368,8 @@ msgid "Cannot open device %s: %m"
 msgstr "Ne peut ouvrir le périphérique %s: %m"
 
 #: comsat/comsat.c:456 mail/copy.c:76 mail/file.c:95 mail/mail.c:438
-#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:218
-#: mh/mh_init.c:379 pop3d/apop.c:240
+#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:219
+#: mh/mh_init.c:380 pop3d/apop.c:240
 #, c-format
 msgid "Cannot open mailbox %s: %s"
 msgstr "Ne peut ouvrir la boîte aux lettres pour %s: %s"
@@ -635,7 +635,7 @@ msgstr "GNU from -- affiche les champs from et subject"
 msgid "Just print a count of messages and exit"
 msgstr "Afficher un décompte des messages et quitter"
 
-#: frm/from.c:30 sieve/sieve.c:95
+#: frm/from.c:30 sieve/sieve.c:96
 msgid "ADDRESS"
 msgstr "ADRESSE"
 
@@ -680,13 +680,13 @@ msgid "Could not close mailbox `%s': %s"
 msgstr "ne peut fermer la boîte aux lettres `%s': %s"
 
 #: frm/common.c:545 messages/messages.c:142 movemail/movemail.c:189
-#: sieve/sieve.c:457
+#: sieve/sieve.c:458
 #, c-format
 msgid "Could not create mailbox `%s': %s"
 msgstr "Ne peut créer la boîte aux lettres `%s': %s"
 
 #: frm/common.c:548 messages/messages.c:145 movemail/movemail.c:193
-#: sieve/sieve.c:460
+#: sieve/sieve.c:461
 #, c-format
 msgid "Could not create default mailbox: %s"
 msgstr "Ne peut créer la boîte aux lettres par défaut: %s"
@@ -731,9 +731,9 @@ msgid "Cannot open output mailbox %s: %s\n"
 msgstr "Ne peut ouvrir la boîte aux lettres de sortie %s: %s\n"
 
 #: guimb/main.c:45 imap4d/auth_gss.c:267 libsieve/sieve.l:132
-#: libsieve/sieve.l:603 libsieve/sieve.l:667 libsieve/sieve.l:721
-#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:111
-#: mh/mh_init.c:316 mh/mh_msgset.c:606
+#: libsieve/sieve.l:604 libsieve/sieve.l:668 libsieve/sieve.l:722
+#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:112
+#: mh/mh_init.c:317 mh/mh_msgset.c:606
 msgid "Not enough memory"
 msgstr "Pas assez de mémoire"
 
@@ -848,66 +848,66 @@ msgstr "usager GSSAPI %s est autoris en tant que %s"
 msgid "User `%s' logged in"
 msgstr "Usager `%s' est loggé"
 
-#: imap4d/imap4d.c:46
+#: imap4d/imap4d.c:47
 msgid "GNU imap4d -- the IMAP4D daemon"
 msgstr "GNU imp4d -- le daemon IMAP4D"
 
-#: imap4d/imap4d.c:52 imap4d/imap4d.c:54
+#: imap4d/imap4d.c:53 imap4d/imap4d.c:55
 msgid "PATHLIST"
 msgstr "PATHLIST"
 
-#: imap4d/imap4d.c:53
+#: imap4d/imap4d.c:54
 msgid "Set the `other' namespace"
 msgstr "Fixer l'espace nom `other'"
 
-#: imap4d/imap4d.c:55
+#: imap4d/imap4d.c:56
 msgid "Set the `shared' namespace"
 msgstr "Fixer l'espace nom `shared'"
 
-#: imap4d/imap4d.c:57
+#: imap4d/imap4d.c:58
 msgid "Disable LOGIN command"
 msgstr "Désactiver la commande LOGIN"
 
-#: imap4d/imap4d.c:60
+#: imap4d/imap4d.c:61
 msgid "Always require STARTTLS before entering authentication phase"
 msgstr ""
 "Toujours demander STARTTLS avant d'entrer dans la phase d'authentification"
 
-#: imap4d/imap4d.c:175 pop3d/pop3d.c:201
+#: imap4d/imap4d.c:176 pop3d/pop3d.c:202
 msgid "Error getting mail group"
 msgstr "Erreur lors de l'obtention du groupe de courriel"
 
-#: imap4d/imap4d.c:181 pop3d/pop3d.c:207
+#: imap4d/imap4d.c:182 pop3d/pop3d.c:208
 msgid "Error setting mail group"
 msgstr "Erreur lors de l'initialisation du groupe de courriel"
 
-#: imap4d/imap4d.c:260 pop3d/pop3d.c:298
+#: imap4d/imap4d.c:261 pop3d/pop3d.c:299
 msgid "Incoming connection opened"
 msgstr "Connexion entrante ouverte"
 
-#: imap4d/imap4d.c:262 pop3d/pop3d.c:310
+#: imap4d/imap4d.c:263 pop3d/pop3d.c:311
 #, c-format
 msgid "Cannot obtain IP address of client: %s"
 msgstr "Ne peut obtenir l'adresse IP du client: %s"
 
-#: imap4d/imap4d.c:265
+#: imap4d/imap4d.c:266
 #, c-format
 msgid "Connect from %s"
 msgstr "Connexion à partir de %s"
 
-#: imap4d/imap4d.c:270 pop3d/pop3d.c:303
+#: imap4d/imap4d.c:271 pop3d/pop3d.c:304
 msgid "Started in debugging mode"
 msgstr "Démarré en mode de mise au point"
 
-#: imap4d/imap4d.c:302
+#: imap4d/imap4d.c:303
 msgid "could not become daemon"
 msgstr "ne peut devenir un daemon"
 
-#: imap4d/imap4d.c:358
+#: imap4d/imap4d.c:359
 msgid "GNU imap4d started"
 msgstr "GNU imap4d démarré"
 
-#: imap4d/imap4d.c:364
+#: imap4d/imap4d.c:365
 #, c-format
 msgid "Too many children (%lu)"
 msgstr "Trop de processus enfants (%lu)"
@@ -947,7 +947,7 @@ msgstr "Fin de session pour l'usager: %s"
 msgid "Quitting (numeric reason %d)"
 msgstr "Fin d'exécution (raison numérotée %d)"
 
-#: imap4d/list.c:247 mh/folder.c:326 mh/mh_init.c:225 mh/mh_init.c:704
+#: imap4d/list.c:247 mh/folder.c:327 mh/mh_init.c:226 mh/mh_init.c:705
 #: mh/rmf.c:147 pop3d/popauth.c:246
 #, c-format
 msgid "Cannot stat %s: %s"
@@ -977,25 +977,25 @@ msgstr "signal obtenu %s"
 msgid "MASTER: exiting on signal"
 msgstr "MAÎTRE: abandon sur réception de signal"
 
-#: imap4d/util.c:509
+#: imap4d/util.c:510
 msgid "Unexpected eof on input"
 msgstr "fin de fichier inattendue sur l'entrée"
 
-#: imap4d/util.c:518
+#: imap4d/util.c:519
 #, c-format
 msgid "Error reading from input file: %s"
 msgstr "erreur de lecture à partir du fichier d'entrée: %s"
 
-#: imap4d/util.c:1005
+#: imap4d/util.c:1006
 msgid "Cannot find out my own hostname"
 msgstr "Ne peut repérer mon propre hôte"
 
-#: imap4d/util.c:1152
+#: imap4d/util.c:1153
 #, c-format
 msgid "Cannot poll input stream: %s"
 msgstr "ne peut interroger le flot d'entrée: %s"
 
-#: imap4d/util.c:1186
+#: imap4d/util.c:1187
 #, c-format
 msgid "Cannot open TLS stream: %s"
 msgstr "ne peut ouvrir le flot TLS: %s"
@@ -1117,108 +1117,108 @@ msgstr "%d: ne peut copier le message: %s"
 msgid "%d: cannot get my email address"
 msgstr "%d: ne peut obtenir mon adresse de courriel"
 
-#: libsieve/comparator.c:171
+#: libsieve/comparator.c:172
 #, c-format
 msgid "Regex error: %s"
 msgstr "Erreur regex: %s"
 
-#: libsieve/comparator.c:176
+#: libsieve/comparator.c:177
 msgid "Regex error"
 msgstr "Erreur regex"
 
-#: libsieve/comparator.c:238
+#: libsieve/comparator.c:239
 #, c-format
 msgid "match type specified twice in call to `%s'"
 msgstr "type de concordance spécifié deux fois dans l'appel à « %s »"
 
 #. TRANSLATORS: Do not translate ':count'. It is the name of a Sieve tag
-#: libsieve/comparator.c:275
+#: libsieve/comparator.c:276
 #, c-format
 msgid "comparator %s is incompatible with :count in call to `%s'"
 msgstr "comparateur %s est incompatible avec : compteur dans l'appel à « %s »"
 
-#: libsieve/comparator.c:291
+#: libsieve/comparator.c:292
 msgid "second argument must be a list of one element"
 msgstr "le second arguement doit être une liste d'un élément"
 
-#: libsieve/comparator.c:299
+#: libsieve/comparator.c:300
 msgid "second argument cannot be converted to number"
 msgstr "le second argument ne peut pas être converti en nombre"
 
-#: libsieve/comparator.c:309
+#: libsieve/comparator.c:310
 #, c-format
 msgid "invalid relational match `%s' in call to `%s'"
 msgstr "concordance relationnelle invalide « %s » dans l'appel à « %s »"
 
-#: libsieve/comparator.c:322
+#: libsieve/comparator.c:323
 #, c-format
 msgid "comparator `%s' is incompatible with match type `%s' in call to `%s'"
 msgstr ""
 "comparateur « %s » est incompatible avec le type de concordance « %s » dans "
 "l'appel à « %s »"
 
-#: libsieve/prog.c:39
+#: libsieve/prog.c:40
 msgid "out of memory!"
 msgstr "mémoire épuisée!"
 
-#: libsieve/prog.c:158 libsieve/require.c:39
+#: libsieve/prog.c:159 libsieve/require.c:40
 #, c-format
 msgid "cannot create iterator: %s"
 msgstr "ne peut créer l'itérateur: %s"
 
-#: libsieve/prog.c:177
+#: libsieve/prog.c:178
 #, c-format
 msgid "invalid tag name `%s' for `%s'"
 msgstr "nom d'étiquette invalide « %s » pour « %s »"
 
-#: libsieve/prog.c:186
+#: libsieve/prog.c:187
 #, c-format
 msgid "%s:%d: cannot create tag list: %s"
 msgstr "%s:%d: ne peut créer une liste d'étiquettes: %s"
 
-#: libsieve/prog.c:210
+#: libsieve/prog.c:211
 #, c-format
 msgid "%s:%d: cannot create check list: %s"
 msgstr "%s:%d: ne peut créer une liste de vérification: %s"
 
-#: libsieve/prog.c:222 mimeview/mimetypes.y:561
+#: libsieve/prog.c:223 mimeview/mimetypes.y:561
 #, c-format
 msgid "too many arguments in call to `%s'"
 msgstr "trop d'argument dans l'appel à « %s »"
 
-#: libsieve/prog.c:243
+#: libsieve/prog.c:244
 #, c-format
 msgid "type mismatch in argument %d to `%s'"
 msgstr "non cocordance de type dans l'argument %d pour « %s »"
 
-#: libsieve/prog.c:247
+#: libsieve/prog.c:248
 #, c-format
 msgid "expected %s but passed %s"
 msgstr "%s attendu mais %s a été fourni"
 
-#: libsieve/prog.c:258
+#: libsieve/prog.c:259
 #, c-format
 msgid "cannot create arg list: %s"
 msgstr "ne peut créer la liste d'arguments: %s"
 
-#: libsieve/prog.c:276 mimeview/mimetypes.y:553
+#: libsieve/prog.c:277 mimeview/mimetypes.y:553
 #, c-format
 msgid "too few arguments in call to `%s'"
 msgstr "trop peu d'argument dans l'appel à « %s »"
 
-#: libsieve/require.c:56
+#: libsieve/require.c:57
 msgid "required comparator"
 msgstr "comparateur requis"
 
-#: libsieve/require.c:62
+#: libsieve/require.c:63
 msgid "required test"
 msgstr "test requis"
 
-#: libsieve/require.c:72
+#: libsieve/require.c:73
 msgid "required action"
 msgstr "action requise"
 
-#: libsieve/require.c:78
+#: libsieve/require.c:79
 #, c-format
 msgid "source for the %s %s is not available"
 msgstr "la source pour %s %s n'est pas disponible"
@@ -1232,8 +1232,8 @@ msgid "stack underflow"
 msgstr "sous-dépilage de la pile"
 
 #: libsieve/runtime.c:341
-#, c-format
-msgid "mailbox_scan: %s"
+#, fuzzy, c-format
+msgid "mu_mailbox_scan: %s"
 msgstr "mailbox_scan: %s"
 
 #: libsieve/sieve.l:234
@@ -1339,7 +1339,7 @@ msgstr ""
 msgid "\"%s\": not a group"
 msgstr "\"%s\": n'est pas un groupe"
 
-#: mail/alt.c:64 mh/mh_init.c:127
+#: mail/alt.c:64 mh/mh_init.c:128
 msgid "Cannot determine my username"
 msgstr "Ne peut déterminer mon nom d'usager"
 
@@ -1353,13 +1353,13 @@ msgstr "Ne peut dterminer mon adresse de courriel: %s"
 msgid "cannot change to '%s': %s"
 msgstr "ne peut évaluer par stat() `%s': %s"
 
-#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:541 mh/inc.c:209
-#: mh/mh_init.c:369
+#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:542 mh/inc.c:210
+#: mh/mh_init.c:370
 #, c-format
 msgid "Cannot create mailbox %s: %s"
 msgstr "Ne peut créer la boîte aux lettres %s: %s"
 
-#: mail/copy.c:92 mail/quit.c:126 mail/send.c:534
+#: mail/copy.c:92 mail/quit.c:126 mail/send.c:535
 #, c-format
 msgid "Cannot append message: %s"
 msgstr "Ne peut accoller le message: %s"
@@ -1387,7 +1387,7 @@ msgstr ""
 "\n"
 "Interruption"
 
-#: mail/escape.c:59 mail/send.c:225 mh/mhn.c:2059 mimeview/mimeview.c:217
+#: mail/escape.c:59 mail/send.c:226 mh/mhn.c:2059 mimeview/mimeview.c:217
 #, c-format
 msgid "Cannot create header: %s"
 msgstr "Ne peut créer l'en-tête: %s"
@@ -1730,21 +1730,21 @@ msgstr "Aucun champ n'a t couramment dcouvert\n"
 msgid "Sender address is obtained from the envelope\n"
 msgstr "Adresse de l'expéditeur est obtenur à partir de l'enveloppe\n"
 
-#: mail/send.c:73
+#: mail/send.c:74
 #, c-format
 msgid "Cannot create header list: %s"
 msgstr "Ne peut créer l'en-tête de liste: %s"
 
-#: mail/send.c:95
+#: mail/send.c:96
 #, c-format
 msgid "Invalid header: %s"
 msgstr "En-tête invalide: %s"
 
-#: mail/send.c:308
+#: mail/send.c:309
 msgid "Cannot open temporary file"
 msgstr "Ne peut ouvrir un fichier temporaire"
 
-#: mail/send.c:337
+#: mail/send.c:338
 msgid ""
 "\n"
 "(Interrupt -- one more to kill letter)"
@@ -1752,43 +1752,43 @@ msgstr ""
 "\n"
 "(Interruption -- un de plus pour avorter le courriel)"
 
-#: mail/send.c:348
+#: mail/send.c:349
 msgid "Use \".\" to terminate letter."
 msgstr "Utilisez \".\" pour terminer le courriel."
 
-#: mail/send.c:349
+#: mail/send.c:350
 msgid "Use \"~.\" to terminate letter."
 msgstr "Utilisez \"~.\" pour terminer le courriel."
 
-#: mail/send.c:391
+#: mail/send.c:392
 #, c-format
 msgid "Unknown escape %s"
 msgstr "Échappement inconnu %s"
 
-#: mail/send.c:394
+#: mail/send.c:395
 msgid "Unfinished escape"
 msgstr "Échappement non complété"
 
-#: mail/send.c:398
+#: mail/send.c:399
 msgid "Cannot parse escape sequence"
 msgstr "ne peut analyser la séquence d'échappement"
 
-#: mail/send.c:423 mh/mh_init.c:668 mh/mh_list.c:264
+#: mail/send.c:424 mh/mh_init.c:669 mh/mh_list.c:264
 #, c-format
 msgid "Cannot open file %s: %s"
 msgstr "ne peut ouvrir le fichier %s: %s"
 
-#: mail/send.c:484
+#: mail/send.c:485
 msgid "Null message body; hope that's ok\n"
 msgstr "Corps du message vide; en espérant que cela soit correct\n"
 
-#: mail/send.c:578
+#: mail/send.c:579
 msgid "Variable sendmail not set: no mailer"
 msgstr ""
 "La variable sendmail n'est pas initialisée: pas de logiciel de livraison de "
 "courriels"
 
-#: mail/send.c:626
+#: mail/send.c:627
 #, c-format
 msgid "Piping %s failed"
 msgstr "Le pipe %s a échoué"
@@ -2029,7 +2029,7 @@ msgstr ""
 "Initialiser le nom du patron pour les filtres sieve du courriel définis par "
 "l'usager"
 
-#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:86
+#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:87
 #: mimeview/mimeview.c:46
 msgid "FLAGS"
 msgstr "OPTIONS"
@@ -2043,7 +2043,7 @@ msgstr "Autoriser la mise au point"
 msgid "Multiple --from options"
 msgstr "options multiples de --from"
 
-#: mail.local/main.c:215 sieve/sieve.c:208
+#: mail.local/main.c:215 sieve/sieve.c:209
 #, c-format
 msgid "%c is not a valid debug flag"
 msgstr "%c n'est pas une option valide de mise au point"
@@ -2092,7 +2092,7 @@ msgstr "Arguments manquants. Essayer --help pour plus d'informations."
 msgid "Access to %s failed: %m"
 msgstr "accès à %s a échoué: %m"
 
-#: mail.local/main.c:427 sieve/sieve.c:375
+#: mail.local/main.c:427 sieve/sieve.c:376
 #, fuzzy, c-format
 msgid "Cannot initialize sieve machine: %s"
 msgstr "ne peut initialiser l'automate sieve: %s"
@@ -2320,79 +2320,79 @@ msgstr "Transmission du message a chou: %s"
 msgid "Closing mailer failed: %s"
 msgstr "Fermeture du postier a échoué: %s"
 
-#: mailbox/getopt.c:552 mailbox/getopt.c:571
+#: mailbox/getopt.c:551 mailbox/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: l'option « %s » est ambiguë\n"
 
-#: mailbox/getopt.c:604 mailbox/getopt.c:608
+#: mailbox/getopt.c:603 mailbox/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: l'option « --%s » ne permet pas d'argument\n"
 
-#: mailbox/getopt.c:617 mailbox/getopt.c:622
+#: mailbox/getopt.c:616 mailbox/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: l'options « %c%s » ne permet pas d'argument\n"
 
-#: mailbox/getopt.c:668 mailbox/getopt.c:690 mailbox/getopt.c:1021
-#: mailbox/getopt.c:1043
+#: mailbox/getopt.c:667 mailbox/getopt.c:689 mailbox/getopt.c:1020
+#: mailbox/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: l'option « %s » requiert un argument\n"
 
-#: mailbox/getopt.c:728 mailbox/getopt.c:731
+#: mailbox/getopt.c:727 mailbox/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: option non reconnue « --%s »\n"
 
-#: mailbox/getopt.c:739 mailbox/getopt.c:742
+#: mailbox/getopt.c:738 mailbox/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: option non reconnue «  %c%s »\n"
 
-#: mailbox/getopt.c:797 mailbox/getopt.c:800
+#: mailbox/getopt.c:796 mailbox/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: option illégale -- %c\n"
 
-#: mailbox/getopt.c:806 mailbox/getopt.c:809
+#: mailbox/getopt.c:805 mailbox/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: option invalide -- %c\n"
 
-#: mailbox/getopt.c:864 mailbox/getopt.c:883 mailbox/getopt.c:1096
-#: mailbox/getopt.c:1117
+#: mailbox/getopt.c:863 mailbox/getopt.c:882 mailbox/getopt.c:1095
+#: mailbox/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: l'option requiert un argument -- %c\n"
 
-#: mailbox/getopt.c:936 mailbox/getopt.c:955
+#: mailbox/getopt.c:935 mailbox/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: l'option `-W %s' est ambiguë\n"
 
-#: mailbox/getopt.c:979 mailbox/getopt.c:1000
+#: mailbox/getopt.c:978 mailbox/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'option `-W %s' ne permet par un argument\n"
 
-#: mailbox/argp-help.c:195
+#: mailbox/argp-help.c:194
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: paramètre ARGP_HELP_FMT requiert une valeur"
 
-#: mailbox/argp-help.c:204
+#: mailbox/argp-help.c:203
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: paramètre ARGP_HELP_FMT inconnu"
 
-#: mailbox/argp-help.c:216
+#: mailbox/argp-help.c:215
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Rebut dans ARGP_HELP_FMT: %s"
 
-#: mailbox/argp-help.c:1195
+#: mailbox/argp-help.c:1194
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
@@ -2400,67 +2400,67 @@ msgstr ""
 "Les arguments obligatoires pour la forme longue des options sont "
 "aussiobligatoires pour les formes courtes qui leur correspondent."
 
-#: mailbox/argp-help.c:1582
+#: mailbox/argp-help.c:1581
 msgid "Usage:"
 msgstr "Usage:"
 
-#: mailbox/argp-help.c:1586
+#: mailbox/argp-help.c:1585
 msgid "  or: "
 msgstr "  ou: "
 
-#: mailbox/argp-help.c:1598
+#: mailbox/argp-help.c:1597
 msgid " [OPTION...]"
 msgstr " [OPTION...]"
 
-#: mailbox/argp-help.c:1625
+#: mailbox/argp-help.c:1624
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Essayer « %s --help » ou « %s --usage » pour plus d'informations.\n"
 
-#: mailbox/argp-help.c:1653
+#: mailbox/argp-help.c:1652
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Rapportez toutes anomalies à %s.\n"
 
-#: mailbox/argp-help.c:1873
+#: mailbox/argp-help.c:1872
 #, fuzzy
 msgid "Unknown system error"
 msgstr "type de message inconnu"
 
-#: mailbox/argp-parse.c:83
+#: mailbox/argp-parse.c:82
 msgid "Give this help list"
 msgstr "Donner cette liste d'aide"
 
-#: mailbox/argp-parse.c:84
+#: mailbox/argp-parse.c:83
 msgid "Give a short usage message"
 msgstr "Donner une court message sur l'usage"
 
-#: mailbox/argp-parse.c:85
+#: mailbox/argp-parse.c:84
 msgid "Set the program name"
 msgstr "Initialiser le nom du programme"
 
-#: mailbox/argp-parse.c:87
+#: mailbox/argp-parse.c:86
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "Suspendre pendant N secondes (par défaut 3600)"
 
-#: mailbox/argp-parse.c:148
+#: mailbox/argp-parse.c:147
 msgid "Print program version"
 msgstr "Afficher la version du programme"
 
-#: mailbox/argp-parse.c:164
+#: mailbox/argp-parse.c:163
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(ERREUR DU PROGRAMME) Pas de version connue!?"
 
-#: mailbox/argp-parse.c:620
+#: mailbox/argp-parse.c:619
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: trop d,arguments\n"
 
-#: mailbox/argp-parse.c:763
+#: mailbox/argp-parse.c:762
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(ERREUR DU PROGRAMME) l'option aurait dû être reconnue!?"
 
-#: mailbox/file_stream.c:479
+#: mailbox/file_stream.c:480
 #, c-format
 msgid "%s must be a plain file with one link\n"
 msgstr "%s doit être un fichier ordinaire avec un seul lien\n"
@@ -2484,24 +2484,24 @@ msgstr "Erreur iconv(): %s"
 msgid "Stream is closed"
 msgstr "Flot est fermé"
 
-#: mailbox/message.c:1092
-#, c-format
-msgid "mailbox_create_default (%s) failed: %s\n"
+#: mailbox/message.c:1093
+#, fuzzy, c-format
+msgid "mu_mailbox_create_default (%s) failed: %s\n"
 msgstr "mailbox_create_default (%s) a échoué: %s\n"
 
-#: mailbox/message.c:1123
-#, c-format
-msgid "mailbox_open (%s) failed: %s\n"
+#: mailbox/message.c:1124
+#, fuzzy, c-format
+msgid "mu_mailbox_open (%s) failed: %s\n"
 msgstr "mailbox_open (%s) a échoué: %s\n"
 
-#: mailbox/message.c:1131
-#, c-format
-msgid "mailbox_append_message (%s) failed: %s\n"
+#: mailbox/message.c:1132
+#, fuzzy, c-format
+msgid "mu_mailbox_append_message (%s) failed: %s\n"
 msgstr "mailbox_append_message (%s) a échoué: %s\n"
 
-#: mailbox/message.c:1143
-#, c-format
-msgid "mailbox_close (%s) failed: %s\n"
+#: mailbox/message.c:1144
+#, fuzzy, c-format
+msgid "mu_mailbox_close (%s) failed: %s\n"
 msgstr "mailbox_close (%s) a échoué: %s\n"
 
 #: mailbox/mu_argp.c:60
@@ -2526,7 +2526,7 @@ msgstr ""
 "Fanions de verrouillage par défaut (E=externe, R=nouvelle tentative, "
 "T=temps, P=pid"
 
-#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:76
+#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:77
 msgid "SECONDS"
 msgstr "SECONDES"
 
@@ -2970,15 +2970,15 @@ msgstr ""
 msgid "[msg [msg...]]"
 msgstr "[msg [msg...]]"
 
-#: mh/anno.c:33 mh/folder.c:49 mh/folder.c:59 mh/forw.c:37 mh/forw.c:43
-#: mh/inc.c:34 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
+#: mh/anno.c:33 mh/folder.c:50 mh/folder.c:60 mh/forw.c:37 mh/forw.c:43
+#: mh/inc.c:35 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
 #: mh/mhpath.c:32 mh/pick.c:39 mh/refile.c:38 mh/refile.c:47 mh/repl.c:40
-#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:39 mh/send.c:42
+#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:40 mh/send.c:42
 #: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:43
 msgid "FOLDER"
 msgstr "RÉPERTOIRE"
 
-#: mh/anno.c:34 mh/folder.c:60 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
+#: mh/anno.c:34 mh/folder.c:61 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
 #: mh/mhn.c:38 mh/mhpath.c:33 mh/pick.c:40 mh/refile.c:39 mh/repl.c:50
 #: mh/rmm.c:33
 msgid "Specify folder to operate upon"
@@ -3004,10 +3004,10 @@ msgstr "Ajouter ce CHAMP  l'en-tte du message"
 msgid "Field value for the component"
 msgstr "Valeur du champ pour le composant"
 
-#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:80 mh/forw.c:75 mh/inc.c:55
+#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:81 mh/forw.c:75 mh/inc.c:56
 #: mh/install-mh.c:33 mh/mark.c:47 mh/mhl.c:53 mh/mhn.c:90 mh/mhpath.c:35
 #: mh/pick.c:96 mh/refile.c:52 mh/repl.c:72 mh/rmf.c:50 mh/rmm.c:35
-#: mh/scan.c:59 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
+#: mh/scan.c:60 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
 msgid "Display software license"
 msgstr "Afficher la licence du logiciel"
 
@@ -3024,16 +3024,16 @@ msgstr ""
 "GNU MH fmtcheckUtiliser -help pour obtenir la liste des options "
 "traditionnelles MH"
 
-#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:44 mh/mhl.c:43 mh/repl.c:58
-#: mh/scan.c:45
+#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:45 mh/mhl.c:43 mh/repl.c:58
+#: mh/scan.c:46
 msgid "Read format from given file"
 msgstr "Lire le format à partir d'un fichier spécifique"
 
-#: mh/fmtcheck.c:34 mh/inc.c:45 mh/scan.c:46
+#: mh/fmtcheck.c:34 mh/inc.c:46 mh/scan.c:47
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: mh/fmtcheck.c:35 mh/inc.c:46 mh/scan.c:47
+#: mh/fmtcheck.c:35 mh/inc.c:47 mh/scan.c:48
 msgid "Use this format string"
 msgstr "Utiliser cette chaîne de format"
 
@@ -3050,35 +3050,35 @@ msgstr "Autoriser la sortie de mise au point de l'analyseur syntaxique"
 msgid "Format string not specified"
 msgstr "chaîne de format non spécifiée"
 
-#: mh/fmtcheck.c:115 mh/inc.c:191 mh/repl.c:373 mh/scan.c:188
+#: mh/fmtcheck.c:115 mh/inc.c:192 mh/repl.c:373 mh/scan.c:189
 msgid "Bad format string"
 msgstr "Chaîne de format erronée"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/folder.c:39
+#: mh/folder.c:40
 msgid "GNU MH folderUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH folderUtiliser -help pour obtenir la liste des options "
 "traditionnelles MH."
 
-#: mh/folder.c:41
+#: mh/folder.c:42
 msgid "[action] [msg]"
 msgstr "[action] [message]"
 
-#: mh/folder.c:44 pop3d/popauth.c:68
+#: mh/folder.c:45 pop3d/popauth.c:68
 msgid "Actions are:"
 msgstr "Les actions sont:"
 
-#: mh/folder.c:46
+#: mh/folder.c:47
 msgid "List the folders (default)"
 msgstr "Lister les répertoires (par défaut)"
 
-#: mh/folder.c:48
+#: mh/folder.c:49
 msgid "List the contents of the folder stack"
 msgstr "Lister le contenu de la pile de répertoires"
 
-#: mh/folder.c:50
+#: mh/folder.c:51
 msgid ""
 "Push the folder on the folder stack. If FOLDER is specified, it is pushed. "
 "Otherwise, if a folder is given in the command line (via + or --folder), it "
@@ -3090,61 +3090,61 @@ msgstr ""
 "de commande (via + ou --folder), il est mis sur la pile. Autrement, le "
 "répertoire courant est le haut du répertoire de pile sont échangés"
 
-#: mh/folder.c:55
+#: mh/folder.c:56
 msgid "Pop the folder off the folder stack"
 msgstr "Dépiler le répertoire du répertoire de pile"
 
-#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:80
+#: mh/folder.c:58 mh/mh_whatnow.c:153 pop3d/popauth.c:80
 msgid "Options are:"
 msgstr "Les options sont:"
 
-#: mh/folder.c:62
+#: mh/folder.c:63
 msgid "List all folders"
 msgstr "Lister tous les répertoires"
 
-#: mh/folder.c:64
+#: mh/folder.c:65
 msgid "Create non-existing folders"
 msgstr "Créer un répertoire qui n'existe pas au préalable"
 
-#: mh/folder.c:67
+#: mh/folder.c:68
 msgid "List only the folder names"
 msgstr "Lister seulement le nom des répertoires"
 
-#: mh/folder.c:70
+#: mh/folder.c:71
 msgid "Print the header line"
 msgstr "Afficher la ligne d'en-tête"
 
-#: mh/folder.c:73
+#: mh/folder.c:74
 msgid "Scan folders recursively"
 msgstr "Scruter récursivement les répertoires"
 
-#: mh/folder.c:76
+#: mh/folder.c:77
 msgid "Output the total statistics"
 msgstr "Produire des statistiques complètes"
 
-#: mh/folder.c:309 mh/rmf.c:128
+#: mh/folder.c:310 mh/rmf.c:128
 #, fuzzy, c-format
 msgid "Cannot scan folder %s: %s"
 msgstr "ne peut scruter le répertoire %s: %s"
 
-#: mh/folder.c:382
+#: mh/folder.c:383
 #, c-format
 msgid " has %4lu message  (%4lu-%4lu)"
 msgid_plural " has %4lu messages (%4lu-%4lu)"
 msgstr[0] " a %4lu message (%4lu-%4lu)"
 msgstr[1] " a %4lu messages (%4lu-%4lu)"
 
-#: mh/folder.c:393
+#: mh/folder.c:394
 #, c-format
 msgid " has no messages"
 msgstr " n'a pas de message"
 
-#: mh/folder.c:402
+#: mh/folder.c:403
 #, c-format
 msgid "(others)"
 msgstr "(autres)"
 
-#: mh/folder.c:450
+#: mh/folder.c:451
 #, c-format
 msgid ""
 "Folder                  # of messages     (  range  )  cur msg   (other "
@@ -3153,18 +3153,18 @@ msgstr ""
 "Répertoire              # de messages     (  étendue )  cour msg   (autres "
 "fichiers)\n"
 
-#: mh/folder.c:456
+#: mh/folder.c:457
 msgid "TOTAL"
 msgstr "TOTAL"
 
-#: mh/folder.c:457
+#: mh/folder.c:458
 #, c-format
 msgid "%4lu message  "
 msgid_plural "%4lu messages "
 msgstr[0] "%4lu message  "
 msgstr[1] "%4lu messages "
 
-#: mh/folder.c:460
+#: mh/folder.c:461
 #, c-format
 msgid "in %4lu folder"
 msgid_plural "in %4lu folders"
@@ -3240,7 +3240,7 @@ msgstr "Annuler l'effet de la dernire option --fliter"
 msgid "Use MIME encapsulation"
 msgstr "Utiliser l'encapsulation MIME"
 
-#: mh/forw.c:65 mh/inc.c:51 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:51
+#: mh/forw.c:65 mh/inc.c:52 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:52
 msgid "Set output width"
 msgstr "Fixer la largeur de la sortie"
 
@@ -3260,16 +3260,16 @@ msgid "Use draft file preserved after the last session"
 msgstr ""
 "Utiliser le fichier contenant le brouillon préservé après la dernière session"
 
-#: mh/forw.c:147 mh/inc.c:137 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:124
+#: mh/forw.c:147 mh/inc.c:138 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:125
 msgid "Invalid width"
 msgstr "Largeur invalide"
 
-#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:138
+#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:139
 #, fuzzy
 msgid "Option is not yet implemented"
 msgstr "l'option n'est pas encore implantée"
 
-#: mh/forw.c:285 mh/mh_init.c:536
+#: mh/forw.c:285 mh/mh_init.c:537
 #, fuzzy, c-format
 msgid "Cannot open output file `%s': %s"
 msgstr "ne peut ouvrir le fichier de sortie \"%s\": %s"
@@ -3292,66 +3292,66 @@ msgstr "Fin des messages relays"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/inc.c:26
+#: mh/inc.c:27
 msgid "GNU MH incUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH incUutiliser -help pour obtenir la listes des options traditionnelles "
 "MH."
 
-#: mh/inc.c:28 mh/rmf.c:37
+#: mh/inc.c:29 mh/rmf.c:37
 msgid "[+folder]"
 msgstr "[+répertoire]"
 
-#: mh/inc.c:33
+#: mh/inc.c:34
 msgid "Incorporate mail from named file"
 msgstr "Incorporer le courrier à partir du fichier nommé"
 
-#: mh/inc.c:35
+#: mh/inc.c:36
 msgid "Specify folder to incorporate mail to"
 msgstr "Spécifier un répertoire pour y incorporer le courrier"
 
-#: mh/inc.c:37
+#: mh/inc.c:38
 msgid "Enable audit"
 msgstr "Autoriser l'audit"
 
-#: mh/inc.c:39
+#: mh/inc.c:40
 msgid "Disable audit"
 msgstr "Interdire l'audit"
 
-#: mh/inc.c:41
+#: mh/inc.c:42
 msgid "Mark first incorporated message as current (default)"
 msgstr ""
 "Marquer d'abord le message incorporé comme message courant (par défaut)"
 
-#: mh/inc.c:48
+#: mh/inc.c:49
 msgid "Truncate source mailbox after incorporating (default)"
 msgstr "Tronquer la boîte aux lettres source après incorporation (par défaut)"
 
-#: mh/inc.c:53 mh/mhn.c:88
+#: mh/inc.c:54 mh/mhn.c:88
 msgid "Be quiet"
 msgstr "Travailler en silence"
 
-#: mh/inc.c:200
+#: mh/inc.c:201
 #, fuzzy
 msgid "Cannot create default mailbox"
 msgstr "Ne peut créer la boîte aux lettres par défaut"
 
-#: mh/inc.c:226
+#: mh/inc.c:227
 #, fuzzy, c-format
 msgid "Cannot read input mailbox: %s"
 msgstr "Ne peut lire à partir de la boîte aux lettres d'entrée: %s"
 
-#: mh/inc.c:233
+#: mh/inc.c:234
 #, fuzzy, c-format
 msgid "Cannot read output mailbox: %s"
 msgstr "Ne peut lire à partir de la boîte aux lettres de sortie: %s"
 
-#: mh/inc.c:254
+#: mh/inc.c:255
 #, fuzzy, c-format
 msgid "%d: cannot get message: %s"
 msgstr "%d: ne peut obtenir le message: %s"
 
-#: mh/inc.c:261
+#: mh/inc.c:262
 #, c-format
 msgid "%d: error appending message: %s"
 msgstr "%d: erreur de concaténation de message: %s"
@@ -3432,12 +3432,12 @@ msgstr ""
 "Ceci est %s\n"
 "\n"
 
-#: mh/mh_ctx.c:92
+#: mh/mh_ctx.c:93
 #, fuzzy, c-format
 msgid "Cannot open context file %s: %s"
 msgstr "ne peut ouvrir le fichier de sortie \"%s\": %s"
 
-#: mh/mh_ctx.c:142
+#: mh/mh_ctx.c:143
 #, fuzzy, c-format
 msgid "Cannot create context %s: %s"
 msgstr "Ne peut créer le fichier de contexte %s: %s"
@@ -3464,17 +3464,17 @@ msgstr "argument manquant pour %s"
 msgid "Extra arguments to %s"
 msgstr "aarguments superflus à %s"
 
-#: mh/mh_format.c:603
+#: mh/mh_format.c:604
 #, c-format
 msgid "INTERNAL ERROR: Unknown opcode: %x"
 msgstr "ERREUR INTERNR: opcode inconnu: %x"
 
 #. TRANSLATORS: Do not translate the word 'format'!
-#: mh/mh_format.c:946 mh/mh_format.c:958
+#: mh/mh_format.c:947 mh/mh_format.c:959
 msgid "format: divide by zero"
 msgstr "format: division par zéro"
 
-#: mh/mh_format.c:1874
+#: mh/mh_format.c:1875
 msgid "Invalid recipient mask"
 msgstr "Masque du récipiendaire invalide"
 
@@ -3504,73 +3504,73 @@ msgstr ""
 "SVP utiliser les options GNU de formes longues à la place.\n"
 "Exécuter %s --help pour plus d'informations.\n"
 
-#: mh/mh_init.c:69
+#: mh/mh_init.c:70
 #, fuzzy, c-format
 msgid "Cannot stat format file %s: %s"
 msgstr "ne peut évaluer avec stat() le fichier de formats %s: %s"
 
-#: mh/mh_init.c:76
+#: mh/mh_init.c:77
 #, fuzzy, c-format
 msgid "Cannot open format file %s: %s"
 msgstr "ne peut ouvrir le fichier de formats %s: %s"
 
-#: mh/mh_init.c:206
+#: mh/mh_init.c:207
 #, c-format
 msgid "Create folder \"%s\""
 msgstr "Création du répertoire \"%s\""
 
-#: mh/mh_init.c:214
+#: mh/mh_init.c:215
 #, fuzzy, c-format
 msgid "Cannot create directory %s: %s"
 msgstr "Ne peut créer le répertoire %s: %s"
 
 #. TRANSLATORS: See msgids "nN" and "yY".
-#: mh/mh_init.c:267
+#: mh/mh_init.c:268
 #, c-format
 msgid "Please answer yes or no: "
 msgstr "SVP répondre yes (pour oui) ou no (pour non): "
 
-#: mh/mh_init.c:326
+#: mh/mh_init.c:327
 #, fuzzy, c-format
 msgid "Cannot open audit file %s: %s"
 msgstr "Ne peut ouvrir le fichier d'audit %s: %s"
 
-#: mh/mh_init.c:457 mh/mh_msgset.c:165
+#: mh/mh_init.c:458 mh/mh_msgset.c:165
 #, fuzzy, c-format
 msgid "Cannot get message %d: %s"
 msgstr "ne peut obtenir le message %d: %s"
 
-#: mh/mh_init.c:475
+#: mh/mh_init.c:476
 #, fuzzy, c-format
 msgid "Cannot split line %s"
 msgstr "ne peut séparer la ligne %s"
 
-#: mh/mh_init.c:527
+#: mh/mh_init.c:528
 #, fuzzy, c-format
 msgid "Cannot open input file `%s': %s"
 msgstr "ne peut ouvrir le fichier d'entrée \"%s\": %s"
 
-#: mh/mh_init.c:550
+#: mh/mh_init.c:551
 #, fuzzy, c-format
 msgid "Write error on `%s': %s"
 msgstr "erreur d'écriture sur \"%s\": %s"
 
-#: mh/mh_init.c:579
+#: mh/mh_init.c:580
 #, fuzzy, c-format
 msgid "Cannot stat file %s: %s"
 msgstr "ne peut évaluer par stat() le fichier %s: %s"
 
-#: mh/mh_init.c:585 mh/mhn.c:2267
+#: mh/mh_init.c:586 mh/mhn.c:2267
 #, fuzzy, c-format
 msgid "Cannot create input stream (file %s): %s"
 msgstr "ne peut créer un flot d'entrée (fichier %s): %s"
 
-#: mh/mh_init.c:592 mh/mhn.c:2274
+#: mh/mh_init.c:593 mh/mhn.c:2274
 #, fuzzy, c-format
 msgid "Cannot open input stream (file %s): %s"
 msgstr "ne peut ouvrir le flot d'entre (fichier %s): %s"
 
-#: mh/mh_init.c:605
+#: mh/mh_init.c:606
 #, c-format
 msgid ""
 "Prior to using MH, it is necessary to have a file in your login\n"
@@ -3587,40 +3587,40 @@ msgstr ""
 "répertoire. Le\n"
 "chemin MH suggéré pour vous est %s...\n"
 
-#: mh/mh_init.c:628
+#: mh/mh_init.c:629
 msgid "Do you need help"
 msgstr "Avez-vous besoin d'aide?"
 
-#: mh/mh_init.c:631
+#: mh/mh_init.c:632
 #, c-format
 msgid "Do you want the standard MH path \"%s\""
 msgstr "Désirez-vous le chemin standard MH \"%s\""
 
-#: mh/mh_init.c:636
+#: mh/mh_init.c:637
 msgid "Do you want a path below your login directory"
 msgstr ""
 "Désirez-vous un chemin situé sous votre répertoire d'établissement de session"
 
-#: mh/mh_init.c:638
+#: mh/mh_init.c:639
 #, c-format
 msgid "What is the path? "
 msgstr "Lequel est le chemin? "
 
-#: mh/mh_init.c:640
+#: mh/mh_init.c:641
 #, c-format
 msgid "What is the full path? "
 msgstr "Lequel est le chemin complet? "
 
-#: mh/mh_init.c:699
+#: mh/mh_init.c:700
 #, c-format
 msgid "I'm going to create the standard MH path for you.\n"
 msgstr "Je vais créer le chemin standard MH pour vous.\n"
 
-#: mh/mh_init.c:710
+#: mh/mh_init.c:711
 msgid "You already have an MH profile, use an editor to modify it"
 msgstr "Vous avez déjà un profil MH, utiliser un éditeur pour le modifier."
 
-#: mh/mh_init.c:715
+#: mh/mh_init.c:716
 #, c-format
 msgid ""
 "You already have file %s which is not a regular file or a symbolic link.\n"
@@ -4135,7 +4135,7 @@ msgstr ""
 "GNU MH mhpathUtiliser -help pour obtenir la liste des options "
 "traditionnelles MH"
 
-#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:35
+#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:36
 msgid "[+folder] [msgs]"
 msgstr "[+répertoire] [messages]"
 
@@ -4466,38 +4466,38 @@ msgstr ""
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/scan.c:33
+#: mh/scan.c:34
 msgid "GNU MH scanUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH scanUtiliser -help pour obtenir la liste des options traditionnelles "
 "MH"
 
-#: mh/scan.c:40
+#: mh/scan.c:41
 msgid "Specify folder to scan"
 msgstr "Spécifier le répertoire à scruter"
 
-#: mh/scan.c:42
+#: mh/scan.c:43
 msgid "Clear screen after displaying the list"
 msgstr "Effacer l'écran après affichage de la liste"
 
-#: mh/scan.c:49
+#: mh/scan.c:50
 msgid "Display header"
 msgstr "Afficher l'en-tête"
 
-#: mh/scan.c:53
+#: mh/scan.c:54
 msgid "List messages in reverse order"
 msgstr "Lister les messages dans l'ordre inverse"
 
-#: mh/scan.c:56
+#: mh/scan.c:57
 msgid "[Not yet implemented]"
 msgstr "[Pas encore implanté]"
 
-#: mh/scan.c:228
+#: mh/scan.c:229
 #, c-format
 msgid "no messages in %s"
 msgstr "pas de message dans %s"
 
-#: mh/scan.c:249
+#: mh/scan.c:250
 #, c-format
 msgid "Folder %s  %s\n"
 msgstr "Répertoire %s %s\n"
@@ -4585,7 +4585,7 @@ msgstr "Monitorer la livraison du courrier"
 msgid "* Make header fields no longer than NUMBER columns"
 msgstr "* Rendre les champs d'en-tête pas plus long que le NOMBRE de colonnes"
 
-#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:134 pop3d/pop3d.c:148
+#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:135 pop3d/pop3d.c:149
 msgid "Invalid number"
 msgstr "Numéro invalide"
 
@@ -4705,15 +4705,18 @@ msgid "Cannot lock"
 msgstr "Ne peut verrouiller"
 
 #: movemail/movemail.c:169
-msgid "mailbox_get_folder failed"
+#, fuzzy
+msgid "mu_mailbox_get_folder failed"
 msgstr "mailbox_get_folder a échoué"
 
 #: movemail/movemail.c:172
-msgid "folder_get_authority failed"
+#, fuzzy
+msgid "mu_folder_get_authority failed"
 msgstr "folder_get_authority a échoué"
 
 #: movemail/movemail.c:175
-msgid "authority_set_ticket failed"
+#, fuzzy
+msgid "mu_authority_set_ticket failed"
 msgstr "authority_set_ticket a échoué"
 
 #: movemail/movemail.c:202
@@ -4816,61 +4819,61 @@ msgstr "fin de fichier inattendue sur l'entre"
 msgid "Locking mailbox `%s' failed: %s"
 msgstr "Ouverture du postier '%s' a échoué: %s"
 
-#: pop3d/pop3d.c:64
+#: pop3d/pop3d.c:65
 msgid "GNU pop3d -- the POP3 daemon"
 msgstr "GNU pop3d -- le daemon POP3"
 
-#: pop3d/pop3d.c:74
+#: pop3d/pop3d.c:75
 msgid "Undelete all messages on startup"
 msgstr "Ne pas détruire tous les messages lors du démarrage"
 
-#: pop3d/pop3d.c:77
+#: pop3d/pop3d.c:78
 msgid "Allowed delay between the two successive logins"
 msgstr "Permettre un délai entre deux logins successifs"
 
-#: pop3d/pop3d.c:78
+#: pop3d/pop3d.c:79
 msgid "FILENAME"
 msgstr "NOM DE FICHIER"
 
-#: pop3d/pop3d.c:79
+#: pop3d/pop3d.c:80
 msgid "Name of login statistics file"
 msgstr "Nom du fichier des statistiques de login"
 
-#: pop3d/pop3d.c:81
+#: pop3d/pop3d.c:82
 msgid "DAYS"
 msgstr "JOURS"
 
-#: pop3d/pop3d.c:82
+#: pop3d/pop3d.c:83
 msgid "Expire read messages after the given number of days"
 msgstr "Expierer les messages lus après un certain nombre de jours"
 
-#: pop3d/pop3d.c:84
+#: pop3d/pop3d.c:85
 msgid "Delete expired messages upon closing the mailbox"
 msgstr "Détruire les messages expirés après fermeture de la boîte aux lettres"
 
-#: pop3d/pop3d.c:87
+#: pop3d/pop3d.c:88
 msgid "Always require STLS before entering authentication phase"
 msgstr "Toujours demander STLS avant d'entrer dans la phase d'authentification"
 
-#: pop3d/pop3d.c:277
+#: pop3d/pop3d.c:278
 #, fuzzy
 msgid "Failed to become a daemon:"
 msgstr "a échoué dans la tentative à devenir un daemon:"
 
-#: pop3d/pop3d.c:313
+#: pop3d/pop3d.c:314
 #, c-format
 msgid "connect from %s"
 msgstr "connexion à partir de %s"
 
-#: pop3d/pop3d.c:437
+#: pop3d/pop3d.c:438
 msgid "Session terminated"
 msgstr "Session terminée"
 
-#: pop3d/pop3d.c:523
+#: pop3d/pop3d.c:524
 msgid "GNU pop3d started"
 msgstr "GNU pop3d a démarré"
 
-#: pop3d/pop3d.c:530
+#: pop3d/pop3d.c:531
 #, c-format
 msgid "too many children (%lu)"
 msgstr "trop d'anfants (%lu)"
@@ -5122,7 +5125,7 @@ msgstr "ne peut ouvrir la bote aux lettres %s: %s\n"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: sieve/sieve.c:53
+#: sieve/sieve.c:54
 #, fuzzy
 msgid ""
 "GNU sieve -- a mail filtering tool\n"
@@ -5141,158 +5144,158 @@ msgstr ""
 "  t - traces de l'automate sieve (MU_SIEVE_DEBUG_TRACE)\n"
 "  i - traces des instructions sieve (MU_SIEVE_DEBUG_INSTR)\n"
 
-#: sieve/sieve.c:69
+#: sieve/sieve.c:70
 msgid "Do not execute any actions, just print what would be done"
 msgstr "N'exécuter aucune action, juste afficher ce qui pourrait être fait"
 
-#: sieve/sieve.c:72
+#: sieve/sieve.c:73
 msgid "Keep on going if execution fails on a message"
 msgstr "Continuer même s'il y a échec d'exécution sur un message"
 
-#: sieve/sieve.c:75
+#: sieve/sieve.c:76
 msgid "Compile script and exit"
 msgstr "Compiler le script et quitter"
 
-#: sieve/sieve.c:78
+#: sieve/sieve.c:79
 msgid "Compile script, dump disassembled sieve code to terminal and exit"
 msgstr ""
 "Compiler le script. vidanger le code sieve déassemblé vers le terminal et "
 "quitter"
 
-#: sieve/sieve.c:80
+#: sieve/sieve.c:81
 msgid "MBOX"
 msgstr "MBOX"
 
-#: sieve/sieve.c:81
+#: sieve/sieve.c:82
 msgid "Mailbox to sieve (defaults to user's mail spool)"
 msgstr ""
 "Boîte aux lettres vers le sieve (par défaut vers la sortie de boîte aux "
 "lettres de l'usager"
 
-#: sieve/sieve.c:83
+#: sieve/sieve.c:84
 msgid "TICKET"
 msgstr "TICKET"
 
-#: sieve/sieve.c:84
+#: sieve/sieve.c:85
 msgid "Ticket file for mailbox authentication"
 msgstr "fichier ticket pour l'authentification de la boîte aux lettres"
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "Debug flags (defaults to \""
 msgstr "Fanions de mise au point (par défaut \""
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "\")"
 msgstr "\")"
 
-#: sieve/sieve.c:90
+#: sieve/sieve.c:91
 msgid "Log all actions"
 msgstr "Journaliser toutes les actions"
 
-#: sieve/sieve.c:93
+#: sieve/sieve.c:94
 msgid "Print source location along with action logs (default)"
 msgstr ""
 "Afficher la localisation de la source avec l'action dans le journal de bord "
 "(par défaut)"
 
-#: sieve/sieve.c:96
+#: sieve/sieve.c:97
 msgid "Override user email address"
 msgstr "Écraser l'adresse de courriel de l'usager"
 
-#: sieve/sieve.c:149
+#: sieve/sieve.c:150
 #, fuzzy, c-format
 msgid "Invalid email: %s"
 msgstr "email invalide: %s"
 
-#: sieve/sieve.c:170
+#: sieve/sieve.c:171
 #, fuzzy
 msgid "Only one MBOX can be specified"
 msgstr "une seule MBOX peut être spécifié"
 
-#: sieve/sieve.c:224
+#: sieve/sieve.c:225
 #, fuzzy
 msgid "Only one SCRIPT can be specified"
 msgstr "un seul SCRIPT peut être spécifié"
 
-#: sieve/sieve.c:229
+#: sieve/sieve.c:230
 msgid "SCRIPT must be specified"
 msgstr "SCRIPT doit être spécifié"
 
-#: sieve/sieve.c:242
+#: sieve/sieve.c:243
 msgid "SCRIPT"
 msgstr "SCRIPT"
 
-#: sieve/sieve.c:300 sieve/sieve.c:325
+#: sieve/sieve.c:301 sieve/sieve.c:326
 #, c-format
 msgid "%s:%lu: %s on msg uid %lu"
 msgstr "%s:%lu: %s dans msg uid %lu"
 
-#: sieve/sieve.c:304 sieve/sieve.c:329
+#: sieve/sieve.c:305 sieve/sieve.c:330
 #, c-format
 msgid "%s on msg uid %lu"
 msgstr "%s dans le message uid %lu"
 
-#: sieve/sieve.c:415
+#: sieve/sieve.c:416
 #, c-format
 msgid "ticket_get failed: %s"
 msgstr "ticket_get a échoué: %s"
 
-#: sieve/sieve.c:421
+#: sieve/sieve.c:422
 #, fuzzy, c-format
-msgid "wicket_create `%s' failed: %s"
+msgid "mu_wicket_create `%s' failed: %s"
 msgstr "wicket_create <%s> a échoué: %s"
 
-#: sieve/sieve.c:434
+#: sieve/sieve.c:435
 #, c-format
 msgid "mu_debug_create failed: %s"
 msgstr "mu_debug_create a échoué: %s"
 
-#: sieve/sieve.c:439
+#: sieve/sieve.c:440
 #, c-format
 msgid "mu_debug_set_level failed: %s"
 msgstr "mu_debug_set_level a échoué: %s"
 
-#: sieve/sieve.c:445
+#: sieve/sieve.c:446
 #, c-format
 msgid "mu_debug_set_print failed: %s"
 msgstr "mu_debug_set_print a échoué: %s"
 
-#: sieve/sieve.c:467
-#, c-format
-msgid "mailbox_set_debug failed: %s"
+#: sieve/sieve.c:468
+#, fuzzy, c-format
+msgid "mu_mailbox_set_debug failed: %s"
 msgstr "mailbox_set_debug a échoué: %s"
 
-#: sieve/sieve.c:478
-#, c-format
-msgid "mailbox_get_folder failed: %s"
+#: sieve/sieve.c:479
+#, fuzzy, c-format
+msgid "mu_mailbox_get_folder failed: %s"
 msgstr "mailbox_get_folder a échoué: %s"
 
-#: sieve/sieve.c:485
-#, c-format
-msgid "folder_get_authority failed: %s"
+#: sieve/sieve.c:486
+#, fuzzy, c-format
+msgid "mu_folder_get_authority failed: %s"
 msgstr "folder_get_authority a échoué: %s"
 
-#: sieve/sieve.c:493
-#, c-format
-msgid "authority_set_ticket failed: %s"
+#: sieve/sieve.c:494
+#, fuzzy, c-format
+msgid "mu_authority_set_ticket failed: %s"
 msgstr "authority_set_ticket a échoué: %s"
 
-#: sieve/sieve.c:508
+#: sieve/sieve.c:509
 #, fuzzy, c-format
 msgid "Opening mailbox `%s' failed: %s"
 msgstr "Ouverture du postier '%s' a échoué: %s"
 
-#: sieve/sieve.c:511
+#: sieve/sieve.c:512
 #, fuzzy, c-format
 msgid "Opening default mailbox failed: %s"
 msgstr "ouverture de stdin a échoué: %s"
 
-#: sieve/sieve.c:532
+#: sieve/sieve.c:533
 #, fuzzy, c-format
 msgid "Expunge on mailbox `%s' failed: %s"
 msgstr "expunge on %s a échoué: %s"
 
-#: sieve/sieve.c:535
+#: sieve/sieve.c:536
 #, fuzzy, c-format
 msgid "Expunge on default mailbox failed: %s"
 msgstr "ne peut ouvrir la boîte aux lettres par défaut %s: %s"

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mailutils 0.6.90\n"
 "Report-Msgid-Bugs-To: bug-mailutils@gnu.org\n"
-"POT-Creation-Date: 2005-08-16 13:23+0300\n"
+"POT-Creation-Date: 2005-08-26 17:10+0300\n"
 "PO-Revision-Date: 2005-05-19 11:43+0300\n"
 "Last-Translator: Sergey Poznyakoff <gray@gnu.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -56,7 +56,7 @@ msgstr ""
 "opcji, ktre s zdefiniowane. Program wychodzi z kodem 0 jeli wszystkie "
 "podane opcje s zdefiniowane i z kodem 1 w wypadku przeciwnym."
 
-#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:569
+#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:570
 msgid "Too many arguments"
 msgstr "Za duo argumentw"
 
@@ -117,8 +117,8 @@ msgid "Name of the database to connect to"
 msgstr "Nazwa bazy SQL"
 
 #: auth/sql.c:201 mailbox/mu_argp.c:80 mailbox/mu_argp.c:115
-#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
-#: mh/repl.c:65 mh/scan.c:50 mh/send.c:75
+#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:51 mh/mhl.c:44 mh/mhl.c:46
+#: mh/repl.c:65 mh/scan.c:51 mh/send.c:75
 msgid "NUMBER"
 msgstr "LICZBA"
 
@@ -166,8 +166,8 @@ msgstr "Opcje szyfrowania"
 #: auth/tls.c:59 auth/tls.c:61 auth/tls.c:63 comsat/comsat.c:59
 #: dotlock/dotlock.c:43 frm/from.c:32 mail.local/main.c:83
 #: mailbox/mu_argp.c:125 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
-#: mh/inc.c:32 mh/inc.c:36 mh/inc.c:43 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
-#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:44 mh/scan.c:55 mh/send.c:38
+#: mh/inc.c:33 mh/inc.c:37 mh/inc.c:44 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
+#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:45 mh/scan.c:56 mh/send.c:38
 #: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:81 pop3d/popauth.c:82
 #: mimeview/mimeview.c:48 mimeview/mimeview.c:52
 msgid "FILE"
@@ -189,17 +189,17 @@ msgstr "Nazwa zaufanego pliku CA"
 msgid "INTERNAL ERROR: cannot register argp capability tls"
 msgstr "BD WEWNTRZNY: nie mona zarejestrowa urzdzenia argp \"tls\""
 
-#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:63 mh/folder.c:66
-#: mh/folder.c:69 mh/folder.c:72 mh/folder.c:75 mh/forw.c:33 mh/forw.c:49
-#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:40 mh/inc.c:47
+#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:64 mh/folder.c:67
+#: mh/folder.c:70 mh/folder.c:73 mh/folder.c:76 mh/forw.c:33 mh/forw.c:49
+#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:41 mh/inc.c:48
 #: mh/mark.c:40 mh/mark.c:43 mh/mhl.c:36 mh/mhl.c:39 mh/mhn.c:43 mh/mhn.c:48
 #: mh/mhn.c:51 mh/mhn.c:54 mh/mhn.c:59 mh/mhn.c:62 mh/mhn.c:67 mh/mhn.c:72
 #: mh/mhn.c:75 mh/mhn.c:84 mh/pick.c:84 mh/pick.c:89 mh/pick.c:92
 #: mh/refile.c:42 mh/refile.c:45 mh/repl.c:36 mh/repl.c:51 mh/repl.c:59
-#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:41
-#: mh/scan.c:48 mh/scan.c:52 mh/send.c:52 mh/send.c:55 mh/send.c:58
+#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:42
+#: mh/scan.c:49 mh/scan.c:53 mh/send.c:52 mh/send.c:55 mh/send.c:58
 #: mh/send.c:61 mh/send.c:64 mh/send.c:69 mh/send.c:72 mh/whom.c:40
-#: sieve/sieve.c:92
+#: sieve/sieve.c:93
 msgid "BOOL"
 msgstr "BOOL"
 
@@ -367,8 +367,8 @@ msgid "Cannot open device %s: %m"
 msgstr "Nie mona otworzy urzdzenia %s: %m"
 
 #: comsat/comsat.c:456 mail/copy.c:76 mail/file.c:95 mail/mail.c:438
-#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:218
-#: mh/mh_init.c:379 pop3d/apop.c:240
+#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:219
+#: mh/mh_init.c:380 pop3d/apop.c:240
 #, c-format
 msgid "Cannot open mailbox %s: %s"
 msgstr "Nie mona otworzy skrzynki %s: %s"
@@ -641,7 +641,7 @@ msgstr "GNU from -- wywietla nagwki \"from\" i \"subject\""
 msgid "Just print a count of messages and exit"
 msgstr "Wywietla liczb wiadomoci i wychodzi"
 
-#: frm/from.c:30 sieve/sieve.c:95
+#: frm/from.c:30 sieve/sieve.c:96
 msgid "ADDRESS"
 msgstr "ADRES"
 
@@ -686,13 +686,13 @@ msgid "Could not close mailbox `%s': %s"
 msgstr "Nie mona otworzy skrzynki `%s': %s"
 
 #: frm/common.c:545 messages/messages.c:142 movemail/movemail.c:189
-#: sieve/sieve.c:457
+#: sieve/sieve.c:458
 #, c-format
 msgid "Could not create mailbox `%s': %s"
 msgstr "Nie mona utworzy skrzynki `%s': %s"
 
 #: frm/common.c:548 messages/messages.c:145 movemail/movemail.c:193
-#: sieve/sieve.c:460
+#: sieve/sieve.c:461
 #, c-format
 msgid "Could not create default mailbox: %s"
 msgstr "Nie mona utworzy skrzynki domylnej: %s"
@@ -737,9 +737,9 @@ msgid "Cannot open output mailbox %s: %s\n"
 msgstr "Nie mona otworzy skrzynki wyjciowej %s: %s\n"
 
 #: guimb/main.c:45 imap4d/auth_gss.c:267 libsieve/sieve.l:132
-#: libsieve/sieve.l:603 libsieve/sieve.l:667 libsieve/sieve.l:721
-#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:111
-#: mh/mh_init.c:316 mh/mh_msgset.c:606
+#: libsieve/sieve.l:604 libsieve/sieve.l:668 libsieve/sieve.l:722
+#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:112
+#: mh/mh_init.c:317 mh/mh_msgset.c:606
 msgid "Not enough memory"
 msgstr "Brak pamici"
 
@@ -854,65 +854,65 @@ msgstr "uytkownik GSSAPI %s zosta autoryzowany do uycia konta %s"
 msgid "User `%s' logged in"
 msgstr "Uytkownik `%s' zalogowa si"
 
-#: imap4d/imap4d.c:46
+#: imap4d/imap4d.c:47
 msgid "GNU imap4d -- the IMAP4D daemon"
 msgstr "GNU imap4d -- demon obsugi IMAP4D"
 
-#: imap4d/imap4d.c:52 imap4d/imap4d.c:54
+#: imap4d/imap4d.c:53 imap4d/imap4d.c:55
 msgid "PATHLIST"
 msgstr "LISTA-CIEEK"
 
-#: imap4d/imap4d.c:53
+#: imap4d/imap4d.c:54
 msgid "Set the `other' namespace"
 msgstr "Ustala przestrze nazw `other'"
 
-#: imap4d/imap4d.c:55
+#: imap4d/imap4d.c:56
 msgid "Set the `shared' namespace"
 msgstr "Ustala przestrze nazw `shared'"
 
-#: imap4d/imap4d.c:57
+#: imap4d/imap4d.c:58
 msgid "Disable LOGIN command"
 msgstr "Wycza obsug polecenia LOGIN"
 
-#: imap4d/imap4d.c:60
+#: imap4d/imap4d.c:61
 msgid "Always require STARTTLS before entering authentication phase"
 msgstr "Wymaga uycia STARTTLS przed przejciem do fazy uwierzytelniania"
 
-#: imap4d/imap4d.c:175 pop3d/pop3d.c:201
+#: imap4d/imap4d.c:176 pop3d/pop3d.c:202
 msgid "Error getting mail group"
 msgstr "Otrzymanie grupy \"mail\" nie powiodo si"
 
-#: imap4d/imap4d.c:181 pop3d/pop3d.c:207
+#: imap4d/imap4d.c:182 pop3d/pop3d.c:208
 msgid "Error setting mail group"
 msgstr "Ustawienie grupy \"mail\" nie powiodo si"
 
-#: imap4d/imap4d.c:260 pop3d/pop3d.c:298
+#: imap4d/imap4d.c:261 pop3d/pop3d.c:299
 msgid "Incoming connection opened"
 msgstr "Otwarto poczenie nadchodzce"
 
-#: imap4d/imap4d.c:262 pop3d/pop3d.c:310
+#: imap4d/imap4d.c:263 pop3d/pop3d.c:311
 #, c-format
 msgid "Cannot obtain IP address of client: %s"
 msgstr "Nie mona uzyska adresu IP klienta: %s"
 
-#: imap4d/imap4d.c:265
+#: imap4d/imap4d.c:266
 #, c-format
 msgid "Connect from %s"
 msgstr "Poczenie z %s"
 
-#: imap4d/imap4d.c:270 pop3d/pop3d.c:303
+#: imap4d/imap4d.c:271 pop3d/pop3d.c:304
 msgid "Started in debugging mode"
 msgstr "Uruchomiono w trybie odpluskwiania"
 
-#: imap4d/imap4d.c:302
+#: imap4d/imap4d.c:303
 msgid "could not become daemon"
 msgstr "uruchomienie w trybie demona nie powiodo si"
 
-#: imap4d/imap4d.c:358
+#: imap4d/imap4d.c:359
 msgid "GNU imap4d started"
 msgstr "GNU imap4d uruchomiony"
 
-#: imap4d/imap4d.c:364
+#: imap4d/imap4d.c:365
 #, c-format
 msgid "Too many children (%lu)"
 msgstr "Za duo procesw potomnych (%lu)"
@@ -952,7 +952,7 @@ msgstr "Zakoczenie sesji uytkownika %s"
 msgid "Quitting (numeric reason %d)"
 msgstr "Zakoczenie (przyczyna %d)"
 
-#: imap4d/list.c:247 mh/folder.c:326 mh/mh_init.c:225 mh/mh_init.c:704
+#: imap4d/list.c:247 mh/folder.c:327 mh/mh_init.c:226 mh/mh_init.c:705
 #: mh/rmf.c:147 pop3d/popauth.c:246
 #, c-format
 msgid "Cannot stat %s: %s"
@@ -982,25 +982,25 @@ msgstr "Otrzymano sygna %s"
 msgid "MASTER: exiting on signal"
 msgstr "Proces nadrzdny: zakoczenie na sygna"
 
-#: imap4d/util.c:509
+#: imap4d/util.c:510
 msgid "Unexpected eof on input"
 msgstr "Niespodziewany EOF w wejciu"
 
-#: imap4d/util.c:518
+#: imap4d/util.c:519
 #, c-format
 msgid "Error reading from input file: %s"
 msgstr "Bd przy odczycie pliku wejciowego: %s"
 
-#: imap4d/util.c:1005
+#: imap4d/util.c:1006
 msgid "Cannot find out my own hostname"
 msgstr "Nie mona ustali wasnej nazwy hosta"
 
-#: imap4d/util.c:1152
+#: imap4d/util.c:1153
 #, c-format
 msgid "Cannot poll input stream: %s"
 msgstr "Nie mona odpytywa strumienia wejciowego: %s"
 
-#: imap4d/util.c:1186
+#: imap4d/util.c:1187
 #, c-format
 msgid "Cannot open TLS stream: %s"
 msgstr "Nie mona otworzy strumienia TLS: %s"
@@ -1123,109 +1123,109 @@ msgstr "%d: nie mona skopiowa wiadomoci: %s"
 msgid "%d: cannot get my email address"
 msgstr "%d: nie mona ustali wasnego adresu"
 
-#: libsieve/comparator.c:171
+#: libsieve/comparator.c:172
 #, c-format
 msgid "Regex error: %s"
 msgstr "Bd wyraenia regularnego: %s"
 
-#: libsieve/comparator.c:176
+#: libsieve/comparator.c:177
 msgid "Regex error"
 msgstr "Bd wyraenia regularnego"
 
-#: libsieve/comparator.c:238
+#: libsieve/comparator.c:239
 #, c-format
 msgid "match type specified twice in call to `%s'"
 msgstr "dwukrotne uycie typu dopasowania w wywoaniu `%s'"
 
 #. TRANSLATORS: Do not translate ':count'. It is the name of a Sieve tag
-#: libsieve/comparator.c:275
+#: libsieve/comparator.c:276
 #, c-format
 msgid "comparator %s is incompatible with :count in call to `%s'"
 msgstr "komparator %s nie jest zgodny z :count w wywoaniu `%s'"
 
-#: libsieve/comparator.c:291
+#: libsieve/comparator.c:292
 msgid "second argument must be a list of one element"
 msgstr "drugim argumentem musi by lista o jednym elemencie"
 
-#: libsieve/comparator.c:299
+#: libsieve/comparator.c:300
 msgid "second argument cannot be converted to number"
 msgstr "nie mona przetworzy drugiego argumentu na liczb"
 
-#: libsieve/comparator.c:309
+#: libsieve/comparator.c:310
 #, c-format
 msgid "invalid relational match `%s' in call to `%s'"
 msgstr "bdne dopasowanie relacyjne `%s' w wywoaniu `%s'"
 
-#: libsieve/comparator.c:322
+#: libsieve/comparator.c:323
 #, c-format
 msgid "comparator `%s' is incompatible with match type `%s' in call to `%s'"
 msgstr ""
 "Modyfikator porwnania `%s' nie jest zgodny z rodzajem porwnania `%s' w "
 "wywoaniu `%s'"
 
-#: libsieve/prog.c:39
+#: libsieve/prog.c:40
 msgid "out of memory!"
 msgstr "brak pamici!"
 
-#: libsieve/prog.c:158 libsieve/require.c:39
+#: libsieve/prog.c:159 libsieve/require.c:40
 #, c-format
 msgid "cannot create iterator: %s"
 msgstr "nie mona utworzy iteratora: %s"
 
-#: libsieve/prog.c:177
+#: libsieve/prog.c:178
 #, c-format
 msgid "invalid tag name `%s' for `%s'"
 msgstr "niepoprawna nazwa etykiety `%s' dla `%s'"
 
-#: libsieve/prog.c:186
+#: libsieve/prog.c:187
 #, c-format
 msgid "%s:%d: cannot create tag list: %s"
 msgstr "%s:%d: nie mona utworzy listy etykiet: %s"
 
-#: libsieve/prog.c:210
+#: libsieve/prog.c:211
 #, c-format
 msgid "%s:%d: cannot create check list: %s"
 msgstr "%s:%d: nie mona utworzy listy kontrolnej: %s"
 
-#: libsieve/prog.c:222 mimeview/mimetypes.y:561
+#: libsieve/prog.c:223 mimeview/mimetypes.y:561
 #, c-format
 msgid "too many arguments in call to `%s'"
 msgstr "zbyt duo argumentw w wywoaniu `%s'"
 
-#: libsieve/prog.c:243
+#: libsieve/prog.c:244
 #, c-format
 msgid "type mismatch in argument %d to `%s'"
 msgstr "typ argumentu %d nie pasuje do definicji `%s'"
 
-#: libsieve/prog.c:247
+#: libsieve/prog.c:248
 #, c-format
 msgid "expected %s but passed %s"
 msgstr "spodziewano si %s, przekazano natomiast %s"
 
-#: libsieve/prog.c:258
+#: libsieve/prog.c:259
 #, c-format
 msgid "cannot create arg list: %s"
 msgstr "nie mona utworzy listy argumentw: %s"
 
-#: libsieve/prog.c:276 mimeview/mimetypes.y:553
+#: libsieve/prog.c:277 mimeview/mimetypes.y:553
 #, c-format
 msgid "too few arguments in call to `%s'"
 msgstr "brak argumentw w wywoaniu `%s'"
 
 # Uycie: "brak rda ...", std dopeniacz
-#: libsieve/require.c:56
+#: libsieve/require.c:57
 msgid "required comparator"
 msgstr "wymaganego komparatora"
 
-#: libsieve/require.c:62
+#: libsieve/require.c:63
 msgid "required test"
 msgstr "wymaganego testu"
 
-#: libsieve/require.c:72
+#: libsieve/require.c:73
 msgid "required action"
 msgstr "wymaganej akcji"
 
-#: libsieve/require.c:78
+#: libsieve/require.c:79
 #, c-format
 msgid "source for the %s %s is not available"
 msgstr "brak rda %s %s"
@@ -1239,8 +1239,8 @@ msgid "stack underflow"
 msgstr "stos pusty"
 
 #: libsieve/runtime.c:341
-#, c-format
-msgid "mailbox_scan: %s"
+#, fuzzy, c-format
+msgid "mu_mailbox_scan: %s"
 msgstr "mailbox_scan: %s"
 
 #: libsieve/sieve.l:234
@@ -1344,7 +1344,7 @@ msgstr ""
 msgid "\"%s\": not a group"
 msgstr "\"%s\": nie jest grup"
 
-#: mail/alt.c:64 mh/mh_init.c:127
+#: mail/alt.c:64 mh/mh_init.c:128
 msgid "Cannot determine my username"
 msgstr "Nie mona ustali wasnej nazwy uytkownika"
 
@@ -1358,13 +1358,13 @@ msgstr "Nie mona ustali wasnego adresu poczty elektronicznej: %s"
 msgid "cannot change to '%s': %s"
 msgstr "stat(%s) nie powid si: %s"
 
-#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:541 mh/inc.c:209
-#: mh/mh_init.c:369
+#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:542 mh/inc.c:210
+#: mh/mh_init.c:370
 #, c-format
 msgid "Cannot create mailbox %s: %s"
 msgstr "Nie mona utworzy skrzynki %s: %s"
 
-#: mail/copy.c:92 mail/quit.c:126 mail/send.c:534
+#: mail/copy.c:92 mail/quit.c:126 mail/send.c:535
 #, c-format
 msgid "Cannot append message: %s"
 msgstr "Nie mona doczy wiadomoci: %s"
@@ -1392,7 +1392,7 @@ msgstr ""
 "\n"
 "Przerwanie"
 
-#: mail/escape.c:59 mail/send.c:225 mh/mhn.c:2059 mimeview/mimeview.c:217
+#: mail/escape.c:59 mail/send.c:226 mh/mhn.c:2059 mimeview/mimeview.c:217
 #, c-format
 msgid "Cannot create header: %s"
 msgstr "Nie mona utworzy nagwka: %s"
@@ -1742,21 +1742,21 @@ msgstr "adne nagwki obecnie nie s zczane\n"
 msgid "Sender address is obtained from the envelope\n"
 msgstr "Pobranie adresu nadawcy z koperty wiadomoci\n"
 
-#: mail/send.c:73
+#: mail/send.c:74
 #, c-format
 msgid "Cannot create header list: %s"
 msgstr "Nie mona utworzy listy nagwkw: %s"
 
-#: mail/send.c:95
+#: mail/send.c:96
 #, c-format
 msgid "Invalid header: %s"
 msgstr "Bdny nagwek: %s"
 
-#: mail/send.c:308
+#: mail/send.c:309
 msgid "Cannot open temporary file"
 msgstr "Nie mona otworzy pliku tymczasowego"
 
-#: mail/send.c:337
+#: mail/send.c:338
 msgid ""
 "\n"
 "(Interrupt -- one more to kill letter)"
@@ -1764,41 +1764,41 @@ msgstr ""
 "\n"
 "(Przerwanie -- by skasowa wiadomo podaj go jeszcze raz)"
 
-#: mail/send.c:348
+#: mail/send.c:349
 msgid "Use \".\" to terminate letter."
 msgstr "Napisz \".\" eby zakoczy wiadomo."
 
-#: mail/send.c:349
+#: mail/send.c:350
 msgid "Use \"~.\" to terminate letter."
 msgstr "Napisz \"~.\" eby zakoczy wiadomo."
 
-#: mail/send.c:391
+#: mail/send.c:392
 #, c-format
 msgid "Unknown escape %s"
 msgstr "Nieznana dyrektywa ucieczki %s"
 
-#: mail/send.c:394
+#: mail/send.c:395
 msgid "Unfinished escape"
 msgstr "Niezakoczona dyrektywa ucieczki"
 
-#: mail/send.c:398
+#: mail/send.c:399
 msgid "Cannot parse escape sequence"
 msgstr "Nie mona przetworzy dyrektyw ucieczki"
 
-#: mail/send.c:423 mh/mh_init.c:668 mh/mh_list.c:264
+#: mail/send.c:424 mh/mh_init.c:669 mh/mh_list.c:264
 #, c-format
 msgid "Cannot open file %s: %s"
 msgstr "Nie mona otworzy pliku %s: %s"
 
-#: mail/send.c:484
+#: mail/send.c:485
 msgid "Null message body; hope that's ok\n"
 msgstr "Ciao wiadomoci puste; mam nadziej e to nie szkodzi\n"
 
-#: mail/send.c:578
+#: mail/send.c:579
 msgid "Variable sendmail not set: no mailer"
 msgstr "Zmienna `sendmail' nie jest ustawiona: brak programu pocztowego"
 
-#: mail/send.c:626
+#: mail/send.c:627
 #, c-format
 msgid "Piping %s failed"
 msgstr "Utworzenie potoku dla %s nie powiodo si"
@@ -2032,7 +2032,7 @@ msgstr ""
 msgid "Set name pattern for user-defined Scheme mail filters"
 msgstr "Wzorzec nazw plikw filtrw pocztowych w jzyku Scheme"
 
-#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:86
+#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:87
 #: mimeview/mimeview.c:46
 msgid "FLAGS"
 msgstr "OPCJE"
@@ -2045,7 +2045,7 @@ msgstr "Wcza odpluskwianie"
 msgid "Multiple --from options"
 msgstr "Wielokrotne wystpienie opcji --from"
 
-#: mail.local/main.c:215 sieve/sieve.c:208
+#: mail.local/main.c:215 sieve/sieve.c:209
 #, c-format
 msgid "%c is not a valid debug flag"
 msgstr "%c nie jest poprawn opcj odpluskwiania"
@@ -2095,7 +2095,7 @@ msgstr "Brak argumentw. Napisz --help eby otrzyma wicej informacji."
 msgid "Access to %s failed: %m"
 msgstr "access(%s) nie powid si: %m"
 
-#: mail.local/main.c:427 sieve/sieve.c:375
+#: mail.local/main.c:427 sieve/sieve.c:376
 #, c-format
 msgid "Cannot initialize sieve machine: %s"
 msgstr "Bd inicjalizacji maszyny sieve: %s"
@@ -2316,79 +2316,79 @@ msgstr "Wysanie wiadomoci nie powiodo si: %s"
 msgid "Closing mailer failed: %s"
 msgstr "Zamknicie przesyacza nie powiodo si: %s"
 
-#: mailbox/getopt.c:552 mailbox/getopt.c:571
+#: mailbox/getopt.c:551 mailbox/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opcja `%s' jest niejednoznaczna\n"
 
-#: mailbox/getopt.c:604 mailbox/getopt.c:608
+#: mailbox/getopt.c:603 mailbox/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opcja `--%s' nie moe mie argumentw\n"
 
-#: mailbox/getopt.c:617 mailbox/getopt.c:622
+#: mailbox/getopt.c:616 mailbox/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opcja `%c%s' nie moe mie argumentw\n"
 
-#: mailbox/getopt.c:668 mailbox/getopt.c:690 mailbox/getopt.c:1021
-#: mailbox/getopt.c:1043
+#: mailbox/getopt.c:667 mailbox/getopt.c:689 mailbox/getopt.c:1020
+#: mailbox/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opcja `%s' musi mie argument\n"
 
-#: mailbox/getopt.c:728 mailbox/getopt.c:731
+#: mailbox/getopt.c:727 mailbox/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: nieznana opcja `--%s'\n"
 
-#: mailbox/getopt.c:739 mailbox/getopt.c:742
+#: mailbox/getopt.c:738 mailbox/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: nieznana opcja `%c%s'\n"
 
-#: mailbox/getopt.c:797 mailbox/getopt.c:800
+#: mailbox/getopt.c:796 mailbox/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: niewaciwa opcja -- %c\n"
 
-#: mailbox/getopt.c:806 mailbox/getopt.c:809
+#: mailbox/getopt.c:805 mailbox/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: bdna opcja -- %c\n"
 
-#: mailbox/getopt.c:864 mailbox/getopt.c:883 mailbox/getopt.c:1096
-#: mailbox/getopt.c:1117
+#: mailbox/getopt.c:863 mailbox/getopt.c:882 mailbox/getopt.c:1095
+#: mailbox/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opcja musi mie argument -- %c\n"
 
-#: mailbox/getopt.c:936 mailbox/getopt.c:955
+#: mailbox/getopt.c:935 mailbox/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
 
-#: mailbox/getopt.c:979 mailbox/getopt.c:1000
+#: mailbox/getopt.c:978 mailbox/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcja `-W %s' nie moe mie argumentw\n"
 
-#: mailbox/argp-help.c:195
+#: mailbox/argp-help.c:194
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: parametr ARGP_HELP_FMT wymaga podania wartoci"
 
-#: mailbox/argp-help.c:204
+#: mailbox/argp-help.c:203
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Nieznany parametr ARGP_HELP_FMT"
 
-#: mailbox/argp-help.c:216
+#: mailbox/argp-help.c:215
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Bdne dane w ARGP_HELP_FMT: %s"
 
-#: mailbox/argp-help.c:1195
+#: mailbox/argp-help.c:1194
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
@@ -2396,66 +2396,66 @@ msgstr ""
 "Argumenty obowizkowe lub opcjonalne dla dugich opcji s rwnie "
 "obowizkowe lub opcjonalne dla odpowiednich krtkich opcji."
 
-#: mailbox/argp-help.c:1582
+#: mailbox/argp-help.c:1581
 msgid "Usage:"
 msgstr "Skadnia:"
 
-#: mailbox/argp-help.c:1586
+#: mailbox/argp-help.c:1585
 msgid "  or: "
 msgstr "  lub: "
 
-#: mailbox/argp-help.c:1598
+#: mailbox/argp-help.c:1597
 msgid " [OPTION...]"
 msgstr " [OPCJA...]"
 
-#: mailbox/argp-help.c:1625
+#: mailbox/argp-help.c:1624
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Napisz `%s --help' lub `%s --usage' by uzyska wicej informacji.\n"
 
-#: mailbox/argp-help.c:1653
+#: mailbox/argp-help.c:1652
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Prosimy zgasza bdy na adres %s.\n"
 
-#: mailbox/argp-help.c:1873
+#: mailbox/argp-help.c:1872
 msgid "Unknown system error"
 msgstr "Nieznany bd systemowy"
 
-#: mailbox/argp-parse.c:83
+#: mailbox/argp-parse.c:82
 msgid "Give this help list"
 msgstr "Wywietla ten tekst pomocy"
 
-#: mailbox/argp-parse.c:84
+#: mailbox/argp-parse.c:83
 msgid "Give a short usage message"
 msgstr "Wywietla krtkie informacje o skadni polecenia"
 
-#: mailbox/argp-parse.c:85
+#: mailbox/argp-parse.c:84
 msgid "Set the program name"
 msgstr "Ustawia nazw programu"
 
-#: mailbox/argp-parse.c:87
+#: mailbox/argp-parse.c:86
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "Czeka przez SEK sekund (domylnie 3600)"
 
-#: mailbox/argp-parse.c:148
+#: mailbox/argp-parse.c:147
 msgid "Print program version"
 msgstr "Wywietla wersj programu"
 
-#: mailbox/argp-parse.c:164
+#: mailbox/argp-parse.c:163
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(BD PROGRAMU) Nieznana wersja!?"
 
-#: mailbox/argp-parse.c:620
+#: mailbox/argp-parse.c:619
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: za duo argumentw\n"
 
-#: mailbox/argp-parse.c:763
+#: mailbox/argp-parse.c:762
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(BD PROGRAMU) Opcja powinna zosta rozpoznana!?"
 
-#: mailbox/file_stream.c:479
+#: mailbox/file_stream.c:480
 #, c-format
 msgid "%s must be a plain file with one link\n"
 msgstr "%s musi by zwykym plikiem z jednym dowizaniem\n"
@@ -2479,24 +2479,24 @@ msgstr "Bd iconv(): %s"
 msgid "Stream is closed"
 msgstr "Strumie jest zamknity"
 
-#: mailbox/message.c:1092
-#, c-format
-msgid "mailbox_create_default (%s) failed: %s\n"
+#: mailbox/message.c:1093
+#, fuzzy, c-format
+msgid "mu_mailbox_create_default (%s) failed: %s\n"
 msgstr "mailbox_create_default (%s) nie powid si: %s\n"
 
-#: mailbox/message.c:1123
-#, c-format
-msgid "mailbox_open (%s) failed: %s\n"
+#: mailbox/message.c:1124
+#, fuzzy, c-format
+msgid "mu_mailbox_open (%s) failed: %s\n"
 msgstr "mailbox_open (%s) nie powid si: %s\n"
 
-#: mailbox/message.c:1131
-#, c-format
-msgid "mailbox_append_message (%s) failed: %s\n"
+#: mailbox/message.c:1132
+#, fuzzy, c-format
+msgid "mu_mailbox_append_message (%s) failed: %s\n"
 msgstr "mailbox_append_message (%s) nie powid si: %s\n"
 
-#: mailbox/message.c:1143
-#, c-format
-msgid "mailbox_close (%s) failed: %s\n"
+#: mailbox/message.c:1144
+#, fuzzy, c-format
+msgid "mu_mailbox_close (%s) failed: %s\n"
 msgstr "mailbox_append_message (%s) nie powid si: %s\n"
 
 #: mailbox/mu_argp.c:60
@@ -2521,7 +2521,7 @@ msgstr ""
 "Domylne opcje blokowania (E=program zewntrzny, R=ponowienie prb, T=czas, "
 "P=pid)"
 
-#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:76
+#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:77
 msgid "SECONDS"
 msgstr "SEKUNDY"
 
@@ -2954,15 +2954,15 @@ msgstr ""
 msgid "[msg [msg...]]"
 msgstr "[wiadomo [wiadomo...]]"
 
-#: mh/anno.c:33 mh/folder.c:49 mh/folder.c:59 mh/forw.c:37 mh/forw.c:43
-#: mh/inc.c:34 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
+#: mh/anno.c:33 mh/folder.c:50 mh/folder.c:60 mh/forw.c:37 mh/forw.c:43
+#: mh/inc.c:35 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
 #: mh/mhpath.c:32 mh/pick.c:39 mh/refile.c:38 mh/refile.c:47 mh/repl.c:40
-#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:39 mh/send.c:42
+#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:40 mh/send.c:42
 #: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:43
 msgid "FOLDER"
 msgstr "KATALOG"
 
-#: mh/anno.c:34 mh/folder.c:60 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
+#: mh/anno.c:34 mh/folder.c:61 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
 #: mh/mhn.c:38 mh/mhpath.c:33 mh/pick.c:40 mh/refile.c:39 mh/repl.c:50
 #: mh/rmm.c:33
 msgid "Specify folder to operate upon"
@@ -2989,10 +2989,10 @@ msgstr "Dodaje podane POLE do nagwkw wiadomoci"
 msgid "Field value for the component"
 msgstr "Zawarto pola nagwka"
 
-#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:80 mh/forw.c:75 mh/inc.c:55
+#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:81 mh/forw.c:75 mh/inc.c:56
 #: mh/install-mh.c:33 mh/mark.c:47 mh/mhl.c:53 mh/mhn.c:90 mh/mhpath.c:35
 #: mh/pick.c:96 mh/refile.c:52 mh/repl.c:72 mh/rmf.c:50 mh/rmm.c:35
-#: mh/scan.c:59 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
+#: mh/scan.c:60 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
 msgid "Display software license"
 msgstr "Wywietla licencj"
 
@@ -3007,16 +3007,16 @@ msgstr "Nazwa nagwka: "
 msgid "GNU MH fmtcheckUse -help to obtain the list of traditional MH options."
 msgstr "GNU MH fmtcheckUyj -help by otrzyma list opcji MH tradycyjnych."
 
-#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:44 mh/mhl.c:43 mh/repl.c:58
-#: mh/scan.c:45
+#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:45 mh/mhl.c:43 mh/repl.c:58
+#: mh/scan.c:46
 msgid "Read format from given file"
 msgstr "Odczytaj format z podanego pliku"
 
-#: mh/fmtcheck.c:34 mh/inc.c:45 mh/scan.c:46
+#: mh/fmtcheck.c:34 mh/inc.c:46 mh/scan.c:47
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: mh/fmtcheck.c:35 mh/inc.c:46 mh/scan.c:47
+#: mh/fmtcheck.c:35 mh/inc.c:47 mh/scan.c:48
 msgid "Use this format string"
 msgstr "Uywa podanego acucha formatu"
 
@@ -3032,33 +3032,33 @@ msgstr "Wcza wyjcie odpluskwiania analizatora skadni"
 msgid "Format string not specified"
 msgstr "Nie podany acuch formatu"
 
-#: mh/fmtcheck.c:115 mh/inc.c:191 mh/repl.c:373 mh/scan.c:188
+#: mh/fmtcheck.c:115 mh/inc.c:192 mh/repl.c:373 mh/scan.c:189
 msgid "Bad format string"
 msgstr "Niepoprawny format"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/folder.c:39
+#: mh/folder.c:40
 msgid "GNU MH folderUse -help to obtain the list of traditional MH options."
 msgstr "GNU MH folderUyj -help by otrzyma list opcji MH tradycyjnych."
 
-#: mh/folder.c:41
+#: mh/folder.c:42
 msgid "[action] [msg]"
 msgstr "[akcja] [wiadomo]"
 
-#: mh/folder.c:44 pop3d/popauth.c:68
+#: mh/folder.c:45 pop3d/popauth.c:68
 msgid "Actions are:"
 msgstr "Akcje s:"
 
-#: mh/folder.c:46
+#: mh/folder.c:47
 msgid "List the folders (default)"
 msgstr "Wywietla wszystkie katalogi (domylnie)"
 
-#: mh/folder.c:48
+#: mh/folder.c:49
 msgid "List the contents of the folder stack"
 msgstr "Wywietla zawarto stosu katalogw"
 
-#: mh/folder.c:50
+#: mh/folder.c:51
 msgid ""
 "Push the folder on the folder stack. If FOLDER is specified, it is pushed. "
 "Otherwise, if a folder is given in the command line (via + or --folder), it "
@@ -3069,44 +3069,44 @@ msgstr ""
 "w wierszu polecenia (przez + lub --folder). Jeli ten rwnie nie zosta "
 "podany, zamienia miejscami katalog z szczytu stosu i katalog biecy."
 
-#: mh/folder.c:55
+#: mh/folder.c:56
 msgid "Pop the folder off the folder stack"
 msgstr "Zdejmuje katalog ze stosu"
 
-#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:80
+#: mh/folder.c:58 mh/mh_whatnow.c:153 pop3d/popauth.c:80
 msgid "Options are:"
 msgstr "Opcje s:"
 
-#: mh/folder.c:62
+#: mh/folder.c:63
 msgid "List all folders"
 msgstr "Wywietla wszystkie katalogi"
 
-#: mh/folder.c:64
+#: mh/folder.c:65
 msgid "Create non-existing folders"
 msgstr "Tworzy nieistniejce katalogi"
 
-#: mh/folder.c:67
+#: mh/folder.c:68
 msgid "List only the folder names"
 msgstr "Wywietla tylko nazwy katalogw"
 
-#: mh/folder.c:70
+#: mh/folder.c:71
 msgid "Print the header line"
 msgstr "Wywietla linie nagwka"
 
-#: mh/folder.c:73
+#: mh/folder.c:74
 msgid "Scan folders recursively"
 msgstr "Rekursywnie przeszukuje katalogi"
 
-#: mh/folder.c:76
+#: mh/folder.c:77
 msgid "Output the total statistics"
 msgstr "Wywietla czn statystyk"
 
-#: mh/folder.c:309 mh/rmf.c:128
+#: mh/folder.c:310 mh/rmf.c:128
 #, c-format
 msgid "Cannot scan folder %s: %s"
 msgstr "Nie mona przeszuka katalogu %s: %s"
 
-#: mh/folder.c:382
+#: mh/folder.c:383
 #, c-format
 msgid " has %4lu message  (%4lu-%4lu)"
 msgid_plural " has %4lu messages (%4lu-%4lu)"
@@ -3114,17 +3114,17 @@ msgstr[0] " zawiera %4lu wiadomo  (%4lu-%4lu)"
 msgstr[1] " zawiera %4lu wiadomoci (%4lu-%4lu)"
 msgstr[2] " zawiera %4lu wiadomoci (%4lu-%4lu)"
 
-#: mh/folder.c:393
+#: mh/folder.c:394
 #, c-format
 msgid " has no messages"
 msgstr " nie zawiera wiadomoci"
 
-#: mh/folder.c:402
+#: mh/folder.c:403
 #, c-format
 msgid "(others)"
 msgstr "(inne)"
 
-#: mh/folder.c:450
+#: mh/folder.c:451
 #, c-format
 msgid ""
 "Folder                  # of messages     (  range  )  cur msg   (other "
@@ -3133,11 +3133,11 @@ msgstr ""
 "Katalog                   ilo wiadomoci      (  zakres )  wdm.bie. "
 "(inne)\n"
 
-#: mh/folder.c:456
+#: mh/folder.c:457
 msgid "TOTAL"
 msgstr "CZNIE"
 
-#: mh/folder.c:457
+#: mh/folder.c:458
 #, c-format
 msgid "%4lu message  "
 msgid_plural "%4lu messages "
@@ -3145,7 +3145,7 @@ msgstr[0] "%4lu wiadomo  "
 msgstr[1] "%4lu wiadomoci "
 msgstr[2] "%4lu wiadomoci "
 
-#: mh/folder.c:460
+#: mh/folder.c:461
 #, c-format
 msgid "in %4lu folder"
 msgid_plural "in %4lu folders"
@@ -3220,7 +3220,7 @@ msgstr "Odwouje dziaanie ostatniej opcji --filter"
 msgid "Use MIME encapsulation"
 msgstr "Uywa kapsuowanie MIME"
 
-#: mh/forw.c:65 mh/inc.c:51 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:51
+#: mh/forw.c:65 mh/inc.c:52 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:52
 msgid "Set output width"
 msgstr "Ustawia szeroko wyjcia"
 
@@ -3237,15 +3237,15 @@ msgstr ""
 msgid "Use draft file preserved after the last session"
 msgstr "Uywa szkicu zachowanego w ostatniej sesji"
 
-#: mh/forw.c:147 mh/inc.c:137 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:124
+#: mh/forw.c:147 mh/inc.c:138 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:125
 msgid "Invalid width"
 msgstr "Niepoprawna szeroko"
 
-#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:138
+#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:139
 msgid "Option is not yet implemented"
 msgstr "Opcja jeszcze nie jest zaimplementowana"
 
-#: mh/forw.c:285 mh/mh_init.c:536
+#: mh/forw.c:285 mh/mh_init.c:537
 #, c-format
 msgid "Cannot open output file `%s': %s"
 msgstr "Nie mona otworzy pliku wyjciowego `%s': %s"
@@ -3268,62 +3268,62 @@ msgstr "Koniec wiadomoci przekazanych"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/inc.c:26
+#: mh/inc.c:27
 msgid "GNU MH incUse -help to obtain the list of traditional MH options."
 msgstr "GNU MH incUyj -help by otrzyma list opcji MH tradycyjnych."
 
-#: mh/inc.c:28 mh/rmf.c:37
+#: mh/inc.c:29 mh/rmf.c:37
 msgid "[+folder]"
 msgstr "[+katalog]"
 
-#: mh/inc.c:33
+#: mh/inc.c:34
 msgid "Incorporate mail from named file"
 msgstr "Docza poczt z podanego pliku"
 
-#: mh/inc.c:35
+#: mh/inc.c:36
 msgid "Specify folder to incorporate mail to"
 msgstr "Docza poczt do podanego katalogu"
 
-#: mh/inc.c:37
+#: mh/inc.c:38
 msgid "Enable audit"
 msgstr "Wcza audyt"
 
-#: mh/inc.c:39
+#: mh/inc.c:40
 msgid "Disable audit"
 msgstr "Wycza audyt"
 
-#: mh/inc.c:41
+#: mh/inc.c:42
 msgid "Mark first incorporated message as current (default)"
 msgstr "Zaznacza pierwsz dodan wiadomo jako biec (domylnie)"
 
-#: mh/inc.c:48
+#: mh/inc.c:49
 msgid "Truncate source mailbox after incorporating (default)"
 msgstr "Obetnij skrzynk rdow po doczaniu (domylnie)"
 
-#: mh/inc.c:53 mh/mhn.c:88
+#: mh/inc.c:54 mh/mhn.c:88
 msgid "Be quiet"
 msgstr "Nie wywietla nagwkw"
 
-#: mh/inc.c:200
+#: mh/inc.c:201
 msgid "Cannot create default mailbox"
 msgstr "Nie mona utworzy skrzynki domylnej"
 
-#: mh/inc.c:226
+#: mh/inc.c:227
 #, c-format
 msgid "Cannot read input mailbox: %s"
 msgstr "Nie mona czyta ze skrzynki wejciowej: %s"
 
-#: mh/inc.c:233
+#: mh/inc.c:234
 #, c-format
 msgid "Cannot read output mailbox: %s"
 msgstr "Nie mona czyta ze skrzynki wyjciowej: %s"
 
-#: mh/inc.c:254
+#: mh/inc.c:255
 #, c-format
 msgid "%d: cannot get message: %s"
 msgstr "%d: nie mona pobra wiadomoci: %s"
 
-#: mh/inc.c:261
+#: mh/inc.c:262
 #, c-format
 msgid "%d: error appending message: %s"
 msgstr "%d: bd przy dodaniu wiadomoci: %s"
@@ -3400,12 +3400,12 @@ msgstr ""
 "To jest %s\n"
 "\n"
 
-#: mh/mh_ctx.c:92
+#: mh/mh_ctx.c:93
 #, c-format
 msgid "Cannot open context file %s: %s"
 msgstr "Nie mona utworzy pliku kontekstu %s: %s"
 
-#: mh/mh_ctx.c:142
+#: mh/mh_ctx.c:143
 #, c-format
 msgid "Cannot create context %s: %s"
 msgstr "Nie mona utworzy kontekstu %s: %s"
@@ -3433,17 +3433,17 @@ msgstr "Brak argumentu do %s"
 msgid "Extra arguments to %s"
 msgstr "Dodatkowe argumenty do %s"
 
-#: mh/mh_format.c:603
+#: mh/mh_format.c:604
 #, c-format
 msgid "INTERNAL ERROR: Unknown opcode: %x"
 msgstr "Nieznany kod operacji: %x (prosz o zgoszenie)"
 
 #. TRANSLATORS: Do not translate the word 'format'!
-#: mh/mh_format.c:946 mh/mh_format.c:958
+#: mh/mh_format.c:947 mh/mh_format.c:959
 msgid "format: divide by zero"
 msgstr "format: dzielenie przez zero"
 
-#: mh/mh_format.c:1874
+#: mh/mh_format.c:1875
 msgid "Invalid recipient mask"
 msgstr "Niepoprawna maska odbiorcy"
 
@@ -3473,73 +3473,73 @@ msgstr ""
 "Prosimy korzysta z dugich opcji GNU.\n"
 "Uruchom %s --help eby otrzyma wicej informacji.\n"
 
-#: mh/mh_init.c:69
+#: mh/mh_init.c:70
 #, c-format
 msgid "Cannot stat format file %s: %s"
 msgstr "stat(%s) nie powid si: %s"
 
-#: mh/mh_init.c:76
+#: mh/mh_init.c:77
 #, c-format
 msgid "Cannot open format file %s: %s"
 msgstr "Nie mona otworzy pliku formatu %s: %s"
 
-#: mh/mh_init.c:206
+#: mh/mh_init.c:207
 #, c-format
 msgid "Create folder \"%s\""
 msgstr "Utworzy katalog \"%s\""
 
-#: mh/mh_init.c:214
+#: mh/mh_init.c:215
 #, c-format
 msgid "Cannot create directory %s: %s"
 msgstr "Nie mona utworzy katalogu %s: %s"
 
 #. TRANSLATORS: See msgids "nN" and "yY".
-#: mh/mh_init.c:267
+#: mh/mh_init.c:268
 #, c-format
 msgid "Please answer yes or no: "
 msgstr "Prosz odpowiedzie 'yes' czy 'no': "
 
-#: mh/mh_init.c:326
+#: mh/mh_init.c:327
 #, c-format
 msgid "Cannot open audit file %s: %s"
 msgstr "Nie mona otworzy pliku audytu %s: %s"
 
-#: mh/mh_init.c:457 mh/mh_msgset.c:165
+#: mh/mh_init.c:458 mh/mh_msgset.c:165
 #, c-format
 msgid "Cannot get message %d: %s"
 msgstr "Nie mona przeczyta wiadomoci %d: %s"
 
-#: mh/mh_init.c:475
+#: mh/mh_init.c:476
 #, c-format
 msgid "Cannot split line %s"
 msgstr "Nie mona rozdzieli acucha %s"
 
-#: mh/mh_init.c:527
+#: mh/mh_init.c:528
 #, c-format
 msgid "Cannot open input file `%s': %s"
 msgstr "Nie mona otworzy pliku wejciowego `%s': %s"
 
-#: mh/mh_init.c:550
+#: mh/mh_init.c:551
 #, c-format
 msgid "Write error on `%s': %s"
 msgstr "Bd zapisu do `%s': %s"
 
-#: mh/mh_init.c:579
+#: mh/mh_init.c:580
 #, c-format
 msgid "Cannot stat file %s: %s"
 msgstr "stat (%s) nie powid si: %s"
 
-#: mh/mh_init.c:585 mh/mhn.c:2267
+#: mh/mh_init.c:586 mh/mhn.c:2267
 #, c-format
 msgid "Cannot create input stream (file %s): %s"
 msgstr "Nie mona utworzy strumienia wejciowego (plik %s): %s"
 
-#: mh/mh_init.c:592 mh/mhn.c:2274
+#: mh/mh_init.c:593 mh/mhn.c:2274
 #, c-format
 msgid "Cannot open input stream (file %s): %s"
 msgstr "Otwarcie strumienia wejciowego (plik %s) niemoliwe: %s"
 
-#: mh/mh_init.c:605
+#: mh/mh_init.c:606
 #, c-format
 msgid ""
 "Prior to using MH, it is necessary to have a file in your login\n"
@@ -3553,39 +3553,39 @@ msgstr ""
 "elementem danych obowizkowym jest cieka do katalogu skrzynek MH. "
 "Proponowana jest cieka %s...\n"
 
-#: mh/mh_init.c:628
+#: mh/mh_init.c:629
 msgid "Do you need help"
 msgstr "Potrzebujesz pomocy"
 
-#: mh/mh_init.c:631
+#: mh/mh_init.c:632
 #, c-format
 msgid "Do you want the standard MH path \"%s\""
 msgstr "Uy cieki standardowej \"%s\""
 
-#: mh/mh_init.c:636
+#: mh/mh_init.c:637
 msgid "Do you want a path below your login directory"
 msgstr "Uy cieki pod katalogiem domowym"
 
-#: mh/mh_init.c:638
+#: mh/mh_init.c:639
 #, c-format
 msgid "What is the path? "
 msgstr "Podaj ciek: "
 
-#: mh/mh_init.c:640
+#: mh/mh_init.c:641
 #, c-format
 msgid "What is the full path? "
 msgstr "Podaj pen ciek: "
 
-#: mh/mh_init.c:699
+#: mh/mh_init.c:700
 #, c-format
 msgid "I'm going to create the standard MH path for you.\n"
 msgstr "Utworzenie standardowej cieki MH.\n"
 
-#: mh/mh_init.c:710
+#: mh/mh_init.c:711
 msgid "You already have an MH profile, use an editor to modify it"
 msgstr "Ju masz profil MH, uyj edytora by go zmodyfikowa"
 
-#: mh/mh_init.c:715
+#: mh/mh_init.c:716
 #, c-format
 msgid ""
 "You already have file %s which is not a regular file or a symbolic link.\n"
@@ -4089,7 +4089,7 @@ msgstr "dodatkowe argumenty"
 msgid "GNU MH mhpathUse -help to obtain the list of traditional MH options."
 msgstr "GNU MH mhpathUyj -help by otrzyma list opcji MH tradycyjnych."
 
-#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:35
+#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:36
 msgid "[+folder] [msgs]"
 msgstr "[+katalog] [wiadomoci]"
 
@@ -4406,36 +4406,36 @@ msgstr "GNU MH rmfUyj -help by otrzyma list opcji MH tradycyjnych."
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/scan.c:33
+#: mh/scan.c:34
 msgid "GNU MH scanUse -help to obtain the list of traditional MH options."
 msgstr "GNU MH scanUyj -help by otrzyma list opcji MH tradycyjnych."
 
-#: mh/scan.c:40
+#: mh/scan.c:41
 msgid "Specify folder to scan"
 msgstr "Przeszukuje podany katalog"
 
-#: mh/scan.c:42
+#: mh/scan.c:43
 msgid "Clear screen after displaying the list"
 msgstr "Wyczyszcza ekran po wywietlaniu listy"
 
-#: mh/scan.c:49
+#: mh/scan.c:50
 msgid "Display header"
 msgstr "Wywietla lini nagwkow"
 
-#: mh/scan.c:53
+#: mh/scan.c:54
 msgid "List messages in reverse order"
 msgstr "Wywietla wiadomoci w odwrconym porzdku"
 
-#: mh/scan.c:56
+#: mh/scan.c:57
 msgid "[Not yet implemented]"
 msgstr "[nie jest zaimplementowana]"
 
-#: mh/scan.c:228
+#: mh/scan.c:229
 #, c-format
 msgid "no messages in %s"
 msgstr "brak wiadomoci w %s"
 
-#: mh/scan.c:249
+#: mh/scan.c:250
 #, c-format
 msgid "Folder %s  %s\n"
 msgstr "Katalog %s  %s\n"
@@ -4517,7 +4517,7 @@ msgstr "Wcza nadzorowanie za dorczaniem poczty"
 msgid "* Make header fields no longer than NUMBER columns"
 msgstr "* Ustala ograniczenie szerokoci pl nagwkw na LICZB kolumn"
 
-#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:134 pop3d/pop3d.c:148
+#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:135 pop3d/pop3d.c:149
 msgid "Invalid number"
 msgstr "Niepoprawny numer"
 
@@ -4636,15 +4636,18 @@ msgid "Cannot lock"
 msgstr "Nie mona zablokowa"
 
 #: movemail/movemail.c:169
-msgid "mailbox_get_folder failed"
+#, fuzzy
+msgid "mu_mailbox_get_folder failed"
 msgstr "mailbox_get_folder nie powioda si"
 
 #: movemail/movemail.c:172
-msgid "folder_get_authority failed"
+#, fuzzy
+msgid "mu_folder_get_authority failed"
 msgstr "folder_get_authority nie powioda si"
 
 #: movemail/movemail.c:175
-msgid "authority_set_ticket failed"
+#, fuzzy
+msgid "mu_authority_set_ticket failed"
 msgstr "authority_set_ticket nie powioda si"
 
 #: movemail/movemail.c:202
@@ -4746,63 +4749,63 @@ msgstr "niespodziewany koniec pliku w wejciu"
 msgid "Locking mailbox `%s' failed: %s"
 msgstr "Otwarcie przesyacza `%s' nie powiodo si: %s"
 
-#: pop3d/pop3d.c:64
+#: pop3d/pop3d.c:65
 msgid "GNU pop3d -- the POP3 daemon"
 msgstr "GNU pop3d -- demon POP3"
 
-#: pop3d/pop3d.c:74
+#: pop3d/pop3d.c:75
 msgid "Undelete all messages on startup"
 msgstr "Po rozpoczciu sesji, odzyska wiadomoci zaznaczone do skasowania"
 
-#: pop3d/pop3d.c:77
+#: pop3d/pop3d.c:78
 msgid "Allowed delay between the two successive logins"
 msgstr ""
 "Najmniejszy dopuszczalny czas midzy kocem poprzedniej a pocztkiem "
 "nastpnej sesji"
 
-#: pop3d/pop3d.c:78
+#: pop3d/pop3d.c:79
 msgid "FILENAME"
 msgstr "PLIK"
 
-#: pop3d/pop3d.c:79
+#: pop3d/pop3d.c:80
 msgid "Name of login statistics file"
 msgstr "Nazwa pliku statystyki loginw"
 
-#: pop3d/pop3d.c:81
+#: pop3d/pop3d.c:82
 msgid "DAYS"
 msgstr "LICZBA-DNI"
 
-#: pop3d/pop3d.c:82
+#: pop3d/pop3d.c:83
 msgid "Expire read messages after the given number of days"
 msgstr "Dopasowanie wiadomoci z dat po podanej"
 
-#: pop3d/pop3d.c:84
+#: pop3d/pop3d.c:85
 msgid "Delete expired messages upon closing the mailbox"
 msgstr ""
 "Po zamkniciu skrzynki kasuje wiadomoci, ktre przekroczyy dat wanoci"
 
-#: pop3d/pop3d.c:87
+#: pop3d/pop3d.c:88
 msgid "Always require STLS before entering authentication phase"
 msgstr "Wymaga uycia STLS przed przejciem do fazy uwierzytelniania"
 
-#: pop3d/pop3d.c:277
+#: pop3d/pop3d.c:278
 msgid "Failed to become a daemon:"
 msgstr "Uruchomienie w trybie demona nie powiodo si"
 
-#: pop3d/pop3d.c:313
+#: pop3d/pop3d.c:314
 #, c-format
 msgid "connect from %s"
 msgstr "poczenie z %s"
 
-#: pop3d/pop3d.c:437
+#: pop3d/pop3d.c:438
 msgid "Session terminated"
 msgstr "Sesja zakoczona"
 
-#: pop3d/pop3d.c:523
+#: pop3d/pop3d.c:524
 msgid "GNU pop3d started"
 msgstr "GNU pop3d uruchomiony"
 
-#: pop3d/pop3d.c:530
+#: pop3d/pop3d.c:531
 #, c-format
 msgid "too many children (%lu)"
 msgstr "za duo procesw potomnych (%lu)"
@@ -5051,7 +5054,7 @@ msgstr "Nie mona otworzy skrzynki `%s': %s\n"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: sieve/sieve.c:53
+#: sieve/sieve.c:54
 msgid ""
 "GNU sieve -- a mail filtering tool\n"
 "Debug flags:\n"
@@ -5068,153 +5071,153 @@ msgstr ""
 "  t - ledzenie wykonania testw i akcji sieve (MU_SIEVE_DEBUG_TRACE)\n"
 "  i - ledzenie wykonania kodu sieve (MU_SIEVE_DEBUG_INSTR)\n"
 
-#: sieve/sieve.c:69
+#: sieve/sieve.c:70
 msgid "Do not execute any actions, just print what would be done"
 msgstr "Nie wykona adnych akcji, wywietla tylko co miao si zrobi"
 
-#: sieve/sieve.c:72
+#: sieve/sieve.c:73
 msgid "Keep on going if execution fails on a message"
 msgstr ""
 "Nie przerywa pracy jeli operacja nie powioda si dla ktrej z wiadomoci"
 
-#: sieve/sieve.c:75
+#: sieve/sieve.c:76
 msgid "Compile script and exit"
 msgstr "Kompiluje skrypt i wychodzi"
 
-#: sieve/sieve.c:78
+#: sieve/sieve.c:79
 msgid "Compile script, dump disassembled sieve code to terminal and exit"
 msgstr "Kompiluje skrypt, wywietla wydruk kodu i wychodzi"
 
-#: sieve/sieve.c:80
+#: sieve/sieve.c:81
 msgid "MBOX"
 msgstr "SKRZYNKA"
 
-#: sieve/sieve.c:81
+#: sieve/sieve.c:82
 msgid "Mailbox to sieve (defaults to user's mail spool)"
 msgstr "Skrzynka do przesiewania"
 
-#: sieve/sieve.c:83
+#: sieve/sieve.c:84
 msgid "TICKET"
 msgstr "BILET"
 
-#: sieve/sieve.c:84
+#: sieve/sieve.c:85
 msgid "Ticket file for mailbox authentication"
 msgstr "Plik legitymacyjny do uwierzytelnienia skrzynki"
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "Debug flags (defaults to \""
 msgstr "Opcje odpluskwiania (domylnie \""
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "\")"
 msgstr "\")"
 
-#: sieve/sieve.c:90
+#: sieve/sieve.c:91
 msgid "Log all actions"
 msgstr "Rejestruj wszystkie akcje"
 
-#: sieve/sieve.c:93
+#: sieve/sieve.c:94
 msgid "Print source location along with action logs (default)"
 msgstr ""
 "Rejestruje miejsce w pliku rdowym, ktre spowodowao wykonanie akcji "
 "(domylnie)"
 
-#: sieve/sieve.c:96
+#: sieve/sieve.c:97
 msgid "Override user email address"
 msgstr "Nadpisuje adres uytkownika"
 
-#: sieve/sieve.c:149
+#: sieve/sieve.c:150
 #, c-format
 msgid "Invalid email: %s"
 msgstr "Niewaciwy adres: %s"
 
-#: sieve/sieve.c:170
+#: sieve/sieve.c:171
 msgid "Only one MBOX can be specified"
 msgstr "Moe by podana tylko jedna skrzynka"
 
-#: sieve/sieve.c:224
+#: sieve/sieve.c:225
 msgid "Only one SCRIPT can be specified"
 msgstr "Moe by podany tylko jeden SKRYPT"
 
-#: sieve/sieve.c:229
+#: sieve/sieve.c:230
 msgid "SCRIPT must be specified"
 msgstr "SKRYPT ma by podany"
 
-#: sieve/sieve.c:242
+#: sieve/sieve.c:243
 msgid "SCRIPT"
 msgstr "SKRYPT"
 
-#: sieve/sieve.c:300 sieve/sieve.c:325
+#: sieve/sieve.c:301 sieve/sieve.c:326
 #, c-format
 msgid "%s:%lu: %s on msg uid %lu"
 msgstr "%s:%lu: %s nad wiadomoci z UID-em %lu"
 
-#: sieve/sieve.c:304 sieve/sieve.c:329
+#: sieve/sieve.c:305 sieve/sieve.c:330
 #, c-format
 msgid "%s on msg uid %lu"
 msgstr "%s nad wiadomoci z UID-em %lu"
 
-#: sieve/sieve.c:415
+#: sieve/sieve.c:416
 #, c-format
 msgid "ticket_get failed: %s"
 msgstr "ticket_get nie powid si: %s"
 
-#: sieve/sieve.c:421
-#, c-format
-msgid "wicket_create `%s' failed: %s"
+#: sieve/sieve.c:422
+#, fuzzy, c-format
+msgid "mu_wicket_create `%s' failed: %s"
 msgstr "wicket_create `%s' nie powid si: %s"
 
-#: sieve/sieve.c:434
+#: sieve/sieve.c:435
 #, c-format
 msgid "mu_debug_create failed: %s"
 msgstr "mu_debug_create nie powid si: %s"
 
-#: sieve/sieve.c:439
+#: sieve/sieve.c:440
 #, c-format
 msgid "mu_debug_set_level failed: %s"
 msgstr "mu_debug_set_level nie powid si: %s"
 
-#: sieve/sieve.c:445
+#: sieve/sieve.c:446
 #, c-format
 msgid "mu_debug_set_print failed: %s"
 msgstr "mu_debug_set_print nie powid si: %s"
 
-#: sieve/sieve.c:467
-#, c-format
-msgid "mailbox_set_debug failed: %s"
+#: sieve/sieve.c:468
+#, fuzzy, c-format
+msgid "mu_mailbox_set_debug failed: %s"
 msgstr "mailbox_set_debug nie powid si: %s"
 
-#: sieve/sieve.c:478
-#, c-format
-msgid "mailbox_get_folder failed: %s"
+#: sieve/sieve.c:479
+#, fuzzy, c-format
+msgid "mu_mailbox_get_folder failed: %s"
 msgstr "mailbox_get_folder nie powid si: %s"
 
-#: sieve/sieve.c:485
-#, c-format
-msgid "folder_get_authority failed: %s"
+#: sieve/sieve.c:486
+#, fuzzy, c-format
+msgid "mu_folder_get_authority failed: %s"
 msgstr "folder_get_authority nie powid si: %s"
 
-#: sieve/sieve.c:493
-#, c-format
-msgid "authority_set_ticket failed: %s"
+#: sieve/sieve.c:494
+#, fuzzy, c-format
+msgid "mu_authority_set_ticket failed: %s"
 msgstr "authority_set_ticket nie powid si: %s"
 
-#: sieve/sieve.c:508
+#: sieve/sieve.c:509
 #, c-format
 msgid "Opening mailbox `%s' failed: %s"
 msgstr "Otwarcie przesyacza '%s' nie powiodo si: %s"
 
-#: sieve/sieve.c:511
+#: sieve/sieve.c:512
 #, c-format
 msgid "Opening default mailbox failed: %s"
 msgstr "Otwarcie skrzynki domylnej nie powiodo si: %s"
 
-#: sieve/sieve.c:532
+#: sieve/sieve.c:533
 #, c-format
 msgid "Expunge on mailbox `%s' failed: %s"
 msgstr "Czyszczenie skrzynki `%s' nie powiodo si: %s"
 
-#: sieve/sieve.c:535
+#: sieve/sieve.c:536
 #, c-format
 msgid "Expunge on default mailbox failed: %s"
 msgstr "Czyszczenie skrzynki domylnej nie powiodo si: %s"

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mailutils 0.4\n"
 "Report-Msgid-Bugs-To: bug-mailutils@gnu.org\n"
-"POT-Creation-Date: 2005-08-16 13:23+0300\n"
+"POT-Creation-Date: 2005-08-26 17:10+0300\n"
 "PO-Revision-Date: 2003-12-13 20:41+0200\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -57,7 +57,7 @@ msgstr ""
 "stare zero dac toate opiunile specificate sunt definite. n caz contrar, "
 "starea de ieire este 1."
 
-#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:569
+#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:570
 msgid "Too many arguments"
 msgstr "Prea multe argumente"
 
@@ -118,8 +118,8 @@ msgid "Name of the database to connect to"
 msgstr "Nume al bazei de date la care ne conectm"
 
 #: auth/sql.c:201 mailbox/mu_argp.c:80 mailbox/mu_argp.c:115
-#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
-#: mh/repl.c:65 mh/scan.c:50 mh/send.c:75
+#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:51 mh/mhl.c:44 mh/mhl.c:46
+#: mh/repl.c:65 mh/scan.c:51 mh/send.c:75
 msgid "NUMBER"
 msgstr "NUMR"
 
@@ -165,8 +165,8 @@ msgstr "Opiuni de criptare(encryption)"
 #: auth/tls.c:59 auth/tls.c:61 auth/tls.c:63 comsat/comsat.c:59
 #: dotlock/dotlock.c:43 frm/from.c:32 mail.local/main.c:83
 #: mailbox/mu_argp.c:125 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
-#: mh/inc.c:32 mh/inc.c:36 mh/inc.c:43 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
-#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:44 mh/scan.c:55 mh/send.c:38
+#: mh/inc.c:33 mh/inc.c:37 mh/inc.c:44 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
+#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:45 mh/scan.c:56 mh/send.c:38
 #: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:81 pop3d/popauth.c:82
 #: mimeview/mimeview.c:48 mimeview/mimeview.c:52
 msgid "FILE"
@@ -188,17 +188,17 @@ msgstr "Specific fiierul de ncredere CA"
 msgid "INTERNAL ERROR: cannot register argp capability tls"
 msgstr "EROARE INTERN: nu se poate nregistra capabilitatea argp tls"
 
-#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:63 mh/folder.c:66
-#: mh/folder.c:69 mh/folder.c:72 mh/folder.c:75 mh/forw.c:33 mh/forw.c:49
-#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:40 mh/inc.c:47
+#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:64 mh/folder.c:67
+#: mh/folder.c:70 mh/folder.c:73 mh/folder.c:76 mh/forw.c:33 mh/forw.c:49
+#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:41 mh/inc.c:48
 #: mh/mark.c:40 mh/mark.c:43 mh/mhl.c:36 mh/mhl.c:39 mh/mhn.c:43 mh/mhn.c:48
 #: mh/mhn.c:51 mh/mhn.c:54 mh/mhn.c:59 mh/mhn.c:62 mh/mhn.c:67 mh/mhn.c:72
 #: mh/mhn.c:75 mh/mhn.c:84 mh/pick.c:84 mh/pick.c:89 mh/pick.c:92
 #: mh/refile.c:42 mh/refile.c:45 mh/repl.c:36 mh/repl.c:51 mh/repl.c:59
-#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:41
-#: mh/scan.c:48 mh/scan.c:52 mh/send.c:52 mh/send.c:55 mh/send.c:58
+#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:42
+#: mh/scan.c:49 mh/scan.c:53 mh/send.c:52 mh/send.c:55 mh/send.c:58
 #: mh/send.c:61 mh/send.c:64 mh/send.c:69 mh/send.c:72 mh/whom.c:40
-#: sieve/sieve.c:92
+#: sieve/sieve.c:93
 msgid "BOOL"
 msgstr "BOOL"
 
@@ -366,8 +366,8 @@ msgid "Cannot open device %s: %m"
 msgstr "nu se poate deschide device-ul %s: %m"
 
 #: comsat/comsat.c:456 mail/copy.c:76 mail/file.c:95 mail/mail.c:438
-#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:218
-#: mh/mh_init.c:379 pop3d/apop.c:240
+#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:219
+#: mh/mh_init.c:380 pop3d/apop.c:240
 #, fuzzy, c-format
 msgid "Cannot open mailbox %s: %s"
 msgstr "Nu se poate deschide mailboxul %s: %s"
@@ -636,7 +636,7 @@ msgstr "GNU from -- afieaz de la cine(from) i subiectul"
 msgid "Just print a count of messages and exit"
 msgstr "Nu s-au putut contoriza mesajele din %s.\n"
 
-#: frm/from.c:30 sieve/sieve.c:95
+#: frm/from.c:30 sieve/sieve.c:96
 msgid "ADDRESS"
 msgstr "ADRES"
 
@@ -680,13 +680,13 @@ msgid "Could not close mailbox `%s': %s"
 msgstr "nu s-a putut deschide mailbox-ul %s: %s\n"
 
 #: frm/common.c:545 messages/messages.c:142 movemail/movemail.c:189
-#: sieve/sieve.c:457
+#: sieve/sieve.c:458
 #, fuzzy, c-format
 msgid "Could not create mailbox `%s': %s"
 msgstr "nu s-a putut crea mailbox-ul <%s>: %s\n"
 
 #: frm/common.c:548 messages/messages.c:145 movemail/movemail.c:193
-#: sieve/sieve.c:460
+#: sieve/sieve.c:461
 #, fuzzy, c-format
 msgid "Could not create default mailbox: %s"
 msgstr "nu s-a putut crea mailbox: %s"
@@ -732,9 +732,9 @@ msgid "Cannot open output mailbox %s: %s\n"
 msgstr "Nu se poate deschide mailboxul %s: %s"
 
 #: guimb/main.c:45 imap4d/auth_gss.c:267 libsieve/sieve.l:132
-#: libsieve/sieve.l:603 libsieve/sieve.l:667 libsieve/sieve.l:721
-#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:111
-#: mh/mh_init.c:316 mh/mh_msgset.c:606
+#: libsieve/sieve.l:604 libsieve/sieve.l:668 libsieve/sieve.l:722
+#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:112
+#: mh/mh_init.c:317 mh/mh_msgset.c:606
 msgid "Not enough memory"
 msgstr "Nu este destul memorie"
 
@@ -849,68 +849,68 @@ msgstr "userul GSSAPI %s este autorizat ca %s"
 msgid "User `%s' logged in"
 msgstr "Userul '%s' logat"
 
-#: imap4d/imap4d.c:46
+#: imap4d/imap4d.c:47
 msgid "GNU imap4d -- the IMAP4D daemon"
 msgstr "GNU imap4d -- daemonul IMAP4D"
 
-#: imap4d/imap4d.c:52 imap4d/imap4d.c:54
+#: imap4d/imap4d.c:53 imap4d/imap4d.c:55
 msgid "PATHLIST"
 msgstr "LISTCI"
 
-#: imap4d/imap4d.c:53
+#: imap4d/imap4d.c:54
 #, fuzzy
 msgid "Set the `other' namespace"
 msgstr "seteaz spaiul de nume `other'"
 
-#: imap4d/imap4d.c:55
+#: imap4d/imap4d.c:56
 #, fuzzy
 msgid "Set the `shared' namespace"
 msgstr "seteaz spaiul de nume `shared'"
 
-#: imap4d/imap4d.c:57
+#: imap4d/imap4d.c:58
 msgid "Disable LOGIN command"
 msgstr "Dezactiveaz comanda LOGIN"
 
-#: imap4d/imap4d.c:60
+#: imap4d/imap4d.c:61
 msgid "Always require STARTTLS before entering authentication phase"
 msgstr ""
 
-#: imap4d/imap4d.c:175 pop3d/pop3d.c:201
+#: imap4d/imap4d.c:176 pop3d/pop3d.c:202
 msgid "Error getting mail group"
 msgstr "Eroare n aflarea grupului mailului"
 
-#: imap4d/imap4d.c:181 pop3d/pop3d.c:207
+#: imap4d/imap4d.c:182 pop3d/pop3d.c:208
 msgid "Error setting mail group"
 msgstr "Eroare n setarea grupului mailului"
 
-#: imap4d/imap4d.c:260 pop3d/pop3d.c:298
+#: imap4d/imap4d.c:261 pop3d/pop3d.c:299
 msgid "Incoming connection opened"
 msgstr "Conexiune de intrare(incoming) deschis"
 
-#: imap4d/imap4d.c:262 pop3d/pop3d.c:310
+#: imap4d/imap4d.c:263 pop3d/pop3d.c:311
 #, fuzzy, c-format
 msgid "Cannot obtain IP address of client: %s"
 msgstr "nu se poate obine adresa IP a clientului: %s"
 
-#: imap4d/imap4d.c:265
+#: imap4d/imap4d.c:266
 #, fuzzy, c-format
 msgid "Connect from %s"
 msgstr "conectare de la %s"
 
-#: imap4d/imap4d.c:270 pop3d/pop3d.c:303
+#: imap4d/imap4d.c:271 pop3d/pop3d.c:304
 msgid "Started in debugging mode"
 msgstr "Pornit n mod de debugging"
 
-#: imap4d/imap4d.c:302
+#: imap4d/imap4d.c:303
 #, fuzzy
 msgid "could not become daemon"
 msgstr "eroare n a deveni un daemon"
 
-#: imap4d/imap4d.c:358
+#: imap4d/imap4d.c:359
 msgid "GNU imap4d started"
 msgstr "GNU imap4d pornit"
 
-#: imap4d/imap4d.c:364
+#: imap4d/imap4d.c:365
 #, fuzzy, c-format
 msgid "Too many children (%lu)"
 msgstr "prea multe procese children (%lu)"
@@ -951,7 +951,7 @@ msgstr "Terminare sesiune pentru user: %s"
 msgid "Quitting (numeric reason %d)"
 msgstr "Se iese (motiv numeric %d)"
 
-#: imap4d/list.c:247 mh/folder.c:326 mh/mh_init.c:225 mh/mh_init.c:704
+#: imap4d/list.c:247 mh/folder.c:327 mh/mh_init.c:226 mh/mh_init.c:705
 #: mh/rmf.c:147 pop3d/popauth.c:246
 #, fuzzy, c-format
 msgid "Cannot stat %s: %s"
@@ -981,27 +981,27 @@ msgstr "s-a primimt semnal %s"
 msgid "MASTER: exiting on signal"
 msgstr "MASTER: ieire la semnal"
 
-#: imap4d/util.c:509
+#: imap4d/util.c:510
 #, fuzzy
 msgid "Unexpected eof on input"
 msgstr "eof n intrare(input) neateptat"
 
-#: imap4d/util.c:518
+#: imap4d/util.c:519
 #, fuzzy, c-format
 msgid "Error reading from input file: %s"
 msgstr "eroare la cititrea din fiierul de intrare(input): %s"
 
-#: imap4d/util.c:1005
+#: imap4d/util.c:1006
 #, fuzzy
 msgid "Cannot find out my own hostname"
 msgstr "Nu pot realiza care este numele de host propriu"
 
-#: imap4d/util.c:1152
+#: imap4d/util.c:1153
 #, fuzzy, c-format
 msgid "Cannot poll input stream: %s"
 msgstr "nu se poate deschide secvena(stream) de input: %s"
 
-#: imap4d/util.c:1186
+#: imap4d/util.c:1187
 #, fuzzy, c-format
 msgid "Cannot open TLS stream: %s"
 msgstr "nu se poate deschide secvena(stream) TLS: %s"
@@ -1126,109 +1126,109 @@ msgstr "%d: nu se poate copia mesajul: %s"
 msgid "%d: cannot get my email address"
 msgstr "%d: nu pot afla adresa mea de e-mail"
 
-#: libsieve/comparator.c:171
+#: libsieve/comparator.c:172
 #, fuzzy, c-format
 msgid "Regex error: %s"
 msgstr "regex eroare: %s"
 
-#: libsieve/comparator.c:176
+#: libsieve/comparator.c:177
 #, fuzzy
 msgid "Regex error"
 msgstr "eroare regex"
 
-#: libsieve/comparator.c:238
+#: libsieve/comparator.c:239
 #, c-format
 msgid "match type specified twice in call to `%s'"
 msgstr "tipul de potrivire este specificat de dou ori n apelarea ctre `%s'"
 
 #. TRANSLATORS: Do not translate ':count'. It is the name of a Sieve tag
-#: libsieve/comparator.c:275
+#: libsieve/comparator.c:276
 #, c-format
 msgid "comparator %s is incompatible with :count in call to `%s'"
 msgstr "comparatorul %s este incompatibil cu :count n apelarea ctre `%s'"
 
-#: libsieve/comparator.c:291
+#: libsieve/comparator.c:292
 msgid "second argument must be a list of one element"
 msgstr "al doilea argument trebuie s fie o list de un element"
 
-#: libsieve/comparator.c:299
+#: libsieve/comparator.c:300
 msgid "second argument cannot be converted to number"
 msgstr "al doilea argument nu poate fi convertit ntr-un numr"
 
-#: libsieve/comparator.c:309
+#: libsieve/comparator.c:310
 #, c-format
 msgid "invalid relational match `%s' in call to `%s'"
 msgstr "potrivire relaional `%s' invalid n apelarea ctre `%s'"
 
-#: libsieve/comparator.c:322
+#: libsieve/comparator.c:323
 #, c-format
 msgid "comparator `%s' is incompatible with match type `%s' in call to `%s'"
 msgstr ""
 "comparatorul `%s' este incompatibil cu tipul de potrivire `%s' n apelarea "
 "ctre `%s'"
 
-#: libsieve/prog.c:39
+#: libsieve/prog.c:40
 msgid "out of memory!"
 msgstr "memorie plin!"
 
-#: libsieve/prog.c:158 libsieve/require.c:39
+#: libsieve/prog.c:159 libsieve/require.c:40
 #, c-format
 msgid "cannot create iterator: %s"
 msgstr "nu se poate crea iterator: %s"
 
-#: libsieve/prog.c:177
+#: libsieve/prog.c:178
 #, c-format
 msgid "invalid tag name `%s' for `%s'"
 msgstr "nume etichet(tag) invalid `%s' pentru `%s'"
 
-#: libsieve/prog.c:186
+#: libsieve/prog.c:187
 #, fuzzy, c-format
 msgid "%s:%d: cannot create tag list: %s"
 msgstr "%s:%d: nu se poate crea lista de etichete(tag): %s"
 
-#: libsieve/prog.c:210
+#: libsieve/prog.c:211
 #, fuzzy, c-format
 msgid "%s:%d: cannot create check list: %s"
 msgstr "%s:%d: nu se poate crea lista de verificare: %s"
 
-#: libsieve/prog.c:222 mimeview/mimetypes.y:561
+#: libsieve/prog.c:223 mimeview/mimetypes.y:561
 #, c-format
 msgid "too many arguments in call to `%s'"
 msgstr "pera multe argumente n apelarea ctre `%s'"
 
-#: libsieve/prog.c:243
+#: libsieve/prog.c:244
 #, c-format
 msgid "type mismatch in argument %d to `%s'"
 msgstr "nepotrivire de tip n argumentul %d pentru `%s'"
 
-#: libsieve/prog.c:247
+#: libsieve/prog.c:248
 #, fuzzy, c-format
 msgid "expected %s but passed %s"
 msgstr "Se atepta %s dar au trecut %s"
 
-#: libsieve/prog.c:258
+#: libsieve/prog.c:259
 #, fuzzy, c-format
 msgid "cannot create arg list: %s"
 msgstr "nu s-a putut crea lista de arg: %s"
 
-#: libsieve/prog.c:276 mimeview/mimetypes.y:553
+#: libsieve/prog.c:277 mimeview/mimetypes.y:553
 #, c-format
 msgid "too few arguments in call to `%s'"
 msgstr "prea puine argumente n apelarea ctre `%s'"
 
-#: libsieve/require.c:56
+#: libsieve/require.c:57
 msgid "required comparator"
 msgstr "comparator cerut"
 
-#: libsieve/require.c:62
+#: libsieve/require.c:63
 msgid "required test"
 msgstr "test cerut"
 
-#: libsieve/require.c:72
+#: libsieve/require.c:73
 msgid "required action"
 msgstr "aciune cerut"
 
-#: libsieve/require.c:78
+#: libsieve/require.c:79
 #, c-format
 msgid "source for the %s %s is not available"
 msgstr "sursa pentru %s %s nu este disponibil"
@@ -1243,8 +1243,8 @@ msgid "stack underflow"
 msgstr "subrulare(underflow) a stivei(stack)"
 
 #: libsieve/runtime.c:341
-#, c-format
-msgid "mailbox_scan: %s"
+#, fuzzy, c-format
+msgid "mu_mailbox_scan: %s"
 msgstr "mailbox_scan: %s"
 
 #: libsieve/sieve.l:234
@@ -1350,7 +1350,7 @@ msgstr ""
 msgid "\"%s\": not a group"
 msgstr "\"%s\": nu este grup"
 
-#: mail/alt.c:64 mh/mh_init.c:127
+#: mail/alt.c:64 mh/mh_init.c:128
 #, fuzzy
 msgid "Cannot determine my username"
 msgstr "nu pot determina username-ul meu"
@@ -1365,13 +1365,13 @@ msgstr "nu pot determina adresa mea de e-mail: %s"
 msgid "cannot change to '%s': %s"
 msgstr "nu se poate stabili(stat) %s:%s"
 
-#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:541 mh/inc.c:209
-#: mh/mh_init.c:369
+#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:542 mh/inc.c:210
+#: mh/mh_init.c:370
 #, fuzzy, c-format
 msgid "Cannot create mailbox %s: %s"
 msgstr "Nu se poate crea mailboxul %s: %s"
 
-#: mail/copy.c:92 mail/quit.c:126 mail/send.c:534
+#: mail/copy.c:92 mail/quit.c:126 mail/send.c:535
 #, fuzzy, c-format
 msgid "Cannot append message: %s"
 msgstr "nu se poate trimite mesajul: %s"
@@ -1399,7 +1399,7 @@ msgstr ""
 "\n"
 "ntrerupere"
 
-#: mail/escape.c:59 mail/send.c:225 mh/mhn.c:2059 mimeview/mimeview.c:217
+#: mail/escape.c:59 mail/send.c:226 mh/mhn.c:2059 mimeview/mimeview.c:217
 #, fuzzy, c-format
 msgid "Cannot create header: %s"
 msgstr "nu se poate crea headerul: %s"
@@ -1750,22 +1750,22 @@ msgstr "Nici un cmp nu este deschis(unfolded) curent\n"
 msgid "Sender address is obtained from the envelope\n"
 msgstr ""
 
-#: mail/send.c:73
+#: mail/send.c:74
 #, fuzzy, c-format
 msgid "Cannot create header list: %s"
 msgstr "nu se poate crea headerul: %s"
 
-#: mail/send.c:95
+#: mail/send.c:96
 #, fuzzy, c-format
 msgid "Invalid header: %s"
 msgstr "email invalid: %s"
 
-#: mail/send.c:308
+#: mail/send.c:309
 #, fuzzy
 msgid "Cannot open temporary file"
 msgstr "Nu se poate deschide fiierul temporar"
 
-#: mail/send.c:337
+#: mail/send.c:338
 msgid ""
 "\n"
 "(Interrupt -- one more to kill letter)"
@@ -1773,43 +1773,43 @@ msgstr ""
 "\n"
 "(ntrerupere -- nc una pentru a distruge(kill) scrisoarea)"
 
-#: mail/send.c:348
+#: mail/send.c:349
 msgid "Use \".\" to terminate letter."
 msgstr "Folosii \".\" pentru a termina scrisoarea."
 
-#: mail/send.c:349
+#: mail/send.c:350
 msgid "Use \"~.\" to terminate letter."
 msgstr "Folosii \"~.\" pentru a termina scrisoarea."
 
-#: mail/send.c:391
+#: mail/send.c:392
 #, c-format
 msgid "Unknown escape %s"
 msgstr "Escape necunoscut %s"
 
-#: mail/send.c:394
+#: mail/send.c:395
 msgid "Unfinished escape"
 msgstr ""
 
-#: mail/send.c:398
+#: mail/send.c:399
 #, fuzzy
 msgid "Cannot parse escape sequence"
 msgstr "nu se poate analiza(parse) secvena de escape"
 
-#: mail/send.c:423 mh/mh_init.c:668 mh/mh_list.c:264
+#: mail/send.c:424 mh/mh_init.c:669 mh/mh_list.c:264
 #, fuzzy, c-format
 msgid "Cannot open file %s: %s"
 msgstr "nu se poate deschide fiierul %s: %s"
 
-#: mail/send.c:484
+#: mail/send.c:485
 msgid "Null message body; hope that's ok\n"
 msgstr "Corp mesaj null; sper c este ok\n"
 
-#: mail/send.c:578
+#: mail/send.c:579
 #, fuzzy
 msgid "Variable sendmail not set: no mailer"
 msgstr "variabila sendmail nu este setat: nu exist mailer"
 
-#: mail/send.c:626
+#: mail/send.c:627
 #, c-format
 msgid "Piping %s failed"
 msgstr "Legtura(piping) %s a euat"
@@ -2049,7 +2049,7 @@ msgid "Set name pattern for user-defined Scheme mail filters"
 msgstr ""
 "Seteaz numele tiparului pentru filtrele de mail sieve definite de utilizator"
 
-#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:86
+#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:87
 #: mimeview/mimeview.c:46
 msgid "FLAGS"
 msgstr "MARCAJE(FLAGS)"
@@ -2063,7 +2063,7 @@ msgstr "Activeaz debugging-ul"
 msgid "Multiple --from options"
 msgstr "opiuni --from multiple"
 
-#: mail.local/main.c:215 sieve/sieve.c:208
+#: mail.local/main.c:215 sieve/sieve.c:209
 #, c-format
 msgid "%c is not a valid debug flag"
 msgstr "%c nu este un flag de debug valid"
@@ -2112,7 +2112,7 @@ msgstr "Argumente lips. ncercai --help pentru mai multe informaii."
 msgid "Access to %s failed: %m"
 msgstr "accesul la %s a euat: %m"
 
-#: mail.local/main.c:427 sieve/sieve.c:375
+#: mail.local/main.c:427 sieve/sieve.c:376
 #, fuzzy, c-format
 msgid "Cannot initialize sieve machine: %s"
 msgstr "nu se poate iniializa maina sieve: %s"
@@ -2308,79 +2308,79 @@ msgstr "Trimiterea mesajului a euat: %s"
 msgid "Closing mailer failed: %s"
 msgstr "nchiderea mailer-ului a euat: %s"
 
-#: mailbox/getopt.c:552 mailbox/getopt.c:571
+#: mailbox/getopt.c:551 mailbox/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opiunea `%s' este ambigu\n"
 
-#: mailbox/getopt.c:604 mailbox/getopt.c:608
+#: mailbox/getopt.c:603 mailbox/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opiunea `--%s' nu permite argumente\n"
 
-#: mailbox/getopt.c:617 mailbox/getopt.c:622
+#: mailbox/getopt.c:616 mailbox/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opiunea `%c%s' nu permite argumente\n"
 
-#: mailbox/getopt.c:668 mailbox/getopt.c:690 mailbox/getopt.c:1021
-#: mailbox/getopt.c:1043
+#: mailbox/getopt.c:667 mailbox/getopt.c:689 mailbox/getopt.c:1020
+#: mailbox/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opiunea `%s' necesit un argument\n"
 
-#: mailbox/getopt.c:728 mailbox/getopt.c:731
+#: mailbox/getopt.c:727 mailbox/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opiune necunoscut `--%s'\n"
 
-#: mailbox/getopt.c:739 mailbox/getopt.c:742
+#: mailbox/getopt.c:738 mailbox/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opiune necunoscut `%c%s'\n"
 
-#: mailbox/getopt.c:797 mailbox/getopt.c:800
+#: mailbox/getopt.c:796 mailbox/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opiune ilegal -- %c\n"
 
-#: mailbox/getopt.c:806 mailbox/getopt.c:809
+#: mailbox/getopt.c:805 mailbox/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opiune invalid -- %c\n"
 
-#: mailbox/getopt.c:864 mailbox/getopt.c:883 mailbox/getopt.c:1096
-#: mailbox/getopt.c:1117
+#: mailbox/getopt.c:863 mailbox/getopt.c:882 mailbox/getopt.c:1095
+#: mailbox/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opiunea necesit un argument -- %c\n"
 
-#: mailbox/getopt.c:936 mailbox/getopt.c:955
+#: mailbox/getopt.c:935 mailbox/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opiune `-W %s' este ambigu\n"
 
-#: mailbox/getopt.c:979 mailbox/getopt.c:1000
+#: mailbox/getopt.c:978 mailbox/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opiune `-W %s' nu permite argumente\n"
 
-#: mailbox/argp-help.c:195
+#: mailbox/argp-help.c:194
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: parametrul ARGP_HELP_FMT necesit o valoare"
 
-#: mailbox/argp-help.c:204
+#: mailbox/argp-help.c:203
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Parametru ARGP_HELP_FMT necunoscut"
 
-#: mailbox/argp-help.c:216
+#: mailbox/argp-help.c:215
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Gunoi(garbage) n ARGP_HELP_FMT: %s"
 
-#: mailbox/argp-help.c:1195
+#: mailbox/argp-help.c:1194
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
@@ -2389,67 +2389,67 @@ msgstr ""
 "asemenea obligatorii sau opionale pentru toate opiunile scurte "
 "corespunztoare."
 
-#: mailbox/argp-help.c:1582
+#: mailbox/argp-help.c:1581
 msgid "Usage:"
 msgstr "Folosire:"
 
-#: mailbox/argp-help.c:1586
+#: mailbox/argp-help.c:1585
 msgid "  or: "
 msgstr "  sau: "
 
-#: mailbox/argp-help.c:1598
+#: mailbox/argp-help.c:1597
 msgid " [OPTION...]"
 msgstr " [OPIUNE...]"
 
-#: mailbox/argp-help.c:1625
+#: mailbox/argp-help.c:1624
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "ncercai `%s --help' sau `%s --usage' pentru mai multe informaii.\n"
 
-#: mailbox/argp-help.c:1653
+#: mailbox/argp-help.c:1652
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Raportai bug-urile la %s.\n"
 
-#: mailbox/argp-help.c:1873
+#: mailbox/argp-help.c:1872
 #, fuzzy
 msgid "Unknown system error"
 msgstr "tip de mesaj necunoscut"
 
-#: mailbox/argp-parse.c:83
+#: mailbox/argp-parse.c:82
 msgid "Give this help list"
 msgstr "Afieaz aceast list de ajutor"
 
-#: mailbox/argp-parse.c:84
+#: mailbox/argp-parse.c:83
 msgid "Give a short usage message"
 msgstr "Afieaz un mesaj de folosire scurt"
 
-#: mailbox/argp-parse.c:85
+#: mailbox/argp-parse.c:84
 msgid "Set the program name"
 msgstr "Seteaz numele programului"
 
-#: mailbox/argp-parse.c:87
+#: mailbox/argp-parse.c:86
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "ntrerupe(hang) pentru SECS secunde (implicit 3600)"
 
-#: mailbox/argp-parse.c:148
+#: mailbox/argp-parse.c:147
 msgid "Print program version"
 msgstr "Afieaz versiunea programului"
 
-#: mailbox/argp-parse.c:164
+#: mailbox/argp-parse.c:163
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(EROARE DE PROGRAM) Nici o versiune cunoscut!?"
 
-#: mailbox/argp-parse.c:620
+#: mailbox/argp-parse.c:619
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Prea multe argumente\n"
 
-#: mailbox/argp-parse.c:763
+#: mailbox/argp-parse.c:762
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(EROARE DE PROGRAM) Opiunea ar fi trebuit recunoscut!?"
 
-#: mailbox/file_stream.c:479
+#: mailbox/file_stream.c:480
 #, c-format
 msgid "%s must be a plain file with one link\n"
 msgstr "%s trebuie s fie un fiier normal(plain) cu o legtur\n"
@@ -2473,24 +2473,24 @@ msgstr "regex eroare: %s"
 msgid "Stream is closed"
 msgstr ""
 
-#: mailbox/message.c:1092
-#, c-format
-msgid "mailbox_create_default (%s) failed: %s\n"
+#: mailbox/message.c:1093
+#, fuzzy, c-format
+msgid "mu_mailbox_create_default (%s) failed: %s\n"
 msgstr "mailbox_create_default (%s) euat: %s\n"
 
-#: mailbox/message.c:1123
-#, c-format
-msgid "mailbox_open (%s) failed: %s\n"
+#: mailbox/message.c:1124
+#, fuzzy, c-format
+msgid "mu_mailbox_open (%s) failed: %s\n"
 msgstr "mailbox_open (%s) euat: %s\n"
 
-#: mailbox/message.c:1131
-#, c-format
-msgid "mailbox_append_message (%s) failed: %s\n"
+#: mailbox/message.c:1132
+#, fuzzy, c-format
+msgid "mu_mailbox_append_message (%s) failed: %s\n"
 msgstr "mailbox_append_message (%s) euat: %s\n"
 
-#: mailbox/message.c:1143
-#, c-format
-msgid "mailbox_close (%s) failed: %s\n"
+#: mailbox/message.c:1144
+#, fuzzy, c-format
+msgid "mu_mailbox_close (%s) failed: %s\n"
 msgstr "mailbox_close (%s) euat: %s\n"
 
 #: mailbox/mu_argp.c:60
@@ -2513,7 +2513,7 @@ msgstr "Folosete URL-ul specificat ca director mailspool"
 msgid "Default locker flags (E=external, R=retry, T=time, P=pid)"
 msgstr "Flag-uri locker implicite (E=extern, R=rencercare, T=timp, P=pid)"
 
-#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:76
+#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:77
 msgid "SECONDS"
 msgstr "SECUNDE"
 
@@ -2960,15 +2960,15 @@ msgstr ""
 msgid "[msg [msg...]]"
 msgstr "[msg [msg...]]"
 
-#: mh/anno.c:33 mh/folder.c:49 mh/folder.c:59 mh/forw.c:37 mh/forw.c:43
-#: mh/inc.c:34 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
+#: mh/anno.c:33 mh/folder.c:50 mh/folder.c:60 mh/forw.c:37 mh/forw.c:43
+#: mh/inc.c:35 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
 #: mh/mhpath.c:32 mh/pick.c:39 mh/refile.c:38 mh/refile.c:47 mh/repl.c:40
-#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:39 mh/send.c:42
+#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:40 mh/send.c:42
 #: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:43
 msgid "FOLDER"
 msgstr "DOSAR"
 
-#: mh/anno.c:34 mh/folder.c:60 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
+#: mh/anno.c:34 mh/folder.c:61 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
 #: mh/mhn.c:38 mh/mhpath.c:33 mh/pick.c:40 mh/refile.c:39 mh/repl.c:50
 #: mh/rmm.c:33
 msgid "Specify folder to operate upon"
@@ -2994,10 +2994,10 @@ msgstr "Adaug acest CMP la header-ul mesajului"
 msgid "Field value for the component"
 msgstr "Valoarea cmpului pentru component"
 
-#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:80 mh/forw.c:75 mh/inc.c:55
+#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:81 mh/forw.c:75 mh/inc.c:56
 #: mh/install-mh.c:33 mh/mark.c:47 mh/mhl.c:53 mh/mhn.c:90 mh/mhpath.c:35
 #: mh/pick.c:96 mh/refile.c:52 mh/repl.c:72 mh/rmf.c:50 mh/rmm.c:35
-#: mh/scan.c:59 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
+#: mh/scan.c:60 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
 msgid "Display software license"
 msgstr "Afieaz licena software"
 
@@ -3014,16 +3014,16 @@ msgstr ""
 "GNU MH fmtcheckFolosii -helppentru a obine o list cu opiunile MH "
 "tradiionale."
 
-#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:44 mh/mhl.c:43 mh/repl.c:58
-#: mh/scan.c:45
+#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:45 mh/mhl.c:43 mh/repl.c:58
+#: mh/scan.c:46
 msgid "Read format from given file"
 msgstr "Citete formatul din fiierul dat"
 
-#: mh/fmtcheck.c:34 mh/inc.c:45 mh/scan.c:46
+#: mh/fmtcheck.c:34 mh/inc.c:46 mh/scan.c:47
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: mh/fmtcheck.c:35 mh/inc.c:46 mh/scan.c:47
+#: mh/fmtcheck.c:35 mh/inc.c:47 mh/scan.c:48
 msgid "Use this format string"
 msgstr "Folosete acest ir de format"
 
@@ -3040,35 +3040,35 @@ msgstr "Activeaz output-ul prin analizorul(parser) de debugging"
 msgid "Format string not specified"
 msgstr "irul formatului nu este specificat"
 
-#: mh/fmtcheck.c:115 mh/inc.c:191 mh/repl.c:373 mh/scan.c:188
+#: mh/fmtcheck.c:115 mh/inc.c:192 mh/repl.c:373 mh/scan.c:189
 msgid "Bad format string"
 msgstr "irul de format este greit"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/folder.c:39
+#: mh/folder.c:40
 msgid "GNU MH folderUse -help to obtain the list of traditional MH options."
 msgstr ""
 "Dosarul(folder) GNU MHFolosii -help pentru a obine o list cu opiunile "
 "tradiionale MH."
 
-#: mh/folder.c:41
+#: mh/folder.c:42
 msgid "[action] [msg]"
 msgstr "[aciune] [msj]"
 
-#: mh/folder.c:44 pop3d/popauth.c:68
+#: mh/folder.c:45 pop3d/popauth.c:68
 msgid "Actions are:"
 msgstr "Aciunile sunt:"
 
-#: mh/folder.c:46
+#: mh/folder.c:47
 msgid "List the folders (default)"
 msgstr "Listarea dosarelor(folders) (implicit)"
 
-#: mh/folder.c:48
+#: mh/folder.c:49
 msgid "List the contents of the folder stack"
 msgstr "Listeaz coninutul stivei(stack) de dosare(folder)"
 
-#: mh/folder.c:50
+#: mh/folder.c:51
 msgid ""
 "Push the folder on the folder stack. If FOLDER is specified, it is pushed. "
 "Otherwise, if a folder is given in the command line (via + or --folder), it "
@@ -3084,61 +3084,61 @@ msgstr ""
 "on stack. Otherwise, the current folder and the top of the folder stack are "
 "exchanged"
 
-#: mh/folder.c:55
+#: mh/folder.c:56
 msgid "Pop the folder off the folder stack"
 msgstr "Scoate dosarul din stiva de dosare"
 
-#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:80
+#: mh/folder.c:58 mh/mh_whatnow.c:153 pop3d/popauth.c:80
 msgid "Options are:"
 msgstr "Opiuni sunt:"
 
-#: mh/folder.c:62
+#: mh/folder.c:63
 msgid "List all folders"
 msgstr "Listeaz toate dosarele"
 
-#: mh/folder.c:64
+#: mh/folder.c:65
 msgid "Create non-existing folders"
 msgstr "Creaz dosare inexistente"
 
-#: mh/folder.c:67
+#: mh/folder.c:68
 msgid "List only the folder names"
 msgstr "Listeaz doar numele dosarelor"
 
-#: mh/folder.c:70
+#: mh/folder.c:71
 msgid "Print the header line"
 msgstr "Tiprete linia de header"
 
-#: mh/folder.c:73
+#: mh/folder.c:74
 msgid "Scan folders recursively"
 msgstr "Scaneaz recursiv dosarele"
 
-#: mh/folder.c:76
+#: mh/folder.c:77
 msgid "Output the total statistics"
 msgstr "Afieaz(output) statisticile totale"
 
-#: mh/folder.c:309 mh/rmf.c:128
+#: mh/folder.c:310 mh/rmf.c:128
 #, fuzzy, c-format
 msgid "Cannot scan folder %s: %s"
 msgstr "nu se poate scana dosarul %s: %s"
 
-#: mh/folder.c:382
+#: mh/folder.c:383
 #, c-format
 msgid " has %4lu message  (%4lu-%4lu)"
 msgid_plural " has %4lu messages (%4lu-%4lu)"
 msgstr[0] " are %4lu mesaj  (%4lu-%4lu)"
 msgstr[1] " are %4lu mesaje  (%4lu-%4lu)"
 
-#: mh/folder.c:393
+#: mh/folder.c:394
 #, c-format
 msgid " has no messages"
 msgstr "nu are mesaje"
 
-#: mh/folder.c:402
+#: mh/folder.c:403
 #, c-format
 msgid "(others)"
 msgstr "(altele)"
 
-#: mh/folder.c:450
+#: mh/folder.c:451
 #, c-format
 msgid ""
 "Folder                  # of messages     (  range  )  cur msg   (other "
@@ -3147,18 +3147,18 @@ msgstr ""
 "Dosar                  # de mesaje      (  inteval  )  msj crt   (alte "
 "fiiere)\n"
 
-#: mh/folder.c:456
+#: mh/folder.c:457
 msgid "TOTAL"
 msgstr "TOTAL"
 
-#: mh/folder.c:457
+#: mh/folder.c:458
 #, c-format
 msgid "%4lu message  "
 msgid_plural "%4lu messages "
 msgstr[0] "%4lu mesaj  "
 msgstr[1] "%4lu mesaje"
 
-#: mh/folder.c:460
+#: mh/folder.c:461
 #, c-format
 msgid "in %4lu folder"
 msgid_plural "in %4lu folders"
@@ -3233,7 +3233,7 @@ msgstr "Revine(undo) nainte de efectul ultimei opiuni --filter"
 msgid "Use MIME encapsulation"
 msgstr "Folosete ncapsulare MIME"
 
-#: mh/forw.c:65 mh/inc.c:51 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:51
+#: mh/forw.c:65 mh/inc.c:52 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:52
 msgid "Set output width"
 msgstr "Seteaz limea output-ului"
 
@@ -3251,16 +3251,16 @@ msgstr ""
 msgid "Use draft file preserved after the last session"
 msgstr "Folosete fiierul ciorn pstrat dup ultima sesiune"
 
-#: mh/forw.c:147 mh/inc.c:137 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:124
+#: mh/forw.c:147 mh/inc.c:138 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:125
 msgid "Invalid width"
 msgstr "Lime invalid"
 
-#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:138
+#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:139
 #, fuzzy
 msgid "Option is not yet implemented"
 msgstr "opiunea nu este nc implementat"
 
-#: mh/forw.c:285 mh/mh_init.c:536
+#: mh/forw.c:285 mh/mh_init.c:537
 #, fuzzy, c-format
 msgid "Cannot open output file `%s': %s"
 msgstr "nu se poate deschide fiierul de ieire(output) \"%s\": %s"
@@ -3283,64 +3283,64 @@ msgstr "Sfrit de mesaje naintate(forwarded)"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/inc.c:26
+#: mh/inc.c:27
 msgid "GNU MH incUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH incFolosii -help pentru a obine o list de opiuni MH tradiionale."
 
-#: mh/inc.c:28 mh/rmf.c:37
+#: mh/inc.c:29 mh/rmf.c:37
 msgid "[+folder]"
 msgstr "[+folder]"
 
-#: mh/inc.c:33
+#: mh/inc.c:34
 msgid "Incorporate mail from named file"
 msgstr "Incorporeaz mail din fiierul numit"
 
-#: mh/inc.c:35
+#: mh/inc.c:36
 msgid "Specify folder to incorporate mail to"
 msgstr "Specific dosarul n care se va ncoropra mailul"
 
-#: mh/inc.c:37
+#: mh/inc.c:38
 msgid "Enable audit"
 msgstr "Activeaz auditul"
 
-#: mh/inc.c:39
+#: mh/inc.c:40
 msgid "Disable audit"
 msgstr "Dezactiveaz auditul"
 
-#: mh/inc.c:41
+#: mh/inc.c:42
 msgid "Mark first incorporated message as current (default)"
 msgstr "Marcheaz primul mesaj ncorporat ca i curent (implicit)"
 
-#: mh/inc.c:48
+#: mh/inc.c:49
 msgid "Truncate source mailbox after incorporating (default)"
 msgstr "Trunchiaz mailboxul surs dup ncorporare (implicit)"
 
-#: mh/inc.c:53 mh/mhn.c:88
+#: mh/inc.c:54 mh/mhn.c:88
 msgid "Be quiet"
 msgstr "Este silenios"
 
-#: mh/inc.c:200
+#: mh/inc.c:201
 #, fuzzy
 msgid "Cannot create default mailbox"
 msgstr "Nu creaz mailbox implicit"
 
-#: mh/inc.c:226
+#: mh/inc.c:227
 #, fuzzy, c-format
 msgid "Cannot read input mailbox: %s"
 msgstr "Nu se poate citi mailboxul de intrare: %s"
 
-#: mh/inc.c:233
+#: mh/inc.c:234
 #, fuzzy, c-format
 msgid "Cannot read output mailbox: %s"
 msgstr "Nu se poate citi mailboxul de ieire: %s"
 
-#: mh/inc.c:254
+#: mh/inc.c:255
 #, fuzzy, c-format
 msgid "%d: cannot get message: %s"
 msgstr "%d: nu se poate primi(get) mesajul: %s"
 
-#: mh/inc.c:261
+#: mh/inc.c:262
 #, c-format
 msgid "%d: error appending message: %s"
 msgstr "%d: eroare n adugarea mesajului: %s"
@@ -3420,12 +3420,12 @@ msgstr ""
 "Acesta este %s\n"
 "\n"
 
-#: mh/mh_ctx.c:92
+#: mh/mh_ctx.c:93
 #, fuzzy, c-format
 msgid "Cannot open context file %s: %s"
 msgstr "nu se poate scrie fiierul context %s: %s"
 
-#: mh/mh_ctx.c:142
+#: mh/mh_ctx.c:143
 #, fuzzy, c-format
 msgid "Cannot create context %s: %s"
 msgstr "Nu se poate crea contextul %s: %s"
@@ -3452,17 +3452,17 @@ msgstr "lipsete argumentul pentru %s"
 msgid "Extra arguments to %s"
 msgstr "extra argumente pentru %s"
 
-#: mh/mh_format.c:603
+#: mh/mh_format.c:604
 #, c-format
 msgid "INTERNAL ERROR: Unknown opcode: %x"
 msgstr "EROARE INTERN: Opcode necunoscut: %x"
 
 #. TRANSLATORS: Do not translate the word 'format'!
-#: mh/mh_format.c:946 mh/mh_format.c:958
+#: mh/mh_format.c:947 mh/mh_format.c:959
 msgid "format: divide by zero"
 msgstr "format: mprire la zero"
 
-#: mh/mh_format.c:1874
+#: mh/mh_format.c:1875
 msgid "Invalid recipient mask"
 msgstr "Masc(mask) de recipient invalid"
 
@@ -3492,73 +3492,73 @@ msgstr ""
 "V rugm folosii n loc opiunile lungi GNU.\n"
 "Rulai %s --help pentru mai multe informaii despre acestea.\n"
 
-#: mh/mh_init.c:69
+#: mh/mh_init.c:70
 #, fuzzy, c-format
 msgid "Cannot stat format file %s: %s"
 msgstr "nu se poate stabili(stat) fiierul de formatare %s: %s"
 
-#: mh/mh_init.c:76
+#: mh/mh_init.c:77
 #, fuzzy, c-format
 msgid "Cannot open format file %s: %s"
 msgstr "nu se poate deschide fiierul de format %s: %s"
 
-#: mh/mh_init.c:206
+#: mh/mh_init.c:207
 #, c-format
 msgid "Create folder \"%s\""
 msgstr "Creaz dosarul(folder) \"%s\""
 
-#: mh/mh_init.c:214
+#: mh/mh_init.c:215
 #, fuzzy, c-format
 msgid "Cannot create directory %s: %s"
 msgstr "Nu se poate crea directorul %s: %s"
 
 #. TRANSLATORS: See msgids "nN" and "yY".
-#: mh/mh_init.c:267
+#: mh/mh_init.c:268
 #, c-format
 msgid "Please answer yes or no: "
 msgstr "V rugm rspundei yes sau no: "
 
-#: mh/mh_init.c:326
+#: mh/mh_init.c:327
 #, fuzzy, c-format
 msgid "Cannot open audit file %s: %s"
 msgstr "Nu se poate deschide fiierul de audit %s: %s"
 
-#: mh/mh_init.c:457 mh/mh_msgset.c:165
+#: mh/mh_init.c:458 mh/mh_msgset.c:165
 #, fuzzy, c-format
 msgid "Cannot get message %d: %s"
 msgstr "nu se poate afla(get) mesajul %d: %s"
 
-#: mh/mh_init.c:475
+#: mh/mh_init.c:476
 #, fuzzy, c-format
 msgid "Cannot split line %s"
 msgstr "nu se poate mpri(split) linia %s"
 
-#: mh/mh_init.c:527
+#: mh/mh_init.c:528
 #, fuzzy, c-format
 msgid "Cannot open input file `%s': %s"
 msgstr "nu se poate deschide fiierul de intrare(input) \"%s\": %s"
 
-#: mh/mh_init.c:550
+#: mh/mh_init.c:551
 #, fuzzy, c-format
 msgid "Write error on `%s': %s"
 msgstr "eroare de scriere n \"%s\": %s"
 
-#: mh/mh_init.c:579
+#: mh/mh_init.c:580
 #, fuzzy, c-format
 msgid "Cannot stat file %s: %s"
 msgstr "nu se poate stabili(stat) fiierul %s: %s"
 
-#: mh/mh_init.c:585 mh/mhn.c:2267
+#: mh/mh_init.c:586 mh/mhn.c:2267
 #, fuzzy, c-format
 msgid "Cannot create input stream (file %s): %s"
 msgstr "nu se poate crea secvena(stream) de input (fiierul %s): %s"
 
-#: mh/mh_init.c:592 mh/mhn.c:2274
+#: mh/mh_init.c:593 mh/mhn.c:2274
 #, fuzzy, c-format
 msgid "Cannot open input stream (file %s): %s"
 msgstr "nu se poate deschide secvena(stream) de input (fiierul %s): %s"
 
-#: mh/mh_init.c:605
+#: mh/mh_init.c:606
 #, c-format
 msgid ""
 "Prior to using MH, it is necessary to have a file in your login\n"
@@ -3575,39 +3575,39 @@ msgstr ""
 "pentru toate operaiile de dosar(folder) MH.  Calea MH sugerat pentru voi\n"
 "este %s...\n"
 
-#: mh/mh_init.c:628
+#: mh/mh_init.c:629
 msgid "Do you need help"
 msgstr "Dorii ajutor"
 
-#: mh/mh_init.c:631
+#: mh/mh_init.c:632
 #, c-format
 msgid "Do you want the standard MH path \"%s\""
 msgstr "Dorii calea MH standard \"%s\""
 
-#: mh/mh_init.c:636
+#: mh/mh_init.c:637
 msgid "Do you want a path below your login directory"
 msgstr "Dorii calea de sub(below) directorul vostru de login"
 
-#: mh/mh_init.c:638
+#: mh/mh_init.c:639
 #, c-format
 msgid "What is the path? "
 msgstr "Care este calea? "
 
-#: mh/mh_init.c:640
+#: mh/mh_init.c:641
 #, c-format
 msgid "What is the full path? "
 msgstr "Care este calea ntreag? "
 
-#: mh/mh_init.c:699
+#: mh/mh_init.c:700
 #, c-format
 msgid "I'm going to create the standard MH path for you.\n"
 msgstr "Voi crea o cale MH standard pentru voi.\n"
 
-#: mh/mh_init.c:710
+#: mh/mh_init.c:711
 msgid "You already have an MH profile, use an editor to modify it"
 msgstr "Avei deja un profil MH; folosii un editor pentru a-l modifica"
 
-#: mh/mh_init.c:715
+#: mh/mh_init.c:716
 #, c-format
 msgid ""
 "You already have file %s which is not a regular file or a symbolic link.\n"
@@ -4120,7 +4120,7 @@ msgstr ""
 "GNU MH mhpathFolosii -help pentru a obine o list de opiuni tradiionale "
 "MH."
 
-#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:35
+#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:36
 msgid "[+folder] [msgs]"
 msgstr "[+folder] [msj]"
 
@@ -4444,37 +4444,37 @@ msgstr ""
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/scan.c:33
+#: mh/scan.c:34
 msgid "GNU MH scanUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH scanFolosii -help pentru a obtine o list de opiuni MH tradiionale."
 
-#: mh/scan.c:40
+#: mh/scan.c:41
 msgid "Specify folder to scan"
 msgstr "Specificai dosarul de scanat"
 
-#: mh/scan.c:42
+#: mh/scan.c:43
 msgid "Clear screen after displaying the list"
 msgstr "terge ecranul dup afiarea listei"
 
-#: mh/scan.c:49
+#: mh/scan.c:50
 msgid "Display header"
 msgstr "Afieaz header-ul"
 
-#: mh/scan.c:53
+#: mh/scan.c:54
 msgid "List messages in reverse order"
 msgstr "Listeaz mesajele n ordine invers"
 
-#: mh/scan.c:56
+#: mh/scan.c:57
 msgid "[Not yet implemented]"
 msgstr "[Neimplementat nc]"
 
-#: mh/scan.c:228
+#: mh/scan.c:229
 #, c-format
 msgid "no messages in %s"
 msgstr "nici un mesaj n %s"
 
-#: mh/scan.c:249
+#: mh/scan.c:250
 #, c-format
 msgid "Folder %s  %s\n"
 msgstr "Dosarul %s  %s\n"
@@ -4559,7 +4559,7 @@ msgstr "Monitorizeaz livrarea mailului"
 msgid "* Make header fields no longer than NUMBER columns"
 msgstr "* F cmpurile header mai mici dect NUMR coloane"
 
-#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:134 pop3d/pop3d.c:148
+#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:135 pop3d/pop3d.c:149
 msgid "Invalid number"
 msgstr "Numr invalid"
 
@@ -4682,17 +4682,17 @@ msgstr ""
 
 #: movemail/movemail.c:169
 #, fuzzy
-msgid "mailbox_get_folder failed"
+msgid "mu_mailbox_get_folder failed"
 msgstr "eroare mailbox_get_folder: %s"
 
 #: movemail/movemail.c:172
 #, fuzzy
-msgid "folder_get_authority failed"
+msgid "mu_folder_get_authority failed"
 msgstr "eroare folder_get_authority: %s"
 
 #: movemail/movemail.c:175
 #, fuzzy
-msgid "authority_set_ticket failed"
+msgid "mu_authority_set_ticket failed"
 msgstr "eroare authority_set_ticket: %s"
 
 #: movemail/movemail.c:202
@@ -4795,64 +4795,64 @@ msgstr "eof n intrare(input) neateptat"
 msgid "Locking mailbox `%s' failed: %s"
 msgstr "Deschiderea mailerului '%s' a euat: %s"
 
-#: pop3d/pop3d.c:64
+#: pop3d/pop3d.c:65
 msgid "GNU pop3d -- the POP3 daemon"
 msgstr "GNU pop3d -- daemon-ul POP3"
 
-#: pop3d/pop3d.c:74
+#: pop3d/pop3d.c:75
 msgid "Undelete all messages on startup"
 msgstr ""
 
-#: pop3d/pop3d.c:77
+#: pop3d/pop3d.c:78
 msgid "Allowed delay between the two successive logins"
 msgstr ""
 
-#: pop3d/pop3d.c:78
+#: pop3d/pop3d.c:79
 #, fuzzy
 msgid "FILENAME"
 msgstr "FIIER"
 
-#: pop3d/pop3d.c:79
+#: pop3d/pop3d.c:80
 msgid "Name of login statistics file"
 msgstr ""
 
-#: pop3d/pop3d.c:81
+#: pop3d/pop3d.c:82
 msgid "DAYS"
 msgstr ""
 
-#: pop3d/pop3d.c:82
+#: pop3d/pop3d.c:83
 #, fuzzy
 msgid "Expire read messages after the given number of days"
 msgstr "Gsete mesajele de dup data specificat"
 
-#: pop3d/pop3d.c:84
+#: pop3d/pop3d.c:85
 msgid "Delete expired messages upon closing the mailbox"
 msgstr ""
 
-#: pop3d/pop3d.c:87
+#: pop3d/pop3d.c:88
 msgid "Always require STLS before entering authentication phase"
 msgstr ""
 
-#: pop3d/pop3d.c:277
+#: pop3d/pop3d.c:278
 #, fuzzy
 msgid "Failed to become a daemon:"
 msgstr "eroare n a deveni un daemon:"
 
-#: pop3d/pop3d.c:313
+#: pop3d/pop3d.c:314
 #, c-format
 msgid "connect from %s"
 msgstr "conectare de la %s"
 
-#: pop3d/pop3d.c:437
+#: pop3d/pop3d.c:438
 #, fuzzy
 msgid "Session terminated"
 msgstr "Terminare sesiune"
 
-#: pop3d/pop3d.c:523
+#: pop3d/pop3d.c:524
 msgid "GNU pop3d started"
 msgstr "GNU pop3d pornit"
 
-#: pop3d/pop3d.c:530
+#: pop3d/pop3d.c:531
 #, c-format
 msgid "too many children (%lu)"
 msgstr "prea multe procese children (%lu)"
@@ -5103,7 +5103,7 @@ msgstr "nu s-a putut deschide mailbox-ul %s: %s\n"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: sieve/sieve.c:53
+#: sieve/sieve.c:54
 #, fuzzy
 msgid ""
 "GNU sieve -- a mail filtering tool\n"
@@ -5122,155 +5122,155 @@ msgstr ""
 "  t - trace de sieve (MU_SIEVE_DEBUG_TRACE)\n"
 "  i - trace instruciuni sieve (MU_SIEVE_DEBUG_INSTR)\n"
 
-#: sieve/sieve.c:69
+#: sieve/sieve.c:70
 #, fuzzy
 msgid "Do not execute any actions, just print what would be done"
 msgstr "Nici o aciune executat, doar afieaz ce se va ntmpla"
 
-#: sieve/sieve.c:72
+#: sieve/sieve.c:73
 msgid "Keep on going if execution fails on a message"
 msgstr "Contiun dac execuia a euat ntr-un mesaj"
 
-#: sieve/sieve.c:75
+#: sieve/sieve.c:76
 msgid "Compile script and exit"
 msgstr "Compileaz scriptul i iese"
 
-#: sieve/sieve.c:78
+#: sieve/sieve.c:79
 msgid "Compile script, dump disassembled sieve code to terminal and exit"
 msgstr ""
 "Compileaz scriptul, las(dump) codul sieve dezasamblat la terminal i iese"
 
-#: sieve/sieve.c:80
+#: sieve/sieve.c:81
 msgid "MBOX"
 msgstr "MBOX"
 
-#: sieve/sieve.c:81
+#: sieve/sieve.c:82
 msgid "Mailbox to sieve (defaults to user's mail spool)"
 msgstr "Mailbox pentru sieve (implicit spool-ul mail-ului user-ului)"
 
-#: sieve/sieve.c:83
+#: sieve/sieve.c:84
 msgid "TICKET"
 msgstr "TICKET"
 
-#: sieve/sieve.c:84
+#: sieve/sieve.c:85
 msgid "Ticket file for mailbox authentication"
 msgstr "Fiier ticket pentru autentificare mailbox"
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "Debug flags (defaults to \""
 msgstr "Flag-uri de debug (implicit \""
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "\")"
 msgstr "\")"
 
-#: sieve/sieve.c:90
+#: sieve/sieve.c:91
 msgid "Log all actions"
 msgstr "Logare toate aciunile"
 
-#: sieve/sieve.c:93
+#: sieve/sieve.c:94
 #, fuzzy
 msgid "Print source location along with action logs (default)"
 msgstr "Trunchiaz mailboxul surs dup ncorporare (implicit)"
 
-#: sieve/sieve.c:96
+#: sieve/sieve.c:97
 msgid "Override user email address"
 msgstr "nlocuiete(override) adresa de email a userului"
 
-#: sieve/sieve.c:149
+#: sieve/sieve.c:150
 #, fuzzy, c-format
 msgid "Invalid email: %s"
 msgstr "email invalid: %s"
 
-#: sieve/sieve.c:170
+#: sieve/sieve.c:171
 #, fuzzy
 msgid "Only one MBOX can be specified"
 msgstr "doar un MBOX poate fi specificat"
 
-#: sieve/sieve.c:224
+#: sieve/sieve.c:225
 #, fuzzy
 msgid "Only one SCRIPT can be specified"
 msgstr "doar un SCRIPT poate fi specificat"
 
-#: sieve/sieve.c:229
+#: sieve/sieve.c:230
 msgid "SCRIPT must be specified"
 msgstr "SCRIPT trebuie specificat"
 
-#: sieve/sieve.c:242
+#: sieve/sieve.c:243
 msgid "SCRIPT"
 msgstr "SCRIPT"
 
-#: sieve/sieve.c:300 sieve/sieve.c:325
+#: sieve/sieve.c:301 sieve/sieve.c:326
 #, fuzzy, c-format
 msgid "%s:%lu: %s on msg uid %lu"
 msgstr "%s pe msj uid %lu"
 
-#: sieve/sieve.c:304 sieve/sieve.c:329
+#: sieve/sieve.c:305 sieve/sieve.c:330
 #, c-format
 msgid "%s on msg uid %lu"
 msgstr "%s pe msj uid %lu"
 
-#: sieve/sieve.c:415
+#: sieve/sieve.c:416
 #, c-format
 msgid "ticket_get failed: %s"
 msgstr "eroare ticket_get: %s"
 
-#: sieve/sieve.c:421
+#: sieve/sieve.c:422
 #, fuzzy, c-format
-msgid "wicket_create `%s' failed: %s"
+msgid "mu_wicket_create `%s' failed: %s"
 msgstr "eroare wicket_create <%s>: %s"
 
-#: sieve/sieve.c:434
+#: sieve/sieve.c:435
 #, c-format
 msgid "mu_debug_create failed: %s"
 msgstr "eroare mu_debug_create: %s"
 
-#: sieve/sieve.c:439
+#: sieve/sieve.c:440
 #, c-format
 msgid "mu_debug_set_level failed: %s"
 msgstr "eroare mu_debug_set_level: %s"
 
-#: sieve/sieve.c:445
+#: sieve/sieve.c:446
 #, c-format
 msgid "mu_debug_set_print failed: %s"
 msgstr "eroare mu_debug_set_print: %s"
 
-#: sieve/sieve.c:467
-#, c-format
-msgid "mailbox_set_debug failed: %s"
+#: sieve/sieve.c:468
+#, fuzzy, c-format
+msgid "mu_mailbox_set_debug failed: %s"
 msgstr "eroare mailbox_set_debug: %s"
 
-#: sieve/sieve.c:478
-#, c-format
-msgid "mailbox_get_folder failed: %s"
+#: sieve/sieve.c:479
+#, fuzzy, c-format
+msgid "mu_mailbox_get_folder failed: %s"
 msgstr "eroare mailbox_get_folder: %s"
 
-#: sieve/sieve.c:485
-#, c-format
-msgid "folder_get_authority failed: %s"
+#: sieve/sieve.c:486
+#, fuzzy, c-format
+msgid "mu_folder_get_authority failed: %s"
 msgstr "eroare folder_get_authority: %s"
 
-#: sieve/sieve.c:493
-#, c-format
-msgid "authority_set_ticket failed: %s"
+#: sieve/sieve.c:494
+#, fuzzy, c-format
+msgid "mu_authority_set_ticket failed: %s"
 msgstr "eroare authority_set_ticket: %s"
 
-#: sieve/sieve.c:508
+#: sieve/sieve.c:509
 #, fuzzy, c-format
 msgid "Opening mailbox `%s' failed: %s"
 msgstr "Deschiderea mailerului '%s' a euat: %s"
 
-#: sieve/sieve.c:511
+#: sieve/sieve.c:512
 #, fuzzy, c-format
 msgid "Opening default mailbox failed: %s"
 msgstr "Deschiderea mailerului '%s' a euat: %s"
 
-#: sieve/sieve.c:532
+#: sieve/sieve.c:533
 #, fuzzy, c-format
 msgid "Expunge on mailbox `%s' failed: %s"
 msgstr "eroare la eliminarea(expunge) %s: %s"
 
-#: sieve/sieve.c:535
+#: sieve/sieve.c:536
 #, fuzzy, c-format
 msgid "Expunge on default mailbox failed: %s"
 msgstr "eroare la eliminarea(expunge) %s: %s"

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mailutils 0.6.90\n"
 "Report-Msgid-Bugs-To: bug-mailutils@gnu.org\n"
-"POT-Creation-Date: 2005-08-16 13:23+0300\n"
+"POT-Creation-Date: 2005-08-26 17:10+0300\n"
 "PO-Revision-Date: 2005-05-19 12:01+0300\n"
 "Last-Translator: Sergey Poznyakoff <gray@gnu.org>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
 ".     0       "
 ".      1."
 
-#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:569
+#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:570
 msgid "Too many arguments"
 msgstr "  "
 
@@ -116,8 +116,8 @@ msgid "Name of the database to connect to"
 msgstr "  "
 
 #: auth/sql.c:201 mailbox/mu_argp.c:80 mailbox/mu_argp.c:115
-#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
-#: mh/repl.c:65 mh/scan.c:50 mh/send.c:75
+#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:51 mh/mhl.c:44 mh/mhl.c:46
+#: mh/repl.c:65 mh/scan.c:51 mh/send.c:75
 msgid "NUMBER"
 msgstr ""
 
@@ -165,8 +165,8 @@ msgstr " "
 #: auth/tls.c:59 auth/tls.c:61 auth/tls.c:63 comsat/comsat.c:59
 #: dotlock/dotlock.c:43 frm/from.c:32 mail.local/main.c:83
 #: mailbox/mu_argp.c:125 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
-#: mh/inc.c:32 mh/inc.c:36 mh/inc.c:43 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
-#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:44 mh/scan.c:55 mh/send.c:38
+#: mh/inc.c:33 mh/inc.c:37 mh/inc.c:44 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
+#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:45 mh/scan.c:56 mh/send.c:38
 #: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:81 pop3d/popauth.c:82
 #: mimeview/mimeview.c:48 mimeview/mimeview.c:52
 msgid "FILE"
@@ -188,17 +188,17 @@ msgstr "  CA"
 msgid "INTERNAL ERROR: cannot register argp capability tls"
 msgstr " :    argp tls"
 
-#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:63 mh/folder.c:66
-#: mh/folder.c:69 mh/folder.c:72 mh/folder.c:75 mh/forw.c:33 mh/forw.c:49
-#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:40 mh/inc.c:47
+#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:64 mh/folder.c:67
+#: mh/folder.c:70 mh/folder.c:73 mh/folder.c:76 mh/forw.c:33 mh/forw.c:49
+#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:41 mh/inc.c:48
 #: mh/mark.c:40 mh/mark.c:43 mh/mhl.c:36 mh/mhl.c:39 mh/mhn.c:43 mh/mhn.c:48
 #: mh/mhn.c:51 mh/mhn.c:54 mh/mhn.c:59 mh/mhn.c:62 mh/mhn.c:67 mh/mhn.c:72
 #: mh/mhn.c:75 mh/mhn.c:84 mh/pick.c:84 mh/pick.c:89 mh/pick.c:92
 #: mh/refile.c:42 mh/refile.c:45 mh/repl.c:36 mh/repl.c:51 mh/repl.c:59
-#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:41
-#: mh/scan.c:48 mh/scan.c:52 mh/send.c:52 mh/send.c:55 mh/send.c:58
+#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:42
+#: mh/scan.c:49 mh/scan.c:53 mh/send.c:52 mh/send.c:55 mh/send.c:58
 #: mh/send.c:61 mh/send.c:64 mh/send.c:69 mh/send.c:72 mh/whom.c:40
-#: sieve/sieve.c:92
+#: sieve/sieve.c:93
 msgid "BOOL"
 msgstr "[yes  no]"
 
@@ -366,8 +366,8 @@ msgid "Cannot open device %s: %m"
 msgstr "   %s: %m"
 
 #: comsat/comsat.c:456 mail/copy.c:76 mail/file.c:95 mail/mail.c:438
-#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:218
-#: mh/mh_init.c:379 pop3d/apop.c:240
+#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:219
+#: mh/mh_init.c:380 pop3d/apop.c:240
 #, c-format
 msgid "Cannot open mailbox %s: %s"
 msgstr "    %s: %s"
@@ -637,7 +637,7 @@ msgstr "GNU from --   From  Subject"
 msgid "Just print a count of messages and exit"
 msgstr "    "
 
-#: frm/from.c:30 sieve/sieve.c:95
+#: frm/from.c:30 sieve/sieve.c:96
 msgid "ADDRESS"
 msgstr ""
 
@@ -683,13 +683,13 @@ msgid "Could not close mailbox `%s': %s"
 msgstr "    `%s': %s"
 
 #: frm/common.c:545 messages/messages.c:142 movemail/movemail.c:189
-#: sieve/sieve.c:457
+#: sieve/sieve.c:458
 #, c-format
 msgid "Could not create mailbox `%s': %s"
 msgstr "    `%s': %s"
 
 #: frm/common.c:548 messages/messages.c:145 movemail/movemail.c:193
-#: sieve/sieve.c:460
+#: sieve/sieve.c:461
 #, c-format
 msgid "Could not create default mailbox: %s"
 msgstr "    : %s"
@@ -734,9 +734,9 @@ msgid "Cannot open output mailbox %s: %s\n"
 msgstr "    %s: %s\n"
 
 #: guimb/main.c:45 imap4d/auth_gss.c:267 libsieve/sieve.l:132
-#: libsieve/sieve.l:603 libsieve/sieve.l:667 libsieve/sieve.l:721
-#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:111
-#: mh/mh_init.c:316 mh/mh_msgset.c:606
+#: libsieve/sieve.l:604 libsieve/sieve.l:668 libsieve/sieve.l:722
+#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:112
+#: mh/mh_init.c:317 mh/mh_msgset.c:606
 msgid "Not enough memory"
 msgstr " "
 
@@ -851,65 +851,65 @@ msgstr " GSSAPI %s     %s"
 msgid "User `%s' logged in"
 msgstr " `%s' "
 
-#: imap4d/imap4d.c:46
+#: imap4d/imap4d.c:47
 msgid "GNU imap4d -- the IMAP4D daemon"
 msgstr "GNU imap4d --  IMAP4D"
 
-#: imap4d/imap4d.c:52 imap4d/imap4d.c:54
+#: imap4d/imap4d.c:53 imap4d/imap4d.c:55
 msgid "PATHLIST"
 msgstr "-"
 
-#: imap4d/imap4d.c:53
+#: imap4d/imap4d.c:54
 msgid "Set the `other' namespace"
 msgstr "   `other'"
 
-#: imap4d/imap4d.c:55
+#: imap4d/imap4d.c:56
 msgid "Set the `shared' namespace"
 msgstr "   `shared'"
 
-#: imap4d/imap4d.c:57
+#: imap4d/imap4d.c:58
 msgid "Disable LOGIN command"
 msgstr "  LOGIN"
 
-#: imap4d/imap4d.c:60
+#: imap4d/imap4d.c:61
 msgid "Always require STARTTLS before entering authentication phase"
 msgstr "  STARTTLS     "
 
-#: imap4d/imap4d.c:175 pop3d/pop3d.c:201
+#: imap4d/imap4d.c:176 pop3d/pop3d.c:202
 msgid "Error getting mail group"
 msgstr "   \"mail\""
 
-#: imap4d/imap4d.c:181 pop3d/pop3d.c:207
+#: imap4d/imap4d.c:182 pop3d/pop3d.c:208
 msgid "Error setting mail group"
 msgstr "   \"mail\""
 
-#: imap4d/imap4d.c:260 pop3d/pop3d.c:298
+#: imap4d/imap4d.c:261 pop3d/pop3d.c:299
 msgid "Incoming connection opened"
 msgstr "  "
 
-#: imap4d/imap4d.c:262 pop3d/pop3d.c:310
+#: imap4d/imap4d.c:263 pop3d/pop3d.c:311
 #, c-format
 msgid "Cannot obtain IP address of client: %s"
 msgstr "  IP  : %s"
 
-#: imap4d/imap4d.c:265
+#: imap4d/imap4d.c:266
 #, c-format
 msgid "Connect from %s"
 msgstr "   %s"
 
-#: imap4d/imap4d.c:270 pop3d/pop3d.c:303
+#: imap4d/imap4d.c:271 pop3d/pop3d.c:304
 msgid "Started in debugging mode"
 msgstr "   "
 
-#: imap4d/imap4d.c:302
+#: imap4d/imap4d.c:303
 msgid "could not become daemon"
 msgstr "  "
 
-#: imap4d/imap4d.c:358
+#: imap4d/imap4d.c:359
 msgid "GNU imap4d started"
 msgstr "GNU imap4d "
 
-#: imap4d/imap4d.c:364
+#: imap4d/imap4d.c:365
 #, c-format
 msgid "Too many children (%lu)"
 msgstr "    (%lu)"
@@ -949,7 +949,7 @@ msgstr "   %s"
 msgid "Quitting (numeric reason %d)"
 msgstr " ( %d)"
 
-#: imap4d/list.c:247 mh/folder.c:326 mh/mh_init.c:225 mh/mh_init.c:704
+#: imap4d/list.c:247 mh/folder.c:327 mh/mh_init.c:226 mh/mh_init.c:705
 #: mh/rmf.c:147 pop3d/popauth.c:246
 #, c-format
 msgid "Cannot stat %s: %s"
@@ -979,25 +979,25 @@ msgstr "  %s"
 msgid "MASTER: exiting on signal"
 msgstr " :   "
 
-#: imap4d/util.c:509
+#: imap4d/util.c:510
 msgid "Unexpected eof on input"
 msgstr "    "
 
-#: imap4d/util.c:518
+#: imap4d/util.c:519
 #, c-format
 msgid "Error reading from input file: %s"
 msgstr "      %s"
 
-#: imap4d/util.c:1005
+#: imap4d/util.c:1006
 msgid "Cannot find out my own hostname"
 msgstr "    "
 
-#: imap4d/util.c:1152
+#: imap4d/util.c:1153
 #, c-format
 msgid "Cannot poll input stream: %s"
 msgstr "   : %s"
 
-#: imap4d/util.c:1186
+#: imap4d/util.c:1187
 #, c-format
 msgid "Cannot open TLS stream: %s"
 msgstr "   TLS: %s"
@@ -1119,106 +1119,106 @@ msgstr "%d:   : %s"
 msgid "%d: cannot get my email address"
 msgstr "%d:    email "
 
-#: libsieve/comparator.c:171
+#: libsieve/comparator.c:172
 #, c-format
 msgid "Regex error: %s"
 msgstr "  : %s"
 
-#: libsieve/comparator.c:176
+#: libsieve/comparator.c:177
 msgid "Regex error"
 msgstr "  "
 
-#: libsieve/comparator.c:238
+#: libsieve/comparator.c:239
 #, c-format
 msgid "match type specified twice in call to `%s'"
 msgstr "    %s  "
 
 #. TRANSLATORS: Do not translate ':count'. It is the name of a Sieve tag
-#: libsieve/comparator.c:275
+#: libsieve/comparator.c:276
 #, c-format
 msgid "comparator %s is incompatible with :count in call to `%s'"
 msgstr " %s   '%s'   :count"
 
-#: libsieve/comparator.c:291
+#: libsieve/comparator.c:292
 msgid "second argument must be a list of one element"
 msgstr "       "
 
-#: libsieve/comparator.c:299
+#: libsieve/comparator.c:300
 msgid "second argument cannot be converted to number"
 msgstr "     "
 
-#: libsieve/comparator.c:309
+#: libsieve/comparator.c:310
 #, c-format
 msgid "invalid relational match `%s' in call to `%s'"
 msgstr "   `%s'   `%s'"
 
-#: libsieve/comparator.c:322
+#: libsieve/comparator.c:323
 #, c-format
 msgid "comparator `%s' is incompatible with match type `%s' in call to `%s'"
 msgstr " %s    '%s'     '%s'"
 
-#: libsieve/prog.c:39
+#: libsieve/prog.c:40
 msgid "out of memory!"
 msgstr " !"
 
-#: libsieve/prog.c:158 libsieve/require.c:39
+#: libsieve/prog.c:159 libsieve/require.c:40
 #, c-format
 msgid "cannot create iterator: %s"
 msgstr "  : %s"
 
-#: libsieve/prog.c:177
+#: libsieve/prog.c:178
 #, c-format
 msgid "invalid tag name `%s' for `%s'"
 msgstr "   '%s'  '%s'"
 
-#: libsieve/prog.c:186
+#: libsieve/prog.c:187
 #, c-format
 msgid "%s:%d: cannot create tag list: %s"
 msgstr "%s:%d:    : %s"
 
-#: libsieve/prog.c:210
+#: libsieve/prog.c:211
 #, c-format
 msgid "%s:%d: cannot create check list: %s"
 msgstr "%s:%d:    : %s"
 
-#: libsieve/prog.c:222 mimeview/mimetypes.y:561
+#: libsieve/prog.c:223 mimeview/mimetypes.y:561
 #, c-format
 msgid "too many arguments in call to `%s'"
 msgstr "     '%s'"
 
-#: libsieve/prog.c:243
+#: libsieve/prog.c:244
 #, c-format
 msgid "type mismatch in argument %d to `%s'"
 msgstr " %d   '%s'   "
 
-#: libsieve/prog.c:247
+#: libsieve/prog.c:248
 #, c-format
 msgid "expected %s but passed %s"
 msgstr " %s,  %s"
 
-#: libsieve/prog.c:258
+#: libsieve/prog.c:259
 #, c-format
 msgid "cannot create arg list: %s"
 msgstr "   : %s"
 
-#: libsieve/prog.c:276 mimeview/mimetypes.y:553
+#: libsieve/prog.c:277 mimeview/mimetypes.y:553
 #, c-format
 msgid "too few arguments in call to `%s'"
 msgstr "    '%s'"
 
-#: libsieve/require.c:56
+#: libsieve/require.c:57
 msgid "required comparator"
 msgstr " "
 
-#: libsieve/require.c:62
+#: libsieve/require.c:63
 msgid "required test"
 msgstr " "
 
-#: libsieve/require.c:72
+#: libsieve/require.c:73
 msgid "required action"
 msgstr " "
 
-#: libsieve/require.c:78
+#: libsieve/require.c:79
 #, c-format
 msgid "source for the %s %s is not available"
 msgstr "    %s %s"
@@ -1232,8 +1232,8 @@ msgid "stack underflow"
 msgstr " "
 
 #: libsieve/runtime.c:341
-#, c-format
-msgid "mailbox_scan: %s"
+#, fuzzy, c-format
+msgid "mu_mailbox_scan: %s"
 msgstr "mailbox_scan: %s"
 
 #: libsieve/sieve.l:234
@@ -1338,7 +1338,7 @@ msgstr ""
 msgid "\"%s\": not a group"
 msgstr "\"%s\":  "
 
-#: mail/alt.c:64 mh/mh_init.c:127
+#: mail/alt.c:64 mh/mh_init.c:128
 msgid "Cannot determine my username"
 msgstr "   "
 
@@ -1352,13 +1352,13 @@ msgstr "    email: %s"
 msgid "cannot change to '%s': %s"
 msgstr " stat(%s): %s"
 
-#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:541 mh/inc.c:209
-#: mh/mh_init.c:369
+#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:542 mh/inc.c:210
+#: mh/mh_init.c:370
 #, c-format
 msgid "Cannot create mailbox %s: %s"
 msgstr "    %s: %s"
 
-#: mail/copy.c:92 mail/quit.c:126 mail/send.c:534
+#: mail/copy.c:92 mail/quit.c:126 mail/send.c:535
 #, c-format
 msgid "Cannot append message: %s"
 msgstr "  : %s"
@@ -1386,7 +1386,7 @@ msgstr ""
 "\n"
 ""
 
-#: mail/escape.c:59 mail/send.c:225 mh/mhn.c:2059 mimeview/mimeview.c:217
+#: mail/escape.c:59 mail/send.c:226 mh/mhn.c:2059 mimeview/mimeview.c:217
 #, c-format
 msgid "Cannot create header: %s"
 msgstr "  : %s"
@@ -1736,21 +1736,21 @@ msgstr "   \n"
 msgid "Sender address is obtained from the envelope\n"
 msgstr "     \n"
 
-#: mail/send.c:73
+#: mail/send.c:74
 #, c-format
 msgid "Cannot create header list: %s"
 msgstr "   : %s"
 
-#: mail/send.c:95
+#: mail/send.c:96
 #, c-format
 msgid "Invalid header: %s"
 msgstr " : %s"
 
-#: mail/send.c:308
+#: mail/send.c:309
 msgid "Cannot open temporary file"
 msgstr "   "
 
-#: mail/send.c:337
+#: mail/send.c:338
 msgid ""
 "\n"
 "(Interrupt -- one more to kill letter)"
@@ -1758,41 +1758,41 @@ msgstr ""
 "\n"
 "( --   ,   )"
 
-#: mail/send.c:348
+#: mail/send.c:349
 msgid "Use \".\" to terminate letter."
 msgstr " \".\"   ."
 
-#: mail/send.c:349
+#: mail/send.c:350
 msgid "Use \"~.\" to terminate letter."
 msgstr " \"~.\"   ."
 
-#: mail/send.c:391
+#: mail/send.c:392
 #, c-format
 msgid "Unknown escape %s"
 msgstr "   %s"
 
-#: mail/send.c:394
+#: mail/send.c:395
 msgid "Unfinished escape"
 msgstr "  "
 
-#: mail/send.c:398
+#: mail/send.c:399
 msgid "Cannot parse escape sequence"
 msgstr "   "
 
-#: mail/send.c:423 mh/mh_init.c:668 mh/mh_list.c:264
+#: mail/send.c:424 mh/mh_init.c:669 mh/mh_list.c:264
 #, c-format
 msgid "Cannot open file %s: %s"
 msgstr "   %s: %s"
 
-#: mail/send.c:484
+#: mail/send.c:485
 msgid "Null message body; hope that's ok\n"
 msgstr "  ;     \n"
 
-#: mail/send.c:578
+#: mail/send.c:579
 msgid "Variable sendmail not set: no mailer"
 msgstr " sendmail  :  ̣ "
 
-#: mail/send.c:626
+#: mail/send.c:627
 #, c-format
 msgid "Piping %s failed"
 msgstr "    %s"
@@ -2026,7 +2026,7 @@ msgstr ""
 msgid "Set name pattern for user-defined Scheme mail filters"
 msgstr "       Scheme"
 
-#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:86
+#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:87
 #: mimeview/mimeview.c:46
 msgid "FLAGS"
 msgstr ""
@@ -2039,7 +2039,7 @@ msgstr " "
 msgid "Multiple --from options"
 msgstr "  --from"
 
-#: mail.local/main.c:215 sieve/sieve.c:208
+#: mail.local/main.c:215 sieve/sieve.c:209
 #, c-format
 msgid "%c is not a valid debug flag"
 msgstr "  : %c"
@@ -2089,7 +2089,7 @@ msgstr ""
 msgid "Access to %s failed: %m"
 msgstr "    %s: %m"
 
-#: mail.local/main.c:427 sieve/sieve.c:375
+#: mail.local/main.c:427 sieve/sieve.c:376
 #, c-format
 msgid "Cannot initialize sieve machine: %s"
 msgstr "   sieve: %s"
@@ -2311,79 +2311,79 @@ msgstr "   : %s"
 msgid "Closing mailer failed: %s"
 msgstr "   : %s"
 
-#: mailbox/getopt.c:552 mailbox/getopt.c:571
+#: mailbox/getopt.c:551 mailbox/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s:  `%s' \n"
 
-#: mailbox/getopt.c:604 mailbox/getopt.c:608
+#: mailbox/getopt.c:603 mailbox/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s:  `--%s'   \n"
 
-#: mailbox/getopt.c:617 mailbox/getopt.c:622
+#: mailbox/getopt.c:616 mailbox/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s:  `%c%s'   \n"
 
-#: mailbox/getopt.c:668 mailbox/getopt.c:690 mailbox/getopt.c:1021
-#: mailbox/getopt.c:1043
+#: mailbox/getopt.c:667 mailbox/getopt.c:689 mailbox/getopt.c:1020
+#: mailbox/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s:  `%s'  \n"
 
-#: mailbox/getopt.c:728 mailbox/getopt.c:731
+#: mailbox/getopt.c:727 mailbox/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s:   `--%s'\n"
 
-#: mailbox/getopt.c:739 mailbox/getopt.c:742
+#: mailbox/getopt.c:738 mailbox/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s:   `%c%s'\n"
 
-#: mailbox/getopt.c:797 mailbox/getopt.c:800
+#: mailbox/getopt.c:796 mailbox/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s:   -- %c\n"
 
-#: mailbox/getopt.c:806 mailbox/getopt.c:809
+#: mailbox/getopt.c:805 mailbox/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s:   -- %c\n"
 
-#: mailbox/getopt.c:864 mailbox/getopt.c:883 mailbox/getopt.c:1096
-#: mailbox/getopt.c:1117
+#: mailbox/getopt.c:863 mailbox/getopt.c:882 mailbox/getopt.c:1095
+#: mailbox/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s:    -- %c\n"
 
-#: mailbox/getopt.c:936 mailbox/getopt.c:955
+#: mailbox/getopt.c:935 mailbox/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s:  `-W %s' \n"
 
-#: mailbox/getopt.c:979 mailbox/getopt.c:1000
+#: mailbox/getopt.c:978 mailbox/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s:  `-W %s'   \n"
 
-#: mailbox/argp-help.c:195
+#: mailbox/argp-help.c:194
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s:  ARGP_HELP_FMT  "
 
-#: mailbox/argp-help.c:204
+#: mailbox/argp-help.c:203
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s:   ARGP_HELP_FMT"
 
-#: mailbox/argp-help.c:216
+#: mailbox/argp-help.c:215
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "  ARGP_HELP_FMT: %s"
 
-#: mailbox/argp-help.c:1195
+#: mailbox/argp-help.c:1194
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
@@ -2391,67 +2391,67 @@ msgstr ""
 "         "
 "    ."
 
-#: mailbox/argp-help.c:1582
+#: mailbox/argp-help.c:1581
 msgid "Usage:"
 msgstr ":"
 
-#: mailbox/argp-help.c:1586
+#: mailbox/argp-help.c:1585
 msgid "  or: "
 msgstr "  : "
 
-#: mailbox/argp-help.c:1598
+#: mailbox/argp-help.c:1597
 msgid " [OPTION...]"
 msgstr " [...]"
 
-#: mailbox/argp-help.c:1625
+#: mailbox/argp-help.c:1624
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr ""
 " `%s --help'  `%s --usage'    .\n"
 
-#: mailbox/argp-help.c:1653
+#: mailbox/argp-help.c:1652
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "     %s.\n"
 
-#: mailbox/argp-help.c:1873
+#: mailbox/argp-help.c:1872
 msgid "Unknown system error"
 msgstr "  "
 
-#: mailbox/argp-parse.c:83
+#: mailbox/argp-parse.c:82
 msgid "Give this help list"
 msgstr "  "
 
-#: mailbox/argp-parse.c:84
+#: mailbox/argp-parse.c:83
 msgid "Give a short usage message"
 msgstr "    "
 
-#: mailbox/argp-parse.c:85
+#: mailbox/argp-parse.c:84
 msgid "Set the program name"
 msgstr "    "
 
-#: mailbox/argp-parse.c:87
+#: mailbox/argp-parse.c:86
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "    (  3600)"
 
-#: mailbox/argp-parse.c:148
+#: mailbox/argp-parse.c:147
 msgid "Print program version"
 msgstr "   "
 
-#: mailbox/argp-parse.c:164
+#: mailbox/argp-parse.c:163
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "( )  !?"
 
-#: mailbox/argp-parse.c:620
+#: mailbox/argp-parse.c:619
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s:   \n"
 
-#: mailbox/argp-parse.c:763
+#: mailbox/argp-parse.c:762
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "( )   !?"
 
-#: mailbox/file_stream.c:479
+#: mailbox/file_stream.c:480
 #, c-format
 msgid "%s must be a plain file with one link\n"
 msgstr "%s       \n"
@@ -2475,24 +2475,24 @@ msgstr "  iconv: %s"
 msgid "Stream is closed"
 msgstr " "
 
-#: mailbox/message.c:1092
-#, c-format
-msgid "mailbox_create_default (%s) failed: %s\n"
+#: mailbox/message.c:1093
+#, fuzzy, c-format
+msgid "mu_mailbox_create_default (%s) failed: %s\n"
 msgstr " mailbox_create_default (%s): %s\n"
 
-#: mailbox/message.c:1123
-#, c-format
-msgid "mailbox_open (%s) failed: %s\n"
+#: mailbox/message.c:1124
+#, fuzzy, c-format
+msgid "mu_mailbox_open (%s) failed: %s\n"
 msgstr " mailbox_open (%s): %s\n"
 
-#: mailbox/message.c:1131
-#, c-format
-msgid "mailbox_append_message (%s) failed: %s\n"
+#: mailbox/message.c:1132
+#, fuzzy, c-format
+msgid "mu_mailbox_append_message (%s) failed: %s\n"
 msgstr " mailbox_append_message (%s): %s\n"
 
-#: mailbox/message.c:1143
-#, c-format
-msgid "mailbox_close (%s) failed: %s\n"
+#: mailbox/message.c:1144
+#, fuzzy, c-format
+msgid "mu_mailbox_close (%s) failed: %s\n"
 msgstr " mailbox_close (%s): %s\n"
 
 #: mailbox/mu_argp.c:60
@@ -2515,7 +2515,7 @@ msgstr " URL   "
 msgid "Default locker flags (E=external, R=retry, T=time, P=pid)"
 msgstr "  (=, R= , T=, P=pid)"
 
-#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:76
+#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:77
 msgid "SECONDS"
 msgstr ""
 
@@ -2947,15 +2947,15 @@ msgstr ""
 msgid "[msg [msg...]]"
 msgstr "[ [...]]"
 
-#: mh/anno.c:33 mh/folder.c:49 mh/folder.c:59 mh/forw.c:37 mh/forw.c:43
-#: mh/inc.c:34 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
+#: mh/anno.c:33 mh/folder.c:50 mh/folder.c:60 mh/forw.c:37 mh/forw.c:43
+#: mh/inc.c:35 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
 #: mh/mhpath.c:32 mh/pick.c:39 mh/refile.c:38 mh/refile.c:47 mh/repl.c:40
-#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:39 mh/send.c:42
+#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:40 mh/send.c:42
 #: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:43
 msgid "FOLDER"
 msgstr ""
 
-#: mh/anno.c:34 mh/folder.c:60 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
+#: mh/anno.c:34 mh/folder.c:61 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
 #: mh/mhn.c:38 mh/mhpath.c:33 mh/pick.c:40 mh/refile.c:39 mh/repl.c:50
 #: mh/rmm.c:33
 msgid "Specify folder to operate upon"
@@ -2981,10 +2981,10 @@ msgstr "     "
 msgid "Field value for the component"
 msgstr "   "
 
-#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:80 mh/forw.c:75 mh/inc.c:55
+#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:81 mh/forw.c:75 mh/inc.c:56
 #: mh/install-mh.c:33 mh/mark.c:47 mh/mhl.c:53 mh/mhn.c:90 mh/mhpath.c:35
 #: mh/pick.c:96 mh/refile.c:52 mh/repl.c:72 mh/rmf.c:50 mh/rmm.c:35
-#: mh/scan.c:59 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
+#: mh/scan.c:60 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
 msgid "Display software license"
 msgstr " "
 
@@ -3001,16 +3001,16 @@ msgstr ""
 "GNU MH fmtcheck  -help     "
 " MH."
 
-#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:44 mh/mhl.c:43 mh/repl.c:58
-#: mh/scan.c:45
+#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:45 mh/mhl.c:43 mh/repl.c:58
+#: mh/scan.c:46
 msgid "Read format from given file"
 msgstr "    "
 
-#: mh/fmtcheck.c:34 mh/inc.c:45 mh/scan.c:46
+#: mh/fmtcheck.c:34 mh/inc.c:46 mh/scan.c:47
 msgid "FORMAT"
 msgstr ""
 
-#: mh/fmtcheck.c:35 mh/inc.c:46 mh/scan.c:47
+#: mh/fmtcheck.c:35 mh/inc.c:47 mh/scan.c:48
 msgid "Use this format string"
 msgstr "   "
 
@@ -3026,35 +3026,35 @@ msgstr "   "
 msgid "Format string not specified"
 msgstr "   "
 
-#: mh/fmtcheck.c:115 mh/inc.c:191 mh/repl.c:373 mh/scan.c:188
+#: mh/fmtcheck.c:115 mh/inc.c:192 mh/repl.c:373 mh/scan.c:189
 msgid "Bad format string"
 msgstr "  "
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/folder.c:39
+#: mh/folder.c:40
 msgid "GNU MH folderUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH folder  -help      "
 "MH."
 
-#: mh/folder.c:41
+#: mh/folder.c:42
 msgid "[action] [msg]"
 msgstr "[] []"
 
-#: mh/folder.c:44 pop3d/popauth.c:68
+#: mh/folder.c:45 pop3d/popauth.c:68
 msgid "Actions are:"
 msgstr ":"
 
-#: mh/folder.c:46
+#: mh/folder.c:47
 msgid "List the folders (default)"
 msgstr "   ()"
 
-#: mh/folder.c:48
+#: mh/folder.c:49
 msgid "List the contents of the folder stack"
 msgstr "   "
 
-#: mh/folder.c:50
+#: mh/folder.c:51
 msgid ""
 "Push the folder on the folder stack. If FOLDER is specified, it is pushed. "
 "Otherwise, if a folder is given in the command line (via + or --folder), it "
@@ -3067,44 +3067,44 @@ msgstr ""
 ".   ,        "
 " ."
 
-#: mh/folder.c:55
+#: mh/folder.c:56
 msgid "Pop the folder off the folder stack"
 msgstr "     "
 
-#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:80
+#: mh/folder.c:58 mh/mh_whatnow.c:153 pop3d/popauth.c:80
 msgid "Options are:"
 msgstr ":"
 
-#: mh/folder.c:62
+#: mh/folder.c:63
 msgid "List all folders"
 msgstr "  "
 
-#: mh/folder.c:64
+#: mh/folder.c:65
 msgid "Create non-existing folders"
 msgstr "  "
 
-#: mh/folder.c:67
+#: mh/folder.c:68
 msgid "List only the folder names"
 msgstr "   "
 
-#: mh/folder.c:70
+#: mh/folder.c:71
 msgid "Print the header line"
 msgstr "  "
 
-#: mh/folder.c:73
+#: mh/folder.c:74
 msgid "Scan folders recursively"
 msgstr "   "
 
-#: mh/folder.c:76
+#: mh/folder.c:77
 msgid "Output the total statistics"
 msgstr "  "
 
-#: mh/folder.c:309 mh/rmf.c:128
+#: mh/folder.c:310 mh/rmf.c:128
 #, c-format
 msgid "Cannot scan folder %s: %s"
 msgstr "   %s: %s"
 
-#: mh/folder.c:382
+#: mh/folder.c:383
 #, c-format
 msgid " has %4lu message  (%4lu-%4lu)"
 msgid_plural " has %4lu messages (%4lu-%4lu)"
@@ -3112,17 +3112,17 @@ msgstr[0] " %4lu  (%4lu-%4lu)"
 msgstr[1] " %4lu  (%4lu-%4lu)"
 msgstr[2] " %4lu  (%4lu-%4lu)"
 
-#: mh/folder.c:393
+#: mh/folder.c:394
 #, c-format
 msgid " has no messages"
 msgstr "  "
 
-#: mh/folder.c:402
+#: mh/folder.c:403
 #, c-format
 msgid "(others)"
 msgstr "()"
 
-#: mh/folder.c:450
+#: mh/folder.c:451
 #, c-format
 msgid ""
 "Folder                  # of messages     (  range  )  cur msg   (other "
@@ -3131,11 +3131,11 @@ msgstr ""
 "                 -     ( )  .. (. "
 ")\n"
 
-#: mh/folder.c:456
+#: mh/folder.c:457
 msgid "TOTAL"
 msgstr ""
 
-#: mh/folder.c:457
+#: mh/folder.c:458
 #, c-format
 msgid "%4lu message  "
 msgid_plural "%4lu messages "
@@ -3143,7 +3143,7 @@ msgstr[0] "%4lu  "
 msgstr[1] "%4lu  "
 msgstr[2] "%4lu  "
 
-#: mh/folder.c:460
+#: mh/folder.c:461
 #, c-format
 msgid "in %4lu folder"
 msgid_plural "in %4lu folders"
@@ -3218,7 +3218,7 @@ msgstr "    --"
 msgid "Use MIME encapsulation"
 msgstr "  MIME"
 
-#: mh/forw.c:65 mh/inc.c:51 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:51
+#: mh/forw.c:65 mh/inc.c:52 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:52
 msgid "Set output width"
 msgstr "    "
 
@@ -3236,15 +3236,15 @@ msgstr ""
 msgid "Use draft file preserved after the last session"
 msgstr "  ,    "
 
-#: mh/forw.c:147 mh/inc.c:137 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:124
+#: mh/forw.c:147 mh/inc.c:138 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:125
 msgid "Invalid width"
 msgstr " "
 
-#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:138
+#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:139
 msgid "Option is not yet implemented"
 msgstr "   "
 
-#: mh/forw.c:285 mh/mh_init.c:536
+#: mh/forw.c:285 mh/mh_init.c:537
 #, c-format
 msgid "Cannot open output file `%s': %s"
 msgstr "    `%s': %s"
@@ -3267,63 +3267,63 @@ msgstr "  "
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/inc.c:26
+#: mh/inc.c:27
 msgid "GNU MH incUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH inc  -help      MH."
 
-#: mh/inc.c:28 mh/rmf.c:37
+#: mh/inc.c:29 mh/rmf.c:37
 msgid "[+folder]"
 msgstr "[+]"
 
-#: mh/inc.c:33
+#: mh/inc.c:34
 msgid "Incorporate mail from named file"
 msgstr "    "
 
-#: mh/inc.c:35
+#: mh/inc.c:36
 msgid "Specify folder to incorporate mail to"
 msgstr "    "
 
-#: mh/inc.c:37
+#: mh/inc.c:38
 msgid "Enable audit"
 msgstr " "
 
-#: mh/inc.c:39
+#: mh/inc.c:40
 msgid "Disable audit"
 msgstr " "
 
-#: mh/inc.c:41
+#: mh/inc.c:42
 msgid "Mark first incorporated message as current (default)"
 msgstr "      ( )"
 
-#: mh/inc.c:48
+#: mh/inc.c:49
 msgid "Truncate source mailbox after incorporating (default)"
 msgstr "      ( )"
 
-#: mh/inc.c:53 mh/mhn.c:88
+#: mh/inc.c:54 mh/mhn.c:88
 msgid "Be quiet"
 msgstr "   "
 
-#: mh/inc.c:200
+#: mh/inc.c:201
 msgid "Cannot create default mailbox"
 msgstr "    "
 
-#: mh/inc.c:226
+#: mh/inc.c:227
 #, c-format
 msgid "Cannot read input mailbox: %s"
 msgstr "     : %s"
 
-#: mh/inc.c:233
+#: mh/inc.c:234
 #, c-format
 msgid "Cannot read output mailbox: %s"
 msgstr "     : %s"
 
-#: mh/inc.c:254
+#: mh/inc.c:255
 #, c-format
 msgid "%d: cannot get message: %s"
 msgstr "%d:   : %s"
 
-#: mh/inc.c:261
+#: mh/inc.c:262
 #, c-format
 msgid "%d: error appending message: %s"
 msgstr "%d:    : %s"
@@ -3403,12 +3403,12 @@ msgstr ""
 "  %s\n"
 "\n"
 
-#: mh/mh_ctx.c:92
+#: mh/mh_ctx.c:93
 #, c-format
 msgid "Cannot open context file %s: %s"
 msgstr "    %s: %s"
 
-#: mh/mh_ctx.c:142
+#: mh/mh_ctx.c:143
 #, c-format
 msgid "Cannot create context %s: %s"
 msgstr "   %s: %s"
@@ -3435,17 +3435,17 @@ msgstr "   %s"
 msgid "Extra arguments to %s"
 msgstr "   %s"
 
-#: mh/mh_format.c:603
+#: mh/mh_format.c:604
 #, c-format
 msgid "INTERNAL ERROR: Unknown opcode: %x"
 msgstr " :   : %x"
 
 #. TRANSLATORS: Do not translate the word 'format'!
-#: mh/mh_format.c:946 mh/mh_format.c:958
+#: mh/mh_format.c:947 mh/mh_format.c:959
 msgid "format: divide by zero"
 msgstr "format:   "
 
-#: mh/mh_format.c:1874
+#: mh/mh_format.c:1875
 msgid "Invalid recipient mask"
 msgstr "  "
 
@@ -3475,74 +3475,74 @@ msgstr ""
 "    GNU.\n"
 " %s --help    .\n"
 
-#: mh/mh_init.c:69
+#: mh/mh_init.c:70
 #, c-format
 msgid "Cannot stat format file %s: %s"
 msgstr "      %s: %s"
 
-#: mh/mh_init.c:76
+#: mh/mh_init.c:77
 #, c-format
 msgid "Cannot open format file %s: %s"
 msgstr "    %s: %s"
 
-#: mh/mh_init.c:206
+#: mh/mh_init.c:207
 #, c-format
 msgid "Create folder \"%s\""
 msgstr "  \"%s\""
 
-#: mh/mh_init.c:214
+#: mh/mh_init.c:215
 #, c-format
 msgid "Cannot create directory %s: %s"
 msgstr "   %s: %s"
 
 #. TRANSLATORS: See msgids "nN" and "yY".
-#: mh/mh_init.c:267
+#: mh/mh_init.c:268
 #, c-format
 msgid "Please answer yes or no: "
 msgstr "  'yes'  'no'"
 
-#: mh/mh_init.c:326
+#: mh/mh_init.c:327
 #, c-format
 msgid "Cannot open audit file %s: %s"
 msgstr "    %s: %s"
 
 # ""    
-#: mh/mh_init.c:457 mh/mh_msgset.c:165
+#: mh/mh_init.c:458 mh/mh_msgset.c:165
 #, c-format
 msgid "Cannot get message %d: %s"
 msgstr "   %d: %s"
 
-#: mh/mh_init.c:475
+#: mh/mh_init.c:476
 #, c-format
 msgid "Cannot split line %s"
 msgstr "   %s"
 
-#: mh/mh_init.c:527
+#: mh/mh_init.c:528
 #, c-format
 msgid "Cannot open input file `%s': %s"
 msgstr "    `%s': %s"
 
-#: mh/mh_init.c:550
+#: mh/mh_init.c:551
 #, c-format
 msgid "Write error on `%s': %s"
 msgstr "   `%s': %s"
 
-#: mh/mh_init.c:579
+#: mh/mh_init.c:580
 #, c-format
 msgid "Cannot stat file %s: %s"
 msgstr " stat(%s): %s"
 
-#: mh/mh_init.c:585 mh/mhn.c:2267
+#: mh/mh_init.c:586 mh/mhn.c:2267
 #, c-format
 msgid "Cannot create input stream (file %s): %s"
 msgstr "    ( %s): %s"
 
-#: mh/mh_init.c:592 mh/mhn.c:2274
+#: mh/mh_init.c:593 mh/mhn.c:2274
 #, c-format
 msgid "Cannot open input stream (file %s): %s"
 msgstr "    ( %s): %s"
 
-#: mh/mh_init.c:605
+#: mh/mh_init.c:606
 #, c-format
 msgid ""
 "Prior to using MH, it is necessary to have a file in your login\n"
@@ -3557,40 +3557,40 @@ msgstr ""
 "     MH.  : %s...\n"
 
 #    
-#: mh/mh_init.c:628
+#: mh/mh_init.c:629
 msgid "Do you need help"
 msgstr " "
 
-#: mh/mh_init.c:631
+#: mh/mh_init.c:632
 #, c-format
 msgid "Do you want the standard MH path \"%s\""
 msgstr "   MH \"%s\""
 
-#: mh/mh_init.c:636
+#: mh/mh_init.c:637
 msgid "Do you want a path below your login directory"
 msgstr "    "
 
-#: mh/mh_init.c:638
+#: mh/mh_init.c:639
 #, c-format
 msgid "What is the path? "
 msgstr "    : "
 
-#: mh/mh_init.c:640
+#: mh/mh_init.c:641
 #, c-format
 msgid "What is the full path? "
 msgstr "  : "
 
-#: mh/mh_init.c:699
+#: mh/mh_init.c:700
 #, c-format
 msgid "I'm going to create the standard MH path for you.\n"
 msgstr "   MH.\n"
 
-#: mh/mh_init.c:710
+#: mh/mh_init.c:711
 msgid "You already have an MH profile, use an editor to modify it"
 msgstr ""
 "    .mh_profile,      "
 
-#: mh/mh_init.c:715
+#: mh/mh_init.c:716
 #, c-format
 msgid ""
 "You already have file %s which is not a regular file or a symbolic link.\n"
@@ -4101,7 +4101,7 @@ msgstr ""
 "GNU MH mhpath  -help      "
 "MH."
 
-#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:35
+#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:36
 msgid "[+folder] [msgs]"
 msgstr "[+] []"
 
@@ -4420,38 +4420,38 @@ msgstr ""
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/scan.c:33
+#: mh/scan.c:34
 msgid "GNU MH scanUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH scan  -help      "
 "MH."
 
-#: mh/scan.c:40
+#: mh/scan.c:41
 msgid "Specify folder to scan"
 msgstr "  "
 
-#: mh/scan.c:42
+#: mh/scan.c:43
 msgid "Clear screen after displaying the list"
 msgstr "    "
 
-#: mh/scan.c:49
+#: mh/scan.c:50
 msgid "Display header"
 msgstr " "
 
-#: mh/scan.c:53
+#: mh/scan.c:54
 msgid "List messages in reverse order"
 msgstr "    "
 
-#: mh/scan.c:56
+#: mh/scan.c:57
 msgid "[Not yet implemented]"
 msgstr "[  ]"
 
-#: mh/scan.c:228
+#: mh/scan.c:229
 #, c-format
 msgid "no messages in %s"
 msgstr " %s  "
 
-#: mh/scan.c:249
+#: mh/scan.c:250
 #, c-format
 msgid "Folder %s  %s\n"
 msgstr " %s  %s\n"
@@ -4533,7 +4533,7 @@ msgstr "  "
 msgid "* Make header fields no longer than NUMBER columns"
 msgstr "*      "
 
-#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:134 pop3d/pop3d.c:148
+#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:135 pop3d/pop3d.c:149
 msgid "Invalid number"
 msgstr "  "
 
@@ -4652,15 +4652,18 @@ msgid "Cannot lock"
 msgstr " "
 
 #: movemail/movemail.c:169
-msgid "mailbox_get_folder failed"
+#, fuzzy
+msgid "mu_mailbox_get_folder failed"
 msgstr "  mailbox_get_folder"
 
 #: movemail/movemail.c:172
-msgid "folder_get_authority failed"
+#, fuzzy
+msgid "mu_folder_get_authority failed"
 msgstr "  folder_get_authority"
 
 #: movemail/movemail.c:175
-msgid "authority_set_ticket failed"
+#, fuzzy
+msgid "mu_authority_set_ticket failed"
 msgstr "  authority_set_ticket"
 
 #: movemail/movemail.c:202
@@ -4763,62 +4766,62 @@ msgstr "    "
 msgid "Locking mailbox `%s' failed: %s"
 msgstr "    `%s': %s"
 
-#: pop3d/pop3d.c:64
+#: pop3d/pop3d.c:65
 msgid "GNU pop3d -- the POP3 daemon"
 msgstr "GNU pop3d --  POP3"
 
-#: pop3d/pop3d.c:74
+#: pop3d/pop3d.c:75
 msgid "Undelete all messages on startup"
 msgstr "    ,   ."
 
-#: pop3d/pop3d.c:77
+#: pop3d/pop3d.c:78
 msgid "Allowed delay between the two successive logins"
 msgstr ""
 "         "
 ""
 
-#: pop3d/pop3d.c:78
+#: pop3d/pop3d.c:79
 msgid "FILENAME"
 msgstr ""
 
-#: pop3d/pop3d.c:79
+#: pop3d/pop3d.c:80
 msgid "Name of login statistics file"
 msgstr "  "
 
-#: pop3d/pop3d.c:81
+#: pop3d/pop3d.c:82
 msgid "DAYS"
 msgstr "-"
 
-#: pop3d/pop3d.c:82
+#: pop3d/pop3d.c:83
 msgid "Expire read messages after the given number of days"
 msgstr " ,    "
 
-#: pop3d/pop3d.c:84
+#: pop3d/pop3d.c:85
 msgid "Delete expired messages upon closing the mailbox"
 msgstr "      "
 
-#: pop3d/pop3d.c:87
+#: pop3d/pop3d.c:88
 msgid "Always require STLS before entering authentication phase"
 msgstr "  STLS     "
 
-#: pop3d/pop3d.c:277
+#: pop3d/pop3d.c:278
 msgid "Failed to become a daemon:"
 msgstr "  :"
 
-#: pop3d/pop3d.c:313
+#: pop3d/pop3d.c:314
 #, c-format
 msgid "connect from %s"
 msgstr "   %s"
 
-#: pop3d/pop3d.c:437
+#: pop3d/pop3d.c:438
 msgid "Session terminated"
 msgstr " "
 
-#: pop3d/pop3d.c:523
+#: pop3d/pop3d.c:524
 msgid "GNU pop3d started"
 msgstr "GNU pop3d "
 
-#: pop3d/pop3d.c:530
+#: pop3d/pop3d.c:531
 #, c-format
 msgid "too many children (%lu)"
 msgstr "    (%lu)"
@@ -5072,7 +5075,7 @@ msgstr "    `%s': %s\n"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: sieve/sieve.c:53
+#: sieve/sieve.c:54
 msgid ""
 "GNU sieve -- a mail filtering tool\n"
 "Debug flags:\n"
@@ -5090,155 +5093,155 @@ msgstr ""
 "  t -  sieve (MU_SIEVE_DEBUG_TRACE)\n"
 "  i -    (MU_SIEVE_DEBUG_INSTR)\n"
 
-#: sieve/sieve.c:69
+#: sieve/sieve.c:70
 msgid "Do not execute any actions, just print what would be done"
 msgstr "   ,      "
 
-#: sieve/sieve.c:72
+#: sieve/sieve.c:73
 msgid "Keep on going if execution fails on a message"
 msgstr "   "
 
-#: sieve/sieve.c:75
+#: sieve/sieve.c:76
 msgid "Compile script and exit"
 msgstr "    "
 
-#: sieve/sieve.c:78
+#: sieve/sieve.c:79
 msgid "Compile script, dump disassembled sieve code to terminal and exit"
 msgstr ""
 " ,        "
 
-#: sieve/sieve.c:80
+#: sieve/sieve.c:81
 msgid "MBOX"
 msgstr "-"
 
-#: sieve/sieve.c:81
+#: sieve/sieve.c:82
 msgid "Mailbox to sieve (defaults to user's mail spool)"
 msgstr ""
 "      (  --  "
 "  )"
 
-#: sieve/sieve.c:83
+#: sieve/sieve.c:84
 msgid "TICKET"
 msgstr ""
 
-#: sieve/sieve.c:84
+#: sieve/sieve.c:85
 msgid "Ticket file for mailbox authentication"
 msgstr "      "
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "Debug flags (defaults to \""
 msgstr "  (  -- \""
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "\")"
 msgstr "\")"
 
-#: sieve/sieve.c:90
+#: sieve/sieve.c:91
 msgid "Log all actions"
 msgstr "   "
 
-#: sieve/sieve.c:93
+#: sieve/sieve.c:94
 msgid "Print source location along with action logs (default)"
 msgstr ""
 "        ,  "
 "  (  )"
 
-#: sieve/sieve.c:96
+#: sieve/sieve.c:97
 msgid "Override user email address"
 msgstr " email  "
 
-#: sieve/sieve.c:149
+#: sieve/sieve.c:150
 #, c-format
 msgid "Invalid email: %s"
 msgstr "  : %s"
 
-#: sieve/sieve.c:170
+#: sieve/sieve.c:171
 msgid "Only one MBOX can be specified"
 msgstr "    -"
 
-#: sieve/sieve.c:224
+#: sieve/sieve.c:225
 msgid "Only one SCRIPT can be specified"
 msgstr "    "
 
-#: sieve/sieve.c:229
+#: sieve/sieve.c:230
 msgid "SCRIPT must be specified"
 msgstr "   "
 
-#: sieve/sieve.c:242
+#: sieve/sieve.c:243
 msgid "SCRIPT"
 msgstr ""
 
-#: sieve/sieve.c:300 sieve/sieve.c:325
+#: sieve/sieve.c:301 sieve/sieve.c:326
 #, c-format
 msgid "%s:%lu: %s on msg uid %lu"
 msgstr "%s:%lu: %s    UID %lu"
 
-#: sieve/sieve.c:304 sieve/sieve.c:329
+#: sieve/sieve.c:305 sieve/sieve.c:330
 #, c-format
 msgid "%s on msg uid %lu"
 msgstr "%s    UID %lu"
 
-#: sieve/sieve.c:415
+#: sieve/sieve.c:416
 #, c-format
 msgid "ticket_get failed: %s"
 msgstr "  ticket_get: %s"
 
-#: sieve/sieve.c:421
-#, c-format
-msgid "wicket_create `%s' failed: %s"
+#: sieve/sieve.c:422
+#, fuzzy, c-format
+msgid "mu_wicket_create `%s' failed: %s"
 msgstr "  wicket_create(%s): %s"
 
-#: sieve/sieve.c:434
+#: sieve/sieve.c:435
 #, c-format
 msgid "mu_debug_create failed: %s"
 msgstr "  mu_debug_create: %s"
 
-#: sieve/sieve.c:439
+#: sieve/sieve.c:440
 #, c-format
 msgid "mu_debug_set_level failed: %s"
 msgstr "  mu_debug_set_level: %s"
 
-#: sieve/sieve.c:445
+#: sieve/sieve.c:446
 #, c-format
 msgid "mu_debug_set_print failed: %s"
 msgstr "  mu_debug_set_print: %s"
 
-#: sieve/sieve.c:467
-#, c-format
-msgid "mailbox_set_debug failed: %s"
+#: sieve/sieve.c:468
+#, fuzzy, c-format
+msgid "mu_mailbox_set_debug failed: %s"
 msgstr "  mailbox_set_debug: %s"
 
-#: sieve/sieve.c:478
-#, c-format
-msgid "mailbox_get_folder failed: %s"
+#: sieve/sieve.c:479
+#, fuzzy, c-format
+msgid "mu_mailbox_get_folder failed: %s"
 msgstr "  mailbox_get_folder: %s"
 
-#: sieve/sieve.c:485
-#, c-format
-msgid "folder_get_authority failed: %s"
+#: sieve/sieve.c:486
+#, fuzzy, c-format
+msgid "mu_folder_get_authority failed: %s"
 msgstr "  folder_get_authority: %s"
 
-#: sieve/sieve.c:493
-#, c-format
-msgid "authority_set_ticket failed: %s"
+#: sieve/sieve.c:494
+#, fuzzy, c-format
+msgid "mu_authority_set_ticket failed: %s"
 msgstr "  authority_set_ticket: %s"
 
-#: sieve/sieve.c:508
+#: sieve/sieve.c:509
 #, c-format
 msgid "Opening mailbox `%s' failed: %s"
 msgstr "     `%s': %s"
 
-#: sieve/sieve.c:511
+#: sieve/sieve.c:512
 #, c-format
 msgid "Opening default mailbox failed: %s"
 msgstr "     : %s"
 
-#: sieve/sieve.c:532
+#: sieve/sieve.c:533
 #, c-format
 msgid "Expunge on mailbox `%s' failed: %s"
 msgstr "    `%s': %s"
 
-#: sieve/sieve.c:535
+#: sieve/sieve.c:536
 #, c-format
 msgid "Expunge on default mailbox failed: %s"
 msgstr "    : %s"

@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mailutils 0.6\n"
 "Report-Msgid-Bugs-To: bug-mailutils@gnu.org\n"
-"POT-Creation-Date: 2005-08-16 13:23+0300\n"
+"POT-Creation-Date: 2005-08-26 17:10+0300\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -62,7 +62,7 @@ msgstr ""
 "Bivuye iyi Urutonde Na: Zeru Imimerere NIBA Byose Bya i Amahitamo i Gusohoka "
 "Imimerere ni 1."
 
-#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:569
+#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:570
 #, fuzzy
 msgid "Too many arguments"
 msgstr "ingingo"
@@ -138,8 +138,8 @@ msgid "Name of the database to connect to"
 msgstr "Bya i Ububikoshingiro Kuri Kwihuza Kuri"
 
 #: auth/sql.c:201 mailbox/mu_argp.c:80 mailbox/mu_argp.c:115
-#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
-#: mh/repl.c:65 mh/scan.c:50 mh/send.c:75
+#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:51 mh/mhl.c:44 mh/mhl.c:46
+#: mh/repl.c:65 mh/scan.c:51 mh/send.c:75
 #, fuzzy
 msgid "NUMBER"
 msgstr "Umubare"
@@ -188,8 +188,8 @@ msgstr "Amahitamo"
 #: auth/tls.c:59 auth/tls.c:61 auth/tls.c:63 comsat/comsat.c:59
 #: dotlock/dotlock.c:43 frm/from.c:32 mail.local/main.c:83
 #: mailbox/mu_argp.c:125 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
-#: mh/inc.c:32 mh/inc.c:36 mh/inc.c:43 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
-#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:44 mh/scan.c:55 mh/send.c:38
+#: mh/inc.c:33 mh/inc.c:37 mh/inc.c:44 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
+#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:45 mh/scan.c:56 mh/send.c:38
 #: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:81 pop3d/popauth.c:82
 #: mimeview/mimeview.c:48 mimeview/mimeview.c:52
 msgid "FILE"
@@ -215,17 +215,17 @@ msgstr "IDOSIYE"
 msgid "INTERNAL ERROR: cannot register argp capability tls"
 msgstr "Kwiyandikisha TLS"
 
-#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:63 mh/folder.c:66
-#: mh/folder.c:69 mh/folder.c:72 mh/folder.c:75 mh/forw.c:33 mh/forw.c:49
-#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:40 mh/inc.c:47
+#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:64 mh/folder.c:67
+#: mh/folder.c:70 mh/folder.c:73 mh/folder.c:76 mh/forw.c:33 mh/forw.c:49
+#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:41 mh/inc.c:48
 #: mh/mark.c:40 mh/mark.c:43 mh/mhl.c:36 mh/mhl.c:39 mh/mhn.c:43 mh/mhn.c:48
 #: mh/mhn.c:51 mh/mhn.c:54 mh/mhn.c:59 mh/mhn.c:62 mh/mhn.c:67 mh/mhn.c:72
 #: mh/mhn.c:75 mh/mhn.c:84 mh/pick.c:84 mh/pick.c:89 mh/pick.c:92
 #: mh/refile.c:42 mh/refile.c:45 mh/repl.c:36 mh/repl.c:51 mh/repl.c:59
-#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:41
-#: mh/scan.c:48 mh/scan.c:52 mh/send.c:52 mh/send.c:55 mh/send.c:58
+#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:42
+#: mh/scan.c:49 mh/scan.c:53 mh/send.c:52 mh/send.c:55 mh/send.c:58
 #: mh/send.c:61 mh/send.c:64 mh/send.c:69 mh/send.c:72 mh/whom.c:40
-#: sieve/sieve.c:92
+#: sieve/sieve.c:93
 msgid "BOOL"
 msgstr ""
 
@@ -442,8 +442,8 @@ msgid "Cannot open device %s: %m"
 msgstr "Gufungura APAREYE"
 
 #: comsat/comsat.c:456 mail/copy.c:76 mail/file.c:95 mail/mail.c:438
-#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:218
-#: mh/mh_init.c:379 pop3d/apop.c:240
+#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:219
+#: mh/mh_init.c:380 pop3d/apop.c:240
 #, fuzzy, c-format
 msgid "Cannot open mailbox %s: %s"
 msgstr "OYA Gufungura"
@@ -731,7 +731,7 @@ msgstr "Bivuye Kugaragaza Bivuye Na Ikivugwaho"
 msgid "Just print a count of messages and exit"
 msgstr "a Inshamake Bya Ubutumwa"
 
-#: frm/from.c:30 sieve/sieve.c:95
+#: frm/from.c:30 sieve/sieve.c:96
 msgid "ADDRESS"
 msgstr "ADERESI"
 
@@ -775,13 +775,13 @@ msgid "Could not close mailbox `%s': %s"
 msgstr "Gufungura"
 
 #: frm/common.c:545 messages/messages.c:142 movemail/movemail.c:189
-#: sieve/sieve.c:457
+#: sieve/sieve.c:458
 #, fuzzy, c-format
 msgid "Could not create mailbox `%s': %s"
 msgstr "OYA Kurema"
 
 #: frm/common.c:548 messages/messages.c:145 movemail/movemail.c:193
-#: sieve/sieve.c:460
+#: sieve/sieve.c:461
 #, fuzzy, c-format
 msgid "Could not create default mailbox: %s"
 msgstr "OYA Kurema Mburabuzi"
@@ -827,9 +827,9 @@ msgid "Cannot open output mailbox %s: %s\n"
 msgstr "OYA Gufungura"
 
 #: guimb/main.c:45 imap4d/auth_gss.c:267 libsieve/sieve.l:132
-#: libsieve/sieve.l:603 libsieve/sieve.l:667 libsieve/sieve.l:721
-#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:111
-#: mh/mh_init.c:316 mh/mh_msgset.c:606
+#: libsieve/sieve.l:604 libsieve/sieve.l:668 libsieve/sieve.l:722
+#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:112
+#: mh/mh_init.c:317 mh/mh_msgset.c:606
 msgid "Not enough memory"
 msgstr "Ububiko ntibuhagije"
 
@@ -949,75 +949,75 @@ msgstr "Ukoresha: ni Nka"
 msgid "User `%s' logged in"
 msgstr "in"
 
-#: imap4d/imap4d.c:46
+#: imap4d/imap4d.c:47
 #, fuzzy
 msgid "GNU imap4d -- the IMAP4D daemon"
 msgstr "i"
 
-#: imap4d/imap4d.c:52 imap4d/imap4d.c:54
+#: imap4d/imap4d.c:53 imap4d/imap4d.c:55
 msgid "PATHLIST"
 msgstr ""
 
-#: imap4d/imap4d.c:53
+#: imap4d/imap4d.c:54
 #, fuzzy
 msgid "Set the `other' namespace"
 msgstr "Gushyiraho i"
 
-#: imap4d/imap4d.c:55
+#: imap4d/imap4d.c:56
 #, fuzzy
 msgid "Set the `shared' namespace"
 msgstr "Gushyiraho i"
 
-#: imap4d/imap4d.c:57
+#: imap4d/imap4d.c:58
 #, fuzzy
 msgid "Disable LOGIN command"
 msgstr "Komandi:"
 
-#: imap4d/imap4d.c:60
+#: imap4d/imap4d.c:61
 #, fuzzy
 msgid "Always require STARTTLS before entering authentication phase"
 msgstr "Mbere"
 
-#: imap4d/imap4d.c:175 pop3d/pop3d.c:201
+#: imap4d/imap4d.c:176 pop3d/pop3d.c:202
 #, fuzzy
 msgid "Error getting mail group"
 msgstr "Ubutumwa Itsinda"
 
-#: imap4d/imap4d.c:181 pop3d/pop3d.c:207
+#: imap4d/imap4d.c:182 pop3d/pop3d.c:208
 #, fuzzy
 msgid "Error setting mail group"
 msgstr "Igenamiterere Ubutumwa Itsinda"
 
-#: imap4d/imap4d.c:260 pop3d/pop3d.c:298
+#: imap4d/imap4d.c:261 pop3d/pop3d.c:299
 #, fuzzy
 msgid "Incoming connection opened"
 msgstr "Ukwihuza"
 
-#: imap4d/imap4d.c:262 pop3d/pop3d.c:310
+#: imap4d/imap4d.c:263 pop3d/pop3d.c:311
 #, fuzzy, c-format
 msgid "Cannot obtain IP address of client: %s"
 msgstr "Aderesi Bya Umukiriya"
 
-#: imap4d/imap4d.c:265
+#: imap4d/imap4d.c:266
 #, fuzzy, c-format
 msgid "Connect from %s"
 msgstr "Kwihuza Bivuye"
 
-#: imap4d/imap4d.c:270 pop3d/pop3d.c:303
+#: imap4d/imap4d.c:271 pop3d/pop3d.c:304
 #, fuzzy
 msgid "Started in debugging mode"
 msgstr "in Ubwoko"
 
-#: imap4d/imap4d.c:302
+#: imap4d/imap4d.c:303
 #, fuzzy
 msgid "could not become daemon"
 msgstr "Byanze Kuri a"
 
-#: imap4d/imap4d.c:358
+#: imap4d/imap4d.c:359
 msgid "GNU imap4d started"
 msgstr ""
 
-#: imap4d/imap4d.c:364
+#: imap4d/imap4d.c:365
 #, c-format
 msgid "Too many children (%lu)"
 msgstr ""
@@ -1061,7 +1061,7 @@ msgstr "kugirango Ukoresha:"
 msgid "Quitting (numeric reason %d)"
 msgstr "Bikurikije umubare"
 
-#: imap4d/list.c:247 mh/folder.c:326 mh/mh_init.c:225 mh/mh_init.c:704
+#: imap4d/list.c:247 mh/folder.c:327 mh/mh_init.c:226 mh/mh_init.c:705
 #: mh/rmf.c:147 pop3d/popauth.c:246
 #, fuzzy, c-format
 msgid "Cannot stat %s: %s"
@@ -1092,27 +1092,27 @@ msgstr ""
 msgid "MASTER: exiting on signal"
 msgstr "ku"
 
-#: imap4d/util.c:509
+#: imap4d/util.c:510
 #, fuzzy
 msgid "Unexpected eof on input"
 msgstr "ku Iyinjiza"
 
-#: imap4d/util.c:518
+#: imap4d/util.c:519
 #, fuzzy, c-format
 msgid "Error reading from input file: %s"
 msgstr "Ikosa Bivuye Iyinjiza IDOSIYE"
 
-#: imap4d/util.c:1005
+#: imap4d/util.c:1006
 #, fuzzy
 msgid "Cannot find out my own hostname"
 msgstr "Gushaka Inyuma Izina ry'inturo:"
 
-#: imap4d/util.c:1152
+#: imap4d/util.c:1153
 #, fuzzy, c-format
 msgid "Cannot poll input stream: %s"
 msgstr "Iyinjiza"
 
-#: imap4d/util.c:1186
+#: imap4d/util.c:1187
 #, fuzzy, c-format
 msgid "Cannot open TLS stream: %s"
 msgstr "Gufungura"
@@ -1240,113 +1240,113 @@ msgstr "%d:Gukoporora Ubutumwa"
 msgid "%d: cannot get my email address"
 msgstr "%d:Kubona imeli Aderesi"
 
-#: libsieve/comparator.c:171
+#: libsieve/comparator.c:172
 #, fuzzy, c-format
 msgid "Regex error: %s"
 msgstr "Ikosa"
 
-#: libsieve/comparator.c:176
+#: libsieve/comparator.c:177
 #, fuzzy
 msgid "Regex error"
 msgstr "Ikosa"
 
-#: libsieve/comparator.c:238
+#: libsieve/comparator.c:239
 #, fuzzy, c-format
 msgid "match type specified twice in call to `%s'"
 msgstr "BIHUYE Ubwoko in Kuri"
 
 #. TRANSLATORS: Do not translate ':count'. It is the name of a Sieve tag
-#: libsieve/comparator.c:275
+#: libsieve/comparator.c:276
 #, fuzzy, c-format
 msgid "comparator %s is incompatible with :count in call to `%s'"
 msgstr "ni Na: IBARA in Kuri"
 
-#: libsieve/comparator.c:291
+#: libsieve/comparator.c:292
 #, fuzzy
 msgid "second argument must be a list of one element"
 msgstr "ISEGONDA a Urutonde Bya Ikigize:"
 
-#: libsieve/comparator.c:299
+#: libsieve/comparator.c:300
 #, fuzzy
 msgid "second argument cannot be converted to number"
 msgstr "ISEGONDA Kuri Umubare"
 
-#: libsieve/comparator.c:309
+#: libsieve/comparator.c:310
 #, fuzzy, c-format
 msgid "invalid relational match `%s' in call to `%s'"
 msgstr "Sibyo BIHUYE in Kuri"
 
-#: libsieve/comparator.c:322
+#: libsieve/comparator.c:323
 #, fuzzy, c-format
 msgid "comparator `%s' is incompatible with match type `%s' in call to `%s'"
 msgstr "ni Na: BIHUYE Ubwoko in Kuri"
 
-#: libsieve/prog.c:39
+#: libsieve/prog.c:40
 #, fuzzy
 msgid "out of memory!"
 msgstr "Ububiko bwarenzwe"
 
-#: libsieve/prog.c:158 libsieve/require.c:39
+#: libsieve/prog.c:159 libsieve/require.c:40
 #, fuzzy, c-format
 msgid "cannot create iterator: %s"
 msgstr "Kurema"
 
-#: libsieve/prog.c:177
+#: libsieve/prog.c:178
 #, fuzzy, c-format
 msgid "invalid tag name `%s' for `%s'"
 msgstr "Sibyo Itagi: Izina: kugirango"
 
-#: libsieve/prog.c:186
+#: libsieve/prog.c:187
 #, fuzzy, c-format
 msgid "%s:%d: cannot create tag list: %s"
 msgstr "%s:%d:Kurema Itagi: Urutonde"
 
-#: libsieve/prog.c:210
+#: libsieve/prog.c:211
 #, fuzzy, c-format
 msgid "%s:%d: cannot create check list: %s"
 msgstr "%s:%d:Kurema Kugenzura... Urutonde"
 
-#: libsieve/prog.c:222 mimeview/mimetypes.y:561
+#: libsieve/prog.c:223 mimeview/mimetypes.y:561
 #, fuzzy, c-format
 msgid "too many arguments in call to `%s'"
 msgstr "ingingo in Kuri"
 
-#: libsieve/prog.c:243
+#: libsieve/prog.c:244
 #, fuzzy, c-format
 msgid "type mismatch in argument %d to `%s'"
 msgstr "Ubwoko in Kuri"
 
-#: libsieve/prog.c:247
+#: libsieve/prog.c:248
 #, fuzzy, c-format
 msgid "expected %s but passed %s"
 msgstr "Itegerejwe"
 
-#: libsieve/prog.c:258
+#: libsieve/prog.c:259
 #, fuzzy, c-format
 msgid "cannot create arg list: %s"
 msgstr "Kurema Urutonde"
 
-#: libsieve/prog.c:276 mimeview/mimetypes.y:553
+#: libsieve/prog.c:277 mimeview/mimetypes.y:553
 #, fuzzy, c-format
 msgid "too few arguments in call to `%s'"
 msgstr "ingingo in Kuri"
 
-#: libsieve/require.c:56
+#: libsieve/require.c:57
 #, fuzzy
 msgid "required comparator"
 msgstr "Bya ngombwa"
 
-#: libsieve/require.c:62
+#: libsieve/require.c:63
 #, fuzzy
 msgid "required test"
 msgstr "Bya ngombwa Igerageza"
 
-#: libsieve/require.c:72
+#: libsieve/require.c:73
 #, fuzzy
 msgid "required action"
 msgstr "Bya ngombwa Igikorwa"
 
-#: libsieve/require.c:78
+#: libsieve/require.c:79
 #, fuzzy, c-format
 msgid "source for the %s %s is not available"
 msgstr "Inkomoko kugirango i ni OYA Bihari"
@@ -1361,9 +1361,9 @@ msgid "stack underflow"
 msgstr ""
 
 #: libsieve/runtime.c:341
-#, c-format
-msgid "mailbox_scan: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "mu_mailbox_scan: %s"
+msgstr "Byanze"
 
 #: libsieve/sieve.l:234
 #, fuzzy, c-format
@@ -1469,7 +1469,7 @@ msgstr ""
 msgid "\"%s\": not a group"
 msgstr "\"%s\":OYA a Itsinda"
 
-#: mail/alt.c:64 mh/mh_init.c:127
+#: mail/alt.c:64 mh/mh_init.c:128
 #, fuzzy
 msgid "Cannot determine my username"
 msgstr "Izina ry'ukoresha"
@@ -1484,13 +1484,13 @@ msgstr "imeli Aderesi"
 msgid "cannot change to '%s': %s"
 msgstr "Guhindura>> Kuri UID"
 
-#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:541 mh/inc.c:209
-#: mh/mh_init.c:369
+#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:542 mh/inc.c:210
+#: mh/mh_init.c:370
 #, fuzzy, c-format
 msgid "Cannot create mailbox %s: %s"
 msgstr "OYA Kurema"
 
-#: mail/copy.c:92 mail/quit.c:126 mail/send.c:534
+#: mail/copy.c:92 mail/quit.c:126 mail/send.c:535
 #, fuzzy, c-format
 msgid "Cannot append message: %s"
 msgstr "Kongeraho... Ubutumwa"
@@ -1518,7 +1518,7 @@ msgid ""
 "Interrupt"
 msgstr "Hagarikira aho"
 
-#: mail/escape.c:59 mail/send.c:225 mh/mhn.c:2059 mimeview/mimeview.c:217
+#: mail/escape.c:59 mail/send.c:226 mh/mhn.c:2059 mimeview/mimeview.c:217
 #, fuzzy, c-format
 msgid "Cannot create header: %s"
 msgstr "Kurema Umutwempangano"
@@ -1879,68 +1879,68 @@ msgstr "Imyanya"
 msgid "Sender address is obtained from the envelope\n"
 msgstr "Aderesi ni Bivuye i"
 
-#: mail/send.c:73
+#: mail/send.c:74
 #, fuzzy, c-format
 msgid "Cannot create header list: %s"
 msgstr "Kurema Umutwempangano Urutonde"
 
-#: mail/send.c:95
+#: mail/send.c:96
 #, fuzzy, c-format
 msgid "Invalid header: %s"
 msgstr "Umutwempangano"
 
-#: mail/send.c:308
+#: mail/send.c:309
 #, fuzzy
 msgid "Cannot open temporary file"
 msgstr "OYA Gufungura By'igihe gito IDOSIYE"
 
-#: mail/send.c:337
+#: mail/send.c:338
 #, fuzzy
 msgid ""
 "\n"
 "(Interrupt -- one more to kill letter)"
 msgstr "(Birenzeho Kuri Ibaruwa..."
 
-#: mail/send.c:348
+#: mail/send.c:349
 #, fuzzy
 msgid "Use \".\" to terminate letter."
 msgstr "Kuri Ibaruwa..."
 
-#: mail/send.c:349
+#: mail/send.c:350
 #, fuzzy
 msgid "Use \"~.\" to terminate letter."
 msgstr "Kuri Ibaruwa..."
 
-#: mail/send.c:391
+#: mail/send.c:392
 #, c-format
 msgid "Unknown escape %s"
 msgstr ""
 
-#: mail/send.c:394
+#: mail/send.c:395
 msgid "Unfinished escape"
 msgstr ""
 
-#: mail/send.c:398
+#: mail/send.c:399
 #, fuzzy
 msgid "Cannot parse escape sequence"
 msgstr "OYA in"
 
-#: mail/send.c:423 mh/mh_init.c:668 mh/mh_list.c:264
+#: mail/send.c:424 mh/mh_init.c:669 mh/mh_list.c:264
 #, fuzzy, c-format
 msgid "Cannot open file %s: %s"
 msgstr "Gufungura IDOSIYE"
 
-#: mail/send.c:484
+#: mail/send.c:485
 #, fuzzy
 msgid "Null message body; hope that's ok\n"
 msgstr "Ubutumwa Umubiri"
 
-#: mail/send.c:578
+#: mail/send.c:579
 #, fuzzy
 msgid "Variable sendmail not set: no mailer"
 msgstr "IMPINDURAGACIRO OYA Gushyiraho Oya Uwanditse"
 
-#: mail/send.c:626
+#: mail/send.c:627
 #, fuzzy, c-format
 msgid "Piping %s failed"
 msgstr "Byanze"
@@ -2181,7 +2181,7 @@ msgid "Set name pattern for user-defined Scheme mail filters"
 msgstr "Izina: Ishusho kugirango Ukoresha: Ubutumwa Muyunguruzi"
 
 # svx/source\gallery2\galtheme.src:RID_GALLERYSTR_THEME_FLAGS.text
-#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:86
+#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:87
 #: mimeview/mimeview.c:46
 #, fuzzy
 msgid "FLAGS"
@@ -2196,7 +2196,7 @@ msgstr ""
 msgid "Multiple --from options"
 msgstr "Igikubo Bivuye Amahitamo"
 
-#: mail.local/main.c:215 sieve/sieve.c:208
+#: mail.local/main.c:215 sieve/sieve.c:209
 #, fuzzy, c-format
 msgid "%c is not a valid debug flag"
 msgstr "%cni OYA a Byemewe Kosora amakosa Ibendera"
@@ -2248,7 +2248,7 @@ msgstr "ingingo Ifashayobora kugirango Birenzeho Ibisobanuro"
 msgid "Access to %s failed: %m"
 msgstr "Kuri Byanze"
 
-#: mail.local/main.c:427 sieve/sieve.c:375
+#: mail.local/main.c:427 sieve/sieve.c:376
 #, fuzzy, c-format
 msgid "Cannot initialize sieve machine: %s"
 msgstr "gutangiza"
@@ -2452,64 +2452,64 @@ msgstr "Ubutumwa Byanze"
 msgid "Closing mailer failed: %s"
 msgstr "Uwanditse Byanze"
 
-#: mailbox/getopt.c:552 mailbox/getopt.c:571
+#: mailbox/getopt.c:551 mailbox/getopt.c:570
 #, fuzzy, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s:Ihitamo ni"
 
-#: mailbox/getopt.c:604 mailbox/getopt.c:608
+#: mailbox/getopt.c:603 mailbox/getopt.c:607
 #, fuzzy, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s:Ihitamo Kwemerera"
 
-#: mailbox/getopt.c:617 mailbox/getopt.c:622
+#: mailbox/getopt.c:616 mailbox/getopt.c:621
 #, fuzzy, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s:Ihitamo Kwemerera"
 
-#: mailbox/getopt.c:668 mailbox/getopt.c:690 mailbox/getopt.c:1021
-#: mailbox/getopt.c:1043
+#: mailbox/getopt.c:667 mailbox/getopt.c:689 mailbox/getopt.c:1020
+#: mailbox/getopt.c:1042
 #, fuzzy, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s:Ihitamo"
 
-#: mailbox/getopt.c:728 mailbox/getopt.c:731
+#: mailbox/getopt.c:727 mailbox/getopt.c:730
 #, fuzzy, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s:Ihitamo"
 
-#: mailbox/getopt.c:739 mailbox/getopt.c:742
+#: mailbox/getopt.c:738 mailbox/getopt.c:741
 #, fuzzy, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s:Ihitamo"
 
-#: mailbox/getopt.c:797 mailbox/getopt.c:800
+#: mailbox/getopt.c:796 mailbox/getopt.c:799
 #, fuzzy, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s:Ihitamo"
 
-#: mailbox/getopt.c:806 mailbox/getopt.c:809
+#: mailbox/getopt.c:805 mailbox/getopt.c:808
 #, fuzzy, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s:Sibyo Ihitamo"
 
-#: mailbox/getopt.c:864 mailbox/getopt.c:883 mailbox/getopt.c:1096
-#: mailbox/getopt.c:1117
+#: mailbox/getopt.c:863 mailbox/getopt.c:882 mailbox/getopt.c:1095
+#: mailbox/getopt.c:1116
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s:Ihitamo"
 
-#: mailbox/getopt.c:936 mailbox/getopt.c:955
+#: mailbox/getopt.c:935 mailbox/getopt.c:954
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s:Ihitamo ni"
 
-#: mailbox/getopt.c:979 mailbox/getopt.c:1000
+#: mailbox/getopt.c:978 mailbox/getopt.c:999
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s:Ihitamo Kwemerera"
 
-#: mailbox/argp-help.c:195
+#: mailbox/argp-help.c:194
 #, fuzzy, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr ""
@@ -2522,7 +2522,7 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: mailbox/argp-help.c:204
+#: mailbox/argp-help.c:203
 #, fuzzy, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr ""
@@ -2535,12 +2535,12 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: mailbox/argp-help.c:216
+#: mailbox/argp-help.c:215
 #, fuzzy, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "in"
 
-#: mailbox/argp-help.c:1195
+#: mailbox/argp-help.c:1194
 #, fuzzy
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
@@ -2549,74 +2549,74 @@ msgstr ""
 "Cyangwa Bitari ngombwa ingingo Kuri Amahitamo Cyangwa Bitari ngombwa "
 "kugirango Amahitamo"
 
-#: mailbox/argp-help.c:1582
+#: mailbox/argp-help.c:1581
 msgid "Usage:"
 msgstr "Ikoresha:"
 
-#: mailbox/argp-help.c:1586
+#: mailbox/argp-help.c:1585
 #, fuzzy
 msgid "  or: "
 msgstr "Cyangwa"
 
-#: mailbox/argp-help.c:1598
+#: mailbox/argp-help.c:1597
 msgid " [OPTION...]"
 msgstr ""
 
-#: mailbox/argp-help.c:1625
+#: mailbox/argp-help.c:1624
 #, fuzzy, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Cyangwa kugirango Birenzeho Ibisobanuro"
 
-#: mailbox/argp-help.c:1653
+#: mailbox/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Kuri"
 
-#: mailbox/argp-help.c:1873
+#: mailbox/argp-help.c:1872
 #, fuzzy
 msgid "Unknown system error"
 msgstr "Kitazwi Ubutumwa Ubwoko"
 
-#: mailbox/argp-parse.c:83
+#: mailbox/argp-parse.c:82
 #, fuzzy
 msgid "Give this help list"
 msgstr "iyi Ifashayobora Urutonde"
 
-#: mailbox/argp-parse.c:84
+#: mailbox/argp-parse.c:83
 #, fuzzy
 msgid "Give a short usage message"
 msgstr "a Ikoresha: Ubutumwa"
 
-#: mailbox/argp-parse.c:85
+#: mailbox/argp-parse.c:84
 #, fuzzy
 msgid "Set the program name"
 msgstr "i Porogaramu Izina:"
 
-#: mailbox/argp-parse.c:87
+#: mailbox/argp-parse.c:86
 #, fuzzy
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "kugirango amasogonda Mburabuzi"
 
-#: mailbox/argp-parse.c:148
+#: mailbox/argp-parse.c:147
 #, fuzzy
 msgid "Print program version"
 msgstr "Porogaramu Verisiyo"
 
-#: mailbox/argp-parse.c:164
+#: mailbox/argp-parse.c:163
 #, fuzzy
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(Verisiyo"
 
-#: mailbox/argp-parse.c:620
+#: mailbox/argp-parse.c:619
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr ""
 
-#: mailbox/argp-parse.c:763
+#: mailbox/argp-parse.c:762
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr ""
 
-#: mailbox/file_stream.c:479
+#: mailbox/file_stream.c:480
 #, fuzzy, c-format
 msgid "%s must be a plain file with one link\n"
 msgstr "%sa Byuzuye IDOSIYE Na:"
@@ -2641,24 +2641,24 @@ msgstr "Ikosa"
 msgid "Stream is closed"
 msgstr "ni"
 
-#: mailbox/message.c:1092
+#: mailbox/message.c:1093
 #, fuzzy, c-format
-msgid "mailbox_create_default (%s) failed: %s\n"
+msgid "mu_mailbox_create_default (%s) failed: %s\n"
 msgstr "Byanze"
 
-#: mailbox/message.c:1123
+#: mailbox/message.c:1124
 #, fuzzy, c-format
-msgid "mailbox_open (%s) failed: %s\n"
+msgid "mu_mailbox_open (%s) failed: %s\n"
 msgstr "Byanze"
 
-#: mailbox/message.c:1131
+#: mailbox/message.c:1132
 #, fuzzy, c-format
-msgid "mailbox_append_message (%s) failed: %s\n"
+msgid "mu_mailbox_append_message (%s) failed: %s\n"
 msgstr "Byanze"
 
-#: mailbox/message.c:1143
+#: mailbox/message.c:1144
 #, fuzzy, c-format
-msgid "mailbox_close (%s) failed: %s\n"
+msgid "mu_mailbox_close (%s) failed: %s\n"
 msgstr "Byanze"
 
 #: mailbox/mu_argp.c:60
@@ -2687,7 +2687,7 @@ msgid "Default locker flags (E=external, R=retry, T=time, P=pid)"
 msgstr "Amabendera E external Ongera ugerageze Igihe"
 
 # offmgr/source\offapp\dialog\optgdlg.src:OFA_TP_MISC.FT_HELPAGENT_TIME_UNIT.text
-#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:76
+#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:77
 #, fuzzy
 msgid "SECONDS"
 msgstr "amasogonda"
@@ -3189,16 +3189,16 @@ msgid "[msg [msg...]]"
 msgstr ""
 
 # sfx2/source\explorer\explorer.src:STR_SFX_FOLDER.text
-#: mh/anno.c:33 mh/folder.c:49 mh/folder.c:59 mh/forw.c:37 mh/forw.c:43
-#: mh/inc.c:34 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
+#: mh/anno.c:33 mh/folder.c:50 mh/folder.c:60 mh/forw.c:37 mh/forw.c:43
+#: mh/inc.c:35 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
 #: mh/mhpath.c:32 mh/pick.c:39 mh/refile.c:38 mh/refile.c:47 mh/repl.c:40
-#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:39 mh/send.c:42
+#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:40 mh/send.c:42
 #: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:43
 #, fuzzy
 msgid "FOLDER"
 msgstr "Ububiko"
 
-#: mh/anno.c:34 mh/folder.c:60 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
+#: mh/anno.c:34 mh/folder.c:61 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
 #: mh/mhn.c:38 mh/mhpath.c:33 mh/pick.c:40 mh/refile.c:39 mh/repl.c:50
 #: mh/rmm.c:33
 #, fuzzy
@@ -3231,10 +3231,10 @@ msgstr "iyi Kuri i Ubutumwa Umutwempangano"
 msgid "Field value for the component"
 msgstr "Agaciro kugirango i"
 
-#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:80 mh/forw.c:75 mh/inc.c:55
+#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:81 mh/forw.c:75 mh/inc.c:56
 #: mh/install-mh.c:33 mh/mark.c:47 mh/mhl.c:53 mh/mhn.c:90 mh/mhpath.c:35
 #: mh/pick.c:96 mh/refile.c:52 mh/repl.c:72 mh/rmf.c:50 mh/rmm.c:35
-#: mh/scan.c:59 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
+#: mh/scan.c:60 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
 msgid "Display software license"
 msgstr ""
 
@@ -3250,18 +3250,18 @@ msgstr "Izina:"
 msgid "GNU MH fmtcheckUse -help to obtain the list of traditional MH options."
 msgstr "Ifashayobora Kuri i Urutonde Bya Amahitamo"
 
-#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:44 mh/mhl.c:43 mh/repl.c:58
-#: mh/scan.c:45
+#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:45 mh/mhl.c:43 mh/repl.c:58
+#: mh/scan.c:46
 #, fuzzy
 msgid "Read format from given file"
 msgstr "Imiterere Bivuye IDOSIYE"
 
-#: mh/fmtcheck.c:34 mh/inc.c:45 mh/scan.c:46
+#: mh/fmtcheck.c:34 mh/inc.c:46 mh/scan.c:47
 #, fuzzy
 msgid "FORMAT"
 msgstr "Imiterere"
 
-#: mh/fmtcheck.c:35 mh/inc.c:46 mh/scan.c:47
+#: mh/fmtcheck.c:35 mh/inc.c:47 mh/scan.c:48
 #, fuzzy
 msgid "Use this format string"
 msgstr "iyi Imiterere Ikurikiranyanyuguti"
@@ -3281,38 +3281,38 @@ msgstr "Ibisohoka"
 msgid "Format string not specified"
 msgstr "Imiterere Ikurikiranyanyuguti OYA"
 
-#: mh/fmtcheck.c:115 mh/inc.c:191 mh/repl.c:373 mh/scan.c:188
+#: mh/fmtcheck.c:115 mh/inc.c:192 mh/repl.c:373 mh/scan.c:189
 #, fuzzy
 msgid "Bad format string"
 msgstr "Imiterere Ikurikiranyanyuguti"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/folder.c:39
+#: mh/folder.c:40
 #, fuzzy
 msgid "GNU MH folderUse -help to obtain the list of traditional MH options."
 msgstr "Ifashayobora Kuri i Urutonde Bya Amahitamo"
 
-#: mh/folder.c:41
+#: mh/folder.c:42
 #, fuzzy
 msgid "[action] [msg]"
 msgstr "[Igikorwa"
 
-#: mh/folder.c:44 pop3d/popauth.c:68
+#: mh/folder.c:45 pop3d/popauth.c:68
 msgid "Actions are:"
 msgstr ""
 
-#: mh/folder.c:46
+#: mh/folder.c:47
 #, fuzzy
 msgid "List the folders (default)"
 msgstr "i Mburabuzi"
 
-#: mh/folder.c:48
+#: mh/folder.c:49
 #, fuzzy
 msgid "List the contents of the folder stack"
 msgstr "i Ibigize Bya i Ububiko"
 
-#: mh/folder.c:50
+#: mh/folder.c:51
 #, fuzzy
 msgid ""
 "Push the folder on the folder stack. If FOLDER is specified, it is pushed. "
@@ -3324,65 +3324,65 @@ msgstr ""
 "Biturutse Cyangwa Ububiko ni ku i KIGEZWEHO Ububiko Na i Hejuru: Bya i "
 "Ububiko"
 
-#: mh/folder.c:55
+#: mh/folder.c:56
 #, fuzzy
 msgid "Pop the folder off the folder stack"
 msgstr "i Ububiko Bidakora i Ububiko"
 
-#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:80
+#: mh/folder.c:58 mh/mh_whatnow.c:153 pop3d/popauth.c:80
 msgid "Options are:"
 msgstr ""
 
-#: mh/folder.c:62
+#: mh/folder.c:63
 #, fuzzy
 msgid "List all folders"
 msgstr "Byose"
 
-#: mh/folder.c:64
+#: mh/folder.c:65
 msgid "Create non-existing folders"
 msgstr ""
 
-#: mh/folder.c:67
+#: mh/folder.c:68
 #, fuzzy
 msgid "List only the folder names"
 msgstr "i Ububiko Amazina"
 
-#: mh/folder.c:70
+#: mh/folder.c:71
 #, fuzzy
 msgid "Print the header line"
 msgstr "i Umutwempangano Umurongo"
 
-#: mh/folder.c:73
+#: mh/folder.c:74
 msgid "Scan folders recursively"
 msgstr ""
 
-#: mh/folder.c:76
+#: mh/folder.c:77
 #, fuzzy
 msgid "Output the total statistics"
 msgstr "i Igiteranyo Sitatisitiki"
 
-#: mh/folder.c:309 mh/rmf.c:128
+#: mh/folder.c:310 mh/rmf.c:128
 #, fuzzy, c-format
 msgid "Cannot scan folder %s: %s"
 msgstr "Gusikana Ububiko"
 
-#: mh/folder.c:382
+#: mh/folder.c:383
 #, fuzzy, c-format
 msgid " has %4lu message  (%4lu-%4lu)"
 msgid_plural " has %4lu messages (%4lu-%4lu)"
 msgstr[0] "Ubutumwa"
 
-#: mh/folder.c:393
+#: mh/folder.c:394
 #, fuzzy, c-format
 msgid " has no messages"
 msgstr "Oya Ubutumwa"
 
-#: mh/folder.c:402
+#: mh/folder.c:403
 #, fuzzy, c-format
 msgid "(others)"
 msgstr "(Ibindi"
 
-#: mh/folder.c:450
+#: mh/folder.c:451
 #, fuzzy, c-format
 msgid ""
 "Folder                  # of messages     (  range  )  cur msg   (other "
@@ -3393,18 +3393,18 @@ msgstr "Bya Ubutumwa Urutonde Ikindi Idosiye"
 # sc/source\ui\src\autofmt.src:RID_SCDLG_AUTOFORMAT.STR_SUM.text
 # #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_PIVOT_TOTAL.text
-#: mh/folder.c:456
+#: mh/folder.c:457
 #, fuzzy
 msgid "TOTAL"
 msgstr "Igiteranyo"
 
-#: mh/folder.c:457
+#: mh/folder.c:458
 #, fuzzy, c-format
 msgid "%4lu message  "
 msgid_plural "%4lu messages "
 msgstr[0] "%4luUbutumwa"
 
-#: mh/folder.c:460
+#: mh/folder.c:461
 #, fuzzy, c-format
 msgid "in %4lu folder"
 msgid_plural "in %4lu folders"
@@ -3487,7 +3487,7 @@ msgstr "i INGARUKA Bya i Iheruka Muyunguruzi... Ihitamo"
 msgid "Use MIME encapsulation"
 msgstr ""
 
-#: mh/forw.c:65 mh/inc.c:51 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:51
+#: mh/forw.c:65 mh/inc.c:52 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:52
 #, fuzzy
 msgid "Set output width"
 msgstr "Ibisohoka Ubugari"
@@ -3507,17 +3507,17 @@ msgstr "*IMPINDURAGACIRO Bisanzwe Igikonoshwa"
 msgid "Use draft file preserved after the last session"
 msgstr "Inyandiko y'agateganyo IDOSIYE Nyuma i Iheruka Umukoro"
 
-#: mh/forw.c:147 mh/inc.c:137 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:124
+#: mh/forw.c:147 mh/inc.c:138 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:125
 #, fuzzy
 msgid "Invalid width"
 msgstr "Ubugari"
 
-#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:138
+#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:139
 #, fuzzy
 msgid "Option is not yet implemented"
 msgstr "Ihitamo ni OYA"
 
-#: mh/forw.c:285 mh/mh_init.c:536
+#: mh/forw.c:285 mh/mh_init.c:537
 #, fuzzy, c-format
 msgid "Cannot open output file `%s': %s"
 msgstr "Gufungura Ibisohoka IDOSIYE"
@@ -3542,69 +3542,69 @@ msgstr "Impera Bya Ubutumwa"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/inc.c:26
+#: mh/inc.c:27
 #, fuzzy
 msgid "GNU MH incUse -help to obtain the list of traditional MH options."
 msgstr "Ifashayobora Kuri i Urutonde Bya Amahitamo"
 
-#: mh/inc.c:28 mh/rmf.c:37
+#: mh/inc.c:29 mh/rmf.c:37
 #, fuzzy
 msgid "[+folder]"
 msgstr "[+Inyandiko"
 
-#: mh/inc.c:33
+#: mh/inc.c:34
 #, fuzzy
 msgid "Incorporate mail from named file"
 msgstr "Ubutumwa Bivuye IDOSIYE"
 
-#: mh/inc.c:35
+#: mh/inc.c:36
 #, fuzzy
 msgid "Specify folder to incorporate mail to"
 msgstr "Ububiko Kuri Ubutumwa Kuri"
 
-#: mh/inc.c:37
+#: mh/inc.c:38
 msgid "Enable audit"
 msgstr ""
 
-#: mh/inc.c:39
+#: mh/inc.c:40
 msgid "Disable audit"
 msgstr ""
 
-#: mh/inc.c:41
+#: mh/inc.c:42
 #, fuzzy
 msgid "Mark first incorporated message as current (default)"
 msgstr "Itangira Ubutumwa Nka KIGEZWEHO Mburabuzi"
 
-#: mh/inc.c:48
+#: mh/inc.c:49
 #, fuzzy
 msgid "Truncate source mailbox after incorporating (default)"
 msgstr "Inkomoko Nyuma Mburabuzi"
 
-#: mh/inc.c:53 mh/mhn.c:88
+#: mh/inc.c:54 mh/mhn.c:88
 msgid "Be quiet"
 msgstr ""
 
-#: mh/inc.c:200
+#: mh/inc.c:201
 #, fuzzy
 msgid "Cannot create default mailbox"
 msgstr "OYA Kurema Mburabuzi"
 
-#: mh/inc.c:226
+#: mh/inc.c:227
 #, fuzzy, c-format
 msgid "Cannot read input mailbox: %s"
 msgstr "OYA Gusoma Iyinjiza"
 
-#: mh/inc.c:233
+#: mh/inc.c:234
 #, fuzzy, c-format
 msgid "Cannot read output mailbox: %s"
 msgstr "OYA Gusoma Ibisohoka"
 
-#: mh/inc.c:254
+#: mh/inc.c:255
 #, fuzzy, c-format
 msgid "%d: cannot get message: %s"
 msgstr "%d:Kubona Ubutumwa"
 
-#: mh/inc.c:261
+#: mh/inc.c:262
 #, fuzzy, c-format
 msgid "%d: error appending message: %s"
 msgstr "%d:Ikosa Ubutumwa"
@@ -3692,12 +3692,12 @@ msgid ""
 "\n"
 msgstr "ni"
 
-#: mh/mh_ctx.c:92
+#: mh/mh_ctx.c:93
 #, fuzzy, c-format
 msgid "Cannot open context file %s: %s"
 msgstr "Gufungura Ibisohoka IDOSIYE"
 
-#: mh/mh_ctx.c:142
+#: mh/mh_ctx.c:143
 #, fuzzy, c-format
 msgid "Cannot create context %s: %s"
 msgstr "Kurema Imvugiro"
@@ -3727,18 +3727,18 @@ msgstr "Ibuze kugirango"
 msgid "Extra arguments to %s"
 msgstr "Birenga ingingo Kuri"
 
-#: mh/mh_format.c:603
+#: mh/mh_format.c:604
 #, c-format
 msgid "INTERNAL ERROR: Unknown opcode: %x"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the word 'format'!
-#: mh/mh_format.c:946 mh/mh_format.c:958
+#: mh/mh_format.c:947 mh/mh_format.c:959
 #, fuzzy
 msgid "format: divide by zero"
 msgstr "Imiterere Kugabanya ku Zeru"
 
-#: mh/mh_format.c:1874
+#: mh/mh_format.c:1875
 #, fuzzy
 msgid "Invalid recipient mask"
 msgstr "Umukoresha"
@@ -3766,73 +3766,73 @@ msgid ""
 "Run %s --help for more info on these.\n"
 msgstr "Gukoresha Amahitamo Ifashayobora kugirango Birenzeho Ibisobanuro ku"
 
-#: mh/mh_init.c:69
+#: mh/mh_init.c:70
 #, fuzzy, c-format
 msgid "Cannot stat format file %s: %s"
 msgstr "Imiterere IDOSIYE"
 
-#: mh/mh_init.c:76
+#: mh/mh_init.c:77
 #, fuzzy, c-format
 msgid "Cannot open format file %s: %s"
 msgstr "Gufungura Imiterere IDOSIYE"
 
-#: mh/mh_init.c:206
+#: mh/mh_init.c:207
 #, fuzzy, c-format
 msgid "Create folder \"%s\""
 msgstr "Guhimba idosiye: %s%s"
 
-#: mh/mh_init.c:214
+#: mh/mh_init.c:215
 #, fuzzy, c-format
 msgid "Cannot create directory %s: %s"
 msgstr "Kurema bushyinguro"
 
 #. TRANSLATORS: See msgids "nN" and "yY".
-#: mh/mh_init.c:267
+#: mh/mh_init.c:268
 #, fuzzy, c-format
 msgid "Please answer yes or no: "
 msgstr "Yego Cyangwa Oya"
 
-#: mh/mh_init.c:326
+#: mh/mh_init.c:327
 #, fuzzy, c-format
 msgid "Cannot open audit file %s: %s"
 msgstr "Gufungura IDOSIYE"
 
-#: mh/mh_init.c:457 mh/mh_msgset.c:165
+#: mh/mh_init.c:458 mh/mh_msgset.c:165
 #, fuzzy, c-format
 msgid "Cannot get message %d: %s"
 msgstr "Kubona Ubutumwa"
 
-#: mh/mh_init.c:475
+#: mh/mh_init.c:476
 #, fuzzy, c-format
 msgid "Cannot split line %s"
 msgstr "Gutandukanya Umurongo"
 
-#: mh/mh_init.c:527
+#: mh/mh_init.c:528
 #, fuzzy, c-format
 msgid "Cannot open input file `%s': %s"
 msgstr "Gufungura Iyinjiza IDOSIYE"
 
-#: mh/mh_init.c:550
+#: mh/mh_init.c:551
 #, fuzzy, c-format
 msgid "Write error on `%s': %s"
 msgstr "Kwandika Ikosa ku"
 
-#: mh/mh_init.c:579
+#: mh/mh_init.c:580
 #, fuzzy, c-format
 msgid "Cannot stat file %s: %s"
 msgstr "IDOSIYE"
 
-#: mh/mh_init.c:585 mh/mhn.c:2267
+#: mh/mh_init.c:586 mh/mhn.c:2267
 #, fuzzy, c-format
 msgid "Cannot create input stream (file %s): %s"
 msgstr "Kurema Iyinjiza IDOSIYE"
 
-#: mh/mh_init.c:592 mh/mhn.c:2274
+#: mh/mh_init.c:593 mh/mhn.c:2274
 #, fuzzy, c-format
 msgid "Cannot open input stream (file %s): %s"
 msgstr "Gufungura Iyinjiza IDOSIYE"
 
-#: mh/mh_init.c:605
+#: mh/mh_init.c:606
 #, fuzzy, c-format
 msgid ""
 "Prior to using MH, it is necessary to have a file in your login\n"
@@ -3844,42 +3844,42 @@ msgstr ""
 "Kuri ikoresha ni Kuri a IDOSIYE in Kirimo Ibikorwa: Ikintu ni i Inzira Kuri "
 "Gukoresha kugirango Byose Ububiko Ibikorwa: kugirango ni"
 
-#: mh/mh_init.c:628
+#: mh/mh_init.c:629
 #, fuzzy
 msgid "Do you need help"
 msgstr "Ifashayobora"
 
-#: mh/mh_init.c:631
+#: mh/mh_init.c:632
 #, fuzzy, c-format
 msgid "Do you want the standard MH path \"%s\""
 msgstr "i Bisanzwe Inzira"
 
-#: mh/mh_init.c:636
+#: mh/mh_init.c:637
 #, fuzzy
 msgid "Do you want a path below your login directory"
 msgstr "a Inzira munsi Ifashayinjira bushyinguro"
 
-#: mh/mh_init.c:638
+#: mh/mh_init.c:639
 #, fuzzy, c-format
 msgid "What is the path? "
 msgstr "ni i Inzira"
 
-#: mh/mh_init.c:640
+#: mh/mh_init.c:641
 #, fuzzy, c-format
 msgid "What is the full path? "
 msgstr "ni i Inzira"
 
-#: mh/mh_init.c:699
+#: mh/mh_init.c:700
 #, fuzzy, c-format
 msgid "I'm going to create the standard MH path for you.\n"
 msgstr "Kuri Kurema i Bisanzwe Inzira kugirango"
 
-#: mh/mh_init.c:710
+#: mh/mh_init.c:711
 #, fuzzy
 msgid "You already have an MH profile, use an editor to modify it"
 msgstr "Ibijyana Gukoresha Muhinduzi Kuri Guhindura"
 
-#: mh/mh_init.c:715
+#: mh/mh_init.c:716
 #, fuzzy, c-format
 msgid ""
 "You already have file %s which is not a regular file or a symbolic link.\n"
@@ -4435,7 +4435,7 @@ msgstr "Birenga ingingo"
 msgid "GNU MH mhpathUse -help to obtain the list of traditional MH options."
 msgstr "Ifashayobora Kuri i Urutonde Bya Amahitamo"
 
-#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:35
+#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:36
 #, fuzzy
 msgid "[+folder] [msgs]"
 msgstr "[+Ububiko"
@@ -4785,42 +4785,42 @@ msgstr "Ifashayobora Kuri i Urutonde Bya Amahitamo"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/scan.c:33
+#: mh/scan.c:34
 #, fuzzy
 msgid "GNU MH scanUse -help to obtain the list of traditional MH options."
 msgstr "Ifashayobora Kuri i Urutonde Bya Amahitamo"
 
-#: mh/scan.c:40
+#: mh/scan.c:41
 #, fuzzy
 msgid "Specify folder to scan"
 msgstr "Ububiko Kuri Gusikana"
 
-#: mh/scan.c:42
+#: mh/scan.c:43
 #, fuzzy
 msgid "Clear screen after displaying the list"
 msgstr "Mugaragaza Nyuma i Urutonde"
 
-#: mh/scan.c:49
+#: mh/scan.c:50
 #, fuzzy
 msgid "Display header"
 msgstr "Umutwempangano"
 
-#: mh/scan.c:53
+#: mh/scan.c:54
 #, fuzzy
 msgid "List messages in reverse order"
 msgstr "Ubutumwa in Ihindurakerekezo Itondekanya"
 
-#: mh/scan.c:56
+#: mh/scan.c:57
 msgid "[Not yet implemented]"
 msgstr ""
 
-#: mh/scan.c:228
+#: mh/scan.c:229
 #, fuzzy, c-format
 msgid "no messages in %s"
 msgstr "Oya Ubutumwa in"
 
 # sfx2/source\explorer\explorer.src:STR_SFX_FOLDER.text
-#: mh/scan.c:249
+#: mh/scan.c:250
 #, fuzzy, c-format
 msgid "Folder %s  %s\n"
 msgstr "Ububiko"
@@ -4912,7 +4912,7 @@ msgstr "i Bya Ubutumwa"
 msgid "* Make header fields no longer than NUMBER columns"
 msgstr "*Umutwempangano Imyanya Oya Inkingi"
 
-#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:134 pop3d/pop3d.c:148
+#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:135 pop3d/pop3d.c:149
 msgid "Invalid number"
 msgstr "Umubare utari wo"
 
@@ -5041,17 +5041,17 @@ msgstr ""
 
 #: movemail/movemail.c:169
 #, fuzzy
-msgid "mailbox_get_folder failed"
+msgid "mu_mailbox_get_folder failed"
 msgstr "Byanze"
 
 #: movemail/movemail.c:172
 #, fuzzy
-msgid "folder_get_authority failed"
+msgid "mu_folder_get_authority failed"
 msgstr "Byanze"
 
 #: movemail/movemail.c:175
 #, fuzzy
-msgid "authority_set_ticket failed"
+msgid "mu_authority_set_ticket failed"
 msgstr "Byanze"
 
 #: movemail/movemail.c:202
@@ -5159,69 +5159,69 @@ msgstr "ku Iyinjiza"
 msgid "Locking mailbox `%s' failed: %s"
 msgstr "Uwanditse Byanze"
 
-#: pop3d/pop3d.c:64
+#: pop3d/pop3d.c:65
 #, fuzzy
 msgid "GNU pop3d -- the POP3 daemon"
 msgstr "i"
 
-#: pop3d/pop3d.c:74
+#: pop3d/pop3d.c:75
 #, fuzzy
 msgid "Undelete all messages on startup"
 msgstr "Byose Ubutumwa ku"
 
-#: pop3d/pop3d.c:77
+#: pop3d/pop3d.c:78
 #, fuzzy
 msgid "Allowed delay between the two successive logins"
 msgstr "Gutinda hagati i"
 
-#: pop3d/pop3d.c:78
+#: pop3d/pop3d.c:79
 #, fuzzy
 msgid "FILENAME"
 msgstr "Izina ry'idosiye"
 
-#: pop3d/pop3d.c:79
+#: pop3d/pop3d.c:80
 #, fuzzy
 msgid "Name of login statistics file"
 msgstr "Bya Ifashayinjira Sitatisitiki IDOSIYE"
 
-#: pop3d/pop3d.c:81
+#: pop3d/pop3d.c:82
 msgid "DAYS"
 msgstr "IMINSI"
 
-#: pop3d/pop3d.c:82
+#: pop3d/pop3d.c:83
 #, fuzzy
 msgid "Expire read messages after the given number of days"
 msgstr "Gusoma Ubutumwa Nyuma i Umubare Bya Iminsi"
 
-#: pop3d/pop3d.c:84
+#: pop3d/pop3d.c:85
 #, fuzzy
 msgid "Delete expired messages upon closing the mailbox"
 msgstr "Byarengeje igihe Ubutumwa i"
 
-#: pop3d/pop3d.c:87
+#: pop3d/pop3d.c:88
 #, fuzzy
 msgid "Always require STLS before entering authentication phase"
 msgstr "Mbere"
 
-#: pop3d/pop3d.c:277
+#: pop3d/pop3d.c:278
 #, fuzzy
 msgid "Failed to become a daemon:"
 msgstr "Byanze Kuri a"
 
-#: pop3d/pop3d.c:313
+#: pop3d/pop3d.c:314
 #, fuzzy, c-format
 msgid "connect from %s"
 msgstr "Kwihuza Bivuye"
 
-#: pop3d/pop3d.c:437
+#: pop3d/pop3d.c:438
 msgid "Session terminated"
 msgstr ""
 
-#: pop3d/pop3d.c:523
+#: pop3d/pop3d.c:524
 msgid "GNU pop3d started"
 msgstr ""
 
-#: pop3d/pop3d.c:530
+#: pop3d/pop3d.c:531
 #, c-format
 msgid "too many children (%lu)"
 msgstr ""
@@ -5504,7 +5504,7 @@ msgstr "Gufungura"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: sieve/sieve.c:53
+#: sieve/sieve.c:54
 #, fuzzy
 msgid ""
 "GNU sieve -- a mail filtering tool\n"
@@ -5516,45 +5516,45 @@ msgid ""
 "  i - sieve instructions trace (MU_SIEVE_DEBUG_INSTR)\n"
 msgstr "a Ubutumwa Iyungurura Amabendera g urusobe T i Amabwiriza"
 
-#: sieve/sieve.c:69
+#: sieve/sieve.c:70
 #, fuzzy
 msgid "Do not execute any actions, just print what would be done"
 msgstr "OYA Gukora Gucapa Byakozwe"
 
-#: sieve/sieve.c:72
+#: sieve/sieve.c:73
 #, fuzzy
 msgid "Keep on going if execution fails on a message"
 msgstr "ku NIBA ku a Ubutumwa"
 
-#: sieve/sieve.c:75
+#: sieve/sieve.c:76
 #, fuzzy
 msgid "Compile script and exit"
 msgstr "IYANDIKA Na Gusohoka"
 
-#: sieve/sieve.c:78
+#: sieve/sieve.c:79
 #, fuzzy
 msgid "Compile script, dump disassembled sieve code to terminal and exit"
 msgstr "IYANDIKA ITEGEKONGENGA Kuri Na Gusohoka"
 
-#: sieve/sieve.c:80
+#: sieve/sieve.c:81
 msgid "MBOX"
 msgstr ""
 
-#: sieve/sieve.c:81
+#: sieve/sieve.c:82
 #, fuzzy
 msgid "Mailbox to sieve (defaults to user's mail spool)"
 msgstr "Kuri Kuri Ubutumwa"
 
-#: sieve/sieve.c:83
+#: sieve/sieve.c:84
 msgid "TICKET"
 msgstr ""
 
-#: sieve/sieve.c:84
+#: sieve/sieve.c:85
 #, fuzzy
 msgid "Ticket file for mailbox authentication"
 msgstr "IDOSIYE kugirango"
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 #, fuzzy
 msgid "Debug flags (defaults to \""
 msgstr "Amabendera Kuri"
@@ -5562,119 +5562,119 @@ msgstr "Amabendera Kuri"
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
 # #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 #, fuzzy
 msgid "\")"
 msgstr "\")"
 
-#: sieve/sieve.c:90
+#: sieve/sieve.c:91
 #, fuzzy
 msgid "Log all actions"
 msgstr "Byose"
 
-#: sieve/sieve.c:93
+#: sieve/sieve.c:94
 #, fuzzy
 msgid "Print source location along with action logs (default)"
 msgstr "Inkomoko Ahantu Na: Igikorwa Mburabuzi"
 
-#: sieve/sieve.c:96
+#: sieve/sieve.c:97
 #, fuzzy
 msgid "Override user email address"
 msgstr "Ukoresha: imeli Aderesi"
 
-#: sieve/sieve.c:149
+#: sieve/sieve.c:150
 #, fuzzy, c-format
 msgid "Invalid email: %s"
 msgstr "Sibyo imeli"
 
-#: sieve/sieve.c:170
+#: sieve/sieve.c:171
 msgid "Only one MBOX can be specified"
 msgstr ""
 
-#: sieve/sieve.c:224
+#: sieve/sieve.c:225
 msgid "Only one SCRIPT can be specified"
 msgstr ""
 
-#: sieve/sieve.c:229
+#: sieve/sieve.c:230
 msgid "SCRIPT must be specified"
 msgstr ""
 
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Font.Family..4.text
-#: sieve/sieve.c:242
+#: sieve/sieve.c:243
 msgid "SCRIPT"
 msgstr "IYANDIKA"
 
-#: sieve/sieve.c:300 sieve/sieve.c:325
+#: sieve/sieve.c:301 sieve/sieve.c:326
 #, fuzzy, c-format
 msgid "%s:%lu: %s on msg uid %lu"
 msgstr "%s:%lu:%sku UID"
 
-#: sieve/sieve.c:304 sieve/sieve.c:329
+#: sieve/sieve.c:305 sieve/sieve.c:330
 #, fuzzy, c-format
 msgid "%s on msg uid %lu"
 msgstr "%sku UID"
 
-#: sieve/sieve.c:415
+#: sieve/sieve.c:416
 #, fuzzy, c-format
 msgid "ticket_get failed: %s"
 msgstr "Byanze"
 
-#: sieve/sieve.c:421
+#: sieve/sieve.c:422
 #, fuzzy, c-format
-msgid "wicket_create `%s' failed: %s"
+msgid "mu_wicket_create `%s' failed: %s"
 msgstr "Byanze"
 
-#: sieve/sieve.c:434
+#: sieve/sieve.c:435
 #, fuzzy, c-format
 msgid "mu_debug_create failed: %s"
 msgstr "Byanze"
 
-#: sieve/sieve.c:439
+#: sieve/sieve.c:440
 #, fuzzy, c-format
 msgid "mu_debug_set_level failed: %s"
 msgstr "Byanze"
 
-#: sieve/sieve.c:445
+#: sieve/sieve.c:446
 #, fuzzy, c-format
 msgid "mu_debug_set_print failed: %s"
 msgstr "Byanze"
 
-#: sieve/sieve.c:467
+#: sieve/sieve.c:468
 #, fuzzy, c-format
-msgid "mailbox_set_debug failed: %s"
+msgid "mu_mailbox_set_debug failed: %s"
 msgstr "Byanze"
 
-#: sieve/sieve.c:478
+#: sieve/sieve.c:479
 #, fuzzy, c-format
-msgid "mailbox_get_folder failed: %s"
+msgid "mu_mailbox_get_folder failed: %s"
 msgstr "Byanze"
 
-#: sieve/sieve.c:485
+#: sieve/sieve.c:486
 #, fuzzy, c-format
-msgid "folder_get_authority failed: %s"
+msgid "mu_folder_get_authority failed: %s"
 msgstr "Byanze"
 
-#: sieve/sieve.c:493
+#: sieve/sieve.c:494
 #, fuzzy, c-format
-msgid "authority_set_ticket failed: %s"
+msgid "mu_authority_set_ticket failed: %s"
 msgstr "Byanze"
 
-#: sieve/sieve.c:508
+#: sieve/sieve.c:509
 #, fuzzy, c-format
 msgid "Opening mailbox `%s' failed: %s"
 msgstr "Uwanditse Byanze"
 
-#: sieve/sieve.c:511
+#: sieve/sieve.c:512
 #, fuzzy, c-format
 msgid "Opening default mailbox failed: %s"
 msgstr "Byanze"
 
-#: sieve/sieve.c:532
+#: sieve/sieve.c:533
 #, fuzzy, c-format
 msgid "Expunge on mailbox `%s' failed: %s"
 msgstr "ku Byanze"
 
-#: sieve/sieve.c:535
+#: sieve/sieve.c:536
 #, fuzzy, c-format
 msgid "Expunge on default mailbox failed: %s"
 msgstr "Gufungura Mburabuzi"

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mailutils 0.6.90\n"
 "Report-Msgid-Bugs-To: bug-mailutils@gnu.org\n"
-"POT-Creation-Date: 2005-08-16 13:23+0300\n"
+"POT-Creation-Date: 2005-08-26 17:10+0300\n"
 "PO-Revision-Date: 2005-05-19 11:54+0300\n"
 "Last-Translator: Sergey Poznyakoff <gray@gnu.org>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -54,7 +54,7 @@ msgstr ""
 "що були визначені під час компіляції. Програма повертає код 0 якщо усі "
 "вказані опції були визначені. Інакше повертається код 1."
 
-#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:569
+#: config/mailutils-config.c:126 frm/from.c:128 mh/folder.c:570
 msgid "Too many arguments"
 msgstr "Забагато аргументів"
 
@@ -115,8 +115,8 @@ msgid "Name of the database to connect to"
 msgstr "Назва бази SQL"
 
 #: auth/sql.c:201 mailbox/mu_argp.c:80 mailbox/mu_argp.c:115
-#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:50 mh/mhl.c:44 mh/mhl.c:46
-#: mh/repl.c:65 mh/scan.c:50 mh/send.c:75
+#: mailbox/mu_argp.c:121 mh/forw.c:65 mh/inc.c:51 mh/mhl.c:44 mh/mhl.c:46
+#: mh/repl.c:65 mh/scan.c:51 mh/send.c:75
 msgid "NUMBER"
 msgstr "ЧИСЛО"
 
@@ -165,8 +165,8 @@ msgstr "Опції шифрування"
 #: auth/tls.c:59 auth/tls.c:61 auth/tls.c:63 comsat/comsat.c:59
 #: dotlock/dotlock.c:43 frm/from.c:32 mail.local/main.c:83
 #: mailbox/mu_argp.c:125 mh/fmtcheck.c:32 mh/forw.c:53 mh/forw.c:55
-#: mh/inc.c:32 mh/inc.c:36 mh/inc.c:43 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
-#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:44 mh/scan.c:55 mh/send.c:38
+#: mh/inc.c:33 mh/inc.c:37 mh/inc.c:44 mh/mhl.c:42 mh/mhn.c:39 mh/mhn.c:65
+#: mh/refile.c:50 mh/repl.c:58 mh/scan.c:45 mh/scan.c:56 mh/send.c:38
 #: mh/send.c:48 mh/whom.c:30 pop3d/popauth.c:81 pop3d/popauth.c:82
 #: mimeview/mimeview.c:48 mimeview/mimeview.c:52
 msgid "FILE"
@@ -188,17 +188,17 @@ msgstr "Назва довіреного файлу CA"
 msgid "INTERNAL ERROR: cannot register argp capability tls"
 msgstr "ВНУТРІШНЯ ПОМИЛКА: не вдається зареєструвати можливість TLS"
 
-#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:63 mh/folder.c:66
-#: mh/folder.c:69 mh/folder.c:72 mh/folder.c:75 mh/forw.c:33 mh/forw.c:49
-#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:40 mh/inc.c:47
+#: auth/tls.c:128 mh/anno.c:35 mh/anno.c:38 mh/folder.c:64 mh/folder.c:67
+#: mh/folder.c:70 mh/folder.c:73 mh/folder.c:76 mh/forw.c:33 mh/forw.c:49
+#: mh/forw.c:59 mh/forw.c:62 mh/forw.c:70 mh/forw.c:72 mh/inc.c:41 mh/inc.c:48
 #: mh/mark.c:40 mh/mark.c:43 mh/mhl.c:36 mh/mhl.c:39 mh/mhn.c:43 mh/mhn.c:48
 #: mh/mhn.c:51 mh/mhn.c:54 mh/mhn.c:59 mh/mhn.c:62 mh/mhn.c:67 mh/mhn.c:72
 #: mh/mhn.c:75 mh/mhn.c:84 mh/pick.c:84 mh/pick.c:89 mh/pick.c:92
 #: mh/refile.c:42 mh/refile.c:45 mh/repl.c:36 mh/repl.c:51 mh/repl.c:59
-#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:41
-#: mh/scan.c:48 mh/scan.c:52 mh/send.c:52 mh/send.c:55 mh/send.c:58
+#: mh/repl.c:61 mh/repl.c:63 mh/repl.c:70 mh/rmf.c:43 mh/scan.c:42
+#: mh/scan.c:49 mh/scan.c:53 mh/send.c:52 mh/send.c:55 mh/send.c:58
 #: mh/send.c:61 mh/send.c:64 mh/send.c:69 mh/send.c:72 mh/whom.c:40
-#: sieve/sieve.c:92
+#: sieve/sieve.c:93
 msgid "BOOL"
 msgstr "ЛОГІЧНЕ-ЗНАЧЕННЯ"
 
@@ -365,8 +365,8 @@ msgid "Cannot open device %s: %m"
 msgstr "Не вдається відкрити пристрій %s: %m"
 
 #: comsat/comsat.c:456 mail/copy.c:76 mail/file.c:95 mail/mail.c:438
-#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:218
-#: mh/mh_init.c:379 pop3d/apop.c:240
+#: mail/quit.c:118 mail.local/main.c:686 mail.local/main.c:705 mh/inc.c:219
+#: mh/mh_init.c:380 pop3d/apop.c:240
 #, c-format
 msgid "Cannot open mailbox %s: %s"
 msgstr "Неможливо відкрити скриньку %s: %s"
@@ -638,7 +638,7 @@ msgstr ""
 msgid "Just print a count of messages and exit"
 msgstr "Вивести кількість повідомлень та вийти"
 
-#: frm/from.c:30 sieve/sieve.c:95
+#: frm/from.c:30 sieve/sieve.c:96
 msgid "ADDRESS"
 msgstr "АДРЕСА"
 
@@ -684,13 +684,13 @@ msgid "Could not close mailbox `%s': %s"
 msgstr "Неможливо закрити скриньку `%s': %s"
 
 #: frm/common.c:545 messages/messages.c:142 movemail/movemail.c:189
-#: sieve/sieve.c:457
+#: sieve/sieve.c:458
 #, c-format
 msgid "Could not create mailbox `%s': %s"
 msgstr "Не вдається створити скриньку `%s': %s"
 
 #: frm/common.c:548 messages/messages.c:145 movemail/movemail.c:193
-#: sieve/sieve.c:460
+#: sieve/sieve.c:461
 #, c-format
 msgid "Could not create default mailbox: %s"
 msgstr "Не вдається створити типову скриньку: %s"
@@ -735,9 +735,9 @@ msgid "Cannot open output mailbox %s: %s\n"
 msgstr "Неможливо відкрити вхідну скриньку %s: %s\n"
 
 #: guimb/main.c:45 imap4d/auth_gss.c:267 libsieve/sieve.l:132
-#: libsieve/sieve.l:603 libsieve/sieve.l:667 libsieve/sieve.l:721
-#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:111
-#: mh/mh_init.c:316 mh/mh_msgset.c:606
+#: libsieve/sieve.l:604 libsieve/sieve.l:668 libsieve/sieve.l:722
+#: mail/folders.c:38 mail/if.c:56 mail/util.c:873 mh/mh_init.c:112
+#: mh/mh_init.c:317 mh/mh_msgset.c:606
 msgid "Not enough memory"
 msgstr "Недостатньо пам'яті"
 
@@ -852,65 +852,65 @@ msgstr "Користувача GSSAPI %s ідентифіковано як %s"
 msgid "User `%s' logged in"
 msgstr "Користувач `%s' увійшов у систему"
 
-#: imap4d/imap4d.c:46
+#: imap4d/imap4d.c:47
 msgid "GNU imap4d -- the IMAP4D daemon"
 msgstr "GNU imap4d -- демон IMAP4D"
 
-#: imap4d/imap4d.c:52 imap4d/imap4d.c:54
+#: imap4d/imap4d.c:53 imap4d/imap4d.c:55
 msgid "PATHLIST"
 msgstr "ШЛЯХИ"
 
-#: imap4d/imap4d.c:53
+#: imap4d/imap4d.c:54
 msgid "Set the `other' namespace"
 msgstr "Встановити простір назв `other'"
 
-#: imap4d/imap4d.c:55
+#: imap4d/imap4d.c:56
 msgid "Set the `shared' namespace"
 msgstr "Встановити простір назв `shared'"
 
-#: imap4d/imap4d.c:57
+#: imap4d/imap4d.c:58
 msgid "Disable LOGIN command"
 msgstr "Вимкнути команду LOGIN"
 
-#: imap4d/imap4d.c:60
+#: imap4d/imap4d.c:61
 msgid "Always require STARTTLS before entering authentication phase"
 msgstr "Вимагати використання STARTTLS перед переходом до фази ідентифікації"
 
-#: imap4d/imap4d.c:175 pop3d/pop3d.c:201
+#: imap4d/imap4d.c:176 pop3d/pop3d.c:202
 msgid "Error getting mail group"
 msgstr "Помилка отримання поштової групи"
 
-#: imap4d/imap4d.c:181 pop3d/pop3d.c:207
+#: imap4d/imap4d.c:182 pop3d/pop3d.c:208
 msgid "Error setting mail group"
 msgstr "Помилка встановлення поштової групи"
 
-#: imap4d/imap4d.c:260 pop3d/pop3d.c:298
+#: imap4d/imap4d.c:261 pop3d/pop3d.c:299
 msgid "Incoming connection opened"
 msgstr "Відкрито вхідне з'єднання"
 
-#: imap4d/imap4d.c:262 pop3d/pop3d.c:310
+#: imap4d/imap4d.c:263 pop3d/pop3d.c:311
 #, c-format
 msgid "Cannot obtain IP address of client: %s"
 msgstr "Не вдається встановити адресу IP клієнта: %s"
 
-#: imap4d/imap4d.c:265
+#: imap4d/imap4d.c:266
 #, c-format
 msgid "Connect from %s"
 msgstr "З'єднання з %s"
 
-#: imap4d/imap4d.c:270 pop3d/pop3d.c:303
+#: imap4d/imap4d.c:271 pop3d/pop3d.c:304
 msgid "Started in debugging mode"
 msgstr "Робота у режимі налагоджування"
 
-#: imap4d/imap4d.c:302
+#: imap4d/imap4d.c:303
 msgid "could not become daemon"
 msgstr "не вдається перейти у фоновий режим"
 
-#: imap4d/imap4d.c:358
+#: imap4d/imap4d.c:359
 msgid "GNU imap4d started"
 msgstr "GNU imap4d запустився"
 
-#: imap4d/imap4d.c:364
+#: imap4d/imap4d.c:365
 #, c-format
 msgid "Too many children (%lu)"
 msgstr "Надто багато процесів-нащадків (%lu)"
@@ -950,7 +950,7 @@ msgstr "Закінчення сесії для користувача %s"
 msgid "Quitting (numeric reason %d)"
 msgstr "Вихід (підстава %d)"
 
-#: imap4d/list.c:247 mh/folder.c:326 mh/mh_init.c:225 mh/mh_init.c:704
+#: imap4d/list.c:247 mh/folder.c:327 mh/mh_init.c:226 mh/mh_init.c:705
 #: mh/rmf.c:147 pop3d/popauth.c:246
 #, c-format
 msgid "Cannot stat %s: %s"
@@ -980,25 +980,25 @@ msgstr "Отримано сигнал %s"
 msgid "MASTER: exiting on signal"
 msgstr "ГОЛОВНИЙ ПРОЦЕС: вихід по сигналу"
 
-#: imap4d/util.c:509
+#: imap4d/util.c:510
 msgid "Unexpected eof on input"
 msgstr "Неочікуваний кінець файлу"
 
-#: imap4d/util.c:518
+#: imap4d/util.c:519
 #, c-format
 msgid "Error reading from input file: %s"
 msgstr "Помилка читання з вхідного файлу %s"
 
-#: imap4d/util.c:1005
+#: imap4d/util.c:1006
 msgid "Cannot find out my own hostname"
 msgstr "Не вдається визначити власну назву системи"
 
-#: imap4d/util.c:1152
+#: imap4d/util.c:1153
 #, c-format
 msgid "Cannot poll input stream: %s"
 msgstr "Не вдається опитати вхідний потік: %s"
 
-#: imap4d/util.c:1186
+#: imap4d/util.c:1187
 #, c-format
 msgid "Cannot open TLS stream: %s"
 msgstr "Неможливо відкрити потік TLS: %s"
@@ -1120,106 +1120,106 @@ msgstr "%d: не вдається скопіювати повідомлення:
 msgid "%d: cannot get my email address"
 msgstr "%d: не вдається встановити власну адресу електронної пошти"
 
-#: libsieve/comparator.c:171
+#: libsieve/comparator.c:172
 #, c-format
 msgid "Regex error: %s"
 msgstr "Помилка регулярного виразу: %s"
 
-#: libsieve/comparator.c:176
+#: libsieve/comparator.c:177
 msgid "Regex error"
 msgstr "Помилка регулярного виразу"
 
-#: libsieve/comparator.c:238
+#: libsieve/comparator.c:239
 #, c-format
 msgid "match type specified twice in call to `%s'"
 msgstr "тип допасування вказано двічі у виклику `%s'"
 
 #. TRANSLATORS: Do not translate ':count'. It is the name of a Sieve tag
-#: libsieve/comparator.c:275
+#: libsieve/comparator.c:276
 #, c-format
 msgid "comparator %s is incompatible with :count in call to `%s'"
 msgstr "порівнювач %s несумісний з :count у виклику `%s'"
 
-#: libsieve/comparator.c:291
+#: libsieve/comparator.c:292
 msgid "second argument must be a list of one element"
 msgstr "другий аргумент має бути списком з одного елементу"
 
-#: libsieve/comparator.c:299
+#: libsieve/comparator.c:300
 msgid "second argument cannot be converted to number"
 msgstr "не вдається перетворити другий аргумент на число"
 
-#: libsieve/comparator.c:309
+#: libsieve/comparator.c:310
 #, c-format
 msgid "invalid relational match `%s' in call to `%s'"
 msgstr "недійсне відносне порівняння `%s' у виклику `%s'"
 
-#: libsieve/comparator.c:322
+#: libsieve/comparator.c:323
 #, c-format
 msgid "comparator `%s' is incompatible with match type `%s' in call to `%s'"
 msgstr "порівнювач %s несумісний з типом порівняння `%s' у виклику `%s'"
 
-#: libsieve/prog.c:39
+#: libsieve/prog.c:40
 msgid "out of memory!"
 msgstr "недостатньо пам'яті!"
 
-#: libsieve/prog.c:158 libsieve/require.c:39
+#: libsieve/prog.c:159 libsieve/require.c:40
 #, c-format
 msgid "cannot create iterator: %s"
 msgstr "не вдається створити ітератор: %s"
 
-#: libsieve/prog.c:177
+#: libsieve/prog.c:178
 #, c-format
 msgid "invalid tag name `%s' for `%s'"
 msgstr "неправильна назва мітки `%s' для `%s'"
 
-#: libsieve/prog.c:186
+#: libsieve/prog.c:187
 #, c-format
 msgid "%s:%d: cannot create tag list: %s"
 msgstr "%s:%d: неможливо створити перелік міток: %s"
 
-#: libsieve/prog.c:210
+#: libsieve/prog.c:211
 #, c-format
 msgid "%s:%d: cannot create check list: %s"
 msgstr "%s:%d: неможливо створити контрольний перелік: %s"
 
-#: libsieve/prog.c:222 mimeview/mimetypes.y:561
+#: libsieve/prog.c:223 mimeview/mimetypes.y:561
 #, c-format
 msgid "too many arguments in call to `%s'"
 msgstr "занадто багато аргументів у виклику `%s'"
 
-#: libsieve/prog.c:243
+#: libsieve/prog.c:244
 #, c-format
 msgid "type mismatch in argument %d to `%s'"
 msgstr "невірний тип аргументу %d у виклику `%s'"
 
-#: libsieve/prog.c:247
+#: libsieve/prog.c:248
 #, c-format
 msgid "expected %s but passed %s"
 msgstr "очікувалось %s але отримано %s"
 
-#: libsieve/prog.c:258
+#: libsieve/prog.c:259
 #, c-format
 msgid "cannot create arg list: %s"
 msgstr "не можна створити перелік аргументів: %s"
 
-#: libsieve/prog.c:276 mimeview/mimetypes.y:553
+#: libsieve/prog.c:277 mimeview/mimetypes.y:553
 #, c-format
 msgid "too few arguments in call to `%s'"
 msgstr "занадто мало аргументів у виклику `%s'"
 
-#: libsieve/require.c:56
+#: libsieve/require.c:57
 msgid "required comparator"
 msgstr "потрібного порівнювача"
 
-#: libsieve/require.c:62
+#: libsieve/require.c:63
 msgid "required test"
 msgstr "потрібної перевірки"
 
-#: libsieve/require.c:72
+#: libsieve/require.c:73
 msgid "required action"
 msgstr "потрібної дії"
 
-#: libsieve/require.c:78
+#: libsieve/require.c:79
 #, c-format
 msgid "source for the %s %s is not available"
 msgstr "джерело %s %s не існує"
@@ -1233,8 +1233,8 @@ msgid "stack underflow"
 msgstr "стек пустий"
 
 #: libsieve/runtime.c:341
-#, c-format
-msgid "mailbox_scan: %s"
+#, fuzzy, c-format
+msgid "mu_mailbox_scan: %s"
 msgstr "mailbox_scan: %s"
 
 #: libsieve/sieve.l:234
@@ -1338,7 +1338,7 @@ msgstr ""
 msgid "\"%s\": not a group"
 msgstr "\"%s\" не є групою"
 
-#: mail/alt.c:64 mh/mh_init.c:127
+#: mail/alt.c:64 mh/mh_init.c:128
 msgid "Cannot determine my username"
 msgstr "Неможливо встановити власне ім'я користувача."
 
@@ -1352,13 +1352,13 @@ msgstr "Неможливо визначити власну адресу email: %
 msgid "cannot change to '%s': %s"
 msgstr "не вдається виконати stat %s: %s"
 
-#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:541 mh/inc.c:209
-#: mh/mh_init.c:369
+#: mail/copy.c:68 mail/mail.c:421 mail/quit.c:111 mail/send.c:542 mh/inc.c:210
+#: mh/mh_init.c:370
 #, c-format
 msgid "Cannot create mailbox %s: %s"
 msgstr "Неможливо створити скриньку %s: %s"
 
-#: mail/copy.c:92 mail/quit.c:126 mail/send.c:534
+#: mail/copy.c:92 mail/quit.c:126 mail/send.c:535
 #, c-format
 msgid "Cannot append message: %s"
 msgstr "Не вдається додати повідомлення: %s"
@@ -1386,7 +1386,7 @@ msgstr ""
 "\n"
 "Переривання"
 
-#: mail/escape.c:59 mail/send.c:225 mh/mhn.c:2059 mimeview/mimeview.c:217
+#: mail/escape.c:59 mail/send.c:226 mh/mhn.c:2059 mimeview/mimeview.c:217
 #, c-format
 msgid "Cannot create header: %s"
 msgstr "Не вдається створити заголовок: %s"
@@ -1733,21 +1733,21 @@ msgstr "Наразі не розгортаються жодні поля\n"
 msgid "Sender address is obtained from the envelope\n"
 msgstr "Адресу відправника отримано з конверта\n"
 
-#: mail/send.c:73
+#: mail/send.c:74
 #, c-format
 msgid "Cannot create header list: %s"
 msgstr "Не вдається створити перелік заголовків: %s"
 
-#: mail/send.c:95
+#: mail/send.c:96
 #, c-format
 msgid "Invalid header: %s"
 msgstr "Недійсний заголовок: %s"
 
-#: mail/send.c:308
+#: mail/send.c:309
 msgid "Cannot open temporary file"
 msgstr "Неможливо відкрити тимчасовий файл"
 
-#: mail/send.c:337
+#: mail/send.c:338
 msgid ""
 "\n"
 "(Interrupt -- one more to kill letter)"
@@ -1755,42 +1755,42 @@ msgstr ""
 "\n"
 "(Переривання -- додайте ще одне щоб знищити лист)"
 
-#: mail/send.c:348
+#: mail/send.c:349
 msgid "Use \".\" to terminate letter."
 msgstr "Використовуйте \".\" щоб закінчити лист."
 
-#: mail/send.c:349
+#: mail/send.c:350
 msgid "Use \"~.\" to terminate letter."
 msgstr "Використовуйте \"~.\" щоб закінчити лист."
 
 # екрануюча послідовність?
-#: mail/send.c:391
+#: mail/send.c:392
 #, c-format
 msgid "Unknown escape %s"
 msgstr "Невідома послідовність втечі %s"
 
-#: mail/send.c:394
+#: mail/send.c:395
 msgid "Unfinished escape"
 msgstr "Не завершена послідовність втечі"
 
-#: mail/send.c:398
+#: mail/send.c:399
 msgid "Cannot parse escape sequence"
 msgstr "Не вдається розібрати послідовність втечі"
 
-#: mail/send.c:423 mh/mh_init.c:668 mh/mh_list.c:264
+#: mail/send.c:424 mh/mh_init.c:669 mh/mh_list.c:264
 #, c-format
 msgid "Cannot open file %s: %s"
 msgstr "Неможливо відкрити файл %s: %s"
 
-#: mail/send.c:484
+#: mail/send.c:485
 msgid "Null message body; hope that's ok\n"
 msgstr "Пусте тіло повідомлення; сподіваюся що це навмисно\n"
 
-#: mail/send.c:578
+#: mail/send.c:579
 msgid "Variable sendmail not set: no mailer"
 msgstr "Змінна sendmail не встановлена: немає відправника"
 
-#: mail/send.c:626
+#: mail/send.c:627
 #, c-format
 msgid "Piping %s failed"
 msgstr "Створення каналу до команди %s не вдалося"
@@ -2023,7 +2023,7 @@ msgstr ""
 msgid "Set name pattern for user-defined Scheme mail filters"
 msgstr "Шаблон назв поштових фільтрів користувачів у форматі Scheme"
 
-#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:86
+#: mail.local/main.c:98 mailbox/mu_argp.c:76 sieve/sieve.c:87
 #: mimeview/mimeview.c:46
 msgid "FLAGS"
 msgstr "ОЗНАКИ"
@@ -2036,7 +2036,7 @@ msgstr "Увімкнути налагодження"
 msgid "Multiple --from options"
 msgstr "Вказано декілька опцій --from"
 
-#: mail.local/main.c:215 sieve/sieve.c:208
+#: mail.local/main.c:215 sieve/sieve.c:209
 #, c-format
 msgid "%c is not a valid debug flag"
 msgstr "%c не є дійсною ознакою налагодження"
@@ -2086,7 +2086,7 @@ msgstr ""
 msgid "Access to %s failed: %m"
 msgstr "Не вдалося отримати доступ до %s: %m"
 
-#: mail.local/main.c:427 sieve/sieve.c:375
+#: mail.local/main.c:427 sieve/sieve.c:376
 #, c-format
 msgid "Cannot initialize sieve machine: %s"
 msgstr "Не вдається ініціалізувати машину sieve: %s"
@@ -2306,146 +2306,146 @@ msgstr "Не вдалося відіслати повідомлення: %s"
 msgid "Closing mailer failed: %s"
 msgstr "Не вдалося закрити відправника: %s"
 
-#: mailbox/getopt.c:552 mailbox/getopt.c:571
+#: mailbox/getopt.c:551 mailbox/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: опція `%s' неоднозначна\n"
 
-#: mailbox/getopt.c:604 mailbox/getopt.c:608
+#: mailbox/getopt.c:603 mailbox/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: опція `--%s' не може мати аргументу\n"
 
-#: mailbox/getopt.c:617 mailbox/getopt.c:622
+#: mailbox/getopt.c:616 mailbox/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: опція `%c%s' не може мати аргументу\n"
 
-#: mailbox/getopt.c:668 mailbox/getopt.c:690 mailbox/getopt.c:1021
-#: mailbox/getopt.c:1043
+#: mailbox/getopt.c:667 mailbox/getopt.c:689 mailbox/getopt.c:1020
+#: mailbox/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: опція `%s' вимагає аргумент\n"
 
-#: mailbox/getopt.c:728 mailbox/getopt.c:731
+#: mailbox/getopt.c:727 mailbox/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: невідома опція `--%s'\n"
 
-#: mailbox/getopt.c:739 mailbox/getopt.c:742
+#: mailbox/getopt.c:738 mailbox/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: невідома опція `%c%s'\n"
 
-#: mailbox/getopt.c:797 mailbox/getopt.c:800
+#: mailbox/getopt.c:796 mailbox/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: недопустима опція -- %c\n"
 
-#: mailbox/getopt.c:806 mailbox/getopt.c:809
+#: mailbox/getopt.c:805 mailbox/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: невірна опція -- %c\n"
 
-#: mailbox/getopt.c:864 mailbox/getopt.c:883 mailbox/getopt.c:1096
-#: mailbox/getopt.c:1117
+#: mailbox/getopt.c:863 mailbox/getopt.c:882 mailbox/getopt.c:1095
+#: mailbox/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: опція вимагає аргумент -- %c\n"
 
-#: mailbox/getopt.c:936 mailbox/getopt.c:955
+#: mailbox/getopt.c:935 mailbox/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: опція `-W %s' неоднозначна\n"
 
-#: mailbox/getopt.c:979 mailbox/getopt.c:1000
+#: mailbox/getopt.c:978 mailbox/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: опція `-W %s' не може мати аргументу\n"
 
-#: mailbox/argp-help.c:195
+#: mailbox/argp-help.c:194
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: параметр ARGP_HELP_FMT вимагає значення"
 
-#: mailbox/argp-help.c:204
+#: mailbox/argp-help.c:203
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Невідомий параметр ARGP_HELP_FMT"
 
-#: mailbox/argp-help.c:216
+#: mailbox/argp-help.c:215
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Хибні дані в ARGP_HELP_FMT: %s"
 
-#: mailbox/argp-help.c:1195
+#: mailbox/argp-help.c:1194
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
 msgstr ""
 "Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких."
 
-#: mailbox/argp-help.c:1582
+#: mailbox/argp-help.c:1581
 msgid "Usage:"
 msgstr "Використання:"
 
-#: mailbox/argp-help.c:1586
+#: mailbox/argp-help.c:1585
 msgid "  or: "
 msgstr " чи: "
 
-#: mailbox/argp-help.c:1598
+#: mailbox/argp-help.c:1597
 msgid " [OPTION...]"
 msgstr " [ОПЦІЯ...]"
 
-#: mailbox/argp-help.c:1625
+#: mailbox/argp-help.c:1624
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr ""
 "Спробуйте `%s --help' або `%s --usage' для отримання докладнішого опису.\n"
 
-#: mailbox/argp-help.c:1653
+#: mailbox/argp-help.c:1652
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Про помилки звітуйте на %s.\n"
 
-#: mailbox/argp-help.c:1873
+#: mailbox/argp-help.c:1872
 msgid "Unknown system error"
 msgstr "Невідомий тип повідомлення"
 
-#: mailbox/argp-parse.c:83
+#: mailbox/argp-parse.c:82
 msgid "Give this help list"
 msgstr "Вивести цю довідку"
 
-#: mailbox/argp-parse.c:84
+#: mailbox/argp-parse.c:83
 msgid "Give a short usage message"
 msgstr "Вивести коротке повідомлення про використання"
 
-#: mailbox/argp-parse.c:85
+#: mailbox/argp-parse.c:84
 msgid "Set the program name"
 msgstr "Встановити текст запрошення"
 
-#: mailbox/argp-parse.c:87
+#: mailbox/argp-parse.c:86
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "Зачекати вказану кількість секунд (типово 3600)"
 
-#: mailbox/argp-parse.c:148
+#: mailbox/argp-parse.c:147
 msgid "Print program version"
 msgstr "Вивести версію програми"
 
-#: mailbox/argp-parse.c:164
+#: mailbox/argp-parse.c:163
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(ПОМИЛКА ПРОГРАМУВАННЯ) Невідома версія!?"
 
-#: mailbox/argp-parse.c:620
+#: mailbox/argp-parse.c:619
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Забагато аргументів\n"
 
-#: mailbox/argp-parse.c:763
+#: mailbox/argp-parse.c:762
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(ПОМИЛКА ПРОГРАМУВАННЯ) Опція мала бути розпізнана!?"
 
-#: mailbox/file_stream.c:479
+#: mailbox/file_stream.c:480
 #, c-format
 msgid "%s must be a plain file with one link\n"
 msgstr "%s повинен бути звичайним файлом з одним посиланням\n"
@@ -2469,24 +2469,24 @@ msgstr "Помилка iconv: %s"
 msgid "Stream is closed"
 msgstr "Потік закритий"
 
-#: mailbox/message.c:1092
-#, c-format
-msgid "mailbox_create_default (%s) failed: %s\n"
+#: mailbox/message.c:1093
+#, fuzzy, c-format
+msgid "mu_mailbox_create_default (%s) failed: %s\n"
 msgstr "помилка mailbox_create_default (%s): %s\n"
 
-#: mailbox/message.c:1123
-#, c-format
-msgid "mailbox_open (%s) failed: %s\n"
+#: mailbox/message.c:1124
+#, fuzzy, c-format
+msgid "mu_mailbox_open (%s) failed: %s\n"
 msgstr "помилка mailbox_open (%s): %s\n"
 
-#: mailbox/message.c:1131
-#, c-format
-msgid "mailbox_append_message (%s) failed: %s\n"
+#: mailbox/message.c:1132
+#, fuzzy, c-format
+msgid "mu_mailbox_append_message (%s) failed: %s\n"
 msgstr "помилка mailbox_append_message (%s): %s\n"
 
-#: mailbox/message.c:1143
-#, c-format
-msgid "mailbox_close (%s) failed: %s\n"
+#: mailbox/message.c:1144
+#, fuzzy, c-format
+msgid "mu_mailbox_close (%s) failed: %s\n"
 msgstr "помилка mailbox_close (%s): %s\n"
 
 #: mailbox/mu_argp.c:60
@@ -2510,7 +2510,7 @@ msgid "Default locker flags (E=external, R=retry, T=time, P=pid)"
 msgstr ""
 "Типові ознаки блокування (E=зовнішня, R=повторення спроб, T=час, P=pid)"
 
-#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:76
+#: mailbox/mu_argp.c:78 mailbox/mu_argp.c:82 mh/send.c:67 pop3d/pop3d.c:77
 msgid "SECONDS"
 msgstr "СЕКУНДИ"
 
@@ -2942,15 +2942,15 @@ msgstr ""
 msgid "[msg [msg...]]"
 msgstr "[повідомлення [повідомлення...]]"
 
-#: mh/anno.c:33 mh/folder.c:49 mh/folder.c:59 mh/forw.c:37 mh/forw.c:43
-#: mh/inc.c:34 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
+#: mh/anno.c:33 mh/folder.c:50 mh/folder.c:60 mh/forw.c:37 mh/forw.c:43
+#: mh/inc.c:35 mh/mark.c:30 mh/mh_whatnow.c:84 mh/mhl.c:34 mh/mhn.c:37
 #: mh/mhpath.c:32 mh/pick.c:39 mh/refile.c:38 mh/refile.c:47 mh/repl.c:40
-#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:39 mh/send.c:42
+#: mh/repl.c:50 mh/repl.c:55 mh/rmf.c:41 mh/rmm.c:32 mh/scan.c:40 mh/send.c:42
 #: mh/whatnow.c:29 mh/whom.c:34 readmsg/readmsg.c:43
 msgid "FOLDER"
 msgstr "ТЕКА"
 
-#: mh/anno.c:34 mh/folder.c:60 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
+#: mh/anno.c:34 mh/folder.c:61 mh/forw.c:44 mh/mark.c:31 mh/mhl.c:35
 #: mh/mhn.c:38 mh/mhpath.c:33 mh/pick.c:40 mh/refile.c:39 mh/repl.c:50
 #: mh/rmm.c:33
 msgid "Specify folder to operate upon"
@@ -2976,10 +2976,10 @@ msgstr "Додати це поле до заголовків повідомле
 msgid "Field value for the component"
 msgstr "Значення компоненту"
 
-#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:80 mh/forw.c:75 mh/inc.c:55
+#: mh/anno.c:46 mh/fmtcheck.c:41 mh/folder.c:81 mh/forw.c:75 mh/inc.c:56
 #: mh/install-mh.c:33 mh/mark.c:47 mh/mhl.c:53 mh/mhn.c:90 mh/mhpath.c:35
 #: mh/pick.c:96 mh/refile.c:52 mh/repl.c:72 mh/rmf.c:50 mh/rmm.c:35
-#: mh/scan.c:59 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
+#: mh/scan.c:60 mh/send.c:78 mh/whatnow.c:40 mh/whom.c:45
 msgid "Display software license"
 msgstr "Вивести текст ліцензії"
 
@@ -2995,16 +2995,16 @@ msgid "GNU MH fmtcheckUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH fmtcheckВикористовуйте -help щоб отримати опис традиційних опцій MH."
 
-#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:44 mh/mhl.c:43 mh/repl.c:58
-#: mh/scan.c:45
+#: mh/fmtcheck.c:33 mh/forw.c:54 mh/inc.c:45 mh/mhl.c:43 mh/repl.c:58
+#: mh/scan.c:46
 msgid "Read format from given file"
 msgstr "Читати формат з вказаного файлу"
 
-#: mh/fmtcheck.c:34 mh/inc.c:45 mh/scan.c:46
+#: mh/fmtcheck.c:34 mh/inc.c:46 mh/scan.c:47
 msgid "FORMAT"
 msgstr "ФОРМАТ"
 
-#: mh/fmtcheck.c:35 mh/inc.c:46 mh/scan.c:47
+#: mh/fmtcheck.c:35 mh/inc.c:47 mh/scan.c:48
 msgid "Use this format string"
 msgstr "Використовувати цей рядок формату"
 
@@ -3020,34 +3020,34 @@ msgstr "Увімкнути налагодження аналізатора"
 msgid "Format string not specified"
 msgstr "Рядок формату не вказано"
 
-#: mh/fmtcheck.c:115 mh/inc.c:191 mh/repl.c:373 mh/scan.c:188
+#: mh/fmtcheck.c:115 mh/inc.c:192 mh/repl.c:373 mh/scan.c:189
 msgid "Bad format string"
 msgstr "Недійсний рядок формату"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/folder.c:39
+#: mh/folder.c:40
 msgid "GNU MH folderUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH folderВикористовуйте -help щоб отримати опис традиційних опцій MH."
 
-#: mh/folder.c:41
+#: mh/folder.c:42
 msgid "[action] [msg]"
 msgstr "[дія] [повідомлення]"
 
-#: mh/folder.c:44 pop3d/popauth.c:68
+#: mh/folder.c:45 pop3d/popauth.c:68
 msgid "Actions are:"
 msgstr "Можливі дії:"
 
-#: mh/folder.c:46
+#: mh/folder.c:47
 msgid "List the folders (default)"
 msgstr "Показати перелік тек (типово)"
 
-#: mh/folder.c:48
+#: mh/folder.c:49
 msgid "List the contents of the folder stack"
 msgstr "Вивести вміст стеку тек"
 
-#: mh/folder.c:50
+#: mh/folder.c:51
 msgid ""
 "Push the folder on the folder stack. If FOLDER is specified, it is pushed. "
 "Otherwise, if a folder is given in the command line (via + or --folder), it "
@@ -3059,44 +3059,44 @@ msgstr ""
 "вершині стеку з поточною"
 
 # Вірші...
-#: mh/folder.c:55
+#: mh/folder.c:56
 msgid "Pop the folder off the folder stack"
 msgstr "Зняти теку зі стеку"
 
-#: mh/folder.c:57 mh/mh_whatnow.c:153 pop3d/popauth.c:80
+#: mh/folder.c:58 mh/mh_whatnow.c:153 pop3d/popauth.c:80
 msgid "Options are:"
 msgstr "Опції:"
 
-#: mh/folder.c:62
+#: mh/folder.c:63
 msgid "List all folders"
 msgstr "Вивести перелік усіх тек"
 
-#: mh/folder.c:64
+#: mh/folder.c:65
 msgid "Create non-existing folders"
 msgstr "Створювати неіснуючі теки"
 
-#: mh/folder.c:67
+#: mh/folder.c:68
 msgid "List only the folder names"
 msgstr "Виводити тільки назви тек"
 
-#: mh/folder.c:70
+#: mh/folder.c:71
 msgid "Print the header line"
 msgstr "Вивести рядок заголовку"
 
-#: mh/folder.c:73
+#: mh/folder.c:74
 msgid "Scan folders recursively"
 msgstr "Рекурсивно переглядати теки"
 
-#: mh/folder.c:76
+#: mh/folder.c:77
 msgid "Output the total statistics"
 msgstr "Вивести загальну статистику"
 
-#: mh/folder.c:309 mh/rmf.c:128
+#: mh/folder.c:310 mh/rmf.c:128
 #, c-format
 msgid "Cannot scan folder %s: %s"
 msgstr "Неможливо переглянути теку %s: %s"
 
-#: mh/folder.c:382
+#: mh/folder.c:383
 #, c-format
 msgid " has %4lu message  (%4lu-%4lu)"
 msgid_plural " has %4lu messages (%4lu-%4lu)"
@@ -3104,18 +3104,18 @@ msgstr[0] " містить %4lu повідомлення (%4lu-%4lu)"
 msgstr[1] " містить %4lu повідомлення (%4lu-%4lu)"
 msgstr[2] " містить %4lu повідомлень  (%4lu-%4lu)"
 
-#: mh/folder.c:393
+#: mh/folder.c:394
 #, c-format
 msgid " has no messages"
 msgstr " не містить повідомлень"
 
-#: mh/folder.c:402
+#: mh/folder.c:403
 #, c-format
 msgid "(others)"
 msgstr "(інші)"
 
 # Вирівнювання
-#: mh/folder.c:450
+#: mh/folder.c:451
 #, c-format
 msgid ""
 "Folder                  # of messages     (  range  )  cur msg   (other "
@@ -3124,11 +3124,11 @@ msgstr ""
 "Тека                    Кількість повідомлень     ( діапазон)  поточне   "
 "(інші)\n"
 
-#: mh/folder.c:456
+#: mh/folder.c:457
 msgid "TOTAL"
 msgstr "ЗАГАЛОМ"
 
-#: mh/folder.c:457
+#: mh/folder.c:458
 #, c-format
 msgid "%4lu message  "
 msgid_plural "%4lu messages "
@@ -3136,7 +3136,7 @@ msgstr[0] "%4lu повідомлення "
 msgstr[1] "%4lu повідомлення "
 msgstr[2] "%4lu повідомлень  "
 
-#: mh/folder.c:460
+#: mh/folder.c:461
 #, c-format
 msgid "in %4lu folder"
 msgid_plural "in %4lu folders"
@@ -3212,7 +3212,7 @@ msgstr "Відмінює результат останньої опції --filt
 msgid "Use MIME encapsulation"
 msgstr "Використовує інкапсуляцію MIME"
 
-#: mh/forw.c:65 mh/inc.c:51 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:51
+#: mh/forw.c:65 mh/inc.c:52 mh/mhl.c:45 mh/repl.c:65 mh/scan.c:52
 msgid "Set output width"
 msgstr "Встановити ширину виводу"
 
@@ -3230,15 +3230,15 @@ msgstr ""
 msgid "Use draft file preserved after the last session"
 msgstr "Використовує чорновий файл що залишився від попередньої сесії"
 
-#: mh/forw.c:147 mh/inc.c:137 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:124
+#: mh/forw.c:147 mh/inc.c:138 mh/mhl.c:115 mh/repl.c:203 mh/scan.c:125
 msgid "Invalid width"
 msgstr "Недійсна ширина"
 
-#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:138
+#: mh/forw.c:196 mh/repl.c:239 mh/scan.c:139
 msgid "Option is not yet implemented"
 msgstr "Опцію ще не реалізовано"
 
-#: mh/forw.c:285 mh/mh_init.c:536
+#: mh/forw.c:285 mh/mh_init.c:537
 #, c-format
 msgid "Cannot open output file `%s': %s"
 msgstr "Неможливо відкрити файл виводу: `%s': %s"
@@ -3261,62 +3261,62 @@ msgstr "Кінець пересланих повідомлень"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/inc.c:26
+#: mh/inc.c:27
 msgid "GNU MH incUse -help to obtain the list of traditional MH options."
 msgstr "GNU MH incВикористовуйте -help щоб отримати опис традиційних опцій MH."
 
-#: mh/inc.c:28 mh/rmf.c:37
+#: mh/inc.c:29 mh/rmf.c:37
 msgid "[+folder]"
 msgstr "[+тека]"
 
-#: mh/inc.c:33
+#: mh/inc.c:34
 msgid "Incorporate mail from named file"
 msgstr "Додати пошту з вказаного файлу"
 
-#: mh/inc.c:35
+#: mh/inc.c:36
 msgid "Specify folder to incorporate mail to"
 msgstr "Додати пошту до вказаної теки"
 
-#: mh/inc.c:37
+#: mh/inc.c:38
 msgid "Enable audit"
 msgstr "Увімкнути аудит"
 
-#: mh/inc.c:39
+#: mh/inc.c:40
 msgid "Disable audit"
 msgstr "Вимкнути аудит"
 
-#: mh/inc.c:41
+#: mh/inc.c:42
 msgid "Mark first incorporated message as current (default)"
 msgstr "Зробити поточним перше додане повідомлення (типово)"
 
-#: mh/inc.c:48
+#: mh/inc.c:49
 msgid "Truncate source mailbox after incorporating (default)"
 msgstr "Обрізати скриньку-джерело після додання повідомлень (типово)"
 
-#: mh/inc.c:53 mh/mhn.c:88
+#: mh/inc.c:54 mh/mhn.c:88
 msgid "Be quiet"
 msgstr "Не друкувати заголовки"
 
-#: mh/inc.c:200
+#: mh/inc.c:201
 msgid "Cannot create default mailbox"
 msgstr "Не вдається створити типову скриньку"
 
-#: mh/inc.c:226
+#: mh/inc.c:227
 #, c-format
 msgid "Cannot read input mailbox: %s"
 msgstr "Не вдається прочитати вхідну скриньку: %s"
 
-#: mh/inc.c:233
+#: mh/inc.c:234
 #, c-format
 msgid "Cannot read output mailbox: %s"
 msgstr "Не вдається прочитати вихідну скриньку: %s"
 
-#: mh/inc.c:254
+#: mh/inc.c:255
 #, c-format
 msgid "%d: cannot get message: %s"
 msgstr "%d: не вдається отримати повідомлення: %s"
 
-#: mh/inc.c:261
+#: mh/inc.c:262
 #, c-format
 msgid "%d: error appending message: %s"
 msgstr "%d: помилка додання повідомлення: %s"
@@ -3394,12 +3394,12 @@ msgstr ""
 "Це є %s\n"
 "\n"
 
-#: mh/mh_ctx.c:92
+#: mh/mh_ctx.c:93
 #, c-format
 msgid "Cannot open context file %s: %s"
 msgstr "Неможливо відкрити файл контексту: %s: %s"
 
-#: mh/mh_ctx.c:142
+#: mh/mh_ctx.c:143
 #, c-format
 msgid "Cannot create context %s: %s"
 msgstr "Не вдається створити контекст %s: %s"
@@ -3426,17 +3426,17 @@ msgstr "Відсутні аргументи для %s"
 msgid "Extra arguments to %s"
 msgstr "Надто багато аргументів для %s"
 
-#: mh/mh_format.c:603
+#: mh/mh_format.c:604
 #, c-format
 msgid "INTERNAL ERROR: Unknown opcode: %x"
 msgstr "ВНУТРІШНЯ ПОМИЛКА: Хибний код операції: %x"
 
 #. TRANSLATORS: Do not translate the word 'format'!
-#: mh/mh_format.c:946 mh/mh_format.c:958
+#: mh/mh_format.c:947 mh/mh_format.c:959
 msgid "format: divide by zero"
 msgstr "формат: ділення на нуль"
 
-#: mh/mh_format.c:1874
+#: mh/mh_format.c:1875
 msgid "Invalid recipient mask"
 msgstr "Недійсна маска одержувача"
 
@@ -3466,73 +3466,73 @@ msgstr ""
 "Будь ласка використовуйте довгі опції GNU.\n"
 "Спробуйте %s --help щоб отримати їх детальний опис.\n"
 
-#: mh/mh_init.c:69
+#: mh/mh_init.c:70
 #, c-format
 msgid "Cannot stat format file %s: %s"
 msgstr "Неможливо отримати інформацію про файл формату %s: %s"
 
-#: mh/mh_init.c:76
+#: mh/mh_init.c:77
 #, c-format
 msgid "Cannot open format file %s: %s"
 msgstr "Неможливо відкрити файл формату %s: %s"
 
-#: mh/mh_init.c:206
+#: mh/mh_init.c:207
 #, c-format
 msgid "Create folder \"%s\""
 msgstr "Створити теку \"%s\""
 
-#: mh/mh_init.c:214
+#: mh/mh_init.c:215
 #, c-format
 msgid "Cannot create directory %s: %s"
 msgstr "Не вдається створити каталог %s: %s"
 
 #. TRANSLATORS: See msgids "nN" and "yY".
-#: mh/mh_init.c:267
+#: mh/mh_init.c:268
 #, c-format
 msgid "Please answer yes or no: "
 msgstr "Будь ласка введіть `yes'(так) або `no'(ні): "
 
-#: mh/mh_init.c:326
+#: mh/mh_init.c:327
 #, c-format
 msgid "Cannot open audit file %s: %s"
 msgstr "Не вдається відкрити файл аудиту %s: %s"
 
-#: mh/mh_init.c:457 mh/mh_msgset.c:165
+#: mh/mh_init.c:458 mh/mh_msgset.c:165
 #, c-format
 msgid "Cannot get message %d: %s"
 msgstr "Не вдається отримати повідомлення %d: %s"
 
-#: mh/mh_init.c:475
+#: mh/mh_init.c:476
 #, c-format
 msgid "Cannot split line %s"
 msgstr "Не вдається розділити рядок %s"
 
-#: mh/mh_init.c:527
+#: mh/mh_init.c:528
 #, c-format
 msgid "Cannot open input file `%s': %s"
 msgstr "Не вдається відкрити вхідний файл `%s': %s"
 
-#: mh/mh_init.c:550
+#: mh/mh_init.c:551
 #, c-format
 msgid "Write error on `%s': %s"
 msgstr "Помилка запису `%s': %s"
 
-#: mh/mh_init.c:579
+#: mh/mh_init.c:580
 #, c-format
 msgid "Cannot stat file %s: %s"
 msgstr "Не вдається отримати інформацію про файл %s: %s"
 
-#: mh/mh_init.c:585 mh/mhn.c:2267
+#: mh/mh_init.c:586 mh/mhn.c:2267
 #, c-format
 msgid "Cannot create input stream (file %s): %s"
 msgstr "Не вдається створити вхідний потік (файл %s): %s"
 
-#: mh/mh_init.c:592 mh/mhn.c:2274
+#: mh/mh_init.c:593 mh/mhn.c:2274
 #, c-format
 msgid "Cannot open input stream (file %s): %s"
 msgstr "Не вдається відкрити вхідний потік (файл %s): %s"
 
-#: mh/mh_init.c:605
+#: mh/mh_init.c:606
 #, c-format
 msgid ""
 "Prior to using MH, it is necessary to have a file in your login\n"
@@ -3546,39 +3546,39 @@ msgstr ""
 "елементом цього файлу є шлях до каталогу в якому містяться усі теки MH. "
 "Запропонований шлях: %s...\n"
 
-#: mh/mh_init.c:628
+#: mh/mh_init.c:629
 msgid "Do you need help"
 msgstr "Потрібна допомога"
 
-#: mh/mh_init.c:631
+#: mh/mh_init.c:632
 #, c-format
 msgid "Do you want the standard MH path \"%s\""
 msgstr "Використати стандартний шлях MH \"%s\""
 
-#: mh/mh_init.c:636
+#: mh/mh_init.c:637
 msgid "Do you want a path below your login directory"
 msgstr "Використати шлях відносно Вашого домашнього каталогу"
 
-#: mh/mh_init.c:638
+#: mh/mh_init.c:639
 #, c-format
 msgid "What is the path? "
 msgstr "Вкажіть шлях: "
 
-#: mh/mh_init.c:640
+#: mh/mh_init.c:641
 #, c-format
 msgid "What is the full path? "
 msgstr "Вкажіть повний шлях: "
 
-#: mh/mh_init.c:699
+#: mh/mh_init.c:700
 #, c-format
 msgid "I'm going to create the standard MH path for you.\n"
 msgstr "Створюється стандартний шлях MH.\n"
 
-#: mh/mh_init.c:710
+#: mh/mh_init.c:711
 msgid "You already have an MH profile, use an editor to modify it"
 msgstr "Ви вже маєте профіль MH, використайте редактор щоб модифікувати його"
 
-#: mh/mh_init.c:715
+#: mh/mh_init.c:716
 #, c-format
 msgid ""
 "You already have file %s which is not a regular file or a symbolic link.\n"
@@ -4085,7 +4085,7 @@ msgid "GNU MH mhpathUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH mhpathВикористовуйте -help щоб отримати опис традиційних опцій MH."
 
-#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:35
+#: mh/mhpath.c:28 mh/rmm.c:28 mh/scan.c:36
 msgid "[+folder] [msgs]"
 msgstr "[+тека] [повідомлення]"
 
@@ -4403,37 +4403,37 @@ msgstr "GNU MH rmmВикористовуйте -help щоб отримати о
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: mh/scan.c:33
+#: mh/scan.c:34
 msgid "GNU MH scanUse -help to obtain the list of traditional MH options."
 msgstr ""
 "GNU MH scanВикористовуйте -help щоб отримати опис традиційних опцій MH."
 
-#: mh/scan.c:40
+#: mh/scan.c:41
 msgid "Specify folder to scan"
 msgstr "Вказує теку для перегляду"
 
-#: mh/scan.c:42
+#: mh/scan.c:43
 msgid "Clear screen after displaying the list"
 msgstr "Очищати екран після виводу переліку"
 
-#: mh/scan.c:49
+#: mh/scan.c:50
 msgid "Display header"
 msgstr "Показувати заголовок"
 
-#: mh/scan.c:53
+#: mh/scan.c:54
 msgid "List messages in reverse order"
 msgstr "Показувати повідомлення у зворотному порядку"
 
-#: mh/scan.c:56
+#: mh/scan.c:57
 msgid "[Not yet implemented]"
 msgstr "[Ще не реалізовано]"
 
-#: mh/scan.c:228
+#: mh/scan.c:229
 #, c-format
 msgid "no messages in %s"
 msgstr "немає повідомлень в %s"
 
-#: mh/scan.c:249
+#: mh/scan.c:250
 #, c-format
 msgid "Folder %s  %s\n"
 msgstr "Тека %s  %s\n"
@@ -4515,7 +4515,7 @@ msgstr "Трасувати доставку пошти"
 msgid "* Make header fields no longer than NUMBER columns"
 msgstr "* Обмежити довжину полів заголовку у ЧИСЛО символів"
 
-#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:134 pop3d/pop3d.c:148
+#: mh/send.c:203 mh/send.c:228 pop3d/pop3d.c:135 pop3d/pop3d.c:149
 msgid "Invalid number"
 msgstr "Недійсне число"
 
@@ -4633,15 +4633,18 @@ msgid "Cannot lock"
 msgstr "Не вдається заблокувати"
 
 #: movemail/movemail.c:169
-msgid "mailbox_get_folder failed"
+#, fuzzy
+msgid "mu_mailbox_get_folder failed"
 msgstr "помилка mailbox_get_folder"
 
 #: movemail/movemail.c:172
-msgid "folder_get_authority failed"
+#, fuzzy
+msgid "mu_folder_get_authority failed"
 msgstr "помилка folder_get_authority"
 
 #: movemail/movemail.c:175
-msgid "authority_set_ticket failed"
+#, fuzzy
+msgid "mu_authority_set_ticket failed"
 msgstr "помилка authority_set_ticket"
 
 #: movemail/movemail.c:202
@@ -4743,62 +4746,62 @@ msgstr "неочікуваний кінець файлу"
 msgid "Locking mailbox `%s' failed: %s"
 msgstr "Не вдалося заблокувати скриньку `%s': %s"
 
-#: pop3d/pop3d.c:64
+#: pop3d/pop3d.c:65
 msgid "GNU pop3d -- the POP3 daemon"
 msgstr "GNU pop3d -- демон POP3"
 
-#: pop3d/pop3d.c:74
+#: pop3d/pop3d.c:75
 msgid "Undelete all messages on startup"
 msgstr "Після запуску скасувати ознаку видалення з усіх повідомлень"
 
-#: pop3d/pop3d.c:77
+#: pop3d/pop3d.c:78
 msgid "Allowed delay between the two successive logins"
 msgstr ""
 "Дозволений найменший інтервал між завершенням попередньої й початком "
 "наступної сесії"
 
-#: pop3d/pop3d.c:78
+#: pop3d/pop3d.c:79
 msgid "FILENAME"
 msgstr "ФАЙЛ"
 
-#: pop3d/pop3d.c:79
+#: pop3d/pop3d.c:80
 msgid "Name of login statistics file"
 msgstr "Назва файлу статистики входів"
 
-#: pop3d/pop3d.c:81
+#: pop3d/pop3d.c:82
 msgid "DAYS"
 msgstr "ДНІ"
 
-#: pop3d/pop3d.c:82
+#: pop3d/pop3d.c:83
 msgid "Expire read messages after the given number of days"
 msgstr "Встановити термін дійсності прочитаних повідомлень"
 
-#: pop3d/pop3d.c:84
+#: pop3d/pop3d.c:85
 msgid "Delete expired messages upon closing the mailbox"
 msgstr "Після закриття скриньки видаляти повідомлення що втратили дійсність"
 
-#: pop3d/pop3d.c:87
+#: pop3d/pop3d.c:88
 msgid "Always require STLS before entering authentication phase"
 msgstr "Вимагати використання STLS перед переходом до фази ідентифікації"
 
-#: pop3d/pop3d.c:277
+#: pop3d/pop3d.c:278
 msgid "Failed to become a daemon:"
 msgstr "Не вдається перейти у фоновий режим:"
 
-#: pop3d/pop3d.c:313
+#: pop3d/pop3d.c:314
 #, c-format
 msgid "connect from %s"
 msgstr "з'єднання з %s"
 
-#: pop3d/pop3d.c:437
+#: pop3d/pop3d.c:438
 msgid "Session terminated"
 msgstr "Сесію закінчено"
 
-#: pop3d/pop3d.c:523
+#: pop3d/pop3d.c:524
 msgid "GNU pop3d started"
 msgstr "GNU pop3d запустився"
 
-#: pop3d/pop3d.c:530
+#: pop3d/pop3d.c:531
 #, c-format
 msgid "too many children (%lu)"
 msgstr "надто багато процесів-нащадків (%lu)"
@@ -5046,7 +5049,7 @@ msgstr "Неможливо відкрити скриньку `%s': %s\n"
 
 #. TRANSLATORS: Please, preserve the vertical tabulation (^K character)
 #. in this message
-#: sieve/sieve.c:53
+#: sieve/sieve.c:54
 msgid ""
 "GNU sieve -- a mail filtering tool\n"
 "Debug flags:\n"
@@ -5063,152 +5066,152 @@ msgstr ""
 "  t - трасування перевірок і дій sieve (MU_SIEVE_DEBUG_TRACE)\n"
 "  i - трасування інструкцій sieve (MU_SIEVE_DEBUG_INSTR)\n"
 
-#: sieve/sieve.c:69
+#: sieve/sieve.c:70
 msgid "Do not execute any actions, just print what would be done"
 msgstr "Не виконувати жодних дій, лише друкувати що мало бути зроблено"
 
-#: sieve/sieve.c:72
+#: sieve/sieve.c:73
 msgid "Keep on going if execution fails on a message"
 msgstr "Продовжувати роботу у разі збою операції з якимось повідомленням"
 
-#: sieve/sieve.c:75
+#: sieve/sieve.c:76
 msgid "Compile script and exit"
 msgstr "Скомпілювати сценарій та вийти"
 
-#: sieve/sieve.c:78
+#: sieve/sieve.c:79
 msgid "Compile script, dump disassembled sieve code to terminal and exit"
 msgstr "Скомпілювати сценарій, вивести код на термінал та вийти"
 
-#: sieve/sieve.c:80
+#: sieve/sieve.c:81
 msgid "MBOX"
 msgstr "СКРИНЬКА"
 
-#: sieve/sieve.c:81
+#: sieve/sieve.c:82
 msgid "Mailbox to sieve (defaults to user's mail spool)"
 msgstr ""
 "Просівати вказану скриньку (типово системну поштову скриньку користувача)"
 
-#: sieve/sieve.c:83
+#: sieve/sieve.c:84
 msgid "TICKET"
 msgstr "КВИТОК"
 
-#: sieve/sieve.c:84
+#: sieve/sieve.c:85
 msgid "Ticket file for mailbox authentication"
 msgstr "Файл квитка для ідентифікації скриньки"
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "Debug flags (defaults to \""
 msgstr "Ознаки налагодження (типово \""
 
-#: sieve/sieve.c:87
+#: sieve/sieve.c:88
 msgid "\")"
 msgstr "\")"
 
-#: sieve/sieve.c:90
+#: sieve/sieve.c:91
 msgid "Log all actions"
 msgstr "Протоколювати усі дії"
 
-#: sieve/sieve.c:93
+#: sieve/sieve.c:94
 msgid "Print source location along with action logs (default)"
 msgstr ""
 "Реєструвати назву джерела та номер рядку що викликали виконання дії (типово)"
 
-#: sieve/sieve.c:96
+#: sieve/sieve.c:97
 msgid "Override user email address"
 msgstr "Перевизначити поштову адресу користувача"
 
-#: sieve/sieve.c:149
+#: sieve/sieve.c:150
 #, c-format
 msgid "Invalid email: %s"
 msgstr "Недійсна поштова адреса: %s"
 
-#: sieve/sieve.c:170
+#: sieve/sieve.c:171
 msgid "Only one MBOX can be specified"
 msgstr "Дозволяється вказувати лише одну скриньку"
 
-#: sieve/sieve.c:224
+#: sieve/sieve.c:225
 msgid "Only one SCRIPT can be specified"
 msgstr "Дозволяється вказувати лише один сценарій"
 
-#: sieve/sieve.c:229
+#: sieve/sieve.c:230
 msgid "SCRIPT must be specified"
 msgstr "Необхідно вказати сценарій"
 
-#: sieve/sieve.c:242
+#: sieve/sieve.c:243
 msgid "SCRIPT"
 msgstr "СЦЕНАРІЙ"
 
-#: sieve/sieve.c:300 sieve/sieve.c:325
+#: sieve/sieve.c:301 sieve/sieve.c:326
 #, c-format
 msgid "%s:%lu: %s on msg uid %lu"
 msgstr "%s:%lu: %s над повідомленням з uid %lu"
 
-#: sieve/sieve.c:304 sieve/sieve.c:329
+#: sieve/sieve.c:305 sieve/sieve.c:330
 #, c-format
 msgid "%s on msg uid %lu"
 msgstr "%s над повідомленням з uid %lu"
 
-#: sieve/sieve.c:415
+#: sieve/sieve.c:416
 #, c-format
 msgid "ticket_get failed: %s"
 msgstr "помилка ticket_get: %s"
 
-#: sieve/sieve.c:421
-#, c-format
-msgid "wicket_create `%s' failed: %s"
+#: sieve/sieve.c:422
+#, fuzzy, c-format
+msgid "mu_wicket_create `%s' failed: %s"
 msgstr "помилка wicket_create `%s': %s"
 
-#: sieve/sieve.c:434
+#: sieve/sieve.c:435
 #, c-format
 msgid "mu_debug_create failed: %s"
 msgstr "помилка mu_debug_create: %s"
 
-#: sieve/sieve.c:439
+#: sieve/sieve.c:440
 #, c-format
 msgid "mu_debug_set_level failed: %s"
 msgstr "помилка mu_debug_set_level: %s"
 
-#: sieve/sieve.c:445
+#: sieve/sieve.c:446
 #, c-format
 msgid "mu_debug_set_print failed: %s"
 msgstr "помилка mu_debug_set_print: %s"
 
-#: sieve/sieve.c:467
-#, c-format
-msgid "mailbox_set_debug failed: %s"
+#: sieve/sieve.c:468
+#, fuzzy, c-format
+msgid "mu_mailbox_set_debug failed: %s"
 msgstr "помилка mailbox_set_debug: %s"
 
-#: sieve/sieve.c:478
-#, c-format
-msgid "mailbox_get_folder failed: %s"
+#: sieve/sieve.c:479
+#, fuzzy, c-format
+msgid "mu_mailbox_get_folder failed: %s"
 msgstr "помилка mailbox_get_folder: %s"
 
-#: sieve/sieve.c:485
-#, c-format
-msgid "folder_get_authority failed: %s"
+#: sieve/sieve.c:486
+#, fuzzy, c-format
+msgid "mu_folder_get_authority failed: %s"
 msgstr "помилка folder_get_authority: %s"
 
-#: sieve/sieve.c:493
-#, c-format
-msgid "authority_set_ticket failed: %s"
+#: sieve/sieve.c:494
+#, fuzzy, c-format
+msgid "mu_authority_set_ticket failed: %s"
 msgstr "помилка authority_set_ticket: %s"
 
-#: sieve/sieve.c:508
+#: sieve/sieve.c:509
 #, c-format
 msgid "Opening mailbox `%s' failed: %s"
 msgstr "Не вдалося відкрити скриньку `%s': %s"
 
-#: sieve/sieve.c:511
+#: sieve/sieve.c:512
 #, c-format
 msgid "Opening default mailbox failed: %s"
 msgstr "Не вдалося відкрити типову скриньку: %s"
 
-#: sieve/sieve.c:532
+#: sieve/sieve.c:533
 #, c-format
 msgid "Expunge on mailbox `%s' failed: %s"
 msgstr "Неможливо видалити повідомлення з `%s': %s"
 
-#: sieve/sieve.c:535
+#: sieve/sieve.c:536
 #, c-format
 msgid "Expunge on default mailbox failed: %s"
 msgstr "Неможливо видалити повідомлення з типової скриньки: %s"