changeset: 6320:8c5ea668e7e0 user: Brendan Cully <bren...@kublai.com> date: Thu Oct 17 22:43:05 2013 -0700 link: http://dev.mutt.org/hg/mutt/rev/8c5ea668e7e0
automatic post-release commit for mutt-1.5.22 changeset: 6321:941ba77040a8 user: Brendan Cully <bren...@kublai.com> date: Thu Oct 17 22:43:06 2013 -0700 link: http://dev.mutt.org/hg/mutt/rev/941ba77040a8 Added tag mutt-1-5-22-rel for changeset 8c5ea668e7e0 changeset: 6322:6f5fe49fdf64 user: Brendan Cully <bren...@kublai.com> date: Thu Oct 17 22:55:27 2013 -0700 link: http://dev.mutt.org/hg/mutt/rev/6f5fe49fdf64 mutt-1.5.22 signed diffs (truncated from 87277 to 950 lines): diff -r 5648f4b2ed44 -r 6f5fe49fdf64 .hgsigs --- a/.hgsigs Wed Oct 16 16:04:29 2013 +0000 +++ b/.hgsigs Thu Oct 17 22:55:27 2013 -0700 @@ -5,3 +5,4 @@ a4b47ac32d32678c5c2d149d8770c97fbbf9aafb 0 iEYEABECAAYFAkliqKcACgkQIigsijWFMDK7ZgCglDuJdAIZ9o4alPTxbLnWJObXVcoAoLjNtqSLiK5hQ5zhciH/Q3kWjQZ7 f399371bb9b0176c35adc9ca3b88ce1d0bc9667b 0 iEYEABECAAYFAko1TMMACgkQIigsijWFMDI7CQCfZm4chcPLu5RVgsNG1TWFVdoL8NMAoLCeGF/Lvct99CBZC9pIdJq7KDqL 25a7f8f7d50dbd2f301417fcb1c9d1337a8268bd 0 iEYEABECAAYFAkyRAHwACgkQIigsijWFMDIWjQCg/pnBwlQFykA00IAaf6TX236jILEAnjRjPytge6U6aI2gX7jm6uNTV8WC +8c5ea668e7e072cfd7161023553b68072545f2d1 0 iEYEABECAAYFAlJgzU8ACgkQIigsijWFMDIuigCfVBvMqZv1zgSknLjMdTLse7pIH5AAnRSGGzu58aQ7YoJU15bevmWA91/H diff -r 5648f4b2ed44 -r 6f5fe49fdf64 .hgtags --- a/.hgtags Wed Oct 16 16:04:29 2013 +0000 +++ b/.hgtags Thu Oct 17 22:55:27 2013 -0700 @@ -97,3 +97,4 @@ a4b47ac32d32678c5c2d149d8770c97fbbf9aafb mutt-1-5-19-rel f399371bb9b0176c35adc9ca3b88ce1d0bc9667b mutt-1-5-20-rel 25a7f8f7d50dbd2f301417fcb1c9d1337a8268bd mutt-1-5-21-rel +8c5ea668e7e072cfd7161023553b68072545f2d1 mutt-1-5-22-rel diff -r 5648f4b2ed44 -r 6f5fe49fdf64 ChangeLog --- a/ChangeLog Wed Oct 16 16:04:29 2013 +0000 +++ b/ChangeLog Thu Oct 17 22:55:27 2013 -0700 @@ -1,3 +1,374 @@ +2013-10-16 16:04 +0000 Michael Elkins <m...@sigpipe.org> (5648f4b2ed44) + + * rfc822.c: Rework logic to avoid advancing list pointer inside the + for loop. + + closes #3531 + +2013-10-15 15:41 +0000 Ivan Vilata i Balaguer <i...@selidor.net> (20954d6af1b1) + + * po/ca.po: updated Catalan translation + +2013-10-11 15:51 +0000 Vsevolod Volkov <v...@mutt.org.ua> (d60465c5ee6a) + + * po/uk.po: updated Ukranian translation + +2013-10-11 15:49 +0000 Tamotsu TAKAHASHI <tta...@lapis.plala.or.jp> (b9ba481ed72a) + + * po/ja.po: updated Japanese translation + +2013-10-07 17:32 +0000 Michael Elkins <m...@sigpipe.org> (804e46bc366e) + + * doc/pgpewrap.man, doc/pgpring.man: add missing files that were + supposed to be included with + [76f8df0ac80396559aa80e7f145be6f235a6db51] + +2013-10-07 17:21 +0000 hhorak <hho...@redhat.com> (76f8df0ac803) + + * doc/Makefile.am, doc/PGP-Notes.txt: adds some missing options in doc + and adds man pages for binaries pgpewrap and pgpring. + + closes #3643 + +2013-10-07 17:09 +0000 esr <e...@thyrsus.com> (8d888e4d4f0b) + + * doc/makedoc.c, doc/muttrc.man.head: Problems with muttrc.5: + + Ambiguous or invalid backslash. This doesn't cause groff a problem. + but it confuses doclifter and may confuse older troff + implementations. + + Unknown or invalid macro. That is, one that does not fit in the + macro set that the man page seems to be using. This is a serious + error; it often means part of your text is being lost or rendered + incorrectly. + + Use local definitions of .EX/.EE or .DS/.DE to avoid low-level troff + requests in the page body. There are plans to add these to groff + man; in the interim, this patch adds a compatible definition to your + page. + +2013-10-07 16:10 +0000 esr <e...@thyrsus.com> (02234de89d2a) + + * doc/mutt.man: Problems with mutt.1: + + Ambiguous or invalid backslash. This doesn't cause groff a problem. + but it confuses doclifter and may confuse older troff + implementations. + + Spelling error or typo. + +2013-10-06 09:31 -0700 nihilhill <nihilh...@gmail.com> (24bb691dcde7) + + * crypt-gpgme.c: include <stdbool.h> for definition 'true' + + closes #3642 + +2013-10-05 15:57 +0800 Kevin McCarthy <ke...@8t8.us> (035306822940) + + * attach.c: Fix segfault when viewing text attachments in compose + menu. (closes #3644) + + The segfault was introduced in changeset b9f9e3147eb4. Since + decoding and charset conversion aren't needed for attachments when + composing a message, this patch reverts to just using + mutt_save_attachment() to view "raw data" for text attachments in + the compose/send case. + + This patch is based on Michael Elkins' patch at http://dev.mutt.org/ + trac/attachment/ticket/3644/view_attach_compose_segfault with just a + missing return value check added. + +2013-10-06 14:32 +0000 Aaron Schrab <aaron+m...@schrab.com> (6bcde5f1c7a7) + + * commands.c, hook.c, imap/command.c, imap/imap.c: Ensure that BUFFER + variables are initialized to prevent later attempts to traverse an + uninitialized pointer. + +2013-10-05 19:25 +0000 Aaron Schrab <aaron+m...@schrab.com> (132861c8b4e9) + + * commands.c, hook.c, imap/command.c, imap/imap.c, imap/message.c, + init.c, keymap.c, pattern.c, score.c: Consistently use + mutt_buffer_init function + + Despite the existence of the mutt_buffer_init function, most + initializations were instead done with memset. Use the specific + function instead to make it easier if later changes are made to how + the initialization should be done. + +2013-10-04 16:47 +0000 Michael Elkins <m...@sigpipe.org> (0beba37c336b) + + * crypt-gpgme.c, handler.c, init.c, pop_auth.c: fix more comment typos + +2013-07-23 14:07 +0200 OndÅej BÃlka <nel...@seznam.cz> (bc7e7cf0fed3) + + * compose.c, crypt-gpgme.c, crypt-mod.h, curs_lib.c, date.c, + doc/makedoc.c, editmsg.c, handler.c, imap/util.c, init.c, + intl/gettextP.h, intl/plural.c, keymap.c, lib.c, mbox.c, mkdtemp.c, + mutt.h, mutt_menu.h, mutt_ssl.c, mutt_ssl_gnutls.c, muttlib.c, mx.c, + parse.c, pattern.c, pop.c, pop_auth.c, pop_lib.c, recvcmd.c, + regex.c, send.c, signal.c, smime.c, snprintf.c, sort.h, thread.c: + fix typos in comments + +2013-04-16 20:12 -0700 Kevin McCarthy <ke...@8t8.us> (d3096e8796e7) + + * pager.c: Don't exit pager if quit=ask is answered "no". + + This patch addresses ticket 2788. + + Currently if you quit ('Q') from inside the pager, with quit=ask-yes + or quit=ask-no, and you respond "no", mutt leaves you back in the + index menu. + + This patch changes it so that mutt does not exit the pager. + +2013-04-11 02:17 +0000 Michael Elkins <m...@sigpipe.org> (4c5163272b9c) + + * browser.c, enter.c, imap/message.c, init.c, mbox.c, muttlib.c, mx.c, + pop.c, query.c, smime.c, system.c: backout c1371176ea45 + +2013-04-11 01:59 +0000 Michael Elkins <m...@sigpipe.org> (f99e91980f0f) + + * getdomain.c, init.c: Backed out changeset 1142ed8974fa + +2013-04-10 23:40 +0000 Michael Elkins <m...@sigpipe.org> (1142ed8974fa) + + * getdomain.c, init.c: use gethostname() to determine the system host + name + + use getaddrinfo() to look up canonical DNS name, and fall back to + hinting from /etc/resolv.conf + + see #3298 + +2013-04-10 22:38 +0000 Michael Elkins <m...@sigpipe.org> (c1371176ea45) + + * browser.c, enter.c, imap/message.c, init.c, mbox.c, muttlib.c, mx.c, + pop.c, query.c, smime.c, system.c: fix various compiler warnings; + most were due to unchecked return values from system calls. + +2013-03-04 04:14 +0000 is <i...@netbsd.org> (d498f0e91914) + + * lib.c: use mkdtemp() to create temporary directory rather than + mktemp() followed by mkdir() + + closes #3637 + +2013-02-23 03:12 +0000 Michael Elkins <m...@sigpipe.org> (4c16c0d1ba9e) + + * pop.c, pop_lib.c: use of sscanf() had undefined behavior, replace + with simple parsing instead + + see #3636 + +2013-02-22 18:31 +0000 Michael Elkins <m...@sigpipe.org> (c7eff98bb299) + + * smime.c: increase string size by one byte to accomodate the + terminating null character in fscanf() since the maximum field width + does not include it + + closes #3636 + + hat tip: Will Fiveash + +2013-02-22 16:30 +0000 john beck <john.b...@oracle.com> (14596ac2b323) + + * rfc1524.c, sendlib.c: fix potential buffer overflow in off-by-one + bounds checking error + + closes #3635 + +2013-02-08 17:06 +0000 Michael Elkins <m...@sigpipe.org> (302044b4ed3f) + + * curs_lib.c: explicitly call mutt_refresh() prior to endwin() to + force a screen redraw. + + [4903e80356d3] removed the call, but some environments (screen+xterm + under SuSE11/12) don't properly flush without it prior to the + endwin() call + +2013-01-31 05:06 +0000 Michael Elkins <m...@sigpipe.org> (2a1c5d3dd72e) + + * curs_lib.c: do not use mutt_message() to display prompt in + mutt_yesorno(). + + properly calculate screen width of prompt string by using + mutt_strwidth() rather than strlen() + + use safe_asprintf() return the formatted yes/no string since + specifying COLS+1 is wrong when dealing with multibyte characters + + closes #3412 closes #3352 + +2013-01-23 21:52 +0000 Michael Elkins <m...@sigpipe.org> (b86b154f3988) + + * buffy.c, buffy.h, mh.c, mx.h: add support for $mail_check_recent to + mh mailbox driver + + closes #3629 + +2013-01-23 19:52 +0000 Michael Elkins <m...@sigpipe.org> (4903e80356d3) + + * curs_lib.c: do not explicitly reset the terminal attributes and move + the cursor in mutt_endwin(). endwin() itself should handle this. + + closes #3627 + +2013-01-22 02:02 +0000 Michael Elkins <m...@sigpipe.org> (acc8b2afdf29) + + * configure.ac: remove PKG_CHECK_MODULE() check and always use + AC_CHECK_HEADERS() + + only check for <idn/idna.h> when <idna.h> isn't found + + closes #3626 + +2013-01-20 21:45 +0000 Michael Elkins <m...@sigpipe.org> (98e031cd81d4) + + * configure.ac, main.c, mutt_idna.h: use pkg-config to look for libidn + if available. + + checking <idn/idna.h> rather than including -I/usr/include/idn for + Solaris 11. + + closes #3624 + +2013-01-17 23:04 +0000 Michael Elkins <m...@sigpipe.org> (7fcc0049f250) + + * attach.c: backout [392e945dfba7] + + closes #3293 see #3234 + +2013-01-17 23:03 +0000 Michael Elkins <m...@sigpipe.org> (b9f9e3147eb4) + + * attach.c: when falling back to viewing an attachment as text in the + internal pager, perform charset conversion + + this change is meant to replace [392e945dfba7] + + see #3234 see #3293 + +2013-01-17 02:43 +0000 Michael Elkins <m...@sigpipe.org> (571e945d6544) + + * hcache.c, hcache.h, imap/util.c, mh.c, pop.c: use a separate flag + for mutt_hcache_store() to signal that the gettimeofday() value + should be substituted, so that a 0 uidvalidity can be used by the + imap driver. + + closes #3501 + +2013-01-17 02:10 +0000 Michael Elkins <m...@sigpipe.org> (b58cdfacfb89) + + * attach.c, handler.c, protos.h: change semantics of + mutt_is_autoview() to return 1 if there is a matching mailcap entry + and either $implicit_autoview is set or the MIME type matches the + user's auto_view list. + + closes #3496 closes #3426 + +2013-01-14 20:39 -0800 Michael Elkins <m...@mutt.org> (1a75c9e477b4) + + * from.c: detect pipermail-style obscured return path in mbox From + lines + + see #1200 + +2013-01-14 19:23 -0800 Michael Elkins <m...@mutt.org> (8c75478735a3) + + * curs_main.c: allow use of sync-mailbox when the current limit has no + visible messages + + closes #3538 + +2013-01-14 08:50 -0800 Michael Elkins <m...@sigpipe.org> (05cd8d0d1450) + + * handler.c: avoid debug warning about trailing whitespace in a base64 + encoded attachment + + closes #3558 + +2013-01-04 04:05 +0000 Michael Elkins <m...@sigpipe.org> (90f7869decec) + + * Makefile.am: When "make install" fails to chgrp or chmod the + mutt_dotlock binary, add the reason why we are doing this so the + user knows what to look for. + +2013-01-03 16:12 -0800 Michael Elkins <m...@sigpipe.org> (d7d26c40e1e5) + + * pager.c: Fix regression introduced by [10cc06eff52b] where the + CLEARLINE() removal was not replaced by a move() to position the + cursor at the correct location to draw the status bar. + + closes #3619 + +2013-01-03 19:04 +0000 Michael Elkins <m...@sigpipe.org> (7fe92ce1cfc1) + + * parse.c: Remove unused variable `matched'. + +2013-01-03 19:04 +0000 Michael Elkins <m...@sigpipe.org> (6f4ce8ce80a7) + + * parse.c: Fix memory leak when multiple x-label or supersedes header + fields exist in the header. + + In order to keep the current behavior where the value of the last + header field present is the one used, free any previous value. + +2013-01-03 08:03 -0800 Michael Elkins <m...@sigpipe.org> (21457574a9b6) + + * main.c: Backed out changeset bf84f24e512d + +2013-01-02 23:43 +0000 Michael Elkins <m...@sigpipe.org> (bf84f24e512d) + + * main.c: display +/-NCURSES_WIDECHAR when displaying ncurses version + to show whether we are linked against -lncurses or -lncursesw + +2013-01-01 21:39 +0100 Matthias Andree <matthias.and...@gmx.de> (ea52317444ef) + + * hcache.c: Drop unneeded variable HEADER_CACHE that causes clang + warnings. + + The variable was unused and clang warned that it was not emitted to + the .o file. + +2012-12-31 23:29 +0000 Michael Elkins <m...@sigpipe.org> (32ec63debe52) + + * init.h: fix xml validation error in manual.xml in auto-generated + content due to missing paragraph mark in the $editor docstring + +2012-12-31 15:03 -0800 guns <s...@sungpae.com> (474e9e809054) + + * rfc822.c: Fix accidental var redeclation with --enable-exact-address + + closes #3615 + +2012-12-31 14:54 -0800 Michael Elkins <m...@sigpipe.org> (bf6bf2a80c35) + + * merge + +2012-12-31 14:52 -0800 Michael Elkins <m...@sigpipe.org> (5196c3d6c5d0) + + * curs_lib.c: reset to color normal before clearing to end of line + when printing a message/error string + + closes #3617 + +2012-12-31 19:06 +0000 Michael Elkins <m...@sigpipe.org> (ca67a3dad949) + + * doc/gen-map-doc: update regexp to include const keyword. The auto + generated documentation of functions was failing due to a change in + the source code format. + +2012-12-30 19:48 -0800 Antonio Radici <anto...@dyne.org> (b1b49019fec0) + + * headers.c: Ensure that the in-reply-to header field was actually + present before deciding it was removed. + + closes #3378 + +2012-12-30 19:17 -0800 Michael Elkins <m...@sigpipe.org> (a90f57e0adbd) + + * ChangeLog: update ChangeLog + 2012-12-30 19:14 -0800 Michael Elkins <m...@sigpipe.org> (c03ba94d8750) * imap/message.c: add __FREE_CHECKED__ diff -r 5648f4b2ed44 -r 6f5fe49fdf64 VERSION --- a/VERSION Wed Oct 16 16:04:29 2013 +0000 +++ b/VERSION Thu Oct 17 22:55:27 2013 -0700 @@ -1,1 +1,1 @@ -1.5.21 +1.5.22 diff -r 5648f4b2ed44 -r 6f5fe49fdf64 po/bg.po --- a/po/bg.po Wed Oct 16 16:04:29 2013 +0000 +++ b/po/bg.po Thu Oct 17 22:55:27 2013 -0700 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Mutt 1.5.5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 10:09-0700\n" +"POT-Creation-Date: 2013-10-17 22:42-0700\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP1251\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,12 +24,12 @@ msgid "Password for %s@%s: " msgstr "Ïàðîëà çà %s@%s: " -#: addrbook.c:37 browser.c:46 pager.c:1530 postpone.c:41 query.c:48 +#: addrbook.c:37 browser.c:46 pager.c:1531 postpone.c:41 query.c:48 #: recvattach.c:53 msgid "Exit" msgstr "Èçõîä" -#: addrbook.c:38 curs_main.c:406 pager.c:1537 postpone.c:42 +#: addrbook.c:38 curs_main.c:406 pager.c:1538 postpone.c:42 msgid "Del" msgstr "Èçòð." @@ -42,8 +42,8 @@ msgstr "Èçáîð" #. __STRCAT_CHECKED__ -#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:3827 curs_main.c:412 -#: mutt_ssl.c:988 mutt_ssl_gnutls.c:875 pager.c:1629 pgpkey.c:522 +#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:3832 curs_main.c:412 +#: mutt_ssl.c:1034 mutt_ssl_gnutls.c:893 pager.c:1630 pgpkey.c:522 #: postpone.c:44 query.c:53 recvattach.c:57 smime.c:425 msgid "Help" msgstr "Ïîìîù" @@ -107,7 +107,7 @@ msgid "Error seeking in alias file" msgstr "Ãðåøêà ïðè ïîêàçâàíåòî íà ôàéëà" -#: attach.c:113 attach.c:245 attach.c:477 attach.c:973 +#: attach.c:113 attach.c:245 attach.c:400 attach.c:925 msgid "Can't match nametemplate, continue?" msgstr "Íÿìà øàáëîí ñ òîâà èìå. Æåëàåòå ëè äà ïðîäúëæèòå?" @@ -117,8 +117,8 @@ msgid "Mailcap compose entry requires %%s" msgstr "Çàïèñúò \"compose\" â mailcap èçèñêâà %%s" -#: attach.c:134 attach.c:266 commands.c:223 compose.c:1179 curs_lib.c:180 -#: curs_lib.c:548 +#: attach.c:134 attach.c:266 commands.c:223 compose.c:1175 curs_lib.c:180 +#: curs_lib.c:551 #, c-format msgid "Error running \"%s\"!" msgstr "Ãðåøêà ïðè èçïúëíåíèåòî íà \"%s\"!" @@ -152,49 +152,49 @@ msgid "No mailcap edit entry for %s" msgstr " mailcap ëèïñâà çàïèñ \"edit\" çà %s" -#: attach.c:443 +#: attach.c:366 msgid "No matching mailcap entry found. Viewing as text." msgstr "" "Íå å íàìåðåíî ïîäõîäÿùî mailcap âïèñâàíå. Ïðèëîæåíèåòî å ïîêàçàíî êàòî òåêñò." -#: attach.c:456 +#: attach.c:379 msgid "MIME type not defined. Cannot view attachment." msgstr "Íåäåôèíèðàí MIME òèï. Ïðèëîæåíèåòî íå ìîæå äà áúäå ïîêàçàíî." -#: attach.c:546 +#: attach.c:469 msgid "Cannot create filter" msgstr "Ôèëòúðúò íå ìîæå äà áúäå ñúçäàäåí" -#: attach.c:554 +#: attach.c:477 #, c-format msgid "---Command: %-20.20s Description: %s" msgstr "" -#: attach.c:558 +#: attach.c:481 #, c-format msgid "---Command: %-30.30s Attachment: %s" msgstr "" -#: attach.c:604 +#: attach.c:558 #, fuzzy, c-format msgid "---Attachment: %s: %s" msgstr "-- Ïðèëîæåíèÿ" -#: attach.c:607 +#: attach.c:561 #, fuzzy, c-format msgid "---Attachment: %s" msgstr "-- Ïðèëîæåíèÿ" -#: attach.c:677 attach.c:709 attach.c:1006 attach.c:1064 handler.c:1285 +#: attach.c:631 attach.c:663 attach.c:958 attach.c:1016 handler.c:1360 #: pgpkey.c:570 pgpkey.c:759 msgid "Can't create filter" msgstr "Ãðåøêà ïðè ñúçäàâàíåòî íà ôèëòúð" -#: attach.c:845 +#: attach.c:797 msgid "Write fault!" msgstr "Ãðåøêà ïðè çàïèñ!" -#: attach.c:1087 +#: attach.c:1039 msgid "I don't know how to print that!" msgstr "Íåâúçìîæíî îòïå÷àòâàíå!" @@ -280,8 +280,8 @@ #: browser.c:1139 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? " msgstr "" -"Îáðàòíî ïîäðåæäàíå ïî äàòà(d), àçáó÷åí ðåä(a), ðàçìåð(z) èëè áåç ïîäðåæäàíå" -"(n)?" +"Îáðàòíî ïîäðåæäàíå ïî äàòà(d), àçáó÷åí ðåä(a), ðàçìåð(z) èëè áåç " +"ïîäðåæäàíå(n)?" #: browser.c:1140 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? " @@ -304,7 +304,7 @@ msgid "Error trying to view file" msgstr "Ãðåøêà ïðè ïîêàçâàíåòî íà ôàéëà" -#: buffy.c:486 +#: buffy.c:487 msgid "New mail in " msgstr "Íîâè ïèñìà â " @@ -350,7 +350,7 @@ msgid "%s: no such attribute" msgstr "%s: íÿìà òàêúâ àòðèáóò" -#: color.c:705 hook.c:69 hook.c:77 keymap.c:902 +#: color.c:705 hook.c:69 hook.c:77 keymap.c:906 msgid "too few arguments" msgstr "íåäîñòàòú÷íî àðãóìåíòè" @@ -367,7 +367,7 @@ msgid "Verify PGP signature?" msgstr "Æåëàåòå ëè äà ïîòâúðäèòå èñòèííîñòòà íà PGP-ïîäïèñà?" -#: commands.c:115 mbox.c:787 +#: commands.c:115 mbox.c:786 msgid "Could not create temporary file!" msgstr "Íåâúçìîæíî ñúçäàâàíåòî íà âðåìåíåí ôàéë!" @@ -494,17 +494,17 @@ #: commands.c:536 #, fuzzy msgid "" -"Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s" -"(p)am?: " +"Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/" +"s(p)am?: " msgstr "" -"Îáðàòíî ïîäðåæäàíå ïî: äàòà íà èçïðàùàíå(d)/îò(f)/äàòà íà ïîëó÷àâàíå(r)/òåìà" -"(s)/ïîëó÷àòåë(o)/íèøêà(t)/áåç ïîäðåæäàíå(u)/ðàçìåð(z)/âàæíîñò(c)?: " +"Îáðàòíî ïîäðåæäàíå ïî: äàòà íà èçïðàùàíå(d)/îò(f)/äàòà íà ïîëó÷àâàíå(r)/" +"òåìà(s)/ïîëó÷àòåë(o)/íèøêà(t)/áåç ïîäðåæäàíå(u)/ðàçìåð(z)/âàæíîñò(c)?: " #: commands.c:537 #, fuzzy msgid "" -"Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)" -"am?: " +"Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/" +"s(p)am?: " msgstr "" "Ïîäðåæäàíå ïî: äàòà íà èçïðàùàíå(d)/îò(f)/äàòà íà ïîëó÷àâàíå(r)/òåìà(s)/" "ïîëó÷àòåë(o)/íèøêà(t)/áåç ïîäðåæäàíå(u)/ðàçìåð(z)/âàæíîñò(c)?: " @@ -518,65 +518,65 @@ msgid "Shell command: " msgstr "Øåë êîìàíäà: " -#: commands.c:738 +#: commands.c:741 #, c-format msgid "Decode-save%s to mailbox" msgstr "Äåêîäèðàíå è çàïèñ íà%s â ïîùåíñêà êóòèÿ" -#: commands.c:739 +#: commands.c:742 #, c-format msgid "Decode-copy%s to mailbox" msgstr "Äåêîäèðàíå è êîïèðàíå íà%s â ïîùåíñêà êóòèÿ" -#: commands.c:740 +#: commands.c:743 #, c-format msgid "Decrypt-save%s to mailbox" msgstr "Äåøèôðèðàíå è çàïèñ íà%s â ïîùåíñêà êóòèÿ" -#: commands.c:741 +#: commands.c:744 #, c-format msgid "Decrypt-copy%s to mailbox" msgstr "Äåøèôðèðàíå è çàïèñ íà%s â ïîùåíñêà êóòèÿ" -#: commands.c:742 +#: commands.c:745 #, c-format msgid "Save%s to mailbox" msgstr "Çàïèñ íà%s â ïîùåíñêà êóòèÿ" -#: commands.c:742 +#: commands.c:745 #, c-format msgid "Copy%s to mailbox" msgstr "Êîïèðàíå íà%s â ïîùåíñêà êóòèÿ" -#: commands.c:743 +#: commands.c:746 msgid " tagged" msgstr " ìàðêèðàí" -#: commands.c:816 +#: commands.c:819 #, c-format msgid "Copying to %s..." msgstr "Ñúçäàâàíå íà êîïèå â %s..." -#: commands.c:932 +#: commands.c:935 #, c-format msgid "Convert to %s upon sending?" msgstr "Æåëàåòå ëè äà ãî êîíâåðòèðàòå äî %s ïðè èçïðàùàíå?" -#: commands.c:942 +#: commands.c:945 #, c-format msgid "Content-Type changed to %s." msgstr "Content-Type å ïðîìåíåí íà %s." -#: commands.c:947 +#: commands.c:950 #, c-format msgid "Character set changed to %s; %s." msgstr "Êîäîâàòà òàáëèöà å ïðîìåíåíà íà %s; %s." -#: commands.c:949 +#: commands.c:952 msgid "not converting" msgstr "íå å êîíâåðòèðàíî" -#: commands.c:949 +#: commands.c:952 msgid "converting" msgstr "êîíâåðòèðàíî" @@ -588,11 +588,11 @@ msgid "Send" msgstr "Èçïðàùàíå" -#: compose.c:90 remailer.c:488 +#: compose.c:90 remailer.c:481 msgid "Abort" msgstr "Îòêàç" -#: compose.c:94 compose.c:664 +#: compose.c:94 compose.c:660 msgid "Attach file" msgstr "Ïðèëàãàíå íà ôàéë" @@ -600,325 +600,325 @@ msgid "Descrip" msgstr "Îïèñàíèå" -#: compose.c:119 +#: compose.c:117 #, fuzzy msgid "Not supported" msgstr "Ìàðêèðàíåòî íå ñå ïîääúðæà." -#: compose.c:124 +#: compose.c:122 msgid "Sign, Encrypt" msgstr "Ïîäïèñ, Øèôðîâàíå" -#: compose.c:126 +#: compose.c:124 msgid "Encrypt" msgstr "Øèôðîâàíå" -#: compose.c:128 +#: compose.c:126 msgid "Sign" msgstr "Ïîäïèñ" -#: compose.c:130 +#: compose.c:128 msgid "None" msgstr "" -#: compose.c:137 +#: compose.c:135 #, fuzzy msgid " (inline PGP)" msgstr "(ïî-íàòàòúê)\n" -#: compose.c:139 +#: compose.c:137 msgid " (PGP/MIME)" msgstr "" -#: compose.c:143 +#: compose.c:141 msgid " (S/MIME)" msgstr "" -#: compose.c:152 compose.c:156 +#: compose.c:150 compose.c:154 msgid " sign as: " msgstr " ïîäïèñ êàòî: " -#: compose.c:152 compose.c:156 +#: compose.c:150 compose.c:154 msgid "<default>" msgstr "<ïî ïîäðàçáèðàíå>" -#: compose.c:164 +#: compose.c:162 msgid "Encrypt with: " msgstr "Øèôðîâàíå c: " -#: compose.c:218 +#: compose.c:215 #, c-format msgid "%s [#%d] no longer exists!" msgstr "%s [#%d] âå÷å íå ñúùåñòâóâà!" -#: compose.c:226 +#: compose.c:223 #, c-format msgid "%s [#%d] modified. Update encoding?" msgstr "%s [#%d] å ïðîìåíåíî. Æåëàåòå ëè äà îïðåñíèòå êîäèðàíåòî?" -#: compose.c:269 +#: compose.c:266 msgid "-- Attachments" msgstr "-- Ïðèëîæåíèÿ" -#: compose.c:299 +#: compose.c:294 #, c-format msgid "Warning: '%s' is a bad IDN." msgstr "Ïðåäóïðåæäåíèå: '%s' å íåâàëèäåí IDN." -#: compose.c:322 +#: compose.c:317 msgid "You may not delete the only attachment." msgstr "Íå ìîæå äà èçòðèåòå åäèíñòâåíàòà ÷àñò íà ïèñìîòî." -#: compose.c:597 send.c:1586 +#: compose.c:593 send.c:1598 #, c-format msgid "Bad IDN in \"%s\": '%s'" msgstr "Ëîø IDN â \"%s\": '%s'" -#: compose.c:680 +#: compose.c:676 msgid "Attaching selected files..." msgstr "Ïðèëàãàíå íà èçáðàíèòå ôàéëîâå..." -#: compose.c:692 +#: compose.c:688 #, c-format msgid "Unable to attach %s!" msgstr "Ïðèëàãàíåòî íà %s å íåâúçìîæíî!" -#: compose.c:711 +#: compose.c:707 msgid "Open mailbox to attach message from" msgstr "Îòâàðÿíå íà ïîùåíñêà êóòèÿ, îò êîÿòî äà áúäå ïðèëîæåíî ïèñìî" -#: compose.c:749 +#: compose.c:745 msgid "No messages in that folder." msgstr " òàçè êóòèÿ íÿìà ïèñìà." -#: compose.c:758 +#: compose.c:754 msgid "Tag the messages you want to attach!" msgstr "Ìàðêèðàéòå ïèñìàòà, êîèòî èñêàòå äà ïðèëîæèòå!" -#: compose.c:790 +#: compose.c:786 msgid "Unable to attach!" msgstr "Ïðèëàãàíåòî å íåâúçìîæíî!" -#: compose.c:841 +#: compose.c:837 msgid "Recoding only affects text attachments." msgstr "Ïðîìÿíàòà íà êîäèðàíåòî çàñÿãà ñàìî òåêñòîâèòå ïðèëîæåíèÿ." -#: compose.c:846 +#: compose.c:842 msgid "The current attachment won't be converted." msgstr "Òîâà ïðèëîæåíèå íÿìà äà áúäå ïðåêîäèðàíî." -#: compose.c:848 +#: compose.c:844 msgid "The current attachment will be converted." msgstr "Òîâà ïðèëîæåíèå ùå áúäå ïðåêîäèðàíî." -#: compose.c:923 +#: compose.c:919 msgid "Invalid encoding." msgstr "Èçáðàíî å íåâàëèäíî êîäèðàíå." -#: compose.c:949 +#: compose.c:945 msgid "Save a copy of this message?" msgstr "Æåëàåòå ëè äà çàïàçèòå êîïèå îò òîâà ïèñìî?" -#: compose.c:1005 +#: compose.c:1001 msgid "Rename to: " msgstr "Ïðåèìåíóâàíå â: " -#: compose.c:1010 editmsg.c:96 editmsg.c:121 sendlib.c:872 +#: compose.c:1006 editmsg.c:96 editmsg.c:121 sendlib.c:872 #, c-format msgid "Can't stat %s: %s" msgstr "Ãðåøêà ïðè îòâàðÿíå íà %s: %s" -#: compose.c:1037 +#: compose.c:1033 msgid "New file: " msgstr "Íîâ ôàéë: " -#: compose.c:1050 +#: compose.c:1046 msgid "Content-Type is of the form base/sub" msgstr "Ïîëåòî Content-Type èìà ôîðìàòà áàçîâ-òèï/ïîäòèï" -#: compose.c:1056 +#: compose.c:1052 #, c-format msgid "Unknown Content-Type %s" msgstr "Íåïîçíàò Content-Type %s" -#: compose.c:1069 +#: compose.c:1065 #, c-format msgid "Can't create file %s" msgstr "Ãðåøêà ïðè ñúçäàâàíå íà ôàéëà %s" -#: compose.c:1077 +#: compose.c:1073 msgid "What we have here is a failure to make an attachment" msgstr "Ãðåøêà ïðè ñúçäàâàíå íà ïðèëîæåíèåòî" -#: compose.c:1138 +#: compose.c:1134 msgid "Postpone this message?" msgstr "Æåëàåòå ëè äà çàïèøåòå ÷åðíîâàòà?" -#: compose.c:1197 +#: compose.c:1193 msgid "Write message to mailbox" msgstr "Çàïèñ íà ïèñìîòî â ïîùåíñêà êóòèÿ" -#: compose.c:1200 +#: compose.c:1196 #, c-format msgid "Writing message to %s ..." msgstr "Çàïèñâàíå íà ïèñìîòî â %s ..." -#: compose.c:1209 +#: compose.c:1205 msgid "Message written." msgstr "Ïèñìîòî å çàïèñàíî." -#: compose.c:1221 +#: compose.c:1217 #, fuzzy msgid "S/MIME already selected. Clear & continue ? " msgstr "S/MIME-øèôðîâàíå âå÷å å èçáðàíî. Clear & continue? " -#: compose.c:1247 +#: compose.c:1243 #, fuzzy msgid "PGP already selected. Clear & continue ? " msgstr "PGP-øèôðîâàíå âå÷å å èçáðàíî. Clear & continue? " -#: crypt-gpgme.c:358 +#: crypt-gpgme.c:348 #, fuzzy, c-format msgid "error creating gpgme context: %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:368 +#: crypt-gpgme.c:358 #, c-format msgid "error enabling CMS protocol: %s\n" msgstr "" -#: crypt-gpgme.c:388 +#: crypt-gpgme.c:378 #, fuzzy, c-format msgid "error creating gpgme data object: %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:454 crypt-gpgme.c:472 crypt-gpgme.c:1431 +#: crypt-gpgme.c:444 crypt-gpgme.c:462 crypt-gpgme.c:1419 #, fuzzy, c-format msgid "error allocating data object: %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:490 +#: crypt-gpgme.c:480 #, fuzzy, c-format msgid "error rewinding data object: %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:512 crypt-gpgme.c:559 +#: crypt-gpgme.c:502 crypt-gpgme.c:549 #, fuzzy, c-format msgid "error reading data object: %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:620 +#: crypt-gpgme.c:610 #, fuzzy, c-format msgid "error adding recipient `%s': %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:658 +#: crypt-gpgme.c:648 #, c-format msgid "secret key `%s' not found: %s\n" msgstr "" -#: crypt-gpgme.c:668 +#: crypt-gpgme.c:658 #, c-format msgid "ambiguous specification of secret key `%s'\n" msgstr "" -#: crypt-gpgme.c:680
