From 5f1e94b1747b8ecc887bd55e1db445eae310ae4a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 28 Apr 2017 14:47:43 +0000 Subject: [PATCH 01/14] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=154 --- COLS-workaround.dif | 37 ---- aw.listreply.diff | 40 ++-- bsc907453-CVE-2014-9116-jessie.patch | 6 +- bug-676388-largefile.patch | 38 ++-- mutt-1.5.15-wrapcolumn.diff | 4 +- mutt-1.5.20-sendgroupreplyto.diff | 34 +-- mutt-1.5.21-mailcap.diff | 23 +- mutt-1.5.23-carriage-return.path | 133 ++++++----- mutt-1.5.9i-pgpewrap.diff | 28 +-- mutt-1.6.1-opennfs.dif | 199 ++++++----------- mutt-1.6.2-gpgme_set_sender.patch | 38 ---- mutt-1.6.2.dif | 320 --------------------------- mutt-1.6.2.tar.gz | 3 - mutt-1.8.2.dif | 116 ++++++++++ mutt.changes | 95 ++++++++ mutt.spec | 60 ++--- neomutt-20170421.tar.gz | 3 + patch-1.5.24.vk.pgp_verbose_mime | 30 +-- widechar.sidebar.dif | 67 +++--- 19 files changed, 512 insertions(+), 762 deletions(-) delete mode 100644 COLS-workaround.dif delete mode 100644 mutt-1.6.2-gpgme_set_sender.patch delete mode 100644 mutt-1.6.2.dif delete mode 100644 mutt-1.6.2.tar.gz create mode 100644 mutt-1.8.2.dif create mode 100644 neomutt-20170421.tar.gz diff --git a/COLS-workaround.dif b/COLS-workaround.dif deleted file mode 100644 index db9eabc..0000000 --- a/COLS-workaround.dif +++ /dev/null @@ -1,37 +0,0 @@ -Use professionel VLINE - ---- - sidebar.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - ---- sidebar.c -+++ sidebar.c 2016-09-13 10:03:50.282864137 +0000 -@@ -579,6 +579,7 @@ static int draw_divider (int first_row, - { - /* Calculate the width of the delimiter in screen cells */ - int delim_len = mutt_strwidth (SidebarDividerChar); -+ int altchar = 0; - - if (delim_len < 1) - return delim_len; -@@ -589,13 +590,19 @@ static int draw_divider (int first_row, - if (delim_len > SidebarWidth) - return -1; - -+ if (delim_len == 1 && strcmp(SidebarDividerChar, "|") == 0) -+ altchar++; -+ - SETCOLOR(MT_COLOR_DIVIDER); - - int i; - for (i = 0; i < num_rows; i++) - { - move (first_row + i, SidebarWidth - delim_len); -- addstr (NONULL(SidebarDividerChar)); -+ if (altchar) -+ addch (ACS_VLINE); -+ else -+ addstr (NONULL(SidebarDividerChar)); - } - - return delim_len; diff --git a/aw.listreply.diff b/aw.listreply.diff index 3c638ed..6d337f0 100644 --- a/aw.listreply.diff +++ b/aw.listreply.diff @@ -8,49 +8,49 @@ ask when sending list message replies to author only - Armin Wolfermann (aw) 4 files changed, 27 insertions(+) --- PATCHES -+++ PATCHES 2016-09-13 10:01:22.837626357 +0000 ++++ PATCHES 2017-04-28 13:20:07.709043569 +0000 @@ -1,3 +1,4 @@ +patch-1.5.9.aw.listreply.1 - patch-compress-neo-git - patch-cond-date-neo-git - patch-fmemopen-neo-git + patch-attach-headers-color-neomutt + patch-compose-to-sender-neomutt + patch-compress-neomutt --- init.h -+++ init.h 2016-09-13 10:00:49.794245364 +0000 -@@ -1501,6 +1501,13 @@ struct option_t MuttVars[] = { - ** The locale used by \fCstrftime(3)\fP to format dates. Legal values are - ** the strings your system accepts for the locale environment variable \fC$$$LC_TIME\fP. ++++ init.h 2017-04-28 13:20:58.292077398 +0000 +@@ -1581,6 +1581,13 @@ struct option_t MuttVars[] = { + ** ``$$keywords_standard'' are \fCfalse\fP, mutt will save keywords + ** to legacy headers to ensure that it does not lose your labels. */ -+ { "list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, M_NO }, ++ { "list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, MUTT_NO }, + /* + ** .pp + ** When set, address replies to the mailing list the original message came + ** from (instead to the author only). Setting this option to ``ask-yes'' or + ** ``ask-no'' will ask if you really intended to reply to the author only. + */ - { "mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, 5 }, + { "mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, 5 }, /* ** .pp --- mutt.h -+++ mutt.h 2016-09-13 10:00:49.794245364 +0000 -@@ -315,6 +315,7 @@ enum ++++ mutt.h 2017-04-28 13:21:29.103488852 +0000 +@@ -299,6 +299,7 @@ enum #endif OPT_SUBJECT, - OPT_VERIFYSIG, /* verify PGP signatures */ + OPT_VERIFYSIG, /* verify PGP signatures */ + OPT_LISTREPLY, #ifdef USE_NNTP OPT_TOMODERATED, OPT_CATCHUP, --- send.c -+++ send.c 2016-09-13 10:00:49.794245364 +0000 -@@ -516,6 +516,7 @@ static int include_reply (CONTEXT *ctx, - static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto) ++++ send.c 2017-04-28 13:22:41.410113734 +0000 +@@ -498,6 +498,7 @@ static int include_reply(CONTEXT *ctx, H + static int default_to(ADDRESS **to, ENVELOPE *env, int flags, int hmfupto) { char prompt[STRING]; + ADDRESS *tmp; - if (flags && env->mail_followup_to && hmfupto == M_YES) + if (flags && env->mail_followup_to && hmfupto == MUTT_YES) { -@@ -529,6 +530,23 @@ static int default_to (ADDRESS **to, ENV +@@ -511,6 +512,23 @@ static int default_to(ADDRESS **to, ENVE if (flags & SENDLISTREPLY) return 0; @@ -61,7 +61,7 @@ ask when sending list message replies to author only - Armin Wolfermann (aw) + switch (query_quadoption (OPT_LISTREPLY, + _("Message came from a mailing list. Reply to author only?"))) + { -+ case M_NO: ++ case MUTT_NO: + tmp = find_mailing_lists (env->to, env->cc); + rfc822_append (to, tmp, 0); + rfc822_free_address (&tmp); @@ -71,6 +71,6 @@ ask when sending list message replies to author only - Armin Wolfermann (aw) + } + } + - if (!option(OPTREPLYSELF) && mutt_addr_is_user (env->from)) + if (!option(OPTREPLYSELF) && mutt_addr_is_user(env->from)) { /* mail is from the user, assume replying to recipients */ diff --git a/bsc907453-CVE-2014-9116-jessie.patch b/bsc907453-CVE-2014-9116-jessie.patch index 2339380..e11d439 100644 --- a/bsc907453-CVE-2014-9116-jessie.patch +++ b/bsc907453-CVE-2014-9116-jessie.patch @@ -17,10 +17,10 @@ Index: mutt/lib.c 1 file changed, 3 insertions(+) --- lib.c -+++ lib.c 2015-01-26 00:00:00.000000000 +0000 -@@ -824,6 +824,9 @@ char *mutt_substrdup (const char *begin, ++++ lib.c 2017-04-28 13:46:19.479130332 +0000 +@@ -825,6 +825,9 @@ char *mutt_substrdup(const char *begin, size_t len; - char *p; + char *p = NULL; + if (end != NULL && end < begin) + return NULL; diff --git a/bug-676388-largefile.patch b/bug-676388-largefile.patch index 61b7377..13086e0 100644 --- a/bug-676388-largefile.patch +++ b/bug-676388-largefile.patch @@ -1,23 +1,23 @@ --- - crypt-gpgme.c | 2 +- + crypt_gpgme.c | 2 +- mh.c | 6 +++--- mutt.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---- crypt-gpgme.c -+++ crypt-gpgme.c 2016-09-13 10:00:08.959010324 +0000 -@@ -496,7 +496,7 @@ static gpgme_data_t body_to_data_object +--- crypt_gpgme.c ++++ crypt_gpgme.c 2017-04-28 13:17:28.120091455 +0000 +@@ -485,7 +485,7 @@ static gpgme_data_t body_to_data_object( /* Create a GPGME data object from the stream FP but limit the object to LENGTH bytes starting at OFFSET bytes from the beginning of the file. */ --static gpgme_data_t file_to_data_object (FILE *fp, long offset, long length) -+static gpgme_data_t file_to_data_object (FILE *fp, LOFF_T offset, long length) +-static gpgme_data_t file_to_data_object(FILE *fp, long offset, long length) ++static gpgme_data_t file_to_data_object(FILE *fp, LOFF_T offset, long length) { int err = 0; gpgme_data_t data; --- mh.c -+++ mh.c 2016-09-13 10:00:08.959010324 +0000 -@@ -1625,9 +1625,9 @@ static int mh_rewrite_message (CONTEXT * ++++ mh.c 2017-04-28 13:18:03.683412304 +0000 +@@ -1735,9 +1735,9 @@ static int mh_rewrite_message(CONTEXT *c char newpath[_POSIX_PATH_MAX]; char partpath[_POSIX_PATH_MAX]; @@ -28,16 +28,16 @@ + LOFF_T old_body_length = h->content->length; + LOFF_T old_hdr_lines = h->lines; - if ((dest = mx_open_new_message (ctx, h, 0)) == NULL) + if ((dest = mx_open_new_message(ctx, h, 0)) == NULL) return -1; --- mutt.h -+++ mutt.h 2016-09-13 10:00:08.959010324 +0000 -@@ -731,7 +731,7 @@ typedef struct body - PARAMETER *parameter; /* parameters of the content-type */ - char *description; /* content-description */ - char *form_name; /* Content-Disposition form-data name param */ -- long hdr_offset; /* offset in stream where the headers begin. -+ LOFF_T hdr_offset; /* offset in stream where the headers begin. - * this info is used when invoking metamail, - * where we need to send the headers of the - * attachment ++++ mutt.h 2017-04-28 13:18:35.438805848 +0000 +@@ -738,7 +738,7 @@ typedef struct body + PARAMETER *parameter; /* parameters of the content-type */ + char *description; /* content-description */ + char *form_name; /* Content-Disposition form-data name param */ +- long hdr_offset; /* offset in stream where the headers begin. ++ LOFF_T hdr_offset; /* offset in stream where the headers begin. + * this info is used when invoking metamail, + * where we need to send the headers of the + * attachment diff --git a/mutt-1.5.15-wrapcolumn.diff b/mutt-1.5.15-wrapcolumn.diff index 36c7d79..068842f 100644 --- a/mutt-1.5.15-wrapcolumn.diff +++ b/mutt-1.5.15-wrapcolumn.diff @@ -5,8 +5,8 @@ Index: init.h 1 file changed, 2 insertions(+), 1 deletion(-) --- init.h -+++ init.h 2016-09-13 09:58:52.548441749 +0000 -@@ -4047,7 +4047,8 @@ struct option_t MuttVars[] = { ++++ init.h 2017-04-28 12:56:30.912131384 +0000 +@@ -4224,7 +4224,8 @@ struct option_t MuttVars[] = { ** When \fIset\fP, mutt will weed headers when displaying, forwarding, ** printing, or replying to messages. */ diff --git a/mutt-1.5.20-sendgroupreplyto.diff b/mutt-1.5.20-sendgroupreplyto.diff index 94802e8..df301de 100644 --- a/mutt-1.5.20-sendgroupreplyto.diff +++ b/mutt-1.5.20-sendgroupreplyto.diff @@ -1,28 +1,28 @@ --- init.h | 7 +++++++ mutt.h | 1 + - send.c | 8 ++++++++ - 3 files changed, 16 insertions(+) + send.c | 12 ++++++++++-- + 3 files changed, 18 insertions(+), 2 deletions(-) --- init.h -+++ init.h 2016-09-13 09:58:08.893259601 +0000 -@@ -2885,6 +2885,13 @@ struct option_t MuttVars[] = { ++++ init.h 2017-04-28 12:50:23.915168252 +0000 +@@ -3011,6 +3011,13 @@ struct option_t MuttVars[] = { ** .pp ** Also see the $$force_name variable. */ -+ { "send_group_reply_to", DT_BOOL, R_NONE, OPTSENDGROUPREPLYTO, 0 }, ++ { "send_group_reply_to", DT_BOOL, R_NONE, OPTSENDGROUPREPLYTO, 0 }, + /* + ** .pp + ** This variable controls how group replies are done. + ** When set, all recepients listet in "To:" are set in the + ** "To:" header again, else in the "CC", which is the default. + */ - { "score", DT_BOOL, R_NONE, OPTSCORE, 1 }, + { "score", DT_BOOL, R_NONE, OPTSCORE, 1 }, /* ** .pp --- mutt.h -+++ mutt.h 2016-09-13 09:58:08.893259601 +0000 -@@ -483,6 +483,7 @@ enum ++++ mutt.h 2017-04-28 12:47:19.222709344 +0000 +@@ -474,6 +474,7 @@ enum OPTSAVEADDRESS, OPTSAVEEMPTY, OPTSAVENAME, @@ -31,20 +31,22 @@ #ifdef USE_SIDEBAR OPTSIDEBAR, --- send.c -+++ send.c 2016-09-13 09:58:08.893259601 +0000 -@@ -624,8 +624,16 @@ int mutt_fetch_recips (ENVELOPE *out, EN - if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != M_YES)) ++++ send.c 2017-04-28 12:55:18.981510643 +0000 +@@ -603,8 +603,16 @@ int mutt_fetch_recips(ENVELOPE *out, ENV + if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != MUTT_YES)) { /* if(!mutt_addr_is_user(in->to)) */ +- rfc822_append(&out->cc, in->to, 1); +- rfc822_append(&out->cc, in->cc, 1); + if (option (OPTSENDGROUPREPLYTO)) + { -+ rfc822_append (&out->to, in->to, 0); -+ rfc822_append (&out->cc, in->cc, 1); -+ } ++ rfc822_append(&out->to, in->to, 0); ++ rfc822_append(&out->cc, in->cc, 1); ++ } + else + { - rfc822_append (&out->cc, in->to, 1); - rfc822_append (&out->cc, in->cc, 1); ++ rfc822_append(&out->cc, in->to, 1); ++ rfc822_append(&out->cc, in->cc, 1); + } } } diff --git a/mutt-1.5.21-mailcap.diff b/mutt-1.5.21-mailcap.diff index 9720fa2..f6da3a7 100644 --- a/mutt-1.5.21-mailcap.diff +++ b/mutt-1.5.21-mailcap.diff @@ -4,19 +4,18 @@ text/html Index: mutt-1.5.21/init.c =================================================================== --- - init.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + init.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) --- init.c -+++ init.c 2016-07-26 12:03:14.963958298 +0000 -@@ -3330,8 +3330,8 @@ void mutt_init (int skip_sys_rc, LIST *c - MailcapPath = safe_strdup (p); - else - { -- /* Default search path from RFC1524 */ -- MailcapPath = safe_strdup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap"); -+ /* Default search path from RFC1524 plus fallback for mutt specific defaults */ -+ MailcapPath = safe_strdup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap:" SYSCONFDIR "/mutt/mailcap"); ++++ init.c 2017-04-28 13:44:54.680745977 +0000 +@@ -3935,7 +3935,8 @@ void mutt_init(int skip_sys_rc, LIST *co + /* Default search path from RFC1524 */ + MailcapPath = safe_strdup( + "~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR +- "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap"); ++ "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap" ++ SYSCONFDIR "/mutt/mailcap"); } - Tempdir = safe_strdup ((p = getenv ("TMPDIR")) ? p : "/tmp"); + Tempdir = safe_strdup((p = getenv("TMPDIR")) ? p : "/tmp"); diff --git a/mutt-1.5.23-carriage-return.path b/mutt-1.5.23-carriage-return.path index fe6ee13..e0571fc 100644 --- a/mutt-1.5.23-carriage-return.path +++ b/mutt-1.5.23-carriage-return.path @@ -1,24 +1,24 @@ --- - crypt-gpgme.c | 2 +- + crypt_gpgme.c | 2 +- lib.c | 12 ++++++++++++ lib.h | 1 + pager.c | 2 +- pgp.c | 24 ++++++++++++------------ 5 files changed, 27 insertions(+), 14 deletions(-) ---- crypt-gpgme.c -+++ crypt-gpgme.c 2016-11-23 10:06:56.163851435 +0000 -@@ -2313,7 +2313,7 @@ static void copy_clearsigned (gpgme_data - +--- crypt_gpgme.c ++++ crypt_gpgme.c 2017-04-28 13:37:50.216829516 +0000 +@@ -2301,7 +2301,7 @@ static void copy_clearsigned(gpgme_data_ + if (armor_header) { -- if (buf[0] == '\n') +- if (buf[0] == '\n') + if (buf[0] == '\n' || (buf[0] == '\r' && buf[1] == '\n')) - armor_header = 0; + armor_header = 0; continue; } --- lib.c -+++ lib.c 2013-05-29 09:31:53.000000000 +0000 ++++ lib.c 2017-04-28 13:36:40.198162342 +0000 @@ -880,6 +880,18 @@ int mutt_strcmp(const char *a, const cha return strcmp(NONULL(a), NONULL(b)); } @@ -39,93 +39,92 @@ { return strcasecmp(NONULL(a), NONULL(b)); --- lib.h -+++ lib.h 2013-05-29 09:25:22.000000000 +0000 -@@ -197,6 +197,7 @@ int mutt_copy_bytes (FILE *, FILE *, siz - int mutt_rx_sanitize_string (char *, size_t, const char *); - int mutt_strcasecmp (const char *, const char *); - int mutt_strcmp (const char *, const char *); -+int mutt_strxcmp (const char *, const char *); - int mutt_strncasecmp (const char *, const char *, size_t); - int mutt_strncmp (const char *, const char *, size_t); - int mutt_strcoll (const char *, const char *); ++++ lib.h 2017-04-28 13:38:18.944282628 +0000 +@@ -168,6 +168,7 @@ int mutt_copy_bytes(FILE *, FILE *, size + int mutt_rx_sanitize_string(char *, size_t, const char *); + int mutt_strcasecmp(const char *, const char *); + int mutt_strcmp(const char *, const char *); ++int mutt_strxcmp(const char *, const char *); + int mutt_strncasecmp(const char *, const char *, size_t); + int mutt_strncmp(const char *, const char *, size_t); + int mutt_strcoll(const char *, const char *); --- pager.c -+++ pager.c 2013-05-29 09:31:53.000000000 +0000 -@@ -774,7 +774,7 @@ resolve_types (char *buf, char *raw, str - else if (check_attachment_marker ((char *) raw) == 0) ++++ pager.c 2017-04-28 13:39:16.319190287 +0000 +@@ -773,7 +773,7 @@ static void resolve_types(char *buf, cha + lineInfo[n].type = MT_COLOR_NORMAL; + else if (check_attachment_marker((char *) raw) == 0) lineInfo[n].type = MT_COLOR_ATTACHMENT; - #endif -- else if (mutt_strcmp ("-- \n", buf) == 0 || mutt_strcmp ("-- \r\n", buf) == 0) -+ else if (mutt_strxcmp ("-- \n", buf) == 0) +- else if ((mutt_strcmp("-- \n", buf) == 0) || (mutt_strcmp("-- \r\n", buf) == 0)) ++ else if (mutt_strxcmp("-- \n", buf) == 0) { i = n + 1; --- pgp.c -+++ pgp.c 2015-01-26 15:48:02.361518080 +0000 -@@ -302,7 +302,7 @@ static void pgp_copy_clearsigned (FILE * ++++ pgp.c 2017-04-28 13:40:43.301534032 +0000 +@@ -282,7 +282,7 @@ static void pgp_copy_clearsigned(FILE *f continue; } -- if (mutt_strcmp (buf, "-----BEGIN PGP SIGNATURE-----\n") == 0) -+ if (mutt_strxcmp (buf, "-----BEGIN PGP SIGNATURE-----\n") == 0) +- if (mutt_strcmp(buf, "-----BEGIN PGP SIGNATURE-----\n") == 0) ++ if (mutt_strxcmp(buf, "-----BEGIN PGP SIGNATURE-----\n") == 0) break; - + if (armor_header) -@@ -368,14 +368,14 @@ int pgp_application_pgp_handler (BODY *m +@@ -347,14 +347,14 @@ int pgp_application_pgp_handler(BODY *m, { clearsign = 0; -- if (mutt_strcmp ("MESSAGE-----\n", buf + 15) == 0) -+ if (mutt_strxcmp ("MESSAGE-----\n", buf + 15) == 0) +- if (mutt_strcmp("MESSAGE-----\n", buf + 15) == 0) ++ if (mutt_strxcmp("MESSAGE-----\n", buf + 15) == 0) needpass = 1; -- else if (mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15) == 0) -+ else if (mutt_strxcmp ("SIGNED MESSAGE-----\n", buf + 15) == 0) +- else if (mutt_strcmp("SIGNED MESSAGE-----\n", buf + 15) == 0) ++ else if (mutt_strxcmp("SIGNED MESSAGE-----\n", buf + 15) == 0) { - clearsign = 1; + clearsign = 1; needpass = 0; } -- else if (!mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15)) -+ else if (!mutt_strxcmp ("PUBLIC KEY BLOCK-----\n", buf + 15)) +- else if (mutt_strcmp("PUBLIC KEY BLOCK-----\n", buf + 15) == 0) ++ else if (mutt_strxcmp("PUBLIC KEY BLOCK-----\n", buf + 15) == 0) { needpass = 0; pgp_keyblock = 1; -@@ -408,10 +408,10 @@ int pgp_application_pgp_handler (BODY *m - - fputs (buf, tmpfp); +@@ -388,9 +388,9 @@ int pgp_application_pgp_handler(BODY *m, -- if ((needpass && mutt_strcmp ("-----END PGP MESSAGE-----\n", buf) == 0) || -+ if ((needpass && mutt_strxcmp ("-----END PGP MESSAGE-----\n", buf) == 0) || - (!needpass -- && (mutt_strcmp ("-----END PGP SIGNATURE-----\n", buf) == 0 -- || mutt_strcmp ("-----END PGP PUBLIC KEY BLOCK-----\n",buf) == 0))) -+ && (mutt_strxcmp ("-----END PGP SIGNATURE-----\n", buf) == 0 -+ || mutt_strxcmp ("-----END PGP PUBLIC KEY BLOCK-----\n",buf) == 0))) - break; - /* remember optional Charset: armor header as defined by RfC4880 */ - if (mutt_strncmp ("Charset: ", buf, 9) == 0) -@@ -645,11 +645,11 @@ static int pgp_check_traditional_one_bod + fputs(buf, tmpfp); + +- if ((needpass && (mutt_strcmp("-----END PGP MESSAGE-----\n", buf) == 0)) || +- (!needpass && ((mutt_strcmp("-----END PGP SIGNATURE-----\n", buf) == 0) || +- (mutt_strcmp("-----END PGP PUBLIC KEY BLOCK-----\n", buf) == 0)))) ++ if ((needpass && (mutt_strxcmp("-----END PGP MESSAGE-----\n", buf) == 0)) || ++ (!needpass && ((mutt_strxcmp("-----END PGP SIGNATURE-----\n", buf) == 0) || ++ (mutt_strxcmp("-----END PGP PUBLIC KEY BLOCK-----\n", buf) == 0)))) + break; + /* remember optional Charset: armor header as defined by RfC4880 */ + if (mutt_strncmp("Charset: ", buf, 9) == 0) +@@ -631,11 +631,11 @@ static int pgp_check_traditional_one_bod { - if (mutt_strncmp ("-----BEGIN PGP ", buf, 15) == 0) + if (mutt_strncmp("-----BEGIN PGP ", buf, 15) == 0) { -- if (mutt_strcmp ("MESSAGE-----\n", buf + 15) == 0) -+ if (mutt_strxcmp ("MESSAGE-----\n", buf + 15) == 0) - enc = 1; -- else if (mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15) == 0) -+ else if (mutt_strxcmp ("SIGNED MESSAGE-----\n", buf + 15) == 0) - sgn = 1; -- else if (mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15) == 0) -+ else if (mutt_strxcmp ("PUBLIC KEY BLOCK-----\n", buf + 15) == 0) - key = 1; +- if (mutt_strcmp("MESSAGE-----\n", buf + 15) == 0) ++ if (mutt_strxcmp("MESSAGE-----\n", buf + 15) == 0) + enc = 1; +- else if (mutt_strcmp("SIGNED MESSAGE-----\n", buf + 15) == 0) ++ else if (mutt_strxcmp("SIGNED MESSAGE-----\n", buf + 15) == 0) + sgn = 1; +- else if (mutt_strcmp("PUBLIC KEY BLOCK-----\n", buf + 15) == 0) ++ else if (mutt_strxcmp("PUBLIC KEY BLOCK-----\n", buf + 15) == 0) + key = 1; } } -@@ -1197,9 +1197,9 @@ BODY *pgp_sign_message (BODY *a) +@@ -1120,9 +1120,9 @@ BODY *pgp_sign_message(BODY *a) */ - while (fgets (buffer, sizeof (buffer) - 1, pgpout) != NULL) + while (fgets(buffer, sizeof(buffer) - 1, pgpout) != NULL) { -- if (mutt_strcmp ("-----BEGIN PGP MESSAGE-----\n", buffer) == 0) -+ if (mutt_strxcmp ("-----BEGIN PGP MESSAGE-----\n", buffer) == 0) - fputs ("-----BEGIN PGP SIGNATURE-----\n", fp); +- if (mutt_strcmp("-----BEGIN PGP MESSAGE-----\n", buffer) == 0) ++ if (mutt_strxcmp("-----BEGIN PGP MESSAGE-----\n", buffer) == 0) + fputs("-----BEGIN PGP SIGNATURE-----\n", fp); - else if (mutt_strcmp("-----END PGP MESSAGE-----\n", buffer) == 0) + else if (mutt_strxcmp("-----END PGP MESSAGE-----\n", buffer) == 0) - fputs ("-----END PGP SIGNATURE-----\n", fp); + fputs("-----END PGP SIGNATURE-----\n", fp); else - fputs (buffer, fp); + fputs(buffer, fp); diff --git a/mutt-1.5.9i-pgpewrap.diff b/mutt-1.5.9i-pgpewrap.diff index e5a3df5..0610cf8 100644 --- a/mutt-1.5.9i-pgpewrap.diff +++ b/mutt-1.5.9i-pgpewrap.diff @@ -1,17 +1,19 @@ --- - pgpewrap.c | 4 ++++ - 1 file changed, 4 insertions(+) + pgpewrap.c | 6 ++++++ + 1 file changed, 6 insertions(+) --- pgpewrap.c -+++ pgpewrap.c 2016-05-12 11:48:02.259503685 +0000 -@@ -58,6 +58,10 @@ int main(int argc, char **argv) { - } - *opt = NULL; ++++ pgpewrap.c 2017-04-28 12:46:25.911731441 +0000 +@@ -61,6 +61,12 @@ int main(int argc, char **argv) + } + *opt = NULL; -+ if (opts[0] == NULL) { -+ fprintf(stderr, "Command line usage: %s [flags] -- prefix [recipients]\n", argv[0]); -+ return 1; -+ } - execvp(opts[0], opts); - perror(argv[0]); - return 2; ++ if (opts[0] == NULL) ++ { ++ fprintf(stderr, "Command line usage: %s [flags] -- prefix [recipients]\n", argv[0]); ++ return 1; ++ } ++ + execvp(opts[0], opts); + perror(argv[0]); + return 2; diff --git a/mutt-1.6.1-opennfs.dif b/mutt-1.6.1-opennfs.dif index 3ebd44c..cec9abc 100644 --- a/mutt-1.6.1-opennfs.dif +++ b/mutt-1.6.1-opennfs.dif @@ -1,108 +1,44 @@ --- Makefile.am | 4 - - Makefile.in | 6 +- - lib.c | 15 ++++--- - mbox.c | 2 + lib.c | 7 ++- + mbox.c | 5 ++ mh.c | 9 +++- - mutt.h | 1 + mutt.h | 5 +- opennfs.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - sendlib.c | 2 - 8 files changed, 148 insertions(+), 13 deletions(-) + sendlib.c | 4 + + 7 files changed, 151 insertions(+), 5 deletions(-) --- Makefile.am -+++ Makefile.am 2016-09-13 09:59:28.591766504 +0000 -@@ -28,7 +28,7 @@ mutt_SOURCES = \ - edit.c enter.c flags.c init.c filter.c from.c \ - getdomain.c group.c \ - handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ -- main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \ -+ main.c mbox.c menu.c mh.c mx.c opennfs.c pager.c parse.c pattern.c \ - postpone.c query.c recvattach.c recvcmd.c \ - rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ - score.c send.c sendlib.c signal.c sort.c \ -@@ -93,7 +93,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c ++++ Makefile.am 2017-04-28 13:01:24.850494937 +0000 +@@ -43,7 +43,7 @@ mutt_SOURCES = addrbook.c alias.c ascii. + date.c edit.c editmsg.c enter.c filter.c flags.c from.c getdomain.c \ + group.c handler.c hash.c hdrline.c headers.c help.c history.c hook.c \ + init.c keymap.c lib.c main.c mbox.c mbyte.c menu.c mh.c muttlib.c \ +- mutt_idna.c mutt_sasl_plain.c mx.c pager.c parse.c pattern.c \ ++ mutt_idna.c mutt_sasl_plain.c mx.c opennfs.c pager.c parse.c pattern.c \ + postpone.c query.c recvattach.c recvcmd.c rfc1524.c rfc2047.c \ + rfc2231.c rfc3676.c rfc822.c safe_asprintf.c score.c send.c sendlib.c \ + signal.c sort.c status.c system.c thread.c url.c version.c +@@ -99,7 +99,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c mutt_dotlock_LDADD = $(LIBOBJS) mutt_dotlock_DEPENDENCIES = $(LIBOBJS) --pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5.c pgppacket.c ascii.c -+pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c opennfs.c md5.c pgppacket.c ascii.c +-pgpring_SOURCES = ascii.c extlib.c lib.c md5.c pgplib.c pgppacket.c \ ++pgpring_SOURCES = ascii.c extlib.c lib.c opennfs.c md5.c pgplib.c pgppacket.c \ + pgppubring.c sha1.c pgpring_LDADD = $(LIBOBJS) $(INTLLIBS) pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS) - ---- Makefile.in -+++ Makefile.in 2016-09-13 09:59:28.591766504 +0000 -@@ -125,7 +125,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali - hash.$(OBJEXT) hdrline.$(OBJEXT) headers.$(OBJEXT) \ - help.$(OBJEXT) hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) \ - mbox.$(OBJEXT) menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) \ -- pager.$(OBJEXT) parse.$(OBJEXT) pattern.$(OBJEXT) \ -+ opennfs.$(OBJEXT) pager.$(OBJEXT) parse.$(OBJEXT) pattern.$(OBJEXT) \ - postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \ - recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \ - rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \ -@@ -154,7 +154,7 @@ pgpewrap_LDADD = $(LDADD) - pgpewrap_DEPENDENCIES = $(LIBOBJS) $(am__DEPENDENCIES_1) - am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \ - lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5.$(OBJEXT) \ -- pgppacket.$(OBJEXT) ascii.$(OBJEXT) -+ pgppacket.$(OBJEXT) ascii.$(OBJEXT) opennfs.$(OBJEXT) - pgpring_OBJECTS = $(am_pgpring_OBJECTS) - am_txt2c_OBJECTS = txt2c.$(OBJEXT) - txt2c_OBJECTS = $(am_txt2c_OBJECTS) -@@ -481,7 +481,7 @@ mutt_SOURCES = \ - edit.c enter.c flags.c init.c filter.c from.c \ - getdomain.c group.c \ - handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ -- main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \ -+ main.c mbox.c menu.c mh.c mx.c opennfs.c pager.c parse.c pattern.c \ - postpone.c query.c recvattach.c recvcmd.c \ - rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ - score.c send.c sendlib.c signal.c sort.c \ --- lib.c -+++ lib.c 2016-09-13 09:59:28.591766504 +0000 -@@ -50,6 +50,7 @@ - #define EX_OK 0 - #endif - ++++ lib.c 2017-04-28 13:06:30.924636428 +0000 +@@ -34,6 +34,7 @@ + #include + #include + #include +#include "mutt.h" #include "lib.h" - -@@ -545,7 +546,7 @@ int safe_rename (const char *src, const - - - /* Create a temporary directory next to a file name */ -- -+#if defined(__linux__) - static int mutt_mkwrapdir (const char *path, char *newfile, size_t nflen, - char *newdir, size_t ndlen) - { -@@ -581,7 +582,7 @@ static int mutt_mkwrapdir (const char *p - } - return 0; - } -- -+#endif - /* remove a directory and everything under it */ - int mutt_rmtree (const char* path) - { -@@ -621,7 +622,7 @@ int mutt_rmtree (const char* path) - - return rc; - } -- -+#if defined(__linux__) - static int mutt_put_file_in_place (const char *path, const char *safe_file, const char *safe_dir) - { - int rv; -@@ -631,12 +632,16 @@ static int mutt_put_file_in_place (const - rmdir (safe_dir); - return rv; - } -- -+#endif - int safe_open (const char *path, int flags) - { + #ifdef HAVE_SYSEXITS_H +@@ -640,6 +641,10 @@ int safe_open(const char *path, int flag struct stat osb, nsb; int fd; @@ -110,66 +46,74 @@ + if ((fd = opennfs (path, flags, 0600)) < 0) + return fd; +#else - if (flags & O_EXCL) + if (flags & O_EXCL) { char safe_file[_POSIX_PATH_MAX]; -@@ -660,7 +665,7 @@ int safe_open (const char *path, int fla +@@ -662,7 +667,7 @@ int safe_open(const char *path, int flag - if ((fd = open (path, flags & ~O_EXCL, 0600)) < 0) + if ((fd = open(path, flags & ~O_EXCL, 0600)) < 0) return fd; -- +- +#endif /* make sure the file is not symlink */ - if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 || - compare_stat(&osb, &nsb) == -1) + if (lstat(path, &osb) < 0 || fstat(fd, &nsb) < 0 || !compare_stat(&osb, &nsb)) + { --- mbox.c -+++ mbox.c 2016-09-13 09:59:28.591766504 +0000 -@@ -781,7 +781,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int ++++ mbox.c 2017-04-28 13:09:43.360964197 +0000 +@@ -1055,8 +1055,13 @@ static int mbox_sync_mailbox(CONTEXT *ct /* Create a temporary file to write the new version of the mailbox in. */ - mutt_mktemp (tempfile, sizeof (tempfile)); -- if ((i = open (tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 || -+ if ((i = opennfs (tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 || - (fp = fdopen (i, "w")) == NULL) + mutt_mktemp(tempfile, sizeof(tempfile)); ++#if defined(__linux__) ++ if ((i = opennfs(tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 || ++ (fp = fdopen(i, "w")) == NULL) ++#else + if ((i = open(tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 || + (fp = fdopen(i, "w")) == NULL) ++#endif { if (-1 != i) + { --- mh.c -+++ mh.c 2016-09-13 09:59:28.591766504 +0000 -@@ -358,7 +358,11 @@ static int mh_mkstemp (CONTEXT * dest, F ++++ mh.c 2017-04-28 13:11:02.323457092 +0000 +@@ -353,7 +353,11 @@ static int mh_mkstemp(CONTEXT *dest, FIL { - snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%" PRIu64, - dest->path, NONULL (Hostname), (int) getpid (), mutt_rand64()); + snprintf(path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%" PRIu64, dest->path, + NONULL(Hostname), (int) getpid(), mutt_rand64()); +#if defined(__linux__) -+ if ((fd = opennfs (path, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1) ++ if ((fd = opennfs(path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) +#else - if ((fd = open (path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) + if ((fd = open(path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) +#endif { if (errno != EEXIST) { -@@ -1382,8 +1386,11 @@ int maildir_open_new_message (MESSAGE * +@@ -1492,8 +1496,11 @@ static int maildir_open_new_message(MESS + subdir, (long long) time(NULL), mutt_rand64(), NONULL(Hostname), suffix); - dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n", - path)); + mutt_debug(2, "maildir_open_new_message (): Trying %s.\n", path); - +#if defined(__linux__) -+ if ((fd = opennfs (path, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1) ++ if ((fd = opennfs(path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) +#else - if ((fd = open (path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) + if ((fd = open(path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) +#endif { if (errno != EEXIST) { --- mutt.h -+++ mutt.h 2016-09-13 09:59:28.591766504 +0000 -@@ -1076,4 +1076,5 @@ typedef struct ++++ mutt.h 2017-04-28 13:13:38.944467312 +0000 +@@ -1150,4 +1150,7 @@ typedef struct #include "lib.h" - #include "globals.h" + #include "protos.h" +-#endif /* _MUTT_H */ ++#if defined(__linux__) +extern int opennfs(const char *, int, int); - #endif /*MUTT_H*/ ++#endif ++#endif /* _MUTT_H */ --- opennfs.c -+++ opennfs.c 2016-09-13 09:59:28.595766429 +0000 ++++ opennfs.c 2017-04-28 12:56:59.243588127 +0000 @@ -0,0 +1,122 @@ +#include +#include @@ -294,13 +238,16 @@ + return open(path, flags, mode); +} --- sendlib.c -+++ sendlib.c 2016-09-13 09:59:28.595766429 +0000 -@@ -2260,7 +2260,7 @@ send_msg (const char *path, char **args, ++++ sendlib.c 2017-04-28 13:13:54.220175677 +0000 +@@ -2230,7 +2230,11 @@ static int send_msg(const char *path, ch if (SendmailWait >= 0 && tempfile && *tempfile) { - /* *tempfile will be opened as stdout */ -- if (open (*tempfile, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0600) < 0) -+ if (opennfs (*tempfile, O_WRONLY | O_CREAT | O_EXCL, 0600) < 0) - _exit (S_ERR); - /* redirect stderr to *tempfile too */ - if (dup (1) < 0) + /* *tempfile will be opened as stdout */ ++#if defined(__linux__) ++ if (opennfs(*tempfile, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0600) < 0) ++#else + if (open(*tempfile, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0600) < 0) ++#endif + _exit(S_ERR); + /* redirect stderr to *tempfile too */ + if (dup(1) < 0) diff --git a/mutt-1.6.2-gpgme_set_sender.patch b/mutt-1.6.2-gpgme_set_sender.patch deleted file mode 100644 index d3708df..0000000 --- a/mutt-1.6.2-gpgme_set_sender.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- - crypt-gpgme.c | 2 +- - crypt-gpgme.h | 2 +- - crypt-mod-pgp-gpgme.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - ---- crypt-gpgme.c -+++ crypt-gpgme.c 2016-11-23 10:35:10.336974209 +0000 -@@ -4946,7 +4946,7 @@ int smime_gpgme_verify_sender (HEADER *h - return verify_sender (h, GPGME_PROTOCOL_CMS); - } - --void gpgme_set_sender (const char *sender) -+void mutt_gpgme_set_sender (const char *sender) - { - mutt_error ("[setting sender] mailbox: %s\n", sender); - FREE (¤t_sender); ---- crypt-gpgme.h -+++ crypt-gpgme.h 2016-11-23 10:34:54.745294760 +0000 -@@ -53,6 +53,6 @@ int smime_gpgme_send_menu (HEADER *msg, - - int smime_gpgme_verify_sender (HEADER *h); - --void gpgme_set_sender (const char *sender); -+void mutt_gpgme_set_sender (const char *sender); - - #endif ---- crypt-mod-pgp-gpgme.c -+++ crypt-mod-pgp-gpgme.c 2016-11-23 10:35:45.700247187 +0000 -@@ -104,7 +104,7 @@ static BODY *crypt_mod_pgp_make_key_atta - - static void crypt_mod_pgp_set_sender (const char *sender) - { -- gpgme_set_sender (sender); -+ mutt_gpgme_set_sender (sender); - } - - struct crypt_module_specs crypt_mod_pgp_gpgme = diff --git a/mutt-1.6.2.dif b/mutt-1.6.2.dif deleted file mode 100644 index 14a1f40..0000000 --- a/mutt-1.6.2.dif +++ /dev/null @@ -1,320 +0,0 @@ ---- - configure.ac | 10 ++++- - doc/Makefile.in | 2 - - doc/Muttrc | 102 +++++++++++++++++++++++++++++++++++++++++--------------- - doc/Muttrc.head | 2 - - imap/auth.c | 20 ++++++++++ - init.h | 3 + - mx.c | 3 + - 7 files changed, 112 insertions(+), 30 deletions(-) - ---- configure.ac -+++ configure.ac 2016-09-13 09:57:13.810291522 +0000 -@@ -280,7 +280,7 @@ main () - mutt_cv_slang=$withval - if test -d $withval/include/slang; then - CPPFLAGS="$CPPFLAGS -I${withval}/include/slang" -- elif test -d $withval/include; then -+ elif test -d $withval/include && test $withval != /usr ; then - CPPFLAGS="$CPPFLAGS -I${withval}/include" - fi - LDFLAGS="$LDFLAGS -L${withval}/lib" -@@ -721,8 +721,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with- - else - if test "$with_ssl" != "yes" - then -+ case $withval in /usr|/usr/local) ;; -+ *) - LDFLAGS="$LDFLAGS -L$withval/lib" - CPPFLAGS="$CPPFLAGS -I$withval/include" -+ ;; -+ esac - fi - saved_LIBS="$LIBS" - -@@ -801,8 +805,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with - - if test "$with_sasl" != "yes" - then -+ case $with_sasl in /usr|/usr/local) ;; -+ *) - CPPFLAGS="$CPPFLAGS -I$with_sasl/include" - LDFLAGS="$LDFLAGS -L$with_sasl/lib" -+ ;; -+ esac - fi - - saved_LIBS="$LIBS" ---- doc/Makefile.in -+++ doc/Makefile.in 2016-09-13 09:57:13.810291522 +0000 -@@ -697,7 +697,7 @@ uninstall-local: - - check: - manual.txt: manual.html -- -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ -+ -LC_ALL=C lynx -dont_wrap_pre -center -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ - LC_ALL=C w3m -dump manual.html > $@ || \ - LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@ - ---- doc/Muttrc.head -+++ doc/Muttrc.head 2016-09-13 09:57:13.810291522 +0000 -@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ - "call urlview to extract URLs out of a message" - - # Show documentation when pressing F1 --macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" -+macro generic,index,pager " less -iM @docdir@/manual.txt" "show Mutt documentation" - - # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" - macro index,pager y "?" "show incoming mailboxes list" ---- doc/Muttrc -+++ doc/Muttrc 2016-09-13 09:57:13.810291522 +0000 -@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ - "call urlview to extract URLs out of a message" - - # Show documentation when pressing F1 --macro generic,pager " less /usr/local/share/doc/mutt/manual.txt" "show Mutt documentation" -+macro generic,index,pager " less -iM /usr/share/doc/packages/mutt/manual.txt.gz" "show Mutt documentation" - - # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" - macro index,pager y "?" "show incoming mailboxes list" -@@ -364,9 +364,9 @@ attachments -I message/external-body - # unset, you must first use the function (bound to ``;'' - # by default) to make the next function apply to all tagged messages. - # --# --# set autoedit=no --# -+ -+set autoedit=yes -+ - # Name: autoedit - # Type: boolean - # Default: no -@@ -482,9 +482,9 @@ attachments -I message/external-body - # Note: It should only be set in case Mutt isn't able to determine the - # character set used correctly. - # --# --# set check_mbox_size=no --# -+ -+set check_mbox_size=yes -+ - # Name: check_mbox_size - # Type: boolean - # Default: no -@@ -912,11 +912,11 @@ attachments -I message/external-body - # filtered message is read from the standard output. - # - # --# set dotlock_program="/usr/local/bin/mutt_dotlock" -+# set dotlock_program="/usr/bin/mutt_dotlock" - # - # Name: dotlock_program - # Type: path --# Default: "/usr/local/bin/mutt_dotlock" -+# Default: "/usr/bin/mutt_dotlock" - # - # - # Contains the path of the mutt_dotlock(8) binary to be used by -@@ -2380,9 +2380,9 @@ attachments -I message/external-body - # directly from the pager, and screen resizes cause lines longer than - # the screen width to be badly formatted in the help menu. - # --# --# set pager_context=0 --# -+ -+set pager_context=4 -+ - # Name: pager_context - # Type: number - # Default: 0 -@@ -2410,9 +2410,9 @@ attachments -I message/external-body - # pager. The valid sequences are listed in the $index_format - # section. - # --# --# set pager_index_lines=0 --# -+ -+set pager_index_lines=10 -+ - # Name: pager_index_lines - # Type: number - # Default: 0 -@@ -2430,9 +2430,9 @@ attachments -I message/external-body - # is less than $pager_index_lines, then the index will only use as - # many lines as it needs. - # --# --# set pager_stop=no --# -+ -+set pager_stop=yes -+ - # Name: pager_stop - # Type: boolean - # Default: no -@@ -3538,9 +3538,9 @@ attachments -I message/external-body - # user-defined headers, and other processing effects from being - # made multiple times to the draft file. - # --# --# set reverse_alias=no --# -+ -+set reverse_alias=yes -+ - # Name: reverse_alias - # Type: boolean - # Default: no -@@ -3672,6 +3672,18 @@ attachments -I message/external-body - # Also see the $force_name variable. - # - # -+# set send_group_reply_to=no -+# -+# Name: send_group_reply_to -+# Type: boolean -+# Default: no -+# -+# -+# This variable controls how group replies are done. -+# When set, all recepients listet in "To:" are set in the -+# "To:" header again, else in the "CC", which is the default. -+# -+# - # set score=yes - # - # Name: score -@@ -4255,9 +4267,9 @@ attachments -I message/external-body - # Setting this variable overrides the value of the $sendmail - # variable. - # --# --# set sort=date --# -+ -+set sort=reverse-date-sent -+ - # Name: sort - # Type: sort order - # Default: date -@@ -4741,9 +4753,9 @@ attachments -I message/external-body - # When set, mutt uses the date received rather than the date sent - # to thread messages by subject. - # --# --# set tilde=no --# -+ -+set tilde=yes -+ - # Name: tilde - # Type: boolean - # Default: no -@@ -5079,6 +5091,42 @@ attachments -I message/external-body - # in this case. - # - # -+# set xterm_icon="M%?n?AIL&ail?" -+# -+# Name: xterm_icon -+# Type: string -+# Default: "M%?n?AIL&ail?" -+# -+# -+# Controls the format of the icon title, as long as xterm_set_titles -+# is enabled. This string is identical in formatting to the one used by -+# ``$status_format''. -+# -+# -+# set xterm_set_titles=no -+# -+# Name: xterm_set_titles -+# Type: boolean -+# Default: no -+# -+# -+# Controls whether mutt sets the xterm title bar and icon name -+# (as long as you're in an appropriate terminal). The default must -+# be off to force in the validity checking. -+# -+# -+# set xterm_title="Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?" -+# -+# Name: xterm_title -+# Type: string -+# Default: "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?" -+# -+# -+# Controls the format of the title bar of the xterm provided that -+# xterm_set_titles has been set. This string is identical in formatting -+# to the one used by ``$status_format''. -+# -+# - # set write_inc=10 - # - # Name: write_inc ---- imap/auth.c -+++ imap/auth.c 2016-09-13 09:57:13.810291522 +0000 -@@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata) - dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method)); - authenticator = imap_authenticators; - -+#ifdef USE_SASL -+ /* "login" not supported by SASL */ -+ if (!ascii_strcasecmp ("login", method)) -+ { -+ while (authenticator->authenticate) -+ { -+ const char *identify = authenticator->method; -+ if (identify && !ascii_strcasecmp(identify, method)) -+ if ((r = authenticator->authenticate(idata, method)) != IMAP_AUTH_UNAVAIL) -+ { -+ FREE(&methods); -+ return r; -+ } -+ authenticator++; -+ } -+ } else { -+#endif - while (authenticator->authenticate) - { - if (!authenticator->method || -@@ -85,6 +102,9 @@ int imap_authenticate (IMAP_DATA* idata) - - authenticator++; - } -+#ifdef USE_SASL -+ } -+#endif - } - - FREE (&methods); ---- init.h -+++ init.h 2016-09-13 09:57:13.814291447 +0000 -@@ -3596,6 +3596,9 @@ struct option_t MuttVars[] = { - ** the default from the GNUTLS library. - */ - # endif /* USE_SSL_GNUTLS */ -+#if defined(USE_IMAP) && defined(SUSE_IMAP_FORCE_SSL) -+ { "imap_force_ssl", DT_SYN, R_NONE, UL "ssl_force_tls", 0 }, -+#endif - { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES }, - /* - ** .pp ---- mx.c -+++ mx.c 2016-09-13 09:57:13.814291447 +0000 -@@ -1829,6 +1829,9 @@ void mx_update_context (CONTEXT *ctx, in - { - h = ctx->hdrs[msgno]; - -+ if (!h) -+ continue; -+ - if (WithCrypto) - { - /* NOTE: this _must_ be done before the check for mailcap! */ diff --git a/mutt-1.6.2.tar.gz b/mutt-1.6.2.tar.gz deleted file mode 100644 index 7bf11bf..0000000 --- a/mutt-1.6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e -size 3956745 diff --git a/mutt-1.8.2.dif b/mutt-1.8.2.dif new file mode 100644 index 0000000..3c882ab --- /dev/null +++ b/mutt-1.8.2.dif @@ -0,0 +1,116 @@ +--- + configure.ac | 10 +++++++++- + doc/Muttrc.head | 2 +- + imap/auth.c | 20 ++++++++++++++++++++ + init.h | 3 +++ + mx.c | 3 +++ + 5 files changed, 36 insertions(+), 2 deletions(-) + +--- configure.ac ++++ configure.ac 2017-04-28 12:37:53.765552498 +0000 +@@ -393,7 +393,7 @@ main () + mutt_cv_slang=$withval + if test -d $withval/include/slang; then + CPPFLAGS="$CPPFLAGS -I${withval}/include/slang" +- elif test -d $withval/include; then ++ elif test -d $withval/include && test $withval != /usr ; then + CPPFLAGS="$CPPFLAGS -I${withval}/include" + fi + LDFLAGS="$LDFLAGS -L${withval}/lib" +@@ -744,8 +744,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with- + AC_MSG_WARN([SSL support is only useful with POP, IMAP or SMTP support]) + else + if test "$with_ssl" != "yes"; then ++ case $withval in /usr|/usr/local) ;; ++ *) + LDFLAGS="$LDFLAGS -L$withval/lib" + CPPFLAGS="$CPPFLAGS -I$withval/include" ++ ;; ++ esac + fi + saved_LIBS="$LIBS" + +@@ -825,8 +829,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with + fi + + if test "$with_sasl" != "yes"; then ++ case $with_sasl in /usr|/usr/local) ;; ++ *) + CPPFLAGS="$CPPFLAGS -I$with_sasl/include" + LDFLAGS="$LDFLAGS -L$with_sasl/lib" ++ ;; ++ esac + fi + + saved_LIBS="$LIBS" +--- doc/Muttrc.head ++++ doc/Muttrc.head 2017-04-28 12:25:19.528026960 +0000 +@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ + "call urlview to extract URLs out of a message" + + # Show documentation when pressing F1 +-macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" ++macro generic,index,pager " less -iM @docdir@/manual.txt.gz" "show Mutt documentation" + + # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" + macro index,pager y "?" "show incoming mailboxes list" +--- imap/auth.c ++++ imap/auth.c 2017-04-28 12:30:38.789900091 +0000 +@@ -68,6 +68,23 @@ int imap_authenticate(IMAP_DATA *idata) + mutt_debug(2, "imap_authenticate: Trying method %s\n", method); + authenticator = imap_authenticators; + ++#ifdef USE_SASL ++ /* "login" not supported by SASL */ ++ if (!ascii_strcasecmp ("login", method)) ++ { ++ while (authenticator->authenticate) ++ { ++ const char *identify = authenticator->method; ++ if (identify && !ascii_strcasecmp(identify, method)) ++ if ((r = authenticator->authenticate(idata, method)) != IMAP_AUTH_UNAVAIL) ++ { ++ FREE(&methods); ++ return r; ++ } ++ authenticator++; ++ } ++ } else { ++#endif + while (authenticator->authenticate) + { + if (!authenticator->method || (ascii_strcasecmp(authenticator->method, method) == 0)) +@@ -79,6 +96,9 @@ int imap_authenticate(IMAP_DATA *idata) + + authenticator++; + } ++#ifdef USE_SASL ++ } ++#endif + } + + FREE(&methods); +--- init.h ++++ init.h 2017-04-28 12:33:39.178438277 +0000 +@@ -3735,6 +3735,9 @@ struct option_t MuttVars[] = { + ** the default from the GNUTLS library. + */ + # endif /* USE_SSL_GNUTLS */ ++#if defined(USE_IMAP) && defined(SUSE_IMAP_FORCE_SSL) ++ { "imap_force_ssl", DT_SYN, R_NONE, UL "ssl_force_tls", 0 }, ++#endif + { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, MUTT_YES }, + /* + ** .pp +--- mx.c ++++ mx.c 2017-04-28 12:25:20.772003088 +0000 +@@ -1444,6 +1444,9 @@ void mx_update_context(CONTEXT *ctx, int + { + h = ctx->hdrs[msgno]; + ++ if (!h) ++ continue; ++ + if (WithCrypto) + { + /* NOTE: this _must_ be done before the check for mailcap! */ diff --git a/mutt.changes b/mutt.changes index e410256..fd61517 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,98 @@ +------------------------------------------------------------------- +Fri Apr 28 14:37:01 UTC 2017 - werner@suse.de + +- Update to neomutt 20170421 which updates to mutt 1.8.2 + 1.8.2 Bug fix release. + 1.8.1 Bug fix release. + 1.8.0 + - $locale has been removed. Mutt now respects the LC_TIME setting + instead. See also $attribution_locale. + + $attribution_locale can be used to override the date formatting in + attribution strings. When unset, Mutt will use the locale + environment, but note the default value of $date_format has a + leading '!' which says to use the C-locale. + ! Message-id and mail-followup-to headers are now preserved for recalled + messages. + + added to complement . + ! The pager position is reset to the top when toggling header-weed. + ! IMAP messages moved to $trash via server-side copy are marked as read. + + jumps to the root message of a thread. + ! Piped text attachments are charset converted. + + Added %F to $attach_format, to show the content-disposition filename. + %d will fall back to %F which will fall back to %f. + + allows an attachment name to be changed, without + modifying the underlying file's name. + ! Mutt will look for the user's muttrc additionally in + $XDG_CONFIG_HOME/mutt/. + + Compressed mbox and mmdf files are now supported via open-hook, + close-hook, and append-hook. See contrib/sample.muttrc-compress + for suggested settings. Note this is a compile-time option: + --enable-compressed. + + When $flag_safe is set, flagged messages cannot be deleted. + + The '@' pattern modifier can be used to limit matches to known aliases. + + creates a hotkey binding to a specific message. The hotkey + prefix is specified via $mark_macro_prefix. + + and can be used to add/remove environment variables + passed to children. + ! Mutt will now use the built-in OpenSSL SSL_set_verify() callback + to verify certificates. This allows better support for verifying + chains, including alternative chain support. + + $uncollapse_new controls whether a thread will be uncollapsed when a new + message arrives. + ! $to_chars and $status_chars now accept multibyte characters. + + allows replacing matching subjects with something else. + This can be used to declutter subject lines in the index. + + can be used to add, change, or delete a message's X-Label. + ! Pattern expressions with ~y support label tab completion. + + The header cache now also supports Kyoto Cabinet and LMDB as + backend databases. + 1.7.2 (2016-12-04): + ! Bug fix release. No features were modified or added. + ! Fixes for OpenSSL 1.1. Versions less than 0.9.6 are no longer supported. + 1.7.1 (2016-10-08): + ! Bug fix release. No features were modified or added. + 1.7.0 (2016-08-18): + ! Improved alignment when using multi-column characters with + soft-fill (%*X) and right-justified (%>X) format strings. + + The COLUMNS environment variable will be set to the width of the + pager when invoking display filters. This can be used in + copiousoutput mailcap entries to allow their output to match the + pager width. + + The sidebar patch has been merged. Please watch for airborne + bovine. See the documentation for all the options, or simply + enable it with 'set sidebar_visible'. + + $mail_check_stats and $mail_check_stats_interval control whether, + and how often, to scan for unread, flagged, and total message + counts when checking for new mail in mailboxes. These statistics + can be displayed in the sidebar and browser. + + $trash, when set, specifies the path of the folder where mails + marked for deletion will be moved, instead of being irremediably + purged. + + The function can be used to delete an entry and + bypass the trash folder. + + $folder_format has new format strings %m and %n, to display + total and unread message counts for mailboxes. Note that + $mail_check_stats should be enabled to use these. + ! When browsing IMAP, %N will now display 'N', instead of the unread + message count. Please use %n to display unread messages. +- Removed obsolete patches + * COLS-workaround.dif + * mutt-1.6.2-gpgme_set_sender.patch +- Modifyed and ported patches + * aw.listreply.diff + * bsc907453-CVE-2014-9116-jessie.patch + * bug-676388-largefile.patch + * mutt-1.5.15-wrapcolumn.diff + * mutt-1.5.20-sendgroupreplyto.diff + * mutt-1.5.21-mailcap.diff + * mutt-1.5.23-carriage-return.path + * mutt-1.5.9i-pgpewrap.diff + * mutt-1.6.1-opennfs.dif + * patch-1.5.24.vk.pgp_verbose_mime + * widechar.sidebar.dif +- Renamed patch + * mutt-1.6.2.dif becomes mutt-1.8.2.dif + ------------------------------------------------------------------- Mon Mar 6 10:37:24 UTC 2017 - werner@suse.de diff --git a/mutt.spec b/mutt.spec index 7cfd66b..540bafd 100644 --- a/mutt.spec +++ b/mutt.spec @@ -41,6 +41,7 @@ BuildRequires: libidn-devel BuildRequires: libopenssl-devel BuildRequires: libxml2 BuildRequires: libxslt +BuildRequires: lua-devel BuildRequires: lynx BuildRequires: ncurses-devel %if 0%{?is_opensuse} @@ -72,14 +73,18 @@ Requires: perl(Expect) # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires: desktop-data-SuSE -%global neo 20160826 -Version: 1.6.2 +%global neo 20170421 +Version: 1.8.2 Release: 0 Summary: Mail Program License: GPL-2.0+ Group: Productivity/Networking/Email/Clients # ftp://ftp.mutt.org/mutt/devel/ -Source0: https://bitbucket.org/mutt/mutt/downloads/%name-%version.tar.gz +# Source0: https://bitbucket.org/mutt/mutt/downloads/%name-%version.tar.gz +# Switch over to neomutt tar ball which is based on original mutt +# http://www.neomutt.org/ +### https://github.com/neomutt/neomutt/archive/neomutt-20170421.tar.gz +Source0: neomutt-%neo.tar.gz Source1: Signature_conversion Source2: README.alternates Source3: mutt.png @@ -88,8 +93,6 @@ Source5: skel.muttrc Source6: krb5-config Source7: mutt-1.5.21.de.po Source9: mutt.mailcap -# http://www.neomutt.org/ -Source10: neomutt-distro-%neo.tar.gz Patch: %name-%version.dif # http://www.spinnaker.de/mutt/compressed/ Patch2: %name-1.5.9i-pgpewrap.diff @@ -108,10 +111,6 @@ Patch16: mutt-1.5.23-carriage-return.path Patch18: mutt-1.5.21-mailcap.diff # PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup() Patch19: bsc907453-CVE-2014-9116-jessie.patch -# PATCH-FIX-OPENSUSE boo#980830 ... remove if fixed upstream -Patch20: COLS-workaround.dif -# PATCH-FIX-OPENSUSE avoid name space trouble with latest libgppme -Patch21: mutt-1.6.2-gpgme_set_sender.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -121,23 +120,8 @@ highlighting, threading, and PGP. It takes some time to get used to, however. %prep -%setup -q -n mutt-%version -a 10 -for p in neomutt-distro-%neo/bugs-common/*.patch -do - patch -s -p1 --fuzz=%_default_patch_fuzz < $p -done -for p in neomutt-distro-%neo/features-common/*.patch -do - patch -s -p1 --fuzz=%_default_patch_fuzz < $p -done -for p in neomutt-distro-%neo/features-extra/*.patch -do - patch -s -p1 --fuzz=%_default_patch_fuzz < $p -done -for p in neomutt-distro-%neo/bugs-neomutt/*.patch -do - patch -s -p1 --fuzz=%_default_patch_fuzz < $p -done +ln -sf neomutt-neomutt-%neo mutt-%version +%setup -q -D -n mutt-%version %patch -p0 -b .p0 %patch2 -p0 -b .pgpewrap %patch3 -p0 -b .sendgroupreplyto @@ -150,12 +134,9 @@ done %patch16 -p0 -b .crlf %patch18 -p0 -b .mailcap %patch19 -p0 -b .cvw2014.9116 -%patch20 -p0 -b .cols -%patch21 -p0 -b .ssend rm -vf README*.orig rm -vf PATCHES*.orig -cp doc/Muttrc Muttrc.SuSE cp %{S:2} . %build @@ -228,17 +209,17 @@ chmod 755 $KRB5CFGPATH --with-curses=%{_prefix} \ --with-regex \ --enable-smtp \ - --enable-hcache \ + --enable-lua \ + --enable-nntp \ --with-idn make -C doc clean -make -C po update-po -cp %{S:7} po/de.po +#make -C po update-po +#cp %{S:7} po/de.po make make -C doc %install make install DESTDIR=%{buildroot} -mv Muttrc.SuSE %{buildroot}%{_sysconfdir}/Muttrc install -m 755 %{S:1} %{buildroot}%{_bindir} gzip -9 doc/manu*.txt rm -f contrib/Makefile* @@ -280,7 +261,6 @@ rm -vf %{buildroot}%{_docdir}/%name/manual.txt %files -f %name.lang %defattr(-,root,root) %doc doc/manual.txt.gz COPYRIGHT README* NEWS TODO -%doc doc/PGP-Notes.txt doc/applying-patches.txt doc/devel-notes.txt %config(noreplace) %{_sysconfdir}/skel/.muttrc %config(noreplace) %{_sysconfdir}/Muttrc %{_bindir}/mutt @@ -299,9 +279,14 @@ rm -vf %{buildroot}%{_docdir}/%name/manual.txt %dir %{_datadir}/mutt/ %{_datadir}/mutt/mailcap %doc %{_docdir}/%name/ChangeLog -%doc %{_docdir}/%name/GPL +%doc %{_docdir}/%name/ChangeLog.neomutt +%doc %{_docdir}/%name/LICENSE.md %doc %{_docdir}/%name/*.html -%doc %{_docdir}/%name/patch-notes.txt +%doc %{_docdir}/%name/*.txt +%dir %doc %{_docdir}/%name/keybase/ +%doc %{_docdir}/%name/keybase/* +%doc %{_docdir}/%name/muttrc.* +%doc %{_docdir}/%name/neomutt-syntax.vim %dir %doc %{_docdir}/%name/samples/ %doc %{_docdir}/%name/samples/*.rc %doc %{_docdir}/%name/samples/ca-bundle.crt @@ -311,6 +296,7 @@ rm -vf %{buildroot}%{_docdir}/%name/manual.txt %doc %{_docdir}/%name/samples/mutt_xtitle %doc %{_docdir}/%name/samples/sample.* %doc %{_docdir}/%name/samples/smime_keys_test.pl -%doc %{_docdir}/%name/smime-notes.txt +%dir %doc %{_docdir}/%name/vim-keys/ +%doc %{_docdir}/%name/vim-keys/* %changelog diff --git a/neomutt-20170421.tar.gz b/neomutt-20170421.tar.gz new file mode 100644 index 0000000..b50101a --- /dev/null +++ b/neomutt-20170421.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2033ab18f2b05b45e22475ee98a5decdb2b19934d41803a02b66dd0d452c125 +size 2733547 diff --git a/patch-1.5.24.vk.pgp_verbose_mime b/patch-1.5.24.vk.pgp_verbose_mime index fbc012f..50dc738 100644 --- a/patch-1.5.24.vk.pgp_verbose_mime +++ b/patch-1.5.24.vk.pgp_verbose_mime @@ -6,15 +6,15 @@ 4 files changed, 17 insertions(+), 1 deletion(-) --- PATCHES -+++ PATCHES 2016-09-13 10:02:27.260419491 +0000 ++++ PATCHES 2017-04-28 13:24:26.336119973 +0000 @@ -1,3 +1,4 @@ +patch-1.5.3.vk.pgp_verbose_mime patch-1.5.9.aw.listreply.1 - patch-compress-neo-git - patch-cond-date-neo-git + patch-attach-headers-color-neomutt + patch-compose-to-sender-neomutt --- globals.h -+++ globals.h 2016-09-13 10:02:12.156702439 +0000 -@@ -271,6 +271,8 @@ WHERE REGEXP PgpDecryptionOkay; ++++ globals.h 2017-04-28 13:23:52.912755124 +0000 +@@ -280,6 +280,8 @@ WHERE REGEXP PgpDecryptionOkay; WHERE char *PgpSignAs; WHERE short PgpTimeout; WHERE char *PgpEntryFormat; @@ -24,8 +24,8 @@ WHERE char *PgpDecodeCommand; WHERE char *PgpVerifyCommand; --- init.h -+++ init.h 2016-09-13 10:02:12.156702439 +0000 -@@ -3205,6 +3205,18 @@ struct option_t MuttVars[] = { ++++ init.h 2017-04-28 13:25:47.026586390 +0000 +@@ -3342,6 +3342,18 @@ struct option_t MuttVars[] = { ** a line quoted text if it also matches $$smileys. This mostly ** happens at the beginning of a line. */ @@ -41,18 +41,18 @@ + ** This option sets the Content-Description used for signature parts in + ** PGP/MIME signed messages. + */ - - - + { "smime_ask_cert_label", DT_BOOL, R_NONE, OPTASKCERTLABEL, 1 }, + /* + ** .pp --- pgp.c -+++ pgp.c 2016-09-13 10:02:12.156702439 +0000 -@@ -1261,7 +1261,8 @@ BODY *pgp_sign_message (BODY *a) ++++ pgp.c 2017-04-28 13:27:03.109140122 +0000 +@@ -1184,7 +1184,8 @@ BODY *pgp_sign_message(BODY *a) t->disposition = DISPNONE; t->encoding = ENC7BIT; - t->unlink = 1; /* ok to remove this file after sending. */ -- mutt_set_parameter ("name", "signature.asc", &t->parameter); + t->unlink = true; /* ok to remove this file after sending. */ +- mutt_set_parameter("name", "signature.asc", &t->parameter); + mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter); + t->description = safe_strdup (PgpMimeSignatureDescription); - return (a); + return a; } diff --git a/widechar.sidebar.dif b/widechar.sidebar.dif index a6cd9e2..65a0cac 100644 --- a/widechar.sidebar.dif +++ b/widechar.sidebar.dif @@ -1,53 +1,52 @@ --- - handler.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) + handler.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) --- handler.c -+++ handler.c 2016-07-26 12:01:48.801608572 +0000 -@@ -780,7 +780,7 @@ static void enriched_set_flags (const wc - static int text_enriched_handler (BODY *a, STATE *s) - { - enum { -- TEXT, LANGLE, TAG, BOGUS_TAG, NEWLINE, ST_EOF, DONE -+ TEXT, TEXT_GOTWC, LANGLE, TAG, BOGUS_TAG, NEWLINE, ST_EOF, DONE - } state = TEXT; - - long bytes = a->length; -@@ -809,7 +809,7 @@ static int text_enriched_handler (BODY * ++++ handler.c 2017-04-28 13:34:40.080448389 +0000 +@@ -816,6 +816,7 @@ static int text_enriched_handler(BODY *a + enum + { + TEXT, ++ TEXT_GOTWC, + LANGLE, + TAG, + BOGUS_TAG, +@@ -853,7 +854,7 @@ static int text_enriched_handler(BODY *a { if (state != ST_EOF) { -- if (!bytes || (wc = fgetwc (s->fpin)) == WEOF) +- if (!bytes || (wc = fgetwc(s->fpin)) == WEOF) + if (state != TEXT_GOTWC && (!bytes || (fscanf (s->fpin, "%lc", &wc)) == EOF)) - state = ST_EOF; + state = ST_EOF; else - bytes--; -@@ -817,6 +817,8 @@ static int text_enriched_handler (BODY * + bytes--; +@@ -861,6 +862,8 @@ static int text_enriched_handler(BODY *a switch (state) { + case TEXT_GOTWC: -+ state = TEXT; - case TEXT : - switch (wc) - { -@@ -877,9 +879,8 @@ static int text_enriched_handler (BODY * - enriched_flush (&stte, 1); - else - { -- ungetwc (wc, s->fpin); - bytes++; -- state = TEXT; -+ state = TEXT_GOTWC; - } - break; ++ state = TEXT; + case TEXT: + switch (wc) + { +@@ -921,9 +924,8 @@ static int text_enriched_handler(BODY *a + enriched_flush(&stte, 1); + else + { +- ungetwc(wc, s->fpin); + bytes++; +- state = TEXT; ++ state = TEXT_GOTWC; + } + break; -@@ -1567,7 +1568,7 @@ void mutt_decode_attachment (BODY *b, ST +@@ -1638,7 +1640,7 @@ void mutt_decode_attachment(BODY *b, STA * strip all trailing spaces to improve interoperability; * if $text_flowed is unset, simply verbatim copy input */ --static int text_plain_handler (BODY *b, STATE *s) -+static int text_plain_handler (BODY *b __attribute__((unused)), STATE *s) +-static int text_plain_handler(BODY *b, STATE *s) ++static int text_plain_handler(BODY *b __attribute__((unused)), STATE *s) { char *buf = NULL; size_t l = 0, sz = 0; From aa2758f4d71d6a4ac29e1f4383e22ce3711c892c Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 28 Apr 2017 16:38:30 +0000 Subject: [PATCH 02/14] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=155 --- mutt-1.5.21.de.po | 5166 --------------------------------------------- mutt.changes | 6 + mutt.spec | 22 +- 3 files changed, 25 insertions(+), 5169 deletions(-) delete mode 100644 mutt-1.5.21.de.po diff --git a/mutt-1.5.21.de.po b/mutt-1.5.21.de.po deleted file mode 100644 index c1b4964..0000000 --- a/mutt-1.5.21.de.po +++ /dev/null @@ -1,5166 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: 1.5.21\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-26 19:59+0100\n" -"PO-Revision-Date: 2008-05-18 10:28+0200\n" -"Last-Translator: Philipp Thomas \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -#: account.c:163 -#, c-format -msgid "Username at %s: " -msgstr "Username bei %s: " - -#: account.c:224 -#, c-format -msgid "Password for %s@%s: " -msgstr "Passwort für %s@%s: " - -#: addrbook.c:37 browser.c:46 pager.c:1530 postpone.c:41 query.c:48 -#: recvattach.c:53 -msgid "Exit" -msgstr "Verlassen" - -#: addrbook.c:38 curs_main.c:406 pager.c:1537 postpone.c:42 -msgid "Del" -msgstr "Lösch." - -#: addrbook.c:39 curs_main.c:407 postpone.c:43 -msgid "Undel" -msgstr "Behalten" - -#: addrbook.c:40 -msgid "Select" -msgstr "Auswählen" - -#. __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 -#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:425 -msgid "Help" -msgstr "Hilfe" - -#: addrbook.c:145 -msgid "You have no aliases!" -msgstr "Keine Einträge im Adressbuch!" - -#: addrbook.c:155 -msgid "Aliases" -msgstr "Adressbuch" - -#. add a new alias -#: alias.c:260 -msgid "Alias as: " -msgstr "Kurzname für Adressbuch: " - -#: alias.c:266 -msgid "You already have an alias defined with that name!" -msgstr "" -"Sie haben bereits einen Adressbucheintrag mit diesem Kurznamen definiert." - -#: alias.c:272 -msgid "Warning: This alias name may not work. Fix it?" -msgstr "Warnung: Dieser Alias-Name könnte Probleme bereiten. Korrigieren?" - -#: alias.c:297 -msgid "Address: " -msgstr "Adresse: " - -#: alias.c:307 send.c:206 -#, c-format -msgid "Error: '%s' is a bad IDN." -msgstr "Fehler: '%s' ist eine fehlerhafte IDN." - -#: alias.c:319 -msgid "Personal name: " -msgstr "Name: " - -#: alias.c:328 -#, c-format -msgid "[%s = %s] Accept?" -msgstr "[%s = %s] Eintragen?" - -#: alias.c:347 recvattach.c:440 recvattach.c:466 recvattach.c:479 -#: recvattach.c:492 recvattach.c:522 -msgid "Save to file: " -msgstr "Speichern in Datei: " - -#: alias.c:361 -msgid "Error reading alias file" -msgstr "Fehler beim Lesen der alias Datei" - -#: alias.c:383 -msgid "Alias added." -msgstr "Adresse eingetragen." - -#: alias.c:391 -msgid "Error seeking in alias file" -msgstr "Fehler beim Suchen in alias Datei" - -#: attach.c:113 attach.c:245 attach.c:477 attach.c:973 -msgid "Can't match nametemplate, continue?" -msgstr "Namensschema kann nicht erfüllt werden, fortfahren?" - -#. For now, editing requires a file, no piping -#: attach.c:126 -#, c-format -msgid "Mailcap compose entry requires %%s" -msgstr "\"compose\"-Eintrag in der Mailcap-Datei erfordert %%s." - -#: attach.c:134 attach.c:266 commands.c:223 compose.c:1179 curs_lib.c:180 -#: curs_lib.c:548 -#, c-format -msgid "Error running \"%s\"!" -msgstr "Fehler beim Ausführen von \"%s\"!" - -#: attach.c:144 -msgid "Failure to open file to parse headers." -msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu untersuchen." - -#: attach.c:175 -msgid "Failure to open file to strip headers." -msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu entfernen." - -#: attach.c:184 -msgid "Failure to rename file." -msgstr "Fehler beim Umbenennen der Datei." - -#: attach.c:197 -#, c-format -msgid "No mailcap compose entry for %s, creating empty file." -msgstr "" -"Kein \"compose\"-Eintrag für %s in der Mailcap-Datei, erzeuge leere Datei." - -#. For now, editing requires a file, no piping -#: attach.c:258 -#, c-format -msgid "Mailcap Edit entry requires %%s" -msgstr "\"edit\"-Eintrag in Mailcap erfordert %%s." - -#: attach.c:280 -#, c-format -msgid "No mailcap edit entry for %s" -msgstr "Kein \"edit\"-Eintrag für %s in Mailcap." - -#: attach.c:443 -msgid "No matching mailcap entry found. Viewing as text." -msgstr "Es gibt keinen passenden Mailcap-Eintrag. Anzeige als Text." - -#: attach.c:456 -msgid "MIME type not defined. Cannot view attachment." -msgstr "Undefinierter MIME-Typ. Kann Anhang nicht anzeigen." - -#: attach.c:546 -msgid "Cannot create filter" -msgstr "Kann Filter nicht erzeugen." - -#: attach.c:554 -#, c-format -msgid "---Command: %-20.20s Description: %s" -msgstr "---Kommando: %-20.20s Beschreibung: %s" - -#: attach.c:558 -#, c-format -msgid "---Command: %-30.30s Attachment: %s" -msgstr "---Kommando: %-30.30s Anhang: %s" - -#: attach.c:604 -#, c-format -msgid "---Attachment: %s: %s" -msgstr "---Anhang: %s: %s" - -#: attach.c:607 -#, c-format -msgid "---Attachment: %s" -msgstr "---Anhang: %s" - -#: attach.c:677 attach.c:709 attach.c:1006 attach.c:1064 handler.c:1285 -#: pgpkey.c:570 pgpkey.c:759 -msgid "Can't create filter" -msgstr "Kann Filter nicht erzeugen" - -#: attach.c:845 -msgid "Write fault!" -msgstr "Schreibfehler!" - -#: attach.c:1087 -msgid "I don't know how to print that!" -msgstr "Ich weiß nicht, wie man dies druckt!" - -#: browser.c:47 -msgid "Chdir" -msgstr "Verzeichnis" - -#: browser.c:48 -msgid "Mask" -msgstr "Maske" - -#: browser.c:400 browser.c:1055 -#, c-format -msgid "%s is not a directory." -msgstr "%s ist kein Verzeichnis." - -#: browser.c:539 -#, c-format -msgid "Mailboxes [%d]" -msgstr "Mailbox-Dateien [%d]" - -#: browser.c:546 -#, c-format -msgid "Subscribed [%s], File mask: %s" -msgstr "Abonniert [%s], Dateimaske: %s" - -#: browser.c:550 -#, c-format -msgid "Directory [%s], File mask: %s" -msgstr "Verzeichnis [%s], Dateimaske: %s" - -#: browser.c:562 -msgid "Can't attach a directory!" -msgstr "Verzeichnisse können nicht angehängt werden!" - -#: browser.c:701 browser.c:1123 browser.c:1221 -msgid "No files match the file mask" -msgstr "Es gibt keine zur Maske passenden Dateien" - -#: browser.c:905 -msgid "Create is only supported for IMAP mailboxes" -msgstr "Es können nur IMAP Mailboxen erzeugt werden" - -#: browser.c:929 -msgid "Rename is only supported for IMAP mailboxes" -msgstr "Es können nur IMAP Mailboxen umbenannt werden" - -#: browser.c:952 -msgid "Delete is only supported for IMAP mailboxes" -msgstr "Es können nur IMAP Mailboxen gelöscht werden" - -#: browser.c:962 -msgid "Cannot delete root folder" -msgstr "Kann Wurzel-Mailbox nicht löschen" - -#: browser.c:965 -#, c-format -msgid "Really delete mailbox \"%s\"?" -msgstr "Mailbox \"%s\" wirklich löschen?" - -#: browser.c:979 -msgid "Mailbox deleted." -msgstr "Mailbox gelöscht." - -#: browser.c:985 -msgid "Mailbox not deleted." -msgstr "Mailbox nicht gelöscht." - -#: browser.c:1004 -msgid "Chdir to: " -msgstr "Verzeichnis wechseln nach: " - -#: browser.c:1043 browser.c:1116 -msgid "Error scanning directory." -msgstr "Fehler beim Einlesen des Verzeichnisses." - -#: browser.c:1067 -msgid "File Mask: " -msgstr "Dateimaske: " - -#: browser.c:1139 -msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? " -msgstr "" -"Sortiere umgekehrt nach (D)atum, (a)lphabetisch, (G)röße, oder (n)icht? " - -#: browser.c:1140 -msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? " -msgstr "Sortiere nach (D)atum, (a)lphabetisch, (G)röße oder (n)icht?" - -#: browser.c:1141 -msgid "dazn" -msgstr "dagn" - -#: browser.c:1208 -msgid "New file name: " -msgstr "Neuer Dateiname: " - -#: browser.c:1239 -msgid "Can't view a directory" -msgstr "Verzeichnisse können nicht angezeigt werden." - -#: browser.c:1256 -msgid "Error trying to view file" -msgstr "Fehler bei der Anzeige einer Datei" - -#: buffy.c:486 -msgid "New mail in " -msgstr "Neue Nachrichten in " - -#: color.c:326 -#, c-format -msgid "%s: color not supported by term" -msgstr "%s: color wird nicht vom Terminal unterstützt." - -#: color.c:332 -#, c-format -msgid "%s: no such color" -msgstr "%s: Farbe unbekannt." - -#: color.c:378 color.c:584 color.c:595 -#, c-format -msgid "%s: no such object" -msgstr "%s: Objekt unbekannt." - -#: color.c:391 -#, c-format -msgid "%s: command valid only for index, body, header objects" -msgstr "%s: Kommando ist nur für Index-/Body-/Header-Objekt gültig." - -#: color.c:399 -#, c-format -msgid "%s: too few arguments" -msgstr "%s: Zu wenige Parameter." - -#: color.c:572 -msgid "Missing arguments." -msgstr "Fehlende Parameter." - -#: color.c:611 color.c:622 -msgid "color: too few arguments" -msgstr "color: Zu wenige Parameter." - -#: color.c:645 -msgid "mono: too few arguments" -msgstr "mono: Zu wenige Parameter." - -#: color.c:665 -#, c-format -msgid "%s: no such attribute" -msgstr "%s: Attribut unbekannt." - -#: color.c:705 hook.c:69 hook.c:77 keymap.c:902 -msgid "too few arguments" -msgstr "Zu wenige Parameter." - -#: color.c:714 hook.c:83 -msgid "too many arguments" -msgstr "Zu viele Parameter." - -#: color.c:730 -msgid "default colors not supported" -msgstr "Standard-Farben werden nicht unterstützt." - -#. find out whether or not the verify signature -#: commands.c:90 -msgid "Verify PGP signature?" -msgstr "PGP-Signatur überprüfen?" - -#: commands.c:115 mbox.c:787 -msgid "Could not create temporary file!" -msgstr "Konnte keine Temporärdatei erzeugen!" - -#: commands.c:128 -msgid "Cannot create display filter" -msgstr "Kann Filter zum Anzeigen nicht erzeugen." - -#: commands.c:152 -msgid "Could not copy message" -msgstr "Konnte Nachricht nicht kopieren." - -#: commands.c:189 -msgid "S/MIME signature successfully verified." -msgstr "S/MIME Unterschrift erfolgreich überprüft." - -#: commands.c:191 -msgid "S/MIME certificate owner does not match sender." -msgstr "S/MIME Zertifikat-Inhaber stimmt nicht mit Absender überein." - -#: commands.c:194 commands.c:205 -msgid "Warning: Part of this message has not been signed." -msgstr "Warnung: Ein Teil dieser Nachricht wurde nicht signiert." - -#: commands.c:196 -msgid "S/MIME signature could NOT be verified." -msgstr "S/MIME Unterschrift konnte NICHT überprüft werden." - -#: commands.c:203 -msgid "PGP signature successfully verified." -msgstr "PGP Unterschrift erfolgreich überprüft." - -#: commands.c:207 -msgid "PGP signature could NOT be verified." -msgstr "PGP Unterschrift konnte NICHT überprüft werden." - -#: commands.c:231 -msgid "Command: " -msgstr "Kommando: " - -#: commands.c:256 -msgid "Warning: message has no From: header" -msgstr "Warnung: Nachricht hat keine From: Kopfzeile" - -#: commands.c:274 recvcmd.c:171 -msgid "Bounce message to: " -msgstr "Nachricht weiterleiten an: " - -#: commands.c:276 recvcmd.c:173 -msgid "Bounce tagged messages to: " -msgstr "Markierte Nachrichten weiterleiten an: " - -#: commands.c:291 recvcmd.c:182 -msgid "Error parsing address!" -msgstr "Unverständliche Adresse!" - -#: commands.c:299 recvcmd.c:190 -#, c-format -msgid "Bad IDN: '%s'" -msgstr "Ungültige IDN: '%s'" - -#: commands.c:310 recvcmd.c:204 -#, c-format -msgid "Bounce message to %s" -msgstr "Nachricht an %s weiterleiten" - -#: commands.c:310 recvcmd.c:204 -#, c-format -msgid "Bounce messages to %s" -msgstr "Nachrichten an %s weiterleiten" - -#: commands.c:326 recvcmd.c:220 -msgid "Message not bounced." -msgstr "Nachricht nicht weitergeleitet." - -#: commands.c:326 recvcmd.c:220 -msgid "Messages not bounced." -msgstr "Nachrichten nicht weitergeleitet." - -#: commands.c:336 recvcmd.c:239 -msgid "Message bounced." -msgstr "Nachricht weitergeleitet." - -#: commands.c:336 recvcmd.c:239 -msgid "Messages bounced." -msgstr "Nachrichten weitergeleitet." - -#: commands.c:413 commands.c:447 commands.c:464 -msgid "Can't create filter process" -msgstr "Kann Filterprozess nicht erzeugen" - -#: commands.c:493 -msgid "Pipe to command: " -msgstr "In Kommando einspeisen: " - -#: commands.c:510 -msgid "No printing command has been defined." -msgstr "Kein Druck-Kommando definiert." - -#: commands.c:515 -msgid "Print message?" -msgstr "Nachricht drucken?" - -#: commands.c:515 -msgid "Print tagged messages?" -msgstr "Ausgewählte Nachrichten drucken?" - -#: commands.c:524 -msgid "Message printed" -msgstr "Nachricht gedruckt" - -#: commands.c:524 -msgid "Messages printed" -msgstr "Nachrichten gedruckt" - -#: commands.c:526 -msgid "Message could not be printed" -msgstr "Nachricht konnte nicht gedruckt werden" - -#: commands.c:527 -msgid "Messages could not be printed" -msgstr "Nachrichten konnten nicht gedruckt werden" - -#: commands.c:536 -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?: " -msgstr "" -"Umgekehrt (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsrt/(G)röße/Be(w)/S(p)" -"am?: " - -#: commands.c:537 -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?: " -msgstr "" -"Sortieren (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsrt/(G)röße/Be(w)ert/S" -"(p)am?: " - -#: commands.c:538 -msgid "dfrsotuzcp" -msgstr "danbefugwp" - -#: commands.c:595 -msgid "Shell command: " -msgstr "Shell-Kommando: " - -#: commands.c:738 -#, c-format -msgid "Decode-save%s to mailbox" -msgstr "Speichere%s dekodiert in Mailbox" - -#: commands.c:739 -#, c-format -msgid "Decode-copy%s to mailbox" -msgstr "Kopiere%s dekodiert in Mailbox" - -#: commands.c:740 -#, c-format -msgid "Decrypt-save%s to mailbox" -msgstr "Speichere%s entschlüsselt in Mailbox" - -#: commands.c:741 -#, c-format -msgid "Decrypt-copy%s to mailbox" -msgstr "Kopiere%s entschlüsselt in Mailbox" - -#: commands.c:742 -#, c-format -msgid "Save%s to mailbox" -msgstr "Speichere%s in Mailbox" - -#: commands.c:742 -#, c-format -msgid "Copy%s to mailbox" -msgstr "Kopiere%s in Mailbox" - -#: commands.c:743 -msgid " tagged" -msgstr " ausgewählte" - -#: commands.c:816 -#, c-format -msgid "Copying to %s..." -msgstr "Kopiere nach %s..." - -#: commands.c:932 -#, c-format -msgid "Convert to %s upon sending?" -msgstr "Konvertiere beim Senden nach %s?" - -#: commands.c:942 -#, c-format -msgid "Content-Type changed to %s." -msgstr "Content-Type in %s abgeändert." - -#: commands.c:947 -#, c-format -msgid "Character set changed to %s; %s." -msgstr "Zeichensatz in %s abgeändert; %s." - -#: commands.c:949 -msgid "not converting" -msgstr "nicht konvertiert" - -#: commands.c:949 -msgid "converting" -msgstr "konvertiert" - -#: compose.c:47 -msgid "There are no attachments." -msgstr "Es sind keine Anhänge vorhanden." - -#: compose.c:89 -msgid "Send" -msgstr "Absenden" - -#: compose.c:90 remailer.c:488 -msgid "Abort" -msgstr "Verwerfen" - -#: compose.c:94 compose.c:664 -msgid "Attach file" -msgstr "Datei anhängen" - -#: compose.c:95 -msgid "Descrip" -msgstr "Beschr." - -#: compose.c:119 -msgid "Not supported" -msgstr "Nicht unterstützt." - -#: compose.c:124 -msgid "Sign, Encrypt" -msgstr "Signieren, Verschlüsseln" - -#: compose.c:126 -msgid "Encrypt" -msgstr "Verschlüsseln" - -#: compose.c:128 -msgid "Sign" -msgstr "Signieren" - -#: compose.c:130 -msgid "None" -msgstr "Kein" - -#: compose.c:137 -msgid " (inline PGP)" -msgstr " (inline PGP)" - -#: compose.c:139 -msgid " (PGP/MIME)" -msgstr " (PGP/MIME)" - -#: compose.c:143 -msgid " (S/MIME)" -msgstr " (S/MIME)" - -#: compose.c:152 compose.c:156 -msgid " sign as: " -msgstr " signiere als: " - -#: compose.c:152 compose.c:156 -msgid "" -msgstr "" - -#: compose.c:164 -msgid "Encrypt with: " -msgstr "Verschlüsseln mit: " - -#: compose.c:218 -#, c-format -msgid "%s [#%d] no longer exists!" -msgstr "%s [#%d] existiert nicht mehr!" - -#: compose.c:226 -#, c-format -msgid "%s [#%d] modified. Update encoding?" -msgstr "%s [#%d] wurde verändert. Kodierung neu bestimmen?" - -#: compose.c:269 -msgid "-- Attachments" -msgstr "-- Anhänge" - -#: compose.c:299 -#, c-format -msgid "Warning: '%s' is a bad IDN." -msgstr "Warnung: '%s' ist eine ungültige IDN." - -#: compose.c:322 -msgid "You may not delete the only attachment." -msgstr "Der einzige Nachrichtenteil kann nicht gelöscht werden." - -#: compose.c:597 send.c:1586 -#, c-format -msgid "Bad IDN in \"%s\": '%s'" -msgstr "Ungültige IDN in \"%s\": '%s'" - -#: compose.c:680 -msgid "Attaching selected files..." -msgstr "Hänge ausgewählte Dateien an..." - -#: compose.c:692 -#, c-format -msgid "Unable to attach %s!" -msgstr "Kann %s nicht anhängen!" - -#: compose.c:711 -msgid "Open mailbox to attach message from" -msgstr "Mailbox, aus der angehängt werden soll" - -#: compose.c:749 -msgid "No messages in that folder." -msgstr "Keine Nachrichten in diesem Ordner." - -#: compose.c:758 -msgid "Tag the messages you want to attach!" -msgstr "Bitte markieren Sie die Nachrichten, die Sie anhängen wollen!" - -#: compose.c:790 -msgid "Unable to attach!" -msgstr "Kann nicht anhängen!" - -#: compose.c:841 -msgid "Recoding only affects text attachments." -msgstr "Ändern der Kodierung betrifft nur Textanhänge." - -#: compose.c:846 -msgid "The current attachment won't be converted." -msgstr "Der aktuelle Anhang wird nicht konvertiert werden." - -#: compose.c:848 -msgid "The current attachment will be converted." -msgstr "Der aktuelle Anhang wird konvertiert werden." - -#: compose.c:923 -msgid "Invalid encoding." -msgstr "Ungültige Kodierung." - -#: compose.c:949 -msgid "Save a copy of this message?" -msgstr "Soll eine Kopie dieser Nachricht gespeichert werden?" - -#: compose.c:1005 -msgid "Rename to: " -msgstr "Umbenennen in: " - -#: compose.c:1010 editmsg.c:96 editmsg.c:121 sendlib.c:872 -#, c-format -msgid "Can't stat %s: %s" -msgstr "Kann Verzeichniseintrag für Datei %s nicht lesen: %s" - -#: compose.c:1037 -msgid "New file: " -msgstr "Neue Datei: " - -#: compose.c:1050 -msgid "Content-Type is of the form base/sub" -msgstr "Content-Type ist von der Form Basis/Untertyp." - -#: compose.c:1056 -#, c-format -msgid "Unknown Content-Type %s" -msgstr "Unbekannter Content-Type %s." - -#: compose.c:1069 -#, c-format -msgid "Can't create file %s" -msgstr "Kann Datei %s nicht anlegen." - -#: compose.c:1077 -msgid "What we have here is a failure to make an attachment" -msgstr "Anhang kann nicht erzeugt werden." - -#: compose.c:1138 -msgid "Postpone this message?" -msgstr "Nachricht zurückstellen?" - -#: compose.c:1197 -msgid "Write message to mailbox" -msgstr "Schreibe Nachricht in Mailbox" - -#: compose.c:1200 -#, c-format -msgid "Writing message to %s ..." -msgstr "Schreibe Nachricht nach %s ..." - -#: compose.c:1209 -msgid "Message written." -msgstr "Nachricht geschrieben." - -#: compose.c:1221 -msgid "S/MIME already selected. Clear & continue ? " -msgstr "S/MIME bereits ausgewählt. Löschen und weiter?" - -#: compose.c:1247 -msgid "PGP already selected. Clear & continue ? " -msgstr "PGP bereits ausgewählt. Löschen und weiter?" - -#: crypt-gpgme.c:358 -#, c-format -msgid "error creating gpgme context: %s\n" -msgstr "Fehler beim Erzeugen des gpgme Kontexts: %s\n" - -#: crypt-gpgme.c:368 -#, c-format -msgid "error enabling CMS protocol: %s\n" -msgstr "Fehler beim Aktivieren des CMS Protokolls : %s\n" - -#: crypt-gpgme.c:388 -#, c-format -msgid "error creating gpgme data object: %s\n" -msgstr "Fehler beim Erzeugen des gpgme Datenobjekts: %s\n" - -#: crypt-gpgme.c:454 crypt-gpgme.c:472 crypt-gpgme.c:1431 -#, c-format -msgid "error allocating data object: %s\n" -msgstr "Fehler beim Anlegen des Datenobjekts: %s\n" - -#: crypt-gpgme.c:490 -#, c-format -msgid "error rewinding data object: %s\n" -msgstr "Fehler beim Zurücklegen des Datenobjekts: %s\n" - -#: crypt-gpgme.c:512 crypt-gpgme.c:559 -#, c-format -msgid "error reading data object: %s\n" -msgstr "Fehler beim Lesen des Datenobjekts: %s\n" - -#: crypt-gpgme.c:620 -#, c-format -msgid "error adding recipient `%s': %s\n" -msgstr "Fehler beim Hinzufügen des Empfängers `%s': %s\n" - -#: crypt-gpgme.c:658 -#, c-format -msgid "secret key `%s' not found: %s\n" -msgstr "Geheimer Schlüssel `%s' nicht gefunden: %s\n" - -#: crypt-gpgme.c:668 -#, c-format -msgid "ambiguous specification of secret key `%s'\n" -msgstr "mehrdeutige Angabe des geheimen Schlüssels `%s'\n" - -#: crypt-gpgme.c:680 -#, c-format -msgid "error setting secret key `%s': %s\n" -msgstr "Fehler beim Setzen des geheimen Schlüssels `%s': %s\n" - -#: crypt-gpgme.c:697 -#, c-format -msgid "error setting PKA signature notation: %s\n" -msgstr "Fehler beim Setzen der Darstellung der PKA Unterschrift: %s\n" - -#: crypt-gpgme.c:753 -#, c-format -msgid "error encrypting data: %s\n" -msgstr "Fehler beim Verschlüsseln der Daten: %s\n" - -#: crypt-gpgme.c:870 -#, c-format -msgid "error signing data: %s\n" -msgstr "Fehler beim Signiren der Daten: %s\n" - -#: crypt-gpgme.c:1065 -msgid "Warning: One of the keys has been revoked\n" -msgstr "Warnung: Einer der Schlüssel wurde zurückgezogen\n" - -#: crypt-gpgme.c:1074 -msgid "Warning: The key used to create the signature expired at: " -msgstr "Warnung: Der Signatur-Schlüssel ist verfallen am: " - -#: crypt-gpgme.c:1080 -msgid "Warning: At least one certification key has expired\n" -msgstr "Warnung: Mindestens ein Zertifikat ist abgelaufen\n" - -#: crypt-gpgme.c:1096 -msgid "Warning: The signature expired at: " -msgstr "Warnung: Die Signatur ist verfallen am: " - -#: crypt-gpgme.c:1102 -msgid "Can't verify due to a missing key or certificate\n" -msgstr "Kann wegen fehlenden Schlüssel oder Zertifikats nicht geprüft werden\n" - -#: crypt-gpgme.c:1107 -msgid "The CRL is not available\n" -msgstr "Die CRL ist nicht verfügbar.\n" - -#: crypt-gpgme.c:1113 -msgid "Available CRL is too old\n" -msgstr "Verfügbare CRL ist zu alt\n" - -#: crypt-gpgme.c:1118 -msgid "A policy requirement was not met\n" -msgstr "Eine Policy-Anforderung wurde nicht erfüllt\n" - -#: crypt-gpgme.c:1127 -msgid "A system error occurred" -msgstr "Ein Systemfehler ist aufgetreten" - -#: crypt-gpgme.c:1161 -msgid "WARNING: PKA entry does not match signer's address: " -msgstr "WARNUNG: PKA Eintrag entspricht nicht Adresse des Unterzeichners: " - -#: crypt-gpgme.c:1168 -msgid "PKA verified signer's address is: " -msgstr "Die PKA geprüfte Adresse des Unterzeichners lautet: " - -#: crypt-gpgme.c:1185 crypt-gpgme.c:3294 -msgid "Fingerprint: " -msgstr "Fingerabdruck: " - -#: crypt-gpgme.c:1245 -msgid "" -"WARNING: We have NO indication whether the key belongs to the person named " -"as shown above\n" -msgstr "" -"WARNUNG: Wir haben KEINEN Hinweis, ob der Schlüssel zur oben genannten " -"Person gehört\n" - -#: crypt-gpgme.c:1252 -msgid "WARNING: The key does NOT BELONG to the person named as shown above\n" -msgstr "WARNUNG: Der Schlüssel gehört NICHT zur oben genannten Person\n" - -#: crypt-gpgme.c:1256 -msgid "" -"WARNING: It is NOT certain that the key belongs to the person named as shown " -"above\n" -msgstr "" -"WARNUNG: Es ist NICHT sicher, dass der Schlüssel zur oben genannten Person " -"gehört\n" - -#: crypt-gpgme.c:1286 -msgid "aka: " -msgstr "aka: " - -#: crypt-gpgme.c:1297 -msgid "created: " -msgstr "erstellt: " - -#: crypt-gpgme.c:1362 -msgid "Error getting key information: " -msgstr "Fehler beim Auslesen der Schlüsselinformation: " - -#. We can't decide (yellow) but this is a PGP key with a good -#. signature, so we display what a PGP user expects: The name, -#. fingerprint and the key validity (which is neither fully or -#. ultimate). -#: crypt-gpgme.c:1369 crypt-gpgme.c:1384 -msgid "Good signature from:" -msgstr "Gültige Unterschrift von:" - -#: crypt-gpgme.c:1376 -msgid "*BAD* signature from:" -msgstr "*Ungültige* Unterschrift von:" - -#: crypt-gpgme.c:1392 -msgid "Problem signature from:" -msgstr "Problematische Unterschrift von:" - -#: crypt-gpgme.c:1393 -msgid " expires: " -msgstr " läuft ab: " - -#. Note: We don't need a current time output because GPGME avoids -#. such an attack by separating the meta information from the -#. data. -#: crypt-gpgme.c:1439 crypt-gpgme.c:1654 crypt-gpgme.c:2287 -msgid "[-- Begin signature information --]\n" -msgstr "[-- Anfang der Unterschrift --]\n" - -#: crypt-gpgme.c:1448 -#, c-format -msgid "Error: verification failed: %s\n" -msgstr "Fehler: Überprüfung fehlgeschlagen: %s\n" - -#: crypt-gpgme.c:1497 -#, c-format -msgid "*** Begin Notation (signature by: %s) ***\n" -msgstr "*** Anfang Darstellung (Unterschrift von: %s) ***\n" - -#: crypt-gpgme.c:1519 -msgid "*** End Notation ***\n" -msgstr "*** Ende Darstellung ***\n" - -#: crypt-gpgme.c:1527 crypt-gpgme.c:1667 crypt-gpgme.c:2302 -msgid "" -"[-- End signature information --]\n" -"\n" -msgstr "" -"[-- Ende der Signatur --]\n" -"\n" - -#: crypt-gpgme.c:1622 -#, c-format -msgid "" -"[-- Error: decryption failed: %s --]\n" -"\n" -msgstr "" -"[-- Fehler: Entschlüsselung fehlgeschlagen: %s --]\n" -"\n" - -#: crypt-gpgme.c:2079 -#, c-format -msgid "Error extracting key data!\n" -msgstr "Fehler beim Auslesen der Schlüsselinformation!\n" - -#: crypt-gpgme.c:2262 -#, c-format -msgid "Error: decryption/verification failed: %s\n" -msgstr "Fehler: Entschlüsselung/Prüfung fehlgeschlagen: %s\n" - -#: crypt-gpgme.c:2310 -msgid "Error: copy data failed\n" -msgstr "Fehler: Kopieren der Daten fehlgeschlagen\n" - -#: crypt-gpgme.c:2330 pgp.c:438 -msgid "" -"[-- BEGIN PGP MESSAGE --]\n" -"\n" -msgstr "" -"[-- BEGIN PGP MESSAGE --]\n" -"\n" - -#: crypt-gpgme.c:2332 pgp.c:440 -msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n" -msgstr "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n" - -#: crypt-gpgme.c:2335 pgp.c:442 -msgid "" -"[-- BEGIN PGP SIGNED MESSAGE --]\n" -"\n" -msgstr "" -"[-- BEGIN PGP SIGNED MESSAGE --]\n" -"\n" - -#: crypt-gpgme.c:2362 pgp.c:473 -msgid "[-- END PGP MESSAGE --]\n" -msgstr "[-- END PGP MESSAGE --]\n" - -#: crypt-gpgme.c:2364 pgp.c:480 -msgid "[-- END PGP PUBLIC KEY BLOCK --]\n" -msgstr "[-- END PGP PUBLIC KEY BLOCK --]\n" - -#: crypt-gpgme.c:2366 pgp.c:482 -msgid "[-- END PGP SIGNED MESSAGE --]\n" -msgstr "[-- END PGP SIGNED MESSAGE --]\n" - -#: crypt-gpgme.c:2388 pgp.c:515 -msgid "" -"[-- Error: could not find beginning of PGP message! --]\n" -"\n" -msgstr "" -"[-- Fehler: Konnte Anfang der PGP-Nachricht nicht finden! --]\n" -"\n" - -#: crypt-gpgme.c:2419 pgp.c:947 -msgid "" -"[-- Error: malformed PGP/MIME message! --]\n" -"\n" -msgstr "" -"[-- Fehler: Fehlerhafte PGP/MIME-Nachricht! --]\n" -"\n" - -#: crypt-gpgme.c:2431 crypt-gpgme.c:2497 pgp.c:960 -msgid "[-- Error: could not create temporary file! --]\n" -msgstr "[-- Fehler: Konnte Temporärdatei nicht anlegen! --]\n" - -#: crypt-gpgme.c:2443 -msgid "" -"[-- The following data is PGP/MIME signed and encrypted --]\n" -"\n" -msgstr "" -"[-- Die folgenden Daten sind PGP/MIME-signiert und -verschlüsselt --]\n" -"\n" - -#: crypt-gpgme.c:2444 pgp.c:969 -msgid "" -"[-- The following data is PGP/MIME encrypted --]\n" -"\n" -msgstr "" -"[-- Die folgenden Daten sind PGP/MIME-verschlüsselt --]\n" -"\n" - -#: crypt-gpgme.c:2466 -msgid "[-- End of PGP/MIME signed and encrypted data --]\n" -msgstr "[-- Ende der PGP/MIME-signierten und -verschlüsselten Daten --]\n" - -#: crypt-gpgme.c:2467 pgp.c:989 -msgid "[-- End of PGP/MIME encrypted data --]\n" -msgstr "[-- Ende der PGP/MIME-verschlüsselten Daten --]\n" - -#: crypt-gpgme.c:2509 -msgid "" -"[-- The following data is S/MIME signed --]\n" -"\n" -msgstr "" -"[-- Die folgenden Daten sind S/MIME signiert --]\n" -"\n" - -#: crypt-gpgme.c:2510 -msgid "" -"[-- The following data is S/MIME encrypted --]\n" -"\n" -msgstr "" -"[-- Die folgenden Daten sind S/MIME-verschlüsselt --]\n" -"\n" - -#: crypt-gpgme.c:2540 -msgid "[-- End of S/MIME signed data --]\n" -msgstr "[-- Ende der S/MIME signierten Daten --]\n" - -#: crypt-gpgme.c:2541 -msgid "[-- End of S/MIME encrypted data --]\n" -msgstr "[-- Ende der S/MIME-verschlüsselten Daten --]\n" - -#: crypt-gpgme.c:3134 -msgid "[Can't display this user ID (unknown encoding)]" -msgstr "[Kann Benutzer-ID nicht darstellen (unbekannte Kodierung)]" - -#: crypt-gpgme.c:3136 -msgid "[Can't display this user ID (invalid encoding)]" -msgstr "[Kann Benutzer-ID nicht darstellen (unzulässige Kodierung)]" - -#: crypt-gpgme.c:3141 -msgid "[Can't display this user ID (invalid DN)]" -msgstr "[Kann Benutzer-ID nicht darstellen (unzulässiger DN)]" - -#: crypt-gpgme.c:3220 -msgid " aka ......: " -msgstr " aka ......: " - -#: crypt-gpgme.c:3220 -msgid "Name ......: " -msgstr "Name ......: " - -#: crypt-gpgme.c:3223 crypt-gpgme.c:3362 -msgid "[Invalid]" -msgstr "[Ungültig]" - -#: crypt-gpgme.c:3243 crypt-gpgme.c:3386 -#, c-format -msgid "Valid From : %s\n" -msgstr "Gültig ab: %s\n" - -#: crypt-gpgme.c:3256 crypt-gpgme.c:3399 -#, c-format -msgid "Valid To ..: %s\n" -msgstr "Gültig bis: %s\n" - -#: crypt-gpgme.c:3269 crypt-gpgme.c:3412 -#, c-format -msgid "Key Type ..: %s, %lu bit %s\n" -msgstr "Schlüssel Typ ..: %s, %lu Bit %s\n" - -#: crypt-gpgme.c:3271 crypt-gpgme.c:3414 -#, c-format -msgid "Key Usage .: " -msgstr "Schlüssel Gebrauch .: " - -#: crypt-gpgme.c:3276 crypt-gpgme.c:3419 -msgid "encryption" -msgstr "Verschlüsselung" - -#: crypt-gpgme.c:3277 crypt-gpgme.c:3282 crypt-gpgme.c:3287 crypt-gpgme.c:3420 -#: crypt-gpgme.c:3425 crypt-gpgme.c:3430 -msgid ", " -msgstr ", " - -#: crypt-gpgme.c:3281 crypt-gpgme.c:3424 -msgid "signing" -msgstr "Signieren" - -#: crypt-gpgme.c:3286 crypt-gpgme.c:3429 -msgid "certification" -msgstr "Zertifikat" - -#: crypt-gpgme.c:3326 -#, c-format -msgid "Serial-No .: 0x%s\n" -msgstr "Seriennr. .: 0x%s\n" - -#: crypt-gpgme.c:3334 -#, c-format -msgid "Issued By .: " -msgstr "Herausgegeben von .: " - -#. display only the short keyID -#: crypt-gpgme.c:3353 -#, c-format -msgid "Subkey ....: 0x%s" -msgstr "Unter-Schlüssel: 0x%s" - -#: crypt-gpgme.c:3357 -msgid "[Revoked]" -msgstr "[Zurückgez.]" - -#: crypt-gpgme.c:3367 -msgid "[Expired]" -msgstr "[Abgelaufen]" - -#: crypt-gpgme.c:3372 -msgid "[Disabled]" -msgstr "[Deaktiviert]" - -#: crypt-gpgme.c:3456 pgpkey.c:559 pgpkey.c:739 -msgid "Can't create temporary file" -msgstr "Kann temporäre Datei nicht erzeugen" - -#: crypt-gpgme.c:3459 -msgid "Collecting data..." -msgstr "Sammle Informtionen..." - -#: crypt-gpgme.c:3485 -#, c-format -msgid "Error finding issuer key: %s\n" -msgstr "Fehler bei der Suche nach dem Schlüssel des Herausgebers: %s\n" - -#: crypt-gpgme.c:3495 -msgid "Error: certification chain to long - stopping here\n" -msgstr "Fehler: Zertifikatskette zu lang - Stoppe hier\n" - -#: crypt-gpgme.c:3506 pgpkey.c:580 -#, c-format -msgid "Key ID: 0x%s" -msgstr "Schlüssel ID: 0x%s" - -#: crypt-gpgme.c:3589 -#, c-format -msgid "gpgme_new failed: %s" -msgstr "gpgme_new fehlgeschlagen: %s" - -#: crypt-gpgme.c:3628 crypt-gpgme.c:3691 -#, c-format -msgid "gpgme_op_keylist_start failed: %s" -msgstr "gpgme_op_keylist_start fehlgeschlagen: %s" - -#: crypt-gpgme.c:3678 crypt-gpgme.c:3719 -#, c-format -msgid "gpgme_op_keylist_next failed: %s" -msgstr "gpgme_op_keylist_next fehlgeschlagen: %s" - -#: crypt-gpgme.c:3790 -msgid "All matching keys are marked expired/revoked." -msgstr "Alles passenden Schlüssel sind abgelaufen/zurückgezogen." - -#: crypt-gpgme.c:3819 mutt_ssl.c:986 mutt_ssl_gnutls.c:873 pgpkey.c:515 -#: smime.c:420 -msgid "Exit " -msgstr "Ende " - -#. __STRCAT_CHECKED__ -#: crypt-gpgme.c:3821 pgpkey.c:517 smime.c:422 -msgid "Select " -msgstr "Auswahl " - -#. __STRCAT_CHECKED__ -#: crypt-gpgme.c:3824 pgpkey.c:520 -msgid "Check key " -msgstr "Schlüssel prüfen " - -#: crypt-gpgme.c:3840 -msgid "PGP and S/MIME keys matching" -msgstr "Passende PGP und S/MIME Schlüssel" - -#: crypt-gpgme.c:3842 -msgid "PGP keys matching" -msgstr "Passende PGP Schlüssel" - -#: crypt-gpgme.c:3844 -msgid "S/MIME keys matching" -msgstr "Passende S/MIME Schlüssel" - -#: crypt-gpgme.c:3846 -msgid "keys matching" -msgstr "Passende Schlüssel" - -#: crypt-gpgme.c:3849 -#, c-format -msgid "%s <%s>." -msgstr "%s <%s>." - -#: crypt-gpgme.c:3851 -#, c-format -msgid "%s \"%s\"." -msgstr "%s \"%s\"." - -#: crypt-gpgme.c:3878 pgpkey.c:600 -msgid "This key can't be used: expired/disabled/revoked." -msgstr "" -"Dieser Schlüssel ist nicht verwendbar: veraltet/deaktiviert/zurückgezogen." - -#: crypt-gpgme.c:3892 pgpkey.c:612 -msgid "ID is expired/disabled/revoked." -msgstr "Diese ID ist veraltet/deaktiviert/zurückgezogen." - -#: crypt-gpgme.c:3912 pgpkey.c:616 -msgid "ID has undefined validity." -msgstr "Die Gültigkeit dieser ID ist undefiniert." - -#: crypt-gpgme.c:3915 pgpkey.c:619 -msgid "ID is not valid." -msgstr "Diese ID ist ungültig." - -#: crypt-gpgme.c:3918 pgpkey.c:622 -msgid "ID is only marginally valid." -msgstr "Diese Gültigkeit dieser ID ist begrenzt." - -#: crypt-gpgme.c:3926 pgpkey.c:626 -#, c-format -msgid "%s Do you really want to use the key?" -msgstr "%s Wollen Sie den Schlüssel wirklich benutzen?" - -#: crypt-gpgme.c:3983 crypt-gpgme.c:4096 pgpkey.c:834 pgpkey.c:939 -#, c-format -msgid "Looking for keys matching \"%s\"..." -msgstr "Suche nach Schlüsseln, die auf \"%s\" passen..." - -#: crypt-gpgme.c:4259 pgp.c:1196 -#, c-format -msgid "Use keyID = \"%s\" for %s?" -msgstr "Benutze KeyID = \"%s\" für %s?" - -#: crypt-gpgme.c:4295 pgp.c:1230 smime.c:650 smime.c:775 -#, c-format -msgid "Enter keyID for %s: " -msgstr "KeyID für %s: " - -#: crypt-gpgme.c:4360 -msgid "" -"\n" -"Using GPGME backend, although no gpg-agent is running" -msgstr "" -"\n" -"Benutze GPGME Backend, obwohl gpg-agent nicht läuft" - -#: crypt-gpgme.c:4388 -msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?" -msgstr "" -"S/MIME (v)erschl., (s)ign., sign. (a)ls, (b)eides, (p)gp, (u)nverschl.?" - -#: crypt-gpgme.c:4389 -msgid "esabpfc" -msgstr "vsabpku" - -#: crypt-gpgme.c:4392 -msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?" -msgstr "" -"PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, s/(m)ime, (u)nverschl.?" - -#: crypt-gpgme.c:4393 -msgid "esabmfc" -msgstr "vsabmku" - -#. sign (a)s -#. unset_option(OPTCRYPTCHECKTRUST); -#. sign (a)s -#: crypt-gpgme.c:4409 pgp.c:1629 smime.c:2026 smime.c:2038 -msgid "Sign as: " -msgstr "Signiere als: " - -#: crypt-gpgme.c:4535 -msgid "Failed to verify sender" -msgstr "Prüfung des Absenders fehlgeschlagen" - -#: crypt-gpgme.c:4538 -msgid "Failed to figure out sender" -msgstr "Kann Absender nicht ermitteln" - -#: crypt.c:68 -#, c-format -msgid " (current time: %c)" -msgstr " (aktuelle Zeit: %c)" - -#: crypt.c:74 -#, c-format -msgid "[-- %s output follows%s --]\n" -msgstr "[-- %s Ausgabe folgt%s --]\n" - -#: crypt.c:89 -msgid "Passphrase(s) forgotten." -msgstr "Mantra(s) vergessen." - -#. they really want to send it inline... go for it -#: crypt.c:146 cryptglue.c:110 pgpkey.c:563 pgpkey.c:752 -msgid "Invoking PGP..." -msgstr "Rufe PGP auf..." - -#. otherwise inline won't work...ask for revert -#: crypt.c:155 -msgid "Message can't be sent inline. Revert to using PGP/MIME?" -msgstr "Nachricht kann nicht inline verschickt werden. PGP/MIME verwenden?" - -#. abort -#: crypt.c:157 send.c:1537 -msgid "Mail not sent." -msgstr "Nachricht nicht verschickt." - -#: crypt.c:408 -msgid "S/MIME messages with no hints on content are unsupported." -msgstr "" -"S/MIME Nachrichten ohne Hinweis auf den Inhalt werden nicht unterstützt." - -#: crypt.c:627 crypt.c:671 -msgid "Trying to extract PGP keys...\n" -msgstr "Versuche PGP Keys zu extrahieren...\n" - -#: crypt.c:651 crypt.c:691 -msgid "Trying to extract S/MIME certificates...\n" -msgstr "Versuche S/MIME Zertifikate zu extrahieren...\n" - -#: crypt.c:813 -msgid "" -"[-- Error: Inconsistent multipart/signed structure! --]\n" -"\n" -msgstr "" -"[-- Fehler: Inkonsistente multipart/signed Struktur! --]\n" -"\n" - -#: crypt.c:834 -#, c-format -msgid "" -"[-- Error: Unknown multipart/signed protocol %s! --]\n" -"\n" -msgstr "" -"[-- Fehler: Unbekanntes multipart/signed Protokoll %s! --]\n" -"\n" - -#: crypt.c:873 -#, c-format -msgid "" -"[-- Warning: We can't verify %s/%s signatures. --]\n" -"\n" -msgstr "" -"[-- Warnung: %s/%s Unterschriften können nicht geprüft werden. --]\n" -"\n" - -#. Now display the signed body -#: crypt.c:885 -msgid "" -"[-- The following data is signed --]\n" -"\n" -msgstr "" -"[-- Die folgenden Daten sind signiert --]\n" -"\n" - -#: crypt.c:891 -msgid "" -"[-- Warning: Can't find any signatures. --]\n" -"\n" -msgstr "" -"[-- Warnung: Kann keine Unterschriften finden. --]\n" -"\n" - -#: crypt.c:897 -msgid "" -"\n" -"[-- End of signed data --]\n" -msgstr "" -"\n" -"[-- Ende der signierten Daten --]\n" - -#: cryptglue.c:89 -msgid "\"crypt_use_gpgme\" set but not built with GPGME support." -msgstr "" -"\"crypt_use_gpgme\" gesetzt, obwohl nicht mit GPGME Support kompiliert." - -#: cryptglue.c:112 -msgid "Invoking S/MIME..." -msgstr "Rufe S/MIME auf..." - -#: curs_lib.c:194 -msgid "yes" -msgstr "ja" - -#: curs_lib.c:195 -msgid "no" -msgstr "nein" - -#. restore blocking operation -#: curs_lib.c:297 -msgid "Exit Mutt?" -msgstr "Mutt verlassen?" - -#: curs_lib.c:500 mutt_socket.c:577 mutt_ssl.c:358 -msgid "unknown error" -msgstr "unbekannter Fehler" - -#: curs_lib.c:520 -msgid "Press any key to continue..." -msgstr "Bitte drücken Sie eine Taste..." - -#: curs_lib.c:564 -msgid " ('?' for list): " -msgstr " (für eine Liste '?' eingeben): " - -#: curs_main.c:52 curs_main.c:613 curs_main.c:643 -msgid "No mailbox is open." -msgstr "Keine Mailbox ist geöffnet." - -#: curs_main.c:53 -msgid "There are no messages." -msgstr "Es sind keine Nachrichten vorhanden." - -#: curs_main.c:54 mx.c:1095 pager.c:51 recvattach.c:43 -msgid "Mailbox is read-only." -msgstr "Mailbox kann nur gelesen, nicht geschrieben werden." - -#: curs_main.c:55 pager.c:52 recvattach.c:924 -msgid "Function not permitted in attach-message mode." -msgstr "Funktion steht beim Anhängen von Nachrichten nicht zur Verfügung." - -#: curs_main.c:56 -msgid "No visible messages." -msgstr "Keine sichtbaren Nachrichten." - -#: curs_main.c:96 pager.c:82 -#, c-format -msgid "Cannot %s: Operation not permitted by ACL" -msgstr "Operation \"%s\" gemäß ACL nicht zulässig" - -#: curs_main.c:251 -msgid "Cannot toggle write on a readonly mailbox!" -msgstr "Kann Mailbox im Nur-Lese-Modus nicht schreibbar machen!" - -#: curs_main.c:258 -msgid "Changes to folder will be written on folder exit." -msgstr "Änderungen an dieser Mailbox werden beim Verlassen geschrieben." - -#: curs_main.c:263 -msgid "Changes to folder will not be written." -msgstr "Änderungen an dieser Mailbox werden nicht geschrieben." - -#: curs_main.c:405 -msgid "Quit" -msgstr "Ende" - -#: curs_main.c:408 recvattach.c:54 -msgid "Save" -msgstr "Speichern" - -#: curs_main.c:409 query.c:49 -msgid "Mail" -msgstr "Senden" - -#: curs_main.c:410 pager.c:1538 -msgid "Reply" -msgstr "Antw." - -#: curs_main.c:411 -msgid "Group" -msgstr "Antw.alle" - -#: curs_main.c:495 -msgid "Mailbox was externally modified. Flags may be wrong." -msgstr "Mailbox wurde verändert. Markierungen können veraltet sein." - -#: curs_main.c:498 -msgid "New mail in this mailbox." -msgstr "Neue Nachrichten in dieser Mailbox." - -#: curs_main.c:502 -msgid "Mailbox was externally modified." -msgstr "Mailbox wurde von außen verändert." - -#: curs_main.c:619 -msgid "No tagged messages." -msgstr "Keine markierten Nachrichten." - -#: curs_main.c:655 menu.c:914 -msgid "Nothing to do." -msgstr "Nichts zu erledigen." - -#: curs_main.c:741 -msgid "Jump to message: " -msgstr "Springe zu Nachricht: " - -#: curs_main.c:747 -msgid "Argument must be a message number." -msgstr "Argument muss eine Nachrichtennummer sein." - -#: curs_main.c:779 -msgid "That message is not visible." -msgstr "Diese Nachricht ist nicht sichtbar." - -#: curs_main.c:782 -msgid "Invalid message number." -msgstr "Ungültige Nachrichtennummer." - -#: curs_main.c:795 curs_main.c:1872 pager.c:2373 -msgid "delete message(s)" -msgstr "Nachricht(en) löschen" - -#: curs_main.c:798 -msgid "Delete messages matching: " -msgstr "Lösche Nachrichten nach Muster: " - -#: curs_main.c:820 -msgid "No limit pattern is in effect." -msgstr "Zur Zeit ist kein Muster aktiv." - -#. i18n: ask for a limit to apply -#: curs_main.c:825 -#, c-format -msgid "Limit: %s" -msgstr "Begrenze: %s" - -#: curs_main.c:835 -msgid "Limit to messages matching: " -msgstr "Begrenze auf Nachrichten nach Muster: " - -#: curs_main.c:857 -msgid "To view all messages, limit to \"all\"." -msgstr "Um alle Nachrichten zu sehen, begrenze auf \"all\"." - -#: curs_main.c:869 -msgid "Quit Mutt?" -msgstr "Mutt beenden?" - -#: curs_main.c:959 -msgid "Tag messages matching: " -msgstr "Markiere Nachrichten nach Muster: " - -#: curs_main.c:968 curs_main.c:2166 pager.c:2683 -msgid "undelete message(s)" -msgstr "Löschmarkierung von Nachricht(en) entfernen" - -#: curs_main.c:970 -msgid "Undelete messages matching: " -msgstr "Entferne Löschmarkierung nach Muster: " - -#: curs_main.c:978 -msgid "Untag messages matching: " -msgstr "Entferne Markierung nach Muster: " - -#: curs_main.c:1004 -msgid "Logged out of IMAP servers." -msgstr "Beim IMAP-Server abgemeldet." - -#: curs_main.c:1083 -msgid "Open mailbox in read-only mode" -msgstr "Öffne Mailbox im nur-Lesen-Modus" - -#: curs_main.c:1085 -msgid "Open mailbox" -msgstr "Öffne Mailbox" - -#: curs_main.c:1095 -msgid "No mailboxes have new mail" -msgstr "Keine Mailbox mit neuen Nachrichten" - -#: curs_main.c:1123 mx.c:472 mx.c:621 -#, c-format -msgid "%s is not a mailbox." -msgstr "%s ist keine Mailbox." - -#: curs_main.c:1222 -msgid "Exit Mutt without saving?" -msgstr "Mutt verlassen, ohne Änderungen zu speichern?" - -#: curs_main.c:1240 curs_main.c:1275 curs_main.c:1719 curs_main.c:1751 -#: flags.c:282 thread.c:1029 thread.c:1084 thread.c:1139 -msgid "Threading is not enabled." -msgstr "Darstellung von Diskussionsfäden ist nicht eingeschaltet." - -#: curs_main.c:1252 -msgid "Thread broken" -msgstr "Diskussionsfaden unterbrochen" - -#: curs_main.c:1263 -msgid "Thread cannot be broken, message is not part of a thread" -msgstr "Nachricht ist nicht Teil eines Diskussionsfadens" - -#: curs_main.c:1272 -msgid "link threads" -msgstr "Diskussionsfäden verlinken" - -#: curs_main.c:1277 -msgid "No Message-ID: header available to link thread" -msgstr "Keine Message-ID verfügbar, um Diskussionsfaden aufzubauen" - -#: curs_main.c:1279 -msgid "First, please tag a message to be linked here" -msgstr "Bitte erst eine Nachricht zur Verlinkung markieren" - -#: curs_main.c:1291 -msgid "Threads linked" -msgstr "Diskussionfäden verbunden" - -#: curs_main.c:1294 -msgid "No thread linked" -msgstr "Kein Diskussionsfaden verbunden" - -#: curs_main.c:1330 curs_main.c:1355 -msgid "You are on the last message." -msgstr "Sie sind bereits auf der letzten Nachricht." - -#: curs_main.c:1337 curs_main.c:1381 -msgid "No undeleted messages." -msgstr "Keine ungelöschten Nachrichten." - -#: curs_main.c:1374 curs_main.c:1398 -msgid "You are on the first message." -msgstr "Sie sind bereits auf der ersten Nachricht." - -#: curs_main.c:1473 menu.c:759 pager.c:2042 pattern.c:1477 -msgid "Search wrapped to top." -msgstr "Suche von vorne begonnen." - -#: curs_main.c:1482 pager.c:2064 pattern.c:1488 -msgid "Search wrapped to bottom." -msgstr "Suche von hinten begonnen." - -#: curs_main.c:1523 -msgid "No new messages" -msgstr "Keine neuen Nachrichten" - -#: curs_main.c:1523 -msgid "No unread messages" -msgstr "Keine ungelesenen Nachrichten" - -#: curs_main.c:1524 -msgid " in this limited view" -msgstr " in dieser begrenzten Ansicht" - -#: curs_main.c:1540 -msgid "flag message" -msgstr "Indikator setzen" - -#: curs_main.c:1577 pager.c:2649 -msgid "toggle new" -msgstr "Umschalten zwischen neu/nicht neu" - -#: curs_main.c:1654 -msgid "No more threads." -msgstr "Keine weiteren Diskussionsfäden." - -#: curs_main.c:1656 -msgid "You are on the first thread." -msgstr "Sie haben bereits den ersten Diskussionsfaden ausgewählt." - -#: curs_main.c:1737 -msgid "Thread contains unread messages." -msgstr "Diskussionsfaden enthält ungelesene Nachrichten." - -#: curs_main.c:1831 pager.c:2342 -msgid "delete message" -msgstr "Nachricht löschen" - -#: curs_main.c:1913 -msgid "edit message" -msgstr "Editiere Nachricht" - -#: curs_main.c:2044 -msgid "mark message(s) as read" -msgstr "Nachricht(en) als gelesen markieren" - -#: curs_main.c:2139 pager.c:2668 -msgid "undelete message" -msgstr "Löschmarkierung entfernen" - -#. -#. * SLcurses_waddnstr() can't take a "const char *", so this is only -#. * declared "static" (sigh) -#. -#: edit.c:41 -msgid "" -"~~\t\tinsert a line begining with a single ~\n" -"~b users\tadd users to the Bcc: field\n" -"~c users\tadd users to the Cc: field\n" -"~f messages\tinclude messages\n" -"~F messages\tsame as ~f, except also include headers\n" -"~h\t\tedit the message header\n" -"~m messages\tinclude and quote messages\n" -"~M messages\tsame as ~m, except include headers\n" -"~p\t\tprint the message\n" -msgstr "" -"~~\t\tFüge Zeile hinzu, die mit einer Tilde beginnt\n" -"~b Adressen\tFüge Adressen zum Bcc-Feld hinzu\n" -"~c Adressen\tFüge Adressen zum Cc-Feld hinzu\n" -"~f Nachrichten\tNachrichten einfügen\n" -"~F Nachrichten\tWie ~f, mit Nachrichtenkopf\n" -"~h\t\tEditiere Nachrichtenkopf\n" -"~m Nachrichten\tNachrichten zitieren\n" -"~M Nachrichten\tWie ~t, mit Nachrichtenkopf\n" -"~p\t\tNachricht ausdrucken\n" - -#: edit.c:52 -msgid "" -"~q\t\twrite file and quit editor\n" -"~r file\t\tread a file into the editor\n" -"~t users\tadd users to the To: field\n" -"~u\t\trecall the previous line\n" -"~v\t\tedit message with the $visual editor\n" -"~w file\t\twrite message to file\n" -"~x\t\tabort changes and quit editor\n" -"~?\t\tthis message\n" -".\t\ton a line by itself ends input\n" -msgstr "" -"~q\t\tDatei speichern und Editor verlassen\n" -"~r Datei\tDatei in Editor einlesen\n" -"~t Adressen\tFüge Adressen zum To-Feld hinzu\n" -"~u\t\tEditiere die letzte Zeile erneut\n" -"~v\t\tEditiere Nachricht mit Editor $visual\n" -"~w Datei\tSchreibe Nachricht in Datei\n" -"~x\t\tVerwerfe Änderungen und verlasse Editor\n" -"~?\t\tDiese Nachricht\n" -".\t\tin einer Zeile alleine beendet die Eingabe\n" - -#: edit.c:187 -#, c-format -msgid "%d: invalid message number.\n" -msgstr "%d: Ungültige Nachrichtennummer.\n" - -#: edit.c:329 -msgid "(End message with a . on a line by itself)\n" -msgstr "" -"(Beenden Sie die Nachricht mit einen Punkt ('.') allein in einer Zeile)\n" - -#: edit.c:388 -msgid "No mailbox.\n" -msgstr "Keine Mailbox.\n" - -#: edit.c:392 -msgid "Message contains:\n" -msgstr "Nachricht enthält:\n" - -#: edit.c:396 edit.c:453 -msgid "(continue)\n" -msgstr "(weiter)\n" - -#: edit.c:409 -msgid "missing filename.\n" -msgstr "Dateiname fehlt.\n" - -#: edit.c:429 -msgid "No lines in message.\n" -msgstr "Keine Zeilen in der Nachricht.\n" - -#: edit.c:446 -#, c-format -msgid "Bad IDN in %s: '%s'\n" -msgstr "Ungültige IDN in %s: '%s'\n" - -#: edit.c:464 -#, c-format -msgid "%s: unknown editor command (~? for help)\n" -msgstr "%s: Unbekanntes Editor-Kommando (~? für Hilfestellung)\n" - -#: editmsg.c:78 -#, c-format -msgid "could not create temporary folder: %s" -msgstr "Konnte temporäre Mailbox nicht erzeugen: %s" - -#: editmsg.c:90 -#, c-format -msgid "could not write temporary mail folder: %s" -msgstr "Konnte nicht in temporäre Mailbox schreiben: %s" - -#: editmsg.c:110 -#, c-format -msgid "could not truncate temporary mail folder: %s" -msgstr "Konnte temporäre Mailbox nicht sutzen: %s" - -#: editmsg.c:127 -msgid "Message file is empty!" -msgstr "Nachricht ist leer!" - -#: editmsg.c:134 -msgid "Message not modified!" -msgstr "Nachricht nicht verändert!" - -#: editmsg.c:142 -#, c-format -msgid "Can't open message file: %s" -msgstr "Kann Nachrichten-Datei nicht öffnen: %s" - -#: editmsg.c:149 editmsg.c:177 -#, c-format -msgid "Can't append to folder: %s" -msgstr "Kann an Mailbox nicht anhängen: %s" - -#: editmsg.c:208 -#, c-format -msgid "Error. Preserving temporary file: %s" -msgstr "Fehler. Speichere temporäre Datei als %s ab." - -#: flags.c:325 -msgid "Set flag" -msgstr "Setze Indikator" - -#: flags.c:325 -msgid "Clear flag" -msgstr "Entferne Indikator" - -#: handler.c:1058 -msgid "[-- Error: Could not display any parts of Multipart/Alternative! --]\n" -msgstr "" -"[-- Fehler: Konnte keinen der multipart/alternative-Teile anzeigen! --]\n" - -#: handler.c:1176 -#, c-format -msgid "[-- Attachment #%d" -msgstr "[-- Anhang #%d" - -#: handler.c:1188 -#, c-format -msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n" -msgstr "[-- Typ: %s/%s, Kodierung: %s, Größe: %s --]\n" - -#: handler.c:1204 -msgid "One or more parts of this message could not be displayed" -msgstr "Warnung: Mind. ein Teil dieser Nachricht konnte nicht angezeigt werden" - -#: handler.c:1256 -#, c-format -msgid "[-- Autoview using %s --]\n" -msgstr "[-- Automatische Anzeige mittels %s --]\n" - -#: handler.c:1257 -#, c-format -msgid "Invoking autoview command: %s" -msgstr "Automatische Anzeige mittels: %s" - -#: handler.c:1289 -#, c-format -msgid "[-- Can't run %s. --]\n" -msgstr "[-- Kann %s nicht ausführen. --]\n" - -#: handler.c:1308 handler.c:1329 -#, c-format -msgid "[-- Autoview stderr of %s --]\n" -msgstr "[-- Fehlerausgabe von %s --]\n" - -#: handler.c:1368 -msgid "[-- Error: message/external-body has no access-type parameter --]\n" -msgstr "" -"[-- Fehler: message/external-body hat keinen access-type Parameter --]\n" - -#: handler.c:1389 -#, c-format -msgid "[-- This %s/%s attachment " -msgstr "[-- Dieser %s/%s-Anhang " - -#: handler.c:1396 -#, c-format -msgid "(size %s bytes) " -msgstr "(Größe %s Byte) " - -#: handler.c:1398 -msgid "has been deleted --]\n" -msgstr "wurde gelöscht --]\n" - -#: handler.c:1403 -#, c-format -msgid "[-- on %s --]\n" -msgstr "[-- am %s --]\n" - -#: handler.c:1408 -#, c-format -msgid "[-- name: %s --]\n" -msgstr "[-- Name: %s --]\n" - -#: handler.c:1421 handler.c:1437 -#, c-format -msgid "[-- This %s/%s attachment is not included, --]\n" -msgstr "[-- Dieser %s/%s-Anhang ist nicht in der Nachricht enthalten, --]\n" - -#: handler.c:1423 -msgid "" -"[-- and the indicated external source has --]\n" -"[-- expired. --]\n" -msgstr "" -"[-- und die zugehörige externe Quelle --]\n" -"[-- existiert nicht mehr. --]\n" - -#: handler.c:1441 -#, c-format -msgid "[-- and the indicated access-type %s is unsupported --]\n" -msgstr "[-- und die angegebene Zugangsmethode %s wird nicht unterstützt --]\n" - -#: handler.c:1583 -msgid "Error: multipart/signed has no protocol." -msgstr "Fehler: multipart/signed ohne \"protocol\"-Parameter." - -#: handler.c:1593 -msgid "Error: multipart/encrypted has no protocol parameter!" -msgstr "Fehler: multipart/encrypted ohne \"protocol\"-Parameter!" - -#: handler.c:1650 -msgid "Unable to open temporary file!" -msgstr "Konnte temporäre Datei nicht öffnen!" - -#: handler.c:1723 -msgid "[-- This is an attachment " -msgstr "[-- Dies ist ein Anhang " - -#: handler.c:1725 -#, c-format -msgid "[-- %s/%s is unsupported " -msgstr "[-- %s/%s wird nicht unterstützt " - -#: handler.c:1730 -#, c-format -msgid "(use '%s' to view this part)" -msgstr "(benutzen Sie '%s', um diesen Teil anzuzeigen)" - -#: handler.c:1732 -msgid "(need 'view-attachments' bound to key!)" -msgstr "(Tastaturbindung für 'view-attachments' benötigt!)" - -#: headers.c:189 -#, c-format -msgid "%s: unable to attach file" -msgstr "%s: Kann Datei nicht anhängen." - -#: help.c:306 -msgid "ERROR: please report this bug" -msgstr "ERROR: Bitte melden sie diesen Fehler" - -#: help.c:348 -msgid "" -msgstr "" - -#: help.c:360 -msgid "" -"\n" -"Generic bindings:\n" -"\n" -msgstr "" -"\n" -"Allgemeine Tastenbelegungen:\n" -"\n" - -#: help.c:364 -msgid "" -"\n" -"Unbound functions:\n" -"\n" -msgstr "" -"\n" -"Funktionen ohne Bindung an Taste:\n" -"\n" - -#: help.c:372 -#, c-format -msgid "Help for %s" -msgstr "Hilfe für %s" - -#: history.c:77 history.c:114 history.c:140 -#, c-format -msgid "Bad history file format (line %d)" -msgstr "Falsches Format der Datei früherer Eingaben (Zeile %d)" - -#: hook.c:250 -#, c-format -msgid "unhook: Can't do unhook * from within a hook." -msgstr "unhook: Innerhalb eines hook kann kein unhook * aufgerufen werden." - -#: hook.c:262 -#, c-format -msgid "unhook: unknown hook type: %s" -msgstr "unhook: Unbekannter hook-Typ: %s" - -#: hook.c:268 -#, c-format -msgid "unhook: Can't delete a %s from within a %s." -msgstr "unhook: Kann kein %s innerhalb von %s löschen." - -#: imap/auth.c:108 pop_auth.c:398 smtp.c:515 -msgid "No authenticators available" -msgstr "Keine Authentifizierung verfügbar" - -#: imap/auth_anon.c:43 -msgid "Authenticating (anonymous)..." -msgstr "Authentifiziere (anonymous)..." - -#: imap/auth_anon.c:73 -msgid "Anonymous authentication failed." -msgstr "Anonyme Authentifizierung fehlgeschlagen." - -#: imap/auth_cram.c:48 -msgid "Authenticating (CRAM-MD5)..." -msgstr "Authentifiziere (CRAM-MD5)..." - -#: imap/auth_cram.c:128 -msgid "CRAM-MD5 authentication failed." -msgstr "CRAM-MD5 Authentifizierung fehlgeschlagen." - -#. now begin login -#: imap/auth_gss.c:144 -msgid "Authenticating (GSSAPI)..." -msgstr "Authentifiziere (GSSAPI)..." - -#: imap/auth_gss.c:309 -msgid "GSSAPI authentication failed." -msgstr "GSSAPI Authentifizierung fehlgeschlagen." - -#: imap/auth_login.c:38 -msgid "LOGIN disabled on this server." -msgstr "LOGIN ist auf diesem Server abgeschaltet." - -#: imap/auth_login.c:47 pop_auth.c:231 -msgid "Logging in..." -msgstr "Anmeldung..." - -#: imap/auth_login.c:67 pop_auth.c:274 -msgid "Login failed." -msgstr "Anmeldung gescheitert..." - -#: imap/auth_sasl.c:97 smtp.c:551 -#, c-format -msgid "Authenticating (%s)..." -msgstr "Authentifiziere (%s)..." - -#: imap/auth_sasl.c:204 pop_auth.c:153 -msgid "SASL authentication failed." -msgstr "SASL Authentifizierung fehlgeschlagen." - -#: imap/browse.c:58 imap/imap.c:569 -#, c-format -msgid "%s is an invalid IMAP path" -msgstr "%s ist ein ungültiger IMAP Pfad" - -#: imap/browse.c:69 -msgid "Getting folder list..." -msgstr "Hole Liste der Ordner..." - -#: imap/browse.c:191 -msgid "No such folder" -msgstr "Ordner existiert nicht" - -#: imap/browse.c:280 -msgid "Create mailbox: " -msgstr "Erzeuge Mailbox: " - -#: imap/browse.c:285 imap/browse.c:331 -msgid "Mailbox must have a name." -msgstr "Mailbox muss einen Namen haben." - -#: imap/browse.c:293 -msgid "Mailbox created." -msgstr "Mailbox erzeugt." - -#: imap/browse.c:324 -#, c-format -msgid "Rename mailbox %s to: " -msgstr "Benenne Mailbox %s um in: " - -#: imap/browse.c:339 -#, c-format -msgid "Rename failed: %s" -msgstr "Umbenennung fehlgeschlagen: %s" - -#: imap/browse.c:344 -msgid "Mailbox renamed." -msgstr "Mailbox umbenannt." - -#: imap/command.c:445 -msgid "Mailbox closed" -msgstr "Mailbox geschlossen" - -#: imap/imap.c:126 -#, c-format -msgid "CREATE failed: %s" -msgstr "CREATE fehlgeschlagen: %s" - -#: imap/imap.c:190 -#, c-format -msgid "Closing connection to %s..." -msgstr "Beende Verbindung zu %s..." - -#: imap/imap.c:310 -msgid "This IMAP server is ancient. Mutt does not work with it." -msgstr "Dieser IMAP-Server ist veraltet und wird nicht von Mutt unterstützt." - -#: imap/imap.c:433 pop_lib.c:295 smtp.c:424 -msgid "Secure connection with TLS?" -msgstr "Sichere Verbindung mittels TLS?" - -#: imap/imap.c:442 pop_lib.c:315 smtp.c:436 -msgid "Could not negotiate TLS connection" -msgstr "Konnte keine TLS-Verbindung realisieren" - -#: imap/imap.c:458 pop_lib.c:336 -msgid "Encrypted connection unavailable" -msgstr "Verschlüsselte Verbindung nicht verfügbar" - -#: imap/imap.c:603 -#, c-format -msgid "Selecting %s..." -msgstr "Wähle %s aus..." - -#: imap/imap.c:758 -msgid "Error opening mailbox" -msgstr "Fehler beim Öffnen der Mailbox" - -#: imap/imap.c:813 imap/message.c:851 muttlib.c:1545 -#, c-format -msgid "Create %s?" -msgstr "%s erstellen?" - -#: imap/imap.c:1186 -msgid "Expunge failed" -msgstr "Löschen fehlgeschlagen" - -#: imap/imap.c:1198 -#, c-format -msgid "Marking %d messages deleted..." -msgstr "Markiere %d Nachrichten zum Löschen..." - -#: imap/imap.c:1230 -#, c-format -msgid "Saving changed messages... [%d/%d]" -msgstr "Speichere veränderte Nachrichten... [%d/%d]" - -#: imap/imap.c:1279 -msgid "Error saving flags. Close anyway?" -msgstr "Fehler beim Speichern der Markierungen. Trotzdem Schließen?" - -#: imap/imap.c:1287 -msgid "Error saving flags" -msgstr "Fehler beim Speichern der Markierungen" - -#: imap/imap.c:1299 -msgid "Expunging messages from server..." -msgstr "Lösche Nachrichten auf dem Server..." - -#: imap/imap.c:1304 -msgid "imap_sync_mailbox: EXPUNGE failed" -msgstr "imap_sync_mailbox: EXPUNGE fehlgeschlagen" - -#: imap/imap.c:1754 -#, c-format -msgid "Header search without header name: %s" -msgstr "Suche im Nachrichtenkopf ohne Angabe des Feldes: %s" - -#: imap/imap.c:1826 -msgid "Bad mailbox name" -msgstr "Unzulässiger Mailbox Name" - -#: imap/imap.c:1851 -#, c-format -msgid "Subscribing to %s..." -msgstr "Abonniere %s..." - -#: imap/imap.c:1853 -#, c-format -msgid "Unsubscribing from %s..." -msgstr "Beende Abonnement von %s..." - -#: imap/imap.c:1863 -#, c-format -msgid "Subscribed to %s" -msgstr "Abonniere %s" - -#: imap/imap.c:1865 -#, c-format -msgid "Unsubscribed from %s" -msgstr "Abonnement von %s beendet" - -#. Unable to fetch headers for lower versions -#: imap/message.c:99 -msgid "Unable to fetch headers from this IMAP server version." -msgstr "" -"Kann von dieser Version des IMAP-Servers keine Nachrichtenköpfe erhalten." - -#: imap/message.c:109 -#, c-format -msgid "Could not create temporary file %s" -msgstr "Konnte Temporärdatei %s nicht erzeugen" - -#: imap/message.c:141 -msgid "Evaluating cache..." -msgstr "Werte Cache aus..." - -#: imap/message.c:232 pop.c:272 -msgid "Fetching message headers..." -msgstr "Hole Nachrichten-Köpfe..." - -#: imap/message.c:441 imap/message.c:498 pop.c:563 -msgid "Fetching message..." -msgstr "Hole Nachricht..." - -#: imap/message.c:487 pop.c:558 -msgid "The message index is incorrect. Try reopening the mailbox." -msgstr "" -"Der Nachrichtenindex ist fehlerhaft. Versuche die Mailbox neu zu öffnen." - -#: imap/message.c:641 -msgid "Uploading message..." -msgstr "Lade Nachricht auf den Server..." - -#: imap/message.c:815 -#, c-format -msgid "Copying %d messages to %s..." -msgstr "Kopiere %d Nachrichten nach %s..." - -#: imap/message.c:819 -#, c-format -msgid "Copying message %d to %s..." -msgstr "Kopiere Nachricht %d nach %s..." - -#: imap/util.c:358 -msgid "Continue?" -msgstr "Weiter?" - -#: init.c:60 init.c:1758 pager.c:50 -#, c-format -msgid "Not available in this menu." -msgstr "Funktion ist in diesem Menü nicht verfügbar." - -#: init.c:468 -#, c-format -msgid "Bad regexp: %s" -msgstr "Fehlerhafte regexp: %s" - -#: init.c:525 -#, c-format -msgid "Not enough subexpressions for spam template" -msgstr "Nicht genügend Unterausdrücke für Spam-Vorlage" - -#: init.c:715 -msgid "spam: no matching pattern" -msgstr "Spam: kein passendes Muster" - -#: init.c:717 -msgid "nospam: no matching pattern" -msgstr "nospam: kein passendes Muster" - -#: init.c:861 -#, c-format -msgid "%sgroup: missing -rx or -addr." -msgstr "%sgroup: -rx oder -addr fehlt." - -#: init.c:879 -#, c-format -msgid "%sgroup: warning: bad IDN '%s'.\n" -msgstr "%sgroup: Warnung: Ungültige IDN '%s'.\n" - -#: init.c:1094 -msgid "attachments: no disposition" -msgstr "attachments: keine disposition" - -#: init.c:1132 -msgid "attachments: invalid disposition" -msgstr "attachments: ungültige disposition" - -#: init.c:1146 -msgid "unattachments: no disposition" -msgstr "unattachments: keine disposition" - -#: init.c:1169 -msgid "unattachments: invalid disposition" -msgstr "unattachments: ungültige disposition" - -#: init.c:1296 -msgid "alias: no address" -msgstr "alias: Keine Adresse" - -#: init.c:1344 -#, c-format -msgid "Warning: Bad IDN '%s' in alias '%s'.\n" -msgstr "Warnung: Ungültige IDN '%s' in Alias '%s'.\n" - -#: init.c:1432 -msgid "invalid header field" -msgstr "my_hdr: Ungültiges Kopf-Feld" - -#: init.c:1485 -#, c-format -msgid "%s: unknown sorting method" -msgstr "%s: Unbekannte Sortiermethode" - -#: init.c:1592 -#, c-format -msgid "mutt_restore_default(%s): error in regexp: %s\n" -msgstr "mutt_restore_default(%s): Fehler in regulärem Ausdruck: %s\n" - -#: init.c:1735 init.c:1848 -#, c-format -msgid "%s: unknown variable" -msgstr "%s: Unbekannte Variable." - -#: init.c:1744 -#, c-format -msgid "prefix is illegal with reset" -msgstr "Präfix ist bei \"reset\" nicht zulässig." - -#: init.c:1750 -#, c-format -msgid "value is illegal with reset" -msgstr "Wertzuweisung ist bei \"reset\" nicht zulässig." - -#: init.c:1786 init.c:1798 -#, c-format -msgid "Usage: set variable=yes|no" -msgstr "Benutzung: set variable=yes|no" - -#: init.c:1806 -#, c-format -msgid "%s is set" -msgstr "%s ist gesetzt." - -#: init.c:1806 -#, c-format -msgid "%s is unset" -msgstr "%s ist nicht gesetzt." - -#: init.c:1909 -#, c-format -msgid "Invalid value for option %s: \"%s\"" -msgstr "Ungültiger Wert für Variable %s: \"%s\"" - -#: init.c:2046 -#, c-format -msgid "%s: invalid mailbox type" -msgstr "%s: Ungültiger Mailbox-Typ" - -#: init.c:2077 -#, c-format -msgid "%s: invalid value (%s)" -msgstr "%s: ungültiger Wert (%s)" - -#: init.c:2078 -msgid "format error" -msgstr "Format-Fehler" - -#: init.c:2078 -msgid "number overflow" -msgstr "Zahlenüberlauf" - -#: init.c:2138 -#, c-format -msgid "%s: invalid value" -msgstr "%s: Ungültiger Wert" - -#: init.c:2179 -#, c-format -msgid "%s: Unknown type." -msgstr "%s: Unbekannter Typ." - -#: init.c:2206 -#, c-format -msgid "%s: unknown type" -msgstr "%s: Unbekannter Typ" - -#: init.c:2268 -#, c-format -msgid "Error in %s, line %d: %s" -msgstr "Fehler in %s, Zeile %d: %s" - -#. the muttrc source keyword -#: init.c:2291 -#, c-format -msgid "source: errors in %s" -msgstr "source: Fehler in %s" - -#: init.c:2292 -#, c-format -msgid "source: reading aborted due too many errors in %s" -msgstr "source: Lesevorgang abgebrochen, zu viele Fehler in %s" - -#: init.c:2306 -#, c-format -msgid "source: error at %s" -msgstr "source: Fehler bei %s" - -#: init.c:2311 -msgid "source: too many arguments" -msgstr "source: Zu viele Argumente" - -#: init.c:2365 -#, c-format -msgid "%s: unknown command" -msgstr "%s: Unbekanntes Kommando" - -#: init.c:2850 -#, c-format -msgid "Error in command line: %s\n" -msgstr "Fehler in Kommandozeile: %s\n" - -#: init.c:2923 -msgid "unable to determine home directory" -msgstr "Kann Home-Verzeichnis nicht bestimmen." - -#: init.c:2931 -msgid "unable to determine username" -msgstr "Kann Nutzernamen nicht bestimmen." - -#: init.c:3167 -msgid "-group: no group name" -msgstr "-group: Kein Gruppen Name" - -#: init.c:3177 -msgid "out of arguments" -msgstr "Zu wenige Parameter" - -#: keymap.c:526 -msgid "Macro loop detected." -msgstr "Makro-Schleife!" - -#: keymap.c:827 keymap.c:835 -msgid "Key is not bound." -msgstr "Taste ist nicht belegt." - -#: keymap.c:839 -#, c-format -msgid "Key is not bound. Press '%s' for help." -msgstr "Taste ist nicht belegt. Drücken Sie '%s' für Hilfe." - -#: keymap.c:850 -msgid "push: too many arguments" -msgstr "push: Zu viele Argumente" - -#: keymap.c:880 -#, c-format -msgid "%s: no such menu" -msgstr "Menü \"%s\" existiert nicht" - -#: keymap.c:895 -msgid "null key sequence" -msgstr "Leere Tastenfolge" - -#: keymap.c:982 -msgid "bind: too many arguments" -msgstr "bind: Zu viele Argumente" - -#: keymap.c:1005 -#, c-format -msgid "%s: no such function in map" -msgstr "%s: Funktion unbekannt" - -#: keymap.c:1029 -msgid "macro: empty key sequence" -msgstr "macro: Leere Tastenfolge" - -#: keymap.c:1040 -msgid "macro: too many arguments" -msgstr "macro: Zu viele Parameter" - -#: keymap.c:1076 -msgid "exec: no arguments" -msgstr "exec: Keine Parameter" - -#: keymap.c:1096 -#, c-format -msgid "%s: no such function" -msgstr "%s: Funktion unbekannt" - -#: keymap.c:1117 -msgid "Enter keys (^G to abort): " -msgstr "Tasten drücken (^G zum Abbrechen): " - -#: keymap.c:1122 -#, c-format -msgid "Char = %s, Octal = %o, Decimal = %d" -msgstr "Char = %s, Oktal = %o, Dezimal = %d" - -#: lib.c:131 -msgid "Integer overflow -- can't allocate memory!" -msgstr "Integer Überlauf -- Kann keinen Speicher belegen!" - -#: lib.c:138 lib.c:153 lib.c:185 -msgid "Out of memory!" -msgstr "Kein Speicher verfügbar!" - -#: main.c:63 -msgid "" -"To contact the developers, please mail to .\n" -"To report a bug, please visit http://bugs.mutt.org/.\n" -msgstr "" -"Um die Entwickler zu kontaktieren, schicken Sie bitte\n" -"eine Nachricht (in englisch) an .\n" -"Um einen Bug zu melden, besuchen Sie bitte http://bugs.mutt.org/.\n" - -#: main.c:67 -msgid "" -"Copyright (C) 1996-2009 Michael R. Elkins and others.\n" -"Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n" -"Mutt is free software, and you are welcome to redistribute it\n" -"under certain conditions; type `mutt -vv' for details.\n" -msgstr "" -"Copyright (C) 1996-2009 Michael R. Elkins und andere.\n" -"Mutt übernimmt KEINERLEI GEWÄHRLEISTUNG. Starten Sie `mutt -vv', um\n" -"weitere Details darüber zu erfahren. Mutt ist freie Software. \n" -"Sie können es unter bestimmten Bedingungen weitergeben; starten Sie\n" -"`mutt -vv' für weitere Details.\n" - -#: main.c:73 -msgid "" -"Copyright (C) 1996-2007 Michael R. Elkins \n" -"Copyright (C) 1996-2002 Brandon Long \n" -"Copyright (C) 1997-2008 Thomas Roessler \n" -"Copyright (C) 1998-2005 Werner Koch \n" -"Copyright (C) 1999-2009 Brendan Cully \n" -"Copyright (C) 1999-2002 Tommi Komulainen \n" -"Copyright (C) 2000-2002 Edmund Grimley Evans \n" -"Copyright (C) 2006-2009 Rocco Rutte \n" -"\n" -"Many others not mentioned here contributed code, fixes,\n" -"and suggestions.\n" -msgstr "" -"Copyright (C) 1996-2007 Michael R. Elkins \n" -"Copyright (C) 1996-2002 Brandon Long \n" -"Copyright (C) 1997-2008 Thomas Roessler \n" -"Copyright (C) 1998-2005 Werner Koch \n" -"Copyright (C) 1999-2009 Brendan Cully \n" -"Copyright (C) 1999-2002 Tommi Komulainen \n" -"Copyright (C) 2000-2002 Edmund Grimley Evans \n" -"Copyright (C) 2006-2009 Rocco Rutte \n" -"\n" -"Unzählige hier nicht einzeln aufgeführte Helfer haben Code,\n" -"Fehlerkorrekturen und hilfreiche Hinweise beigesteuert.\n" - -#: main.c:86 -msgid "" -" This program is free software; you can redistribute it and/or modify\n" -" it under the terms of the GNU General Public License as published by\n" -" the Free Software Foundation; either version 2 of the License, or\n" -" (at your option) any later version.\n" -"\n" -" This program is distributed in the hope that it will be useful,\n" -" but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -" GNU General Public License for more details.\n" -msgstr "" -" Dieses Programm ist freie Software. Sie dürfen es weitergeben\n" -" und/oder es verändern, wie es die Bedingungen der GNU General\n" -" Public License, wie von der Free Software Foundation\n" -" veröffentlicht, verändern; entweder unter Version 2 dieser Lizenz\n" -" oder, wenn Sie es wünschen, jeder späteren Version.\n" -"\n" -" Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass\n" -" es Ihnen von Nutzen sein wird, aber OHNE JEGLICHE GEWÄHRLEISTUNG,\n" -" sogar ohne die Garantie der MARKTREIFE oder EIGNUNG FÜR EINEN\n" -" BESTIMMTEN ZWECK. Lesen Sie die GNU General Public License, um\n" -" mehr Details zu erfahren.\n" - -#: main.c:96 -msgid "" -" You should have received a copy of the GNU General Public License\n" -" along with this program; if not, write to the Free Software\n" -" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-" -"1301, USA.\n" -msgstr "" -" Sie sollten eine Kopie der GNU General Public License zusammen mit\n" -" diesem Programm erhalten haben; falls nicht, schreiben sie an die\n" -" Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n" -" Boston, MA 02110-1301, USA.\n" - -#: main.c:113 -msgid "" -"usage: mutt [] [-z] [-f | -yZ]\n" -" mutt [] [-x] [-Hi ] [-s ] [-bc ] [-a " -" [...] --] [...]\n" -" mutt [] [-x] [-s ] [-bc ] [-a [...] --] " -" [...] < message\n" -" mutt [] -p\n" -" mutt [] -A [...]\n" -" mutt [] -Q [...]\n" -" mutt [] -D\n" -" mutt -v[v]\n" -msgstr "" -"Aufruf: mutt [] [-z] [-f | -yZ]\n" -" mutt [] [-x] [-Hi ] [-s ] [-bc ] [-a " -" [...]] [--] [...]\n" -" mutt [] [-x] [-s ] [-bc ] [-a [...]] [--] " -" [...] < Nachricht\n" -" mutt [] -p\n" -" mutt [] -A [...]\n" -" mutt [] -Q [...]\n" -" mutt [] -D\n" -" mutt -v[v]\n" - -#: main.c:122 -msgid "" -"options:\n" -" -A \texpand the given alias\n" -" -a [...] --\tattach file(s) to the message\n" -"\t\tthe list of files must be terminated with the \"--\" sequence\n" -" -b
\tspecify a blind carbon-copy (BCC) address\n" -" -c
\tspecify a carbon-copy (CC) address\n" -" -D\t\tprint the value of all variables to stdout" -msgstr "" -"Optionen:\n" -" -A \tExpandiere den angegebenen Alias\n" -" -a \tHängt Datei an die Message an\n" -" -b \tEmpfänger einer unsichtbaren Kopie (Bcc:)\n" -" -c \tEmpfänger einer Kopie (Cc:)\n" -" -D\t\tGib die Werte aller Variablen aus" - -#: main.c:131 -msgid " -d \tlog debugging output to ~/.muttdebug0" -msgstr " -d \tSschreibe Debug-Informationen nach ~/.muttdebug0" - -#: main.c:134 -msgid "" -" -e \tspecify a command to be executed after initialization\n" -" -f \tspecify which mailbox to read\n" -" -F \tspecify an alternate muttrc file\n" -" -H \tspecify a draft file to read header and body from\n" -" -i \tspecify a file which Mutt should include in the body\n" -" -m \tspecify a default mailbox type\n" -" -n\t\tcauses Mutt not to read the system Muttrc\n" -" -p\t\trecall a postponed message" -msgstr "" -" -e \tMutt-Kommando, nach der Initialisierung ausführen\n" -" -f \tMailbox, die eingelesen werden soll\n" -" -F \tAlternatives muttrc File.\n" -" -H \tFile, aus dem Header und Body der Mail gelesen werden sollen\n" -" -i \tFile, das in den Body der Message eingebunden werden soll\n" -" -m \tDefault-Mailbox Typ\n" -" -n\t\tDas Muttrc des Systems ignorieren\n" -" -p\t\tEine zurückgestellte Nachricht zurückholen" - -#: main.c:143 -msgid "" -" -Q \tquery a configuration variable\n" -" -R\t\topen mailbox in read-only mode\n" -" -s \tspecify a subject (must be in quotes if it has spaces)\n" -" -v\t\tshow version and compile-time definitions\n" -" -x\t\tsimulate the mailx send mode\n" -" -y\t\tselect a mailbox specified in your `mailboxes' list\n" -" -z\t\texit immediately if there are no messages in the mailbox\n" -" -Z\t\topen the first folder with new message, exit immediately if none\n" -" -h\t\tthis help message" -msgstr "" -" -Q \tFrage die Variable aus der Konfiguration ab\n" -" -R\t\tMailbox nur zum Lesen öffnen\n" -" -s \tSubject der Mail (Leerzeichen in Anführungsstrichen)\n" -" -v\t\tVersion und Einstellungen beim Compilieren anzeigen\n" -" -x\t\tSimuliert mailx beim Verschicken von Mails\n" -" -y\t\tStarte Mutt mit einer Mailbox aus der `mailboxes' Liste\n" -" -z\t\tNur starten, wenn neue Nachrichten in der Mailbox liegen\n" -" -Z\t\tÖffne erste Mailbox mit neuen Nachrichten oder beenden\n" -" -h\t\tDiese Hilfe" - -#: main.c:196 -msgid "" -"\n" -"Compile options:" -msgstr "" -"\n" -"Einstellungen bei der Compilierung:" - -#: main.c:500 -msgid "Error initializing terminal." -msgstr "Kann Terminal nicht initialisieren." - -#: main.c:636 -#, c-format -msgid "Error: value '%s' is invalid for -d.\n" -msgstr "Fehler: Wert '%s' ist ungültig für -d.\n" - -#: main.c:639 -#, c-format -msgid "Debugging at level %d.\n" -msgstr "Debugging auf Ebene %d.\n" - -#: main.c:641 -msgid "DEBUG was not defined during compilation. Ignored.\n" -msgstr "DEBUG war beim Kompilieren nicht definiert. Ignoriert.\n" - -#: main.c:806 -#, c-format -msgid "%s does not exist. Create it?" -msgstr "%s existiert nicht. Neu anlegen?" - -#: main.c:810 -#, c-format -msgid "Can't create %s: %s." -msgstr "Kann %s nicht anlegen: %s." - -#: main.c:852 -msgid "Failed to parse mailto: link\n" -msgstr "Fehler beim Parsen von mailto: Link\n" - -#: main.c:864 -msgid "No recipients specified.\n" -msgstr "Keine Empfänger angegeben.\n" - -#: main.c:950 -#, c-format -msgid "%s: unable to attach file.\n" -msgstr "%s: Kann Datei nicht anhängen.\n" - -#: main.c:973 -msgid "No mailbox with new mail." -msgstr "Keine Mailbox mit neuen Nachrichten." - -#: main.c:982 -msgid "No incoming mailboxes defined." -msgstr "Keine Eingangs-Mailboxen definiert." - -#: main.c:1010 -msgid "Mailbox is empty." -msgstr "Mailbox ist leer." - -#: mbox.c:119 mbox.c:269 mh.c:1152 mx.c:642 -#, c-format -msgid "Reading %s..." -msgstr "Lese %s..." - -#: mbox.c:157 mbox.c:214 -msgid "Mailbox is corrupt!" -msgstr "Mailbox fehlerhaft!" - -#: mbox.c:670 -msgid "Mailbox was corrupted!" -msgstr "Mailbox wurde zerstört!" - -#: mbox.c:752 mbox.c:1008 -msgid "Fatal error! Could not reopen mailbox!" -msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!" - -#: mbox.c:761 -msgid "Unable to lock mailbox!" -msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!" - -#. this means ctx->changed or ctx->deleted was set, but no -#. * messages were found to be changed or deleted. This should -#. * never happen, is we presume it is a bug in mutt. -#. -#: mbox.c:804 -msgid "sync: mbox modified, but no modified messages! (report this bug)" -msgstr "" -"sync: Mailbox verändert, aber Nachrichten unverändert! (bitte Bug melden)" - -#: mbox.c:828 mh.c:1658 mx.c:739 -#, c-format -msgid "Writing %s..." -msgstr "Schreibe %s..." - -#: mbox.c:963 -msgid "Committing changes..." -msgstr "Speichere Änderungen..." - -#: mbox.c:994 -#, c-format -msgid "Write failed! Saved partial mailbox to %s" -msgstr "Konnte nicht schreiben! Speichere Teil-Mailbox in %s" - -#: mbox.c:1056 -msgid "Could not reopen mailbox!" -msgstr "Konnte Mailbox nicht erneut öffnen!" - -#: mbox.c:1092 -msgid "Reopening mailbox..." -msgstr "Öffne Mailbox erneut..." - -#: menu.c:423 -msgid "Jump to: " -msgstr "Springe zu: " - -#: menu.c:432 -msgid "Invalid index number." -msgstr "Ungültige Indexnummer." - -#: menu.c:436 menu.c:457 menu.c:522 menu.c:565 menu.c:581 menu.c:592 -#: menu.c:603 menu.c:614 menu.c:627 menu.c:640 menu.c:1051 -msgid "No entries." -msgstr "Keine Einträge" - -#: menu.c:454 -msgid "You cannot scroll down farther." -msgstr "Sie können nicht weiter nach unten gehen." - -#: menu.c:472 -msgid "You cannot scroll up farther." -msgstr "Sie können nicht weiter nach oben gehen." - -#: menu.c:515 -msgid "You are on the first page." -msgstr "Sie sind auf der ersten Seite." - -#: menu.c:516 -msgid "You are on the last page." -msgstr "Sie sind auf der letzten Seite." - -#: menu.c:651 -msgid "You are on the last entry." -msgstr "Sie sind auf dem letzten Eintrag." - -#: menu.c:662 -msgid "You are on the first entry." -msgstr "Sie sind auf dem ersten Eintrag" - -#: menu.c:733 pager.c:2086 pattern.c:1417 -msgid "Search for: " -msgstr "Suche nach: " - -#: menu.c:733 pager.c:2086 pattern.c:1417 -msgid "Reverse search for: " -msgstr "Suche rückwärts nach: " - -#: menu.c:777 pager.c:2039 pager.c:2061 pager.c:2181 pattern.c:1531 -msgid "Not found." -msgstr "Nicht gefunden." - -#: menu.c:903 -msgid "No tagged entries." -msgstr "Keine markierten Einträge." - -#: menu.c:1008 -msgid "Search is not implemented for this menu." -msgstr "In diesem Menü kann nicht gesucht werden." - -#: menu.c:1013 -msgid "Jumping is not implemented for dialogs." -msgstr "Springen in Dialogen ist nicht möglich." - -#: menu.c:1054 -msgid "Tagging is not supported." -msgstr "Markieren wird nicht unterstützt." - -#: mh.c:1131 -#, c-format -msgid "Scanning %s..." -msgstr "Durchsuche %s..." - -#: mh.c:1332 mh.c:1410 -msgid "Could not flush message to disk" -msgstr "Konnte Nachricht nicht auf Festplatte speichern" - -#: mh.c:1377 -msgid "maildir_commit_message(): unable to set time on file" -msgstr "maildir_commit_message(): kann Zeitstempel der Datei nicht setzen" - -#: mutt_sasl.c:192 -msgid "Unknown SASL profile" -msgstr "Unbekanntes SASL Profil" - -#: mutt_sasl.c:226 -msgid "Error allocating SASL connection" -msgstr "Fehler beim Aufbau der SASL Verbindung" - -#: mutt_sasl.c:236 -msgid "Error setting SASL security properties" -msgstr "Fehler beim Setzen der SASL Sicherheitsparameter" - -#: mutt_sasl.c:246 -msgid "Error setting SASL external security strength" -msgstr "Fehler beim Setzen der externen SASL Sicherheitstärke" - -#: mutt_sasl.c:255 -msgid "Error setting SASL external user name" -msgstr "Fehler beim Setzen des externen SASL Benutzernamens" - -#: mutt_socket.c:103 mutt_socket.c:181 -#, c-format -msgid "Connection to %s closed" -msgstr "Verbindung zu %s beendet" - -#: mutt_socket.c:300 -msgid "SSL is unavailable." -msgstr "SSL ist nicht verfügbar." - -#: mutt_socket.c:332 -msgid "Preconnect command failed." -msgstr "\"Preconnect\" Kommando fehlgeschlagen." - -#: mutt_socket.c:403 mutt_socket.c:417 -#, c-format -msgid "Error talking to %s (%s)" -msgstr "Fehler bei Verbindung mit %s (%s)" - -#: mutt_socket.c:470 mutt_socket.c:529 -#, c-format -msgid "Bad IDN \"%s\"." -msgstr "Ungültige IDN \"%s\"." - -#: mutt_socket.c:478 mutt_socket.c:537 -#, c-format -msgid "Looking up %s..." -msgstr "Schlage %s nach..." - -#: mutt_socket.c:488 mutt_socket.c:546 -#, c-format -msgid "Could not find the host \"%s\"" -msgstr "Kann Host \"%s\" nicht finden" - -#: mutt_socket.c:494 mutt_socket.c:552 -#, c-format -msgid "Connecting to %s..." -msgstr "Verbinde zu %s..." - -#: mutt_socket.c:576 -#, c-format -msgid "Could not connect to %s (%s)." -msgstr "Kann keine Verbindung zu %s aufbauen (%s)." - -#: mutt_ssl.c:187 -msgid "Failed to find enough entropy on your system" -msgstr "Nicht genügend Entropie auf diesem System gefunden" - -#: mutt_ssl.c:211 -#, c-format -msgid "Filling entropy pool: %s...\n" -msgstr "Sammle Entropie für Zufallsgenerator: %s...\n" - -#: mutt_ssl.c:219 -#, c-format -msgid "%s has insecure permissions!" -msgstr "%s hat unsichere Zugriffsrechte!" - -#: mutt_ssl.c:238 -msgid "SSL disabled due the lack of entropy" -msgstr "SSL deaktiviert, weil nicht genügend Entropie zur Verfügung steht" - -#: mutt_ssl.c:352 -msgid "I/O error" -msgstr "Ein-/Ausgabe Fehler" - -#: mutt_ssl.c:361 -#, c-format -msgid "SSL failed: %s" -msgstr "SSL fehlgeschlagen: %s" - -#: mutt_ssl.c:370 mutt_ssl_gnutls.c:950 mutt_ssl_gnutls.c:984 -#: mutt_ssl_gnutls.c:994 -msgid "Unable to get certificate from peer" -msgstr "Kann kein Zertifikat vom Server erhalten" - -#: mutt_ssl.c:378 -#, c-format -msgid "SSL connection using %s (%s)" -msgstr "SSL Verbindung unter Verwendung von %s (%s)" - -#: mutt_ssl.c:480 -msgid "Unknown" -msgstr "unbekannt" - -#: mutt_ssl.c:505 mutt_ssl_gnutls.c:473 -#, c-format -msgid "[unable to calculate]" -msgstr "[kann nicht berechnet werden]" - -#: mutt_ssl.c:523 mutt_ssl_gnutls.c:496 -msgid "[invalid date]" -msgstr "[ungültiges Datum]" - -#: mutt_ssl.c:651 -msgid "Server certificate is not yet valid" -msgstr "Zertifikat des Servers ist noch nicht gültig" - -#: mutt_ssl.c:658 -msgid "Server certificate has expired" -msgstr "Zertifikat des Servers ist abgelaufen" - -#: mutt_ssl.c:780 -msgid "cannot get certificate subject" -msgstr "Kann Subject des Zertifikats nicht ermitteln" - -#: mutt_ssl.c:790 mutt_ssl.c:799 -msgid "cannot get certificate common name" -msgstr "Kann Common Name des Zertifikats nicht ermitteln" - -#: mutt_ssl.c:813 -#, c-format -msgid "certificate owner does not match hostname %s" -msgstr "Zertifikat-Inhaber stimmt nicht mit Rechnername %s überein" - -#: mutt_ssl.c:854 -#, c-format -msgid "Certificate host check failed: %s" -msgstr "Prüfung des Rechnernames in Zertifikat gescheitert: %s" - -#: mutt_ssl.c:932 mutt_ssl_gnutls.c:732 -msgid "This certificate belongs to:" -msgstr "Dieses Zertifikat gehört zu:" - -#: mutt_ssl.c:945 mutt_ssl_gnutls.c:771 -msgid "This certificate was issued by:" -msgstr "Dieses Zertifikat wurde ausgegeben von:" - -#: mutt_ssl.c:956 mutt_ssl_gnutls.c:810 -#, c-format -msgid "This certificate is valid" -msgstr "Dieses Zertifikat ist gültig" - -#: mutt_ssl.c:957 mutt_ssl_gnutls.c:813 -#, c-format -msgid " from %s" -msgstr " von %s" - -#: mutt_ssl.c:959 mutt_ssl_gnutls.c:817 -#, c-format -msgid " to %s" -msgstr " an %s" - -#: mutt_ssl.c:965 -#, c-format -msgid "Fingerprint: %s" -msgstr "Fingerabdruck: %s" - -#: mutt_ssl.c:968 mutt_ssl_gnutls.c:854 -#, c-format -msgid "SSL Certificate check (certificate %d of %d in chain)" -msgstr "SSL Zertifikatprüfung (Zertifikat %d von %d in Kette)" - -#: mutt_ssl.c:976 mutt_ssl_gnutls.c:863 -msgid "(r)eject, accept (o)nce, (a)ccept always" -msgstr "(z)urückweisen, (e)inmal akzeptieren, (i)mmer akzeptieren" - -#: mutt_ssl.c:977 mutt_ssl_gnutls.c:864 -msgid "roa" -msgstr "zei" - -#: mutt_ssl.c:981 mutt_ssl_gnutls.c:868 -msgid "(r)eject, accept (o)nce" -msgstr "(z)urückweisen, (e)inmal akzeptieren" - -#: mutt_ssl.c:982 mutt_ssl_gnutls.c:869 -msgid "ro" -msgstr "ze" - -#: mutt_ssl.c:1013 mutt_ssl_gnutls.c:918 -msgid "Warning: Couldn't save certificate" -msgstr "Warnung: Konnte Zertifikat nicht speichern" - -#: mutt_ssl.c:1018 mutt_ssl_gnutls.c:923 -msgid "Certificate saved" -msgstr "Zertifikat gespeichert" - -#: mutt_ssl_gnutls.c:106 mutt_ssl_gnutls.c:133 -msgid "Error: no TLS socket open" -msgstr "Fehler: kein TLS Socket offen" - -#: mutt_ssl_gnutls.c:292 -msgid "All available protocols for TLS/SSL connection disabled" -msgstr "Alle verfügbaren TLS/SSL Protokolle sind deaktiviert" - -#: mutt_ssl_gnutls.c:356 -#, c-format -msgid "SSL/TLS connection using %s (%s/%s/%s)" -msgstr "SSL/TLS Verbindung unter Verwendung von %s (%s/%s/%s)" - -#: mutt_ssl_gnutls.c:563 mutt_ssl_gnutls.c:712 -msgid "Error initialising gnutls certificate data" -msgstr "Fehler beim Initialisieren von gnutls Zertifikatdaten" - -#: mutt_ssl_gnutls.c:570 mutt_ssl_gnutls.c:719 -msgid "Error processing certificate data" -msgstr "Fehler beim Verarbeiten der Zertifikatdaten" - -#: mutt_ssl_gnutls.c:703 -msgid "Warning: Server certificate was signed using an insecure algorithm" -msgstr "Warnung: Server-Zertifikat wurde mit unsicherem Algorithmus signiert" - -#: mutt_ssl_gnutls.c:822 -#, c-format -msgid "SHA1 Fingerprint: %s" -msgstr "SHA1 Fingerabdruck: %s" - -#: mutt_ssl_gnutls.c:825 -#, c-format -msgid "MD5 Fingerprint: %s" -msgstr "MD5 Fingerabdruck: %s" - -#: mutt_ssl_gnutls.c:830 -msgid "WARNING: Server certificate is not yet valid" -msgstr "WARNUNG: Zertifikat des Servers ist noch nicht gültig" - -#: mutt_ssl_gnutls.c:835 -msgid "WARNING: Server certificate has expired" -msgstr "WARNUNG: Zertifikat des Servers ist abgelaufen" - -#: mutt_ssl_gnutls.c:840 -msgid "WARNING: Server certificate has been revoked" -msgstr "WARNUNG: Zertifikat des Servers wurde zurückgezogen" - -#: mutt_ssl_gnutls.c:845 -msgid "WARNING: Server hostname does not match certificate" -msgstr "WARNUNG: Hostname des Servers entspricht nicht dem Zertifikat" - -#: mutt_ssl_gnutls.c:850 -msgid "WARNING: Signer of server certificate is not a CA" -msgstr "WARNUNG: Aussteller des Zertifikats ist keine CA" - -#: mutt_ssl_gnutls.c:956 -#, c-format -msgid "Certificate verification error (%s)" -msgstr "Fehler beim Prüfen des Zertifikats (%s)" - -#: mutt_ssl_gnutls.c:965 -msgid "Certificate is not X.509" -msgstr "Zertifikat ist kein X.509" - -#: mutt_tunnel.c:72 -#, c-format -msgid "Connecting with \"%s\"..." -msgstr "Verbinde zu \"%s\"..." - -#: mutt_tunnel.c:139 -#, c-format -msgid "Tunnel to %s returned error %d (%s)" -msgstr "Tunnel zu %s liefert Fehler %d (%s)" - -#: mutt_tunnel.c:157 mutt_tunnel.c:173 -#, c-format -msgid "Tunnel error talking to %s: %s" -msgstr "Tunnel-Fehler bei Verbindung mit %s: %s" - -#: muttlib.c:976 -msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]" -msgstr "Datei ist ein Verzeichnis, darin abspeichern? [(j)a, (n)ein, (a)lle]" - -#: muttlib.c:976 -msgid "yna" -msgstr "jna" - -#: muttlib.c:992 -msgid "File is a directory, save under it?" -msgstr "Datei ist ein Verzeichnis, darin abspeichern?" - -#: muttlib.c:998 -msgid "File under directory: " -msgstr "Datei in diesem Verzeichnis: " - -#: muttlib.c:1010 -msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?" -msgstr "Datei existiert, (u)eberschreiben, (a)nhängen, a(b)brechen?" - -#: muttlib.c:1010 -msgid "oac" -msgstr "uab" - -#: muttlib.c:1511 -msgid "Can't save message to POP mailbox." -msgstr "Kann Nachricht nicht in POP Mailbox schreiben." - -#: muttlib.c:1520 -#, c-format -msgid "Append messages to %s?" -msgstr "Nachricht an %s anhängen?" - -#: muttlib.c:1532 -#, c-format -msgid "%s is not a mailbox!" -msgstr "%s ist keine Mailbox!" - -#: mx.c:116 -#, c-format -msgid "Lock count exceeded, remove lock for %s?" -msgstr "Lock-Datei für %s entfernen?" - -#: mx.c:128 -#, c-format -msgid "Can't dotlock %s.\n" -msgstr "Kann %s nicht (dot-)locken.\n" - -#: mx.c:184 -msgid "Timeout exceeded while attempting fcntl lock!" -msgstr "Konnte fcntl-Lock nicht innerhalb akzeptabler Zeit erhalten." - -#: mx.c:190 -#, c-format -msgid "Waiting for fcntl lock... %d" -msgstr "Warte auf fcntl-Lock... %d" - -#: mx.c:217 -msgid "Timeout exceeded while attempting flock lock!" -msgstr "Konnte flock-Lock nicht innerhalb akzeptabler Zeit erhalten." - -#: mx.c:224 -#, c-format -msgid "Waiting for flock attempt... %d" -msgstr "Warte auf flock-Versuch... %d" - -#: mx.c:555 -#, c-format -msgid "Couldn't lock %s\n" -msgstr "Kann %s nicht locken.\n" - -#: mx.c:771 -#, c-format -msgid "Could not synchronize mailbox %s!" -msgstr "Kann Mailbox %s nicht synchronisieren!" - -#: mx.c:835 -#, c-format -msgid "Move read messages to %s?" -msgstr "Verschiebe gelesene Nachrichten nach %s?" - -#: mx.c:851 mx.c:1111 -#, c-format -msgid "Purge %d deleted message?" -msgstr "Entferne %d als gelöscht markierte Nachrichten?" - -#: mx.c:851 mx.c:1111 -#, c-format -msgid "Purge %d deleted messages?" -msgstr "Entferne %d als gelöscht markierte Nachrichten?" - -#: mx.c:872 -#, c-format -msgid "Moving read messages to %s..." -msgstr "Verschiebe gelesene Nachrichten nach %s..." - -#: mx.c:932 mx.c:1102 -msgid "Mailbox is unchanged." -msgstr "Mailbox unverändert." - -#: mx.c:972 -#, c-format -msgid "%d kept, %d moved, %d deleted." -msgstr "%d behalten, %d verschoben, %d gelöscht." - -#: mx.c:975 mx.c:1154 -#, c-format -msgid "%d kept, %d deleted." -msgstr "%d behalten, %d gelöscht." - -#: mx.c:1086 -#, c-format -msgid " Press '%s' to toggle write" -msgstr " Drücken Sie '%s', um Schreib-Modus ein-/auszuschalten" - -#: mx.c:1088 -msgid "Use 'toggle-write' to re-enable write!" -msgstr "Benutzen Sie 'toggle-write', um Schreib-Modus zu reaktivieren" - -#: mx.c:1090 -#, c-format -msgid "Mailbox is marked unwritable. %s" -msgstr "Mailbox ist als unschreibbar markiert. %s" - -#: mx.c:1148 -msgid "Mailbox checkpointed." -msgstr "Checkpoint in der Mailbox gesetzt." - -#: mx.c:1466 -msgid "Can't write message" -msgstr "Kann Nachricht nicht schreiben" - -#: mx.c:1505 -msgid "Integer overflow -- can't allocate memory." -msgstr "Integer Überlauf -- kann keinen Speicher belegen." - -#: pager.c:1531 -msgid "PrevPg" -msgstr "S.zurück" - -#: pager.c:1532 -msgid "NextPg" -msgstr "S.vor" - -#: pager.c:1536 -msgid "View Attachm." -msgstr "Anhänge betr." - -#: pager.c:1539 -msgid "Next" -msgstr "Nächste Nachr." - -#. emulate "less -q" and don't go on to the next message. -#: pager.c:1940 pager.c:1971 pager.c:2003 pager.c:2279 -msgid "Bottom of message is shown." -msgstr "Das Ende der Nachricht wird angezeigt." - -#: pager.c:1956 pager.c:1978 pager.c:1985 pager.c:1992 -msgid "Top of message is shown." -msgstr "Der Beginn der Nachricht wird angezeigt." - -#: pager.c:2217 -msgid "Help is currently being shown." -msgstr "Hilfe wird bereits angezeigt." - -#: pager.c:2246 -msgid "No more quoted text." -msgstr "Kein weiterer zitierter Text." - -#: pager.c:2259 -msgid "No more unquoted text after quoted text." -msgstr "Kein weiterer eigener Text nach zitiertem Text." - -#: parse.c:577 -msgid "multipart message has no boundary parameter!" -msgstr "Mehrteilige Nachricht hat keinen \"boundary\"-Parameter!" - -#: pattern.c:264 -#, c-format -msgid "Error in expression: %s" -msgstr "Fehler in Ausdruck: %s" - -#: pattern.c:269 -#, c-format -msgid "Empty expression" -msgstr "Leerer Ausdruck" - -#: pattern.c:402 -#, c-format -msgid "Invalid day of month: %s" -msgstr "Ungültiger Tag: %s" - -#: pattern.c:416 -#, c-format -msgid "Invalid month: %s" -msgstr "Ungültiger Monat: %s" - -#. getDate has its own error message, don't overwrite it here -#: pattern.c:568 -#, c-format -msgid "Invalid relative date: %s" -msgstr "Ungültiges relatives Datum: %s" - -#: pattern.c:582 -msgid "error in expression" -msgstr "Fehler in Ausdruck." - -#: pattern.c:804 pattern.c:956 -#, c-format -msgid "error in pattern at: %s" -msgstr "Fehler in Muster bei: %s" - -#: pattern.c:830 -#, c-format -msgid "missing pattern: %s" -msgstr "Fehlendes Suchmuster: %s" - -#: pattern.c:840 -#, c-format -msgid "mismatched brackets: %s" -msgstr "Nicht zusammen passende Klammern: %s" - -#: pattern.c:896 -#, c-format -msgid "%c: invalid pattern modifier" -msgstr "%c: Ungültiger Muster-Modifikator" - -#: pattern.c:902 -#, c-format -msgid "%c: not supported in this mode" -msgstr "%c: Wird in diesem Modus nicht unterstützt." - -#: pattern.c:915 -#, c-format -msgid "missing parameter" -msgstr "Fehlender Parameter" - -#: pattern.c:931 -#, c-format -msgid "mismatched parenthesis: %s" -msgstr "Unpassende Klammern: %s" - -#: pattern.c:963 -msgid "empty pattern" -msgstr "Leeres Muster" - -#: pattern.c:1217 -#, c-format -msgid "error: unknown op %d (report this error)." -msgstr "Fehler: Unbekannter Muster-Operator %d (Bitte Bug melden)." - -#: pattern.c:1300 pattern.c:1438 -msgid "Compiling search pattern..." -msgstr "Compiliere Suchmuster..." - -#: pattern.c:1320 -msgid "Executing command on matching messages..." -msgstr "Führe Kommando aus..." - -#: pattern.c:1387 -msgid "No messages matched criteria." -msgstr "Keine Nachrichten haben Kriterium erfüllt." - -#: pattern.c:1467 -msgid "Searching..." -msgstr "Suche..." - -#: pattern.c:1480 -msgid "Search hit bottom without finding match" -msgstr "Suche hat Ende erreicht, ohne Treffer zu erzielen." - -#: pattern.c:1491 -msgid "Search hit top without finding match" -msgstr "Suche hat Anfang erreicht, ohne Treffer zu erzielen." - -#: pattern.c:1523 -msgid "Search interrupted." -msgstr "Suche unterbrochen." - -#: pgp.c:90 -msgid "Enter PGP passphrase:" -msgstr "PGP-Mantra eingeben:" - -#: pgp.c:104 -msgid "PGP passphrase forgotten." -msgstr "PGP-Mantra vergessen." - -#: pgp.c:368 -msgid "[-- Error: unable to create PGP subprocess! --]\n" -msgstr "[-- Fehler: Kann keinen PGP-Prozess erzeugen! --]\n" - -#: pgp.c:402 pgp.c:659 pgp.c:863 -msgid "" -"[-- End of PGP output --]\n" -"\n" -msgstr "" -"[-- Ende der PGP-Ausgabe --]\n" -"\n" - -#: pgp.c:424 pgp.c:475 pgp.c:998 -msgid "Could not decrypt PGP message" -msgstr "Konnte PGP Nachricht nicht entschlüsseln" - -#. clear 'Invoking...' message, since there's no error -#: pgp.c:477 pgp.c:994 -msgid "PGP message successfully decrypted." -msgstr "PGP Nachricht erfolgreich entschlüsselt." - -#: pgp.c:767 -msgid "Internal error. Inform ." -msgstr "Interner Fehler. Bitte informieren." - -#: pgp.c:828 -msgid "" -"[-- Error: could not create a PGP subprocess! --]\n" -"\n" -msgstr "" -"[-- Fehler: Konnte PGP-Subprozess nicht erzeugen! --]\n" -"\n" - -#: pgp.c:875 -msgid "Decryption failed" -msgstr "Entschlüsselung gescheitert" - -#: pgp.c:1050 -msgid "Can't open PGP subprocess!" -msgstr "Kann PGP-Subprozess nicht erzeugen!" - -#: pgp.c:1487 -msgid "Can't invoke PGP" -msgstr "Kann PGP nicht aufrufen" - -#: pgp.c:1592 -#, c-format -msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, or (c)lear? " -msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, %s Format, (k)ein PGP? " - -#: pgp.c:1593 -msgid "PGP/M(i)ME" -msgstr "PGP/M(i)ME" - -#: pgp.c:1593 -msgid "(i)nline" -msgstr "(i)nline" - -#. The keys accepted for this prompt *must* match the order in the second -#. * version in the else clause since the switch statement below depends on -#. * it. The 'i' key is appended in this version. -#. -#: pgp.c:1599 -msgid "esabfci" -msgstr "vsabpku" - -#. The keys accepted *must* be a prefix of the accepted keys in the "if" -#. * clause above since the switch statement below depends on it. -#. -#: pgp.c:1606 -msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (c)lear? " -msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, oder (k)ein PGP? " - -#: pgp.c:1607 -msgid "esabfc" -msgstr "vsabku" - -#: pgpinvoke.c:308 -msgid "Fetching PGP key..." -msgstr "Hole PGP Schlüssel..." - -#: pgpkey.c:491 -msgid "All matching keys are expired, revoked, or disabled." -msgstr "" -"Alle passenden Schlüssel sind veraltet, zurückgezogen oder deaktiviert." - -#: pgpkey.c:532 -#, c-format -msgid "PGP keys matching <%s>." -msgstr "PGP-Schlüssel, die zu <%s> passen." - -#: pgpkey.c:534 -#, c-format -msgid "PGP keys matching \"%s\"." -msgstr "PGP-Schlüssel, die zu \"%s\" passen." - -#: pgpkey.c:553 pgpkey.c:745 -msgid "Can't open /dev/null" -msgstr "Kann /dev/null nicht öffnen" - -#: pgpkey.c:724 -msgid "Please enter the key ID: " -msgstr "Bitte Schlüsselidentifikation eingeben: " - -#: pgpkey.c:777 -#, c-format -msgid "PGP Key %s." -msgstr "PGP Schlüssel %s." - -#: pop.c:101 pop_lib.c:210 -#, c-format -msgid "Command TOP is not supported by server." -msgstr "Das Kommando TOP wird vom Server nicht unterstützt." - -#: pop.c:128 -msgid "Can't write header to temporary file!" -msgstr "Kann Header nicht in temporäre Datei schreiben!" - -#: pop.c:267 pop_lib.c:212 -#, c-format -msgid "Command UIDL is not supported by server." -msgstr "Kommando UIDL wird vom Server nicht unterstützt." - -#: pop.c:287 -#, c-format -msgid "%d messages have been lost. Try reopening the mailbox." -msgstr "" -"%d Nachrichten verloren gegangen. Versuche Sie die Mailbox neu zu öffnen." - -#: pop.c:402 pop.c:785 -#, c-format -msgid "%s is an invalid POP path" -msgstr "%s ist ein ungültiger POP Pfad" - -#: pop.c:445 -msgid "Fetching list of messages..." -msgstr "Hole Liste der Nachrichten..." - -#: pop.c:603 -msgid "Can't write message to temporary file!" -msgstr "Kann Nachricht nicht in temporäre Datei schreiben!" - -#: pop.c:662 -msgid "Marking messages deleted..." -msgstr "Markiere Nachrichten zum Löschen..." - -#: pop.c:740 pop.c:805 -msgid "Checking for new messages..." -msgstr "Prüfe auf neue Nachrichten..." - -#: pop.c:769 -msgid "POP host is not defined." -msgstr "Es wurde kein POP-Server definiert." - -#: pop.c:833 -msgid "No new mail in POP mailbox." -msgstr "Keine neuen Nachrichten auf dem POP-Server." - -#: pop.c:840 -msgid "Delete messages from server?" -msgstr "Lösche Nachrichten auf dem Server?" - -#: pop.c:842 -#, c-format -msgid "Reading new messages (%d bytes)..." -msgstr "Lese neue Nachrichten (%d Bytes)..." - -#: pop.c:884 -msgid "Error while writing mailbox!" -msgstr "Fehler beim Versuch, die Mailbox zu schreiben!" - -#: pop.c:888 -#, c-format -msgid "%s [%d of %d messages read]" -msgstr "%s [%d von %d Nachrichten gelesen]" - -#: pop.c:911 pop_lib.c:378 -msgid "Server closed connection!" -msgstr "Server hat Verbindung beendet!" - -#: pop_auth.c:78 -msgid "Authenticating (SASL)..." -msgstr "Authentifiziere (SASL)..." - -#: pop_auth.c:188 -msgid "POP timestamp is invalid!" -msgstr "POP Zeitstempel ist ungültig!" - -#: pop_auth.c:193 -msgid "Authenticating (APOP)..." -msgstr "Authentifiziere (APOP)..." - -#: pop_auth.c:216 -msgid "APOP authentication failed." -msgstr "APOP Authentifizierung fehlgeschlagen." - -#: pop_auth.c:251 -#, c-format -msgid "Command USER is not supported by server." -msgstr "Kommando USER wird vom Server nicht unterstützt." - -#: pop_lib.c:55 -#, c-format -msgid "Invalid POP URL: %s\n" -msgstr "Ungültige POP URL: %s\n" - -#: pop_lib.c:208 -msgid "Unable to leave messages on server." -msgstr "Kann Nachrichten nicht auf dem Server belassen." - -#: pop_lib.c:238 -#, c-format -msgid "Error connecting to server: %s" -msgstr "Fehler beim Verbinden mit dem Server: %s" - -#: pop_lib.c:392 -msgid "Closing connection to POP server..." -msgstr "Beende Verbindung zum POP-Server..." - -#: pop_lib.c:563 -msgid "Verifying message indexes..." -msgstr "Überprüfe Nachrichten-Indexe..." - -#: pop_lib.c:585 -msgid "Connection lost. Reconnect to POP server?" -msgstr "Verbindung unterbrochen. Verbindung zum POP-Server wiederherstellen?" - -#: postpone.c:165 -msgid "Postponed Messages" -msgstr "Zurückgestelle Nachrichten" - -#: postpone.c:245 postpone.c:254 -msgid "No postponed messages." -msgstr "Keine zurückgestellten Nachrichten." - -#: postpone.c:442 postpone.c:463 postpone.c:497 -msgid "Illegal crypto header" -msgstr "Unzulässiger Crypto Header" - -#: postpone.c:483 -msgid "Illegal S/MIME header" -msgstr "Unzulässiger S/MIME Header" - -#: postpone.c:563 -msgid "Decrypting message..." -msgstr "Entschlüssle Nachricht..." - -#: postpone.c:572 -msgid "Decryption failed." -msgstr "Entschlüsselung gescheitert." - -#: query.c:50 -msgid "New Query" -msgstr "Neue Abfrage" - -#: query.c:51 -msgid "Make Alias" -msgstr "Kurznamen erzeugen" - -#: query.c:52 -msgid "Search" -msgstr "Suchen" - -#: query.c:95 -msgid "Waiting for response..." -msgstr "Warte auf Antwort..." - -#: query.c:246 query.c:274 -msgid "Query command not defined." -msgstr "Kein Abfragekommando definiert." - -#: query.c:301 -#, c-format -msgid "Query" -msgstr "Abfrage" - -#. Prompt for Query -#: query.c:313 query.c:338 -msgid "Query: " -msgstr "Abfrage: " - -#: query.c:321 query.c:347 -#, c-format -msgid "Query '%s'" -msgstr "Abfrage: '%s'" - -#: recvattach.c:55 -msgid "Pipe" -msgstr "Filtern" - -#: recvattach.c:56 -msgid "Print" -msgstr "Drucke" - -#: recvattach.c:484 -msgid "Saving..." -msgstr "Speichere..." - -#: recvattach.c:487 recvattach.c:578 -msgid "Attachment saved." -msgstr "Anhang gespeichert." - -#: recvattach.c:590 -#, c-format -msgid "WARNING! You are about to overwrite %s, continue?" -msgstr "WARNUNG! Datei %s existiert, überschreiben?" - -#: recvattach.c:608 -msgid "Attachment filtered." -msgstr "Anhang gefiltert." - -#: recvattach.c:675 -msgid "Filter through: " -msgstr "Filtere durch: " - -#: recvattach.c:675 -msgid "Pipe to: " -msgstr "Übergebe an (pipe): " - -#: recvattach.c:710 -#, c-format -msgid "I dont know how to print %s attachments!" -msgstr "Kann %s Anhänge nicht drucken!" - -#: recvattach.c:775 -msgid "Print tagged attachment(s)?" -msgstr "Drucke markierte Anhänge?" - -#: recvattach.c:775 -msgid "Print attachment?" -msgstr "Drucke Anhang?" - -#: recvattach.c:1008 -msgid "Can't decrypt encrypted message!" -msgstr "Kann verschlüsselte Nachricht nicht entschlüsseln!" - -#: recvattach.c:1020 -msgid "Attachments" -msgstr "Anhänge" - -#: recvattach.c:1056 -msgid "There are no subparts to show!" -msgstr "Es sind keine Teile zur Anzeige vorhanden!" - -#: recvattach.c:1117 -msgid "Can't delete attachment from POP server." -msgstr "Kann Dateianhang nicht vom POP-Server löschen." - -#: recvattach.c:1125 -msgid "Deletion of attachments from encrypted messages is unsupported." -msgstr "Kann Anhänge aus verschlüsselten Nachrichten nicht löschen." - -#: recvattach.c:1144 recvattach.c:1161 -msgid "Only deletion of multipart attachments is supported." -msgstr "Kann nur aus mehrteiligen Anhängen löschen." - -#: recvcmd.c:43 -msgid "You may only bounce message/rfc822 parts." -msgstr "Sie können nur message/rfc822-Anhänge erneut versenden." - -#: recvcmd.c:148 recvcmd.c:161 -msgid "Warning: message contains no From: header" -msgstr "Warnung: Nachricht enthält keine From: Kopfzeile" - -#: recvcmd.c:241 -msgid "Error bouncing message!" -msgstr "Fehler beim Weiterleiten der Nachricht!" - -#: recvcmd.c:241 -msgid "Error bouncing messages!" -msgstr "Fehler beim Weiterleiten der Nachrichten!" - -#: recvcmd.c:441 -#, c-format -msgid "Can't open temporary file %s." -msgstr "Kann temporäre Datei %s nicht öffnen." - -#: recvcmd.c:472 -msgid "Forward as attachments?" -msgstr "Als Anhänge weiterleiten?" - -#: recvcmd.c:486 -msgid "Can't decode all tagged attachments. MIME-forward the others?" -msgstr "" -"Nicht alle markierten Anhänge dekodierbar. MIME für den Rest verwenden? " - -#: recvcmd.c:611 -msgid "Forward MIME encapsulated?" -msgstr "Zum Weiterleiten in MIME-Anhang einpacken?" - -#: recvcmd.c:619 recvcmd.c:869 -#, c-format -msgid "Can't create %s." -msgstr "Kann %s nicht anlegen." - -#: recvcmd.c:752 -msgid "Can't find any tagged messages." -msgstr "Es sind keine Nachrichten markiert." - -#: recvcmd.c:773 send.c:738 -msgid "No mailing lists found!" -msgstr "Keine Mailing-Listen gefunden!" - -#: recvcmd.c:848 -msgid "Can't decode all tagged attachments. MIME-encapsulate the others?" -msgstr "" -"Nicht alle markierten Anhänge dekodierbar. MIME für den Rest verwenden?" - -#: remailer.c:485 -msgid "Append" -msgstr "Anhängen" - -#: remailer.c:486 -msgid "Insert" -msgstr "Einfügen" - -#: remailer.c:487 -msgid "Delete" -msgstr "Löschen" - -#: remailer.c:489 -msgid "OK" -msgstr "OK" - -#: remailer.c:517 -msgid "Can't get mixmaster's type2.list!" -msgstr "Kann die \"type2.list\" für Mixmaster nicht holen!" - -#: remailer.c:542 -msgid "Select a remailer chain." -msgstr "Wähle eine Remailer Kette aus." - -#: remailer.c:602 -#, c-format -msgid "Error: %s can't be used as the final remailer of a chain." -msgstr "" -"Fehler: %s kann nicht als letzter Remailer einer Kette verwendet werden." - -#: remailer.c:632 -#, c-format -msgid "Mixmaster chains are limited to %d elements." -msgstr "Eine Mixmaster-Kette kann maximal %d Elemente enthalten." - -#: remailer.c:655 -msgid "The remailer chain is already empty." -msgstr "Die Remailer-Kette ist bereits leer." - -#: remailer.c:665 -msgid "You already have the first chain element selected." -msgstr "Sie haben bereits das erste Element der Kette ausgewählt." - -#: remailer.c:675 -msgid "You already have the last chain element selected." -msgstr "Sie haben bereits das letzte Element der Kette ausgewählt." - -#: remailer.c:714 -msgid "Mixmaster doesn't accept Cc or Bcc headers." -msgstr "Mixmaster unterstützt weder Cc: noch Bcc:" - -#: remailer.c:738 -msgid "" -"Please set the hostname variable to a proper value when using mixmaster!" -msgstr "" -"Setzen sie die Variable \"hostname\" richtig, wenn Sie Mixmaster verwenden!" - -#: remailer.c:772 -#, c-format -msgid "Error sending message, child exited %d.\n" -msgstr "Fehler %d beim Versand der Nachricht.\n" - -#: remailer.c:776 -msgid "Error sending message." -msgstr "Fehler beim Versand der Nachricht." - -#: rfc1524.c:164 -#, c-format -msgid "Improperly formated entry for type %s in \"%s\" line %d" -msgstr "Ungültiger Eintrag für Typ %s in \"%s\", Zeile %d." - -#: rfc1524.c:396 -msgid "No mailcap path specified" -msgstr "Kein Mailcap-Pfad definiert." - -#: rfc1524.c:424 -#, c-format -msgid "mailcap entry for type %s not found" -msgstr "Kann keinen Mailcap-Eintrag für %s finden." - -#: score.c:75 -msgid "score: too few arguments" -msgstr "score: Zu wenige Parameter." - -#: score.c:84 -msgid "score: too many arguments" -msgstr "score: Zu viele Parameter." - -#: score.c:122 -msgid "Error: score: invalid number" -msgstr "Fehler: score: Ungültige Zahl" - -#: send.c:252 -msgid "No subject, abort?" -msgstr "Kein Betreff, abbrechen?" - -#: send.c:254 -msgid "No subject, aborting." -msgstr "Kein Betreff, breche ab." - -#. There are quite a few mailing lists which set the Reply-To: -#. * header field to the list address, which makes it quite impossible -#. * to send a message to only the sender of the message. This -#. * provides a way to do that. -#. -#: send.c:501 -#, c-format -msgid "Reply to %s%s?" -msgstr "Antworte an %s%s?" - -#: send.c:535 -#, c-format -msgid "Follow-up to %s%s?" -msgstr "Antworte an %s%s?" - -#. This could happen if the user tagged some messages and then did -#. * a limit such that none of the tagged message are visible. -#. -#: send.c:713 -msgid "No tagged messages are visible!" -msgstr "Keine markierten Nachrichten sichtbar!" - -#: send.c:764 -msgid "Include message in reply?" -msgstr "Nachricht in Antwort zitieren?" - -#: send.c:769 -msgid "Including quoted message..." -msgstr "Binde zitierte Nachricht ein..." - -#: send.c:779 -msgid "Could not include all requested messages!" -msgstr "Konnte nicht alle gewünschten Nachrichten zitieren!" - -#: send.c:793 -msgid "Forward as attachment?" -msgstr "Als Anhang weiterleiten?" - -#: send.c:797 -msgid "Preparing forwarded message..." -msgstr "Bereite Nachricht zum Weiterleiten vor..." - -#. If the user is composing a new message, check to see if there -#. * are any postponed messages first. -#. -#: send.c:1147 -msgid "Recall postponed message?" -msgstr "Zurückgestellte Nachricht weiterbearbeiten?" - -#: send.c:1379 -msgid "Edit forwarded message?" -msgstr "Weitergeleitete Nachricht editieren?" - -#: send.c:1419 -msgid "Abort unmodified message?" -msgstr "Unveränderte Nachricht verwerfen?" - -#: send.c:1421 -msgid "Aborted unmodified message." -msgstr "Unveränderte Nachricht verworfen." - -#: send.c:1564 -msgid "Message postponed." -msgstr "Nachricht zurückgestellt." - -#: send.c:1574 -msgid "No recipients are specified!" -msgstr "Es wurden keine Empfänger angegeben!" - -#: send.c:1579 -msgid "No recipients were specified." -msgstr "Es wurden keine Empfänger angegeben!" - -#: send.c:1595 -msgid "No subject, abort sending?" -msgstr "Kein Betreff, Versand abbrechen?" - -#: send.c:1599 -msgid "No subject specified." -msgstr "Kein Betreff." - -#: send.c:1661 smtp.c:185 -msgid "Sending message..." -msgstr "Verschicke Nachricht..." - -#. check to see if the user wants copies of all attachments -#: send.c:1694 -msgid "Save attachments in Fcc?" -msgstr "Anhänge in Fcc-Mailbox speichern?" - -#: send.c:1803 -msgid "Could not send the message." -msgstr "Konnte Nachricht nicht verschicken." - -#: send.c:1808 -msgid "Mail sent." -msgstr "Nachricht verschickt." - -#: send.c:1808 -msgid "Sending in background." -msgstr "Verschicke im Hintergrund." - -#: sendlib.c:425 -msgid "No boundary parameter found! [report this error]" -msgstr "Kein boundary-Parameter gefunden! (bitte Bug melden)" - -#: sendlib.c:455 -#, c-format -msgid "%s no longer exists!" -msgstr "%s existiert nicht mehr!" - -#: sendlib.c:878 -#, c-format -msgid "%s isn't a regular file." -msgstr "%s ist keine normale Datei." - -#: sendlib.c:1050 -#, c-format -msgid "Could not open %s" -msgstr "Konnte %s nicht öffnen." - -#: sendlib.c:2414 -#, c-format -msgid "Error sending message, child exited %d (%s)." -msgstr "Fehler %d beim Versand der Nachricht (%s)." - -#: sendlib.c:2420 -msgid "Output of the delivery process" -msgstr "Ausgabe des Auslieferungs-Prozesses" - -#: sendlib.c:2594 -#, c-format -msgid "Bad IDN %s while preparing resent-from." -msgstr "Ungültige IDN %s bei der Vorbereitung von Resent-From." - -#: signal.c:43 -#, c-format -msgid "%s... Exiting.\n" -msgstr "%s... Abbruch.\n" - -#: signal.c:46 signal.c:49 -#, c-format -msgid "Caught %s... Exiting.\n" -msgstr "Signal %s... Abbruch.\n" - -#: signal.c:51 -#, c-format -msgid "Caught signal %d... Exiting.\n" -msgstr "Signal %d... Abbruch.\n" - -#: smime.c:111 -msgid "Enter S/MIME passphrase:" -msgstr "S/MIME-Mantra eingeben:" - -#: smime.c:322 -msgid "Trusted " -msgstr "Vertr.würd" - -#: smime.c:325 -msgid "Verified " -msgstr "Geprüft " - -#: smime.c:328 -msgid "Unverified" -msgstr "Ungeprüft " - -#: smime.c:331 -msgid "Expired " -msgstr "Veraltet " - -#: smime.c:334 -msgid "Revoked " -msgstr "Zurückgez." - -#: smime.c:337 -msgid "Invalid " -msgstr "Ungültig " - -#: smime.c:340 -msgid "Unknown " -msgstr "Unbekannt " - -#: smime.c:368 -msgid "Enter keyID: " -msgstr "KeyID eingeben: " - -#: smime.c:378 -#, c-format -msgid "S/MIME certificates matching \"%s\"." -msgstr "S/MIME Zertifikate, die zu \"%s\" passen." - -#: smime.c:526 smime.c:596 smime.c:614 -#, c-format -msgid "ID %s is unverified. Do you want to use it for %s ?" -msgstr "ID %s ist ungeprüft. Möchten Sie sie für %s verwenden?" - -#: smime.c:530 smime.c:600 -#, c-format -msgid "Use (untrusted!) ID %s for %s ?" -msgstr "Benutze (nicht vertrauenswürdige!) ID %s für %s?" - -#: smime.c:533 smime.c:603 -#, c-format -msgid "Use ID %s for %s ?" -msgstr "Benutze ID = %s für %s?" - -#: smime.c:622 -#, c-format -msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)" -msgstr "Warnung: Sie vertrauen ID %s noch nicht. (Taste drücken für weiter)" - -#: smime.c:781 -#, c-format -msgid "No (valid) certificate found for %s." -msgstr "Kein (gültiges) Zertifikat für %s gefunden." - -#: smime.c:836 smime.c:864 smime.c:929 smime.c:973 smime.c:1038 smime.c:1113 -msgid "Error: unable to create OpenSSL subprocess!" -msgstr "Fehler: Kann keinen OpenSSL Prozess erzeugen!" - -#: smime.c:1191 -msgid "no certfile" -msgstr "keine Zertifikat-Datei" - -#: smime.c:1194 -msgid "no mbox" -msgstr "keine Mailbox" - -#. fatal error while trying to encrypt message -#: smime.c:1337 -msgid "No output from OpenSSL.." -msgstr "Keine Ausgabe von OpenSSL.." - -#: smime.c:1375 -msgid "Can't sign: No key specified. Use Sign As." -msgstr "" -"Kann nicht signieren: Kein Schlüssel angegeben. Verwenden Sie \"sign. als\"." - -#: smime.c:1382 -msgid "Warning: Intermediate certificate not found." -msgstr "Warnung: Zwischenzertifikat nicht gefunden." - -#: smime.c:1429 -msgid "Can't open OpenSSL subprocess!" -msgstr "Kann OpenSSL-Unterprozess nicht erzeugen!" - -#: smime.c:1469 -msgid "No output from OpenSSL..." -msgstr "Keine Ausgabe von OpenSSL..." - -#: smime.c:1634 smime.c:1759 -msgid "" -"[-- End of OpenSSL output --]\n" -"\n" -msgstr "" -"[-- Ende der OpenSSL-Ausgabe --]\n" -"\n" - -#: smime.c:1718 smime.c:1729 -msgid "[-- Error: unable to create OpenSSL subprocess! --]\n" -msgstr "[-- Fehler: Kann keinen OpenSSL-Unterprozess erzeugen! --]\n" - -#: smime.c:1763 -msgid "[-- The following data is S/MIME encrypted --]\n" -msgstr "[-- Die folgenden Daten sind S/MIME-verschlüsselt --]\n" - -#: smime.c:1766 -msgid "[-- The following data is S/MIME signed --]\n" -msgstr "[-- Die folgenden Daten sind S/MIME signiert --]\n" - -#: smime.c:1830 -msgid "" -"\n" -"[-- End of S/MIME encrypted data. --]\n" -msgstr "" -"\n" -"[-- Ende der S/MIME-verschlüsselten Daten --]\n" - -#: smime.c:1832 -msgid "" -"\n" -"[-- End of S/MIME signed data. --]\n" -msgstr "" -"\n" -"[-- Ende der S/MIME signierten Daten --]\n" - -#: smime.c:1943 -msgid "" -"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? " -msgstr "" -"S/MIME (v)erschl., (s)ign., verschl. (m)it, sign. (a)ls, (b)eides, (k)eins? " - -#: smime.c:1944 -msgid "eswabfc" -msgstr "vsmabkc" - -#. I use "dra" because "123" is recognized anyway -#: smime.c:1959 -msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? " -msgstr "Wähle Algorithmus: 1: DES, 2: RC2, 3: AES, oder (u)nverschlüsselt? " - -#: smime.c:1962 -msgid "drac" -msgstr "drau" - -#: smime.c:1965 -msgid "1: DES, 2: Triple-DES " -msgstr "1: DES, 2: Triple-DES " - -#: smime.c:1966 -msgid "dt" -msgstr "dt" - -#: smime.c:1978 -msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 " -msgstr "1: RC2-40, 2: RC2-64, 3: RC2-128 " - -#: smime.c:1979 -msgid "468" -msgstr "468" - -#: smime.c:1994 -msgid "1: AES128, 2: AES192, 3: AES256 " -msgstr "1: AES128, 2: AES192, 3: AES256 " - -#: smime.c:1995 -msgid "895" -msgstr "895" - -#: smtp.c:134 -#, c-format -msgid "SMTP session failed: %s" -msgstr "SMTP Verbindung fehlgeschlagen: %s" - -#: smtp.c:180 -#, c-format -msgid "SMTP session failed: unable to open %s" -msgstr "SMTP Verbindung fehlgeschlagen: Kann %s nicht öffnen" - -#: smtp.c:258 -msgid "No from address given" -msgstr "Keine Absenderadresse angegeben" - -#: smtp.c:314 -msgid "SMTP session failed: read error" -msgstr "SMTP Verbindung fehlgeschlagen: Lesefehler" - -#: smtp.c:316 -msgid "SMTP session failed: write error" -msgstr "SMTP Verbindung fehlgeschlagen: Schreibfehler" - -#: smtp.c:318 -msgid "Invalid server response" -msgstr "Ungültige Serverantwort" - -#: smtp.c:341 -#, c-format -msgid "Invalid SMTP URL: %s" -msgstr "Ungültige SMTP URL: %s" - -#: smtp.c:451 -msgid "SMTP server does not support authentication" -msgstr "SMTP Server unterstützt keine Authentifizierung" - -#: smtp.c:459 -msgid "SMTP authentication requires SASL" -msgstr "SMTP Authentifizierung benötigt SASL" - -#: smtp.c:493 -#, c-format -msgid "%s authentication failed, trying next method" -msgstr "%s Authentifizierung fehlgeschlagen, versuche nächste Methode" - -#: smtp.c:510 -msgid "SASL authentication failed" -msgstr "SASL Authentifizierung fehlgeschlagen" - -#: sort.c:265 -msgid "Sorting mailbox..." -msgstr "Sortiere Mailbox..." - -#: sort.c:302 -msgid "Could not find sorting function! [report this bug]" -msgstr "Sortierfunktion nicht gefunden! (bitte Bug melden)" - -#: status.c:105 -msgid "(no mailbox)" -msgstr "(keine Mailbox)" - -#: thread.c:1096 -msgid "Parent message is not visible in this limited view." -msgstr "Bezugsnachricht ist in dieser begrenzten Sicht nicht sichtbar." - -#: thread.c:1102 -msgid "Parent message is not available." -msgstr "Bezugsnachricht ist nicht verfügbar." - -#: ../keymap_alldefs.h:5 -msgid "null operation" -msgstr "Leere Funktion" - -#: ../keymap_alldefs.h:6 -msgid "end of conditional execution (noop)" -msgstr "Ende der beedingten Ausführung (noop)" - -#: ../keymap_alldefs.h:7 -msgid "force viewing of attachment using mailcap" -msgstr "Erzwinge Ansicht des Anhangs mittels mailcap" - -#: ../keymap_alldefs.h:8 -msgid "view attachment as text" -msgstr "Zeige Anhang als Text an" - -#: ../keymap_alldefs.h:9 -msgid "Toggle display of subparts" -msgstr "Schalte Anzeige von Teilen ein/aus" - -#: ../keymap_alldefs.h:10 -msgid "move to the bottom of the page" -msgstr "Gehe zum Ende der Seite" - -#: ../keymap_alldefs.h:11 -msgid "remail a message to another user" -msgstr "Versende Nachricht erneut an anderen Empfänger" - -#: ../keymap_alldefs.h:12 -msgid "select a new file in this directory" -msgstr "Wähle eine neue Datei in diesem Verzeichnis aus" - -#: ../keymap_alldefs.h:13 -msgid "view file" -msgstr "Zeige Datei an" - -#: ../keymap_alldefs.h:14 -msgid "display the currently selected file's name" -msgstr "Zeige den Namen der derzeit ausgewählten Datei" - -#: ../keymap_alldefs.h:15 -msgid "subscribe to current mailbox (IMAP only)" -msgstr "Abonniere aktuelle Mailbox (nur für IMAP)" - -#: ../keymap_alldefs.h:16 -msgid "unsubscribe from current mailbox (IMAP only)" -msgstr "Kündige Abonnement der aktuellen Mailbox (nur für IMAP)" - -#: ../keymap_alldefs.h:17 -msgid "toggle view all/subscribed mailboxes (IMAP only)" -msgstr "Umschalter: Ansicht aller/der abonnierten Mailboxen (nur für IMAP)" - -#: ../keymap_alldefs.h:18 -msgid "list mailboxes with new mail" -msgstr "Liste Mailboxen mit neuen Nachrichten" - -#: ../keymap_alldefs.h:19 -msgid "change directories" -msgstr "Wechsle Verzeichnisse" - -#: ../keymap_alldefs.h:20 -msgid "check mailboxes for new mail" -msgstr "Überprüfe Mailboxen auf neue Nachrichten" - -#: ../keymap_alldefs.h:21 -msgid "attach file(s) to this message" -msgstr "Hänge Datei(en) an diese Nachricht an" - -#: ../keymap_alldefs.h:22 -msgid "attach message(s) to this message" -msgstr "Hänge Nachricht(en) an diese Nachricht an" - -#: ../keymap_alldefs.h:23 -msgid "edit the BCC list" -msgstr "Editiere die BCC-Liste" - -#: ../keymap_alldefs.h:24 -msgid "edit the CC list" -msgstr "Editiere die CC-Liste" - -#: ../keymap_alldefs.h:25 -msgid "edit attachment description" -msgstr "Editiere Beschreibung des Anhangs" - -#: ../keymap_alldefs.h:26 -msgid "edit attachment transfer-encoding" -msgstr "Editiere Kodierung des Anhangs" - -#: ../keymap_alldefs.h:27 -msgid "enter a file to save a copy of this message in" -msgstr "Wähle Datei, in die die Nachricht kopiert werden soll" - -#: ../keymap_alldefs.h:28 -msgid "edit the file to be attached" -msgstr "Editiere die anzuhängende Datei" - -#: ../keymap_alldefs.h:29 -msgid "edit the from field" -msgstr "Editiere das From-Feld" - -#: ../keymap_alldefs.h:30 -msgid "edit the message with headers" -msgstr "Editiere Nachricht (einschließlich Kopf)" - -#: ../keymap_alldefs.h:31 -msgid "edit the message" -msgstr "Editiere Nachricht" - -#: ../keymap_alldefs.h:32 -msgid "edit attachment using mailcap entry" -msgstr "Editiere Anhang mittels mailcap" - -#: ../keymap_alldefs.h:33 -msgid "edit the Reply-To field" -msgstr "Editiere Reply-To-Feld" - -#: ../keymap_alldefs.h:34 -msgid "edit the subject of this message" -msgstr "Editiere Betreff dieser Nachricht (Subject)" - -#: ../keymap_alldefs.h:35 -msgid "edit the TO list" -msgstr "Editiere Empfängerliste (To)" - -#: ../keymap_alldefs.h:36 -msgid "create a new mailbox (IMAP only)" -msgstr "Erzeuge eine neue Mailbox (nur für IMAP)" - -#: ../keymap_alldefs.h:37 -msgid "edit attachment content type" -msgstr "Editiere Typ des Anhangs" - -#: ../keymap_alldefs.h:38 -msgid "get a temporary copy of an attachment" -msgstr "Erzeuge temporäre Kopie dieses Anhangs" - -#: ../keymap_alldefs.h:39 -msgid "run ispell on the message" -msgstr "Rechtschreibprüfung via ispell" - -#: ../keymap_alldefs.h:40 -msgid "compose new attachment using mailcap entry" -msgstr "Erzeuge neues Attachment via mailcap" - -#: ../keymap_alldefs.h:41 -msgid "toggle recoding of this attachment" -msgstr "Schalte Kodierung dieses Anhangs um" - -#: ../keymap_alldefs.h:42 -msgid "save this message to send later" -msgstr "Stelle Nachricht zum späteren Versand zurück" - -#: ../keymap_alldefs.h:43 -msgid "rename/move an attached file" -msgstr "Benenne angehängte Datei um" - -#: ../keymap_alldefs.h:44 -msgid "send the message" -msgstr "Verschicke Nachricht" - -#: ../keymap_alldefs.h:45 -msgid "toggle disposition between inline/attachment" -msgstr "Schalte Verwendbarkeit um: Inline/Anhang" - -#: ../keymap_alldefs.h:46 -msgid "toggle whether to delete file after sending it" -msgstr "Wähle, ob Datei nach Versand gelöscht wird" - -#: ../keymap_alldefs.h:47 -msgid "update an attachment's encoding info" -msgstr "Aktualisiere Kodierungsinformation eines Anhangs" - -#: ../keymap_alldefs.h:48 -msgid "write the message to a folder" -msgstr "Schreibe Nachricht in Mailbox" - -#: ../keymap_alldefs.h:49 -msgid "copy a message to a file/mailbox" -msgstr "Kopiere Nachricht in Datei/Mailbox" - -#: ../keymap_alldefs.h:50 -msgid "create an alias from a message sender" -msgstr "Erzeuge Adressbucheintrag für Absender" - -#: ../keymap_alldefs.h:51 -msgid "move entry to bottom of screen" -msgstr "Bewege Eintrag zum unteren Ende des Bildschirms" - -#: ../keymap_alldefs.h:52 -msgid "move entry to middle of screen" -msgstr "Bewege Eintrag zur Bildschirmmitte" - -#: ../keymap_alldefs.h:53 -msgid "move entry to top of screen" -msgstr "Bewege Eintrag zum Bildschirmanfang" - -#: ../keymap_alldefs.h:54 -msgid "make decoded (text/plain) copy" -msgstr "Erzeuge decodierte Kopie (text/plain)" - -#: ../keymap_alldefs.h:55 -msgid "make decoded copy (text/plain) and delete" -msgstr "Erzeuge decodierte Kopie (text/plain) und lösche" - -#: ../keymap_alldefs.h:56 -msgid "delete the current entry" -msgstr "Lösche aktuellen Eintrag" - -#: ../keymap_alldefs.h:57 -msgid "delete the current mailbox (IMAP only)" -msgstr "Lösche die aktuelle Mailbox (nur für IMAP)" - -#: ../keymap_alldefs.h:58 -msgid "delete all messages in subthread" -msgstr "Lösche alle Nachrichten im Diskussionsfadenteil" - -#: ../keymap_alldefs.h:59 -msgid "delete all messages in thread" -msgstr "Lösche alle Nachrichten im Diskussionsfaden" - -#: ../keymap_alldefs.h:60 -msgid "display full address of sender" -msgstr "Zeige komplette Absenderadresse" - -#: ../keymap_alldefs.h:61 -msgid "display message and toggle header weeding" -msgstr "Zeige Nachricht an und schalte zwischen allen/wichtigen Headern um" - -#: ../keymap_alldefs.h:62 -msgid "display a message" -msgstr "Zeige Nachricht an" - -#: ../keymap_alldefs.h:63 -msgid "edit the raw message" -msgstr "Editiere \"rohe\" Nachricht" - -#: ../keymap_alldefs.h:64 -msgid "delete the char in front of the cursor" -msgstr "Lösche Zeichen vor dem Cursor" - -#: ../keymap_alldefs.h:65 -msgid "move the cursor one character to the left" -msgstr "Bewege Cursor ein Zeichen nach links" - -#: ../keymap_alldefs.h:66 -msgid "move the cursor to the beginning of the word" -msgstr "Springe zum Anfang des Wortes" - -#: ../keymap_alldefs.h:67 -msgid "jump to the beginning of the line" -msgstr "Springe zum Zeilenanfang" - -#: ../keymap_alldefs.h:68 -msgid "cycle among incoming mailboxes" -msgstr "Rotiere unter den Eingangs-Mailboxen" - -#: ../keymap_alldefs.h:69 -msgid "complete filename or alias" -msgstr "Vervollständige Dateinamen oder Kurznamen" - -#: ../keymap_alldefs.h:70 -msgid "complete address with query" -msgstr "Vervollständige Adresse mittels Abfrage (query)" - -#: ../keymap_alldefs.h:71 -msgid "delete the char under the cursor" -msgstr "Lösche das Zeichen unter dem Cursor" - -#: ../keymap_alldefs.h:72 -msgid "jump to the end of the line" -msgstr "Springe zum Zeilenende" - -#: ../keymap_alldefs.h:73 -msgid "move the cursor one character to the right" -msgstr "Bewege den Cursor ein Zeichen nach rechts" - -#: ../keymap_alldefs.h:74 -msgid "move the cursor to the end of the word" -msgstr "Springe zum Ende des Wortes" - -#: ../keymap_alldefs.h:75 -msgid "scroll down through the history list" -msgstr "Gehe in der Liste früherer Eingaben nach unten" - -#: ../keymap_alldefs.h:76 -msgid "scroll up through the history list" -msgstr "Gehe in der Liste früherer Eingaben nach oben" - -#: ../keymap_alldefs.h:77 -msgid "delete chars from cursor to end of line" -msgstr "Lösche bis Ende der Zeile" - -#: ../keymap_alldefs.h:78 -msgid "delete chars from the cursor to the end of the word" -msgstr "Lösche vom Cursor bis zum Ende des Wortes" - -#: ../keymap_alldefs.h:79 -msgid "delete all chars on the line" -msgstr "Lösche Zeile" - -#: ../keymap_alldefs.h:80 -msgid "delete the word in front of the cursor" -msgstr "Lösche Wort vor Cursor" - -#: ../keymap_alldefs.h:81 -msgid "quote the next typed key" -msgstr "Übernehme nächste Taste unverändert" - -#: ../keymap_alldefs.h:82 -msgid "transpose character under cursor with previous" -msgstr "Ersetze Zeichen unter dem Cursor mit vorhergehendem" - -#: ../keymap_alldefs.h:83 -msgid "capitalize the word" -msgstr "kapitalisiere das Wort (Anfang groß, Rest klein)" - -#: ../keymap_alldefs.h:84 -msgid "convert the word to lower case" -msgstr "konvertiere Wort in Kleinbuchstaben" - -#: ../keymap_alldefs.h:85 -msgid "convert the word to upper case" -msgstr "konvertiere Wort in Großbuchstaben" - -#: ../keymap_alldefs.h:86 -msgid "enter a muttrc command" -msgstr "Gib ein muttrc-Kommando ein" - -#: ../keymap_alldefs.h:87 -msgid "enter a file mask" -msgstr "Gib Dateimaske ein" - -#: ../keymap_alldefs.h:88 -msgid "exit this menu" -msgstr "Menü verlassen" - -#: ../keymap_alldefs.h:89 -msgid "filter attachment through a shell command" -msgstr "Filtere Anhang durch Shell-Kommando" - -#: ../keymap_alldefs.h:90 -msgid "move to the first entry" -msgstr "Gehe zum ersten Eintrag" - -#: ../keymap_alldefs.h:91 -msgid "toggle a message's 'important' flag" -msgstr "Schalte 'Wichtig'-Markierung der Nachricht um" - -#: ../keymap_alldefs.h:92 -msgid "forward a message with comments" -msgstr "Leite Nachricht mit Kommentar weiter" - -#: ../keymap_alldefs.h:93 -msgid "select the current entry" -msgstr "Wähle den aktuellen Eintrag aus" - -#: ../keymap_alldefs.h:94 -msgid "reply to all recipients" -msgstr "Antworte an alle Empfänger" - -#: ../keymap_alldefs.h:95 -msgid "scroll down 1/2 page" -msgstr "Gehe 1/2 Seite nach unten" - -#: ../keymap_alldefs.h:96 -msgid "scroll up 1/2 page" -msgstr "Gehe 1/2 Seite nach oben" - -#: ../keymap_alldefs.h:97 -msgid "this screen" -msgstr "Dieser Bildschirm" - -#: ../keymap_alldefs.h:98 -msgid "jump to an index number" -msgstr "Springe zu einer Index-Nummer" - -#: ../keymap_alldefs.h:99 -msgid "move to the last entry" -msgstr "Springe zum letzten Eintrag" - -#: ../keymap_alldefs.h:100 -msgid "reply to specified mailing list" -msgstr "Antworte an Mailing-Listen" - -#: ../keymap_alldefs.h:101 -msgid "execute a macro" -msgstr "Führe Makro aus" - -#: ../keymap_alldefs.h:102 -msgid "compose a new mail message" -msgstr "Erzeuge neue Nachricht" - -#: ../keymap_alldefs.h:103 -msgid "break the thread in two" -msgstr "Zerlege Diskussionsfaden in zwei" - -#: ../keymap_alldefs.h:104 -msgid "open a different folder" -msgstr "Öffne eine andere Mailbox" - -#: ../keymap_alldefs.h:105 -msgid "open a different folder in read only mode" -msgstr "Öffne eine andere Mailbox im Nur-Lesen-Modus" - -#: ../keymap_alldefs.h:106 -msgid "clear a status flag from a message" -msgstr "Entferne einen Status-Indikator" - -#: ../keymap_alldefs.h:107 -msgid "delete messages matching a pattern" -msgstr "Lösche Nachrichten nach Muster" - -#: ../keymap_alldefs.h:108 -msgid "force retrieval of mail from IMAP server" -msgstr "Hole Nachrichten vom IMAP-Server" - -#: ../keymap_alldefs.h:109 -msgid "logout from all IMAP servers" -msgstr "Bei allen IMAP-Servern abgemeldet" - -#: ../keymap_alldefs.h:110 -msgid "retrieve mail from POP server" -msgstr "Hole Nachrichten vom POP-Server" - -#: ../keymap_alldefs.h:111 -msgid "move to the first message" -msgstr "Springe zu erster Nachricht" - -#: ../keymap_alldefs.h:112 -msgid "move to the last message" -msgstr "Springe zu letzter Nachricht" - -#: ../keymap_alldefs.h:113 -msgid "show only messages matching a pattern" -msgstr "Wähle anzuzeigende Nachrichten mit Muster aus" - -#: ../keymap_alldefs.h:114 -msgid "link tagged message to the current one" -msgstr "Markierte Nachrichten mit der aktuellen verbinden" - -#: ../keymap_alldefs.h:115 -msgid "open next mailbox with new mail" -msgstr "Öffne nächste Mailbox mit neuen Nachrichten" - -#: ../keymap_alldefs.h:116 -msgid "jump to the next new message" -msgstr "Springe zur nächsten neuen Nachricht" - -#: ../keymap_alldefs.h:117 -msgid "jump to the next new or unread message" -msgstr "Springe zur nächsten neuen oder ungelesenen Nachricht" - -#: ../keymap_alldefs.h:118 -msgid "jump to the next subthread" -msgstr "Springe zum nächsten Diskussionsfadenteil" - -#: ../keymap_alldefs.h:119 -msgid "jump to the next thread" -msgstr "Springe zum nächsten Diskussionsfaden" - -#: ../keymap_alldefs.h:120 -msgid "move to the next undeleted message" -msgstr "Springe zur nächsten ungelöschten Nachricht" - -#: ../keymap_alldefs.h:121 -msgid "jump to the next unread message" -msgstr "Springe zur nächsten ungelesenen Nachricht" - -#: ../keymap_alldefs.h:122 -msgid "jump to parent message in thread" -msgstr "Springe zur Bezugsnachricht im Diskussionsfaden" - -#: ../keymap_alldefs.h:123 -msgid "jump to previous thread" -msgstr "Springe zum vorigen Diskussionsfaden" - -#: ../keymap_alldefs.h:124 -msgid "jump to previous subthread" -msgstr "Springe zum vorigen Diskussionsfadenteil" - -#: ../keymap_alldefs.h:125 -msgid "move to the previous undeleted message" -msgstr "Springe zur vorigen ungelöschten Nachricht" - -#: ../keymap_alldefs.h:126 -msgid "jump to the previous new message" -msgstr "Springe zur vorigen neuen Nachricht" - -#: ../keymap_alldefs.h:127 -msgid "jump to the previous new or unread message" -msgstr "Springe zur vorigen neuen oder ungelesenen Nachricht" - -#: ../keymap_alldefs.h:128 -msgid "jump to the previous unread message" -msgstr "Springe zur vorigen ungelesenen Nachricht" - -#: ../keymap_alldefs.h:129 -msgid "mark the current thread as read" -msgstr "Markiere den aktuellen Diskussionsfaden als gelesen" - -#: ../keymap_alldefs.h:130 -msgid "mark the current subthread as read" -msgstr "Markiere den aktuellen Diskussionsfadenteil als gelesen" - -#: ../keymap_alldefs.h:131 -msgid "set a status flag on a message" -msgstr "Setze Statusindikator einer Nachricht" - -#: ../keymap_alldefs.h:132 -msgid "save changes to mailbox" -msgstr "Speichere Änderungen in Mailbox" - -#: ../keymap_alldefs.h:133 -msgid "tag messages matching a pattern" -msgstr "Markiere Nachrichten nach Muster" - -#: ../keymap_alldefs.h:134 -msgid "undelete messages matching a pattern" -msgstr "entferne Löschmarkierung nach Muster" - -#: ../keymap_alldefs.h:135 -msgid "untag messages matching a pattern" -msgstr "Entferne Markierung nach Muster" - -#: ../keymap_alldefs.h:136 -msgid "move to the middle of the page" -msgstr "Gehe zur Seitenmitte" - -#: ../keymap_alldefs.h:137 -msgid "move to the next entry" -msgstr "Gehe zum nächsten Eintrag" - -#: ../keymap_alldefs.h:138 -msgid "scroll down one line" -msgstr "Gehe eine Zeile nach unten" - -#: ../keymap_alldefs.h:139 -msgid "move to the next page" -msgstr "Gehe zur nächsten Seite" - -#: ../keymap_alldefs.h:140 -msgid "jump to the bottom of the message" -msgstr "Springe zum Ende der Nachricht" - -#: ../keymap_alldefs.h:141 -msgid "toggle display of quoted text" -msgstr "Schalte Anzeige von zitiertem Text ein/aus" - -#: ../keymap_alldefs.h:142 -msgid "skip beyond quoted text" -msgstr "Übergehe zitierten Text" - -#: ../keymap_alldefs.h:143 -msgid "jump to the top of the message" -msgstr "Springe zum Nachrichtenanfang" - -#: ../keymap_alldefs.h:144 -msgid "pipe message/attachment to a shell command" -msgstr "Bearbeite (pipe) Nachricht/Anhang mit Shell-Kommando" - -#: ../keymap_alldefs.h:145 -msgid "move to the previous entry" -msgstr "Gehe zum vorigen Eintrag" - -#: ../keymap_alldefs.h:146 -msgid "scroll up one line" -msgstr "Gehe eine Zeile nach oben" - -#: ../keymap_alldefs.h:147 -msgid "move to the previous page" -msgstr "Gehe zur vorigen Seite" - -#: ../keymap_alldefs.h:148 -msgid "print the current entry" -msgstr "Drucke aktuellen Eintrag" - -#: ../keymap_alldefs.h:149 -msgid "query external program for addresses" -msgstr "Externe Adressenabfrage" - -#: ../keymap_alldefs.h:150 -msgid "append new query results to current results" -msgstr "Hänge neue Abfrageergebnisse an" - -#: ../keymap_alldefs.h:151 -msgid "save changes to mailbox and quit" -msgstr "Speichere Änderungen in Mailbox und beende das Programm" - -#: ../keymap_alldefs.h:152 -msgid "recall a postponed message" -msgstr "Bearbeite eine zurückgestellte Nachricht" - -#: ../keymap_alldefs.h:153 -msgid "clear and redraw the screen" -msgstr "Erzeuge Bildschirmanzeige neu" - -#: ../keymap_alldefs.h:154 -msgid "{internal}" -msgstr "{intern}" - -#: ../keymap_alldefs.h:155 -msgid "rename the current mailbox (IMAP only)" -msgstr "benenne die aktuelle Mailbox um (nur für IMAP)" - -#: ../keymap_alldefs.h:156 -msgid "reply to a message" -msgstr "Beantworte Nachricht" - -#: ../keymap_alldefs.h:157 -msgid "use the current message as a template for a new one" -msgstr "Verwende aktuelle Nachricht als Vorlage für neue Nachricht" - -#: ../keymap_alldefs.h:158 -msgid "save message/attachment to a mailbox/file" -msgstr "Speichere Nachricht/Anhang in Mailbox/Datei" - -#: ../keymap_alldefs.h:159 -msgid "search for a regular expression" -msgstr "Suche nach regulärem Ausdruck" - -#: ../keymap_alldefs.h:160 -msgid "search backwards for a regular expression" -msgstr "Suche rückwärts nach regulärem Ausdruck" - -#: ../keymap_alldefs.h:161 -msgid "search for next match" -msgstr "Suche nächsten Treffer" - -#: ../keymap_alldefs.h:162 -msgid "search for next match in opposite direction" -msgstr "Suche nächsten Treffer in umgekehrter Richtung" - -#: ../keymap_alldefs.h:163 -msgid "toggle search pattern coloring" -msgstr "Schalte Suchtreffer-Hervorhebung ein/aus" - -#: ../keymap_alldefs.h:164 -msgid "invoke a command in a subshell" -msgstr "Rufe Kommando in Shell auf" - -#: ../keymap_alldefs.h:165 -msgid "sort messages" -msgstr "Sortiere Nachrichten" - -#: ../keymap_alldefs.h:166 -msgid "sort messages in reverse order" -msgstr "Sortiere Nachrichten in umgekehrter Reihenfolge" - -#: ../keymap_alldefs.h:167 -msgid "tag the current entry" -msgstr "Markiere aktuellen Eintrag" - -#: ../keymap_alldefs.h:168 -msgid "apply next function to tagged messages" -msgstr "Wende nächste Funktion auf markierte Nachrichten an" - -#: ../keymap_alldefs.h:169 -msgid "apply next function ONLY to tagged messages" -msgstr "Wende nächste Funktion NUR auf markierte Nachrichten an" - -#: ../keymap_alldefs.h:170 -msgid "tag the current subthread" -msgstr "Markiere aktuellen Diskussionsfadenteil" - -#: ../keymap_alldefs.h:171 -msgid "tag the current thread" -msgstr "Markiere aktuellen Diskussionsfaden" - -#: ../keymap_alldefs.h:172 -msgid "toggle a message's 'new' flag" -msgstr "Setze/entferne den \"neu\"-Indikator einer Nachricht" - -#: ../keymap_alldefs.h:173 -msgid "toggle whether the mailbox will be rewritten" -msgstr "Schalte Sichern von Änderungen ein/aus" - -#: ../keymap_alldefs.h:174 -msgid "toggle whether to browse mailboxes or all files" -msgstr "Schalte zwischen Mailboxen und allen Dateien um" - -#: ../keymap_alldefs.h:175 -msgid "move to the top of the page" -msgstr "Springe zum Anfang der Seite" - -#: ../keymap_alldefs.h:176 -msgid "undelete the current entry" -msgstr "Entferne Löschmarkierung vom aktuellen Eintrag" - -#: ../keymap_alldefs.h:177 -msgid "undelete all messages in thread" -msgstr "Entferne Löschmarkierung von allen Nachrichten im Diskussionsfaden" - -#: ../keymap_alldefs.h:178 -msgid "undelete all messages in subthread" -msgstr "Entferne Löschmarkierung von allen Nachrichten im Diskussionsfadenteil" - -#: ../keymap_alldefs.h:179 -msgid "show the Mutt version number and date" -msgstr "Zeige Versionsnummer an" - -#: ../keymap_alldefs.h:180 -msgid "view attachment using mailcap entry if necessary" -msgstr "Zeige Anhang, wenn nötig via Mailcap" - -#: ../keymap_alldefs.h:181 -msgid "show MIME attachments" -msgstr "Zeige MIME-Anhänge" - -#: ../keymap_alldefs.h:182 -msgid "display the keycode for a key press" -msgstr "Zeige Tastatur-Code einer Taste" - -#: ../keymap_alldefs.h:183 -msgid "show currently active limit pattern" -msgstr "Zeige derzeit aktives Begrenzungsmuster" - -#: ../keymap_alldefs.h:184 -msgid "collapse/uncollapse current thread" -msgstr "Kollabiere/expandiere aktuellen Diskussionsfaden" - -#: ../keymap_alldefs.h:185 -msgid "collapse/uncollapse all threads" -msgstr "Kollabiere/expandiere alle Diskussionsfäden" - -#: ../keymap_alldefs.h:186 -msgid "attach a PGP public key" -msgstr "Hänge öffentlichen PGP-Schlüssel an" - -#: ../keymap_alldefs.h:187 -msgid "show PGP options" -msgstr "Zeige PGP-Optionen" - -#: ../keymap_alldefs.h:188 -msgid "mail a PGP public key" -msgstr "Verschicke öffentlichen PGP-Schlüssel" - -#: ../keymap_alldefs.h:189 -msgid "verify a PGP public key" -msgstr "Prüfe öffentlichen PGP-Schlüssel" - -#: ../keymap_alldefs.h:190 -msgid "view the key's user id" -msgstr "Zeige Nutzer-ID zu Schlüssel an" - -#: ../keymap_alldefs.h:191 -msgid "check for classic PGP" -msgstr "Suche nach klassischem PGP" - -#: ../keymap_alldefs.h:192 -msgid "Accept the chain constructed" -msgstr "Akzeptiere die erstellte Kette" - -#: ../keymap_alldefs.h:193 -msgid "Append a remailer to the chain" -msgstr "Hänge einen Remailer an die Kette an" - -#: ../keymap_alldefs.h:194 -msgid "Insert a remailer into the chain" -msgstr "Füge einen Remailer in die Kette ein" - -#: ../keymap_alldefs.h:195 -msgid "Delete a remailer from the chain" -msgstr "Lösche einen Remailer aus der Kette" - -#: ../keymap_alldefs.h:196 -msgid "Select the previous element of the chain" -msgstr "Wähle das vorhergehende Element der Kette aus" - -#: ../keymap_alldefs.h:197 -msgid "Select the next element of the chain" -msgstr "Wähle das nächste Element der Kette aus" - -#: ../keymap_alldefs.h:198 -msgid "send the message through a mixmaster remailer chain" -msgstr "Verschicke die Nachricht über eine Mixmaster Remailer Kette" - -#: ../keymap_alldefs.h:199 -msgid "make decrypted copy and delete" -msgstr "Erzeuge dechiffrierte Kopie und lösche" - -#: ../keymap_alldefs.h:200 -msgid "make decrypted copy" -msgstr "Erzeuge dechiffrierte Kopie" - -#: ../keymap_alldefs.h:201 -msgid "wipe passphrase(s) from memory" -msgstr "Entferne Mantra(s) aus Speicher" - -#: ../keymap_alldefs.h:202 -msgid "extract supported public keys" -msgstr "Extrahiere unterstützte öffentliche Schlüssel" - -#: ../keymap_alldefs.h:203 -msgid "show S/MIME options" -msgstr "Zeige S/MIME Optionen" - -#~ msgid "Clear" -#~ msgstr "Klartext" - -#~ msgid "" -#~ " --\t\ttreat remaining arguments as addr even if starting with a dash\n" -#~ "\t\twhen using -a with multiple filenames using -- is mandatory" -#~ msgstr "" -#~ " --\t\tbehandle folgende Parameter als Adressen, auch wenn sie mit\n" -#~ "\t\teinem Bindestrich beginnen. Bei Verwendung von -a mit mehreren\n" -#~ "\t\tDateinamen ist -- zwingend notwendig" - -#~ msgid "esabifc" -#~ msgstr "vsabikc" diff --git a/mutt.changes b/mutt.changes index fd61517..e5b1539 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 28 16:27:15 UTC 2017 - werner@suse.de + +- Move some extend documentation about mutt in a seperate package +- Remove mutt-1.5.21.de.po as mutt now have a de.po as well + ------------------------------------------------------------------- Fri Apr 28 14:37:01 UTC 2017 - werner@suse.de diff --git a/mutt.spec b/mutt.spec index 540bafd..9cde67a 100644 --- a/mutt.spec +++ b/mutt.spec @@ -61,6 +61,7 @@ BuildRequires: gpgme-devel Url: http://www.mutt.org Provides: muttssl Obsoletes: muttssl +Recommends: mutt-doc Recommends: smtp_daemon Recommends: urlscan Recommends: urlview @@ -91,7 +92,6 @@ Source3: mutt.png Source4: mutt.desktop Source5: skel.muttrc Source6: krb5-config -Source7: mutt-1.5.21.de.po Source9: mutt.mailcap Patch: %name-%version.dif # http://www.spinnaker.de/mutt/compressed/ @@ -119,6 +119,16 @@ A very powerful mail user agent. It supports (among other nice things) highlighting, threading, and PGP. It takes some time to get used to, however. +%package doc +Summary: Additional Documentation about Mutt +Group: Documentation/Other +Requires: %{name} = %{version} +BuildArch: noarch + +%description doc +Some extend documentation about mutt together with muttrc examples +for different environments and requirements + %prep ln -sf neomutt-neomutt-%neo mutt-%version %setup -q -D -n mutt-%version @@ -213,7 +223,6 @@ chmod 755 $KRB5CFGPATH --enable-nntp \ --with-idn make -C doc clean -#make -C po update-po #cp %{S:7} po/de.po make make -C doc @@ -260,7 +269,7 @@ rm -vf %{buildroot}%{_docdir}/%name/manual.txt %files -f %name.lang %defattr(-,root,root) -%doc doc/manual.txt.gz COPYRIGHT README* NEWS TODO +%doc doc/manual.txt.gz %config(noreplace) %{_sysconfdir}/skel/.muttrc %config(noreplace) %{_sysconfdir}/Muttrc %{_bindir}/mutt @@ -278,6 +287,13 @@ rm -vf %{buildroot}%{_docdir}/%name/manual.txt %{_mandir}/man5/mbox_mutt.5.gz %dir %{_datadir}/mutt/ %{_datadir}/mutt/mailcap + +%files doc +%defattr(-,root,root) +%doc %{_docdir}/%name/COPYRIGHT +%doc %{_docdir}/%name/README* +%doc %{_docdir}/%name/NEWS +%doc %{_docdir}/%name/TODO %doc %{_docdir}/%name/ChangeLog %doc %{_docdir}/%name/ChangeLog.neomutt %doc %{_docdir}/%name/LICENSE.md From c24651cda8a90f54970502f57ea73076e8a7b8c9 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 28 Apr 2017 16:38:43 +0000 Subject: [PATCH 03/14] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=156 --- neomutt-distro-20160826.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 neomutt-distro-20160826.tar.gz diff --git a/neomutt-distro-20160826.tar.gz b/neomutt-distro-20160826.tar.gz deleted file mode 100644 index 82e2e81..0000000 --- a/neomutt-distro-20160826.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3580dc9c8b8b2247ac77f7a1ab9eba01974def8de6e7adfb0eacf2ccb7bb4aca -size 559148 From f12861403c64158a58443957326cba456656cdc4 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Sat, 29 Apr 2017 15:50:29 +0000 Subject: [PATCH 04/14] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=157 --- mutt.changes | 5 +++++ mutt.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/mutt.changes b/mutt.changes index e5b1539..2b81c63 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Apr 29 15:50:04 UTC 2017 - werner@suse.de + +- Provide a hint on the package split + ------------------------------------------------------------------- Fri Apr 28 16:27:15 UTC 2017 - werner@suse.de diff --git a/mutt.spec b/mutt.spec index 9cde67a..3fb8d7d 100644 --- a/mutt.spec +++ b/mutt.spec @@ -123,6 +123,7 @@ however. Summary: Additional Documentation about Mutt Group: Documentation/Other Requires: %{name} = %{version} +Provides: mutt:%{_docdir}/%name/COPYRIGHT BuildArch: noarch %description doc From e2bbdc6baca07154fb2d85c569c3699ce7fc0ffa Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Sat, 29 Apr 2017 15:52:28 +0000 Subject: [PATCH 05/14] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=158 --- mutt.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mutt.spec b/mutt.spec index 3fb8d7d..07905ad 100644 --- a/mutt.spec +++ b/mutt.spec @@ -224,7 +224,6 @@ chmod 755 $KRB5CFGPATH --enable-nntp \ --with-idn make -C doc clean -#cp %{S:7} po/de.po make make -C doc From 0d4b7eb668e8130ee5d0e05c8c0afc783581a2a8 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Sat, 29 Apr 2017 16:03:46 +0000 Subject: [PATCH 06/14] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=159 --- mutt.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mutt.spec b/mutt.spec index 07905ad..50693e2 100644 --- a/mutt.spec +++ b/mutt.spec @@ -256,6 +256,7 @@ install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/ install -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/skel/.muttrc install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/%name/mailcap rm -vf %{buildroot}%{_docdir}/%name/manual.txt +install -D -m 644 doc/manual.txt.gz %{buildroot}%{_docdir}/%name/ %suse_update_desktop_file mutt %if 0%{?suse_version} >= 1140 @@ -269,7 +270,6 @@ rm -vf %{buildroot}%{_docdir}/%name/manual.txt %files -f %name.lang %defattr(-,root,root) -%doc doc/manual.txt.gz %config(noreplace) %{_sysconfdir}/skel/.muttrc %config(noreplace) %{_sysconfdir}/Muttrc %{_bindir}/mutt @@ -287,6 +287,8 @@ rm -vf %{buildroot}%{_docdir}/%name/manual.txt %{_mandir}/man5/mbox_mutt.5.gz %dir %{_datadir}/mutt/ %{_datadir}/mutt/mailcap +%dir %doc %{_docdir}/%name/ +%doc %{_docdir}/%name/manual.txt.gz %files doc %defattr(-,root,root) From 6389548096998f06aa5cd441d96b78c2aff5d1ba Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Sat, 29 Apr 2017 16:16:09 +0000 Subject: [PATCH 07/14] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=160 --- mutt.changes | 5 +++++ mutt.spec | 22 +++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/mutt.changes b/mutt.changes index 2b81c63..b392332 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Apr 29 16:14:43 UTC 2017 - werner@suse.de + +- Yet an other package split: now there is a mutt-lang + ------------------------------------------------------------------- Sat Apr 29 15:50:04 UTC 2017 - werner@suse.de diff --git a/mutt.spec b/mutt.spec index 50693e2..9c0c978 100644 --- a/mutt.spec +++ b/mutt.spec @@ -62,6 +62,7 @@ Url: http://www.mutt.org Provides: muttssl Obsoletes: muttssl Recommends: mutt-doc +Recommends: mutt-lang Recommends: smtp_daemon Recommends: urlscan Recommends: urlview @@ -123,12 +124,23 @@ however. Summary: Additional Documentation about Mutt Group: Documentation/Other Requires: %{name} = %{version} -Provides: mutt:%{_docdir}/%name/COPYRIGHT +Provides: %{name}:%{_docdir}/%name/COPYRIGHT BuildArch: noarch %description doc Some extend documentation about mutt together with muttrc examples -for different environments and requirements +for different environments and requirements. + +%package lang +Summary: Languages for Mutt +Group: System/Localizamutttion +Provides: mutt:/usr/share/locale/en_GB/LC_MESSAGES/mutt.mo +Requires: %{name} = %{version} +Provides: %{name}:%{_docdir}/%name/COPYRIGHT +BuildArch: noarch + +%description lang +Provides translations to the package mutt. %prep ln -sf neomutt-neomutt-%neo mutt-%version @@ -257,6 +269,7 @@ install -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/skel/.muttrc install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/%name/mailcap rm -vf %{buildroot}%{_docdir}/%name/manual.txt install -D -m 644 doc/manual.txt.gz %{buildroot}%{_docdir}/%name/ +chmod a-x %{buildroot}%{_docdir}/%name/keybase/*.sh %suse_update_desktop_file mutt %if 0%{?suse_version} >= 1140 @@ -268,7 +281,7 @@ install -D -m 644 doc/manual.txt.gz %{buildroot}%{_docdir}/%name/ %mime_database_postun %endif -%files -f %name.lang +%files %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/skel/.muttrc %config(noreplace) %{_sysconfdir}/Muttrc @@ -317,4 +330,7 @@ install -D -m 644 doc/manual.txt.gz %{buildroot}%{_docdir}/%name/ %dir %doc %{_docdir}/%name/vim-keys/ %doc %{_docdir}/%name/vim-keys/* +%files lang -f %name.lang +%defattr(-,root,root) + %changelog From 753e11f10fe4ec5e2df4bbb64299c903ae3049a4 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 1 May 2017 15:42:33 +0000 Subject: [PATCH 08/14] Accepting request 492183 from home:bmwiedemann:branches:server:mail call gzip -n to make build more reproducible OBS-URL: https://build.opensuse.org/request/show/492183 OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=161 --- mutt.changes | 5 +++++ mutt.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mutt.changes b/mutt.changes index b392332..0e61389 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Apr 30 05:03:43 UTC 2017 - bwiedemann@suse.com + +- call gzip -n to make build more reproducible + ------------------------------------------------------------------- Sat Apr 29 16:14:43 UTC 2017 - werner@suse.de diff --git a/mutt.spec b/mutt.spec index 9c0c978..9d7788c 100644 --- a/mutt.spec +++ b/mutt.spec @@ -242,7 +242,7 @@ make -C doc %install make install DESTDIR=%{buildroot} install -m 755 %{S:1} %{buildroot}%{_bindir} -gzip -9 doc/manu*.txt +gzip -n -9 doc/manu*.txt rm -f contrib/Makefile* # datadir not automatically created: mkdir -p %{buildroot}%{_datadir}/mutt From e97becb1152e9f446ee140b205c329cc9832c890 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 1 May 2017 15:49:59 +0000 Subject: [PATCH 09/14] Add request of thorsten Behrens OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=162 --- mutt.changes | 11 +++++++++++ mutt.spec | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/mutt.changes b/mutt.changes index 0e61389..dbc6aaf 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Apr 30 23:32:51 UTC 2017 - thorsten.behrens@cib.de + +- Remove warning + +------------------------------------------------------------------- +Sun Apr 30 23:26:06 UTC 2017 - thorsten.behrens@cib.de + +- Make header cache work again, using TokyoCabinet as backend +- Remove now-obsolete configure parameters + ------------------------------------------------------------------- Sun Apr 30 05:03:43 UTC 2017 - bwiedemann@suse.com diff --git a/mutt.spec b/mutt.spec index 9d7788c..3ad147f 100644 --- a/mutt.spec +++ b/mutt.spec @@ -39,6 +39,7 @@ BuildRequires: libgnutls-devel BuildRequires: libgpg-error-devel BuildRequires: libidn-devel BuildRequires: libopenssl-devel +BuildRequires: libtokyocabinet-devel BuildRequires: libxml2 BuildRequires: libxslt BuildRequires: lua-devel @@ -82,7 +83,7 @@ Summary: Mail Program License: GPL-2.0+ Group: Productivity/Networking/Email/Clients # ftp://ftp.mutt.org/mutt/devel/ -# Source0: https://bitbucket.org/mutt/mutt/downloads/%name-%version.tar.gz +# Source0: https://bitbucket.org/mutt/mutt/downloads/%%name-%%version.tar.gz # Switch over to neomutt tar ball which is based on original mutt # http://www.neomutt.org/ ### https://github.com/neomutt/neomutt/archive/neomutt-20170421.tar.gz @@ -223,14 +224,13 @@ chmod 755 $KRB5CFGPATH %if 0%{?is_opensuse} --enable-notmuch \ %endif - --enable-hcache \ --disable-external-dotlock \ + --with-tokyocabinet \ --with-ssl=%{_prefix} \ --with-sasl=%{_prefix} \ --with-gss=%{_prefix} \ --with-gnutls=%{_prefix} \ --with-curses=%{_prefix} \ - --with-regex \ --enable-smtp \ --enable-lua \ --enable-nntp \ From 3b9e29f213370ac7892c8ae777bda66dc4e6ab41 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 1 May 2017 16:08:13 +0000 Subject: [PATCH 10/14] Switch form TokyoCabinet over to KyotoCabinet OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=163 --- mutt.changes | 5 +++++ mutt.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mutt.changes b/mutt.changes index dbc6aaf..f57fca7 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 1 16:06:58 UTC 2017 - werner@suse.de + +- Switch form TokyoCabinet over to KyotoCabinet + ------------------------------------------------------------------- Sun Apr 30 23:32:51 UTC 2017 - thorsten.behrens@cib.de diff --git a/mutt.spec b/mutt.spec index 3ad147f..ce68dea 100644 --- a/mutt.spec +++ b/mutt.spec @@ -38,8 +38,8 @@ BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel BuildRequires: libgpg-error-devel BuildRequires: libidn-devel +BuildRequires: libkyotocabinet-devel BuildRequires: libopenssl-devel -BuildRequires: libtokyocabinet-devel BuildRequires: libxml2 BuildRequires: libxslt BuildRequires: lua-devel @@ -225,7 +225,7 @@ chmod 755 $KRB5CFGPATH --enable-notmuch \ %endif --disable-external-dotlock \ - --with-tokyocabinet \ + --with-kyotocabinet \ --with-ssl=%{_prefix} \ --with-sasl=%{_prefix} \ --with-gss=%{_prefix} \ From 17cbbe14cec7749b663eeb7bca309978e4792c9c Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 3 May 2017 09:30:37 +0000 Subject: [PATCH 11/14] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=164 --- mutt.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mutt.spec b/mutt.spec index ce68dea..833ff7d 100644 --- a/mutt.spec +++ b/mutt.spec @@ -134,7 +134,7 @@ for different environments and requirements. %package lang Summary: Languages for Mutt -Group: System/Localizamutttion +Group: System/Localization Provides: mutt:/usr/share/locale/en_GB/LC_MESSAGES/mutt.mo Requires: %{name} = %{version} Provides: %{name}:%{_docdir}/%name/COPYRIGHT @@ -225,6 +225,7 @@ chmod 755 $KRB5CFGPATH --enable-notmuch \ %endif --disable-external-dotlock \ + --with-gdbm \ --with-kyotocabinet \ --with-ssl=%{_prefix} \ --with-sasl=%{_prefix} \ From 4d72695455d083a46404b3fd1eb65a3c7332f254 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 10 May 2017 13:27:40 +0000 Subject: [PATCH 12/14] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=165 --- mutt-1.8.2-from4crypt.diff | 40 ++++++++++++++++++++++++++++++++++++++ mutt.changes | 5 +++++ mutt.spec | 3 +++ 3 files changed, 48 insertions(+) create mode 100644 mutt-1.8.2-from4crypt.diff diff --git a/mutt-1.8.2-from4crypt.diff b/mutt-1.8.2-from4crypt.diff new file mode 100644 index 0000000..c5f4aca --- /dev/null +++ b/mutt-1.8.2-from4crypt.diff @@ -0,0 +1,40 @@ +From 67061b07d357086d1a0526a3c53adfa32f72929f Mon Sep 17 00:00:00 2001 +From: Werner Fink +Subject: Fix crash if no from is set or found + +On multi folder mailbox setup and without a set +'From:' line in ~/.muttrc the mutt crash with SIGSEGV +on a NULL pointer at msg->env->from + +Signed-off-by: Werner Fink +--- + crypt.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +--- a/crypt.c ++++ b/crypt.c 2017-05-10 09:02:42.654128156 +0000 +@@ -179,12 +179,22 @@ int mutt_protect(HEADER *msg, char *keyl + + if (option(OPTCRYPTUSEPKA) && (msg->security & SIGN)) + { ++ const char *mailbox; ++ ADDRESS *from = msg->env->from; ++ ++ if (!from) ++ from = mutt_default_from(); ++ ++ mailbox = from->mailbox; ++ if (!mailbox && EnvFrom) ++ mailbox = EnvFrom->mailbox; ++ + /* Set sender (necessary for e.g. PKA). */ + + if ((WithCrypto & APPLICATION_SMIME) && (msg->security & APPLICATION_SMIME)) +- crypt_smime_set_sender(msg->env->from->mailbox); ++ crypt_smime_set_sender(mailbox); + else if ((WithCrypto & APPLICATION_PGP) && (msg->security & APPLICATION_PGP)) +- crypt_pgp_set_sender(msg->env->from->mailbox); ++ crypt_pgp_set_sender(mailbox); + } + + if (msg->security & SIGN) diff --git a/mutt.changes b/mutt.changes index f57fca7..c118715 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 10 08:55:37 UTC 2017 - werner@suse.de + +- Fix crash in crypt.c if no From is found or set + ------------------------------------------------------------------- Mon May 1 16:06:58 UTC 2017 - werner@suse.de diff --git a/mutt.spec b/mutt.spec index 833ff7d..3c5ef4b 100644 --- a/mutt.spec +++ b/mutt.spec @@ -113,6 +113,8 @@ Patch16: mutt-1.5.23-carriage-return.path Patch18: mutt-1.5.21-mailcap.diff # PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup() Patch19: bsc907453-CVE-2014-9116-jessie.patch +# PATCH-FIX-SUSE: Fix crash in crypt routines if no from is set or found +Patch20: mutt-1.8.2-from4crypt.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -158,6 +160,7 @@ ln -sf neomutt-neomutt-%neo mutt-%version %patch16 -p0 -b .crlf %patch18 -p0 -b .mailcap %patch19 -p0 -b .cvw2014.9116 +%patch20 -p0 -b .from4crypt rm -vf README*.orig rm -vf PATCHES*.orig From b465cf7349460053b771b721b3b12433b37a5d1d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 10 May 2017 13:31:12 +0000 Subject: [PATCH 13/14] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=166 --- mutt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mutt.spec b/mutt.spec index 3c5ef4b..1b08381 100644 --- a/mutt.spec +++ b/mutt.spec @@ -160,7 +160,7 @@ ln -sf neomutt-neomutt-%neo mutt-%version %patch16 -p0 -b .crlf %patch18 -p0 -b .mailcap %patch19 -p0 -b .cvw2014.9116 -%patch20 -p0 -b .from4crypt +%patch20 -p1 -b .from4crypt rm -vf README*.orig rm -vf PATCHES*.orig From bef692bbd0ca45da680594f8f1ac26234529a109 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 10 May 2017 13:36:08 +0000 Subject: [PATCH 14/14] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=167 --- mutt.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mutt.changes b/mutt.changes index c118715..23548cf 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Wed May 10 08:55:37 UTC 2017 - werner@suse.de -- Fix crash in crypt.c if no From is found or set +- Add patch mutt-1.8.2-from4crypt.diff + to fix crash in crypt.c if no From is found or set ------------------------------------------------------------------- Mon May 1 16:06:58 UTC 2017 - werner@suse.de