From 01b69ca539ce817463f9e60b8840a070f3995237 Mon Sep 17 00:00:00 2001
From: Kevin McCarthy <kevin@8t8.us>
Date: Tue, 13 Mar 2018 19:09:45 -0700
Subject: [PATCH] Improve the error message when a signature is missing.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Thanks to Vincent Lefèvre for reporting the issue and for the wording
suggestion!
---
 ncrypt/crypt.c | 3 ++-
 po/bg.po       | 3 ++-
 po/ca.po       | 3 ++-
 po/cs.po       | 3 ++-
 po/da.po       | 3 ++-
 po/de.po       | 3 ++-
 po/el.po       | 3 ++-
 po/en_GB.po    | 4 ++--
 po/eo.po       | 3 ++-
 po/es.po       | 3 ++-
 po/et.po       | 3 ++-
 po/eu.po       | 3 ++-
 po/fr.po       | 9 ++++-----
 po/ga.po       | 3 ++-
 po/gl.po       | 3 ++-
 po/hu.po       | 3 ++-
 po/id.po       | 3 ++-
 po/it.po       | 3 ++-
 po/ja.po       | 3 ++-
 po/ko.po       | 3 ++-
 po/lt.po       | 3 ++-
 po/nl.po       | 3 ++-
 po/pl.po       | 3 ++-
 po/pt_BR.po    | 3 ++-
 po/ru.po       | 3 ++-
 po/sk.po       | 3 ++-
 po/sv.po       | 3 ++-
 po/tr.po       | 3 ++-
 po/uk.po       | 3 ++-
 po/zh_CN.po    | 3 ++-
 po/zh_TW.po    | 3 ++-
 31 files changed, 64 insertions(+), 36 deletions(-)

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index c4b1523f8..77f4a8fe0 100644
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -1010,7 +1010,8 @@ int mutt_signed_handler(struct Body *a, struct State *s)
   if (inconsistent)
   {
     state_attach_puts(_("[-- Error: "
-                        "Inconsistent multipart/signed structure! --]\n\n"),
+                        "Missing or bad-format multipart/signed signature!"
+                        " --]\n\n"),
                       s);
     return mutt_body_handler(a, s);
   }
diff --git a/po/bg.po b/po/bg.po
index 060fc86f7..ff2f5053e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3423,8 +3423,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Грешка: Противоречива multipart/signed структура! --]\n"
diff --git a/po/ca.po b/po/ca.po
index 72d1f9228..098b4f673 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3498,8 +3498,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Error: L’estructura «multipart/signed» no és consistent. --]\n"
diff --git a/po/cs.po b/po/cs.po
index d5ff4ccf4..ff0df002f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3270,8 +3270,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Chyba: Chybná struktura zprávy typu multipart/signed! --]\n"
diff --git a/po/da.po b/po/da.po
index bd4023618..521b346ce 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3287,8 +3287,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Fejl: Inkonsistent \"multipart/signed\" struktur! --]\n"
diff --git a/po/de.po b/po/de.po
index 1b81d5764..9aa60a35a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3279,8 +3279,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Fehler: Inkonsistente multipart/signed Struktur! --]\n"
diff --git a/po/el.po b/po/el.po
index 903403c77..67e3bab0d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3425,8 +3425,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Σφάλμα: Ασυνεπής πολυμερής/υπογεγραμμένη δομή! --]\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 3b2fe9b59..5780233bd 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3256,10 +3256,10 @@ msgstr ""
 
 #: ncrypt/crypt.c:1012
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 
 #: ncrypt/crypt.c:1053
diff --git a/po/eo.po b/po/eo.po
index 97c3b05a5..0b672ff3c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -3283,8 +3283,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Eraro: malĝusta strukturo de multipart/signed! --]\n"
diff --git a/po/es.po b/po/es.po
index 6b56569c3..9306ac44a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3409,8 +3409,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Error: ¡Estructura multipart/signed inconsistente! --]\n"
diff --git a/po/et.po b/po/et.po
index 6a9ed98ef..36edf3f44 100644
--- a/po/et.po
+++ b/po/et.po
@@ -3393,8 +3393,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Viga: Vigane multipart/signed struktuur! --]\n"
diff --git a/po/eu.po b/po/eu.po
index 21678679e..0a6cab756 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3323,8 +3323,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Errorea: konsistentzi gabeko zatianitz/sinaturiko estruktura! --]\n"
diff --git a/po/fr.po b/po/fr.po
index b540aee67..0d4440491 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3466,10 +3466,10 @@ msgstr ""
 
 #: ncrypt/crypt.c:1012
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
-"[-- Erreur : Structure multipart/signed incohérente ! --]\n"
+"[-- Erreur : Signature multipart/signed manquante ou mauvais format ! --]\n"
 "\n"
 
 #: ncrypt/crypt.c:1053
@@ -6305,13 +6305,12 @@ msgid "No newsgroup specified."
 msgstr "Pas d'objet (Subject) spécifié."
 
 #: send.c:1938
-#, fuzzy
 msgid "No attachments, cancel sending?"
-msgstr "éditer le transfer-encoding de l'attachement"
+msgstr "Pas d'attachements, abandonner l'envoi ?"
 
 #: send.c:1944
 msgid "Message contains text matching \"$abort_noattach_regex\". Not sending."
-msgstr ""
+msgstr "L'attachement référencé dans le message est manquant"
 
 #: send.c:2005 smtp.c:189
 msgid "Sending message..."
diff --git a/po/ga.po b/po/ga.po
index f7daed562..bc2dd83bf 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -3329,8 +3329,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Earráid: Struchtúr neamhréireach multipart/signed! --]\n"
diff --git a/po/gl.po b/po/gl.po
index 1f25dece8..1d26a464d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3413,8 +3413,9 @@ msgid ""
 msgstr "[-- Erro: protocolo multiparte/asinado %s descoñecido --]\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr "[-- Erro: estructura multiparte/asinada inconsistente --]\n"
 
diff --git a/po/hu.po b/po/hu.po
index e628d81d4..3123807f3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3409,8 +3409,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Hiba: Ellentmondó többrészes/aláírt struktúra! --]\n"
diff --git a/po/id.po b/po/id.po
index 124969c0f..e4736c3d6 100644
--- a/po/id.po
+++ b/po/id.po
@@ -3320,8 +3320,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Error: Struktur multipart/signed tidak konsisten! --]\n"
diff --git a/po/it.po b/po/it.po
index a1fd7a72b..693f86d0b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3322,8 +3322,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Errore: struttura multipart/signed incoerente! --]\n"
diff --git a/po/ja.po b/po/ja.po
index 86fef6a4c..e598c17d7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3300,8 +3300,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- エラー: multipart/signed 構造が矛盾している! --]\n"
diff --git a/po/ko.po b/po/ko.po
index 5a7aa5582..2d23a47df 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3384,8 +3384,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- 오류: 일치하지 않는 multipart/signed 구조! --]\n"
diff --git a/po/lt.po b/po/lt.po
index 9c21e63d3..21cc47c66 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3364,8 +3364,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Klaida: Neteisinga multipart/signed struktūra! --]\n"
diff --git a/po/nl.po b/po/nl.po
index 070434307..42628b152 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3296,8 +3296,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Fout: Inconsistente multipart/signed-structuur! --]\n"
diff --git a/po/pl.po b/po/pl.po
index ce6bca29b..863543d2b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3265,8 +3265,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Błąd: Niespójna struktura multipart/signed ! --]\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 815baf09e..e05de08f4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3268,8 +3268,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Erro: Estrutura multipart/signed inconsistente! --]\n"
diff --git a/po/ru.po b/po/ru.po
index 5ebb3c424..54ae136ff 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3307,8 +3307,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Ошибка: нарушена структура multipart/signed-сообщения! --]\n"
diff --git a/po/sk.po b/po/sk.po
index d5c5c9c2c..62ba6f8a7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3375,8 +3375,9 @@ msgid ""
 msgstr "[--Chyba: neznámy multipart/signet protokol %s! --].\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr "[--Chyba: Nekonzistentná multipart/signet štruktúra! --].\n"
 
diff --git a/po/sv.po b/po/sv.po
index 7f79a4a12..993b8925b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3323,8 +3323,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Fel: Inkonsekvent \"multipart/signed\" struktur! --]\n"
diff --git a/po/tr.po b/po/tr.po
index 5ea439198..6d4cf0b29 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3292,8 +3292,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Hata: Tutarsız \"multipart/signed\" yapısı! --]\n"
diff --git a/po/uk.po b/po/uk.po
index 53667ff61..1200ac1f4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3286,8 +3286,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- Помилка: несумісна структура multipart/signed! --]\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c0241ab69..a4ede4e11 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3325,8 +3325,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- 错误：不一致的 multipart/signed 结构！ --]\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 18cbc71dd..ea7140771 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3402,8 +3402,9 @@ msgstr ""
 "\n"
 
 #: ncrypt/crypt.c:1012
+#, fuzzy
 msgid ""
-"[-- Error: Inconsistent multipart/signed structure! --]\n"
+"[-- Error: Missing or bad-format multipart/signed signature! --]\n"
 "\n"
 msgstr ""
 "[-- 錯誤：不一致的 multipart/signed 結構！ --]\n"
-- 
2.40.0