From: Richard Russon <rich@flatcap.org>
Date: Sun, 27 May 2018 23:20:03 +0000 (+0100)
Subject: drop dupe bad IDN messages
X-Git-Tag: neomutt-20180622~38^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee80f7d04897397b20d0409147f5371e0c278a83;p=neomutt

drop dupe bad IDN messages
---

diff --git a/alias.c b/alias.c
index 20db4a9d4..1a73faf5e 100644
--- a/alias.c
+++ b/alias.c
@@ -424,7 +424,7 @@ retry_name:
       BEEP();
     if (mutt_addrlist_to_intl(new->addr, &err))
     {
-      mutt_error(_("Error: '%s' is a bad IDN."), err);
+      mutt_error(_("Bad IDN: '%s'"), err);
       continue;
     }
   } while (!new->addr);
diff --git a/compose.c b/compose.c
index 6f5b1c940..e446d53e2 100644
--- a/compose.c
+++ b/compose.c
@@ -479,7 +479,7 @@ static void edit_address_list(int line, struct Address **addr)
 
   if (mutt_addrlist_to_intl(*addr, &err) != 0)
   {
-    mutt_error(_("Warning: '%s' is a bad IDN."), err);
+    mutt_error(_("Bad IDN: '%s'"), err);
     mutt_refresh();
     FREE(&err);
   }
@@ -1013,7 +1013,7 @@ int mutt_compose_menu(struct Header *msg, char *fcc, size_t fcclen,
           mutt_edit_headers(NONULL(Editor), msg->content->filename, msg, fcc, fcclen);
           if (mutt_env_to_intl(msg->env, &tag, &err))
           {
-            mutt_error(_("Bad IDN in \"%s\": '%s'"), tag, err);
+            mutt_error(_("Bad IDN in '%s': '%s'"), tag, err);
             FREE(&err);
           }
           if (CryptOpportunisticEncrypt)
diff --git a/conn/conn_raw.c b/conn/conn_raw.c
index 0b29d7223..ca5b00a5f 100644
--- a/conn/conn_raw.c
+++ b/conn/conn_raw.c
@@ -256,7 +256,7 @@ int raw_socket_open(struct Connection *conn)
 #ifdef HAVE_LIBIDN
   if (mutt_idna_to_ascii_lz(conn->account.host, &host_idna, 1) != 0)
   {
-    mutt_error(_("Bad IDN \"%s\"."), conn->account.host);
+    mutt_error(_("Bad IDN: '%s'"), conn->account.host);
     return -1;
   }
 #else
@@ -314,7 +314,7 @@ int raw_socket_open(struct Connection *conn)
 #ifdef HAVE_LIBIDN
   if (mutt_idna_to_ascii_lz(conn->account.host, &host_idna, 1) != 0)
   {
-    mutt_error(_("Bad IDN \"%s\"."), conn->account.host);
+    mutt_error(_("Bad IDN: '%s'"), conn->account.host);
     return -1;
   }
 #else
diff --git a/edit.c b/edit.c
index 6178082ab..8fe7b71d5 100644
--- a/edit.c
+++ b/edit.c
@@ -460,7 +460,7 @@ int mutt_builtin_editor(const char *path, struct Header *msg, struct Header *cur
               mutt_env_to_local(msg->env);
               mutt_edit_headers(NONULL(Visual), path, msg, NULL, 0);
               if (mutt_env_to_intl(msg->env, &tag, &err))
-                printw(_("Bad IDN in %s: '%s'\n"), tag, err);
+                printw(_("Bad IDN in '%s': '%s'"), tag, err);
               /* tag is a statically allocated string and should not be freed */
               FREE(&err);
             }
diff --git a/po/bg.po b/po/bg.po
index 3d1bbacbf..f327e759d 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -23,6 +23,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Лош IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Лош IDN в '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -470,11 +478,6 @@ msgstr "Препращане на маркираните писма към: "
 msgid "Error parsing address!"
 msgstr "Грешка при разчитане на адресът!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Лош IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/ca.po b/po/ca.po
index 22ec9aa6f..0c15e5a12 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -64,6 +64,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "L’IDN no és vàlid: %s"
+
+# El primer camp és una capçalera de correu.  ivb
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "L’IDN de «%s» no és vàlid: %s"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -517,11 +526,6 @@ msgstr "Redirigeix els missatges marcats a: "
 msgid "Error parsing address!"
 msgstr "Error en interpretar l’adreça."
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "L’IDN no és vàlid: %s"
-
 # ivb (2001/12/02)
 # ivb  El programa posa l’interrogant.
 #: commands.c:325 recvcmd.c:196
diff --git a/po/cs.po b/po/cs.po
index 636ec419e..def45d031 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -28,6 +28,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Chybné IDN: „%s“"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Neplatné IDN v „%s“: „%s“"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -462,11 +470,6 @@ msgstr "Zaslat kopii označených zpráv na: "
 msgid "Error parsing address!"
 msgstr "Chyba při zpracování adresy!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Chybné IDN: „%s“"
-
 #: commands.c:325 recvcmd.c:196
 #, c-format
 msgid "Bounce message to %s"
diff --git a/po/da.po b/po/da.po
index c3bd5ff42..e0d366a3c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -21,6 +21,14 @@ msgstr ""
 "X-Generator: Jed w/po-mode: http://mbjnet.dk/po_mode/\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Forkert IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Forkert IDN i '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -463,11 +471,6 @@ msgstr "Gensend udvalgte breve til: "
 msgid "Error parsing address!"
 msgstr "Ugyldig adresse!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Forkert IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/de.po b/po/de.po
index 964d37426..96fb62d7e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,6 +24,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Ungültige IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Ungültige IDN in '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -458,11 +466,6 @@ msgstr "Markierte Nachrichten neu versenden an: "
 msgid "Error parsing address!"
 msgstr "Unverständliche Adresse!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Ungültige IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, c-format
 msgid "Bounce message to %s"
diff --git a/po/el.po b/po/el.po
index f39becf32..6224de41f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -23,6 +23,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Λανθασμένη διεθνής διεύθυνση IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Λανθασμένη διεθνής διεύθυνση IDN στο '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -469,11 +477,6 @@ msgstr "Διαβίβαση σημειωμένων μηνυμάτων στον: "
 msgid "Error parsing address!"
 msgstr "Σφάλμα κατά την ανάλυση της διεύθυνσης!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Λανθασμένη διεθνής διεύθυνση IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index 36fbd95e0..d50fc95c4 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -19,6 +19,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Bad IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Bad IDN in '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -453,11 +461,6 @@ msgstr "Bounce tagged messages to: "
 msgid "Error parsing address!"
 msgstr "Error parsing address!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Bad IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, c-format
 msgid "Bounce message to %s"
diff --git a/po/eo.po b/po/eo.po
index 3b256a5f1..08bb37fd0 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -20,6 +20,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Malbona IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Malbona IDN en '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -462,11 +470,6 @@ msgstr "Redirekti markitajn mesaĝojn al: "
 msgid "Error parsing address!"
 msgstr "Eraro dum analizo de adreso!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Malbona IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/es.po b/po/es.po
index 1e165fb1d..3f776e2bf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -20,6 +20,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "IDN incorrecto: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "IDN inválido en '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -469,11 +477,6 @@ msgstr "Rebotar mensajes marcados a: "
 msgid "Error parsing address!"
 msgstr "¡Dirección errónea!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "IDN incorrecto: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/et.po b/po/et.po
index 59dc05833..fe697d635 100644
--- a/po/et.po
+++ b/po/et.po
@@ -19,6 +19,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr ""
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr ""
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -466,11 +474,6 @@ msgstr "Peegelda märgitud teated aadressile: "
 msgid "Error parsing address!"
 msgstr "Viga aadressi analüüsimisel!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr ""
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/eu.po b/po/eu.po
index 4ea3b71de..b4e5955fb 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -20,6 +20,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "IDN Okerra: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "IDN okerra '%s'-n: '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -462,11 +470,6 @@ msgstr "Markatutako mezuak hona errebotatu: "
 msgid "Error parsing address!"
 msgstr "Errorea helbidea analizatzean!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "IDN Okerra: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/fr.po b/po/fr.po
index 17b794e8a..0cf0118f3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -33,6 +33,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Mauvais IDN : '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Mauvais IDN dans « %s » : '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -494,11 +502,6 @@ msgstr "Renvoyer les messages marqués à : "
 msgid "Error parsing address!"
 msgstr "Erreur de décodage de l'adresse !"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Mauvais IDN : '%s'"
-
 # , c-format
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
diff --git a/po/ga.po b/po/ga.po
index c907ca7c1..01a4670a2 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -19,6 +19,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "DrochIDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "DrochIDN i '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -464,11 +472,6 @@ msgstr "Scinn teachtaireachtaí clibeáilte go: "
 msgid "Error parsing address!"
 msgstr "Earráid agus seoladh á pharsáil!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "DrochIDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/gl.po b/po/gl.po
index 1778f0da5..7893a790d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -19,6 +19,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr ""
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr ""
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -471,11 +479,6 @@ msgstr "Rebotar mensaxes marcadas a: "
 msgid "Error parsing address!"
 msgstr "¡Erro analizando enderezo!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr ""
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/hu.po b/po/hu.po
index 80f8cb89f..5abc470fe 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,6 +20,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Hibás IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Hibás IDN '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -467,11 +475,6 @@ msgstr "Kijelölt levelek visszaküldése. Címzett: "
 msgid "Error parsing address!"
 msgstr "Hibás cím!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Hibás IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/id.po b/po/id.po
index 80123b144..806a2bf0e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -21,6 +21,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "IDN salah: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "IDN di '%s' tidak benar: '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -465,11 +473,6 @@ msgstr "Bounce surat ke: "
 msgid "Error parsing address!"
 msgstr "Gagal menguraikan alamat!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "IDN salah: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/it.po b/po/it.po
index 23b495fa4..54e0df20e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -21,6 +21,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "IDN non valido: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "IDN non valido in '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -464,11 +472,6 @@ msgstr "Rimbalza i messaggi segnati a: "
 msgid "Error parsing address!"
 msgstr "Errore nella lettura dell'indirizzo!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "IDN non valido: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/ja.po b/po/ja.po
index 989bcb883..bbe3cde05 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -19,6 +19,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "不正な IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "'%s' 中に不正な IDN: '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -461,11 +469,6 @@ msgstr "タグ付きメッセージの再送先: "
 msgid "Error parsing address!"
 msgstr "アドレス解析エラー!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "不正な IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/ko.po b/po/ko.po
index c844613ee..19e891708 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -21,6 +21,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "잘못된 IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "잘못된 IDN '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -468,11 +476,6 @@ msgstr "메일을 전달할 주소: "
 msgid "Error parsing address!"
 msgstr "주소 분석 중 오류!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "잘못된 IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/lt.po b/po/lt.po
index 40b8c166f..03f9194af 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -21,6 +21,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Blogas IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Blogas IDN '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -455,11 +463,6 @@ msgstr "Nukreipti pažymėtus laiškus kam: "
 msgid "Error parsing address!"
 msgstr "Klaida nagrinėjant adresą!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Blogas IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, c-format
 msgid "Bounce message to %s"
diff --git a/po/nl.po b/po/nl.po
index 36064c704..cb45af3c2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -20,6 +20,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Ongeldig IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Ongeldige IDN in '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -462,11 +470,6 @@ msgstr "Gemarkeerde berichten doorsturen naar: "
 msgid "Error parsing address!"
 msgstr "Ongeldig adres!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Ongeldig IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/pl.po b/po/pl.po
index 2e091360e..90823bc3b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,6 +21,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Błędny IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Błędny IDN w '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -457,11 +465,6 @@ msgstr "Wyślij kopie zaznaczonych listów do: "
 msgid "Error parsing address!"
 msgstr "Błąd interpretacji adresu!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Błędny IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a919b10a2..f5deec590 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,6 +20,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "IDN inválido: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "IDN inválida em '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -454,11 +462,6 @@ msgstr "Replicar mensagens marcadas para: "
 msgid "Error parsing address!"
 msgstr "Erro ao interpretar endereço!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "IDN inválido: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, c-format
 msgid "Bounce message to %s"
diff --git a/po/ru.po b/po/ru.po
index 969fcefd3..f1e47b13e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -26,6 +26,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Некорректный IDN: %s"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Некорректный IDN в '%s': %s."
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -468,11 +476,6 @@ msgstr "Перенаправить сообщения: "
 msgid "Error parsing address!"
 msgstr "Ошибка разбора адреса!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Некорректный IDN: %s"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/sk.po b/po/sk.po
index 5a69e6e93..cf2406f87 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -20,6 +20,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Zlý IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr ""
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -459,11 +467,6 @@ msgstr "Presmerovať označené správy do: "
 msgid "Error parsing address!"
 msgstr "Chyba pri analýze adresy!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Zlý IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/sv.po b/po/sv.po
index a82575303..da1f75893 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -18,6 +18,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Felaktigt IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Felaktigt IDN i '%s': '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -462,11 +470,6 @@ msgstr "Återsänd märkta meddelanden till: "
 msgid "Error parsing address!"
 msgstr "Fel vid tolkning av adress!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Felaktigt IDN: \"%s\""
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/tr.po b/po/tr.po
index 9700eadb6..1c5127d6f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -21,6 +21,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Hatalı IDN: '%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "'%s' hatalı IDN'e sahip: '%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -459,11 +467,6 @@ msgstr "İşaretli iletileri geri gönder:"
 msgid "Error parsing address!"
 msgstr "Adres ayrıştırılırken hata!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Hatalı IDN: '%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/uk.po b/po/uk.po
index b1b96eb88..7382e51d3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -21,6 +21,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "Некоректний IDN: %s"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "Некоректне IDN в '%s': %s"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -463,11 +471,6 @@ msgstr "Надіслати копії виділених листів: "
 msgid "Error parsing address!"
 msgstr "Помилка розбору адреси!"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "Некоректний IDN: %s"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d7ddc9a81..2916fa573 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -24,6 +24,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "错误的 IDN：'%s'"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "在 '%s' 中有错误的 IDN：'%s'"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -458,11 +466,6 @@ msgstr "退回已标记的信件至："
 msgid "Error parsing address!"
 msgstr "解析地址出错！"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "错误的 IDN：'%s'"
-
 #: commands.c:325 recvcmd.c:196
 #, c-format
 msgid "Bounce message to %s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9155b74b4..e5f3ed542 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -21,6 +21,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#, c-format
+msgid "Bad IDN: '%s'"
+msgstr "無效的 IDN：「%s」"
+
+#, c-format
+msgid "Bad IDN in '%s': '%s'"
+msgstr "「%s」中有無效的 IDN：「%s」"
+
 #: addrbook.c:50 browser.c:71 browser.c:81 history.c:103 pager.c:1697
 #: postpone.c:62 query.c:67 recvattach.c:69
 msgid "Exit"
@@ -471,11 +479,6 @@ msgstr "回退信件至："
 msgid "Error parsing address!"
 msgstr "無法分析位址！"
 
-#: commands.c:314 recvcmd.c:182
-#, c-format
-msgid "Bad IDN: '%s'"
-msgstr "無效的 IDN：「%s」"
-
 #: commands.c:325 recvcmd.c:196
 #, fuzzy, c-format
 msgid "Bounce message to %s"
diff --git a/send.c b/send.c
index f4632663b..965b35cb4 100644
--- a/send.c
+++ b/send.c
@@ -204,7 +204,7 @@ static int edit_address(struct Address **a, /* const */ char *field)
     idna_ok = mutt_addrlist_to_intl(*a, &err);
     if (idna_ok != 0)
     {
-      mutt_error(_("Error: '%s' is a bad IDN."), err);
+      mutt_error(_("Bad IDN: '%s'"), err);
       FREE(&err);
     }
   } while (idna_ok != 0);
@@ -1911,7 +1911,7 @@ int ci_send_message(int flags, struct Header *msg, char *tempfile,
 
   if (mutt_env_to_intl(msg->env, &tag, &err))
   {
-    mutt_error(_("Bad IDN in \"%s\": '%s'"), tag, err);
+    mutt_error(_("Bad IDN in '%s': '%s'"), tag, err);
     FREE(&err);
     if (!(flags & SENDBATCH))
       goto main_loop;