From: pdmef <pdmef@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Date: Wed, 27 Jul 2005 12:12:55 +0000 (+0000)
Subject: Rocco Rutte:
X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=3ea753c6005292b3e3153ac7e1f7b7d2363955c9

Rocco Rutte:
- merge in latest mutt changes


git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@357 e385b8ad-14ed-0310-8656-cc95a2468c6d
---

diff --git a/ChangeLog.mutt b/ChangeLog.mutt
index 8e12b1b..ef4aed1 100644
--- a/ChangeLog.mutt
+++ b/ChangeLog.mutt
@@ -1,3 +1,14 @@
+2005-07-27 05:53:27  Brendan Cully  <brendan@kublai.com>  (brendan)
+
+	* po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, po/es.po,
+	po/et.po, po/gl.po, po/lt.po, po/pt_BR.po, po/sk.po: Update
+	Thomas' address in several out-of-date PO files. (closes #990)
+
+2005-07-27 04:29:36  Brendan Cully  <brendan@kublai.com>  (brendan)
+
+	* mutt_ssl_gnutls.c: Silence some harmless warnings. Also, one day
+	-pedantic is going to get held up on the causeway.
+
 2005-07-27 00:40:15  Brendan Cully  <brendan@kublai.com>  (brendan)
 
 	* imap/command.c: More fiddling with fatal state handling. Not
diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index 1284aa3..1080faf 100644
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -323,8 +323,8 @@ static int tls_compare_certificates (const gnutls_datum * peercert)
       return 0;
     }
 
-    ptr = (unsigned char *) strstr (b64_data.data, CERT_SEP) + 1;
-    ptr = (unsigned char *) strstr (ptr, CERT_SEP);
+    ptr = (unsigned char *) strstr ((char*) b64_data.data, CERT_SEP) + 1;
+    ptr = (unsigned char *) strstr ((char*) ptr, CERT_SEP);
 
     b64_data.size = b64_data.size - (ptr - b64_data.data);
     b64_data.data = ptr;
@@ -449,10 +449,9 @@ static int tls_check_certificate (CONNECTION * conn)
   MUTTMENU *menu;
   int done, row, i, ret;
   FILE *fp;
-  gnutls_x509_dn dn;
   time_t t;
   const gnutls_datum *cert_list;
-  int cert_list_size = 0;
+  unsigned int cert_list_size = 0;
   gnutls_certificate_status certstat;
   char datestr[30];
   gnutls_x509_crt cert;
diff --git a/po/bg.po b/po/bg.po
index 34fb33e..5c5293d 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3491,7 +3491,7 @@ msgid ""
 msgstr ""
 "Àâòîðñêî ïðàâî (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Àâòîðñêî ïðàâî (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Àâòîðñêî ïðàâî (C) 1997-2002 Thomas Roessler <roessler@guug.de>\n"
+"Àâòîðñêî ïðàâî (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Àâòîðñêî ïðàâî (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Àâòîðñêî ïðàâî (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
 "Àâòîðñêî ïðàâî (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
diff --git a/po/cs.po b/po/cs.po
index 5b3807a..0910160 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4062,7 +4062,7 @@ msgid ""
 msgstr ""
 "Copyright (C) 1996-2003 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2003 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2003 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1997-2003 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2003 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Copyright (C) 1999-2003 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2003 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
diff --git a/po/da.po b/po/da.po
index 14b9b48..46ecd00 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3456,7 +3456,7 @@ msgid ""
 msgstr ""
 "Copyright (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
diff --git a/po/eo.po b/po/eo.po
index b34d1d7..8773e1e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -3471,7 +3471,7 @@ msgid ""
 msgstr ""
 "Kopirajto (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
 "Kopirajto (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Kopirajto (C) 1997-2002 Thomas Roessler <roessler@guug.de>\n"
+"Kopirajto (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Kopirajto (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Kopirajto (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
 "Kopirajto (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
diff --git a/po/es.po b/po/es.po
index 9d43caf..ba2c7c5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3518,7 +3518,7 @@ msgid ""
 msgstr ""
 "Copyright (C) 1996-2001 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2001 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2001 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1997-2001 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2001 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Copyright (C) 1999-2001 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2001 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
@@ -4564,7 +4564,7 @@ msgstr ""
 #: pgp.c:665
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
-msgstr "Error interno. Informe a <roessler@guug.de>."
+msgstr "Error interno. Informe a <roessler@does-not-exist.org>."
 
 #: pgp.c:723
 msgid ""
diff --git a/po/et.po b/po/et.po
index 7549a72..7b06a4c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -3476,7 +3476,7 @@ msgid ""
 msgstr ""
 "Autoriõigus (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Autoriõigus (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Autoriõigus (C) 1997-2002 Thomas Roessler <roessler@guug.de>\n"
+"Autoriõigus (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Autoriõigus (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Autoriõigus (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
 "Autoriõigus (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
@@ -4524,7 +4524,7 @@ msgstr ""
 #: pgp.c:665
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
-msgstr "Sisemine viga. Informeerige <roessler@guug.de>."
+msgstr "Sisemine viga. Informeerige <roessler@does-not-exist.org>."
 
 #: pgp.c:723
 msgid ""
diff --git a/po/gl.po b/po/gl.po
index 8e7e988..308f8ea 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3526,7 +3526,7 @@ msgid ""
 msgstr ""
 "Copyright (C) 1996-2001 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2001 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2001 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1997-2001 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2001 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Copyright (C) 1999-2001 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2001 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
@@ -4572,7 +4572,7 @@ msgstr "[-- Fin da sa
 #: pgp.c:665
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
-msgstr "Erro interno. Informe a <roessler@guug.de>."
+msgstr "Erro interno. Informe a <roessler@does-not-exist.org>."
 
 #: pgp.c:723
 msgid ""
diff --git a/po/id.po b/po/id.po
index 968ac61..f5dbf7e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -3468,7 +3468,7 @@ msgid ""
 msgstr ""
 "Hak Cipta (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Hak Cipta (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Hak Cipta (C) 1997-2002 Thomas Roessler <roessler@guug.de>\n"
+"Hak Cipta (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Hak Cipta (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Hak Cipta (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
 "Hak Cipta (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
diff --git a/po/it.po b/po/it.po
index 51b9e9b..17adc9d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3470,7 +3470,7 @@ msgid ""
 msgstr ""
 "Copyright (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
diff --git a/po/lt.po b/po/lt.po
index 1f04a08..c6e6e90 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3525,7 +3525,7 @@ msgid ""
 msgstr ""
 "Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2000 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2000 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1997-2000 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2000 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Copyright (C) 1999-2000 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
@@ -4568,7 +4568,7 @@ msgstr ""
 #: pgp.c:665
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
-msgstr "Vidinë klaida. Praneðk <roessler@guug.de>."
+msgstr "Vidinë klaida. Praneðk <roessler@does-not-exist.org>."
 
 #: pgp.c:723
 msgid ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fcd3d66..81f4070 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3541,7 +3541,7 @@ msgid ""
 msgstr ""
 "Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2000 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2000 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1997-2000 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2000 Werner Kock     <wk@isil.d.shuttle.de>\n"
 "Copyright (C) 1999-2000 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
@@ -4592,7 +4592,7 @@ msgstr ""
 #: pgp.c:665
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
-msgstr "Erro interno. Informe <roessler@guug.de>."
+msgstr "Erro interno. Informe <roessler@does-not-exist.org>."
 
 #: pgp.c:723
 msgid ""
diff --git a/po/ru.po b/po/ru.po
index 42368e5..f27397f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3487,7 +3487,7 @@ msgid ""
 msgstr ""
 "Copyright (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
diff --git a/po/sk.po b/po/sk.po
index eaf8b49..9a30c70 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3546,7 +3546,7 @@ msgid ""
 "    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
 msgstr ""
 "Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>\n"
-"Copyright (C) 1997-8 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1997-8 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998   Werner Koch <wk@isil.d.shuttle.de>\n"
 "Copyright (C) 1998   Ruslan Ermilov <ru@ucb.crimea.ua>\n"
 "\n"
@@ -4593,7 +4593,7 @@ msgstr ""
 #: pgp.c:665
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
-msgstr "Interná chyba. Informujte <roessler@guug.de>"
+msgstr "Interná chyba. Informujte <roessler@does-not-exist.org>"
 
 #: pgp.c:723
 msgid ""
diff --git a/po/sv.po b/po/sv.po
index b5e8f34..734a6ea 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3464,7 +3464,7 @@ msgid ""
 msgstr ""
 "Upphovsrätt (C) 1996-2002 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Upphovsrätt (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Upphovsrätt (C) 1997-2002 Thomas Roessler <roessler@guug.de>\n"
+"Upphovsrätt (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Upphovsrätt (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Upphovsrätt (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
 "Upphovsrätt (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
diff --git a/po/tr.po b/po/tr.po
index 6b8ec4d..3abee6c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4549,7 +4549,7 @@ msgstr ""
 #: pgp.c:665
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
-msgstr "Iç hata. Thomas R. <roessler@guug.de>'ye haber ver."
+msgstr "Iç hata. Thomas R. <roessler@does-not-exist.org>'ye haber ver."
 
 #: pgp.c:723
 msgid ""
diff --git a/po/uk.po b/po/uk.po
index 6b3723d..32edf16 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4484,7 +4484,7 @@ msgstr ""
 #: pgp.c:665
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
-msgstr "÷ÎÕÔÒ¦ÛÎÑ ÐÏÍÉÌËÁ. ðÏצÄÏÍØÔÅ <roessler@guug.de>."
+msgstr "÷ÎÕÔÒ¦ÛÎÑ ÐÏÍÉÌËÁ. ðÏצÄÏÍØÔÅ <roessler@does-not-exist.org>."
 
 #: pgp.c:723
 msgid ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3a0d3cb..7137fcc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3552,7 +3552,7 @@ msgid ""
 msgstr ""
 "Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2000 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2000 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1997-2000 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2000 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Copyright (C) 1999-2000 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index eacd14a..52d8c18 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3514,7 +3514,7 @@ msgid ""
 msgstr ""
 "版權所有 (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>\n"
 "版權所有 (C) 1996-2000 Brandon Long <blong@fiction.net>\n"
-"版權所有 (C) 1997-2000 Thomas Roessler <roessler@guug.de>\n"
+"版權所有 (C) 1997-2000 Thomas Roessler <roessler@does-not-exist.org>\n"
 "版權所有 (C) 1998-2000 Werner Koch <wk@isil.d.shuttle.de>\n"
 "版權所有 (C) 1999-2000 Brendan Cully <brendan@kublai.com>\n"
 "版權所有 (C) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"