From: Richard Russon <rich@flatcap.org>
Date: Sat, 31 Aug 2019 12:29:20 +0000 (+0100)
Subject: rename rfc1524.c to mailcap.c
X-Git-Tag: 2019-10-25~63^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fd8fe80cd1a45f67a19cea944b972a6897a8185;p=neomutt

rename rfc1524.c to mailcap.c
---

diff --git a/Makefile.autosetup b/Makefile.autosetup
index 275703a2f..760fdb2f5 100644
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -65,12 +65,12 @@ NEOMUTTOBJS=	addrbook.o alias.o bcache.o browser.o color.o commands.o \
 		complete.o compose.o compress.o conststrings.o context.o copy.o \
 		curs_lib.o edit.o editmsg.o enriched.o enter.o \
 		filter.o flags.o git_ver.o handler.o hdrline.o help.o hook.o \
-		index.o init.o keymap.o main.o menu.o muttlib.o \
+		index.o init.o keymap.o mailcap.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_mailbox.o mutt_parse.o mutt_signal.o \
 		mutt_socket.o mutt_thread.o mutt_window.o mx.o myvar.o \
 		pager.o pattern.o postpone.o progress.o query.o recvattach.o \
-		recvcmd.o resize.o rfc1524.o rfc3676.o \
+		recvcmd.o resize.o rfc3676.o \
 		score.o send.o sendlib.o sidebar.o smtp.o sort.o state.o \
 		status.o system.o terminal.o version.o icommands.o
 @if HAVE_LIBUNWIND
diff --git a/handler.c b/handler.c
index d86f5a51f..24a6fc8ca 100644
--- a/handler.c
+++ b/handler.c
@@ -48,13 +48,13 @@
 #include "filter.h"
 #include "globals.h"
 #include "keymap.h"
+#include "mailcap.h"
 #include "mutt_attach.h"
 #include "mutt_logging.h"
 #include "muttlib.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "rfc1524.h"
 #include "rfc3676.h"
 #include "state.h"
 #ifdef ENABLE_NLS
diff --git a/init.h b/init.h
index 57635c785..253771c20 100644
--- a/init.h
+++ b/init.h
@@ -75,7 +75,7 @@
 #include "query.h"
 #include "recvattach.h"
 #include "recvcmd.h"
-#include "rfc1524.h"
+#include "mailcap.h"
 #include "rfc3676.h"
 #include "score.h"
 #include "send.h"
diff --git a/rfc1524.c b/mailcap.c
similarity index 99%
rename from rfc1524.c
rename to mailcap.c
index 7d46a94c3..f1a572e8d 100644
--- a/rfc1524.c
+++ b/mailcap.c
@@ -39,7 +39,7 @@
 #include <string.h>
 #include "mutt/mutt.h"
 #include "email/lib.h"
-#include "rfc1524.h"
+#include "mailcap.h"
 #include "globals.h"
 #include "mutt_attach.h"
 #include "muttlib.h"
diff --git a/rfc1524.h b/mailcap.h
similarity index 96%
rename from rfc1524.h
rename to mailcap.h
index 61300e686..52ae80abe 100644
--- a/rfc1524.h
+++ b/mailcap.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MUTT_RFC1524_H
-#define MUTT_RFC1524_H
+#ifndef MUTT_MAILCAP_H
+#define MUTT_MAILCAP_H
 
 #include <stdbool.h>
 
@@ -68,4 +68,4 @@ bool rfc1524_mailcap_lookup(struct Body *a, char *type, struct Rfc1524MailcapEnt
 
 int mutt_rfc1524_expand_command(struct Body *a, const char *filename, const char *type, struct Buffer *command);
 
-#endif /* MUTT_RFC1524_H */
+#endif /* MUTT_MAILCAP_H */
diff --git a/mutt_attach.c b/mutt_attach.c
index b7e46f497..a02455a58 100644
--- a/mutt_attach.c
+++ b/mutt_attach.c
@@ -46,13 +46,13 @@
 #include "filter.h"
 #include "globals.h"
 #include "handler.h"
+#include "mailcap.h"
 #include "muttlib.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "pager.h"
 #include "protos.h"
-#include "rfc1524.h"
 #include "sendlib.h"
 #include "state.h"
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 557241004..3ba35f405 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -95,6 +95,7 @@ imap/util.c
 index.c
 init.c
 keymap.c
+mailcap.c
 maildir/maildir.c
 maildir/mh.c
 maildir/shared.c
@@ -177,7 +178,6 @@ recvattach.c
 recvcmd.c
 remailer.c
 resize.c
-rfc1524.c
 rfc3676.c
 score.c
 send.c
diff --git a/po/bg.po b/po/bg.po
index f130c472a..fc0d97abf 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6717,16 +6717,16 @@ msgstr "Грешка (%d) при изпращане на писмото.\n"
 msgid "Error sending message"
 msgstr "Грешка при изпращане на писмото"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Невалидно форматирано вписване за типа %s в \"%s\" на ред %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Не е указан пътя към mailcap"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "не е намерено mailcap-вписване за типа %s"
diff --git a/po/ca.po b/po/ca.po
index 2537caa64..e65838e7b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6903,16 +6903,16 @@ msgstr "Error en enviar el missatge"
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  L’entrada del tipus «%s» a «%s», línia %d, no té un format vàlid.
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Entrada de tipus «%s» a «%s», línia %d: format no vàlid."
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "No s’ha indicat cap camí per a «mailcap»."
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "No s’ha trobat cap entrada pel tipus «%s» a «mailcap»"
diff --git a/po/cs.po b/po/cs.po
index 24499c612..9904a1989 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6544,16 +6544,16 @@ msgstr "Chyba při zasílání zprávy, potomek ukončen %d.\n"
 msgid "Error sending message"
 msgstr "Chyba při zasílání zprávy"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Nesprávně formátovaná položka pro typ %s v „%s“ na řádku %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Cesta k mailcapu není zadána."
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "pro typ %s nebyla nalezena položka v mailcapu"
diff --git a/po/da.po b/po/da.po
index 1acf57ed1..f04d68be3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6570,16 +6570,16 @@ msgstr "Fejl ved afsendelse af brev, afslutningskode fra barneproces: %d.\n"
 msgid "Error sending message"
 msgstr "Fejl ved afsendelse af brev"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Ugyldig angivelse for type %s i \"%s\" linje %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Ingen mailcap-sti er defineret"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "ingen mailcap-angivelse for type %s"
diff --git a/po/de.po b/po/de.po
index 341040b8f..c2ac82f14 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6507,16 +6507,16 @@ msgstr "Fehler %d beim Versand der Nachricht.\n"
 msgid "Error sending message"
 msgstr "Fehler beim Versand der Nachricht"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Ungültiger Eintrag für Typ %s in \"%s\", Zeile %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Kein Mailcap-Pfad definiert"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "Kann keinen Mailcap-Eintrag für %s finden"
diff --git a/po/el.po b/po/el.po
index f4298288c..ab5105b66 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6723,16 +6723,16 @@ msgstr "Σφάλμα στην αποστολή μηνύματος, τερματ
 msgid "Error sending message"
 msgstr "Σφάλμα κατά την αποστολή του μηνύματος"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Ακατάλληλα μορφοποιημένη είσοδος για το τύπο %s στη \"%s\" γραμμή %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Δεν καθορίστηκε διαδρομή mailcap"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "Η είσοδος mailcap για το τύπο %s δε βρέθηκε"
diff --git a/po/en_GB.po b/po/en_GB.po
index a0cf1619a..11f32a701 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6481,16 +6481,16 @@ msgstr "Error sending message, child exited %d.\n"
 msgid "Error sending message"
 msgstr "Error sending message"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Improperly formatted entry for type %s in \"%s\" line %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "No mailcap path specified"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "mailcap entry for type %s not found"
diff --git a/po/eo.po b/po/eo.po
index b622e7941..96e1c13ef 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6586,16 +6586,16 @@ msgstr "Eraro dum sendado de mesaĝo; ido finis per %d.\n"
 msgid "Error sending message"
 msgstr "Eraro dum sendado de mesaĝo"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Malĝuste strukturita elemento por speco %s en \"%s\" linio %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Neniu mailcap-vojo specifita"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "mailcap-regulo por speco %s ne trovita"
diff --git a/po/es.po b/po/es.po
index 935b4f361..e5447cc9e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6637,16 +6637,16 @@ msgstr "Error al enviar mensaje, proceso hijo terminó %d.\n"
 msgid "Error sending message"
 msgstr "Error al enviar el mensaje"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Entrada mal formateada para el tipo %s en \"%s\" renglón %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Ruta para mailcap no especificada"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "Entrada mailcap para tipo %s no encontrada"
diff --git a/po/et.po b/po/et.po
index 539dfbce9..d91ca5ce9 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6715,16 +6715,16 @@ msgstr "Viga teate saatmisel, alamprotsess lõpetas koodiga %d.\n"
 msgid "Error sending message"
 msgstr "Viga teate saatmisel"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Vigaselt formaaditud kirje tüübile %s faili \"%s\" real %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Mailcap tee ei ole määratud"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "Tüübil %s puudub mailcap kirje"
diff --git a/po/eu.po b/po/eu.po
index 5864f1eae..95001b57f 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6663,16 +6663,16 @@ msgstr "Errorea mezua bidaltzerakoan, azpiprozesua uzten %d.\n"
 msgid "Error sending message"
 msgstr "Errorea mezua bidaltzerakoan"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Gaizki eratutako %s motako sarrera \"%s\"-n %d lerroan"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Ez da mailcap bidea ezarri"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "ez da aurkitu %s motako mailcap sarrerarik"
diff --git a/po/fi.po b/po/fi.po
index 260a05835..54b05ae3a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6508,16 +6508,16 @@ msgstr "Virhe viestin lähetyksessä, lapsiprosessi palautti arvon %d.\n"
 msgid "Error sending message"
 msgstr "Virhe viestin lähetyksessä"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Väärin muodostettu tietue tyypille %s kohteessa %s rivillä %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Mailcap-polkua ei ole määritelty"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "Mailcap-tietue tyypille %s puuttuu"
diff --git a/po/fr.po b/po/fr.po
index 504f2ce44..f16739b93 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6787,17 +6787,17 @@ msgid "Error sending message"
 msgstr "Erreur en envoyant le message"
 
 # , c-format
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Entrée incorrectement formatée pour le type %s dans \"%s\" ligne %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Pas de chemin mailcap spécifié"
 
 # , c-format
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "Entrée mailcap pour le type %s non trouvée"
diff --git a/po/ga.po b/po/ga.po
index f7a85977d..5e9b5baff 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6745,16 +6745,16 @@ msgstr "Earráid agus teachtaireacht á seoladh, scoir an macphróiseas le stád
 msgid "Error sending message"
 msgstr "Earráid agus teachtaireacht á seoladh"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Iontráil mhíchumtha don chineál %s i \"%s\", líne %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Níor sonraíodh conair mailcap"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "níor aimsíodh iontráil mailcap don chineál %s"
diff --git a/po/gl.po b/po/gl.po
index fe68df37f..5c5d173bc 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6777,16 +6777,16 @@ msgstr "Erro enviando mensaxe, o proceso fillo saíu con %d.\n"
 msgid "Error sending message"
 msgstr "Erro enviando a mensaxe"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Entrada malformada para o tipo %s en \"%s\" liña %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Non se especificou unha ruta de mailcap"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "non se atopou unha entrada mailcap para o tipo %s"
diff --git a/po/hu.po b/po/hu.po
index 37f1b0414..7aa10dc73 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6715,16 +6715,16 @@ msgstr "Hiba a levél elküldésekor, a gyermek folyamat kilépett: %d.\n"
 msgid "Error sending message"
 msgstr "Hiba a levél elküldésekor"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Nem megfelelően formázott bejegyzés a(z) %s típushoz a(z) \"%s\" fájl %d. sorában"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Nincs mailcap útvonal megadva"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "mailcap bejegyzés a(z) %s típushoz nem található"
diff --git a/po/id.po b/po/id.po
index 69f3d6115..ad7374cc6 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6639,16 +6639,16 @@ msgstr "Error mengirimkan surat, proses keluar dengan kode %d.\n"
 msgid "Error sending message"
 msgstr "Gagal mengirim surat"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Entry utk jenis %s di '%s' baris %d tidak diformat dengan benar"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Path untuk mailcap tidak diketahui"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "entry mailcap untuk jenis %s tidak ditemukan"
diff --git a/po/it.po b/po/it.po
index b5f0dc5b5..e01ad7dd5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6641,16 +6641,16 @@ msgstr "Errore nell'invio del messaggio, il figlio è uscito con %d.\n"
 msgid "Error sending message"
 msgstr "Errore durante l'invio del messaggio"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Voce impropriamente formattata per il tipo %s in \"%s\", linea %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Il percorso di mailcap non è stato specificato"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "La voce di mailcap per il tipo %s non è stata trovata"
diff --git a/po/ja.po b/po/ja.po
index b74dcf0ec..c3c1985ed 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6567,16 +6567,16 @@ msgstr "メッセージ送信エラー、子プロセスが %d で終了。\n"
 msgid "Error sending message"
 msgstr "メッセージ送信エラー。"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "%s 形式に不適切なエントリが \"%s\" の %d 行目にある"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "mailcap パスが指定されていない"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "%s 形式用の mailcap エントリが見つからなかった"
diff --git a/po/ko.po b/po/ko.po
index 3c625a24f..32d550142 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6700,16 +6700,16 @@ msgstr "메일 보내는 중 오류 %d.\n"
 msgid "Error sending message"
 msgstr "메일 보내는 중 오류"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "\"%2$s\" %3$d 번째 줄의 %1$s 유형의 항목은 잘못된 형식임"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "mailcap 패스가 지정되지 않음"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "%s 형식을 mailcap 항목에서 찾을 수 없음"
diff --git a/po/lt.po b/po/lt.po
index e2a6afdd8..c2e79f78b 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6519,16 +6519,16 @@ msgstr "Klaida siunčiant laišką, klaidos kodas %d.\n"
 msgid "Error sending message"
 msgstr "Klaida siunčiant laišką"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Blogai suformuotas tipo %s įrašas \"%s\" %d eilutėje"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Nenurodytas mailcap kelias!"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "mailcap įrašas tipui %s nerastas"
diff --git a/po/nl.po b/po/nl.po
index 290b6f1f7..29ccdaa34 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6599,16 +6599,16 @@ msgstr "Externe fout %d opgetreden tijdens versturen van bericht.\n"
 msgid "Error sending message"
 msgstr "Er is een fout opgetreden tijdens het versturen van het bericht"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Ongeldig geformuleerde entry voor type %s in \"%s\", regel %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Geen mailcap-pad opgegeven"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "Kan geen mailcap-entry voor %s vinden."
diff --git a/po/pl.po b/po/pl.po
index 2ea218b2d..8613c68e5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6460,16 +6460,16 @@ msgstr "Błąd podczas wysyłania listu, proces potomny zwrócił %d.\n"
 msgid "Error sending message"
 msgstr "Błąd podczas wysyłania listu"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Błędnie sformatowane pole dla typu %s w \"%s\" linii %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Brak ścieżki do pliku specjalnego 'mailcap'"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "brak wpisu w 'mailcap' dla typu %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index aeafd4078..c744921b3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6490,16 +6490,16 @@ msgstr "Erro ao enviar mensagem, processo filho terminou com código %d\n"
 msgid "Error sending message"
 msgstr "Erro ao enviar mensagem"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Entrada mal formatada para o tipo %s em \"%s\" linha %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Nenhum caminho de mailcap especificado"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "entrada no mailcap para o tipo %s não foi encontrada."
diff --git a/po/ru.po b/po/ru.po
index 7f3225b3b..328e19715 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6609,16 +6609,16 @@ msgstr "Сообщение отправить не удалось, процес
 msgid "Error sending message"
 msgstr "Ошибка отправки сообщения"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Некорректно отформатированная запись для типа %s в \"%s\", строка %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Путь к файлу mailcap не указан"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "для типа %s не найдено записи в файле mailcap"
diff --git a/po/sk.po b/po/sk.po
index 33389789b..613090473 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6715,16 +6715,16 @@ msgstr "Chyba pri posielaní správy, dcérsky proces vrátil %d (%s).\n"
 msgid "Error sending message"
 msgstr "Chyba pri posielaní správy"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Nesprávne formátovaná položka pre typ %s v \"%s\", riadok %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Nešpecifikovaná cesta k mailcap"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "položka mailcap-u pre typ %s nenájdená"
diff --git a/po/sv.po b/po/sv.po
index 4073d7a1c..7f4070d87 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6666,16 +6666,16 @@ msgstr "Fel vid sändning av meddelande, barn returnerade %d.\n"
 msgid "Error sending message"
 msgstr "Fel vid sändning av meddelande"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Felaktigt formatterad post för typ %s i \"%s\", rad %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Ingen \"mailcap\"-sökväg angiven"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "\"mailcap\"-post för typ %s hittades inte"
diff --git a/po/tr.po b/po/tr.po
index af66a5618..60c94f9d9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6616,16 +6616,16 @@ msgstr "İleti gönderilirken hata oluştu, alt süreç %d ile sonlandı.\n"
 msgid "Error sending message"
 msgstr "İleti gönderilirken hata oluştu"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "\"%2$s\" dosyasında %3$d nolu satırdaki %1$s tipi için hatalı biçimlendirilmiş öge"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "mailcap dosyayolu tanımlanmamış"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "%s için mailcap kaydı bulunamadı"
diff --git a/po/uk.po b/po/uk.po
index 5cb8fa499..db9b256b8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6604,16 +6604,16 @@ msgstr "Помилка відправки, код повернення %d.\n"
 msgid "Error sending message"
 msgstr "Помилка при відправці"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "Невірно форматований запис для типу %s в \"%s\", рядок %d"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "Шлях до mailcap не вказано"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "запису для типу %s в mailcap не знайдено"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bb7dd8120..2bebe9ee3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6473,16 +6473,16 @@ msgstr "发送信件出错，子进程已退出 %d。\n"
 msgid "Error sending message"
 msgstr "发送信件出错"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "在 \"%2$s\" 的第 %3$d 行发现类型 %1$s 为错误的格式纪录"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "没有指定 mailcap 路径"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "没有发现类型 %s 的 mailcap 纪录"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f4e7f5353..fcd9c18d6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6753,16 +6753,16 @@ msgstr "寄送訊息時出現錯誤，子程序結束 %d。\n"
 msgid "Error sending message"
 msgstr "寄信途中發生錯誤"
 
-#: rfc1524.c:215
+#: mailcap.c:215
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "在 \"%2$s\" 的第 %3$d 行發現類別 %1$s 為錯誤的格式紀錄"
 
-#: rfc1524.c:475
+#: mailcap.c:475
 msgid "No mailcap path specified"
 msgstr "沒有指定 mailcap 路徑"
 
-#: rfc1524.c:497
+#: mailcap.c:497
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "沒有發現類型 %s 的 mailcap 紀錄"
diff --git a/recvattach.c b/recvattach.c
index 091af8b23..50434405c 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -50,6 +50,7 @@
 #include "hdrline.h"
 #include "hook.h"
 #include "keymap.h"
+#include "mailcap.h"
 #include "mutt_attach.h"
 #include "mutt_logging.h"
 #include "mutt_menu.h"
@@ -61,7 +62,6 @@
 #include "opcodes.h"
 #include "options.h"
 #include "recvcmd.h"
-#include "rfc1524.h"
 #include "send.h"
 #include "sendlib.h"
 #include "state.h"