From: Gerfried Fuchs <rhonda@debian.at>
Date: Wed, 17 Feb 2010 19:23:56 +0000 (+0100)
Subject: Imported Upstream version 1.96
X-Git-Tag: upstream/1.96
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=ca079a63a7db44a05ce47ae8e5bf1f668778fc2f;p=pkg%2Ft-prot.git

Imported Upstream version 1.96
---

diff --git a/ChangeLog b/ChangeLog
index f9c0ac1..afef141 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2005-02-14 14:19  Jochen Striepe
+
+	* t-prot: Release as v1.96.
+
+2005-02-14 14:18  Jochen Striepe
+
+	* t-prot: GnuPG locale strings were for v1.2.6, update them to
+	v1.4.0.
+
+2005-02-14 13:29  Jochen Striepe
+
+	* t-prot: Release as v1.95. The use of Locale::gettext is quite a
+	big change, so we consider this a v2.0 pre-release. Please send any
+	feature requests and bugreports NOW, so we can work on them before
+	the release of v2.0.
+
+2005-02-14 13:26  Jochen Striepe
+
+	* t-prot.1: Mention the need for Locale::gettext when using
+	--locale. Update date string.
+
+2005-02-14 13:23  Jochen Striepe
+
+	* t-prot: Following a suggestion by Gerfried Fuchs, make
+	Locale::gettext fetch the locale strings for us. Big change, please
+	report any funny behaviour -- thanks!
+
 2005-02-02 13:46  Jochen Striepe
 
 	* t-prot: Release as v1.49.
diff --git a/contrib/README.patches b/contrib/README.patches
index 8a66aea..9710a46 100644
--- a/contrib/README.patches
+++ b/contrib/README.patches
@@ -25,25 +25,17 @@ to decide if some specific feature makes it into vanilla t-prot.
 RECENT PATCHES
 ==============
 
-t-prot-*-gpg1*.diff
-===================
-Your distribution's gnupg version is not quite up-to-date, and you want
-to use a current t-prot version with it? No problem, this patch changes
-the locales back to a not so current gpg version.
-
-Please note that this patch will most likely be applied by your t-prot
-package maintainer if the distribution makes use of an old gnupg version.
-
-t-prot-*-mutt15*.diff
-=====================
+t-prot-*-mutt15*.diff and t-prot-*-gpg1*.diff
+=============================================
 You want to be on the bleeding edge, using a developer version of mutt?
-No problem, this patch changes the locales so most things should work
-smoothly. Please send a bug report if there are some great new features
-in the new mutt which break anything inside t-prot.
+Your distribution provides just an outdated version of gnupg?
 
-Please note that this patch will most likely be applied by your t-prot
-package maintainer if the distribution makes use of mutt-1.5.4 or newer,
-e.g. Debian Testing/Unstable.
+No problem, these patches add the locales needed for them working
+smoothly. Please send a bug report if there are some great new
+features in the new mutt or gnupg which break anything inside t-prot.
+
+Please note that this patch will most likely be applied by the t-prot
+package maintainer of your distribution, e.g. Debian Testing/Unstable.
 
 
 OBSOLETE PATCHES
@@ -88,10 +80,6 @@ interest in switching to Getopt::Long. Furthermore (as stated before),
 I see no benefits in using Getopt::Long over Getopt::Mixed as long as
 the latter is working and available at CPAN.
 
-t-prot-*-gpg107.diff
-====================
-This patch has been dropped, since noone seems to make use of it.
-
 t-prot-*-indentms.diff
 ======================
 This patch has been dropped, since noone seems to make use of it.
diff --git a/contrib/t-prot-r1.206-mutt156.diff b/contrib/t-prot-r1.206-mutt156.diff
deleted file mode 100644
index bf65762..0000000
--- a/contrib/t-prot-r1.206-mutt156.diff
+++ /dev/null
@@ -1,323 +0,0 @@
---- t-prot	Sun Oct 10 23:25:08 2004
-+++ t-prot-M156	Sun Oct 10 23:28:23 2004
-@@ -31,7 +31,7 @@
- 
-     $mutt_attachment $mutt_contenttype $mutt_pgpsigned $mutt_beginsigned
-     $mutt_pgpclearsigned $mutt_pgpclearsigstart $mutt_pgpencrypted
--    $mutt_pgpoutstart $mutt_pgpoutend
-+    $mutt_pgpoutstart $mutt_pgpoutend $mutt_ssloutstart $mutt_ssloutend
- );
- 
- 
-@@ -57,9 +57,9 @@
- $msg_ratio      = "Blocked by $0: This message has been rejected because of excessive quoting. Please see http://learn.to/quote/ and http://www.escape.de/users/tolot/mutt/ for more info. Have a nice day!\n";
- # end of user adjusted vals
- 
--# mutt's locales as in mutt-1.3.28 up to mutt-1.4.2.1 {{{
-+# mutt's locales as in mutt-1.5.6 {{{
- my %mutt_attachment = (
--	'bg' => '[-- Ïðèêà÷åí ôàéë: #',
-+	'bg' => '[-- Ïðèëîæåíèå: #',
- 	'ca' => '[-- Fitxer adjunt #',
- 	'cs' => '[-- Pøíloha #',
- 	'da' => '[-- Brevdel #',
-@@ -117,31 +117,31 @@
- my %mutt_pgpsigned = (
- 	'bg' => '[-- Êðàé íà ïîäïèñàíèòå äàííè --]',
- 	'ca' => '[-- Final de les dades signades. --]',
--	'cs' => '',
-+	'cs' => '[-- Konec podepsaných dat --]',
- 	'da' => '[-- Slut på underskrevne data --]',
- 	'de' => '[-- Ende der signierten Daten --]',
--	'el' => '[-- ÔÝëïò äåäïìÝíùí õðïãåãñáììÝíùí --]',
-+	'el' => '[-- ÔÝëïò õðïãåãñáììÝíùí äåäïìÝíùí --]',
- 	'eo' => '[-- Fino de subskribitaj datenoj --]',
--	'es' => '',
-+	'es' => '[-- Fin de datos firmados --]',
- 	'et' => '[-- Allkirjastatud info lõpp --]',
- 	'fr' => '[-- Fin des données signées --]',
--	'gl' => '',
--	'hu' => '',
-+	'gl' => '[-- Fin dos datos asinados --]',
-+	'hu' => '[-- Aláírt adat vége --]',
- 	'id' => '[-- Akhir data yang ditandatangani --]',
- 	'it' => '[-- Fine dei dati firmati --]',
- 	'ja' => '[-- ½ð̾¥Ç¡¼¥¿½ªÎ» --]',
--	'ko' => '[-- ¼­¸í ÀÚ·á ³¡ --]',
--	'lt' => '',
--	'nl' => '',
-+	'ko' => '[-- ¼­¸í ÀÚ·áÀÇ ³¡ --]',
-+	'lt' => '[-- Pasiraðytø duomenø pabaiga --]',
-+	'nl' => '[-- Einde van ondertekende gegevens --]',
- 	'pl' => '[-- Koniec podpisanych danych --]',
--	'pt_BR' => '',
-+	'pt_BR' => '[-- Fim dos dados assinados --]',
- 	'ru' => '[-- ëÏÎÅà ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]',
--	'sk' => '',
-+	'sk' => '[-- Koniec dát s podpisom PGP/MIME --]',
- 	'sv' => '[-- Slut på signerat data --]',
--	'tr' => '',
-+	'tr' => '[-- Imzalanmýþ bilginin sonu --]',
- 	'uk' => '[-- ë¦ÎÅÃØ Ð¦ÄÐÉÓÁÎÉÈ ÄÁÎÉÈ --]',
--	'zh_CN' => '',
--	'zh_TW' => ''
-+	'zh_CN' => '[-- Ç©ÊðµÄ×ÊÁϽáÊø --]',
-+	'zh_TW' => '[-- 簽署的資料結束 --]',
- );
- my %mutt_beginsigned = (
-     'bg' => '[-- Ñëåäíèòå äàííè ñà ïîäïèñàíè --]',
-@@ -161,7 +161,7 @@
-     'ja' => '[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï½ð̾¤µ¤ì¤Æ¤¤¤ë --]',
-     'ko' => '[-- ¾Æ·¡ÀÇ ÀÚ·á´Â ¼­¸í µÇ¾úÀ½ --]',
-     'lt' => '[-- Toliau einantys duomenys yra pasiraðyti --]',
--    'nl' => '[-- De volgende gegevens zijn PGP/MIME ondertekend --]',
-+    'nl' => '[-- De volgende gegevens zijn ondertekend --]',
-     'pl' => '[-- Poni¿sze dane s± podpisane --]',
-     'pt_BR' => '[-- Os dados a seguir estão assinados --]',
-     'ru' => '[-- îÁÞÁÌÏ ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]',
-@@ -173,9 +173,9 @@
-     'zh_TW' => '[-- 以下的資料已被簽署 --]',
- );
- my %mutt_pgpencrypted = (
--	'bg' => '[-- Êðàé íà PGP/MIME øèôðîâàíèòå äàííè --]',
-+	'bg' => '[-- Êðàé íà øèôðîâàíèòå ñ PGP/MIME äàííè --]',
- 	'ca' => '[-- Final de les dades xifrades amb PGP/MIME. --]',
--	'cs' => '',
-+	'cs' => '[-- Konec dat za¹ifrovaných ve formátu PGP/MIME --]',
- 	'da' => '[-- Slut på PGP/MIME-krypteret data --]',
- 	'de' => '[-- Ende der PGP/MIME-verschlüsselten Daten --]',
- 	'el' => '[-- ÔÝëïò äåäïìÝíùí êñõðôïãñáöçìÝíùí ìÝóù PGP/MIME --]',
-@@ -184,13 +184,13 @@
- 	'et' => '[-- PGP/MIME krüptitud info lõpp --]',
- 	'fr' => '[-- Fin des données chiffrées avec PGP/MIME --]',
- 	'gl' => '',
--	'hu' => '',
-+	'hu' => '[-- PGP/MIME titkosított adat vége --]',
- 	'id' => '[-- Akhir data yang dienkripsi dg PGP/MIME --]',
- 	'it' => '[-- Fine dei dati cifrati con PGP/MIME  --]',
--	'ja' => '[-- PGP/MIME°Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]',
-+	'ja' => '[-- PGP/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]',
- 	'ko' => '[-- PGP/MIME ¾Ïȣȭ ÀÚ·á ³¡ --]',
- 	'lt' => '',
--	'nl' => '',
-+	'nl' => '[-- Einde van PGP/MIME versleutelde data --]',
- 	'pl' => '[-- Koniec danych zaszyfrowanych PGP/MIME --]',
- 	'pt_BR' => '',
- 	'ru' => '[-- ëÏÎÅà ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]',
-@@ -204,20 +204,20 @@
- my %mutt_pgpclearsigned = (
- 	'bg' => '[-- ÊÐÀÉ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎÒÎ ÏÈÑÌÎ --]',
- 	'ca' => '[-- TERMINA EL MISSATGE PGP SIGNAT --]',
--	'cs' => '',
-+	'cs' => '[-- KONEC PODEPSANÉ PGP ZPRÁVY --]',
- 	'el' => '[-- ÔÅËÏÓ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]',
- 	'eo' => '[-- FINO DE PGP-SUBSKRIBITA MESAØO --]',
- 	'es' => '',
- 	'et' => '[-- PGP ALLKIRJASTATUD TEATE LÕPP --]',
- 	'fr' => '[-- FIN DE MESSAGE SIGNÉ PGP --]',
- 	'gl' => '',
--	'hu' => '',
-+	'hu' => '[-- PGP ALÁÍRT LEVÉL VÉGE --]',
- 	'id' => '[-- AKHIR PESAN DG TANDATANGAN PGP --]',
- 	'it' => '[-- FINE DEL MESSAGGIO FIRMATO CON PGP --]',
--	'ja' => '[-- PGP½ð̾¥á¥Ã¥»¡¼¥¸½ªÎ» --]',
-+	'ja' => '[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸½ªÎ» --]',
- 	'ko' => '[-- PGP ¼­¸í ¸ÞÀÏ ³¡ --]',
- 	'lt' => '',
--	'nl' => '',
-+	'nl' => '[-- EINDE PGP ONDERTEKEND BERICHT --]',
- 	'pl' => '[-- KONIEC LISTU PODPISANEGO PGP --]',
- 	'pt_BR' => '',
- 	'ru' => '[-- ëÏÎÅà ÓÏÏÂÝÅÎÉÑ, ÐÏÄÐÉÓÁÎÎÏÇÏ PGP --]',
-@@ -229,7 +229,7 @@
- 	'zh_TW' => ''
- );
- my %mutt_pgpclearsigstart = (
--	'bg' => '[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎÒÎ ÏÈÑÌÎ --]',
-+	'bg' => '[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎ ÏÈÑÌÎ --]',
- 	'ca' => '[-- COMENÇA EL MISSATGE PGP SIGNAT --]',
- 	'cs' => '[-- ZAÈÁTEK PODEPSANÉ PGP ZPRÁVY --]',
- 	'el' => '[-- ÅÍÁÑÎÇ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]',
-@@ -241,7 +241,7 @@
- 	'hu' => '[-- PGP ALÁÍRT LEVÉL KEZDÕDIK --]',
- 	'id' => '[-- AWAL SURAT DG TANDATANGAN PGP --]',
- 	'it' => '[-- INIZIO DEL MESSAGGIO FIRMATO CON PGP --]',
--	'ja' => '[-- PGP½ð̾¥á¥Ã¥»¡¼¥¸³«»Ï --]',
-+	'ja' => '[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸³«»Ï --]',
- 	'ko' => '[-- PGP ¼­¸í ¸ÞÀÏ ½ÃÀÛ --]',
- 	'lt' => '[-- PGP PASIRAÐYTO LAIÐKO PRADÞIA --]',
- 	'nl' => '[-- BEGIN PGP ONDERTEKEND BERICHT --]',
-@@ -256,29 +256,29 @@
- 	'zh_TW' => '[-- PGP 簽名的信件開始 --]'
- );
- my %mutt_pgpoutstart = (
--	'bg' => '[-- ñëåäâà ðåçóëòàòà îò PGP (òåêóùî âåìå: ',
--	'ca' => '[-- Aquesta és l\'eixida de PGP (data actual: ',
--	'cs' => '[-- následuje výstup PGP (aktuální èas: ',
-+	'bg' => '[-- ñëåäâà ðåçóëòàòúòPGP) --]',
-+	'ca' => '[-- Aquesta és l\'eixida de PGP',
-+	'cs' => '[-- následuje výstup PGP ',
- 	'da' => '[-- PGP-uddata følger (aktuelt tidspunkt: ',
--	'de' => '[-- PGP-Ausgabe folgt (aktuelle Zeit: ',
--	'el' => '[-- Áêïëïõèåß Ýîïäïò ôïõ PGP (ôñÝ÷ïõóá þñá: ',
--	'eo' => '[-- Eligo de PGP sekvas (nuna horo: ',
-+	'de' => '[-- PGP Ausgabe folgt',
-+	'el' => '[-- PGP áêïëïõèåß Ýîïäïò',
-+	'eo' => '[-- PGP eligo sekvas',
- 	'es' => '[-- Salida de PGP a continuación (tiempo actual: ',
--	'et' => '[-- järgneb PGP väljund (praegune aeg: ',
--	'fr' => '[-- La sortie PGP suit (heure courante : ',
-+	'et' => '[-- järgneb PGP väljund',
-+	'fr' => '[-- La sortie PGP suit',
- 	'gl' => '[-- Saída PGP a continuación (hora actual: ',
--	'hu' => '[-- PGP kimenet következik (idõ: ',
--	'id' => '[-- Keluaran dari PGP (waktu skrg: ',
-+	'hu' => '[-- PGP kimenet következik',
-+	'id' => '[-- Keluaran dari PGP',
- 	'it' => '[-- Segue l\'output di PGP (ora attuale: ',
--	'ja' => '[-- PGP ½ÐÎϤϰʲ¼¤ÎÄ̤ê (¸½ºß»þ¹ï: ',
--	'ko' => '[-- PGP Ãâ·Â (ÇöÀç ½Ã°£: ',
-+	'ja' => '[-- PGP ½ÐÎϤϰʲ¼¤ÎÄ̤ê',
-+	'ko' => '[-- PGP Ãâ·Â °á°ú ',
- 	'lt' => '[-- Toliau PGP iðvestis (esamas laikas: ',
--	'nl' => '[-- PGP uitvoer volgt (Huidige tijd: ',
--	'pl' => '[-- Wynik dzia³ania PGP (bie¿±ca data i czas: ',
-+	'nl' => '[-- PGP uitvoer volgt',
-+	'pl' => '[-- Wynik dzia³ania PGP ',
- 	'pt_BR' => '[-- Saída do PGP a seguir (hora atual: ',
--	'ru' => '[-- òÅÚÕÌØÔÁÔ ÒÁÂÏÔÙ ÐÒÏÇÒÁÍÍÙ PGP (ÔÅËÕÝÅÅ ×ÒÅÍÑ: ',
-+	'ru' => '[-- òÅÚÕÌØÔÁÔ ÒÁÂÏÔÙ ÐÒÏÇÒÁÍÍÙ PGP',
- 	'sk' => '[-- Nasleduje výstup PGP (aktuálny èas: ',
--	'sv' => '[-- Utdata från PGP följer (aktuell tid: ',
-+	'sv' => '[-- PGP utdata följer',
- 	'tr' => '[-- PGP geri verisi (geçerli zaman: ',
- 	'uk' => '[-- ÔÅËÓÔ ÎÁ ×ÉÈÏĦ PGP (ÞÁÓ: ',
- 	'zh_CN' => '[-- ÒÔÏÂΪ PGP Êä³öµÄ×ÊÁÏ£¨ÏÖÔÚʱ¼ä£º ',
-@@ -299,7 +299,7 @@
- 	'hu' => '[-- PGP kimenet vége --]',
- 	'id' => '[-- Akhir keluaran PGP --]',
- 	'it' => '[-- Fine dell\'output di PGP --]',
--	'ja' => '[-- PGP½ÐÎϽªÎ» --]',
-+	'ja' => '[-- PGP ½ÐÎϽªÎ» --]',
- 	'ko' => '[-- PGP Ãâ·Â ³¡ --]',
- 	'lt' => '[-- PGP iðvesties pabaiga --]',
- 	'nl' => '[-- Einde van PGP uitvoer --]',
-@@ -313,6 +313,63 @@
- 	'zh_CN' => '[-- PGP Êä³ö²¿·Ý½áÊø --]',
- 	'zh_TW' => '[-- PGP 輸出部份結束 --]'
- );
-+my %mutt_ssloutstart = (
-+	'bg' => '[-- ñëåäâà ðåçóëòàòúòOpenSSL) --]',
-+	'ca' => '[-- Aquesta és l\'eixida de OpenSSL',
-+	'cs' => '[-- následuje výstup OpenSSL ',
-+	'da' => '[-- PGP-uddata følger (aktuelt tidspunkt: ',
-+	'de' => '[-- OpenSSL Ausgabe folgt',
-+	'el' => '[-- OpenSSL áêïëïõèåß Ýîïäïò',
-+	'eo' => '[-- OpenSSL eligo sekvas',
-+	'es' => '[-- Salida de PGP a continuación (tiempo actual: ',
-+	'et' => '[-- järgneb OpenSSL väljund',
-+	'fr' => '[-- La sortie OpenSSL suit',
-+	'gl' => '[-- Saída PGP a continuación (hora actual: ',
-+	'hu' => '[-- OpenSSL kimenet következik',
-+	'id' => '[-- Keluaran dari OpenSSL',
-+	'it' => '[-- Segue l\'output di PGP (ora attuale: ',
-+	'ja' => '[-- OpenSSL ½ÐÎϤϰʲ¼¤ÎÄ̤ê',
-+	'ko' => '[-- OpenSSL Ãâ·Â °á°ú ',
-+	'lt' => '[-- Toliau PGP iðvestis (esamas laikas: ',
-+	'nl' => '[-- OpenSSL uitvoer volgt',
-+	'pl' => '[-- Wynik dzia³ania OpenSSL ',
-+	'pt_BR' => '[-- Saída do PGP a seguir (hora atual: ',
-+	'ru' => '[-- òÅÚÕÌØÔÁÔ ÒÁÂÏÔÙ ÐÒÏÇÒÁÍÍÙ OpenSSL',
-+	'sk' => '[-- Nasleduje výstup PGP (aktuálny èas: ',
-+	'sv' => '[-- OpenSSL utdata följer',
-+	'tr' => '[-- PGP geri verisi (geçerli zaman: ',
-+	'uk' => '[-- ÔÅËÓÔ ÎÁ ×ÉÈÏĦ PGP (ÞÁÓ: ',
-+	'zh_CN' => '[-- ÒÔÏÂΪ PGP Êä³öµÄ×ÊÁÏ£¨ÏÖÔÚʱ¼ä£º ',
-+	'zh_TW' => '[-- 以下為 PGP 輸出的資料（現在時間：'
-+);
-+my %mutt_ssloutend = (
-+	'bg' => '[-- Êðàé íà OpenSSL-ðåçóëòàòà --]',
-+	'ca' => '[-- Final de l\'eixida d\'OpenSSL. --]',
-+	'cs' => '[-- Konec OpenSSL výstupu --]',
-+	'da' => '[-- Slut på PGP-uddata --]',
-+	'de' => '[-- Ende der OpenSSL-Ausgabe --]',
-+	'el' => '[-- ÔÝëïò ôçò åîüäïõ OpenSSL --]',
-+	'eo' => '[-- Fino de OpenSSL-eligo --]',
-+	'es' => '[-- Fin de salida PGP --]',
-+	'et' => '[-- OpenSSL väljundi lõpp --]',
-+	'fr' => '[-- Fin de sortie OpenSSL --]',
-+	'hu' => '[-- OpenSSL kimenet vége --]',
-+	'id' => '[-- Akhir keluaran OpenSSL --]',
-+	'it' => '[-- Fine dell\'output di PGP --]',
-+	'ja' => '[-- OpenSSL ½ÐÎϽªÎ» --]',
-+	'ko' => '[-- OpenSSL Ãâ·Â ³¡ --]',
-+	'lt' => '[-- PGP iðvesties pabaiga --]',
-+	'nl' => '[-- Einde van OpenSSL uitvoer --]',
-+	'pl' => '[-- Koniec komunikatów OpenSSL --]',
-+	'pt_BR' => '[-- Fim da saída do PGP --]',
-+	'ru' => '[-- ëÏÎÅà ×Ù×ÏÄÁ ÐÒÏÇÒÁÍÍÙ OpenSSL --]',
-+	'sk' => '[-- Koniec výstupu PGP --]',
-+	'sv' => '[-- Slut på utdata från S/MIME --]',
-+	'tr' => '[-- PGP geri verisi sonu --]',
-+	'uk' => '[-- ë¦ÎÅÃØ ÔÅËÓÔÕ ÎÁ ×ÉÈÏĦ PGP --]',
-+	'zh_CN' => '[-- PGP Êä³ö²¿·Ý½áÊø --]',
-+	'zh_TW' => '[-- PGP 輸出部份結束 --]'
-+);
- # }}}
- # set the defaults to the C locale
- $mutt_attachment        = '[-- Attachment #';
-@@ -324,6 +381,8 @@
- $mutt_pgpencrypted      = '[-- End of PGP/MIME encrypted data --]';
- $mutt_pgpoutstart       = '[-- PGP output follows (current time:';
- $mutt_pgpoutend         = '[-- End of PGP output --]';
-+$mutt_ssloutstart       = '[-- OpenSSL output follows';
-+$mutt_ssloutend         = '[-- End of OpenSSL output --]';
- 
- # gpg's locales as in gpg-1.2.6 {{{
- my %gpg_WARNING = (
-@@ -818,7 +877,7 @@
-     for (my $x=0; $x<scalar(@$L); $x++) {
-         if ($$V[$x]) { next; }
- 
--        if ($$L[$x]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o)
-+        if ($$L[$x]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutstart|$mutt_ssloutstart)/o)
-         {
-             my ($from) = grep(/^From:/, @$H);
-             ($from) = $from=~m/([a-z\d][a-z_\d\+-\.]*\@(?:[a-z_\d\+-\.]+\.)+[a-z]{2,})/i;
-@@ -836,7 +895,7 @@
-                     splice(@$V, $i, 1);
-                     $i--;
-                 }
--                elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutend)/o)
-+                elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutend|$mutt_ssloutend)/o)
-                 {
-                     if ($pgpmove ||
-                         ($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i)))
-@@ -1131,7 +1190,7 @@
-                     'Forwarded message',
-                     'Weitergeleitete Nachricht / Forwarded Message');
-         my $k = 0;    # any text above?
--        my $tmp = 0;  # flagged if inside PGP output
-+        my $tmp = 0;  # flagged if inside PGP or SSL output
- 
-         DONE: for ($x=0; $x<scalar(@$lines); $x++) { 
-             if (!$vrb[$x]) {
-@@ -1152,7 +1211,8 @@
-                     ((!$spass) || $$lines[$x]!~/^$spass_prefix/o))
-                 {
-                     if ($mua eq 'mutt' && (!$tmp) &&
--                        $$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o) {
-+                        ($$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o ||
-+                         $$lines[$x] !~ /^(?:\e.+?\a)?(?:$mutt_ssloutstart)/o)) {
-                         $tmp = 1; 
-                     } elsif ($mua eq 'mutt' && $tmp && 
-                         ($$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_beginsigned)/o ||
-@@ -1446,6 +1506,8 @@
-     esc(\$mutt_pgpencrypted);
-     esc(\$mutt_pgpoutstart);
-     esc(\$mutt_pgpoutend);
-+    esc(\$mutt_ssloutstart);
-+    esc(\$mutt_ssloutend);
- 
-     esc(\$gpg_WARNING);
-     esc(\$gpg_Warning);
diff --git a/contrib/t-prot-r1.213-gpg124.diff b/contrib/t-prot-r1.213-gpg124.diff
deleted file mode 100644
index 3337dce..0000000
--- a/contrib/t-prot-r1.213-gpg124.diff
+++ /dev/null
@@ -1,206 +0,0 @@
---- t-prot	Fri Dec 31 14:45:11 2004
-+++ t-prot-G124	Mon Jan  3 16:58:09 2005
-@@ -325,7 +325,7 @@
- $mutt_pgpoutstart       = '[-- PGP output follows (current time:';
- $mutt_pgpoutend         = '[-- End of PGP output --]';
- 
--# gpg's locales as in gpg-1.4.0 {{{
-+# gpg's locales as in gpg-1.2.4 {{{
- my %gpg_WARNING = (
- 	'be' => '',
- 	'ca' => 'AV�S: ',
-@@ -343,6 +343,7 @@
- 	'id' => 'PERINGATAN: ',
- 	'it' => 'ATTENZIONE: ',
- 	'ja' => '·Ù¹ð: ',
-+	'nl' => 'LET OP: ',
- 	'pl' => 'OSTRZE¯ENIE: ',
- 	'pt' => 'AVISO: ',
- 	'pt_BR' => 'AVISO: ',
-@@ -351,8 +352,7 @@
- 	'sk' => 'VAROVANIE: ',
- 	'sv' => 'VARNING: ',
- 	'tr' => 'UYARI: ',
--	'zh_CN' => '警告：我们不信任这把密钥！',
--	'zh_TW' => 'ĵ§i¡G§Ú­Ì *¤£* «H¥ô³o§âª÷Æ_¡I'
-+	'zh_TW' => 'ĵ§i¡G§Ú­Ì *¤£* «H¥ô³o§âª÷Æ_¡I\n'
- );
- my %gpg_Warning = (
- 	'be' => '',
-@@ -371,6 +371,7 @@
- 	'id' => 'PERINGATAN: ',
- 	'it' => 'ATTENZIONE: ',
- 	'ja' => '·Ù¹ð: ',
-+	'nl' => 'LET OP: ',
- 	'pl' => 'OSTRZE¯ENIE: ',
- 	'pt' => 'CUIDADO: ',
- 	'pt_BR' => 'CUIDADO: ',
-@@ -379,8 +380,7 @@
- 	'sk' => 'VAROVANIE: ',
- 	'sv' => 'VARNING: ',
- 	'tr' => 'UYARI: ',
--	'zh_CN' => '警告：加密过的报文已经变造！',
--	'zh_TW' => 'ĵ§i¡G¥[±K¹Lªº°T®§¤w¸g³QÅܳy¤F¡I'
-+	'zh_TW' => 'ĵ§i¡G¥[±K¹Lªº°T®§¤w¸g³QÅܳy¤F¡I\n'
- );
- my %gpg_Cantcheck = (
- 	'be' => '',
-@@ -399,6 +399,7 @@
- 	'id' => 'Tidak dapat memeriksa signature: ',
- 	'it' => 'Impossibile controllare la firma: ',
- 	'ja' => '½ð̾¤ò¸¡ºº¤Ç¤­¤Þ¤»¤ó: ',
-+	'nl' => 'Kan ondertekening niet controleren: ',
- 	'pl' => 'Nie mo¿na sprawdziæ podpisu: ',
- 	'pt' => 'Impossível verificar assinatura: ',
- 	'pt_BR' => 'Impossível verificar assinatura: ',
-@@ -407,7 +408,6 @@
- 	'sk' => 'Nemô¾em overi» podpis: ',
- 	'sv' => 'Kan inte verifiera signaturen: ',
- 	'tr' => 'Ä°mza kontrol edilemedi: ',
--	'zh_CN' => '无法检查签字：',
- 	'zh_TW' => 'µLªkÀˬdñ³¹¡G '
- );
- my %gpg_aka = (
-@@ -420,23 +420,23 @@
- 	'eo' => '            alinome ',
- 	'es' => '                alias ',
- 	'et' => '                 ka ',
--	'fr' => '                alias « ',
-+	'fr' => '              alias ',
- 	'gl' => '               alias ',
- 	'hu' => '               azaz ',
- 	'id' => '              alias ',
- 	'it' => '                alias ',
--	'ja' => '                ÊÌ̾¡È',
-+	'ja' => '       ÊÌ̾ ',
-+	'nl' => '              alias ',
- 	'pl' => '                        alias ',
- 	'pt' => '                   ou ',
- 	'pt_BR' => '                   ou ',
- 	'sk' => '                alias ',
--	'sv' => '      även känd som ',
-+	'sv' => '      även känd som ',
- 	'tr' => '                den ',
--	'zh_CN' => '              亦即“',
- 	'zh_TW' => '                ¥ç§Y '
- );
- my %gpg_bad = (
--	'be' => 'нерэчаісны хэш-альгарытм ',
-+	'be' => '',
- 	'ca' => 'Signatura INCORRECTA de ',
- 	'cs' => '©PATNÝ podpis od ',
- 	'da' => 'DÅRLIG signatur fra ',
-@@ -445,22 +445,22 @@
- 	'eo' => 'MALBONA subskribo de ',
- 	'es' => 'Firma INCORRECTA de ',
- 	'et' => 'HALB allkiri kasutajalt ',
--	'fi' => 'VÄÄRÄ allekirjoitus lähettäjältä ',
--	'fr' => 'MAUVAISE signature de « ',
-+	'fi' => 'Allekirjoitus EI TÄSMÄÄ lähettäjallä ',
-+	'fr' => 'MAUVAISE signature de ',
- 	'gl' => 'Sinatura INCORRECTA de',
- 	'hu' => 'ROSSZ aláírás a következõtõl: ',
- 	'id' => 'signature BURUK dari ',
- 	'it' => 'Firma NON corretta da ',
--	'ja' => '¡È',
-+	'ja' => 'ÉÔÀµ¤Ê ½ð̾: ',
-+	'nl' => 'FOUTE ondertekening van ',
- 	'pl' => 'NIEPOPRAWNY podpis z³o¿ony przez ',
- 	'pt' => 'Assinatura INCORRECTA de ',
- 	'pt_BR' => 'Assinatura INCORRETA de ',
- 	'ro' => 'Semnãturã INCORECTÃ din ',
- 	'ru' => 'ПЛОХАЯ подпись от ',
- 	'sk' => 'ZLÝ podpis od ',
--	'sv' => 'FELAKTIG signatur från ',
-+	'sv' => 'FELAKTIG signatur från ',
- 	'tr' => 'KÖTÜ imza: ',
--	'zh_CN' => '已损坏的签字，来自于“',
- 	'zh_TW' => '*·lÃa* ªºÃ±³¹¨Ó¦Û©ó '
- );
- my %gpg_expired = (
-@@ -473,26 +473,26 @@
- 	'eo' => 'Noto: Æi tiu þlosilo eksvalidiøis!',
- 	'es' => 'Nota: ¡Esta clave ha caducado!',
- 	'et' => 'Märkus: See võti on aegunud!',
--	'fi' => 'Huom: Tämä avain on vanhentunut!',
-+	'fi' => 'Huom: Tämä avain on vanhentunut!',
- 	'fr' => 'Note: Cette clé a expiré !',
- 	'gl' => 'Nota: ¡Esta chave xa caducou!',
- 	'hu' => 'Megjegyzés: Ez a kulcs lejárt!',
- 	'id' => 'Catatan: Kunci ini telah berakhir!',
- 	'it' => 'Nota: questa chiave è scaduta!',
--	'ja' => 'Ãí°Õ: ¤³¤Î¸°¤ÏËþλ¤Ç¤¹!',
-+	'ja' => 'Ãí°Õ: ¤³¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹!',
-+	'nl' => 'Let op: Deze sleutel is verlopen!',
- 	'pl' => 'Uwaga: Data wa¿no¶ci tego klucza up³ynê³a!',
- 	'pt' => 'Nota: Esta chave expirou!',
- 	'pt_BR' => 'Nota: Esta chave expirou!',
- 	'ro' => 'Notã: Aceastã cheie a expirat!',
- 	'ru' => 'ПРЕДУПРЕЖДАЮ: Данный ключ просрочен!',
- 	'sk' => 'Poznámka: Skonèila platnos» tohto kµúèa!',
--	'sv' => 'Obs: Giltighetstiden för denna nyckel har gått ut!',
-+	'sv' => 'Notera: Denna nyckel har gått ut!',
- 	'tr' => 'Bilgi: Bu anahtarın kullanım süresi dolmuştu!',
--	'zh_CN' => '注意：这把密钥已经过期了！',
- 	'zh_TW' => '½Ðª`·N¡G³o§âª÷Æ_¤w¸g¹L´Á¤F¡I'
- );
- my %gpg_good = (
--	'be' => 'нерэчаісны хэш-альгарытм ',
-+	'be' => '',
- 	'ca' => 'Signatura correcta de ',
- 	'cs' => 'Dobrý podpis od ',
- 	'da' => 'God signatur fra ',
-@@ -501,22 +501,22 @@
- 	'eo' => 'Bona subskribo de ',
- 	'es' => 'Firma correcta de ',
- 	'et' => 'Korrektne allkiri kasutajalt ',
--	'fi' => 'Allekirjoitus täsmää lähettäjään ',
--	'fr' => 'Bonne signature de « ',
-+	'fi' => 'Allekirjoitus täsmää lähettäjään ',
-+	'fr' => 'Bonne signature de ',
- 	'gl' => 'Sinatura correcta de ',
- 	'hu' => 'Jó aláírás a következõtõl: ',
- 	'id' => 'Signature baik dari ',
- 	'it' => 'Firma valida da ',
--	'ja' => '¡È',
-+	'ja' => 'Àµ¤·¤¤½ð̾: ',
-+	'nl' => 'Correcte ondertekening van ',
- 	'pl' => 'Poprawny podpis z³o¿ony przez ',
- 	'pt' => 'Assinatura correcta de ',
- 	'pt_BR' => 'Assinatura correta de ',
- 	'ro' => 'Semnãturã bunã din ',
- 	'ru' => 'Действительная подпись от ',
- 	'sk' => 'Dobrý podpis od ',
--	'sv' => 'Korrekt signatur från ',
-+	'sv' => 'Korrekt signatur från ',
- 	'tr' => 'Kullanıcı kimliği: ',
--	'zh_CN' => '完好的签字，来自于“',
- 	'zh_TW' => '§¹¦nªºÃ±³¹¨Ó¦Û©ó '
- );
- my %gpg_bug = (
-@@ -529,22 +529,22 @@
- 	'eo' => '... æi tio estas cimo (',
- 	'es' => '... esto es un bug (',
- 	'et' => '... see on viga (',
--	'fi' => '...tämä on ohjelmistovika (',
-+	'fi' => '...tämä on ohjelmistovika (',
- 	'fr' => '... cest un bug (',
- 	'gl' => '... isto é un erro (',
- 	'hu' => 'Ez egy programhiba... (',
- 	'id' => '... kesalahan (',
- 	'it' => '... questo è un bug (',
- 	'ja' => '... ¥Ð¥°¤Ç¤¹ (',
-+	'nl' => '... dit is een programmeerfout (',
- 	'pl' => '... to jest b³±d programu (',
- 	'pt' => '... isto é um bug (',
- 	'pt_BR' => '... isto é um bug (',
- 	'ro' => '... acesta este un bug (',
- 	'ru' => ' ... это ошибка (',
- 	'sk' => '... toto je chyba v programe (',
--	'sv' => '... detta är ett fel i programmet (',
-+	'sv' => '... detta är ett fel i programmet (',
- 	'tr' => '... bu bir yazılım hatası (',
--	'zh_CN' => '……这是个程序缺陷(',
- 	'zh_TW' => '... ³o¬O­Ó·å²« ('
- );
- # }}}
diff --git a/contrib/t-prot-r1.213-gpg125.diff b/contrib/t-prot-r1.213-gpg125.diff
deleted file mode 100644
index 1d0d631..0000000
--- a/contrib/t-prot-r1.213-gpg125.diff
+++ /dev/null
@@ -1,195 +0,0 @@
---- t-prot	Fri Dec 31 14:45:11 2004
-+++ t-prot-g125	Sat Jan  8 11:45:41 2005
-@@ -325,7 +325,7 @@
- $mutt_pgpoutstart       = '[-- PGP output follows (current time:';
- $mutt_pgpoutend         = '[-- End of PGP output --]';
- 
--# gpg's locales as in gpg-1.4.0 {{{
-+# gpg's locales as in gpg-1.2.5 {{{
- my %gpg_WARNING = (
- 	'be' => '',
- 	'ca' => 'AV�S: ',
-@@ -343,6 +343,7 @@
- 	'id' => 'PERINGATAN: ',
- 	'it' => 'ATTENZIONE: ',
- 	'ja' => '·Ù¹ð: ',
-+	'nl' => 'WAARSCHUWING: ',
- 	'pl' => 'OSTRZE¯ENIE: ',
- 	'pt' => 'AVISO: ',
- 	'pt_BR' => 'AVISO: ',
-@@ -351,8 +352,8 @@
- 	'sk' => 'VAROVANIE: ',
- 	'sv' => 'VARNING: ',
- 	'tr' => 'UYARI: ',
--	'zh_CN' => '警告：我们不信任这把密钥！',
--	'zh_TW' => 'ĵ§i¡G§Ú­Ì *¤£* «H¥ô³o§âª÷Æ_¡I'
-+	'zh_CN' => '¾¯¸æ£ºÎÒÃDz»ÐÅÈÎÕâ°ÑÃÜÔ¿£¡\n',
-+	'zh_TW' => 'ĵ§i¡G§Ú­Ì *¤£* «H¥ô³o§âª÷Æ_¡I\n'
- );
- my %gpg_Warning = (
- 	'be' => '',
-@@ -371,6 +372,7 @@
- 	'id' => 'PERINGATAN: ',
- 	'it' => 'ATTENZIONE: ',
- 	'ja' => '·Ù¹ð: ',
-+	'nl' => 'WAARSCHUWING: ',
- 	'pl' => 'OSTRZE¯ENIE: ',
- 	'pt' => 'CUIDADO: ',
- 	'pt_BR' => 'CUIDADO: ',
-@@ -379,8 +381,8 @@
- 	'sk' => 'VAROVANIE: ',
- 	'sv' => 'VARNING: ',
- 	'tr' => 'UYARI: ',
--	'zh_CN' => '警告：加密过的报文已经变造！',
--	'zh_TW' => 'ĵ§i¡G¥[±K¹Lªº°T®§¤w¸g³QÅܳy¤F¡I'
-+	'zh_CN' => '¾¯¸æ£º¼ÓÃܹýµÄ±¨ÎÄÒѾ­±äÔ죡\n',
-+	'zh_TW' => 'ĵ§i¡G¥[±K¹Lªº°T®§¤w¸g³QÅܳy¤F¡I\n'
- );
- my %gpg_Cantcheck = (
- 	'be' => '',
-@@ -399,6 +401,7 @@
- 	'id' => 'Tidak dapat memeriksa signature: ',
- 	'it' => 'Impossibile controllare la firma: ',
- 	'ja' => '½ð̾¤ò¸¡ºº¤Ç¤­¤Þ¤»¤ó: ',
-+	'nl' => 'Kan ondertekening niet controleren: ',
- 	'pl' => 'Nie mo¿na sprawdziæ podpisu: ',
- 	'pt' => 'Impossível verificar assinatura: ',
- 	'pt_BR' => 'Impossível verificar assinatura: ',
-@@ -407,7 +410,7 @@
- 	'sk' => 'Nemô¾em overi» podpis: ',
- 	'sv' => 'Kan inte verifiera signaturen: ',
- 	'tr' => 'Ä°mza kontrol edilemedi: ',
--	'zh_CN' => '无法检查签字：',
-+	'zh_CN' => 'ÎÞ·¨¼ì²éÇ©×Ö£º',
- 	'zh_TW' => 'µLªkÀˬdñ³¹¡G '
- );
- my %gpg_aka = (
-@@ -420,23 +423,24 @@
- 	'eo' => '            alinome ',
- 	'es' => '                alias ',
- 	'et' => '                 ka ',
--	'fr' => '                alias « ',
-+	'fr' => '              alias ',
- 	'gl' => '               alias ',
- 	'hu' => '               azaz ',
- 	'id' => '              alias ',
- 	'it' => '                alias ',
--	'ja' => '                ÊÌ̾¡È',
-+	'ja' => '       ÊÌ̾ ',
-+	'nl' => '                alias ',
- 	'pl' => '                        alias ',
- 	'pt' => '                   ou ',
- 	'pt_BR' => '                   ou ',
- 	'sk' => '                alias ',
--	'sv' => '      även känd som ',
-+	'sv' => '      även känd som ',
- 	'tr' => '                den ',
--	'zh_CN' => '              亦即“',
-+	'zh_CN' => '                Ò༴ ',
- 	'zh_TW' => '                ¥ç§Y '
- );
- my %gpg_bad = (
--	'be' => 'нерэчаісны хэш-альгарытм ',
-+	'be' => '',
- 	'ca' => 'Signatura INCORRECTA de ',
- 	'cs' => '©PATNÝ podpis od ',
- 	'da' => 'DÅRLIG signatur fra ',
-@@ -446,21 +450,22 @@
- 	'es' => 'Firma INCORRECTA de ',
- 	'et' => 'HALB allkiri kasutajalt ',
- 	'fi' => 'VÄÄRÄ allekirjoitus lähettäjältä ',
--	'fr' => 'MAUVAISE signature de « ',
-+	'fr' => 'MAUVAISE signature de ',
- 	'gl' => 'Sinatura INCORRECTA de',
- 	'hu' => 'ROSSZ aláírás a következõtõl: ',
- 	'id' => 'signature BURUK dari ',
- 	'it' => 'Firma NON corretta da ',
--	'ja' => '¡È',
-+	'ja' => 'ÉÔÀµ¤Ê ½ð̾: ',
-+	'nl' => 'SLECHTE ondertekening van ',
- 	'pl' => 'NIEPOPRAWNY podpis z³o¿ony przez ',
- 	'pt' => 'Assinatura INCORRECTA de ',
- 	'pt_BR' => 'Assinatura INCORRETA de ',
- 	'ro' => 'Semnãturã INCORECTÃ din ',
- 	'ru' => 'ПЛОХАЯ подпись от ',
- 	'sk' => 'ZLÝ podpis od ',
--	'sv' => 'FELAKTIG signatur från ',
-+	'sv' => 'FELAKTIG signatur från ',
- 	'tr' => 'KÖTÜ imza: ',
--	'zh_CN' => '已损坏的签字，来自于“',
-+	'zh_CN' => 'ÒÑË𻵵ÄÇ©×Ö£¬À´×ÔÓÚ',
- 	'zh_TW' => '*·lÃa* ªºÃ±³¹¨Ó¦Û©ó '
- );
- my %gpg_expired = (
-@@ -479,20 +484,21 @@
- 	'hu' => 'Megjegyzés: Ez a kulcs lejárt!',
- 	'id' => 'Catatan: Kunci ini telah berakhir!',
- 	'it' => 'Nota: questa chiave è scaduta!',
--	'ja' => 'Ãí°Õ: ¤³¤Î¸°¤ÏËþλ¤Ç¤¹!',
-+	'ja' => 'Ãí°Õ: ¤³¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹!',
-+	'nl' => 'Let op: Deze sleutel is verlopen!',
- 	'pl' => 'Uwaga: Data wa¿no¶ci tego klucza up³ynê³a!',
- 	'pt' => 'Nota: Esta chave expirou!',
- 	'pt_BR' => 'Nota: Esta chave expirou!',
- 	'ro' => 'Notã: Aceastã cheie a expirat!',
- 	'ru' => 'ПРЕДУПРЕЖДАЮ: Данный ключ просрочен!',
- 	'sk' => 'Poznámka: Skonèila platnos» tohto kµúèa!',
--	'sv' => 'Obs: Giltighetstiden för denna nyckel har gått ut!',
-+	'sv' => 'Notera: Denna nyckel har gått ut!',
- 	'tr' => 'Bilgi: Bu anahtarın kullanım süresi dolmuştu!',
--	'zh_CN' => '注意：这把密钥已经过期了！',
-+	'zh_CN' => '×¢Ò⣺Õâ°ÑÃÜÔ¿ÒѾ­¹ýÆÚÁË£¡',
- 	'zh_TW' => '½Ðª`·N¡G³o§âª÷Æ_¤w¸g¹L´Á¤F¡I'
- );
- my %gpg_good = (
--	'be' => 'нерэчаісны хэш-альгарытм ',
-+	'be' => '',
- 	'ca' => 'Signatura correcta de ',
- 	'cs' => 'Dobrý podpis od ',
- 	'da' => 'God signatur fra ',
-@@ -502,21 +508,22 @@
- 	'es' => 'Firma correcta de ',
- 	'et' => 'Korrektne allkiri kasutajalt ',
- 	'fi' => 'Allekirjoitus täsmää lähettäjään ',
--	'fr' => 'Bonne signature de « ',
-+	'fr' => 'Bonne signature de ',
- 	'gl' => 'Sinatura correcta de ',
- 	'hu' => 'Jó aláírás a következõtõl: ',
- 	'id' => 'Signature baik dari ',
- 	'it' => 'Firma valida da ',
--	'ja' => '¡È',
-+	'ja' => 'Àµ¤·¤¤½ð̾: ',
-+	'nl' => 'Goede ondertekening van ',
- 	'pl' => 'Poprawny podpis z³o¿ony przez ',
- 	'pt' => 'Assinatura correcta de ',
- 	'pt_BR' => 'Assinatura correta de ',
- 	'ro' => 'Semnãturã bunã din ',
- 	'ru' => 'Действительная подпись от ',
- 	'sk' => 'Dobrý podpis od ',
--	'sv' => 'Korrekt signatur från ',
-+	'sv' => 'Korrekt signatur från ',
- 	'tr' => 'Kullanıcı kimliği: ',
--	'zh_CN' => '完好的签字，来自于“',
-+	'zh_CN' => 'ÍêºÃµÄÇ©×Ö£¬À´×ÔÓÚ',
- 	'zh_TW' => '§¹¦nªºÃ±³¹¨Ó¦Û©ó '
- );
- my %gpg_bug = (
-@@ -536,15 +543,16 @@
- 	'id' => '... kesalahan (',
- 	'it' => '... questo è un bug (',
- 	'ja' => '... ¥Ð¥°¤Ç¤¹ (',
-+	'nl' => '... dit is een softwarefout (',
- 	'pl' => '... to jest b³±d programu (',
- 	'pt' => '... isto é um bug (',
- 	'pt_BR' => '... isto é um bug (',
- 	'ro' => '... acesta este un bug (',
- 	'ru' => ' ... это ошибка (',
- 	'sk' => '... toto je chyba v programe (',
--	'sv' => '... detta är ett fel i programmet (',
-+	'sv' => '... detta är ett fel i programmet (',
- 	'tr' => '... bu bir yazılım hatası (',
--	'zh_CN' => '……这是个程序缺陷(',
-+	'zh_CN' => '¡­¡­ÕâÊǸö³ÌÐòȱÏÝ(',
- 	'zh_TW' => '... ³o¬O­Ó·å²« ('
- );
- # }}}
diff --git a/contrib/t-prot-r1.213-gpg126.diff b/contrib/t-prot-r1.213-gpg126.diff
deleted file mode 100644
index b2de292..0000000
--- a/contrib/t-prot-r1.213-gpg126.diff
+++ /dev/null
@@ -1,210 +0,0 @@
---- t-prot	Fri Dec 31 14:45:11 2004
-+++ t-prot-g126	Sat Jan  8 11:47:14 2005
-@@ -325,10 +325,10 @@
- $mutt_pgpoutstart       = '[-- PGP output follows (current time:';
- $mutt_pgpoutend         = '[-- End of PGP output --]';
- 
--# gpg's locales as in gpg-1.4.0 {{{
-+# gpg's locales as in gpg-1.2.6 {{{
- my %gpg_WARNING = (
- 	'be' => '',
--	'ca' => 'AV�S: ',
-+	'ca' => 'AVÍS: ',
- 	'cs' => 'VAROVÁNÍ: ',
- 	'da' => 'ADVARSEL: ',
- 	'de' => 'WARNUNG: ',
-@@ -343,6 +343,7 @@
- 	'id' => 'PERINGATAN: ',
- 	'it' => 'ATTENZIONE: ',
- 	'ja' => '·Ù¹ð: ',
-+	'nl' => 'WAARSCHUWING: ',
- 	'pl' => 'OSTRZE¯ENIE: ',
- 	'pt' => 'AVISO: ',
- 	'pt_BR' => 'AVISO: ',
-@@ -351,12 +352,12 @@
- 	'sk' => 'VAROVANIE: ',
- 	'sv' => 'VARNING: ',
- 	'tr' => 'UYARI: ',
--	'zh_CN' => '警告：我们不信任这把密钥！',
--	'zh_TW' => 'ĵ§i¡G§Ú­Ì *¤£* «H¥ô³o§âª÷Æ_¡I'
-+	'zh_CN' => '¾¯¸æ£ºÎÒÃDz»ÐÅÈÎÕâ°ÑÃÜÔ¿£¡\n',
-+	'zh_TW' => 'ĵ§i¡G§Ú­Ì *¤£* «H¥ô³o§âª÷Æ_¡I\n'
- );
- my %gpg_Warning = (
- 	'be' => '',
--	'ca' => 'AV�S: ',
-+	'ca' => 'AVÍS: ',
- 	'cs' => 'VAROVÁNÍ: ',
- 	'da' => '',
- 	'de' => 'Warnung: ',
-@@ -371,6 +372,7 @@
- 	'id' => 'PERINGATAN: ',
- 	'it' => 'ATTENZIONE: ',
- 	'ja' => '·Ù¹ð: ',
-+	'nl' => 'WAARSCHUWING: ',
- 	'pl' => 'OSTRZE¯ENIE: ',
- 	'pt' => 'CUIDADO: ',
- 	'pt_BR' => 'CUIDADO: ',
-@@ -379,8 +381,8 @@
- 	'sk' => 'VAROVANIE: ',
- 	'sv' => 'VARNING: ',
- 	'tr' => 'UYARI: ',
--	'zh_CN' => '警告：加密过的报文已经变造！',
--	'zh_TW' => 'ĵ§i¡G¥[±K¹Lªº°T®§¤w¸g³QÅܳy¤F¡I'
-+	'zh_CN' => '¾¯¸æ£º¼ÓÃܹýµÄ±¨ÎÄÒѾ­±äÔ죡\n',
-+	'zh_TW' => 'ĵ§i¡G¥[±K¹Lªº°T®§¤w¸g³QÅܳy¤F¡I\n'
- );
- my %gpg_Cantcheck = (
- 	'be' => '',
-@@ -399,6 +401,7 @@
- 	'id' => 'Tidak dapat memeriksa signature: ',
- 	'it' => 'Impossibile controllare la firma: ',
- 	'ja' => '½ð̾¤ò¸¡ºº¤Ç¤­¤Þ¤»¤ó: ',
-+	'nl' => 'Kan ondertekening niet controleren: ',
- 	'pl' => 'Nie mo¿na sprawdziæ podpisu: ',
- 	'pt' => 'Impossível verificar assinatura: ',
- 	'pt_BR' => 'Impossível verificar assinatura: ',
-@@ -407,7 +410,7 @@
- 	'sk' => 'Nemô¾em overi» podpis: ',
- 	'sv' => 'Kan inte verifiera signaturen: ',
- 	'tr' => 'Ä°mza kontrol edilemedi: ',
--	'zh_CN' => '无法检查签字：',
-+	'zh_CN' => 'ÎÞ·¨¼ì²éÇ©×Ö£º',
- 	'zh_TW' => 'µLªkÀˬdñ³¹¡G '
- );
- my %gpg_aka = (
-@@ -420,23 +423,24 @@
- 	'eo' => '            alinome ',
- 	'es' => '                alias ',
- 	'et' => '                 ka ',
--	'fr' => '                alias « ',
-+	'fr' => '              alias ',
- 	'gl' => '               alias ',
- 	'hu' => '               azaz ',
- 	'id' => '              alias ',
- 	'it' => '                alias ',
--	'ja' => '                ÊÌ̾¡È',
-+	'ja' => '       ÊÌ̾ ',
-+	'nl' => '                alias ',
- 	'pl' => '                        alias ',
- 	'pt' => '                   ou ',
- 	'pt_BR' => '                   ou ',
- 	'sk' => '                alias ',
--	'sv' => '      även känd som ',
-+	'sv' => '      även känd som ',
- 	'tr' => '                den ',
--	'zh_CN' => '              亦即“',
-+	'zh_CN' => '                Ò༴ ',
- 	'zh_TW' => '                ¥ç§Y '
- );
- my %gpg_bad = (
--	'be' => 'нерэчаісны хэш-альгарытм ',
-+	'be' => '',
- 	'ca' => 'Signatura INCORRECTA de ',
- 	'cs' => '©PATNÝ podpis od ',
- 	'da' => 'DÅRLIG signatur fra ',
-@@ -446,21 +450,22 @@
- 	'es' => 'Firma INCORRECTA de ',
- 	'et' => 'HALB allkiri kasutajalt ',
- 	'fi' => 'VÄÄRÄ allekirjoitus lähettäjältä ',
--	'fr' => 'MAUVAISE signature de « ',
-+	'fr' => 'MAUVAISE signature de ',
- 	'gl' => 'Sinatura INCORRECTA de',
- 	'hu' => 'ROSSZ aláírás a következõtõl: ',
- 	'id' => 'signature BURUK dari ',
- 	'it' => 'Firma NON corretta da ',
--	'ja' => '¡È',
-+	'ja' => 'ÉÔÀµ¤Ê ½ð̾: ',
-+	'nl' => 'SLECHTE ondertekening van ',
- 	'pl' => 'NIEPOPRAWNY podpis z³o¿ony przez ',
- 	'pt' => 'Assinatura INCORRECTA de ',
- 	'pt_BR' => 'Assinatura INCORRETA de ',
- 	'ro' => 'Semnãturã INCORECTÃ din ',
- 	'ru' => 'ПЛОХАЯ подпись от ',
- 	'sk' => 'ZLÝ podpis od ',
--	'sv' => 'FELAKTIG signatur från ',
-+	'sv' => 'FELAKTIG signatur från ',
- 	'tr' => 'KÖTÜ imza: ',
--	'zh_CN' => '已损坏的签字，来自于“',
-+	'zh_CN' => 'ÒÑË𻵵ÄÇ©×Ö£¬À´×ÔÓÚ',
- 	'zh_TW' => '*·lÃa* ªºÃ±³¹¨Ó¦Û©ó '
- );
- my %gpg_expired = (
-@@ -479,20 +484,21 @@
- 	'hu' => 'Megjegyzés: Ez a kulcs lejárt!',
- 	'id' => 'Catatan: Kunci ini telah berakhir!',
- 	'it' => 'Nota: questa chiave è scaduta!',
--	'ja' => 'Ãí°Õ: ¤³¤Î¸°¤ÏËþλ¤Ç¤¹!',
-+	'ja' => 'Ãí°Õ: ¤³¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹!',
-+	'nl' => 'Let op: Deze sleutel is verlopen!',
- 	'pl' => 'Uwaga: Data wa¿no¶ci tego klucza up³ynê³a!',
- 	'pt' => 'Nota: Esta chave expirou!',
- 	'pt_BR' => 'Nota: Esta chave expirou!',
- 	'ro' => 'Notã: Aceastã cheie a expirat!',
- 	'ru' => 'ПРЕДУПРЕЖДАЮ: Данный ключ просрочен!',
- 	'sk' => 'Poznámka: Skonèila platnos» tohto kµúèa!',
--	'sv' => 'Obs: Giltighetstiden för denna nyckel har gått ut!',
-+	'sv' => 'Notera: Denna nyckel har gått ut!',
- 	'tr' => 'Bilgi: Bu anahtarın kullanım süresi dolmuştu!',
--	'zh_CN' => '注意：这把密钥已经过期了！',
-+	'zh_CN' => '×¢Ò⣺Õâ°ÑÃÜÔ¿ÒѾ­¹ýÆÚÁË£¡',
- 	'zh_TW' => '½Ðª`·N¡G³o§âª÷Æ_¤w¸g¹L´Á¤F¡I'
- );
- my %gpg_good = (
--	'be' => 'нерэчаісны хэш-альгарытм ',
-+	'be' => '',
- 	'ca' => 'Signatura correcta de ',
- 	'cs' => 'Dobrý podpis od ',
- 	'da' => 'God signatur fra ',
-@@ -502,26 +508,27 @@
- 	'es' => 'Firma correcta de ',
- 	'et' => 'Korrektne allkiri kasutajalt ',
- 	'fi' => 'Allekirjoitus täsmää lähettäjään ',
--	'fr' => 'Bonne signature de « ',
-+	'fr' => 'Bonne signature de ',
- 	'gl' => 'Sinatura correcta de ',
- 	'hu' => 'Jó aláírás a következõtõl: ',
- 	'id' => 'Signature baik dari ',
- 	'it' => 'Firma valida da ',
--	'ja' => '¡È',
-+	'ja' => 'Àµ¤·¤¤½ð̾: ',
-+	'nl' => 'Goede ondertekening van ',
- 	'pl' => 'Poprawny podpis z³o¿ony przez ',
- 	'pt' => 'Assinatura correcta de ',
- 	'pt_BR' => 'Assinatura correta de ',
- 	'ro' => 'Semnãturã bunã din ',
- 	'ru' => 'Действительная подпись от ',
- 	'sk' => 'Dobrý podpis od ',
--	'sv' => 'Korrekt signatur från ',
-+	'sv' => 'Korrekt signatur från ',
- 	'tr' => 'Kullanıcı kimliği: ',
--	'zh_CN' => '完好的签字，来自于“',
-+	'zh_CN' => 'ÍêºÃµÄÇ©×Ö£¬À´×ÔÓÚ',
- 	'zh_TW' => '§¹¦nªºÃ±³¹¨Ó¦Û©ó '
- );
- my %gpg_bug = (
- 	'be' => '',
--	'ca' => '... a�� �s un bug (',
-+	'ca' => '... açò és un bug (',
- 	'cs' => '... toto je chyba v programu (',
- 	'da' => '... dette er en fejl (',
- 	'de' => '... dies ist ein Bug (Programmfehler) (',
-@@ -536,15 +543,16 @@
- 	'id' => '... kesalahan (',
- 	'it' => '... questo è un bug (',
- 	'ja' => '... ¥Ð¥°¤Ç¤¹ (',
-+	'nl' => '... dit is een softwarefout (',
- 	'pl' => '... to jest b³±d programu (',
- 	'pt' => '... isto é um bug (',
- 	'pt_BR' => '... isto é um bug (',
- 	'ro' => '... acesta este un bug (',
- 	'ru' => ' ... это ошибка (',
- 	'sk' => '... toto je chyba v programe (',
--	'sv' => '... detta är ett fel i programmet (',
-+	'sv' => '... detta är ett fel i programmet (',
- 	'tr' => '... bu bir yazılım hatası (',
--	'zh_CN' => '……这是个程序缺陷(',
-+	'zh_CN' => '¡­¡­ÕâÊǸö³ÌÐòȱÏÝ(',
- 	'zh_TW' => '... ³o¬O­Ó·å²« ('
- );
- # }}}
diff --git a/contrib/t-prot-r1.217-mutt157.diff b/contrib/t-prot-r1.217-mutt157.diff
deleted file mode 100644
index 0e013fa..0000000
--- a/contrib/t-prot-r1.217-mutt157.diff
+++ /dev/null
@@ -1,345 +0,0 @@
---- t-prot	Wed Feb  2 13:22:52 2005
-+++ t-prot-M157	Wed Feb  2 14:21:06 2005
-@@ -31,7 +31,7 @@
- 
-     $mutt_attachment $mutt_contenttype $mutt_pgpsigned $mutt_beginsigned
-     $mutt_pgpclearsigned $mutt_pgpclearsigstart $mutt_pgpencrypted
--    $mutt_pgpoutstart $mutt_pgpoutend
-+    $mutt_pgpoutstart $mutt_pgpoutend $mutt_ssloutstart $mutt_ssloutend
- );
- 
- 
-@@ -57,9 +57,9 @@
- $msg_ratio      = "Blocked by $0: This message has been rejected because of excessive quoting. Please see http://learn.to/quote/ and http://www.escape.de/users/tolot/mutt/ for more info. Have a nice day!\n";
- # end of user adjusted vals
- 
--# mutt's locales as in mutt-1.3.28 up to mutt-1.4.2.1 {{{
-+# mutt's locales as in mutt-1.5.7 {{{
- my %mutt_attachment = (
--	'bg' => '[-- Ïðèêà÷åí ôàéë: #',
-+	'bg' => '[-- Ïðèëîæåíèå: #',
- 	'ca' => '[-- Fitxer adjunt #',
- 	'cs' => '[-- Pøíloha #',
- 	'da' => '[-- Brevdel #',
-@@ -117,31 +117,31 @@
- my %mutt_pgpsigned = (
- 	'bg' => '[-- Êðàé íà ïîäïèñàíèòå äàííè --]',
- 	'ca' => '[-- Final de les dades signades. --]',
--	'cs' => '',
-+	'cs' => '[-- Konec podepsaných dat --]',
- 	'da' => '[-- Slut på underskrevne data --]',
- 	'de' => '[-- Ende der signierten Daten --]',
--	'el' => '[-- ÔÝëïò äåäïìÝíùí õðïãåãñáììÝíùí --]',
-+	'el' => '[-- ÔÝëïò õðïãåãñáììÝíùí äåäïìÝíùí --]',
- 	'eo' => '[-- Fino de subskribitaj datenoj --]',
--	'es' => '',
-+	'es' => '[-- Fin de datos firmados --]',
- 	'et' => '[-- Allkirjastatud info lõpp --]',
- 	'fr' => '[-- Fin des données signées --]',
--	'gl' => '',
--	'hu' => '',
-+	'gl' => '[-- Fin dos datos asinados --]',
-+	'hu' => '[-- Aláírt adat vége --]',
- 	'id' => '[-- Akhir data yang ditandatangani --]',
- 	'it' => '[-- Fine dei dati firmati --]',
- 	'ja' => '[-- ½ð̾¥Ç¡¼¥¿½ªÎ» --]',
--	'ko' => '[-- ¼­¸í ÀÚ·á ³¡ --]',
--	'lt' => '',
--	'nl' => '',
-+	'ko' => '[-- ¼­¸í ÀÚ·áÀÇ ³¡ --]',
-+	'lt' => '[-- Pasiraðytø duomenø pabaiga --]',
-+	'nl' => '[-- Einde van ondertekende gegevens --]',
- 	'pl' => '[-- Koniec podpisanych danych --]',
--	'pt_BR' => '',
-+	'pt_BR' => '[-- Fim dos dados assinados --]',
- 	'ru' => '[-- ëÏÎÅà ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]',
--	'sk' => '',
-+	'sk' => '[-- Koniec dát s podpisom PGP/MIME --]',
- 	'sv' => '[-- Slut på signerat data --]',
--	'tr' => '',
-+	'tr' => '[-- Imzalanmýþ bilginin sonu --]',
- 	'uk' => '[-- ë¦ÎÅÃØ Ð¦ÄÐÉÓÁÎÉÈ ÄÁÎÉÈ --]',
--	'zh_CN' => '',
--	'zh_TW' => ''
-+	'zh_CN' => '[-- Ç©ÊðµÄ×ÊÁϽáÊø --]',
-+	'zh_TW' => '[-- 簽署的資料結束 --]',
- );
- my %mutt_beginsigned = (
-     'bg' => '[-- Ñëåäíèòå äàííè ñà ïîäïèñàíè --]',
-@@ -161,7 +161,7 @@
-     'ja' => '[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï½ð̾¤µ¤ì¤Æ¤¤¤ë --]',
-     'ko' => '[-- ¾Æ·¡ÀÇ ÀÚ·á´Â ¼­¸í µÇ¾úÀ½ --]',
-     'lt' => '[-- Toliau einantys duomenys yra pasiraðyti --]',
--    'nl' => '[-- De volgende gegevens zijn PGP/MIME ondertekend --]',
-+    'nl' => '[-- De volgende gegevens zijn ondertekend --]',
-     'pl' => '[-- Poni¿sze dane s± podpisane --]',
-     'pt_BR' => '[-- Os dados a seguir estão assinados --]',
-     'ru' => '[-- îÁÞÁÌÏ ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]',
-@@ -173,9 +173,9 @@
-     'zh_TW' => '[-- 以下的資料已被簽署 --]',
- );
- my %mutt_pgpencrypted = (
--	'bg' => '[-- Êðàé íà PGP/MIME øèôðîâàíèòå äàííè --]',
-+	'bg' => '[-- Êðàé íà øèôðîâàíèòå ñ PGP/MIME äàííè --]',
- 	'ca' => '[-- Final de les dades xifrades amb PGP/MIME. --]',
--	'cs' => '',
-+	'cs' => '[-- Konec dat za¹ifrovaných ve formátu PGP/MIME --]',
- 	'da' => '[-- Slut på PGP/MIME-krypteret data --]',
- 	'de' => '[-- Ende der PGP/MIME-verschlüsselten Daten --]',
- 	'el' => '[-- ÔÝëïò äåäïìÝíùí êñõðôïãñáöçìÝíùí ìÝóù PGP/MIME --]',
-@@ -184,18 +184,18 @@
- 	'et' => '[-- PGP/MIME krüptitud info lõpp --]',
- 	'fr' => '[-- Fin des données chiffrées avec PGP/MIME --]',
- 	'gl' => '',
--	'hu' => '',
-+	'hu' => '[-- PGP/MIME titkosított adat vége --]',
- 	'id' => '[-- Akhir data yang dienkripsi dg PGP/MIME --]',
- 	'it' => '[-- Fine dei dati cifrati con PGP/MIME  --]',
--	'ja' => '[-- PGP/MIME°Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]',
-+	'ja' => '[-- PGP/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]',
- 	'ko' => '[-- PGP/MIME ¾Ïȣȭ ÀÚ·á ³¡ --]',
- 	'lt' => '',
--	'nl' => '',
-+	'nl' => '[-- Einde van PGP/MIME versleutelde data --]',
- 	'pl' => '[-- Koniec danych zaszyfrowanych PGP/MIME --]',
- 	'pt_BR' => '',
- 	'ru' => '[-- ëÏÎÅà ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]',
- 	'sk' => '',
--	'sv' => '[-- Slut på data krypterad enligt PGP/MIME --]',
-+	'sv' => '[-- Slut på PGP/MIME-krypterad data --]',
- 	'tr' => '',
- 	'uk' => '[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]',
- 	'zh_CN' => '',
-@@ -204,32 +204,32 @@
- my %mutt_pgpclearsigned = (
- 	'bg' => '[-- ÊÐÀÉ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎÒÎ ÏÈÑÌÎ --]',
- 	'ca' => '[-- TERMINA EL MISSATGE PGP SIGNAT --]',
--	'cs' => '',
-+	'cs' => '[-- KONEC PODEPSANÉ PGP ZPRÁVY --]',
- 	'el' => '[-- ÔÅËÏÓ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]',
- 	'eo' => '[-- FINO DE PGP-SUBSKRIBITA MESAØO --]',
- 	'es' => '',
- 	'et' => '[-- PGP ALLKIRJASTATUD TEATE LÕPP --]',
- 	'fr' => '[-- FIN DE MESSAGE SIGNÉ PGP --]',
- 	'gl' => '',
--	'hu' => '',
-+	'hu' => '[-- PGP ALÁÍRT LEVÉL VÉGE --]',
- 	'id' => '[-- AKHIR PESAN DG TANDATANGAN PGP --]',
- 	'it' => '[-- FINE DEL MESSAGGIO FIRMATO CON PGP --]',
--	'ja' => '[-- PGP½ð̾¥á¥Ã¥»¡¼¥¸½ªÎ» --]',
-+	'ja' => '[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸½ªÎ» --]',
- 	'ko' => '[-- PGP ¼­¸í ¸ÞÀÏ ³¡ --]',
- 	'lt' => '',
--	'nl' => '',
-+	'nl' => '[-- EINDE PGP ONDERTEKEND BERICHT --]',
- 	'pl' => '[-- KONIEC LISTU PODPISANEGO PGP --]',
- 	'pt_BR' => '',
- 	'ru' => '[-- ëÏÎÅà ÓÏÏÂÝÅÎÉÑ, ÐÏÄÐÉÓÁÎÎÏÇÏ PGP --]',
- 	'sk' => '',
--	'sv' => '[-- SLUT PÅ MEDDELANDE SIGNERAT MED PGP --]',
-+	'sv' => '[-- SLUT PÅ PGP-SIGNERAT MEDDELANDE --]',
- 	'tr' => '',
- 	'uk' => '[-- ë¦ÎÅÃØ ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]',
- 	'zh_CN' => '',
- 	'zh_TW' => ''
- );
- my %mutt_pgpclearsigstart = (
--	'bg' => '[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎÒÎ ÏÈÑÌÎ --]',
-+	'bg' => '[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎ ÏÈÑÌÎ --]',
- 	'ca' => '[-- COMENÇA EL MISSATGE PGP SIGNAT --]',
- 	'cs' => '[-- ZAÈÁTEK PODEPSANÉ PGP ZPRÁVY --]',
- 	'el' => '[-- ÅÍÁÑÎÇ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]',
-@@ -241,7 +241,7 @@
- 	'hu' => '[-- PGP ALÁÍRT LEVÉL KEZDÕDIK --]',
- 	'id' => '[-- AWAL SURAT DG TANDATANGAN PGP --]',
- 	'it' => '[-- INIZIO DEL MESSAGGIO FIRMATO CON PGP --]',
--	'ja' => '[-- PGP½ð̾¥á¥Ã¥»¡¼¥¸³«»Ï --]',
-+	'ja' => '[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸³«»Ï --]',
- 	'ko' => '[-- PGP ¼­¸í ¸ÞÀÏ ½ÃÀÛ --]',
- 	'lt' => '[-- PGP PASIRAÐYTO LAIÐKO PRADÞIA --]',
- 	'nl' => '[-- BEGIN PGP ONDERTEKEND BERICHT --]',
-@@ -249,36 +249,36 @@
- 	'pt_BR' => '[-- INÍCIO DE MENSAGEM ASSINADA POR PGP --]',
- 	'ru' => '[-- îÁÞÁÌÏ ÓÏÏÂÝÅÎÉÑ, ÐÏÄÐÉÓÁÎÎÏÇÏ PGP --]',
- 	'sk' => '[-- ZAÈIATOK SPRÁVY PODPÍSANEJ S PGP --]',
--	'sv' => '[-- MEDDELANDE SIGNERAT MED PGP BÖRJAR --]',
-+	'sv' => '[-- START PÅ PGP-SIGNERAT MEDDELANDE --]',
- 	'tr' => '[-- PGP IMZALANMIÞ ILETI BAÞI --]',
- 	'uk' => '[-- ðÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]',
- 	'zh_CN' => '[-- PGP Ç©ÃûµÄÐżþ¿ªÊ¼ --]',
- 	'zh_TW' => '[-- PGP 簽名的信件開始 --]'
- );
- my %mutt_pgpoutstart = (
--	'bg' => '[-- ñëåäâà ðåçóëòàòà îò PGP (òåêóùî âåìå: ',
--	'ca' => '[-- Aquesta és l\'eixida de PGP (data actual: ',
--	'cs' => '[-- následuje výstup PGP (aktuální èas: ',
-+	'bg' => '[-- ñëåäâà ðåçóëòàòúòPGP) --]',
-+	'ca' => '[-- Aquesta és l\'eixida de PGP',
-+	'cs' => '[-- následuje výstup PGP ',
- 	'da' => '[-- PGP-uddata følger (aktuelt tidspunkt: ',
--	'de' => '[-- PGP-Ausgabe folgt (aktuelle Zeit: ',
--	'el' => '[-- Áêïëïõèåß Ýîïäïò ôïõ PGP (ôñÝ÷ïõóá þñá: ',
--	'eo' => '[-- Eligo de PGP sekvas (nuna horo: ',
-+	'de' => '[-- PGP Ausgabe folgt',
-+	'el' => '[-- PGP áêïëïõèåß Ýîïäïò',
-+	'eo' => '[-- PGP eligo sekvas',
- 	'es' => '[-- Salida de PGP a continuación (tiempo actual: ',
--	'et' => '[-- järgneb PGP väljund (praegune aeg: ',
--	'fr' => '[-- La sortie PGP suit (heure courante : ',
-+	'et' => '[-- järgneb PGP väljund',
-+	'fr' => '[-- La sortie PGP suit',
- 	'gl' => '[-- Saída PGP a continuación (hora actual: ',
--	'hu' => '[-- PGP kimenet következik (idõ: ',
--	'id' => '[-- Keluaran dari PGP (waktu skrg: ',
--	'it' => '[-- Segue l\'output di PGP (ora attuale: ',
--	'ja' => '[-- PGP ½ÐÎϤϰʲ¼¤ÎÄ̤ê (¸½ºß»þ¹ï: ',
--	'ko' => '[-- PGP Ãâ·Â (ÇöÀç ½Ã°£: ',
-+	'hu' => '[-- PGP kimenet következik',
-+	'id' => '[-- Keluaran dari PGP',
-+	'it' => '[-- Segue l\'output di PGP',
-+	'ja' => '[-- PGP ½ÐÎϤϰʲ¼¤ÎÄ̤ê',
-+	'ko' => '[-- PGP Ãâ·Â °á°ú ',
- 	'lt' => '[-- Toliau PGP iðvestis (esamas laikas: ',
--	'nl' => '[-- PGP uitvoer volgt (Huidige tijd: ',
--	'pl' => '[-- Wynik dzia³ania PGP (bie¿±ca data i czas: ',
-+	'nl' => '[-- PGP uitvoer volgt',
-+	'pl' => '[-- Wynik dzia³ania PGP ',
- 	'pt_BR' => '[-- Saída do PGP a seguir (hora atual: ',
--	'ru' => '[-- òÅÚÕÌØÔÁÔ ÒÁÂÏÔÙ ÐÒÏÇÒÁÍÍÙ PGP (ÔÅËÕÝÅÅ ×ÒÅÍÑ: ',
-+	'ru' => '[-- òÅÚÕÌØÔÁÔ ÒÁÂÏÔÙ ÐÒÏÇÒÁÍÍÙ PGP',
- 	'sk' => '[-- Nasleduje výstup PGP (aktuálny èas: ',
--	'sv' => '[-- Utdata från PGP följer (aktuell tid: ',
-+	'sv' => '[-- PGP utdata följer',
- 	'tr' => '[-- PGP geri verisi (geçerli zaman: ',
- 	'uk' => '[-- ÔÅËÓÔ ÎÁ ×ÉÈÏĦ PGP (ÞÁÓ: ',
- 	'zh_CN' => '[-- ÒÔÏÂΪ PGP Êä³öµÄ×ÊÁÏ£¨ÏÖÔÚʱ¼ä£º ',
-@@ -299,7 +299,7 @@
- 	'hu' => '[-- PGP kimenet vége --]',
- 	'id' => '[-- Akhir keluaran PGP --]',
- 	'it' => '[-- Fine dell\'output di PGP --]',
--	'ja' => '[-- PGP½ÐÎϽªÎ» --]',
-+	'ja' => '[-- PGP ½ÐÎϽªÎ» --]',
- 	'ko' => '[-- PGP Ãâ·Â ³¡ --]',
- 	'lt' => '[-- PGP iðvesties pabaiga --]',
- 	'nl' => '[-- Einde van PGP uitvoer --]',
-@@ -307,7 +307,64 @@
- 	'pt_BR' => '[-- Fim da saída do PGP --]',
- 	'ru' => '[-- ëÏÎÅà ×Ù×ÏÄÁ ÐÒÏÇÒÁÍÍÙ PGP --]',
- 	'sk' => '[-- Koniec výstupu PGP --]',
--	'sv' => '[-- Slut på utdata från PGP --]',
-+	'sv' => '[-- Slut på PGP-utdata --]',
-+	'tr' => '[-- PGP geri verisi sonu --]',
-+	'uk' => '[-- ë¦ÎÅÃØ ÔÅËÓÔÕ ÎÁ ×ÉÈÏĦ PGP --]',
-+	'zh_CN' => '[-- PGP Êä³ö²¿·Ý½áÊø --]',
-+	'zh_TW' => '[-- PGP 輸出部份結束 --]'
-+);
-+my %mutt_ssloutstart = (
-+	'bg' => '[-- ñëåäâà ðåçóëòàòúòOpenSSL) --]',
-+	'ca' => '[-- Aquesta és l\'eixida de OpenSSL',
-+	'cs' => '[-- následuje výstup OpenSSL ',
-+	'da' => '[-- PGP-uddata følger (aktuelt tidspunkt: ',
-+	'de' => '[-- OpenSSL Ausgabe folgt',
-+	'el' => '[-- OpenSSL áêïëïõèåß Ýîïäïò',
-+	'eo' => '[-- OpenSSL eligo sekvas',
-+	'es' => '[-- Salida de PGP a continuación (tiempo actual: ',
-+	'et' => '[-- järgneb OpenSSL väljund',
-+	'fr' => '[-- La sortie OpenSSL suit',
-+	'gl' => '[-- Saída PGP a continuación (hora actual: ',
-+	'hu' => '[-- OpenSSL kimenet következik',
-+	'id' => '[-- Keluaran dari OpenSSL',
-+	'it' => '[-- Segue l\'output di OpenSSL',
-+	'ja' => '[-- OpenSSL ½ÐÎϤϰʲ¼¤ÎÄ̤ê',
-+	'ko' => '[-- OpenSSL Ãâ·Â °á°ú ',
-+	'lt' => '[-- Toliau PGP iðvestis (esamas laikas: ',
-+	'nl' => '[-- OpenSSL uitvoer volgt',
-+	'pl' => '[-- Wynik dzia³ania OpenSSL ',
-+	'pt_BR' => '[-- Saída do PGP a seguir (hora atual: ',
-+	'ru' => '[-- òÅÚÕÌØÔÁÔ ÒÁÂÏÔÙ ÐÒÏÇÒÁÍÍÙ OpenSSL',
-+	'sk' => '[-- Nasleduje výstup PGP (aktuálny èas: ',
-+	'sv' => '[-- OpenSSL utdata följer',
-+	'tr' => '[-- PGP geri verisi (geçerli zaman: ',
-+	'uk' => '[-- ÔÅËÓÔ ÎÁ ×ÉÈÏĦ PGP (ÞÁÓ: ',
-+	'zh_CN' => '[-- ÒÔÏÂΪ PGP Êä³öµÄ×ÊÁÏ£¨ÏÖÔÚʱ¼ä£º ',
-+	'zh_TW' => '[-- 以下為 PGP 輸出的資料（現在時間：'
-+);
-+my %mutt_ssloutend = (
-+	'bg' => '[-- Êðàé íà OpenSSL-ðåçóëòàòà --]',
-+	'ca' => '[-- Final de l\'eixida d\'OpenSSL. --]',
-+	'cs' => '[-- Konec OpenSSL výstupu --]',
-+	'da' => '[-- Slut på PGP-uddata --]',
-+	'de' => '[-- Ende der OpenSSL-Ausgabe --]',
-+	'el' => '[-- ÔÝëïò ôçò åîüäïõ OpenSSL --]',
-+	'eo' => '[-- Fino de OpenSSL-eligo --]',
-+	'es' => '[-- Fin de salida PGP --]',
-+	'et' => '[-- OpenSSL väljundi lõpp --]',
-+	'fr' => '[-- Fin de sortie OpenSSL --]',
-+	'hu' => '[-- OpenSSL kimenet vége --]',
-+	'id' => '[-- Akhir keluaran OpenSSL --]',
-+	'it' => '[-- Fine dell\'output di OpenSSL --]',
-+	'ja' => '[-- OpenSSL ½ÐÎϽªÎ» --]',
-+	'ko' => '[-- OpenSSL Ãâ·Â ³¡ --]',
-+	'lt' => '[-- PGP iðvesties pabaiga --]',
-+	'nl' => '[-- Einde van OpenSSL uitvoer --]',
-+	'pl' => '[-- Koniec komunikatów OpenSSL --]',
-+	'pt_BR' => '[-- Fim da saída do PGP --]',
-+	'ru' => '[-- ëÏÎÅà ×Ù×ÏÄÁ ÐÒÏÇÒÁÍÍÙ OpenSSL --]',
-+	'sk' => '[-- Koniec výstupu PGP --]',
-+	'sv' => '[-- Slut på utdata från OpenSSL --]',
- 	'tr' => '[-- PGP geri verisi sonu --]',
- 	'uk' => '[-- ë¦ÎÅÃØ ÔÅËÓÔÕ ÎÁ ×ÉÈÏĦ PGP --]',
- 	'zh_CN' => '[-- PGP Êä³ö²¿·Ý½áÊø --]',
-@@ -324,6 +381,8 @@
- $mutt_pgpencrypted      = '[-- End of PGP/MIME encrypted data --]';
- $mutt_pgpoutstart       = '[-- PGP output follows (current time:';
- $mutt_pgpoutend         = '[-- End of PGP output --]';
-+$mutt_ssloutstart       = '[-- OpenSSL output follows';
-+$mutt_ssloutend         = '[-- End of OpenSSL output --]';
- 
- # gpg's locales as in gpg-1.4.0 {{{
- my %gpg_WARNING = (
-@@ -810,7 +869,7 @@
-     for (my $x=0; $x<scalar(@$L); $x++) {
-         if ($$V[$x]) { next; }
- 
--        if ($$L[$x]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o)
-+        if ($$L[$x]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutstart|$mutt_ssloutstart)/o)
-         {
-             my $from;
-             for (my $m=0; $m<scalar(@$H); $m++) {
-@@ -836,7 +895,7 @@
-                     splice(@$V, $i, 1);
-                     $i--;
-                 }
--                elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutend)/o)
-+                elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutend|$mutt_ssloutend)/o)
-                 {
-                     if ($pgpmove ||
-                         ($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i)))
-@@ -1131,7 +1190,7 @@
-                     'Forwarded message',
-                     'Weitergeleitete Nachricht / Forwarded Message');
-         my $k = 0;    # any text above?
--        my $tmp = 0;  # flagged if inside PGP output
-+        my $tmp = 0;  # flagged if inside PGP or SSL output
- 
-         DONE: for ($x=0; $x<scalar(@$lines); $x++) { 
-             if (!$vrb[$x]) {
-@@ -1152,7 +1211,8 @@
-                     ((!$spass) || $$lines[$x]!~/^$spass_prefix/o))
-                 {
-                     if ($mua eq 'mutt' && (!$tmp) &&
--                        $$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o) {
-+                        ($$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o ||
-+                         $$lines[$x] !~ /^(?:\e.+?\a)?(?:$mutt_ssloutstart)/o)) {
-                         $tmp = 1; 
-                     } elsif ($mua eq 'mutt' && $tmp && 
-                         ($$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_beginsigned)/o ||
-@@ -1461,6 +1521,8 @@
-     esc(\$mutt_pgpencrypted);
-     esc(\$mutt_pgpoutstart);
-     esc(\$mutt_pgpoutend);
-+    esc(\$mutt_ssloutstart);
-+    esc(\$mutt_ssloutend);
- 
-     esc(\$gpg_WARNING);
-     esc(\$gpg_Warning);
diff --git a/contrib/t-prot-r1.220-mutt157.diff b/contrib/t-prot-r1.220-mutt157.diff
new file mode 100644
index 0000000..46133c6
--- /dev/null
+++ b/contrib/t-prot-r1.220-mutt157.diff
@@ -0,0 +1,106 @@
+--- t-prot	Mon Feb 14 14:29:31 2005
++++ t-prot-M157	Fri Feb 11 13:53:28 2005
+@@ -32,7 +32,7 @@
+ 
+     $mutt_attachment $mutt_contenttype $mutt_pgpsigned $mutt_beginsigned
+     $mutt_pgpclearsigned $mutt_pgpclearsigstart $mutt_pgpencrypted
+-    $mutt_pgpoutstart $mutt_pgpoutend
++    $mutt_pgpoutstart $mutt_pgpoutend $mutt_ssloutstart $mutt_ssloutend
+ );
+ 
+ 
+@@ -69,6 +69,8 @@
+ $mutt_pgpencrypted      = '[-- End of PGP/MIME encrypted data --]';
+ $mutt_pgpoutstart       = '[-- PGP output follows (current time:';
+ $mutt_pgpoutend         = '[-- End of PGP output --]';
++$mutt_ssloutstart       = '[-- OpenSSL output follows';
++$mutt_ssloutend         = '[-- End of OpenSSL output --]';
+ 
+ # set the defaults to the C locale
+ $gpg_WARNING            = 'WARNING: ';
+@@ -332,7 +334,7 @@
+     for (my $x=0; $x<scalar(@$L); $x++) {
+         if ($$V[$x]) { next; }
+ 
+-        if ($$L[$x]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o)
++        if ($$L[$x]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutstart|$mutt_ssloutstart)/o)
+         {
+             my $from;
+             for (my $m=0; $m<scalar(@$H); $m++) {
+@@ -358,7 +360,7 @@
+                     splice(@$V, $i, 1);
+                     $i--;
+                 }
+-                elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutend)/o)
++                elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutend|$mutt_ssloutend)/o)
+                 {
+                     if ($pgpmove ||
+                         ($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i)))
+@@ -653,7 +655,7 @@
+                     'Forwarded message',
+                     'Weitergeleitete Nachricht / Forwarded Message');
+         my $k = 0;    # any text above?
+-        my $tmp = 0;  # flagged if inside PGP output
++        my $tmp = 0;  # flagged if inside PGP or SSL output
+ 
+         DONE: for ($x=0; $x<scalar(@$lines); $x++) { 
+             if (!$vrb[$x]) {
+@@ -674,7 +676,8 @@
+                     ((!$spass) || $$lines[$x]!~/^$spass_prefix/o))
+                 {
+                     if ($mua eq 'mutt' && (!$tmp) &&
+-                        $$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o) {
++                        ($$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o ||
++                         $$lines[$x] !~ /^(?:\e.+?\a)?(?:$mutt_ssloutstart)/o)) {
+                         $tmp = 1; 
+                     } elsif ($mua eq 'mutt' && $tmp && 
+                         ($$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_beginsigned)/o ||
+@@ -940,8 +943,8 @@
+                 Locale::gettext::gettext("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n") =~
+                 m/^([^%]*)/o;
+             ($mutt_pgpsigned) =
+-                Locale::gettext::gettext("[-- End of signed data --]\n")  =~
+-                m/^(.*?)\n/mo;
++                Locale::gettext::gettext("\n[-- End of signed data --]\n")  =~
++                m/^\n*(.*?)\n/mo;
+             ($mutt_beginsigned) =
+                 Locale::gettext::gettext("[-- The following data is signed --]\n\n") =~
+                 m/^(.*?)\n/mo;
+@@ -949,16 +952,24 @@
+                 Locale::gettext::gettext("[-- END PGP SIGNED MESSAGE --]\n") =~
+                 m/^(.*?)\n/mo;
+             ($mutt_pgpclearsigstart) =
+-                Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n") =~
++                Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n\n") =~
+                 m/^(.*?)\n/mo;
+             ($mutt_pgpencrypted) =
+                 Locale::gettext::gettext("[-- End of PGP/MIME encrypted data --]\n") =~
+                 m/^(.*?)\n/mo;
+             ($mutt_pgpoutstart) =
+-                Locale::gettext::gettext("[-- PGP output follows (current time: %c) --]\n") =~
+-                m/^([^%]*)/o;
++                Locale::gettext::gettext("[-- %s output follows%s --]\n") =~
++                m/^(.*)%s/o;
++            $mutt_pgpoutstart =~ s/%s/PGP/;
+             ($mutt_pgpoutend) =
+-                Locale::gettext::gettext("[-- End of PGP output --]\n") =~
++                Locale::gettext::gettext("[-- End of PGP output --]\n\n") =~
++                m/^(.*?)\n/mo;
++            ($mutt_ssloutstart) =
++                Locale::gettext::gettext("[-- %s output follows%s --]\n") =~
++                m/^(.*)%s/o;
++            $mutt_ssloutstart =~ s/%s/OpenSSL/;
++            ($mutt_ssloutend) =
++                Locale::gettext::gettext("[-- End of OpenSSL output --]\n\n") =~
+                 m/^(.*?)\n/mo;
+ 
+             Locale::gettext::textdomain('gnupg');
+@@ -998,6 +1009,8 @@
+     esc(\$mutt_pgpencrypted);
+     esc(\$mutt_pgpoutstart);
+     esc(\$mutt_pgpoutend);
++    esc(\$mutt_ssloutstart);
++    esc(\$mutt_ssloutend);
+ 
+     esc(\$gpg_WARNING);
+     esc(\$gpg_Warning);
diff --git a/contrib/t-prot-r1.222-gpg126.diff b/contrib/t-prot-r1.222-gpg126.diff
new file mode 100644
index 0000000..1d05254
--- /dev/null
+++ b/contrib/t-prot-r1.222-gpg126.diff
@@ -0,0 +1,22 @@
+--- t-prot	Mon Feb 14 15:17:19 2005
++++ t-prot-G126	Mon Feb 14 15:15:30 2005
+@@ -972,16 +972,16 @@
+                 Locale::gettext::gettext("Can't check signature: %s\n") =~
+                 m/^([^%]*)/o;
+             ($gpg_aka) =
+-                Locale::gettext::gettext((' 'x16).'aka "%s"') =~
++                Locale::gettext::gettext((' 'x16).'aka "') =~
+                 m/^(.*?)"/o;
+             ($gpg_bad) =
+-                Locale::gettext::gettext('BAD signature from "%s"') =~
++                Locale::gettext::gettext('BAD signature from "') =~
+                 m/^(.*?)"/o;
+             ($gpg_expired) =
+                 Locale::gettext::gettext("Note: This key has expired!\n") =~
+                 m/^(.*?)\n/mo;
+             ($gpg_good) =
+-                Locale::gettext::gettext('Good signature from "%s"') =~
++                Locale::gettext::gettext('Good signature from "') =~
+                 m/^(.*?)"/o;
+             ($gpg_bug) =
+                 Locale::gettext::gettext("... this is a bug (%s:%d:%s)\n") =~
diff --git a/t-prot b/t-prot
index 936a4ac..199daba 100755
--- a/t-prot
+++ b/t-prot
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -w
-# $Id: t-prot,v 1.218 2005/02/02 13:46:42 jochen Exp $
+# $Id: t-prot,v 1.222 2005/02/14 14:19:14 jochen Exp $
 
 require 5.006;
 use strict;
 use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
 use Getopt::Mixed qw(nextOption);
-use constant VER            => '1.49';
+use constant VER            => '1.96';
 use constant REV            => '';
-use constant REL            => q$Revision: 1.218 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL            => q$Revision: 1.222 $=~m/(\d+(?:\.\d+)+)/;
 # MTA expecting mail on STDIN
 # (you might have to adjust this if using a different MTA)
 use constant SENDMAIL       => '/usr/sbin/sendmail -oi';
@@ -17,6 +17,7 @@ use constant EX_OK          =>  0;
 use constant EX_USAGE       => 64;
 use constant EX_DATAERR     => 65;
 use constant EX_UNAVAILABLE => 69;
+use constant EX_SOFTWARE    => 70;
 use constant EX_IOERR       => 74;
 use constant EX_BOUNCE      => EX_UNAVAILABLE;
 use vars qw(
@@ -57,263 +58,7 @@ $msg_quote      = "Blocked by $0: This message has been rejected because of a fu
 $msg_ratio      = "Blocked by $0: This message has been rejected because of excessive quoting. Please see http://learn.to/quote/ and http://www.escape.de/users/tolot/mutt/ for more info. Have a nice day!\n";
 # end of user adjusted vals
 
-# mutt's locales as in mutt-1.3.28 up to mutt-1.4.2.1 {{{
-my %mutt_attachment = (
-	'bg' => '[-- Ïðèêà÷åí ôàéë: #',
-	'ca' => '[-- Fitxer adjunt #',
-	'cs' => '[-- Pøíloha #',
-	'da' => '[-- Brevdel #',
-	'de' => '[-- Anhang #',
-	'el' => '[-- ÐñïóÜñôçóç #',
-	'eo' => '[-- Parto #',
-	'es' => '[-- Archivo adjunto #',
-	'et' => '[-- Lisa #',
-	'fr' => '[-- Attachement #',
-	'gl' => '[-- Adxunto #',
-	'hu' => '[-- Melléklet #',
-	'id' => '[-- Lampiran #',
-	'it' => '[-- Allegato #',
-	'ja' => '[-- źÉÕ¥Õ¥¡¥¤¥ë #',
-	'ko' => '[-- ÷ºÎ¹° #',
-	'lt' => '[-- Priedas #',
-	'nl' => '[-- Bijlage #',
-	'pl' => '[-- Za³±cznik #',
-	'pt_BR' => '[-- Anexo No.',
-	'ru' => '[-- ÷ÌÏÖÅÎÉÅ #',
-	'sk' => '[-- Príloha #',
-	'sv' => '[-- Bilaga #',
-	'tr' => '[-- Eklenti #',
-	'uk' => '[-- äÏÄÁÔÏË ÎÏÍÅÒ ',
-	'zh_CN' => '[-- ¸½¼þ #',
-	'zh_TW' => '[-- 附件 #'
-);
-my %mutt_contenttype = (
-	'bg' => '[-- Òèï: ',
-	'ca' => '[-- Tipus: ',
-	'cs' => '[-- Typ: ',
-	'de' => '[-- Typ: ',
-	'el' => '[-- Ôýðïò: ',
-	'eo' => '[-- Speco: ',
-	'es' => '[-- Tipo: ',
-	'et' => '[-- Tüüp: ',
-	'fr' => '[-- Type : ',
-	'gl' => '[-- Tipo: ',
-	'hu' => '[-- Típus: ',
-	'id' => '[-- Jenis: ',
-	'it' => '[-- Tipo: ',
-	'ja' => '[-- ¥¿¥¤¥×: ',
-	'ko' => '[-- Á¾·ù: ',
-	'lt' => '[-- Tipas: ',
-	'pl' => '[-- Typ: ',
-	'pt_BR' => '[-- Tipo: ',
-	'ru' => '[-- ôÉÐ: ',
-	'sk' => '[-- Typ: ',
-	'sv' => '[-- Typ: ',
-	'tr' => '[-- Tip: ',
-	'uk' => '[-- ôÉÐ: ',
-	'zh_CN' => '[-- ÐÎ̬:  ',
-	'zh_TW' => '[-- 種類：'
-);
-my %mutt_pgpsigned = (
-	'bg' => '[-- Êðàé íà ïîäïèñàíèòå äàííè --]',
-	'ca' => '[-- Final de les dades signades. --]',
-	'cs' => '',
-	'da' => '[-- Slut på underskrevne data --]',
-	'de' => '[-- Ende der signierten Daten --]',
-	'el' => '[-- ÔÝëïò äåäïìÝíùí õðïãåãñáììÝíùí --]',
-	'eo' => '[-- Fino de subskribitaj datenoj --]',
-	'es' => '',
-	'et' => '[-- Allkirjastatud info lõpp --]',
-	'fr' => '[-- Fin des données signées --]',
-	'gl' => '',
-	'hu' => '',
-	'id' => '[-- Akhir data yang ditandatangani --]',
-	'it' => '[-- Fine dei dati firmati --]',
-	'ja' => '[-- ½ð̾¥Ç¡¼¥¿½ªÎ» --]',
-	'ko' => '[-- ¼­¸í ÀÚ·á ³¡ --]',
-	'lt' => '',
-	'nl' => '',
-	'pl' => '[-- Koniec podpisanych danych --]',
-	'pt_BR' => '',
-	'ru' => '[-- ëÏÎÅà ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]',
-	'sk' => '',
-	'sv' => '[-- Slut på signerat data --]',
-	'tr' => '',
-	'uk' => '[-- ë¦ÎÅÃØ Ð¦ÄÐÉÓÁÎÉÈ ÄÁÎÉÈ --]',
-	'zh_CN' => '',
-	'zh_TW' => ''
-);
-my %mutt_beginsigned = (
-    'bg' => '[-- Ñëåäíèòå äàííè ñà ïîäïèñàíè --]',
-    'ca' => '[-- Les dades següents es troben signades: --]',
-    'cs' => '[-- Následují podepsaná data --]',
-    'da' => '[-- Følgende data er underskrevet --]',
-    'de' => '[-- Die folgenden Daten sind signiert --]',
-    'el' => '[-- Ôá åðüìåíá äåäïìÝíá åßíáé õðïãåãñáììÝíá --]',
-    'eo' => '[-- La sekvaj datenoj estas subskribitaj --]',
-    'es' => '[-- Los siguientes datos están firmados --]',
-    'et' => '[-- Järgnev info on allkirjastatud --]',
-    'fr' => '[-- Les données suivantes sont signées --]',
-    'gl' => '[-- Os datos a continuación están asinados --]',
-    'hu' => '[-- A következõ adatok alá vannak írva --]',
-    'id' => '[-- Data berikut ini ditandatangani --]',
-    'it' => '[-- I seguenti dati sono firmati --]',
-    'ja' => '[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï½ð̾¤µ¤ì¤Æ¤¤¤ë --]',
-    'ko' => '[-- ¾Æ·¡ÀÇ ÀÚ·á´Â ¼­¸í µÇ¾úÀ½ --]',
-    'lt' => '[-- Toliau einantys duomenys yra pasiraðyti --]',
-    'nl' => '[-- De volgende gegevens zijn PGP/MIME ondertekend --]',
-    'pl' => '[-- Poni¿sze dane s± podpisane --]',
-    'pt_BR' => '[-- Os dados a seguir estão assinados --]',
-    'ru' => '[-- îÁÞÁÌÏ ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]',
-    'sk' => '[-- Nasledujúce dáta sú podpísané s PGP/MIME --]',
-    'sv' => '[-- Följande data är signerat --]',
-    'tr' => '[-- Bu bilgi imzalanmýþtýr --]',
-    'uk' => '[-- îÁÓÔÕÐΦ ÄÁΦ ЦÄÐÉÓÁÎÏ --]',
-    'zh_CN' => '[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]',
-    'zh_TW' => '[-- 以下的資料已被簽署 --]',
-);
-my %mutt_pgpencrypted = (
-	'bg' => '[-- Êðàé íà PGP/MIME øèôðîâàíèòå äàííè --]',
-	'ca' => '[-- Final de les dades xifrades amb PGP/MIME. --]',
-	'cs' => '',
-	'da' => '[-- Slut på PGP/MIME-krypteret data --]',
-	'de' => '[-- Ende der PGP/MIME-verschlüsselten Daten --]',
-	'el' => '[-- ÔÝëïò äåäïìÝíùí êñõðôïãñáöçìÝíùí ìÝóù PGP/MIME --]',
-	'eo' => '[-- Fino de PGP/MIME-æifritaj datenoj --]',
-	'es' => '',
-	'et' => '[-- PGP/MIME krüptitud info lõpp --]',
-	'fr' => '[-- Fin des données chiffrées avec PGP/MIME --]',
-	'gl' => '',
-	'hu' => '',
-	'id' => '[-- Akhir data yang dienkripsi dg PGP/MIME --]',
-	'it' => '[-- Fine dei dati cifrati con PGP/MIME  --]',
-	'ja' => '[-- PGP/MIME°Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]',
-	'ko' => '[-- PGP/MIME ¾Ïȣȭ ÀÚ·á ³¡ --]',
-	'lt' => '',
-	'nl' => '',
-	'pl' => '[-- Koniec danych zaszyfrowanych PGP/MIME --]',
-	'pt_BR' => '',
-	'ru' => '[-- ëÏÎÅà ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]',
-	'sk' => '',
-	'sv' => '[-- Slut på data krypterad enligt PGP/MIME --]',
-	'tr' => '',
-	'uk' => '[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]',
-	'zh_CN' => '',
-	'zh_TW' => ''
-);
-my %mutt_pgpclearsigned = (
-	'bg' => '[-- ÊÐÀÉ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎÒÎ ÏÈÑÌÎ --]',
-	'ca' => '[-- TERMINA EL MISSATGE PGP SIGNAT --]',
-	'cs' => '',
-	'el' => '[-- ÔÅËÏÓ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]',
-	'eo' => '[-- FINO DE PGP-SUBSKRIBITA MESAØO --]',
-	'es' => '',
-	'et' => '[-- PGP ALLKIRJASTATUD TEATE LÕPP --]',
-	'fr' => '[-- FIN DE MESSAGE SIGNÉ PGP --]',
-	'gl' => '',
-	'hu' => '',
-	'id' => '[-- AKHIR PESAN DG TANDATANGAN PGP --]',
-	'it' => '[-- FINE DEL MESSAGGIO FIRMATO CON PGP --]',
-	'ja' => '[-- PGP½ð̾¥á¥Ã¥»¡¼¥¸½ªÎ» --]',
-	'ko' => '[-- PGP ¼­¸í ¸ÞÀÏ ³¡ --]',
-	'lt' => '',
-	'nl' => '',
-	'pl' => '[-- KONIEC LISTU PODPISANEGO PGP --]',
-	'pt_BR' => '',
-	'ru' => '[-- ëÏÎÅà ÓÏÏÂÝÅÎÉÑ, ÐÏÄÐÉÓÁÎÎÏÇÏ PGP --]',
-	'sk' => '',
-	'sv' => '[-- SLUT PÅ MEDDELANDE SIGNERAT MED PGP --]',
-	'tr' => '',
-	'uk' => '[-- ë¦ÎÅÃØ ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]',
-	'zh_CN' => '',
-	'zh_TW' => ''
-);
-my %mutt_pgpclearsigstart = (
-	'bg' => '[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎÒÎ ÏÈÑÌÎ --]',
-	'ca' => '[-- COMENÇA EL MISSATGE PGP SIGNAT --]',
-	'cs' => '[-- ZAÈÁTEK PODEPSANÉ PGP ZPRÁVY --]',
-	'el' => '[-- ÅÍÁÑÎÇ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]',
-	'eo' => '[-- KOMENCO DE PGP-SUBSKRIBITA MESAØO --]',
-	'es' => '[-- PRINCIPIO DEL MENSAJE FIRMADO CON PGP --]',
-	'et' => '[-- PGP ALLKIRJASTATUD TEATE ALGUS --]',
-	'fr' => '[-- DÉBUT DE MESSAGE SIGNÉ PGP --]',
-	'gl' => '[-- COMEZA A MESAXE FIRMADA CON PGP --]',
-	'hu' => '[-- PGP ALÁÍRT LEVÉL KEZDÕDIK --]',
-	'id' => '[-- AWAL SURAT DG TANDATANGAN PGP --]',
-	'it' => '[-- INIZIO DEL MESSAGGIO FIRMATO CON PGP --]',
-	'ja' => '[-- PGP½ð̾¥á¥Ã¥»¡¼¥¸³«»Ï --]',
-	'ko' => '[-- PGP ¼­¸í ¸ÞÀÏ ½ÃÀÛ --]',
-	'lt' => '[-- PGP PASIRAÐYTO LAIÐKO PRADÞIA --]',
-	'nl' => '[-- BEGIN PGP ONDERTEKEND BERICHT --]',
-	'pl' => '[-- POCZ¡TEK LISTU PODPISANEGO PGP --]',
-	'pt_BR' => '[-- INÍCIO DE MENSAGEM ASSINADA POR PGP --]',
-	'ru' => '[-- îÁÞÁÌÏ ÓÏÏÂÝÅÎÉÑ, ÐÏÄÐÉÓÁÎÎÏÇÏ PGP --]',
-	'sk' => '[-- ZAÈIATOK SPRÁVY PODPÍSANEJ S PGP --]',
-	'sv' => '[-- MEDDELANDE SIGNERAT MED PGP BÖRJAR --]',
-	'tr' => '[-- PGP IMZALANMIÞ ILETI BAÞI --]',
-	'uk' => '[-- ðÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]',
-	'zh_CN' => '[-- PGP Ç©ÃûµÄÐżþ¿ªÊ¼ --]',
-	'zh_TW' => '[-- PGP 簽名的信件開始 --]'
-);
-my %mutt_pgpoutstart = (
-	'bg' => '[-- ñëåäâà ðåçóëòàòà îò PGP (òåêóùî âåìå: ',
-	'ca' => '[-- Aquesta és l\'eixida de PGP (data actual: ',
-	'cs' => '[-- následuje výstup PGP (aktuální èas: ',
-	'da' => '[-- PGP-uddata følger (aktuelt tidspunkt: ',
-	'de' => '[-- PGP-Ausgabe folgt (aktuelle Zeit: ',
-	'el' => '[-- Áêïëïõèåß Ýîïäïò ôïõ PGP (ôñÝ÷ïõóá þñá: ',
-	'eo' => '[-- Eligo de PGP sekvas (nuna horo: ',
-	'es' => '[-- Salida de PGP a continuación (tiempo actual: ',
-	'et' => '[-- järgneb PGP väljund (praegune aeg: ',
-	'fr' => '[-- La sortie PGP suit (heure courante : ',
-	'gl' => '[-- Saída PGP a continuación (hora actual: ',
-	'hu' => '[-- PGP kimenet következik (idõ: ',
-	'id' => '[-- Keluaran dari PGP (waktu skrg: ',
-	'it' => '[-- Segue l\'output di PGP (ora attuale: ',
-	'ja' => '[-- PGP ½ÐÎϤϰʲ¼¤ÎÄ̤ê (¸½ºß»þ¹ï: ',
-	'ko' => '[-- PGP Ãâ·Â (ÇöÀç ½Ã°£: ',
-	'lt' => '[-- Toliau PGP iðvestis (esamas laikas: ',
-	'nl' => '[-- PGP uitvoer volgt (Huidige tijd: ',
-	'pl' => '[-- Wynik dzia³ania PGP (bie¿±ca data i czas: ',
-	'pt_BR' => '[-- Saída do PGP a seguir (hora atual: ',
-	'ru' => '[-- òÅÚÕÌØÔÁÔ ÒÁÂÏÔÙ ÐÒÏÇÒÁÍÍÙ PGP (ÔÅËÕÝÅÅ ×ÒÅÍÑ: ',
-	'sk' => '[-- Nasleduje výstup PGP (aktuálny èas: ',
-	'sv' => '[-- Utdata från PGP följer (aktuell tid: ',
-	'tr' => '[-- PGP geri verisi (geçerli zaman: ',
-	'uk' => '[-- ÔÅËÓÔ ÎÁ ×ÉÈÏĦ PGP (ÞÁÓ: ',
-	'zh_CN' => '[-- ÒÔÏÂΪ PGP Êä³öµÄ×ÊÁÏ£¨ÏÖÔÚʱ¼ä£º ',
-	'zh_TW' => '[-- 以下為 PGP 輸出的資料（現在時間：'
-);
-my %mutt_pgpoutend = (
-	'bg' => '[-- Êðàé íà PGP-ðåçóëòàòà --]',
-	'ca' => '[-- Final de l\'eixida de PGP. --]',
-	'cs' => '[-- Konec výstupu PGP --]',
-	'da' => '[-- Slut på PGP-uddata --]',
-	'de' => '[-- Ende der PGP-Ausgabe --]',
-	'el' => '[-- ÔÝëïò ôçò åîüäïõ PGP --]',
-	'eo' => '[-- Fino de PGP-eligo --]',
-	'es' => '[-- Fin de salida PGP --]',
-	'et' => '[-- PGP väljundi lõpp --]',
-	'fr' => '[-- Fin de sortie PGP --]',
-	'gl' => '[-- Fin da saída PGP --]',
-	'hu' => '[-- PGP kimenet vége --]',
-	'id' => '[-- Akhir keluaran PGP --]',
-	'it' => '[-- Fine dell\'output di PGP --]',
-	'ja' => '[-- PGP½ÐÎϽªÎ» --]',
-	'ko' => '[-- PGP Ãâ·Â ³¡ --]',
-	'lt' => '[-- PGP iðvesties pabaiga --]',
-	'nl' => '[-- Einde van PGP uitvoer --]',
-	'pl' => '[-- Koniec komunikatów PGP --]',
-	'pt_BR' => '[-- Fim da saída do PGP --]',
-	'ru' => '[-- ëÏÎÅà ×Ù×ÏÄÁ ÐÒÏÇÒÁÍÍÙ PGP --]',
-	'sk' => '[-- Koniec výstupu PGP --]',
-	'sv' => '[-- Slut på utdata från PGP --]',
-	'tr' => '[-- PGP geri verisi sonu --]',
-	'uk' => '[-- ë¦ÎÅÃØ ÔÅËÓÔÕ ÎÁ ×ÉÈÏĦ PGP --]',
-	'zh_CN' => '[-- PGP Êä³ö²¿·Ý½áÊø --]',
-	'zh_TW' => '[-- PGP 輸出部份結束 --]'
-);
-# }}}
+
 # set the defaults to the C locale
 $mutt_attachment        = '[-- Attachment #';
 $mutt_contenttype       = '[-- Type: ';
@@ -325,229 +70,6 @@ $mutt_pgpencrypted      = '[-- End of PGP/MIME encrypted data --]';
 $mutt_pgpoutstart       = '[-- PGP output follows (current time:';
 $mutt_pgpoutend         = '[-- End of PGP output --]';
 
-# gpg's locales as in gpg-1.4.0 {{{
-my %gpg_WARNING = (
-	'be' => '',
-	'ca' => 'AV�S: ',
-	'cs' => 'VAROVÁNÍ: ',
-	'da' => 'ADVARSEL: ',
-	'de' => 'WARNUNG: ',
-	'el' => 'ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ',
-	'eo' => 'AVERTO: ',
-	'es' => 'ATENCIÓN: ',
-	'et' => 'HOIATUS: ',
-	'fi' => 'VAROITUS: ',
-	'fr' => 'ATTENTION: ',
-	'gl' => 'AVISO: ',
-	'hu' => 'FIGYELEM: ',
-	'id' => 'PERINGATAN: ',
-	'it' => 'ATTENZIONE: ',
-	'ja' => '·Ù¹ð: ',
-	'pl' => 'OSTRZE¯ENIE: ',
-	'pt' => 'AVISO: ',
-	'pt_BR' => 'AVISO: ',
-	'ro' => 'AVERTISMENT: ',
-	'ru' => 'ВНИМАНИЕ: ',
-	'sk' => 'VAROVANIE: ',
-	'sv' => 'VARNING: ',
-	'tr' => 'UYARI: ',
-	'zh_CN' => '警告：我们不信任这把密钥！',
-	'zh_TW' => 'ĵ§i¡G§Ú­Ì *¤£* «H¥ô³o§âª÷Æ_¡I'
-);
-my %gpg_Warning = (
-	'be' => '',
-	'ca' => 'AV�S: ',
-	'cs' => 'VAROVÁNÍ: ',
-	'da' => '',
-	'de' => 'Warnung: ',
-	'el' => 'ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ',
-	'eo' => 'AVERTO: ',
-	'es' => 'ATENCIÓN: ',
-	'et' => 'HOIATUS: ',
-	'fi' => 'VAROITUS: ',
-	'fr' => 'AVERTISSEMENT: ',
-	'gl' => 'AVISO: ',
-	'hu' => 'FIGYELEM: ',
-	'id' => 'PERINGATAN: ',
-	'it' => 'ATTENZIONE: ',
-	'ja' => '·Ù¹ð: ',
-	'pl' => 'OSTRZE¯ENIE: ',
-	'pt' => 'CUIDADO: ',
-	'pt_BR' => 'CUIDADO: ',
-	'ro' => 'AVERTISMENT: ',
-	'ru' => 'ВНИМАНИЕ: ',
-	'sk' => 'VAROVANIE: ',
-	'sv' => 'VARNING: ',
-	'tr' => 'UYARI: ',
-	'zh_CN' => '警告：加密过的报文已经变造！',
-	'zh_TW' => 'ĵ§i¡G¥[±K¹Lªº°T®§¤w¸g³QÅܳy¤F¡I'
-);
-my %gpg_Cantcheck = (
-	'be' => '',
-	'ca' => 'No sha pogut comprovar la signatura: ',
-	'cs' => 'Nemohu ovìøit podpis: ',
-	'da' => 'Kan ikke tjekke signatur: ',
-	'de' => 'Unterschrift kann nicht geprüft werden: ',
-	'el' => 'Áäõíáìßá åëÝã÷ïõ ôçò õðïãñáöÞò: ',
-	'eo' => 'Ne povas kontroli subskribon: ',
-	'es' => 'Imposible comprobar la firma: ',
-	'et' => 'Allkirja ei saa kontrollida: ',
-	'fi' => 'Allekirjoitusta ei voi tarkistaa: ',
-	'fr' => 'Impossible de vérifier la signature: ',
-	'gl' => 'Non foi posible verifica-la sinatura: ',
-	'hu' => 'Nem tudom ellenõrizni az aláírást: ',
-	'id' => 'Tidak dapat memeriksa signature: ',
-	'it' => 'Impossibile controllare la firma: ',
-	'ja' => '½ð̾¤ò¸¡ºº¤Ç¤­¤Þ¤»¤ó: ',
-	'pl' => 'Nie mo¿na sprawdziæ podpisu: ',
-	'pt' => 'Impossível verificar assinatura: ',
-	'pt_BR' => 'Impossível verificar assinatura: ',
-	'ro' => 'Nu pot verifica semnãtura: ',
-	'ru' => 'Не могу проверить подпись: ',
-	'sk' => 'Nemô¾em overi» podpis: ',
-	'sv' => 'Kan inte verifiera signaturen: ',
-	'tr' => 'Ä°mza kontrol edilemedi: ',
-	'zh_CN' => '无法检查签字：',
-	'zh_TW' => 'µLªkÀˬdñ³¹¡G '
-);
-my %gpg_aka = (
-	'be' => '',
-	'ca' => '              alias ',
-	'cs' => '                alias ',
-	'da' => '              alias ',
-	'de' => '                    alias ',
-	'el' => '                ãíùóôü óáí ',
-	'eo' => '            alinome ',
-	'es' => '                alias ',
-	'et' => '                 ka ',
-	'fr' => '                alias « ',
-	'gl' => '               alias ',
-	'hu' => '               azaz ',
-	'id' => '              alias ',
-	'it' => '                alias ',
-	'ja' => '                ÊÌ̾¡È',
-	'pl' => '                        alias ',
-	'pt' => '                   ou ',
-	'pt_BR' => '                   ou ',
-	'sk' => '                alias ',
-	'sv' => '      även känd som ',
-	'tr' => '                den ',
-	'zh_CN' => '              亦即“',
-	'zh_TW' => '                ¥ç§Y '
-);
-my %gpg_bad = (
-	'be' => 'нерэчаісны хэш-альгарытм ',
-	'ca' => 'Signatura INCORRECTA de ',
-	'cs' => '©PATNÝ podpis od ',
-	'da' => 'DÅRLIG signatur fra ',
-	'de' => 'FALSCHE Unterschrift von ',
-	'el' => 'ÊÁÊÇ õðïãñáöÞ áðü ',
-	'eo' => 'MALBONA subskribo de ',
-	'es' => 'Firma INCORRECTA de ',
-	'et' => 'HALB allkiri kasutajalt ',
-	'fi' => 'VÄÄRÄ allekirjoitus lähettäjältä ',
-	'fr' => 'MAUVAISE signature de « ',
-	'gl' => 'Sinatura INCORRECTA de',
-	'hu' => 'ROSSZ aláírás a következõtõl: ',
-	'id' => 'signature BURUK dari ',
-	'it' => 'Firma NON corretta da ',
-	'ja' => '¡È',
-	'pl' => 'NIEPOPRAWNY podpis z³o¿ony przez ',
-	'pt' => 'Assinatura INCORRECTA de ',
-	'pt_BR' => 'Assinatura INCORRETA de ',
-	'ro' => 'Semnãturã INCORECTÃ din ',
-	'ru' => 'ПЛОХАЯ подпись от ',
-	'sk' => 'ZLÝ podpis od ',
-	'sv' => 'FELAKTIG signatur från ',
-	'tr' => 'KÖTÜ imza: ',
-	'zh_CN' => '已损坏的签字，来自于“',
-	'zh_TW' => '*·lÃa* ªºÃ±³¹¨Ó¦Û©ó '
-);
-my %gpg_expired = (
-	'be' => '',
-	'ca' => 'Nota: La clau ha caducat!',
-	'cs' => 'Poznámka: Skonèila platnost tohoto klíèe!',
-	'da' => 'Bemærk: Denne nøgle er forældet!',
-	'de' => 'Hinweis: Dieser Schlüssel ist verfallen!',
-	'el' => 'Óçìåßùóç: Áõôü ôï êëåéäß Ý÷åé ëÞîåé!',
-	'eo' => 'Noto: Æi tiu þlosilo eksvalidiøis!',
-	'es' => 'Nota: ¡Esta clave ha caducado!',
-	'et' => 'Märkus: See võti on aegunud!',
-	'fi' => 'Huom: Tämä avain on vanhentunut!',
-	'fr' => 'Note: Cette clé a expiré !',
-	'gl' => 'Nota: ¡Esta chave xa caducou!',
-	'hu' => 'Megjegyzés: Ez a kulcs lejárt!',
-	'id' => 'Catatan: Kunci ini telah berakhir!',
-	'it' => 'Nota: questa chiave è scaduta!',
-	'ja' => 'Ãí°Õ: ¤³¤Î¸°¤ÏËþλ¤Ç¤¹!',
-	'pl' => 'Uwaga: Data wa¿no¶ci tego klucza up³ynê³a!',
-	'pt' => 'Nota: Esta chave expirou!',
-	'pt_BR' => 'Nota: Esta chave expirou!',
-	'ro' => 'Notã: Aceastã cheie a expirat!',
-	'ru' => 'ПРЕДУПРЕЖДАЮ: Данный ключ просрочен!',
-	'sk' => 'Poznámka: Skonèila platnos» tohto kµúèa!',
-	'sv' => 'Obs: Giltighetstiden för denna nyckel har gått ut!',
-	'tr' => 'Bilgi: Bu anahtarın kullanım süresi dolmuştu!',
-	'zh_CN' => '注意：这把密钥已经过期了！',
-	'zh_TW' => '½Ðª`·N¡G³o§âª÷Æ_¤w¸g¹L´Á¤F¡I'
-);
-my %gpg_good = (
-	'be' => 'нерэчаісны хэш-альгарытм ',
-	'ca' => 'Signatura correcta de ',
-	'cs' => 'Dobrý podpis od ',
-	'da' => 'God signatur fra ',
-	'de' => 'Korrekte Unterschrift von ',
-	'el' => 'ÊáëÞ õðïãñáöÞ áðü ',
-	'eo' => 'Bona subskribo de ',
-	'es' => 'Firma correcta de ',
-	'et' => 'Korrektne allkiri kasutajalt ',
-	'fi' => 'Allekirjoitus täsmää lähettäjään ',
-	'fr' => 'Bonne signature de « ',
-	'gl' => 'Sinatura correcta de ',
-	'hu' => 'Jó aláírás a következõtõl: ',
-	'id' => 'Signature baik dari ',
-	'it' => 'Firma valida da ',
-	'ja' => '¡È',
-	'pl' => 'Poprawny podpis z³o¿ony przez ',
-	'pt' => 'Assinatura correcta de ',
-	'pt_BR' => 'Assinatura correta de ',
-	'ro' => 'Semnãturã bunã din ',
-	'ru' => 'Действительная подпись от ',
-	'sk' => 'Dobrý podpis od ',
-	'sv' => 'Korrekt signatur från ',
-	'tr' => 'Kullanıcı kimliği: ',
-	'zh_CN' => '完好的签字，来自于“',
-	'zh_TW' => '§¹¦nªºÃ±³¹¨Ó¦Û©ó '
-);
-my %gpg_bug = (
-	'be' => '',
-	'ca' => '... a�� �s un bug (',
-	'cs' => '... toto je chyba v programu (',
-	'da' => '... dette er en fejl (',
-	'de' => '... dies ist ein Bug (Programmfehler) (',
-	'el' => '... áõôü åßíáé bug (',
-	'eo' => '... æi tio estas cimo (',
-	'es' => '... esto es un bug (',
-	'et' => '... see on viga (',
-	'fi' => '...tämä on ohjelmistovika (',
-	'fr' => '... cest un bug (',
-	'gl' => '... isto é un erro (',
-	'hu' => 'Ez egy programhiba... (',
-	'id' => '... kesalahan (',
-	'it' => '... questo è un bug (',
-	'ja' => '... ¥Ð¥°¤Ç¤¹ (',
-	'pl' => '... to jest b³±d programu (',
-	'pt' => '... isto é um bug (',
-	'pt_BR' => '... isto é um bug (',
-	'ro' => '... acesta este un bug (',
-	'ru' => ' ... это ошибка (',
-	'sk' => '... toto je chyba v programe (',
-	'sv' => '... detta är ett fel i programmet (',
-	'tr' => '... bu bir yazılım hatası (',
-	'zh_CN' => '……这是个程序缺陷(',
-	'zh_TW' => '... ³o¬O­Ó·å²« ('
-);
-# }}}
 # set the defaults to the C locale
 $gpg_WARNING            = 'WARNING: ';
 # (yes, the translations in gnupg's po files *are* braindamaged):
@@ -1408,47 +930,62 @@ if (($ml && $footers eq '')||    # no -l without -L
 
 if ($mua eq 'mutt') {
     if (defined $locale && $locale ne '' && $locale ne 'C' && $locale ne 'POSIX') {
-        foreach my $key (keys %mutt_attachment) {
-            if ($locale =~ /^$key/) {
-                if ($mutt_attachment{$key}) 
-                    { $mutt_attachment = $mutt_attachment{$key}; }
-                if ($mutt_contenttype{$key})
-                    { $mutt_contenttype = $mutt_contenttype{$key}; }
-                if ($mutt_pgpsigned{$key})
-                    { $mutt_pgpsigned = $mutt_pgpsigned{$key}; }
-                if ($mutt_beginsigned{$key})
-                    { $mutt_beginsigned = $mutt_beginsigned{$key}; }
-                if ($mutt_pgpclearsigned{$key})
-                    { $mutt_pgpclearsigned = $mutt_pgpclearsigned{$key}; }
-                if ($mutt_pgpclearsigstart{$key})
-                    { $mutt_pgpclearsigstart = $mutt_pgpclearsigstart{$key}; }
-                if ($mutt_pgpencrypted{$key})
-                    { $mutt_pgpencrypted = $mutt_pgpencrypted{$key}; }
-                if ($mutt_pgpoutstart{$key})
-                    { $mutt_pgpoutstart = $mutt_pgpoutstart{$key}; }
-                if ($mutt_pgpoutend{$key})
-                    { $mutt_pgpoutend = $mutt_pgpoutend{$key}; }
-                last;
-            }
-        }
-        foreach my $key (keys %gpg_WARNING) {
-            if ($locale =~ /^$key/) {
-                if ($gpg_WARNING{$key})
-                    { $gpg_WARNING = $gpg_WARNING{$key}; }
-                if ($gpg_Warning{$key})
-                    { $gpg_Warning = $gpg_Warning{$key}; }
-                if ($gpg_Cantcheck{$key})
-                    { $gpg_Cantcheck = $gpg_Cantcheck{$key}; }
-                if ($gpg_aka{$key})
-                    { $gpg_aka = $gpg_aka{$key}; }
-                if ($gpg_bad{$key})
-                    { $gpg_bad = $gpg_bad{$key}; }
-                if ($gpg_expired{$key})
-                    { $gpg_expired = $gpg_expired{$key}; }
-                if ($gpg_good{$key})
-                    { $gpg_good = $gpg_good{$key}; }
-                last;
-            }
+        eval { require Locale::gettext; };
+        if ($@) { warn $@; exit(EX_SOFTWARE); } else {
+            Locale::gettext::textdomain('mutt');
+            ($mutt_attachment) =
+                Locale::gettext::gettext("[-- Attachment #%d") =~
+                m/^([^%]*)/o;
+            ($mutt_contenttype) =
+                Locale::gettext::gettext("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n") =~
+                m/^([^%]*)/o;
+            ($mutt_pgpsigned) =
+                Locale::gettext::gettext("[-- End of signed data --]\n")  =~
+                m/^(.*?)\n/mo;
+            ($mutt_beginsigned) =
+                Locale::gettext::gettext("[-- The following data is signed --]\n\n") =~
+                m/^(.*?)\n/mo;
+            ($mutt_pgpclearsigned) =
+                Locale::gettext::gettext("[-- END PGP SIGNED MESSAGE --]\n") =~
+                m/^(.*?)\n/mo;
+            ($mutt_pgpclearsigstart) =
+                Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n") =~
+                m/^(.*?)\n/mo;
+            ($mutt_pgpencrypted) =
+                Locale::gettext::gettext("[-- End of PGP/MIME encrypted data --]\n") =~
+                m/^(.*?)\n/mo;
+            ($mutt_pgpoutstart) =
+                Locale::gettext::gettext("[-- PGP output follows (current time: %c) --]\n") =~
+                m/^([^%]*)/o;
+            ($mutt_pgpoutend) =
+                Locale::gettext::gettext("[-- End of PGP output --]\n") =~
+                m/^(.*?)\n/mo;
+
+            Locale::gettext::textdomain('gnupg');
+            ($gpg_WARNING) =
+                Locale::gettext::gettext("WARNING: using insecure random number generator!!\n") =~
+                m/^(.*?: )/o;
+            ($gpg_Warning) =
+                Locale::gettext::gettext("WARNING: message was encrypted with a weak key in the symmetric cipher.\n") =~
+                m/^(.*?: )/o;
+            ($gpg_Cantcheck) =
+                Locale::gettext::gettext("Can't check signature: %s\n") =~
+                m/^([^%]*)/o;
+            ($gpg_aka) =
+                Locale::gettext::gettext((' 'x16).'aka "%s"') =~
+                m/^(.*?)"/o;
+            ($gpg_bad) =
+                Locale::gettext::gettext('BAD signature from "%s"') =~
+                m/^(.*?)"/o;
+            ($gpg_expired) =
+                Locale::gettext::gettext("Note: This key has expired!\n") =~
+                m/^(.*?)\n/mo;
+            ($gpg_good) =
+                Locale::gettext::gettext('Good signature from "%s"') =~
+                m/^(.*?)"/o;
+            ($gpg_bug) =
+                Locale::gettext::gettext("... this is a bug (%s:%d:%s)\n") =~
+                m/^([^%]*)/o;
         }
     }
 
diff --git a/t-prot.1 b/t-prot.1
index a8e4b53..b4bc791 100644
--- a/t-prot.1
+++ b/t-prot.1
@@ -1,9 +1,9 @@
 .\" Copyright Jochen Striepe <t-prot@tolot.escape.de>, 2001-2004.
 .\" License see below.
 .\" 
-.\" $Id: t-prot.1,v 1.92 2005/01/08 11:05:13 jochen Exp $
+.\" $Id: t-prot.1,v 1.93 2005/02/14 13:26:36 jochen Exp $
 .\"
-.TH T-PROT "1" "Jan 2005" "T-PROT"
+.TH T-PROT "1" "Feb 2005" "T-PROT"
 .SH NAME
 t-prot \- TOFU Protection - Display Filter for RFC 822 messages
 .SH SYNOPSIS
@@ -224,7 +224,9 @@ a security issue.)
 Here you can specify which locale to use. Right now this option is only
 used when
 .I "\-Mmutt"
-is specified, but this may change in future.
+is specified, but this may change in future. You need the Perl module
+.I "Locale::gettext"
+for this feature.
 .sp
 Valid values for LOCALE are the locale names in the mutt(1) and gpg(1)
 po file names.