upstream/608706-fix-spelling-errors.patch: to fix some spelling errors (Closes: 608706)

diff --git a/debian/changelog b/debian/changelog
index eb4bac5822e2c76029023f1cc57b2dce888a89c7..e5d9b1cce64e6c678cfb19ec7bf7a5db0c264a77 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ mutt (1.5.21-2) experimental; urgency=low
       workaround for Exchange 2010 (Closes: 603288)
     + upstream/537061-dont-recode-saved-attachments.patch: as the patch says,
       see the patch for more info (Closes: 537061)
       workaround for Exchange 2010 (Closes: 603288)
     + upstream/537061-dont-recode-saved-attachments.patch: as the patch says,
       see the patch for more info (Closes: 537061)

+    + upstream/608706-fix-spelling-errors.patch: to fix some spelling errors
+      (Closes: 608706)

     + debian-specific/566076-build_doc_adjustments.patch: use w3m to build the
       manual (Closes: 566076)
   * debian/extra/lib/mailto-mutt: replaced by a wrapper, added the reason to
     + debian-specific/566076-build_doc_adjustments.patch: use w3m to build the
       manual (Closes: 566076)
   * debian/extra/lib/mailto-mutt: replaced by a wrapper, added the reason to


@@ -20,7 +22,7 @@ mutt (1.5.21-2) experimental; urgency=low
   * debian/*.lintian-overrides: ignore 'binary without manpage' errors due to
     the diversions to mutt-org/mutt-patched
 
   * debian/*.lintian-overrides: ignore 'binary without manpage' errors due to
     the diversions to mutt-org/mutt-patched
 

- -- Antonio Radici <antonio@dyne.org>  Sat, 01 Jan 2011 18:24:16 +0000
+ -- Antonio Radici <antonio@dyne.org>  Sun, 02 Jan 2011 21:05:25 +0000

 
 mutt (1.5.21-1) experimental; urgency=low
 
 
 mutt (1.5.21-1) experimental; urgency=low
 

diff --git a/debian/patches/series b/debian/patches/series
index bd611a53ef7521bfc5511054366217c69af529a9..61c912e158ab5be531d221b56ac68e63c0d1cced 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,6 +44,8 @@ upstream/578087-header-strchr.patch
 
 upstream/603288-split-fetches.patch
 upstream/537061-dont-recode-saved-attachments.patch
 
 upstream/603288-split-fetches.patch
 upstream/537061-dont-recode-saved-attachments.patch

+upstream/608706-fix-spelling-errors.patch
+

 upstream/path_max
 
 mutt.org
 upstream/path_max
 
 mutt.org

diff --git a/debian/patches/upstream/608706-fix-spelling-errors.patch b/debian/patches/upstream/608706-fix-spelling-errors.patch
new file mode 100644 (file)
index 0000000..468b38c
--- /dev/null
+++ b/debian/patches/upstream/608706-fix-spelling-errors.patch
@@ -0,0 +1,426 @@
+Simple patch to fix some spelling errors, forwarded upstream on:
+http://bugs.mutt.org/3493
+
+--- a/copy.c
++++ b/copy.c
+@@ -77,7 +77,7 @@
+       if ((fgets (buf, sizeof (buf), in)) == NULL)
+       break;
+ 
+-      /* Is it the begining of a header? */
++      /* Is it the beginning of a header? */
+       if (nl && buf[0] != ' ' && buf[0] != '\t')
+       {
+       ignore = 1;
+@@ -147,7 +147,7 @@
+     if ((fgets (buf, sizeof (buf), in)) == NULL)
+       break;
+ 
+-    /* Is it the begining of a header? */
++    /* Is it the beginning of a header? */
+     if (nl && buf[0] != ' ' && buf[0] != '\t')
+     {
+       /* Do we have anything pending? */
+--- a/edit.c
++++ b/edit.c
+@@ -39,7 +39,7 @@
+  * declared "static" (sigh)
+  */
+ static char* EditorHelp1 = N_("\
+-~~            insert a line begining with a single ~\n\
++~~            insert a line beginning with a single ~\n\
+ ~b users      add users to the Bcc: field\n\
+ ~c users      add users to the Cc: field\n\
+ ~f messages   include messages\n\
+--- a/enter.c
++++ b/enter.c
+@@ -435,7 +435,7 @@
+         break;
+ 
+       case OP_EDITOR_KILL_WORD:
+-        /* delete to begining of word */
++        /* delete to beginning of word */
+         if (state->curpos != 0)
+         {
+           i = state->curpos;
+--- a/crypt.c
++++ b/crypt.c
+@@ -224,7 +224,7 @@
+       /* free tmp_body if messages was signed AND encrypted ... */
+       if (tmp_smime_pbody != msg->content && tmp_smime_pbody != tmp_pbody)
+       {
+-      /* detatch and dont't delete msg->content,
++      /* detatch and don't delete msg->content,
+          which tmp_smime_pbody->parts after signing. */
+       tmp_smime_pbody->parts = tmp_smime_pbody->parts->next;
+       msg->content->next = NULL;
+--- a/init.c
++++ b/init.c
+@@ -2543,7 +2543,7 @@
+       Matches[Num_matched++] = User_typed;
+ 
+       /* All matches are stored. Longest non-ambiguous string is ""
+-       * i.e. dont change 'buffer'. Fake successful return this time */
++       * i.e. don't change 'buffer'. Fake successful return this time */
+       if (User_typed[0] == 0)
+       return 1;
+     }
+@@ -2599,7 +2599,7 @@
+       Matches[Num_matched++] = User_typed;
+ 
+       /* All matches are stored. Longest non-ambiguous string is ""
+-       * i.e. dont change 'buffer'. Fake successful return this time */
++       * i.e. don't change 'buffer'. Fake successful return this time */
+       if (User_typed[0] == 0)
+       return 1;
+     }
+@@ -2646,7 +2646,7 @@
+       Matches[Num_matched++] = User_typed;
+ 
+       /* All matches are stored. Longest non-ambiguous string is ""
+-       * i.e. dont change 'buffer'. Fake successful return this time */
++       * i.e. don't change 'buffer'. Fake successful return this time */
+       if (User_typed[0] == 0)
+       return 1;
+     }
+--- a/po/mutt.pot
++++ b/po/mutt.pot
+@@ -3620,7 +3620,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr ""
+ 
+ #: recvattach.c:775
+--- a/recvattach.c
++++ b/recvattach.c
+@@ -707,7 +707,7 @@
+       {
+         if (!mutt_can_decode (top))
+         {
+-          mutt_error (_("I dont know how to print %s attachments!"), type);
++          mutt_error (_("I don't know how to print %s attachments!"), type);
+           return (0);
+         }
+       }
+--- a/po/bg.po
++++ b/po/bg.po
+@@ -3899,7 +3899,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Íå å äåôèíèðàíà êîìàíäà çà îòïå÷àòâàíå íà %s ïðèëîæåíèÿ!"
+ 
+ #: recvattach.c:775
+--- a/po/ca.po
++++ b/po/ca.po
+@@ -4054,7 +4054,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Es desconeix com imprimir adjuncions de tipus «%s»."
+ 
+ #: recvattach.c:775
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -3781,7 +3781,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Nevím, jak vytisknout přílohy typu %s!."
+ 
+ #: recvattach.c:775
+--- a/po/da.po
++++ b/po/da.po
+@@ -3850,7 +3850,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Kan ikke udskrive %s-brevdele."
+ 
+ #: recvattach.c:775
+--- a/po/de.po
++++ b/po/de.po
+@@ -3779,7 +3779,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Kann %s Anhänge nicht drucken!"
+ 
+ #: recvattach.c:775
+--- a/po/el.po
++++ b/po/el.po
+@@ -4528,7 +4528,7 @@
+ #
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Äåí îÝñù ðùò íá ôõðþóù ôéò %s ðñïóáñôÞóåéò!"
+ 
+ #
+--- a/po/eo.po
++++ b/po/eo.po
+@@ -3772,7 +3772,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Mi ne scias presi %s-partojn!"
+ 
+ #: recvattach.c:775
+--- a/po/es.po
++++ b/po/es.po
+@@ -3898,7 +3898,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "¡No sé cómo imprimir archivos adjuntos %s!"
+ 
+ #: recvattach.c:775
+--- a/po/et.po
++++ b/po/et.po
+@@ -3875,7 +3875,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Ma ei tea, kuidas trükkida %s lisasid!"
+ 
+ #: recvattach.c:775
+--- a/po/eu.po
++++ b/po/eu.po
+@@ -3764,7 +3764,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Ez dakit nola inprimatu %s gehigarriak!"
+ 
+ #: recvattach.c:775
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -3958,7 +3958,7 @@
+ # , c-format
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Je ne sais pas comment imprimer %s attachements !"
+ 
+ #: recvattach.c:775
+--- a/po/ga.po
++++ b/po/ga.po
+@@ -3809,7 +3809,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Ní eol dom conas a phriontáil iatáin %s!"
+ 
+ #: recvattach.c:775
+--- a/po/gl.po
++++ b/po/gl.po
+@@ -3912,7 +3912,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "¡Non sei cómo imprimir adxuntos %s!"
+ 
+ #: recvattach.c:775
+--- a/po/hu.po
++++ b/po/hu.po
+@@ -3888,7 +3888,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Nem tudom hogyan kell nyomtatni a(z) %s csatolást!"
+ 
+ #: recvattach.c:775
+--- a/po/id.po
++++ b/po/id.po
+@@ -3773,7 +3773,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Saya tidak tahu bagaimana mencetak lampiran %s!"
+ 
+ #: recvattach.c:775
+--- a/po/it.po
++++ b/po/it.po
+@@ -3859,7 +3859,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Non so come stampare allegati %s!"
+ 
+ #: recvattach.c:775
+--- a/po/ja.po
++++ b/po/ja.po
+@@ -3797,7 +3797,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "¤É¤Î¤è¤¦¤ËźÉÕ¥Õ¥¡¥¤¥ë %s ¤ò°õºþ¤¹¤ë¤«ÉÔÌÀ!"
+ 
+ #: recvattach.c:775
+--- a/po/ko.po
++++ b/po/ko.po
+@@ -3863,7 +3863,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "÷ºÎ¹° %sÀÇ Ãâ·Â ¹æ¹ýÀ» ¾Ë ¼ö ¾øÀ½!"
+ 
+ #: recvattach.c:775
+--- a/po/lt.po
++++ b/po/lt.po
+@@ -3904,7 +3904,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Að neþinau kaip spausdinti %s priedus!"
+ 
+ #: recvattach.c:775
+--- a/po/nl.po
++++ b/po/nl.po
+@@ -3771,7 +3771,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Kan %s bijlagen niet afdrukken!"
+ 
+ #: recvattach.c:775
+--- a/po/pl.po
++++ b/po/pl.po
+@@ -3788,7 +3788,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Nie wiem jak wydrukowaæ %s za³±czników!"
+ 
+ #: recvattach.c:775
+--- a/po/pt_BR.po
++++ b/po/pt_BR.po
+@@ -3932,7 +3932,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Eu não sei como imprimir anexos %s!"
+ 
+ #: recvattach.c:775
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -3795,7 +3795,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "îÅÉÚ×ÅÓÔÎÏ ËÁË ÐÅÞÁÔÁÔØ %s ×ÌÏÖÅÎÉÑ!"
+ 
+ #: recvattach.c:775
+--- a/po/sk.po
++++ b/po/sk.po
+@@ -3920,7 +3920,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Neviem ako tlaèi» prílohy %s!"
+ 
+ #: recvattach.c:775
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -3784,7 +3784,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "Jag vet inte hur %s bilagor ska skrivas ut!"
+ 
+ #: recvattach.c:775
+--- a/po/tr.po
++++ b/po/tr.po
+@@ -3806,7 +3806,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "%s eklerinin nasıl yazdırılacağı bilinmiyor!"
+ 
+ #: recvattach.c:775
+--- a/po/uk.po
++++ b/po/uk.po
+@@ -3846,7 +3846,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "ñ ÎÅ ÚÎÁÀ, ÑË ÄÒÕËÕ×ÁÔÉ ÄÏÄÁÔËÉ ÔÉÐÕ %s!"
+ 
+ #: recvattach.c:775
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -3763,7 +3763,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "我不知道要怎么打印附件 %s！"
+ 
+ #: recvattach.c:775
+--- a/po/zh_TW.po
++++ b/po/zh_TW.po
+@@ -3900,7 +3900,7 @@
+ 
+ #: recvattach.c:710
+ #, c-format
+-msgid "I dont know how to print %s attachments!"
++msgid "I don't know how to print %s attachments!"
+ msgstr "我不知道要怎麼列印 %s 附件!"
+ 
+ #: recvattach.c:775