Commit 35bb9989 authored by Dale Woolridge's avatar Dale Woolridge
parent 405ff13b
......@@ -131,6 +131,15 @@ static void redraw_crypt_lines (HEADER *msg)
addstr (_("Sign"));
else
addstr (_("Clear"));
if ((WithCrypto & APPLICATION_PGP))
if ((msg->security & (ENCRYPT | SIGN)))
{
if ((msg->security & INLINE))
addstr (_(" (inline)"));
else
addstr (_(" (PGP/MIME)"));
}
clrtoeol ();
move (HDR_CRYPTINFO, 0);
......@@ -162,15 +171,15 @@ static int pgp_send_menu (HEADER *msg, int *redraw)
if (!(WithCrypto & APPLICATION_PGP))
return msg->security;
switch (mutt_multi_choice (_("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
_("esabf")))
switch (mutt_multi_choice (_("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "),
_("esabif")))
{
case 1: /* (e)ncrypt */
msg->security |= ENCRYPT;
msg->security ^= ENCRYPT;
break;
case 2: /* (s)ign */
msg->security |= SIGN;
msg->security ^= SIGN;
break;
case 3: /* sign (a)s */
......@@ -197,18 +206,31 @@ static int pgp_send_menu (HEADER *msg, int *redraw)
break;
case 4: /* (b)oth */
msg->security = ENCRYPT | SIGN;
if ((msg->security & (ENCRYPT | SIGN)) == (ENCRYPT | SIGN))
msg->security = 0;
else
msg->security |= (ENCRYPT | SIGN);
break;
case 5: /* (f)orget it */
case 5: /* (i)nline */
if ((msg->security & (ENCRYPT | SIGN)))
msg->security ^= INLINE;
else
msg->security &= ~INLINE;
break;
case 6: /* (f)orget it */
msg->security = 0;
break;
}
if (msg->security && msg->security != APPLICATION_PGP)
msg->security |= APPLICATION_PGP;
else
msg->security = 0;
if (msg->security)
{
if (! (msg->security & (ENCRYPT | SIGN)))
msg->security = 0;
else
msg->security |= APPLICATION_PGP;
}
if(*redraw)
redraw_crypt_lines (msg);
......
......@@ -159,12 +159,11 @@ int crypt_valid_passphrase(int flags)
int mutt_protect (HEADER *msg, HEADER *cur, char *keylist)
int mutt_protect (HEADER *msg, char *keylist)
{
BODY *pbody = NULL, *tmp_pbody = NULL;
BODY *tmp_smime_pbody = NULL;
BODY *tmp_pgp_pbody = NULL;
int traditional = 0;
int flags = (WithCrypto & APPLICATION_PGP)? msg->security: 0;
int i;
......@@ -174,36 +173,22 @@ int mutt_protect (HEADER *msg, HEADER *cur, char *keylist)
if ((msg->security & SIGN) && !crypt_valid_passphrase (msg->security))
return (-1);
if ((WithCrypto & APPLICATION_PGP) && (msg->security & APPLICATION_PGP))
if ((WithCrypto & APPLICATION_PGP) && ((msg->security & PGPINLINE) == PGPINLINE))
{
if ((msg->content->type == TYPETEXT) &&
!ascii_strcasecmp (msg->content->subtype, "plain"))
/* they really want to send it inline... go for it */
if (!isendwin ()) mutt_endwin _("Invoking PGP...");
pbody = crypt_pgp_traditional_encryptsign (msg->content, flags, keylist);
if (pbody)
{
if (cur && cur->security && option (OPTPGPAUTOTRAD)
&& (option (OPTCRYPTREPLYENCRYPT)
|| option (OPTCRYPTREPLYSIGN)
|| option (OPTCRYPTREPLYSIGNENCRYPTED)))
{
if(mutt_is_application_pgp(cur->content))
traditional = 1;
}
else
{
if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create a traditional (inline) PGP message?"))) == -1)
return -1;
else if (i == M_YES)
traditional = 1;
}
}
if (traditional)
{
if (!isendwin ()) mutt_endwin _("Invoking PGP...");
if (!(pbody = crypt_pgp_traditional_encryptsign (msg->content, flags, keylist)))
return -1;
msg->content = pbody;
return 0;
}
/* otherwise inline won't work...ask for revert */
if ((i = query_quadoption (OPT_PGPMIMEASK, _("Message can't be sent inline. Revert to using PGP/MIME?"))) != M_YES)
return -1;
/* go ahead with PGP/MIME */
}
if (!isendwin ()) mutt_endwin (NULL);
......@@ -391,6 +376,9 @@ int mutt_is_application_pgp (BODY *m)
else if (p && !ascii_strncasecmp ("pgp-keys", p, 7))
t |= PGPKEY;
}
if (t)
t |= PGPINLINE;
return t;
}
......
......@@ -1378,6 +1378,48 @@ struct option_t MuttVars[] = {
** removed, while the inner multipart/signed part is retained.
** (PGP only)
*/
{ "pgp_create_traditional", DT_SYN, R_NONE, UL "pgp_autoinline", 0 },
{ "pgp_autoinline", DT_BOOL, R_NONE, OPTPGPAUTOINLINE, 0 },
/*
** .pp
** This option controls whether Mutt generates old-style inline
** (traditional) PGP encrypted or signed messages under certain
** circumstances. This can be overridden by use of the \fIpgp-menu\fP,
** when inline is not required.
** .pp
** Note that Mutt might automatically use PGP/MIME for messages
** which consist of more than a single MIME part. Mutt can be
** configured to ask before sending PGP/MIME messages when inline
** (traditional) would not work.
** See also: ``$$pgp_mime_ask''.
** .pp
** Also note that using the old-style PGP message format is \fBstrongly\fP
** \fBdeprecated\fP.
** (PGP only)
*/
{ "pgp_auto_traditional", DT_SYN, R_NONE, UL "pgp_replyinline", 0 },
{ "pgp_replyinline", DT_BOOL, R_NONE, OPTPGPREPLYINLINE, 0 },
/*
** .pp
** Setting this variable will cause Mutt to always attempt to
** create an inline (traditional) message when replying to a
** message which is PGP encrypted/signed inline. This can be
** overridden by use of the \fIpgp-menu\fP, when inline is not
** required. This option does not automatically detect if the
** (replied-to) message is inline; instead it relies on Mutt
** internals for previously checked/flagged messages.
** .pp
** Note that Mutt might automatically use PGP/MIME for messages
** which consist of more than a single MIME part. Mutt can be
** configured to ask before sending PGP/MIME messages when inline
** (traditional) would not work.
** See also: ``$$pgp_mime_ask''.
** .pp
** Also note that using the old-style PGP message format is \fBstrongly\fP
** \fBdeprecated\fP.
** (PGP only)
**
*/
{ "pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, 1 },
/*
** .pp
......@@ -1427,37 +1469,17 @@ struct option_t MuttVars[] = {
** `reverse-'.
** (PGP only)
*/
{ "pgp_create_traditional", DT_QUAD, R_NONE, OPT_PGPTRADITIONAL, M_NO },
{ "pgp_mime_ask", DT_QUAD, R_NONE, OPT_PGPMIMEASK, M_NO },
/*
** .pp
** This option controls whether Mutt generates old-style inline PGP
** encrypted or signed messages.
** .pp
** Note that PGP/MIME will be used automatically for messages which have
** a character set different from us-ascii, or which consist of more than
** a single MIME part.
** This option controls whether Mutt will prompt you for
** automatically sending a (signed/encrypted) message using
** PGP/MIME when inline (traditional) fails (for any reason).
** .pp
** Also note that using the old-style PGP message format is \fBstrongly\fP
** \fBdeprecated\fP.
** (PGP only)
*/
{ "pgp_auto_traditional", DT_BOOL, R_NONE, OPTPGPAUTOTRAD, 0 },
/*
** .pp
** This option causes Mutt to generate an old-style inline PGP
** encrypted or signed message when replying to an old-style
** message, and a PGP/MIME message when replying to a PGP/MIME
** message. Note that this option is only meaningful when using
** ``$$crypt_replyencrypt'', ``$$crypt_replysign'', or
** ``$$crypt_replysignencrypted''.
** .pp
** Also note that PGP/MIME will be used automatically for messages
** which have a character set different from us-ascii, or which
** consist of more than a single MIME part.
** .pp
** This option overrides ``$$pgp_create_traditional''
** (PGP only)
*/
/* XXX Default values! */
......
/*
* Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
*
......@@ -277,7 +278,7 @@ enum
OPT_MIMEFWD,
OPT_MIMEFWDREST,
OPT_MOVE,
OPT_PGPTRADITIONAL, /* create old-style PGP messages */
OPT_PGPMIMEASK, /* ask to revert to PGP/MIME when inline fails */
#ifdef USE_POP
OPT_POPDELETE,
OPT_POPRECONNECT,
......@@ -444,7 +445,6 @@ enum
OPTPGPIGNORESUB,
OPTPGPCHECKEXIT,
OPTPGPLONGIDS,
OPTPGPAUTOTRAD,
#if 0
OPTPGPENCRYPTSELF,
#endif
......@@ -452,6 +452,8 @@ enum
OPTPGPSTRICTENC,
OPTFORWDECRYPT,
OPTPGPSHOWUNUSABLE,
OPTPGPAUTOINLINE,
OPTPGPREPLYINLINE,
/* pseudo options */
......@@ -641,7 +643,7 @@ typedef struct body
typedef struct header
{
unsigned int security : 10; /* bit 0-6: flags, bit 7,8: application.
unsigned int security : 11; /* bit 0-6: flags, bit 7,8: application.
see: crypt.h pgplib.h, smime.h */
unsigned int mime : 1; /* has a Mime-Version header? */
......
......@@ -36,17 +36,19 @@
#define BADSIGN (1 << 3)
#define PARTSIGN (1 << 4)
#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)
#define PGP_TRADITIONAL_CHECKED (1 << 9)
#define PGP_TRADITIONAL_CHECKED (1 << 10)
#define PGPENCRYPT (APPLICATION_PGP | ENCRYPT)
#define PGPSIGN (APPLICATION_PGP | SIGN)
#define PGPGOODSIGN (APPLICATION_PGP | GOODSIGN)
#define PGPKEY (APPLICATION_PGP | (1 << 6))
#define PGPKEY (APPLICATION_PGP | KEYBLOCK)
#define PGPINLINE (APPLICATION_PGP | INLINE)
#define SMIMEENCRYPT (APPLICATION_SMIME | ENCRYPT)
#define SMIMESIGN (APPLICATION_SMIME | SIGN)
......@@ -105,7 +107,7 @@ typedef struct pgp_keyinfo *pgp_key_t;
/* Some prototypes -- old crypt.h. */
int mutt_protect (HEADER *, HEADER *, char *);
int mutt_protect (HEADER *, char *);
int mutt_is_multipart_encrypted (BODY *);
......
......@@ -599,14 +599,14 @@ msgid "Encrypt with: "
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)mbds, o en (c)lar? "
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbds, en (l)nia, o en (c)lar? "
# ivb (2003/03/26)
# ivb (x)ifra, (s)igna, si(g)na com a, (a)mbds, (c)lar
# ivb (x)ifra, (s)igna, si(g)na com a, (a)mbds, en (l)nia, o en (c)lar
#: compose.c:166
msgid "esabf"
msgstr "xsgac"
msgid "esabif"
msgstr "xsgalc"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -681,13 +681,13 @@ msgstr "Za
#
#: compose.c:165
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
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 "PGP - ()ifrovat, (p)odepsat, podepsat (j)ako, (o)boj, p(m), i (n)ic?"
#
#: compose.c:166
msgid "esabf"
msgstr "pjon"
msgid "esabif"
msgstr "pjomn"
#
#. sign (a)s
......
......@@ -576,12 +576,12 @@ msgstr "Krypt
#: compose.c:165
#, fuzzy
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
msgstr "(k)ryptr, (u)nderskriv, underskriv (s)om, (b)egge, (i)ngen PGP"
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "(k)ryptr, (u)nderskriv, underskriv (s)om, (b)egge, i(n)tegreret, (i)ngen PGP"
#: compose.c:166
msgid "esabf"
msgstr "kusbi"
msgid "esabif"
msgstr "kusbni"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -567,12 +567,12 @@ msgid "Encrypt with: "
msgstr "Verschlsseln 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? "
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, (i)nline, (k)ein PGP? "
#: compose.c:166
msgid "esabf"
msgstr "vsabk"
msgid "esabif"
msgstr "vsabik"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -698,14 +698,14 @@ msgstr "
#
# compose.c:132
#: 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? "
#
# compose.c:133
#: compose.c:166
msgid "esabf"
msgstr "esabf"
msgid "esabif"
msgstr "esabif"
#
#. sign (a)s
......
......@@ -569,12 +569,12 @@ msgid "Encrypt with: "
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? "
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "PGP (i)fri, (s)ubskribi, subskribi (k)iel, (a)mba, \"i(n)line\", a (f)orgesi? "
#: compose.c:166
msgid "esabf"
msgstr "iskaf"
msgid "esabif"
msgstr "iskanf"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -574,13 +574,14 @@ msgstr "Cifrar"
#: compose.c:165
#, 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? "
#: compose.c:166
#, fuzzy
msgid "esabf"
msgstr "dicon"
msgid "esabif"
msgstr "dicoln"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -569,12 +569,12 @@ msgid "Encrypt with: "
msgstr "Krpti kasutades: "
#: compose.c:165
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
msgstr "PGP (k)rpti, (a)llkiri, allk. ku(i), (m)lemad vi (u)nusta? "
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "PGP (k)rpti, (a)llkiri, allk. ku(i), (m)lemad, k(e)hasse, vi (u)nusta? "
#: compose.c:166
msgid "esabf"
msgstr "kaimu"
msgid "esabif"
msgstr "kaimeu"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -594,12 +594,12 @@ msgid "Encrypt with: "
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 ? "
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, en (l)igne, ou (o)ublier ? "
#: compose.c:166
msgid "esabf"
msgstr "csedo"
msgid "esabif"
msgstr "csedlo"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -578,12 +578,12 @@ msgstr "Encriptar"
#: compose.c:165
#, 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? "
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas, (i)nterior, ou (o)lvidar? "
#: compose.c:166
msgid "esabf"
msgstr "efcao"
msgid "esabif"
msgstr "efcaio"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -569,12 +569,12 @@ msgid "Encrypt with: "
msgstr "Titkosts: "
#: compose.c:165
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
msgstr "PGP (t)itkost, (a)lr, alr (m)int, titkost (s) alr, m(g)se? "
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "PGP (t)itkost, (a)lr, alr (m)int, titkost (s) alr, (b)egyazott, m(g)se? "
#: compose.c:166
msgid "esabf"
msgstr "tamsg"
msgid "esabif"
msgstr "tamsbg"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -570,12 +570,12 @@ msgid "Encrypt with: "
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? "
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, (i)nline, (b)atal? "
#: compose.c:166
msgid "esabf"
msgstr "etsdb"
msgid "esabif"
msgstr "etsdib"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -580,12 +580,12 @@ msgstr "Crittografa"
#: compose.c:165
#, 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) "
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "cifra(e), firma(s), firma come(a), entrambi(b), in l(i)nea , annulla(f) "
#: compose.c:166
msgid "esabf"
msgstr "esabf"
msgid "esabif"
msgstr "esabif"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -567,12 +567,12 @@ msgid "Encrypt with: "
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)解除?"
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "PGP (e)暗号化,(s)署名,(a)..として署名,(b)両者,(i)nline,(f)解除?"
#: compose.c:166
msgid "esabf"
msgstr "esabf"
msgid "esabif"
msgstr "esabif"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -568,12 +568,12 @@ msgid "Encrypt with: "
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)? "
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "PGP 암호화(e), 서명(s), 사용 서명(a), 둘 다(b), (i)nline, 취소(f)? "
#: compose.c:166
msgid "esabf"
msgstr "esabf"
msgid "esabif"
msgstr "esabif"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -576,15 +576,15 @@ msgstr "U
#: compose.c:165
#, 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 ""
"(u)ifruot, pa(s)irayt, pasirayt k(a)ip, a(b)u, rinktis (m)ic algoritm, "
"(u)ifruot, pa(s)irayt, pasirayt k(a)ip, a(b)u, (l)aike, "
"ar (p)amirti?"
#: compose.c:166
#, fuzzy
msgid "esabf"
msgstr "usabmp"
msgid "esabif"
msgstr "usablp"
#. sign (a)s
#: compose.c:179 compose.c:269
......@@ -596,13 +596,12 @@ msgstr "Pasira
msgid ""
"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
msgstr ""
"(u)ifruot, pa(s)irayt, pasirayt k(a)ip, a(b)u, rinktis (m)ic algoritm, "
"ar (p)amirti?"
"(u)ifruot, pa(s)irayt, uifruo(t) su, pasirayt k(a)ip, a(b)u, ar (p)amirti?"
#: compose.c:228
#, fuzzy
msgid "eswabf"
msgstr "usabmp"
msgstr "ustabp"
#: compose.c:236
msgid ""
......
......@@ -566,12 +566,12 @@ msgid "Encrypt with: "
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)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)eiden, ber(i)cht, (g)een? "
#: compose.c:166
msgid "esabf"
msgstr "voabg"
msgid "esabif"
msgstr "voabig"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -564,12 +564,12 @@ msgid "Encrypt with: "
msgstr "Zaszyfruj uywajc: "
#: 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? "
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, (i)nline, b(e)z PGP? "
#: compose.c:166
msgid "esabf"
msgstr "zsabe"
msgid "esabif"
msgstr "zsabie"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -579,14 +579,14 @@ msgstr "Encriptar"
#: compose.c:165
#, 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 ""
"(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? "
#: compose.c:166
#, fuzzy
msgid "esabf"
msgstr "escamq"
msgid "esabif"
msgstr "escaiq"
#. sign (a)s
#: compose.c:179 compose.c:269
......@@ -598,12 +598,12 @@ msgstr "Assinar como: "
msgid ""
"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
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? "
#: compose.c:228
#, fuzzy
msgid "eswabf"
msgstr "escamq"
msgstr "esncaq"
#: compose.c:236
msgid ""
......
......@@ -575,12 +575,12 @@ msgid "Encrypt with: "
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)? "
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "PGP (e), (s), (a) , (b), (i)nline, (f)? "
#: compose.c:166
msgid "esabf"
msgstr "esabf"
msgid "esabif"
msgstr "esabif"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -584,15 +584,15 @@ msgstr "Za
#: compose.c:165
#, 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 ""
"(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? "
#: compose.c:166
#, fuzzy
msgid "esabf"
msgstr "esabmf"
msgid "esabif"
msgstr "esabif"
#. sign (a)s
#: compose.c:179 compose.c:269
......@@ -604,13 +604,12 @@ msgstr "Podp
msgid ""
"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
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? "
#: compose.c:228
#, fuzzy
msgid "eswabf"
msgstr "esabmf"
msgstr "eswabf"
#: compose.c:236
msgid ""
......
......@@ -566,12 +566,12 @@ msgid "Encrypt with: "
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?"
msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
msgstr "PGP: (k)ryptera, (s)ignera, signera s(o)m, (b)da, i(n)fogat, eller sk(i)ppa det?"
#: compose.c:166
msgid "esabf"
msgstr "ksobi"
msgid "esabif"
msgstr "ksobni"
#. sign (a)s
#: compose.c:179 compose.c:269
......
......@@ -575,14 +575,14 @@ msgstr "
#: compose.c:165
#, 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 ""
"(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? "
#: compose.c:166