ports/62353: maintainer-update of mail/mutt-devel
Udo Schweigert
udo.schweigert at siemens.com
Wed Feb 4 16:50:46 UTC 2004
>Number: 62353
>Category: ports
>Synopsis: maintainer-update of mail/mutt-devel
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 04 08:50:16 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Udo Schweigert
>Release: FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
>Description:
Maintainer update of mail/mutt-devel:
- Update to mutt 1.5.6.
>How-To-Repeat:
>Fix:
diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile Wed Feb 4 16:13:57 2004
+++ ./Makefile Wed Feb 4 17:41:17 2004
@@ -74,8 +74,7 @@
# WITH_MUTT_IFDEF_PATCH
PORTNAME= mutt-devel
-PORTVERSION= 1.5.5.1
-PORTREVISION= 2
+PORTVERSION= 1.5.6
CATEGORIES+= mail ipv6
.if defined(WITH_MUTT_NNTP)
CATEGORIES+= news
@@ -88,8 +87,10 @@
PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
+ http://www3.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
ftp://ftp2.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
+ ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
http://cedricduval.free.fr/mutt/patches/download/:cd \
http://home.woolridge.ca/mutt/patches/:dw
@@ -123,8 +124,11 @@
.include <bsd.port.pre.mk>
+.if defined(WITH_MUTT_EDIT_THREADS)
+BROKEN= "mutt-devel's edit threads patch appears to be broken"
+.endif
+CD_PATCH_VERSION= 1.5.5.1
CD_IFDEF_PATCH_VERSION= 1.5.4
-DW_PATCH_VERSION= 1.5.5
.if !defined(VVV_PATCH_VERSION)
VVV_PATCH_VERSION= ${PORTVERSION}
.endif
@@ -215,6 +219,7 @@
CONFIGURE_ARGS+= --with-curses=${PREFIX}
.elif defined(USE_SLANG)
CONFIGURE_ARGS+= --with-slang=${PREFIX}
+PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.slang.gz:vvv
.endif
.if defined(WITH_MUTT_CYRUS_SASL)
CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
@@ -232,7 +237,6 @@
.endif
.if defined(WITH_MUTT_NNTP)
PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv
-PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.compose.gz:vvv
CONFIGURE_ARGS+= --enable-nntp
SGML_NEEDED= yes
.endif
diff -ru /usr/ports/mail/mutt-devel/distinfo ./distinfo
--- /usr/ports/mail/mutt-devel/distinfo Tue Feb 3 06:33:12 2004
+++ ./distinfo Wed Feb 4 14:58:58 2004
@@ -1,10 +1,10 @@
-MD5 (mutt/mutt-1.5.5.1i.tar.gz) = 9729ee2a2024b57e2a903ec7753970a5
-MD5 (mutt/patch-1.5.5.1.rr.compressed.gz) = 12bf7e03af3a0d7529dfbdec5dd0f63a
-MD5 (mutt/patch-1.5.5.1.vvv.nntp.gz) = a655b6b5ceb582640172d5476093705d
-MD5 (mutt/patch-1.5.5.1.vvv.compose.gz) = 69e946fe70735d37b9f8e6f6ef6376d1
-MD5 (mutt/patch-1.5.5.1.vvv.initials.gz) = 5abdf15c3f76b5c24f29767e65e0fc32
-MD5 (mutt/patch-1.5.5.1.vvv.quote.gz) = abb2ba5829110cba4be323d6b6f303dc
+MD5 (mutt/mutt-1.5.6i.tar.gz) = aa1433635d7c86beba1675a3408b0324
+MD5 (mutt/patch-1.5.6.vvv.slang.gz) = 11dccb4b178d63d0dbf51afcea3b30c8
+MD5 (mutt/patch-1.5.6.rr.compressed.gz) = 0d57a62f17c93eb1d2eff60e070933b3
+MD5 (mutt/patch-1.5.6.vvv.nntp.gz) = b32ef18006ce8a211ad2d1dabc62bfcb
+MD5 (mutt/patch-1.5.6.vvv.initials.gz) = eecaa646227609b52e5267178b3bc462
+MD5 (mutt/patch-1.5.6.vvv.quote.gz) = f262968775cf5c37ba49b29248fcf170
MD5 (mutt/patch-1.5.5.1.cd.edit_threads.9.5) = a8a3a973d8693f8af526cecf7edbd71f
MD5 (mutt/patch-1.5.5.1.cd.signatures_menu.2.1) = 22caeffb4a612f5fa6e1f585b40c51a6
MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
-MD5 (mutt/p0-patch-1.5.5.dw.mbox-hook.1) = 78c260504082efc900aff809819953cb
+MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
diff -ru /usr/ports/mail/mutt-devel/files/extra-patch-pgp-dw ./files/extra-patch-pgp-dw
--- /usr/ports/mail/mutt-devel/files/extra-patch-pgp-dw Tue Feb 3 06:33:18 2004
+++ ./files/extra-patch-pgp-dw Wed Feb 4 15:42:28 2004
@@ -1,12 +1,12 @@
--- PATCHES Dec 2002 17:44:54 -0000 3.6
-+++ PATCHES Jan 2004 08:46:05 -0000
++++ PATCHES Feb 2004 06:07:13 -0000
@@ -0,0 +1,4 @@
-+patch-1.5.5.dw.multiple-crypt-hook.2
-+patch-1.5.5.dw.confirm-crypt-hook.1
-+patch-1.5.5.dw.crypt-autoselectkey.1
-+patch-1.5.5.dw.pgp-menu-traditional.2
++patch-1.5.6.dw.multiple-crypt-hook.2
++patch-1.5.6.dw.confirm-crypt-hook.1
++patch-1.5.6.dw.crypt-autoselectkey.1
++patch-1.5.6.dw.pgp-menu-traditional.2
--- compose.c Oct 2003 20:34:59 -0000 3.14
-+++ compose.c Jan 2004 08:46:05 -0000
++++ compose.c Feb 2004 06:07:13 -0000
@@ -133,2 +133,9 @@ static void redraw_crypt_lines (HEADER *
addstr (_("Clear"));
+
@@ -80,8 +80,8 @@
+ }
+ }
---- crypt.c Sep 2003 13:03:25 -0000 3.19
-+++ crypt.c Jan 2004 08:46:06 -0000
+--- crypt.c Jan 2004 19:59:38 -0000 3.22
++++ crypt.c Feb 2004 06:07:13 -0000
@@ -161,3 +161,3 @@ int crypt_valid_passphrase(int flags)
-int mutt_protect (HEADER *msg, HEADER *cur, char *keylist)
@@ -135,14 +135,14 @@
+
+ /* go ahead with PGP/MIME */
}
-@@ -391,2 +376,5 @@ int mutt_is_application_pgp (BODY *m)
+@@ -393,2 +378,5 @@ int mutt_is_application_pgp (BODY *m)
}
+ if (t)
+ t |= PGPINLINE;
+
return t;
---- hook.c Jan 2003 12:33:41 -0000 3.7
-+++ hook.c Jan 2004 08:46:07 -0000
+--- hook.c Jan 2004 09:52:55 -0000 3.8
++++ hook.c Feb 2004 06:07:13 -0000
@@ -119,3 +119,7 @@ int mutt_parse_hook (BUFFER *buf, BUFFER
{
+#ifdef M_CRYPTHOOK
@@ -175,9 +175,9 @@
+ }
+ return (key_list);
}
---- init.h Sep 2003 15:10:09 -0000 3.40
-+++ init.h Jan 2004 08:46:07 -0000
-@@ -1211,2 +1211,12 @@ struct option_t MuttVars[] = {
+--- init.h Feb 2004 17:10:43 -0000 3.43
++++ init.h Feb 2004 06:07:14 -0000
+@@ -1205,2 +1205,12 @@ struct option_t MuttVars[] = {
*/
+
+
@@ -190,7 +190,7 @@
+ ** the \fIcrypt-hook\fP command.
+ */
{ "pgp_autosign", DT_SYN, R_NONE, UL "crypt_autosign", 0 },
-@@ -1236,2 +1246,11 @@ struct option_t MuttVars[] = {
+@@ -1230,2 +1240,11 @@ struct option_t MuttVars[] = {
*/
+ { "pgp_confirmhook", DT_SYN, R_NONE, UL "crypt_confirmhook", 1 },
+ { "crypt_confirmhook", DT_BOOL, R_NONE, OPTCRYPTCONFIRMHOOK, 1 },
@@ -202,7 +202,7 @@
+ ** typos are concerned.
+ */
{ "pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, 1},
-@@ -1380,2 +1399,44 @@ struct option_t MuttVars[] = {
+@@ -1374,2 +1393,44 @@ struct option_t MuttVars[] = {
*/
+ { "pgp_create_traditional", DT_SYN, R_NONE, UL "pgp_autoinline", 0 },
+ { "pgp_autoinline", DT_BOOL, R_NONE, OPTPGPAUTOINLINE, 0 },
@@ -247,7 +247,7 @@
+ **
+ */
{ "pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, 1 },
-@@ -1429,11 +1490,8 @@ struct option_t MuttVars[] = {
+@@ -1423,11 +1484,8 @@ struct option_t MuttVars[] = {
*/
- { "pgp_create_traditional", DT_QUAD, R_NONE, OPT_PGPTRADITIONAL, M_NO },
+ { "pgp_mime_ask", DT_QUAD, R_NONE, OPT_PGPMIMEASK, M_NO },
@@ -263,7 +263,7 @@
+ ** automatically sending a (signed/encrypted) message using
+ ** PGP/MIME when inline (traditional) fails (for any reason).
** .pp
-@@ -1441,19 +1499,2 @@ struct option_t MuttVars[] = {
+@@ -1435,19 +1493,2 @@ struct option_t MuttVars[] = {
** \fBdeprecated\fP.
- ** (PGP only)
- */
@@ -283,68 +283,66 @@
- ** .pp
- ** This option overrides ``$$pgp_create_traditional''
** (PGP only)
---- mutt.h Oct 2003 20:34:59 -0000 3.21
-+++ mutt.h Jan 2004 08:46:08 -0000
-@@ -276,3 +276,2 @@ enum
+--- mutt.h Feb 2004 17:10:43 -0000 3.23
++++ mutt.h Feb 2004 06:07:14 -0000
+@@ -278,3 +278,2 @@ enum
OPT_MOVE,
- OPT_PGPTRADITIONAL, /* create old-style PGP messages */
#ifdef USE_POP
-@@ -282,2 +281,3 @@ enum
+@@ -284,2 +283,3 @@ enum
OPT_POSTPONE,
+ OPT_PGPMIMEASK, /* ask to revert to PGP/MIME when inline fails */
OPT_PRINT,
-@@ -429,2 +429,3 @@ enum
+@@ -431,2 +431,3 @@ enum
+ OPTCRYPTAUTOSELECT,
OPTCRYPTAUTOSIGN,
-@@ -440,2 +441,3 @@ enum
+@@ -442,2 +443,3 @@ enum
OPTSDEFAULTDECRYPTKEY,
+ OPTCRYPTCONFIRMHOOK,
OPTPGPIGNORESUB,
-@@ -443,3 +445,2 @@ enum
+@@ -445,3 +447,2 @@ enum
OPTPGPLONGIDS,
- OPTPGPAUTOTRAD,
#if 0
-@@ -451,2 +452,4 @@ enum
+@@ -453,2 +454,4 @@ enum
OPTPGPSHOWUNUSABLE,
+ OPTPGPAUTOINLINE,
+ OPTPGPREPLYINLINE,
-@@ -632,4 +635,4 @@ typedef struct header
+@@ -642,4 +645,4 @@ typedef struct header
{
-- unsigned int security : 7; /* bit 0-4: flags, bit 5,6: application.
+- unsigned int security : 9; /* bit 0-6: flags, bit 7,8: application.
- see: crypt.h pgplib.h, smime.h */
-+ unsigned int security : 9; /* bit 0-6: flags, bit 7,8: application.
++ unsigned int security : 10; /* bit 0-7: flags, bit 8,9: application.
+ see: mutt_crypt.h */
---- mutt_crypt.h Jan 2003 23:54:30 -0000 3.4
-+++ mutt_crypt.h Jan 2004 08:46:08 -0000
-@@ -35,7 +35,9 @@
- #define GOODSIGN (1 << 2)
--#define BADSIGN (1 << 3) /* FIXME: value also used below for PGPKEY */
-+#define BADSIGN (1 << 3)
- #define SIGNOPAQUE (1 << 4)
-+#define KEYBLOCK (1 << 5) /* KEY too generic? */
-+#define INLINE (1 << 6)
-
--#define APPLICATION_PGP (1 << 5)
--#define APPLICATION_SMIME (1 << 6)
-+#define APPLICATION_PGP (1 << 7)
-+#define APPLICATION_SMIME (1 << 8)
+--- mutt_crypt.h Dec 2003 13:04:20 -0000 3.5
++++ mutt_crypt.h Feb 2004 06:07:14 -0000
+@@ -38,6 +38,7 @@
+ #define SIGNOPAQUE (1 << 5)
+-/* (1 << 6) is used by PGPKEY below. */
++#define KEYBLOCK (1 << 6) /* KEY too generic? */
++#define INLINE (1 << 7)
+
+-#define APPLICATION_PGP (1 << 7)
+-#define APPLICATION_SMIME (1 << 8)
++#define APPLICATION_PGP (1 << 8)
++#define APPLICATION_SMIME (1 << 9)
-@@ -44,3 +46,4 @@
+@@ -46,3 +47,4 @@
#define PGPGOODSIGN (APPLICATION_PGP | GOODSIGN)
--#define PGPKEY (APPLICATION_PGP | (1 << 3))
+-#define PGPKEY (APPLICATION_PGP | (1 << 6))
+#define PGPKEY (APPLICATION_PGP | KEYBLOCK)
+#define PGPINLINE (APPLICATION_PGP | INLINE)
-@@ -103,3 +106,3 @@ typedef struct pgp_keyinfo *pgp_key_t;
+@@ -105,3 +107,3 @@ typedef struct pgp_keyinfo *pgp_key_t;
-int mutt_protect (HEADER *, HEADER *, char *);
+int mutt_protect (HEADER *, char *);
--- pgp.c Sep 2003 13:03:26 -0000 3.26
-+++ pgp.c Jan 2004 08:46:09 -0000
++++ pgp.c Feb 2004 06:07:14 -0000
@@ -1018,2 +1018,4 @@ char *pgp_findKeys (ADDRESS *to, ADDRESS
size_t keylist_used = 0;
+ LIST *hook_list = NULL;
@@ -492,7 +490,7 @@
+ mutt_free_list (&hook_list);
--- pgpkey.c Oct 2003 19:55:39 -0000 3.8
-+++ pgpkey.c Jan 2004 08:46:09 -0000
++++ pgpkey.c Feb 2004 06:07:14 -0000
@@ -437,4 +437,9 @@ static int pgp_id_matches_addr (ADDRESS
+
@@ -538,7 +536,7 @@
+ if (!pgp_trusted_id(KeyTable[menu->current]))
{
--- postpone.c Sep 2003 17:22:09 -0000 3.9
-+++ postpone.c Jan 2004 08:46:09 -0000
++++ postpone.c Feb 2004 06:07:14 -0000
@@ -486,2 +486,7 @@ int mutt_parse_crypt_hdr (char *p, int s
+ case 'i':
@@ -547,16 +545,16 @@
+ break;
+
default:
---- protos.h Oct 2003 20:34:59 -0000 3.18
-+++ protos.h Jan 2004 08:46:09 -0000
+--- protos.h Feb 2004 17:10:43 -0000 3.19
++++ protos.h Feb 2004 06:07:14 -0000
@@ -131,3 +131,3 @@ const char *mutt_get_name (ADDRESS *);
char *mutt_get_parameter (const char *, PARAMETER *);
-char *mutt_crypt_hook (ADDRESS *);
+LIST *mutt_crypt_hook (ADDRESS *);
char *mutt_make_date (char *, size_t);
---- send.c Sep 2003 12:56:49 -0000 3.26
-+++ send.c Jan 2004 08:46:10 -0000
-@@ -1256,2 +1256,9 @@ ci_send_message (int flags, /* send mod
+--- send.c Jan 2004 10:03:46 -0000 3.29
++++ send.c Feb 2004 06:07:14 -0000
+@@ -1258,2 +1258,9 @@ ci_send_message (int flags, /* send mod
msg->security |= SIGN;
+ if ((WithCrypto & APPLICATION_PGP) && (msg->security & (ENCRYPT | SIGN)))
+ {
@@ -566,35 +564,35 @@
+ msg->security |= INLINE;
+ }
}
-@@ -1494,3 +1501,3 @@ main_loop:
+@@ -1496,3 +1503,3 @@ main_loop:
if ((crypt_get_keys (msg, &pgpkeylist) == -1) ||
- mutt_protect (msg, cur, pgpkeylist) == -1)
+ mutt_protect (msg, pgpkeylist) == -1)
{
-@@ -1574,3 +1581,3 @@ main_loop:
+@@ -1576,3 +1583,3 @@ main_loop:
- if (mutt_protect (msg, cur, pgpkeylist) == -1)
+ if (mutt_protect (msg, pgpkeylist) == -1)
{
--- sendlib.c Sep 2003 13:03:26 -0000 3.24
-+++ sendlib.c Jan 2004 08:46:11 -0000
++++ sendlib.c Feb 2004 06:07:14 -0000
@@ -2407,2 +2407,4 @@ int mutt_write_fcc (const char *path, HE
}
+ if (hdr->security & INLINE)
+ fputc ('I', msg->fp);
fputc ('\n', msg->fp);
---- doc/manual.sgml.head Oct 2003 20:54:37 -0000 3.22
-+++ doc/manual.sgml.head Jan 2004 08:46:13 -0000
-@@ -1423,3 +1423,5 @@ normally use. The crypt-hook command pr
+--- doc/manual.sgml.head Feb 2004 17:45:33 -0000 3.26
++++ doc/manual.sgml.head Feb 2004 06:07:15 -0000
+@@ -1450,3 +1450,5 @@ normally use. The crypt-hook command pr
specify the ID of the public key to be used when encrypting messages to
-a certain recipient.
+a certain recipient. You may use multiple pgp-hook's with the same
+pattern; multiple matching pgp-hook's result in the use of multiple
+keyids for recipient.
---- doc/muttrc.man.head Sep 2003 16:34:32 -0000 3.9
-+++ doc/muttrc.man.head Jan 2004 08:46:14 -0000
-@@ -289,3 +289,6 @@ to a certain recipient. The meaning of
+--- doc/muttrc.man.head Feb 2004 17:10:43 -0000 3.10
++++ doc/muttrc.man.head Feb 2004 06:07:15 -0000
+@@ -297,3 +297,6 @@ to a certain recipient. The meaning of
broadly: This can be a different e-mail address, a numerical key ID,
-or even just an arbitrary search string.
+or even just an arbitrary search string. You may use multiple
@@ -602,9 +600,9 @@
+\fBpgp-hook\fPs result in the use of multiple \fIkey-id\fPs for
+recipient.
.TP
---- po/ca.po Nov 2003 09:51:09 -0000 3.11
-+++ po/ca.po Jan 2004 08:46:16 -0000
-@@ -599,10 +599,10 @@ msgstr "Xifra amb: "
+--- po/ca.po Feb 2004 18:26:11 -0000 3.13
++++ po/ca.po Feb 2004 06:07:15 -0000
+@@ -603,10 +603,10 @@ msgstr "Xifra amb: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, o en (c)lar? "
@@ -620,25 +618,25 @@
+msgid "esabif"
+msgstr "xsialc"
---- po/cs.po Nov 2003 09:51:09 -0000 3.9
-+++ po/cs.po Jan 2004 08:46:16 -0000
-@@ -683,4 +683,4 @@ msgstr "Za¹ifrovat"
- #, fuzzy
+--- po/cs.po Feb 2004 18:26:11 -0000 3.12
++++ po/cs.po Feb 2004 06:07:16 -0000
+@@ -683,4 +683,4 @@ msgstr "Za¹ifrovat pomocí:"
+ #: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "(¹)ifrovat, (p)odepsat, podepsat (j)ako, (o)bojí, èi (n)ic?"
+-msgstr "PGP - (¹)ifrovat, (p)odepsat, podepsat (j)ako, (o)bojí, èi (n)ic?"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "(¹)ifrovat, (p)odepsat, podepsat (j)ako, (o)bojí, pøí(m)ý, èi (n)ic?"
++msgstr "PGP - (¹)ifrovat, (p)odepsat, podepsat (j)ako, (o)bojí, pøí(m)ý, èi (n)ic?"
-@@ -688,4 +688,4 @@ msgstr "(¹)ifrovat, (p)odepsat, podepsat
+@@ -688,4 +688,4 @@ msgstr "PGP - (¹)ifrovat, (p)odepsat, po
#: compose.c:166
-msgid "esabf"
-msgstr "¹pjon"
+msgid "esabif"
+msgstr "¹pjomn"
---- po/da.po Nov 2003 09:51:09 -0000 3.9
-+++ po/da.po Jan 2004 08:46:16 -0000
-@@ -574,8 +574,8 @@ msgstr "Kryptér"
+--- po/da.po Feb 2004 18:26:11 -0000 3.11
++++ po/da.po Feb 2004 06:07:16 -0000
+@@ -578,8 +578,8 @@ msgstr "Kryptér"
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(k)ryptér, (u)nderskriv, underskriv (s)om, (b)egge, (i)ngen PGP"
@@ -651,9 +649,9 @@
+msgid "esabif"
+msgstr "kusbni"
---- po/de.po Nov 2003 09:51:09 -0000 3.12
-+++ po/de.po Jan 2004 08:46:16 -0000
-@@ -565,8 +565,8 @@ msgstr "Verschlüsseln mit: "
+--- po/de.po Feb 2004 18:26:11 -0000 3.15
++++ po/de.po Feb 2004 06:07:16 -0000
+@@ -569,8 +569,8 @@ msgstr "Verschlüsseln mit: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, (k)ein PGP? "
@@ -666,25 +664,25 @@
+msgid "esabif"
+msgstr "vsabik"
---- po/el.po Nov 2003 09:51:09 -0000 3.10
-+++ po/el.po Jan 2004 08:46:17 -0000
-@@ -696,4 +696,4 @@ msgstr "ÊñõðôïãñÜöçóç ìå: "
+--- po/el.po Feb 2004 18:26:11 -0000 3.12
++++ po/el.po Feb 2004 06:07:17 -0000
+@@ -700,4 +700,4 @@ msgstr "ÊñõðôïãñÜöçóç ìå: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, Þ (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)êåßìåíï, Þ (f)orget it? "
-@@ -702,4 +702,4 @@ msgstr "PGP (e)ncrypt, (s)ign, sign (a)s
+@@ -706,4 +706,4 @@ msgstr "PGP (e)ncrypt, (s)ign, sign (a)s
#: compose.c:166
-msgid "esabf"
-msgstr "esabf"
+msgid "esabif"
+msgstr "esabif"
---- po/eo.po Nov 2003 09:51:09 -0000 3.10
-+++ po/eo.po Jan 2004 08:46:17 -0000
-@@ -567,8 +567,8 @@ msgstr "Æifri per: "
+--- po/eo.po Feb 2004 18:26:11 -0000 3.13
++++ po/eo.po Feb 2004 06:07:17 -0000
+@@ -571,8 +571,8 @@ msgstr "Æifri per: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP æ(i)fri, (s)ubskribi, subskribi (k)iel, (a)mbaý, aý (f)orgesi? "
@@ -697,25 +695,25 @@
+msgid "esabif"
+msgstr "iskanf"
---- po/es.po Nov 2003 09:51:09 -0000 3.12
-+++ po/es.po Jan 2004 08:46:17 -0000
-@@ -572,4 +572,4 @@ msgstr "Cifrar"
+--- po/es.po Feb 2004 18:26:11 -0000 3.14
++++ po/es.po Feb 2004 06:07:17 -0000
+@@ -576,4 +576,4 @@ msgstr "Cifrar"
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "¿co(d)ificar, f(i)rmar (c)omo, amb(o)s o ca(n)celar? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgstr "¿co(d)ificar, f(i)rmar (c)omo, amb(o)s, inc(l)uido, o ca(n)celar? "
-@@ -577,4 +577,4 @@ msgstr "¿co(d)ificar, f(i)rmar (c)omo, a
+@@ -581,4 +581,4 @@ msgstr "¿co(d)ificar, f(i)rmar (c)omo, a
#, fuzzy
-msgid "esabf"
-msgstr "dicon"
+msgid "esabif"
+msgstr "dicoln"
---- po/et.po Nov 2003 09:51:09 -0000 3.11
-+++ po/et.po Jan 2004 08:46:18 -0000
-@@ -567,8 +567,8 @@ msgstr "Krüpti kasutades: "
+--- po/et.po Feb 2004 18:26:11 -0000 3.13
++++ po/et.po Feb 2004 06:07:18 -0000
+@@ -571,8 +571,8 @@ msgstr "Krüpti kasutades: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad või (u)nusta? "
@@ -728,9 +726,9 @@
+msgid "esabif"
+msgstr "kaimeu"
---- po/fr.po Nov 2003 09:51:09 -0000 3.20
-+++ po/fr.po Jan 2004 08:46:18 -0000
-@@ -591,8 +591,8 @@ msgstr "Chiffrer avec : "
+--- po/fr.po Feb 2004 18:26:11 -0000 3.23
++++ po/fr.po Feb 2004 06:07:18 -0000
+@@ -596,8 +596,8 @@ msgstr "Chiffrer avec : "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, ou (o)ublier ? "
@@ -743,9 +741,9 @@
+msgid "esabif"
+msgstr "csedlo"
---- po/gl.po Nov 2003 09:51:09 -0000 3.9
-+++ po/gl.po Jan 2004 08:46:18 -0000
-@@ -576,8 +576,8 @@ msgstr "Encriptar"
+--- po/gl.po Feb 2004 18:26:11 -0000 3.11
++++ po/gl.po Feb 2004 06:07:18 -0000
+@@ -580,8 +580,8 @@ msgstr "Encriptar"
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "¿(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas ou (o)lvidar? "
@@ -758,9 +756,9 @@
+msgid "esabif"
+msgstr "efcaio"
---- po/hu.po Nov 2003 09:51:09 -0000 3.10
-+++ po/hu.po Jan 2004 08:46:19 -0000
-@@ -567,8 +567,8 @@ msgstr "Titkosítás: "
+--- po/hu.po Feb 2004 18:26:11 -0000 3.12
++++ po/hu.po Feb 2004 06:07:19 -0000
+@@ -571,8 +571,8 @@ msgstr "Titkosítás: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (t)itkosít, (a)láír, aláír (m)int, titkosít é(s) aláír, mé(g)se? "
@@ -773,9 +771,9 @@
+msgid "esabif"
+msgstr "tamsbg"
---- po/id.po Nov 2003 09:51:09 -0000 3.11
-+++ po/id.po Jan 2004 08:46:19 -0000
-@@ -568,8 +568,8 @@ msgstr "Enkrip dengan: "
+--- po/id.po Feb 2004 18:26:12 -0000 3.14
++++ po/id.po Feb 2004 06:07:19 -0000
+@@ -572,8 +572,8 @@ msgstr "Enkrip dengan: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, (b)atal? "
@@ -788,9 +786,9 @@
+msgid "esabif"
+msgstr "etsdib"
---- po/it.po Nov 2003 09:51:09 -0000 3.9
-+++ po/it.po Jan 2004 08:46:19 -0000
-@@ -578,8 +578,8 @@ msgstr "Crittografa"
+--- po/it.po Feb 2004 18:26:12 -0000 3.11
++++ po/it.po Feb 2004 06:07:19 -0000
+@@ -582,8 +582,8 @@ msgstr "Crittografa"
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "cifra(e), firma(s), firma come(a), entrambi(b), annulla(f) "
@@ -803,9 +801,9 @@
+msgid "esabif"
+msgstr "esabif"
---- po/ja.po Nov 2003 09:51:09 -0000 3.18
-+++ po/ja.po Jan 2004 08:46:20 -0000
-@@ -565,8 +565,8 @@ msgstr " °Å¹æ²½Êý¼°: "
+--- po/ja.po Feb 2004 18:26:12 -0000 3.21
++++ po/ja.po Feb 2004 06:07:20 -0000
+@@ -569,8 +569,8 @@ msgstr " °Å¹æ²½Êý¼°: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (e)°Å¹æ²½,(s)½ð̾,(a)..¤È¤·¤Æ½ð̾,(b)ξ¼Ô,(f)²ò½ü?"
@@ -818,9 +816,9 @@
+msgid "esabif"
+msgstr "esabif"
---- po/ko.po Nov 2003 09:51:09 -0000 3.13
-+++ po/ko.po Jan 2004 08:46:20 -0000
-@@ -566,8 +566,8 @@ msgstr "¾ÏÈ£È ¹æ½Ä: "
+--- po/ko.po Feb 2004 18:26:12 -0000 3.15
++++ po/ko.po Feb 2004 06:07:20 -0000
+@@ -570,8 +570,8 @@ msgstr "¾ÏÈ£È ¹æ½Ä: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP ¾ÏÈ£È(e), ¼¸í(s), »ç¿ë ¼¸í(a), µÑ ´Ù(b), Ãë¼Ò(f)? "
@@ -833,9 +831,9 @@
+msgid "esabif"
+msgstr "esabif"
---- po/lt.po Nov 2003 09:51:09 -0000 3.9
-+++ po/lt.po Jan 2004 08:46:20 -0000
-@@ -574,5 +574,5 @@ msgstr "Uþðifruoti"
+--- po/lt.po Feb 2004 18:26:12 -0000 3.11
++++ po/lt.po Feb 2004 06:07:20 -0000
+@@ -578,5 +578,5 @@ msgstr "Uþðifruoti"
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
@@ -843,32 +841,32 @@
-"(u)þðifruot, pa(s)iraðyt, pasiraðyt k(a)ip, a(b)u, rinktis (m)ic algoritmà, "
+"(u)þðifruot, pa(s)iraðyt, pasiraðyt k(a)ip, a(b)u, (l)aiðke, "
"ar (p)amirðti?"
-@@ -581,4 +581,4 @@ msgstr ""
+@@ -585,4 +585,4 @@ msgstr ""
#, fuzzy
-msgid "esabf"
-msgstr "usabmp"
+msgid "esabif"
+msgstr "usablp"
-@@ -594,4 +594,3 @@ msgid ""
+@@ -598,4 +598,3 @@ msgid ""
msgstr ""
-"(u)þðifruot, pa(s)iraðyt, pasiraðyt k(a)ip, a(b)u, rinktis (m)ic algoritmà, "
-"ar (p)amirðti?"
+"(u)þðifruot, pa(s)iraðyt, uþðifruo(t) su, pasiraðyt k(a)ip, a(b)u, ar (p)amirðti?"
-@@ -600,3 +599,3 @@ msgstr ""
+@@ -604,3 +603,3 @@ msgstr ""
msgid "eswabf"
-msgstr "usabmp"
+msgstr "ustabp"
---- po/nl.po Nov 2003 09:51:09 -0000 3.13
-+++ po/nl.po Jan 2004 08:46:21 -0000
-@@ -564,8 +564,8 @@ msgstr "Versleutelen met: "
+--- po/nl.po Feb 2004 18:26:12 -0000 3.16
++++ po/nl.po Feb 2004 06:07:21 -0000
+@@ -568,8 +568,8 @@ msgstr "Versleutelen met: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
--msgstr "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eide, (g)een? "
+-msgstr "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, (g)een? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-+msgstr "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eide, ber(i)cht, (g)een? "
++msgstr "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, ber(i)cht, (g)een? "
#: compose.c:166
-msgid "esabf"
@@ -876,9 +874,9 @@
+msgid "esabif"
+msgstr "voabig"
---- po/pl.po Nov 2003 09:51:10 -0000 3.14
-+++ po/pl.po Jan 2004 08:46:21 -0000
-@@ -567,8 +567,8 @@ msgstr "Zaszyfruj u¿ywaj±c: "
+--- po/pl.po Feb 2004 18:26:12 -0000 3.17
++++ po/pl.po Feb 2004 06:07:21 -0000
+@@ -571,8 +571,8 @@ msgstr "Zaszyfruj u¿ywaj±c: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, b(e)z PGP? "
@@ -891,9 +889,9 @@
+msgid "esabif"
+msgstr "zsabie"
---- po/pt_BR.po Nov 2003 09:51:10 -0000 3.10
-+++ po/pt_BR.po Jan 2004 08:46:21 -0000
-@@ -577,5 +577,5 @@ msgstr "Encriptar"
+--- po/pt_BR.po Feb 2004 18:26:13 -0000 3.12
++++ po/pt_BR.po Feb 2004 06:07:21 -0000
+@@ -581,5 +581,5 @@ msgstr "Encriptar"
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
@@ -901,26 +899,26 @@
-"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, escolhe (m)ic, ou es(q)uece? "
+"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, em l(i)nha, ou es(q)uece? "
-@@ -583,4 +583,4 @@ msgstr ""
+@@ -587,4 +587,4 @@ msgstr ""
#, fuzzy
-msgid "esabf"
-msgstr "escamq"
+msgid "esabif"
+msgstr "escaiq"
-@@ -596,3 +596,3 @@ msgid ""
+@@ -600,3 +600,3 @@ msgid ""
msgstr ""
-"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, escolhe (m)ic, ou es(q)uece? "
+"(e)ncripa, a(s)sina, e(n)cripa com, assina (c)omo, (a)mbos, ou es(q)uece? "
-@@ -601,3 +601,3 @@ msgstr ""
+@@ -605,3 +605,3 @@ msgstr ""
msgid "eswabf"
-msgstr "escamq"
+msgstr "esncaq"
---- po/ru.po Nov 2003 09:51:10 -0000 3.15
-+++ po/ru.po Jan 2004 08:46:22 -0000
-@@ -573,8 +573,8 @@ msgstr "úÁÛÉÆÒÏ×ÁÔØ: "
+--- po/ru.po Feb 2004 18:26:13 -0000 3.19
++++ po/ru.po Feb 2004 06:07:22 -0000
+@@ -577,8 +577,8 @@ msgstr "úÁÛÉÆÒÏ×ÁÔØ: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP (e)ÛÉÆÒ, (s)ÐÏÄÐÉÓØ, (a)ÐÏÄÐÉÓØ ËÁË, (b)ÏÂÁ, (f)ÏÔËÁÚÁÔØÓÑ? "
@@ -933,9 +931,9 @@
+msgid "esabif"
+msgstr "esabif"
---- po/sk.po Nov 2003 09:51:10 -0000 3.9
-+++ po/sk.po Jan 2004 08:46:22 -0000
-@@ -582,5 +582,5 @@ msgstr "Za¹ifruj"
+--- po/sk.po Feb 2004 18:26:13 -0000 3.11
++++ po/sk.po Feb 2004 06:07:22 -0000
+@@ -586,5 +586,5 @@ msgstr "Za¹ifruj"
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
@@ -943,27 +941,27 @@
-"(e)-¹ifr, (s)-podp, podp (a)ko, o(b)e, oznaè alg. mi(c), alebo (f)-zabudnú» "
+"(e)-¹ifr, (s)-podp, podp (a)ko, o(b)e, (i)nline, alebo (f)-zabudnú» "
"na to? "
-@@ -589,4 +589,4 @@ msgstr ""
+@@ -593,4 +593,4 @@ msgstr ""
#, fuzzy
-msgid "esabf"
-msgstr "esabmf"
+msgid "esabif"
+msgstr "esabif"
-@@ -602,4 +602,3 @@ msgid ""
+@@ -606,4 +606,3 @@ msgid ""
msgstr ""
-"(e)-¹ifr, (s)-podp, podp (a)ko, o(b)e, oznaè alg. mi(c), alebo (f)-zabudnú» "
-"na to? "
+"(e)-¹ifr, (s)-podp, (w)-¹ifr s, podp (a)ko, o(b)e, alebo (f)-zabudnú» na to? "
-@@ -608,3 +607,3 @@ msgstr ""
+@@ -612,3 +611,3 @@ msgstr ""
msgid "eswabf"
-msgstr "esabmf"
+msgstr "eswabf"
---- po/sv.po Nov 2003 09:51:10 -0000 3.10
-+++ po/sv.po Jan 2004 08:46:22 -0000
-@@ -564,8 +564,8 @@ msgstr "Kryptera med: "
+--- po/sv.po Feb 2004 18:26:13 -0000 3.12
++++ po/sv.po Feb 2004 06:07:22 -0000
+@@ -568,8 +568,8 @@ msgstr "Kryptera med: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "PGP: (k)ryptera, (s)ignera, signera s(o)m, (b)åda, eller sk(i)ppa det?"
@@ -976,9 +974,9 @@
+msgid "esabif"
+msgstr "ksobni"
---- po/tr.po Nov 2003 09:51:10 -0000 3.9
-+++ po/tr.po Jan 2004 08:46:23 -0000
-@@ -573,5 +573,5 @@ msgstr "Þifrele"
+--- po/tr.po Feb 2004 18:26:13 -0000 3.11
++++ po/tr.po Feb 2004 06:07:22 -0000
+@@ -577,5 +577,5 @@ msgstr "Þifrele"
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
@@ -986,16 +984,16 @@
-"þ(i)frele, i(m)zala, (f)arklý imzala, i(k)isi de, mi(c) algoritmini seç "
+"þ(i)frele, i(m)zala, (f)arklý imzala, i(k)isi de, (i)nline, "
"yoksa i(p)talmý? "
-@@ -579,4 +579,4 @@ msgstr ""
+@@ -583,4 +583,4 @@ msgstr ""
#: compose.c:166
-msgid "esabf"
-msgstr "imfkcp"
+msgid "esabif"
+msgstr "imfkip"
---- po/uk.po Nov 2003 09:51:10 -0000 3.10
-+++ po/uk.po Jan 2004 08:46:23 -0000
-@@ -568,8 +568,8 @@ msgstr "ûÉÆÒÕ×ÁÎÎÑ"
+--- po/uk.po Feb 2004 18:26:13 -0000 3.12
++++ po/uk.po Feb 2004 06:07:23 -0000
+@@ -572,8 +572,8 @@ msgstr "ûÉÆÒÕ×ÁÎÎÑ"
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b) ÞÉ ×¦ÄͦÎÁ(f)? "
@@ -1008,9 +1006,9 @@
+msgid "esabif"
+msgstr "esabif"
---- po/zh_CN.po Nov 2003 09:51:10 -0000 3.9
-+++ po/zh_CN.po Jan 2004 08:46:23 -0000
-@@ -581,5 +581,5 @@ msgstr "¼ÓÃÜ"
+--- po/zh_CN.po Feb 2004 18:26:13 -0000 3.11
++++ po/zh_CN.po Feb 2004 06:07:23 -0000
+@@ -585,5 +585,5 @@ msgstr "¼ÓÃÜ"
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
@@ -1018,21 +1016,21 @@
-"(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, Ñ¡Ôñ (m)ic ÑÝËã·¨ »ò (f)·Å"
+"(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, (i)nline, »ò (f)·Å"
"Æú£¿"
-@@ -587,4 +587,4 @@ msgstr ""
+@@ -591,4 +591,4 @@ msgstr ""
#: compose.c:166
-msgid "esabf"
-msgstr ""
+msgid "esabif"
+msgstr "esabif"
---- po/zh_TW.po Nov 2003 09:51:10 -0000 3.9
-+++ po/zh_TW.po Jan 2004 08:46:24 -0000
-@@ -573,3 +573,3 @@ msgstr "åŠ å¯†"
+--- po/zh_TW.po Feb 2004 18:26:13 -0000 3.11
++++ po/zh_TW.po Feb 2004 06:07:24 -0000
+@@ -577,3 +577,3 @@ msgstr "åŠ å¯†"
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "(1)åŠ å¯†, (2)ç°½å, (3)用別的身份簽, (4)兩者皆è¦, 或 (5)放棄？"
-@@ -577,4 +577,4 @@ msgstr "(1)åŠ å¯†, (2)ç°½å, (3)用別ç
+@@ -581,4 +581,4 @@ msgstr "(1)åŠ å¯†, (2)ç°½å, (3)用別ç
#: compose.c:166
-msgid "esabf"
-msgstr "12345"
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list