rename buffy.c

diff --git a/Makefile.autosetup b/Makefile.autosetup
index f6005f0aeb2c93a24e211a3b91da694026bf745e..7e99cc4da6caa852c85b1254cf621aa1e2b20008 100644 (file)
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -61,18 +61,18 @@ ALL_FILES!= (cd $(SRCDIR) && git ls-files 2>/dev/null) || true
 ###############################################################################
 # neomutt
 NEOMUTT=       neomutt$(EXEEXT)
-NEOMUTTOBJS=   addrbook.o alias.o bcache.o browser.o buffy.o color.o \
-               commands.o complete.o compose.o compress.o conststrings.o \
-               copy.o curs_lib.o curs_main.o edit.o editmsg.o enriched.o \
-               enter.o filter.o flags.o group.o handler.o hdrline.o help.o \
-               hook.o init.o keymap.o main.o menu.o muttlib.o mutt_account.o \
-               mutt_attach.o mutt_body.o mutt_header.o mutt_history.o \
-               mutt_logging.o mutt_parse.o mutt_signal.o mutt_socket.o \
-               mutt_thread.o mutt_url.o mutt_window.o mx.o pager.o pattern.o \
-               postpone.o progress.o query.o recvattach.o recvcmd.o resize.o \
-               rfc1524.o rfc3676.o safe_asprintf.o score.o send.o sendlib.o \
-               sidebar.o smtp.o sort.o state.o status.o system.o terminal.o \
-               version.o
+NEOMUTTOBJS=   addrbook.o alias.o bcache.o browser.o color.o commands.o \
+               complete.o compose.o compress.o conststrings.o copy.o \
+               curs_lib.o curs_main.o edit.o editmsg.o enriched.o enter.o \
+               filter.o flags.o group.o handler.o hdrline.o help.o hook.o \
+               init.o keymap.o mailbox.o main.o menu.o muttlib.o \
+               mutt_account.o mutt_attach.o mutt_body.o mutt_header.o \
+               mutt_history.o mutt_logging.o mutt_parse.o mutt_signal.o \
+               mutt_socket.o mutt_thread.o mutt_url.o mutt_window.o mx.o \
+               pager.o pattern.o postpone.o progress.o query.o recvattach.o \
+               recvcmd.o resize.o rfc1524.o rfc3676.o safe_asprintf.o \
+               score.o send.o sendlib.o sidebar.o smtp.o sort.o state.o \
+               status.o system.o terminal.o version.o
 
 @if !HAVE_WCSCASECMP
 NEOMUTTOBJS+=  wcscasecmp.o

diff --git a/browser.c b/browser.c
index 520d6b33524272a7f3ed74f7a838ff6c67dcc28c..d29ad5b7ebfa79d8ab4cb7f8afe67423de47527e 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -41,12 +41,12 @@
 #include "conn/conn.h"
 #include "mutt.h"
 #include "browser.h"
-#include "buffy.h"
 #include "context.h"
 #include "curs_lib.h"
 #include "format_flags.h"
 #include "globals.h"
 #include "keymap.h"
+#include "mailbox.h"
 #include "maildir/maildir.h"
 #include "menu.h"
 #include "mutt_attach.h"

diff --git a/commands.c b/commands.c
index a1cf850641f335b0c0eea0313fa4a6abba1a8538..1fe27687aa233f9e4cbf52d8b836ac8dafb10656 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -35,7 +35,6 @@
 #include "conn/conn.h"
 #include "mutt.h"
 #include "alias.h"
-#include "buffy.h"
 #include "context.h"
 #include "copy.h"
 #include "curs_lib.h"
@@ -45,6 +44,7 @@
 #include "hdrline.h"
 #include "hook.h"
 #include "keymap.h"
+#include "mailbox.h"
 #include "menu.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"

diff --git a/curs_main.c b/curs_main.c
index 93f40f8557d814951fd54ffaaba85d0b2acd54bb..e380adb38419b45838739f1e028e4e90bf4d061d 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -36,7 +36,6 @@
 #include "curs_main.h"
 #include "alias.h"
 #include "browser.h"
-#include "buffy.h"
 #include "commands.h"
 #include "context.h"
 #include "curs_lib.h"
@@ -45,6 +44,7 @@
 #include "hdrline.h"
 #include "hook.h"
 #include "keymap.h"
+#include "mailbox.h"
 #include "menu.h"
 #include "mutt_curses.h"
 #include "mutt_header.h"

diff --git a/enter.c b/enter.c
index 1f52f0c72bd3f443aa886acc43b680f8fde9cd43..2f4205952138989ac7c9b2a81d94c81b81cd733b 100644 (file)
--- a/enter.c
+++ b/enter.c
@@ -37,11 +37,11 @@
 #include "mutt.h"
 #include "alias.h"
 #include "browser.h"
-#include "buffy.h"
 #include "curs_lib.h"
 #include "enter_state.h"
 #include "globals.h"
 #include "keymap.h"
+#include "mailbox.h"
 #include "mutt_curses.h"
 #include "mutt_history.h"
 #include "mutt_window.h"

diff --git a/imap/browse.c b/imap/browse.c
index cd7876ffdde4c520e02d1578b4f7dc7bd973ca1f..6aaef412d150a9a1127a48a0d88dd8cae68863e9 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -38,11 +38,11 @@
 #include "conn/conn.h"
 #include "mutt.h"
 #include "browser.h"
-#include "buffy.h"
 #include "context.h"
 #include "curs_lib.h"
 #include "globals.h"
 #include "imap/imap.h"
+#include "mailbox.h"
 #include "mutt_logging.h"
 #include "muttlib.h"
 

diff --git a/imap/command.c b/imap/command.c
index 895a1ea915a3def37bd2ff980b9745c70de326d8..81f2dc25b2346099edb30d42a1ee4e348147581b 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -43,10 +43,10 @@
 #include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
-#include "buffy.h"
 #include "context.h"
 #include "globals.h"
 #include "imap/imap.h"
+#include "mailbox.h"
 #include "menu.h"
 #include "message.h"
 #include "mutt_account.h"

diff --git a/imap/imap.c b/imap/imap.c
index 2fe3cd2a071be601a6ccb01c9cba28f16aae70e3..8c28ca138c2bf3d5de4cd002f43b3e039e30a523 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -44,11 +44,11 @@
 #include "imap.h"
 #include "auth.h"
 #include "bcache.h"
-#include "buffy.h"
 #include "commands.h"
 #include "context.h"
 #include "curs_lib.h"
 #include "globals.h"
+#include "mailbox.h"
 #include "message.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"

diff --git a/init.h b/init.h
index d264f5255b9de68a80b94d0a29d61d2f69dfa936..7ffc62d7942a908635d1233c51342dfc299a8952 100644 (file)
--- a/init.h
+++ b/init.h
@@ -37,7 +37,6 @@
 #include "addrbook.h"
 #include "bcache.h"
 #include "browser.h"
-#include "buffy.h"
 #include "color.h"
 #include "commands.h"
 #include "compose.h"
@@ -48,15 +47,16 @@
 #include "group.h"
 #include "handler.h"
 #include "hdrline.h"
-#include "mutt_history.h"
 #include "hook.h"
 #include "imap/imap.h"
 #include "keymap.h"
+#include "mailbox.h"
 #include "maildir/maildir.h"
 #include "main.h"
 #include "menu.h"
 #include "mutt_account.h"
 #include "mutt_commands.h"
+#include "mutt_history.h"
 #include "mutt_logging.h"
 #include "mutt_thread.h"
 #include "muttlib.h"

diff --git a/buffy.c b/mailbox.c
similarity index 99%
rename from buffy.c
rename to mailbox.c
index e09edf20966445431cdf35f7af0fcca8ac3abd0c..fc2f0b5101d9f37839ad0070988f111d29f82fec 100644 (file)
--- a/buffy.c
+++ b/mailbox.c
@@ -34,7 +34,7 @@
 #include "config/lib.h"
 #include "email/email.h"
 #include "mutt.h"
-#include "buffy.h"
+#include "mailbox.h"
 #include "context.h"
 #include "globals.h"
 #include "maildir/maildir.h"
@@ -53,7 +53,7 @@
 #include "notmuch/mutt_notmuch.h"
 #endif
 
-/* These Config Variables are only used in buffy.c */
+/* These Config Variables are only used in mailbox.c */
 short MailCheck; ///< Config: Number of seconds before NeoMutt checks for new mail
 bool MailCheckStats;          ///< Config: Periodically check for new mail
 short MailCheckStatsInterval; ///< Config: How often to check for new mail

diff --git a/buffy.h b/mailbox.h
similarity index 98%
rename from buffy.h
rename to mailbox.h
index c7b1e26f38996fa09a3a855c79f85daad9a079de..84f40748374c9b1f21c975088d2e8c043fa0fd8c 100644 (file)
--- a/buffy.h
+++ b/mailbox.h
@@ -33,7 +33,7 @@
 struct Buffer;
 struct stat;
 
-/* These Config Variables are only used in buffy.c */
+/* These Config Variables are only used in mailbox.c */
 extern short MailCheck;
 extern bool  MailCheckStats;
 extern short MailCheckStatsInterval;

diff --git a/maildir/mh.c b/maildir/mh.c
index 451182f85a91579858f9acbf598b1305173c7158..9352b9817666e2fceb02ad82cf71475097c0c720 100644 (file)
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -47,10 +47,10 @@
 #include "mutt/mutt.h"
 #include "email/email.h"
 #include "mutt.h"
-#include "buffy.h"
 #include "context.h"
 #include "copy.h"
 #include "globals.h"
+#include "mailbox.h"
 #include "maildir.h"
 #include "mutt_thread.h"
 #include "muttlib.h"

diff --git a/main.c b/main.c
index b3140a83c217e576dfe1d12ac65e76bd1f2a9708..3a6b5e903d681e7b1e8f55221775252d968604cd 100644 (file)
--- a/main.c
+++ b/main.c
@@ -48,13 +48,13 @@
 #include "mutt.h"
 #include "alias.h"
 #include "browser.h"
-#include "buffy.h"
 #include "color.h"
 #include "curs_lib.h"
 #include "curs_main.h"
 #include "globals.h"
 #include "hook.h"
 #include "keymap.h"
+#include "mailbox.h"
 #include "menu.h"
 #include "mutt_curses.h"
 #include "mutt_history.h"

diff --git a/mbox/mbox.c b/mbox/mbox.c
index 2222426abbd8264768fd89223baeac3b4d96d2d7..66b7b49b28252d1cbbbe13d7f39c5592132644ae 100644 (file)
--- a/mbox/mbox.c
+++ b/mbox/mbox.c
@@ -41,10 +41,10 @@
 #include "mutt/mutt.h"
 #include "email/email.h"
 #include "mutt.h"
-#include "buffy.h"
 #include "context.h"
 #include "copy.h"
 #include "globals.h"
+#include "mailbox.h"
 #include "mutt_header.h"
 #include "mutt_thread.h"
 #include "muttlib.h"

diff --git a/mx.c b/mx.c
index 3fb05e97860e42f22484e66c4f154cadc968c9c8..c68a85e89496ed73cd08ffffc9a3894ef68173ef 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -41,12 +41,12 @@
 #include "email/email.h"
 #include "mutt.h"
 #include "mx.h"
-#include "buffy.h"
 #include "context.h"
 #include "copy.h"
 #include "globals.h"
 #include "hook.h"
 #include "keymap.h"
+#include "mailbox.h"
 #include "maildir/maildir.h"
 #include "mbox/mbox.h"
 #include "mutt_header.h"

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index 2cb8a9bc4647d9b91778bf08909491875949d796..200a40ef240447a4d2d05a1b47a6b59e69ca4597 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -58,11 +58,11 @@
 #include "email/email.h"
 #include "mutt.h"
 #include "mutt_notmuch.h"
-#include "buffy.h"
 #include "context.h"
 #include "curs_lib.h"
 #include "curs_main.h"
 #include "globals.h"
+#include "mailbox.h"
 #include "maildir/maildir.h"
 #include "mutt_logging.h"
 #include "mutt_thread.h"

diff --git a/pager.c b/pager.c
index 68d02b186f536e2736066d30da7a6b5470bcce7d..2f4cfeea0b54c8899c3b2b8912cb00739d9226a2 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -37,7 +37,6 @@
 #include "mutt.h"
 #include "pager.h"
 #include "alias.h"
-#include "buffy.h"
 #include "color.h"
 #include "commands.h"
 #include "context.h"
@@ -48,6 +47,7 @@
 #include "hdrline.h"
 #include "hook.h"
 #include "keymap.h"
+#include "mailbox.h"
 #include "menu.h"
 #include "mutt_attach.h"
 #include "mutt_curses.h"

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5bd9068776f4710fce4cf456bf8f88433aa73560..841b5f467f62a19275f61ea766ea13e9f514040a 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,6 @@ addrbook.c
 alias.c
 bcache.c
 browser.c
-buffy.c
 color.c
 commands.c
 complete.c
@@ -84,6 +83,7 @@ imap/utf7.c
 imap/util.c
 init.c
 keymap.c
+mailbox.c
 maildir/mh.c
 main.c
 mbox/mbox.c

diff --git a/po/bg.po b/po/bg.po
index b6765eec06ce27727a9a5d9dabf35eb4f609745d..b64fad42b9adbe79066ff15aa75690f558d71878 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -282,7 +282,7 @@ msgstr "Отписване от %s..."
 msgid "No newsgroups match the mask"
 msgstr "Няма файлове, отговарящи на маската"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Нови писма в "
 

diff --git a/po/ca.po b/po/ca.po
index 94451cf89679a05795bd3205d0e5644c069f546c..f46af86ca4ae2c90f579c52f6aaaa474352f1fa1 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -319,7 +319,7 @@ msgid "No newsgroups match the mask"
 msgstr "No hi ha cap fitxer que concorde amb la màscara de fitxers."
 
 # Vaja, no hi ha com posar-li cometes…  ivb
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Hi ha correu nou a "
 

diff --git a/po/cs.po b/po/cs.po
index 04d4586d0a6f9a91279908552f7ffdbe7fe4bb90..8127bd66f3ab22c16da97454b933def67f4259c4 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -277,7 +277,7 @@ msgstr "Odhlásit odběr zpráv dle vzoru: "
 msgid "No newsgroups match the mask"
 msgstr "Masce nevyhovují žádné diskusní skupiny"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Nová pošta ve složce "
 

diff --git a/po/da.po b/po/da.po
index 1e636812dc2a85e1c2b0e1fa007b131b25dd7ba7..b9c9d4543da2861b839f377213dcc2f4a0a1bbf0 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -276,7 +276,7 @@ msgstr "Afmeldt fra %s"
 msgid "No newsgroups match the mask"
 msgstr "Ingen filer passer til filmasken"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Ny post i "
 

diff --git a/po/de.po b/po/de.po
index 9f425af52ec981587d776c8205c26ced27bc0c6e..87134bebb5e3077d524b5dbcb9ead4adc3de4933 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -273,7 +273,7 @@ msgstr "Abbestellen mittels Muster: "
 msgid "No newsgroups match the mask"
 msgstr "Es gibt keine zur Maske passenden Newsgroups"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Neue Nachrichten in "
 

diff --git a/po/el.po b/po/el.po
index caae2f61937e2de0d3e6df143e015de6a145be18..aed1459b768d94840fd2012722bb8cca376a1e25 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -282,7 +282,7 @@ msgstr "Διαγραφή στο %s..."
 msgid "No newsgroups match the mask"
 msgstr "Κανένα αρχείο δεν ταιριάζει με τη μάσκα αρχείου"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Νέα αλληλογραφία στο "
 

diff --git a/po/en_GB.po b/po/en_GB.po
index 75ba69fbbf1cd754c1dbf4aca5d160f10000d75b..75155a8ac965a0b248c20c55486bff5910c6d2c8 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -267,7 +267,7 @@ msgstr "Unsubscribe pattern: "
 msgid "No newsgroups match the mask"
 msgstr "No newsgroups match the mask"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "New mail in "
 

diff --git a/po/eo.po b/po/eo.po
index efef36b9b3061c2faa25b85ad936f254b7542361..d723dbf5129be497f8f2f4ebbcb4b2f25b122859 100644 (file)
--- a/po/eo.po
+++ b/po/eo.po
@@ -275,7 +275,7 @@ msgstr "Malabonis %s"
 msgid "No newsgroups match the mask"
 msgstr "Neniu dosiero kongruas kun la dosieromasko"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Nova mesaĝo en "
 

diff --git a/po/es.po b/po/es.po
index 34c8dcd311d87923c45f7006cf01b4c01981e5ce..5f595856af17845fba8cfbb9c93e93480a99e827 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -278,7 +278,7 @@ msgstr "Desuscribiendo de %s..."
 msgid "No newsgroups match the mask"
 msgstr "Ningún archivo coincide con el patrón"
 
-#: buffy.c:838
+#: mailbox.c:838
 #, fuzzy
 msgid "New mail in "
 msgstr "Correo nuevo en %s."

diff --git a/po/et.po b/po/et.po
index c50e8531a57c4056ebed85b00ca0249e3af3e669..69f659041f247d7b681d73991ba59a6bc21dc7b6 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -278,7 +278,7 @@ msgstr "Loobun kaustast %s..."
 msgid "No newsgroups match the mask"
 msgstr "Maskile vastavaid faile ei ole"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Uus kiri kaustas "
 

diff --git a/po/eu.po b/po/eu.po
index f357670da03f2e353c2f4ef6732c95b9d9bf85ff..f209df894a5b3a5d83652564063a6caa0182ea5f 100644 (file)
--- a/po/eu.po
+++ b/po/eu.po
@@ -275,7 +275,7 @@ msgstr "%s-ra harpidetzaz ezabaturik"
 msgid "No newsgroups match the mask"
 msgstr "Ez da fitxategi maskara araberako fitxategirik aurkitu"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Posta berria "
 

diff --git a/po/fr.po b/po/fr.po
index 7d7a98f9a8b3aad3aa341ed783d07ae89913ef43..f8aabc3ac1f327110c445dd8799ba2e50586ff24 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -300,7 +300,7 @@ msgid "No newsgroups match the mask"
 msgstr "Aucun fichier ne correspond au masque"
 
 # , c-format
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Nouveau(x) message(s) dans "
 

diff --git a/po/ga.po b/po/ga.po
index 16271330af5aeffe1b75deb4957c5c95796e763d..39b46e0f4c6a75c130864744eccc7e30e833c904 100644 (file)
--- a/po/ga.po
+++ b/po/ga.po
@@ -277,7 +277,7 @@ msgstr "Díliostáilte ó %s"
 msgid "No newsgroups match the mask"
 msgstr "Níl aon chomhad comhoiriúnach leis an mhasc chomhaid"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Post nua i "
 

diff --git a/po/gl.po b/po/gl.po
index c28c4a4b4fce57c296f7edac79a30c16405124ca..dbe8dd5ac65574bd352bde3f873856005afcb0a7 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -278,7 +278,7 @@ msgstr "Borrando a subscripción con %s..."
 msgid "No newsgroups match the mask"
 msgstr "Non hai ficheiros que coincidan coa máscara"
 
-#: buffy.c:838
+#: mailbox.c:838
 #, fuzzy
 msgid "New mail in "
 msgstr "Novo correo en %s."

diff --git a/po/hu.po b/po/hu.po
index 0e6d853d28682bf922f8dba5db524fd75acb96c0..b3f1b25370dcbf6a2e5f533568aaa510f693f5eb 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -279,7 +279,7 @@ msgstr "%s leírása..."
 msgid "No newsgroups match the mask"
 msgstr "Nincs a fájlmaszknak megfelelő fájl"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Új levél: "
 

diff --git a/po/id.po b/po/id.po
index ad4d1075170b3f03a42dee4f883b3d1814bf5601..2a6c0b8711d42de95cf2279453508396063dde2e 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -278,7 +278,7 @@ msgstr "Berhenti langganan dari %s"
 msgid "No newsgroups match the mask"
 msgstr "Tidak ada file yang sesuai dengan mask"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Surat baru di "
 

diff --git a/po/it.po b/po/it.po
index 103f7216dbda2f3e37b0580e32bf5350921f1bec..f8a938d45ebaf9826c4191281c246b0ba9a52da3 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -276,7 +276,7 @@ msgstr "Sottoscrizione rimossa da %s..."
 msgid "No newsgroups match the mask"
 msgstr "Non ci sono file corrispondenti alla maschera"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Nuova posta in "
 

diff --git a/po/ja.po b/po/ja.po
index a8745fa331a1240615d361a39097fd1123a5a8dc..2068f96202004c4a7a0937caf18380b2ee6234e5 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -273,7 +273,7 @@ msgstr "%s の購読を取り消した"
 msgid "No newsgroups match the mask"
 msgstr "マスクに一致するニュースグループがない"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "新着メールあり: "
 

diff --git a/po/ko.po b/po/ko.po
index a331cc3b9d23ca1da532b1b7f26ff43b60cf1af6..00397e66e9bd99bc168b906c6e6105374c866306 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -280,7 +280,7 @@ msgstr "%s에서 가입 탈퇴 중..."
 msgid "No newsgroups match the mask"
 msgstr "파일 매스크와 일치하는 파일 없음."
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "새 메일 도착 "
 

diff --git a/po/lt.po b/po/lt.po
index af70673d9dbf1698073d0d7f883bd54f13139c19..d425d110e3c3ae1524e7551e253a8505eae5aea4 100644 (file)
--- a/po/lt.po
+++ b/po/lt.po
@@ -270,7 +270,7 @@ msgstr "Atsisakymo pattern'as: "
 msgid "No newsgroups match the mask"
 msgstr "Nė viena naujienų grupė neatitinka kaukės"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Naujas paštas dėžutėje "
 

diff --git a/po/nl.po b/po/nl.po
index b72d3f18a86fccd2d406bd7dc2ab619353159512..1157f5b0f55350b68e0137e158980db24818f41d 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -275,7 +275,7 @@ msgstr "Abonnement op %s opgezegd"
 msgid "No newsgroups match the mask"
 msgstr "Geen bestanden waarop het masker past gevonden."
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Nieuw bericht in "
 

diff --git a/po/pl.po b/po/pl.po
index 5b8719bb865100f4a904df32b97dc6aff17d466b..a493f68feb4dd70e6d9cfbc1a3b2a222bb72d398 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -270,7 +270,7 @@ msgstr "Odsubskrybuj wzorzec: "
 msgid "No newsgroups match the mask"
 msgstr "Żadna grupa dyskusyjna nie pasuje do wzorca"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Nowa poczta w "
 

diff --git a/po/pt_BR.po b/po/pt_BR.po
index f3df1a3f40efb9c45bd52f7c6a47946105b765f0..81397f349f93d70ea125a7fd100c027c7c70dda0 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -269,7 +269,7 @@ msgstr "Padrão para desinscrição: "
 msgid "No newsgroups match the mask"
 msgstr "Nenhum grupo de notícias coincide com a máscara"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Nova mensagem em "
 

diff --git a/po/ru.po b/po/ru.po
index b299505c0a644feca4a7ae343c275c9fb420cf53..320d11e7800cc9a06ea737c00b9ba7c6e8d705a6 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -277,7 +277,7 @@ msgstr "Отключено от %s"
 msgid "No newsgroups match the mask"
 msgstr "Нет файлов, удовлетворяющих данной маске"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Новая почта в "
 

diff --git a/po/sk.po b/po/sk.po
index 6dc1be6ecef0fac47e9fb4c49ecca50b4e932e24..88daf343474f87cb118e0182290755430aa00245 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -269,7 +269,7 @@ msgstr "Neodoberať podľa vzoru: "
 msgid "No newsgroups match the mask"
 msgstr "Žiadne diskusné skupiny nezodpovedajú maske"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Nová pošta v zložke "
 

diff --git a/po/sv.po b/po/sv.po
index 89cb3b32f9e8aac2137ada3430fd9b851560a45e..441e7d70888c4d285535151f241e189d5da50127 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -275,7 +275,7 @@ msgstr "Avslutar prenumeration på %s"
 msgid "No newsgroups match the mask"
 msgstr "Inga filer matchar filmasken"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Nytt brev i "
 

diff --git a/po/tr.po b/po/tr.po
index d93bcdeccaf848b3e226eb7e84d798e084826344..79399f2fe838391ef3254bfabcdc3b62df913229 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -272,7 +272,7 @@ msgstr "%s aboneliği iptal ediliyor..."
 msgid "No newsgroups match the mask"
 msgstr "Tabire uyan haber grubu bulunamaz"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Yeni posta: "
 

diff --git a/po/uk.po b/po/uk.po
index 37baf00ec9d90f68946650a395248c569df44148..013fe5cbf4671a18cd1c5e37f8ebcf19d3b321c3 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -275,7 +275,7 @@ msgstr "Відписано від %s..."
 msgid "No newsgroups match the mask"
 msgstr "Немає файлів, що відповідають масці"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "Нова пошта в "
 

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c63275395e926e39f9a5c65b10d2dd30beffb6da..4c53fb7e91c337d633c7ab5ed1197e78027436e0 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -274,7 +274,7 @@ msgstr "退订模式："
 msgid "No newsgroups match the mask"
 msgstr "没有新闻组与掩码相符"
 
-#: buffy.c:838
+#: mailbox.c:838
 msgid "New mail in "
 msgstr "有新信件在 "
 

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 794697b6deb7177291d42ba43ba15424bc4849ea..13eda15dd57fc593217fee1e06e2559a8c2895eb 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -280,7 +280,7 @@ msgstr "取消訂閱 %s…"
 msgid "No newsgroups match the mask"
 msgstr "沒有檔案與檔案遮罩相符"
 
-#: buffy.c:838
+#: mailbox.c:838
 #, fuzzy
 msgid "New mail in "
 msgstr "在 %s 有新信件。"

diff --git a/sendlib.c b/sendlib.c
index cd2242860cb38ea7638159fb40e1da44f3b80d97..3d3905058086c49c14f293f660d2e04fad0ea335 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -40,13 +40,13 @@
 #include "email/email.h"
 #include "mutt.h"
 #include "sendlib.h"
-#include "buffy.h"
 #include "context.h"
 #include "copy.h"
 #include "curs_lib.h"
 #include "filter.h"
 #include "globals.h"
 #include "handler.h"
+#include "mailbox.h"
 #include "mutt_parse.h"
 #include "mutt_window.h"
 #include "muttlib.h"

diff --git a/sidebar.c b/sidebar.c
index a3ecb7e65018c54de096a6bcf370a679d893a954..8d7c6e0a278fa17c3883550e671df2785d15a534 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -37,11 +37,11 @@
 #include "mutt/mutt.h"
 #include "config/lib.h"
 #include "sidebar.h"
-#include "buffy.h"
 #include "context.h"
 #include "curs_lib.h"
 #include "format_flags.h"
 #include "globals.h"
+#include "mailbox.h"
 #include "menu.h"
 #include "mutt_curses.h"
 #include "mutt_window.h"

diff --git a/status.c b/status.c
index b221d0b0a04843516f30bcc24ba554a889ef90f4..d0a2ae0a5e48f366bc80fa1a602a02c889b0a49c 100644 (file)
--- a/status.c
+++ b/status.c
@@ -29,10 +29,10 @@
 #include "config.h"
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "buffy.h"
 #include "context.h"
 #include "format_flags.h"
 #include "globals.h"
+#include "mailbox.h"
 #include "menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"