Bug#1052070: bookworm-pu: package mutt/2.2.12-0.1~deb12u1
On 2023-09-16 23:30:44 [+0200], To submit@bugs.debian.org wrote:
forgot to attach the debdiff. Here it comes…
Sebastian
diff -Nru mutt-2.2.9/background.c mutt-2.2.12/background.c
--- mutt-2.2.9/background.c 2022-11-04 21:31:45.000000000 +0100
+++ mutt-2.2.12/background.c 2023-08-18 05:03:18.000000000 +0200
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1996-2000,2013 Michael R. Elkins <me@mutt.org>
- * Copyright (C) 2020-2021 Kevin J. McCarthy <kevin@8t8.us>
+ * Copyright (C) 2020-2022 Kevin J. McCarthy <kevin@8t8.us>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -Nru mutt-2.2.9/base64.c mutt-2.2.12/base64.c
--- mutt-2.2.9/base64.c 2022-05-11 18:57:07.000000000 +0200
+++ mutt-2.2.12/base64.c 2023-08-18 05:03:18.000000000 +0200
@@ -56,16 +56,15 @@
mutt_buffer_fix_dptr (out);
}
-/* raw bytes to null-terminated base 64 string */
-void mutt_to_base64 (unsigned char *out, const unsigned char *in, size_t len,
- size_t olen)
+static void to_base64 (unsigned char *out, const unsigned char *in, size_t len,
+ size_t olen, const char *dict)
{
while (len >= 3 && olen > 4)
{
- *out++ = B64Chars[in[0] >> 2];
- *out++ = B64Chars[((in[0] << 4) & 0x30) | (in[1] >> 4)];
- *out++ = B64Chars[((in[1] << 2) & 0x3c) | (in[2] >> 6)];
- *out++ = B64Chars[in[2] & 0x3f];
+ *out++ = dict[in[0] >> 2];
+ *out++ = dict[((in[0] << 4) & 0x30) | (in[1] >> 4)];
+ *out++ = dict[((in[1] << 2) & 0x3c) | (in[2] >> 6)];
+ *out++ = dict[in[2] & 0x3f];
olen -= 4;
len -= 3;
in += 3;
@@ -76,15 +75,29 @@
{
unsigned char fragment;
- *out++ = B64Chars[in[0] >> 2];
+ *out++ = dict[in[0] >> 2];
fragment = (in[0] << 4) & 0x30;
if (len > 1)
fragment |= in[1] >> 4;
- *out++ = B64Chars[fragment];
- *out++ = (len < 2) ? '=' : B64Chars[(in[1] << 2) & 0x3c];
+ *out++ = dict[fragment];
+ *out++ = (len < 2) ? '=' : dict[(in[1] << 2) & 0x3c];
*out++ = '=';
}
*out = '\0';
+
+}
+
+/* raw bytes to null-terminated base 64 string */
+void mutt_to_base64 (unsigned char *out, const unsigned char *in, size_t len,
+ size_t olen)
+{
+ to_base64 (out, in, len, olen, B64Chars);
+}
+
+void mutt_to_base64_safeurl (unsigned char *out, const unsigned char *in,
+ size_t len, size_t olen)
+{
+ to_base64 (out, in, len, olen, B64Chars_urlsafe);
}
int mutt_buffer_from_base64 (BUFFER *out, const char *in)
diff -Nru mutt-2.2.9/buffy.c mutt-2.2.12/buffy.c
--- mutt-2.2.9/buffy.c 2022-05-11 18:57:07.000000000 +0200
+++ mutt-2.2.12/buffy.c 2023-08-18 05:03:18.000000000 +0200
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1996-2000,2010,2013 Michael R. Elkins <me@mutt.org>
- * Copyright (C) 2016-2017,2020-2021 Kevin J. McCarthy <kevin@8t8.us>
+ * Copyright (C) 2016-2017,2020-2022 Kevin J. McCarthy <kevin@8t8.us>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -Nru mutt-2.2.9/ChangeLog mutt-2.2.12/ChangeLog
--- mutt-2.2.9/ChangeLog 2022-11-12 21:47:26.000000000 +0100
+++ mutt-2.2.12/ChangeLog 2023-09-09 08:43:27.000000000 +0200
@@ -1,3 +1,374 @@
+2023-09-09 14:42:14 +0800 Kevin McCarthy <kevin@8t8.us> (6a155b49)
+
+ * Update UPDATING file for 2.2.12 release.
+
+M UPDATING
+
+2023-09-03 14:11:48 +0800 Kevin McCarthy <kevin@8t8.us> (a4752eb0)
+
+ * Fix write_one_header() illegal header check.
+
+ This is another crash caused by the rfc2047 decoding bug fixed in the
+ second prior commit.
+
+ In this case, an empty header line followed by a header line starting
+ with ":", would result in t==end.
+
+ The mutt_substrdup() further below would go very badly at that point,
+ with t >= end+1. This could result in either a memcpy onto NULL or a
+ huge malloc call.
+
+ Thanks to Chenyuan Mi (@morningbread) for giving a working example
+ draft message of the rfc2047 decoding flaw. This allowed me, with
+ further testing, to discover this additional crash bug.
+
+M sendlib.c
+
+2023-09-04 12:50:07 +0800 Kevin McCarthy <kevin@8t8.us> (4cc3128a)
+
+ * Check for NULL userhdrs.
+
+ When composing an email, miscellaneous extra headers are stored in a
+ userhdrs list. Mutt first checks to ensure each header contains at
+ least a colon character, passes the entire userhdr field (name, colon,
+ and body) to the rfc2047 decoder, and safe_strdup()'s the result on
+ the userhdrs list. An empty result would from the decode would result
+ in a NULL headers being added to list.
+
+ The previous commit removed the possibility of the decoded header
+ field being empty, but it's prudent to add a check to the strchr
+ calls, in case there is another unexpected bug resulting in one.
+
+ Thanks to Chenyuan Mi (@morningbread) for discovering the two strchr
+ crashes, giving a working example draft message, and providing the
+ stack traces for the two NULL derefences.
+
+M sendlib.c
+
+2023-09-03 12:22:01 +0800 Kevin McCarthy <kevin@8t8.us> (452ee330)
+
+ * Fix rfc2047 base64 decoding to abort on illegal characters.
+
+ For some reason, the rfc2047 base64 decoder ignored illegal
+ characters, instead of aborting. This seems innocuous, but in fact
+ leads to at least three crash-bugs elsewhere in Mutt.
+
+ These stem from Mutt, in some cases, passing an entire header
+ field (name, colon, and body) to the rfc2047 decoder. (It is
+ technically incorrect to do so, by the way, but is beyond scope for
+ these fixes in stable). Mutt then assumes the result can't be empty
+ because of a previous check that the header contains at least a colon.
+
+ This commit takes care of the source of the crashes, by aborting the
+ rfc2047 decode. The following two commits add protective fixes to the
+ specific crash points.
+
+ Thanks to Chenyuan Mi (@morningbread) for discovering the strchr
+ crashes, giving a working example draft message, and providing the
+ stack traces for the two NULL derefences.
+
+M rfc2047.c
+
+2023-08-23 15:40:19 +0800 Kevin McCarthy <kevin@8t8.us> (7eb9c18f)
+
+ * Add a documentation note that aliases are case insensitive.
+
+ It's very old behavior, but doesn't seem to be documented anywhere.
+
+ Thanks to Charles for pointing that out.
+
+M doc/manual.xml.head
+
+2023-08-18 11:17:23 +0800 Kevin McCarthy <kevin@8t8.us> (6b538297)
+
+ * automatic post-release commit for mutt-2.2.11
+
+M ChangeLog
+M VERSION
+
+2023-08-18 11:07:42 +0800 Kevin McCarthy <kevin@8t8.us> (d619496e)
+
+ * Update UPDATING file for 2.2.11 release.
+
+M UPDATING
+
+2023-08-15 12:34:05 +0800 Kevin McCarthy <kevin@8t8.us> (d52c6115)
+
+ * Fix GPGME build failure on MacOS.
+
+ Commit 012981e8 (in release 2.2.9) updated the GPGME autoconf files,
+ to fix a build issue with newer GPGME releases.
+
+ Unfortunatley that caused a build issue for hosts where the gpg-error
+ header files aren't in the include path. The newer autoconf file
+ expect GPG_ERROR_CFLAGS to be added to the list of flags for the
+ compiler.
+
+ Thanks to Will Yardley for reporting the issue and quickly testing the
+ proposed fix.
+
+M Makefile.am
+
+2023-06-05 18:53:55 +0800 TAKAHASHI Tamotsu <ttakah@lapis.plala.or.jp> (a5423c40)
+
+ * Updated Japanese translation.
+
+M po/ja.po
+
+2023-04-14 15:57:07 -0700 Kevin McCarthy <kevin@8t8.us> (50954c4a)
+
+ * Fix <collapse-all> behavior for sort=reverse-threads.
+
+ When uncollapsing, _mutt_traverse_thread() returns the virtual number
+ of the root message in the thread. <collapse-thread> directly sets
+ menu->current to this value to cause the cursor to be on the *first*
+ message of the thread (which isn't the same as the root message when
+ sort=reverse-threads). <collapse-all> finds the corresponding message
+ by searching for it after re-indexing.
+
+ However, when collapsing, _mutt_traverse_thread() had code to try and
+ find the *first* message in the thread and return that virtual number.
+ <collapse-thread> then did the same trick, because the old first
+ message is now the new root message for sort=reverse-threads.
+
+ However, that cleverness caused a bug for <collapse-all> - it can't
+ use that virtual number directly, and it can't "find" the message at
+ the index after reindexing.
+
+ To fix this, remove the cleverness from _mutt_traverse_thread() when
+ collapsing. Return the virtual number of the root. Add searching
+ behavior for <collapse-thread> to fix its behavior.
+
+M curs_main.c
+M thread.c
+
+2023-03-25 13:07:19 -0700 Kevin McCarthy <kevin@8t8.us> (e0e92c31)
+
+ * automatic post-release commit for mutt-2.2.10
+
+M ChangeLog
+M VERSION
+
+2023-03-25 13:03:39 -0700 Kevin McCarthy <kevin@8t8.us> (9138232d)
+
+ * Update UPDATING files for 2.2.10 release.
+
+M UPDATING
+
+2023-03-13 18:24:31 -0700 Kevin McCarthy <kevin@8t8.us> (33f8b7ce)
+
+ * Update copyright notices.
+
+ This is generated from the copyright-updater script, with manual
+ updates for the main.c and documentation, and po files.
+
+M COPYRIGHT
+M background.c
+M buffy.c
+M doc/manual.xml.head
+M doc/mutt.man
+M main.c
+M mutt_sasl_gnu.c
+M po/bg.po
+M po/ca.po
+M po/cs.po
+M po/da.po
+M po/de.po
+M po/el.po
+M po/eo.po
+M po/es.po
+M po/et.po
+M po/eu.po
+M po/fi.po
+M po/fr.po
+M po/ga.po
+M po/gl.po
+M po/hu.po
+M po/id.po
+M po/it.po
+M po/ja.po
+M po/ko.po
+M po/lt.po
+M po/nl.po
+M po/pl.po
+M po/pt_BR.po
+M po/ru.po
+M po/sk.po
+M po/sv.po
+M po/tr.po
+M po/uk.po
+M po/zh_CN.po
+M po/zh_TW.po
+M sidebar.c
+
+2022-11-12 10:02:01 -0800 Kevin McCarthy <kevin@8t8.us> (9f01d4ab)
+
+ * Abort imap_fast_trash() if previously checkpointed.
+
+ We don't want to copy the deleted flag over to the trash folder too.
+
+ I looked into various ways to keep the UID COPY, but they lead to
+ niggling issues with error handling along with handling if the server
+ sends flag updates back to the client.
+
+ So for that (hopefully rare) case, abort the fast trash and just use a
+ regular copy.
+
+M imap/imap.c
+
+2023-03-06 18:55:06 -0800 Kevin McCarthy <kevin@8t8.us> (216dd145)
+
+ * Improve smtp oauth authentication.
+
+ Split XOAUTH2 to use two steps.
+
+ This follows the microsoft.com documentation example for smtp. Since
+ office365 is the main site using XOAUTH2 now, it's better to match
+ their documentation.
+
+ It also matches msmtp's behavior, which probably means somewhere or
+ another needs it that way.
+
+ At the same time, improve response code checking. Mutt was using
+ smtp_get_resp() before, which returns 0 for both a ready and success
+ response code. Make sure it's a success response code when done
+ authenticating.
+
+M smtp.c
+
+2023-03-04 18:33:35 +0100 Sebastian Andrzej Siewior <sebastian@breakpoint.cc> (5df86199)
+
+ * Use base64 URL safe alphabet for message id generation.
+
+ The character '/' from base64 alphabet breaks web redirectors if the
+ message-id from an email is used as part of the URL for redirectors and/
+ or automatic pointers to an email.
+
+ Use the URL safe alphabet from RFC4648 section 5 for message id
+ generation.
+
+ Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+
+M base64.c
+M messageid.c
+M mime.h
+M protos.h
+M sendlib.c
+
+2023-03-04 18:33:34 +0100 Sebastian Andrzej Siewior <sebastian@breakpoint.cc> (cecddeac)
+
+ * base64val: Add support to decode base64 safe URL.
+
+ In the base64 safe URL dictionary the characters '+' and '/' are
+ replaced by '-' and '_'.
+ Add the characters to Index_64 to allow decoding if needed.
+
+ Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+
+M handler.c
+
+2022-12-19 18:53:43 -0800 Cline, Wade <wade.cline@intel.com> (7c4fa478)
+
+ * mutt_oauth2: Print access token request message
+
+ There are cases when using the 'authcode' grant where the authorization
+ request will succeed but the access token request will fail (for
+ example: if the user's web browser and terminal use different proxy
+ settings). The current implementation of the script does not inform
+ the user that the authorization token is being exchanged for an access
+ code, with the result that it can appear that a request has both
+ succeeded (according to the browser) and failed (according to the
+ terminal output) simultaneously. Add a message to inform the user that
+ a second request is being made so there is less potential for confusion.
+
+M contrib/mutt_oauth2.py
+
+2022-12-12 15:05:18 -0800 Kevin McCarthy <kevin@8t8.us> (16d8ad64)
+
+ * Move MuttLisp boolean config note.
+
+ I think it probably makes more sense to be inside the (if) function
+ documentation than (equal).
+
+M doc/manual.xml.head
+
+2022-12-07 15:51:36 -0800 Kevin McCarthy <kevin@8t8.us> (ef2abed2)
+
+ * Fix counters for external maildir 'T' flag changes.
+
+ The maildir_check_mailbox() code was not updating the context deleted
+ and trashed counts in those cases. This could lead to messages marked
+ as deleted, but no action being taken on a mailbox sync/close.
+
+ wip: fix ctx counts for maildir 'T' flags updates.
+
+M mh.c
+
+2022-12-07 12:58:40 -0800 Kevin McCarthy <kevin@8t8.us> (d0faf2d4)
+
+ * Remove reference to $mark_old inside $mail_check_recent.
+
+ There doesn't appear to be any relationship between $mark_old and "new
+ mail" status any more.
+
+ Commit c26c2531 (from 2002) is the most recent commit that talked
+ about reducing the meaning of $mark_old, and may have been the commit
+ to make that separation.
+
+M init.h
+
+2022-12-07 12:53:51 -0800 Kevin McCarthy <kevin@8t8.us> (ba5e0dc2)
+
+ * Add doc note to MuttLisp about boolean config vars.
+
+ They evaluate to "yes" and "no", and so need an explicit comparison to
+ those values when using the equal function.
+
+M doc/manual.xml.head
+
+2022-11-19 13:20:25 -0800 Kevin McCarthy <kevin@8t8.us> (2f35d2fd)
+
+ * Reset header color after mutt_set_flag().
+
+ I partially changed this to lazily update after a thread update in
+ commit c9fa0414, but unfortunately didn't investigate the reason for
+ the color update while setting a flag. Since it was that way, I
+ assumed it was for a purpose.
+
+ However, it turns out there is no need to actively set the header
+ color in that function. Many places in Mutt already simply reset the
+ color values to 0 to invalidate and cause a recheck later.
+
+ Setting the color there so can even be detrimental, if the user has
+ slow 'color index' lines. For example doing a <tag-pattern>~A will
+ cause the color to be computed for the *entire* mailbox. Now, the
+ user ought to not have a slow color index line, but if they do, this
+ causes unnecessary pain.
+
+ Note that the header->color doesn't have an actual "unset" value,
+ which could also help performance. Maybe in the future in master
+ branch.
+
+M flags.c
+M mutt.h
+M protos.h
+M score.c
+
+2020-04-26 10:43:24 -0700 Kevin McCarthy <kevin@8t8.us> (a60b22fe)
+
+ * Filter U+200C in pager.
+
+ "U+200C ZERO WIDTH NON-JOINER" is generating '?' on some systems.
+
+M pager.c
+
+2022-11-12 12:50:23 -0800 Kevin McCarthy <kevin@8t8.us> (00093fd7)
+
+ * automatic post-release commit for mutt-2.2.9
+
+M ChangeLog
+M VERSION
+
2022-11-12 12:44:13 -0800 Kevin McCarthy <kevin@8t8.us> (b40c28ce)
* Update UPDATING file for 2.2.9.
diff -Nru mutt-2.2.9/configure mutt-2.2.12/configure
--- mutt-2.2.9/configure 2022-11-12 21:50:36.000000000 +0100
+++ mutt-2.2.12/configure 2023-09-09 08:45:37.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for mutt 2.2.9.
+# Generated by GNU Autoconf 2.71 for mutt 2.2.12.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -608,8 +608,8 @@
# Identity of this package.
PACKAGE_NAME='mutt'
PACKAGE_TARNAME='mutt'
-PACKAGE_VERSION='2.2.9'
-PACKAGE_STRING='mutt 2.2.9'
+PACKAGE_VERSION='2.2.12'
+PACKAGE_STRING='mutt 2.2.12'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1443,7 +1443,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mutt 2.2.9 to adapt to many kinds of systems.
+\`configure' configures mutt 2.2.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1514,7 +1514,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mutt 2.2.9:";;
+ short | recursive ) echo "Configuration of mutt 2.2.12:";;
esac
cat <<\_ACEOF
@@ -1673,7 +1673,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mutt configure 2.2.9
+mutt configure 2.2.12
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2330,7 +2330,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mutt $as_me 2.2.9, which was
+It was created by mutt $as_me 2.2.12, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3604,7 +3604,7 @@
# Define the identity of the package.
PACKAGE='mutt'
- VERSION='2.2.9'
+ VERSION='2.2.12'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -17239,7 +17239,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mutt $as_me 2.2.9, which was
+This file was extended by mutt $as_me 2.2.12, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17307,7 +17307,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-mutt config.status 2.2.9
+mutt config.status 2.2.12
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff -Nru mutt-2.2.9/contrib/mutt_oauth2.py mutt-2.2.12/contrib/mutt_oauth2.py
--- mutt-2.2.9/contrib/mutt_oauth2.py 2022-05-11 18:57:07.000000000 +0200
+++ mutt-2.2.12/contrib/mutt_oauth2.py 2023-08-18 05:03:18.000000000 +0200
@@ -239,6 +239,7 @@
'code': authcode,
'client_secret': registration['client_secret'],
'code_verifier': verifier})
+ print('Exchanging the authorization code for an access token')
try:
response = urllib.request.urlopen(registration['token_endpoint'],
urllib.parse.urlencode(p).encode())
diff -Nru mutt-2.2.9/COPYRIGHT mutt-2.2.12/COPYRIGHT
--- mutt-2.2.9/COPYRIGHT 2022-05-11 18:57:07.000000000 +0200
+++ mutt-2.2.12/COPYRIGHT 2023-08-18 05:03:18.000000000 +0200
@@ -17,7 +17,7 @@
Copyright (C) 2000-2004 Edmund Grimley Evans <edmundo@rano.org>
Copyright (C) 2000-2019 David Champion <dgc.mutt@c13.us>
Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>
-Copyright (C) 2014-2022 Kevin J. McCarthy <kevin@8t8.us>
+Copyright (C) 2014-2023 Kevin J. McCarthy <kevin@8t8.us>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -Nru mutt-2.2.9/curs_main.c mutt-2.2.12/curs_main.c
--- mutt-2.2.9/curs_main.c 2022-10-23 00:45:20.000000000 +0200
+++ mutt-2.2.12/curs_main.c 2023-09-01 08:32:23.000000000 +0200
@@ -2071,6 +2071,11 @@
if (CURHDR->collapsed)
{
+ /* Note this returns the *old* virtual index of the root message.
+ *
+ * For sort=reverse-threads this trick allows uncollapsing a
+ * single thread to position on the first (not root) message
+ * in the thread */
menu->current = mutt_uncollapse_thread (Context, CURHDR);
mutt_set_virtual (Context);
if (option (OPTUNCOLLAPSEJUMP))
@@ -2078,8 +2083,22 @@
}
else if (option (OPTCOLLAPSEUNREAD) || !UNREAD (CURHDR))
{
- menu->current = mutt_collapse_thread (Context, CURHDR);
+ HEADER *base;
+ int final;
+ /* This also returns the *old* virtual index of the root, but now
+ * we have to find the new position of the root, which isn't
+ * the same for sort=reverse-threads. */
+ final = mutt_collapse_thread (Context, CURHDR);
+ base = Context->hdrs[Context->v2r[final]];
mutt_set_virtual (Context);
+ for (j = 0; j < Context->vcount; j++)
+ {
+ if (Context->hdrs[Context->v2r[j]]->index == base->index)
+ {
+ menu->current = j;
+ break;
+ }
+ }
}
else
{
diff -Nru mutt-2.2.9/debian/changelog mutt-2.2.12/debian/changelog
--- mutt-2.2.9/debian/changelog 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/changelog 2023-09-16 22:48:56.000000000 +0200
@@ -1,3 +1,10 @@
+mutt (2.2.12-0.1~deb12u1) bookworm; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release.
+
+ -- Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Sat, 16 Sep 2023 22:48:56 +0200
+
mutt (2.2.9-1+deb12u1) bookworm-security; urgency=high
* Non-maintainer upload by the Security Team.
diff -Nru mutt-2.2.9/debian/patches/debian-specific/467432-write_bcc.patch mutt-2.2.12/debian/patches/debian-specific/467432-write_bcc.patch
--- mutt-2.2.9/debian/patches/debian-specific/467432-write_bcc.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/debian-specific/467432-write_bcc.patch 2023-09-16 22:48:32.000000000 +0200
@@ -20,17 +20,29 @@
This patch is a slightly modified version of the patch provided by
Stefan Völkel <stefan@bc-bd.org> in the second bug.
---
- headers.c | 2 +-
- init.h | 11 +++--------
- main.c | 2 +-
- protos.h | 2 +-
- send.c | 4 ++--
- sendlib.c | 6 +++---
- 6 files changed, 11 insertions(+), 16 deletions(-)
+ headers.c | 2 +-
+ init.h | 15 +--------------
+ main.c | 2 +-
+ pattern.c | 2 +-
+ protos.h | 2 +-
+ send.c | 4 ++--
+ sendlib.c | 8 ++++----
+ 7 files changed, 11 insertions(+), 24 deletions(-)
+--- a/headers.c
++++ b/headers.c
+@@ -55,7 +55,7 @@ int mutt_edit_headers (const char *edito
+ }
+
+ mutt_env_to_local (sctx->msg->env);
+- mutt_write_rfc822_header (ofp, sctx->msg->env, NULL, NULL, MUTT_WRITE_HEADER_EDITHDRS, 0, 0);
++ mutt_write_rfc822_header (ofp, sctx->msg->env, NULL, NULL, MUTT_WRITE_HEADER_EDITHDRS, 0, 0, 1);
+ fputc ('\n', ofp); /* tie off the header. */
+
+ /* now copy the body of the message. */
--- a/init.h
+++ b/init.h
-@@ -561,9 +561,6 @@
+@@ -561,9 +561,6 @@ struct option_t MuttVars[] = {
** .pp
** When this variable is \fIset\fP, mutt will include Delivered-To headers when
** bouncing messages. Postfix users may wish to \fIunset\fP this variable.
@@ -40,7 +52,7 @@
*/
{ "braille_friendly", DT_BOOL, R_NONE, {.l=OPTBRAILLEFRIENDLY}, {.l=0} },
/*
-@@ -1134,7 +1131,7 @@
+@@ -1134,7 +1131,7 @@ struct option_t MuttVars[] = {
** .pp
** This variable specifies which editor is used by mutt.
** It defaults to the value of the \fC$$$VISUAL\fP, or \fC$$$EDITOR\fP, environment
@@ -49,7 +61,7 @@
** .pp
** The \fC$$editor\fP string may contain a \fI%s\fP escape, which will be replaced by the name
** of the file to be edited. If the \fI%s\fP escape does not appear in \fC$$editor\fP, a
-@@ -1603,9 +1600,6 @@
+@@ -1603,9 +1600,6 @@ struct option_t MuttVars[] = {
** your muttrc.
** .pp
** Also see $$use_domain and $$hidden_host.
@@ -59,7 +71,7 @@
*/
#if defined(HAVE_LIBIDN) || defined(HAVE_LIBIDN2)
{ "idn_decode", DT_BOOL, R_MENU, {.l=OPTIDNDECODE}, {.l=1} },
-@@ -4106,10 +4100,6 @@
+@@ -4103,10 +4097,6 @@ struct option_t MuttVars[] = {
** This is a format string, see the $$smime_decrypt_command command for
** possible \fCprintf(3)\fP-like sequences.
** (S/MIME only)
@@ -70,7 +82,7 @@
*/
#ifdef USE_SMTP
{ "smtp_authenticators", DT_STR, R_NONE, {.p=&SmtpAuthenticators}, {.p=0} },
-@@ -4328,9 +4318,6 @@
+@@ -4325,9 +4315,6 @@ struct option_t MuttVars[] = {
** .ts
** set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
** .te
@@ -80,9 +92,31 @@
*/
# endif /* USE_SSL_GNUTLS */
{ "ssl_client_cert", DT_PATH, R_NONE, {.p=&SslClientCert}, {.p=0} },
+--- a/main.c
++++ b/main.c
+@@ -1294,7 +1294,7 @@ int main (int argc, char **argv, char **
+ mutt_write_rfc822_header (fout, msg->env, msg->content, NULL,
+ MUTT_WRITE_HEADER_POSTPONE, 0,
+ option (OPTCRYPTPROTHDRSREAD) &&
+- mutt_should_hide_protected_subject (msg));
++ mutt_should_hide_protected_subject (msg), 1);
+ if (option (OPTRESUMEEDITEDDRAFTFILES))
+ fprintf (fout, "X-Mutt-Resume-Draft: 1\n");
+ fputc ('\n', fout);
+--- a/pattern.c
++++ b/pattern.c
+@@ -474,7 +474,7 @@ static int msg_search_sendmode (HEADER *
+
+ mutt_write_rfc822_header (fp, h->env, h->content, NULL,
+ MUTT_WRITE_HEADER_POSTPONE,
+- 0, 0);
++ 0, 0, 1);
+ fflush (fp);
+ fseek (fp, 0, SEEK_SET);
+
--- a/protos.h
+++ b/protos.h
-@@ -407,7 +407,7 @@
+@@ -407,7 +407,7 @@ int mutt_write_fcc (const char *path, SE
int mutt_write_mime_body (BODY *, FILE *);
int mutt_write_mime_header (BODY *, FILE *);
int mutt_write_one_header (FILE *fp, const char *tag, const char *value, const char *pfx, int wraplen, int flags);
@@ -91,9 +125,26 @@
void mutt_write_references (LIST *, FILE *, int);
int mutt_yesorno (const char *, int);
int mutt_yesorno_with_help (const char *, int, const char *);
+--- a/send.c
++++ b/send.c
+@@ -1194,12 +1194,12 @@ static int invoke_mta (SEND_CONTEXT *sct
+ #ifdef MIXMASTER
+ mutt_write_rfc822_header (tempfp, msg->env, msg->content, sctx->date_header,
+ MUTT_WRITE_HEADER_NORMAL, msg->chain ? 1 : 0,
+- mutt_should_hide_protected_subject (msg));
++ mutt_should_hide_protected_subject (msg), 0);
+ #endif
+ #ifndef MIXMASTER
+ mutt_write_rfc822_header (tempfp, msg->env, msg->content, sctx->date_header,
+ MUTT_WRITE_HEADER_NORMAL, 0,
+- mutt_should_hide_protected_subject (msg));
++ mutt_should_hide_protected_subject (msg), 0);
+ #endif
+ #ifdef USE_SMTP
+ if (old_write_bcc)
--- a/sendlib.c
+++ b/sendlib.c
-@@ -431,7 +431,7 @@
+@@ -440,7 +440,7 @@ int mutt_write_mime_header (BODY *a, FIL
a->mime_headers)
{
mutt_write_rfc822_header (f, a->mime_headers, NULL, a->mime_headers->date,
@@ -102,7 +153,7 @@
}
/* Do NOT add the terminator here!!! */
-@@ -2265,7 +2265,7 @@
+@@ -2274,7 +2274,7 @@ int mutt_write_one_header (FILE *fp, con
*/
int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, char *date,
mutt_write_header_mode mode, int privacy,
@@ -111,7 +162,7 @@
{
char buffer[LONG_STRING];
char *p, *q;
-@@ -2328,7 +2328,7 @@
+@@ -2337,7 +2337,7 @@ int mutt_write_rfc822_header (FILE *fp,
else if (mode == MUTT_WRITE_HEADER_EDITHDRS)
fputs ("Cc: \n", fp);
@@ -120,7 +171,7 @@
{
if (mode == MUTT_WRITE_HEADER_POSTPONE ||
mode == MUTT_WRITE_HEADER_EDITHDRS ||
-@@ -3166,7 +3166,7 @@
+@@ -3175,7 +3175,7 @@ int mutt_write_fcc (const char *path, SE
post ? MUTT_WRITE_HEADER_POSTPONE : MUTT_WRITE_HEADER_FCC,
0,
option (OPTCRYPTPROTHDRSREAD) &&
@@ -129,53 +180,3 @@
/* (postponment) if this was a reply of some sort, <msgid> contains the
* Message-ID: of message replied to. Save it using a special X-Mutt-
---- a/headers.c
-+++ b/headers.c
-@@ -55,7 +55,7 @@
- }
-
- mutt_env_to_local (sctx->msg->env);
-- mutt_write_rfc822_header (ofp, sctx->msg->env, NULL, NULL, MUTT_WRITE_HEADER_EDITHDRS, 0, 0);
-+ mutt_write_rfc822_header (ofp, sctx->msg->env, NULL, NULL, MUTT_WRITE_HEADER_EDITHDRS, 0, 0, 1);
- fputc ('\n', ofp); /* tie off the header. */
-
- /* now copy the body of the message. */
---- a/main.c
-+++ b/main.c
-@@ -1287,7 +1287,7 @@
- mutt_write_rfc822_header (fout, msg->env, msg->content, NULL,
- MUTT_WRITE_HEADER_POSTPONE, 0,
- option (OPTCRYPTPROTHDRSREAD) &&
-- mutt_should_hide_protected_subject (msg));
-+ mutt_should_hide_protected_subject (msg), 1);
- if (option (OPTRESUMEEDITEDDRAFTFILES))
- fprintf (fout, "X-Mutt-Resume-Draft: 1\n");
- fputc ('\n', fout);
---- a/send.c
-+++ b/send.c
-@@ -1194,12 +1194,12 @@
- #ifdef MIXMASTER
- mutt_write_rfc822_header (tempfp, msg->env, msg->content, sctx->date_header,
- MUTT_WRITE_HEADER_NORMAL, msg->chain ? 1 : 0,
-- mutt_should_hide_protected_subject (msg));
-+ mutt_should_hide_protected_subject (msg), 0);
- #endif
- #ifndef MIXMASTER
- mutt_write_rfc822_header (tempfp, msg->env, msg->content, sctx->date_header,
- MUTT_WRITE_HEADER_NORMAL, 0,
-- mutt_should_hide_protected_subject (msg));
-+ mutt_should_hide_protected_subject (msg), 0);
- #endif
- #ifdef USE_SMTP
- if (old_write_bcc)
---- a/pattern.c
-+++ b/pattern.c
-@@ -474,7 +474,7 @@
-
- mutt_write_rfc822_header (fp, h->env, h->content, NULL,
- MUTT_WRITE_HEADER_POSTPONE,
-- 0, 0);
-+ 0, 0, 1);
- fflush (fp);
- fseek (fp, 0, SEEK_SET);
-
diff -Nru mutt-2.2.9/debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch mutt-2.2.12/debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch
--- mutt-2.2.9/debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch 2023-09-16 22:48:33.000000000 +0200
@@ -1,9 +1,17 @@
Adjust docs to reflect that the default TMPDIR is now /var/tmp, and not /tmp.
This is a follow up to 530584-default-tmpdir-to-var-tmp.patch
+---
+ doc/manual.html | 4 ++--
+ doc/mutt.info | 2 +-
+ doc/mutt.texi | 2 +-
+ doc/muttrc.man | 2 +-
+ doc/reference.html | 4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
--- a/doc/manual.html
+++ b/doc/manual.html
-@@ -9787,7 +9787,7 @@
+@@ -9805,7 +9805,7 @@ Default: (empty)</p></div><p>
This variable allows you to specify where Mutt will place its
temporary files needed for displaying and composing messages. If
this variable is not set, the environment variable <code class="literal">$TMPDIR</code> is
@@ -12,7 +20,7 @@
</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="to-chars"></a>3.395. to_chars</h3></div></div></div><div class="literallayout"><p>Type: string<br />
Default: <span class="quote">“<span class="quote"><code class="literal"> +TCFL</code></span>”</span></p></div><p>
Controls the character used to indicate mail addressed to you. The
-@@ -9991,4 +9991,4 @@
+@@ -10010,4 +10010,4 @@ MIME parsing code back in the ELM-ME day
This document was written in <a class="ulink" href="http://docbook.sourceforge.net"; target="_top">DocBook</a>, and then rendered
using the <a class="ulink" href="http://xmlsoft.org/XSLT/"; target="_top">Gnome XSLT
toolkit</a>.
@@ -21,7 +29,7 @@
+</p></div></div></div></body></html>
--- a/doc/mutt.info
+++ b/doc/mutt.info
-@@ -15952,7 +15952,7 @@
+@@ -15970,7 +15970,7 @@ File: mutt.info, Node: tmpdir, Next: t
This variable allows you to specify where Mutt will place its
temporary files needed for displaying and composing messages. If this
variable is not set, the environment variable ‘$TMPDIR’ is used. If
@@ -32,7 +40,7 @@
File: mutt.info, Node: to_chars, Next: trash, Prev: tmpdir, Up: Configuration Variables
--- a/doc/mutt.texi
+++ b/doc/mutt.texi
-@@ -17200,7 +17200,7 @@
+@@ -17221,7 +17221,7 @@ Default: (empty)
This variable allows you to specify where Mutt will place its
temporary files needed for displaying and composing messages. If
this variable is not set, the environment variable @samp{$TMPDIR} is
@@ -43,7 +51,7 @@
@subsection to_chars
--- a/doc/muttrc.man
+++ b/doc/muttrc.man
-@@ -7757,7 +7757,7 @@
+@@ -7754,7 +7754,7 @@ Default: \(lq\(rq
This variable allows you to specify where Mutt will place its
temporary files needed for displaying and composing messages. If
this variable is not set, the environment variable \fB$TMPDIR\fP is
@@ -54,7 +62,7 @@
.TP
--- a/doc/reference.html
+++ b/doc/reference.html
-@@ -4011,7 +4011,7 @@
+@@ -4008,7 +4008,7 @@ Default: (empty)</p></div><p>
This variable allows you to specify where Mutt will place its
temporary files needed for displaying and composing messages. If
this variable is not set, the environment variable <code class="literal">$TMPDIR</code> is
@@ -63,7 +71,7 @@
</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="to-chars"></a>3.395. to_chars</h3></div></div></div><div class="literallayout"><p>Type: string<br />
Default: <span class="quote">“<span class="quote"><code class="literal"> +TCFL</code></span>”</span></p></div><p>
Controls the character used to indicate mail addressed to you. The
-@@ -4206,4 +4206,4 @@
+@@ -4204,4 +4204,4 @@ The <span class="emphasis"><em>generic</
(such as movement) available in all menus except for <span class="emphasis"><em>pager</em></span> and
<span class="emphasis"><em>editor</em></span>. Changing settings for this menu will affect the default
bindings for all menus (except as noted).
diff -Nru mutt-2.2.9/debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp.patch mutt-2.2.12/debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp.patch
--- mutt-2.2.9/debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp.patch 2023-09-16 22:48:33.000000000 +0200
@@ -24,9 +24,14 @@
This patch modifies all occurrences of $tmpdir, $TMPDIR and Tempdir, but
not the documentation, which looks like it's generated from init.h.
+---
+ init.c | 2 +-
+ init.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
--- a/init.c
+++ b/init.c
-@@ -3881,7 +3881,7 @@
+@@ -3881,7 +3881,7 @@ void mutt_init (int skip_sys_rc, LIST *c
MailcapPath = safe_strdup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap");
}
@@ -37,7 +42,7 @@
if (!p)
--- a/init.h
+++ b/init.h
-@@ -4654,7 +4654,7 @@
+@@ -4651,7 +4651,7 @@ struct option_t MuttVars[] = {
** This variable allows you to specify where Mutt will place its
** temporary files needed for displaying and composing messages. If
** this variable is not set, the environment variable \fC$$$TMPDIR\fP is
diff -Nru mutt-2.2.9/debian/patches/debian-specific/566076-build_doc_adjustments.patch mutt-2.2.12/debian/patches/debian-specific/566076-build_doc_adjustments.patch
--- mutt-2.2.9/debian/patches/debian-specific/566076-build_doc_adjustments.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/debian-specific/566076-build_doc_adjustments.patch 2023-09-16 22:34:57.000000000 +0200
@@ -4,12 +4,12 @@
Use w3m to build the txt manual.
---
- doc/Makefile.am | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
+ doc/Makefile.am | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
-@@ -151,9 +151,7 @@
+@@ -151,9 +151,7 @@ install-data-local: makedoc-all instdoc
check:
manual.txt: manual.html
@@ -20,7 +20,7 @@
Muttrc: stamp-doc-rc
-@@ -165,7 +163,7 @@
+@@ -165,7 +163,7 @@ stamp-doc-rc: $(top_srcdir)/init.h maked
touch stamp-doc-rc
manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
diff -Nru mutt-2.2.9/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch mutt-2.2.12/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch
--- mutt-2.2.9/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch 2023-09-16 22:34:57.000000000 +0200
@@ -1,6 +1,10 @@
This patch enables gpgme by default on the Debian version of mutt starting from
1.7.0-2. More explanations are in NEWS.Debian.
+---
+ contrib/gpg.rc | 26 ++++++++++++++++++--------
+ 1 file changed, 18 insertions(+), 8 deletions(-)
+
--- a/contrib/gpg.rc
+++ b/contrib/gpg.rc
@@ -52,30 +52,40 @@
diff -Nru mutt-2.2.9/debian/patches/debian-specific/882690-use_fqdn_from_etc_mailname.patch mutt-2.2.12/debian/patches/debian-specific/882690-use_fqdn_from_etc_mailname.patch
--- mutt-2.2.9/debian/patches/debian-specific/882690-use_fqdn_from_etc_mailname.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/debian-specific/882690-use_fqdn_from_etc_mailname.patch 2023-09-16 22:34:56.000000000 +0200
@@ -4,9 +4,13 @@
This patch is based on Md.etc_mailname_gethostbyname.patch which did not apply
cleanly to mutt 1.9.1 so I decided to rewrite to use the mutt libraries.
+---
+ init.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 48 insertions(+), 17 deletions(-)
+
--- a/init.c
+++ b/init.c
-@@ -170,6 +170,30 @@
+@@ -170,6 +170,30 @@ static int mutt_option_index (char *s)
return (-1);
}
@@ -37,7 +41,7 @@
int mutt_extract_token (BUFFER *dest, BUFFER *tok, int flags)
{
char ch;
-@@ -4005,8 +4029,8 @@
+@@ -4005,8 +4029,8 @@ void mutt_init (int skip_sys_rc, LIST *c
/* If not set in the muttrc or mutt_execute_commands(), set Fqdn ($hostname).
@@ -48,7 +52,7 @@
if (!Fqdn)
{
dprint (1, (debugfile, "Setting $hostname\n"));
-@@ -4014,28 +4038,35 @@
+@@ -4014,28 +4038,35 @@ void mutt_init (int skip_sys_rc, LIST *c
domain = safe_strdup (DOMAIN);
#endif /* DOMAIN */
diff -Nru mutt-2.2.9/debian/patches/debian-specific/correct_docdir_in_man_page.patch mutt-2.2.12/debian/patches/debian-specific/correct_docdir_in_man_page.patch
--- mutt-2.2.9/debian/patches/debian-specific/correct_docdir_in_man_page.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/debian-specific/correct_docdir_in_man_page.patch 2023-09-16 22:34:57.000000000 +0200
@@ -5,12 +5,12 @@
Fix the link so it points to the correct docdir
and gzipped manual.
---
- doc/mutt.man | 2 +-
+ doc/mutt.man | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/doc/mutt.man
+++ b/doc/mutt.man
-@@ -285,7 +285,7 @@
+@@ -285,7 +285,7 @@ System mapping between MIME types and fi
.I @bindir@/mutt_dotlock
The privileged dotlocking program.
.TP
diff -Nru mutt-2.2.9/debian/patches/debian-specific/document_debian_defaults.patch mutt-2.2.12/debian/patches/debian-specific/document_debian_defaults.patch
--- mutt-2.2.9/debian/patches/debian-specific/document_debian_defaults.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/debian-specific/document_debian_defaults.patch 2023-09-16 22:48:32.000000000 +0200
@@ -5,12 +5,12 @@
Some customization of the option which are straying
from the default only on Debian systems.
---
- init.h | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
+ init.h | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
--- a/init.h
+++ b/init.h
-@@ -561,6 +561,9 @@
+@@ -561,6 +561,9 @@ struct option_t MuttVars[] = {
** .pp
** When this variable is \fIset\fP, mutt will include Delivered-To headers when
** bouncing messages. Postfix users may wish to \fIunset\fP this variable.
@@ -20,7 +20,7 @@
*/
{ "braille_friendly", DT_BOOL, R_NONE, {.l=OPTBRAILLEFRIENDLY}, {.l=0} },
/*
-@@ -1600,6 +1603,9 @@
+@@ -1600,6 +1603,9 @@ struct option_t MuttVars[] = {
** your muttrc.
** .pp
** Also see $$use_domain and $$hidden_host.
@@ -30,7 +30,7 @@
*/
#if defined(HAVE_LIBIDN) || defined(HAVE_LIBIDN2)
{ "idn_decode", DT_BOOL, R_MENU, {.l=OPTIDNDECODE}, {.l=1} },
-@@ -2346,6 +2352,9 @@
+@@ -2343,6 +2349,9 @@ struct option_t MuttVars[] = {
** system. It is used with various sets of parameters to gather the
** list of known remailers, and to finally send a message through the
** mixmaster chain. (Mixmaster only)
@@ -40,7 +40,7 @@
*/
#endif
{ "move", DT_QUAD, R_NONE, {.l=OPT_MOVE}, {.l=MUTT_NO} },
-@@ -4097,6 +4106,10 @@
+@@ -4094,6 +4103,10 @@ struct option_t MuttVars[] = {
** This is a format string, see the $$smime_decrypt_command command for
** possible \fCprintf(3)\fP-like sequences.
** (S/MIME only)
@@ -51,7 +51,7 @@
*/
#ifdef USE_SMTP
{ "smtp_authenticators", DT_STR, R_NONE, {.p=&SmtpAuthenticators}, {.p=0} },
-@@ -4315,6 +4328,9 @@
+@@ -4312,6 +4325,9 @@ struct option_t MuttVars[] = {
** .ts
** set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
** .te
@@ -61,7 +61,7 @@
*/
# endif /* USE_SSL_GNUTLS */
{ "ssl_client_cert", DT_PATH, R_NONE, {.p=&SslClientCert}, {.p=0} },
-@@ -4887,6 +4903,9 @@
+@@ -4885,6 +4901,9 @@ struct option_t MuttVars[] = {
** Note this option only affects the sending of messages. Fcc'ed
** copies of a message will always contain the ``Bcc:'' header if
** one exists.
diff -Nru mutt-2.2.9/debian/patches/debian-specific/Muttrc.patch mutt-2.2.12/debian/patches/debian-specific/Muttrc.patch
--- mutt-2.2.9/debian/patches/debian-specific/Muttrc.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/debian-specific/Muttrc.patch 2023-09-16 22:34:56.000000000 +0200
@@ -7,12 +7,12 @@
Signed-off-by: Matteo F. Vescovi <mfvescovi@gmail.com>
---
- doc/Muttrc.head | 41 ++++++++++++++++++++++++++++++++++-------
- 1 file changed, 34 insertions(+), 7 deletions(-)
+ doc/Muttrc.head | 39 +++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 37 insertions(+), 2 deletions(-)
--- a/doc/Muttrc.head
+++ b/doc/Muttrc.head
-@@ -12,6 +12,34 @@
+@@ -12,6 +12,34 @@ unignore from: subject to cc date x-mail
# Display the fields in this order
hdr_order date from to cc subject
@@ -47,7 +47,7 @@
# imitate the old search-body function
macro index \eb "<search>~b " "search in message bodies"
-@@ -23,7 +51,7 @@
+@@ -23,7 +51,7 @@ macro index,pager,attach,compose \cb "\
"call urlview to extract URLs out of a message"
# Show documentation when pressing F1
@@ -56,7 +56,7 @@
# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
# note: these macros have been subsumed by the <browse-mailboxes> function.
-@@ -37,7 +65,7 @@
+@@ -37,7 +65,7 @@ bind browser y exit
# append-hook '\.gz$' "gzip -c '%t' >> '%f'"
# If Mutt is unable to determine your site's domain name correctly, you can
@@ -65,7 +65,7 @@
#
# set hostname=cs.hmc.edu
-@@ -49,6 +77,13 @@
+@@ -49,6 +77,13 @@ bind browser y exit
# be undone with unmime_lookup.
mime_lookup application/octet-stream
diff -Nru mutt-2.2.9/debian/patches/debian-specific/use_usr_bin_editor.patch mutt-2.2.12/debian/patches/debian-specific/use_usr_bin_editor.patch
--- mutt-2.2.9/debian/patches/debian-specific/use_usr_bin_editor.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/debian-specific/use_usr_bin_editor.patch 2023-09-16 22:34:56.000000000 +0200
@@ -6,13 +6,13 @@
(which is set by update-alternatives), rather than falling back
to vi.
---
- init.c | 2 +-
- init.h | 2 +-
+ init.c | 2 +-
+ init.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/init.c
+++ b/init.c
-@@ -3888,7 +3888,7 @@
+@@ -3888,7 +3888,7 @@ void mutt_init (int skip_sys_rc, LIST *c
{
p = getenv ("EDITOR");
if (!p)
@@ -23,7 +23,7 @@
Visual = safe_strdup (p);
--- a/init.h
+++ b/init.h
-@@ -1131,7 +1131,7 @@
+@@ -1131,7 +1131,7 @@ struct option_t MuttVars[] = {
** .pp
** This variable specifies which editor is used by mutt.
** It defaults to the value of the \fC$$$VISUAL\fP, or \fC$$$EDITOR\fP, environment
diff -Nru mutt-2.2.9/debian/patches/misc/gpg.rc-paths.patch mutt-2.2.12/debian/patches/misc/gpg.rc-paths.patch
--- mutt-2.2.9/debian/patches/misc/gpg.rc-paths.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/misc/gpg.rc-paths.patch 2023-09-16 22:34:58.000000000 +0200
@@ -4,12 +4,12 @@
Use the correct path of pgpewrap.
---
- contrib/gpg.rc | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
+ contrib/gpg.rc | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
--- a/contrib/gpg.rc
+++ b/contrib/gpg.rc
-@@ -72,20 +72,16 @@
+@@ -72,20 +72,16 @@ set pgp_verify_command="gpg --status-fd=
set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0 --pinentry-mode=loopback? --no-verbose --quiet --batch --output - %f"
# create a pgp/mime signed attachment
diff -Nru mutt-2.2.9/debian/patches/misc/smime.rc.patch mutt-2.2.12/debian/patches/misc/smime.rc.patch
--- mutt-2.2.9/debian/patches/misc/smime.rc.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/misc/smime.rc.patch 2023-09-16 22:34:58.000000000 +0200
@@ -7,8 +7,8 @@
Signed-off-by: Matteo F. Vescovi <mfv@debian.org>
---
- contrib/smime.rc | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
+ contrib/smime.rc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
--- a/contrib/smime.rc
+++ b/contrib/smime.rc
diff -Nru mutt-2.2.9/debian/patches/series mutt-2.2.12/debian/patches/series
--- mutt-2.2.9/debian/patches/series 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/series 2023-09-16 22:47:26.000000000 +0200
@@ -11,6 +11,3 @@
misc/gpg.rc-paths.patch
misc/smime.rc.patch
upstream/528233-readonly-open.patch
-upstream/Fix-rfc2047-base64-decoding-to-abort-on-illegal-char.patch
-upstream/Check-for-NULL-userhdrs.patch
-upstream/Fix-write_one_header-illegal-header-check.patch
diff -Nru mutt-2.2.9/debian/patches/upstream/528233-readonly-open.patch mutt-2.2.12/debian/patches/upstream/528233-readonly-open.patch
--- mutt-2.2.9/debian/patches/upstream/528233-readonly-open.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/upstream/528233-readonly-open.patch 2023-09-16 22:34:58.000000000 +0200
@@ -8,12 +8,12 @@
Debian bugs: #528233, updated in #572203
---
- attach.c | 5 +++++
+ attach.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/attach.c
+++ b/attach.c
-@@ -389,6 +389,7 @@
+@@ -389,6 +389,7 @@ int mutt_view_attachment (FILE *fp, BODY
}
else
goto return_error;
@@ -21,7 +21,7 @@
}
}
-@@ -598,7 +599,11 @@
+@@ -598,7 +599,11 @@ int mutt_view_attachment (FILE *fp, BODY
rfc1524_free_entry (&entry);
if (unlink_tempfile)
diff -Nru mutt-2.2.9/debian/patches/upstream/Check-for-NULL-userhdrs.patch mutt-2.2.12/debian/patches/upstream/Check-for-NULL-userhdrs.patch
--- mutt-2.2.9/debian/patches/upstream/Check-for-NULL-userhdrs.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/upstream/Check-for-NULL-userhdrs.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-From: Kevin McCarthy <kevin@8t8.us>
-Date: Mon, 4 Sep 2023 12:50:07 +0800
-Subject: Check for NULL userhdrs.
-Origin: https://gitlab.com/muttmua/mutt/-/commit/4cc3128abdf52c615911589394a03271fddeefc6
-Bug-Debian: https://bugs.debian.org/1051563
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2023-4875
-
-When composing an email, miscellaneous extra headers are stored in a
-userhdrs list. Mutt first checks to ensure each header contains at
-least a colon character, passes the entire userhdr field (name, colon,
-and body) to the rfc2047 decoder, and safe_strdup()'s the result on
-the userhdrs list. An empty result would from the decode would result
-in a NULL headers being added to list.
-
-The previous commit removed the possibility of the decoded header
-field being empty, but it's prudent to add a check to the strchr
-calls, in case there is another unexpected bug resulting in one.
-
-Thanks to Chenyuan Mi (@morningbread) for discovering the two strchr
-crashes, giving a working example draft message, and providing the
-stack traces for the two NULL derefences.
----
- sendlib.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sendlib.c b/sendlib.c
-index c2283972f1d3..763bff4117f2 100644
---- a/sendlib.c
-+++ b/sendlib.c
-@@ -2418,7 +2418,7 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, char *date,
- /* Add any user defined headers */
- for (; tmp; tmp = tmp->next)
- {
-- if ((p = strchr (tmp->data, ':')))
-+ if ((p = strchr (NONULL (tmp->data), ':')))
- {
- q = p;
-
-@@ -2466,7 +2466,7 @@ static void encode_headers (LIST *h)
-
- for (; h; h = h->next)
- {
-- if (!(p = strchr (h->data, ':')))
-+ if (!(p = strchr (NONULL (h->data), ':')))
- continue;
-
- i = p - h->data;
---
-2.40.1
-
diff -Nru mutt-2.2.9/debian/patches/upstream/Fix-rfc2047-base64-decoding-to-abort-on-illegal-char.patch mutt-2.2.12/debian/patches/upstream/Fix-rfc2047-base64-decoding-to-abort-on-illegal-char.patch
--- mutt-2.2.9/debian/patches/upstream/Fix-rfc2047-base64-decoding-to-abort-on-illegal-char.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/upstream/Fix-rfc2047-base64-decoding-to-abort-on-illegal-char.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-From: Kevin McCarthy <kevin@8t8.us>
-Date: Sun, 3 Sep 2023 12:22:01 +0800
-Subject: Fix rfc2047 base64 decoding to abort on illegal characters.
-Origin: https://gitlab.com/muttmua/mutt/-/commit/452ee330e094bfc7c9a68555e5152b1826534555
-Bug-Debian: https://bugs.debian.org/1051563
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2023-4875
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2023-4874
-
-For some reason, the rfc2047 base64 decoder ignored illegal
-characters, instead of aborting. This seems innocuous, but in fact
-leads to at least three crash-bugs elsewhere in Mutt.
-
-These stem from Mutt, in some cases, passing an entire header
-field (name, colon, and body) to the rfc2047 decoder. (It is
-technically incorrect to do so, by the way, but is beyond scope for
-these fixes in stable). Mutt then assumes the result can't be empty
-because of a previous check that the header contains at least a colon.
-
-This commit takes care of the source of the crashes, by aborting the
-rfc2047 decode. The following two commits add protective fixes to the
-specific crash points.
-
-Thanks to Chenyuan Mi (@morningbread) for discovering the strchr
-crashes, giving a working example draft message, and providing the
-stack traces for the two NULL derefences.
----
- rfc2047.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rfc2047.c b/rfc2047.c
-index 1ce82ebbe49a..36cc76dbc402 100644
---- a/rfc2047.c
-+++ b/rfc2047.c
-@@ -724,7 +724,7 @@ static int rfc2047_decode_word (BUFFER *d, const char *s, char **charset)
- if (*pp == '=')
- break;
- if ((*pp & ~127) || (c = base64val(*pp)) == -1)
-- continue;
-+ goto error_out_0;
- if (k + 6 >= 8)
- {
- k -= 2;
---
-2.40.1
-
diff -Nru mutt-2.2.9/debian/patches/upstream/Fix-write_one_header-illegal-header-check.patch mutt-2.2.12/debian/patches/upstream/Fix-write_one_header-illegal-header-check.patch
--- mutt-2.2.9/debian/patches/upstream/Fix-write_one_header-illegal-header-check.patch 2023-09-10 12:57:40.000000000 +0200
+++ mutt-2.2.12/debian/patches/upstream/Fix-write_one_header-illegal-header-check.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-From: Kevin McCarthy <kevin@8t8.us>
-Date: Sun, 3 Sep 2023 14:11:48 +0800
-Subject: Fix write_one_header() illegal header check.
-Origin: https://gitlab.com/muttmua/mutt/-/commit/a4752eb0ae0a521eec02e59e51ae5daedf74fda0
-Bug-Debian: https://bugs.debian.org/1051563
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2023-4874
-
-This is another crash caused by the rfc2047 decoding bug fixed in the
-second prior commit.
-
-In this case, an empty header line followed by a header line starting
-with ":", would result in t==end.
-
-The mutt_substrdup() further below would go very badly at that point,
-with t >= end+1. This could result in either a memcpy onto NULL or a
-huge malloc call.
-
-Thanks to Chenyuan Mi (@morningbread) for giving a working example
-draft message of the rfc2047 decoding flaw. This allowed me, with
-further testing, to discover this additional crash bug.
----
- sendlib.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sendlib.c b/sendlib.c
-index 763bff4117f2..204b13085227 100644
---- a/sendlib.c
-+++ b/sendlib.c
-@@ -2130,7 +2130,7 @@ static int write_one_header (FILE *fp, int pfxw, int max, int wraplen,
- else
- {
- t = strchr (start, ':');
-- if (!t || t > end)
-+ if (!t || t >= end)
- {
- dprint (1, (debugfile, "mwoh: warning: header not in "
- "'key: value' format!\n"));
---
-2.40.1
-
diff -Nru mutt-2.2.9/doc/advancedusage.html mutt-2.2.12/doc/advancedusage.html
diff -Nru mutt-2.2.9/doc/configuration.html mutt-2.2.12/doc/configuration.html
diff -Nru mutt-2.2.9/doc/index.html mutt-2.2.12/doc/index.html
\ No newline at end of file
diff -Nru mutt-2.2.9/doc/intro.html mutt-2.2.12/doc/intro.html
diff -Nru mutt-2.2.9/doc/manual.html mutt-2.2.12/doc/manual.html
diff -Nru mutt-2.2.9/doc/manual.xml.head mutt-2.2.12/doc/manual.xml.head
diff -Nru mutt-2.2.9/doc/mutt.info mutt-2.2.12/doc/mutt.info
diff -Nru mutt-2.2.9/doc/mutt.man mutt-2.2.12/doc/mutt.man
diff -Nru mutt-2.2.9/doc/muttrc.man mutt-2.2.12/doc/muttrc.man
diff -Nru mutt-2.2.9/doc/mutt.texi mutt-2.2.12/doc/mutt.texi
diff -Nru mutt-2.2.9/doc/reference.html mutt-2.2.12/doc/reference.html
diff -Nru mutt-2.2.9/flags.c mutt-2.2.12/flags.c
--- mutt-2.2.9/flags.c 2022-05-11 18:57:07.000000000 +0200
+++ mutt-2.2.12/flags.c 2023-08-18 05:03:18.000000000 +0200
@@ -33,7 +33,6 @@
int tagged = ctx->tagged;
int flagged = ctx->flagged;
int upd_ctx = (upd_flags & MUTT_SET_FLAG_UPDATE_CONTEXT);
- int upd_color = (upd_flags & MUTT_SET_FLAG_UPDATE_COLOR);
int update = 0;
if (ctx->readonly && flag != MUTT_TAG)
@@ -274,13 +273,8 @@
if (update)
{
- if (upd_color)
- mutt_set_header_color (ctx, h);
- else
- {
- h->color.pair = 0;
- h->color.attrs = 0;
- }
+ h->color.pair = 0;
+ h->color.attrs = 0;
#ifdef USE_SIDEBAR
mutt_set_current_menu_redraw (REDRAW_SIDEBAR);
#endif
@@ -326,7 +320,7 @@
*/
if (cur->message)
{
- _mutt_set_flag (Context, cur->message, flag, bf, MUTT_SET_FLAG_UPDATE_CONTEXT);
+ mutt_set_flag (Context, cur->message, flag, bf);
cur->message->color.pair = cur->message->color.attrs = 0;
}
@@ -337,7 +331,7 @@
{
if (cur->message)
{
- _mutt_set_flag (Context, cur->message, flag, bf, MUTT_SET_FLAG_UPDATE_CONTEXT);
+ mutt_set_flag (Context, cur->message, flag, bf);
cur->message->color.pair = cur->message->color.attrs = 0;
}
diff -Nru mutt-2.2.9/handler.c mutt-2.2.12/handler.c
--- mutt-2.2.9/handler.c 2022-08-05 21:39:43.000000000 +0200
+++ mutt-2.2.12/handler.c 2023-08-18 05:03:18.000000000 +0200
@@ -58,10 +58,10 @@
const int Index_64[128] = {
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
- -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
+ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,62,-1,63,
52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1,-1,-1,-1,
-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11,12,13,14,
- 15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
+ 15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,63,
-1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
};
diff -Nru mutt-2.2.9/imap/imap.c mutt-2.2.12/imap/imap.c
--- mutt-2.2.9/imap/imap.c 2022-11-12 21:28:31.000000000 +0100
+++ mutt-2.2.12/imap/imap.c 2023-08-18 05:03:18.000000000 +0200
@@ -2519,6 +2519,25 @@
return 1;
}
+ /* Scan if any of the messages were previously checkpoint-deleted
+ * on the server, by answering "no" to $delete for instance.
+ * In that case, doing a UID COPY would also copy the deleted flag, which
+ * is probably not desired. Trying to work around that leads to all sorts
+ * of headaches, so just force a manual append.
+ */
+ for (n = 0; n < ctx->msgcount; n++)
+ {
+ if (ctx->hdrs[n]->active &&
+ ctx->hdrs[n]->deleted && !ctx->hdrs[n]->purge &&
+ HEADER_DATA(ctx->hdrs[n])->deleted)
+ {
+ dprint (1, (debugfile,
+ "imap_fast_trash: server-side delete flag set. aborting.\n"));
+ rc = -1;
+ goto out;
+ }
+ }
+
imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox));
if (!*mbox)
strfcpy (mbox, "INBOX", sizeof (mbox));
diff -Nru mutt-2.2.9/init.h mutt-2.2.12/init.h
--- mutt-2.2.9/init.h 2022-11-03 22:02:36.000000000 +0100
+++ mutt-2.2.12/init.h 2023-09-01 08:32:23.000000000 +0200
@@ -2018,9 +2018,6 @@
** since the last time you opened the mailbox. When \fIunset\fP, Mutt will notify you
** if any new mail exists in the mailbox, regardless of whether you have visited it
** recently.
- ** .pp
- ** When \fI$$mark_old\fP is set, Mutt does not consider the mailbox to contain new
- ** mail if only old messages exist.
*/
{ "mail_check_stats", DT_BOOL, R_NONE, {.l=OPTMAILCHECKSTATS}, {.l=0} },
/*
diff -Nru mutt-2.2.9/main.c mutt-2.2.12/main.c
--- mutt-2.2.9/main.c 2022-10-23 00:45:20.000000000 +0200
+++ mutt-2.2.12/main.c 2023-09-01 08:32:23.000000000 +0200
@@ -86,7 +86,7 @@
https://gitlab.com/muttmua/mutt/issues\n";);
static const char *Notice = N_("\
-Copyright (C) 1996-2022 Michael R. Elkins and others.\n\
+Copyright (C) 1996-2023 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");
@@ -100,7 +100,7 @@
Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n\
Copyright (C) 2000-2004 Edmund Grimley Evans <edmundo@rano.org>\n\
Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>\n\
-Copyright (C) 2014-2022 Kevin J. McCarthy <kevin@8t8.us>\n";
+Copyright (C) 2014-2023 Kevin J. McCarthy <kevin@8t8.us>\n";
static const char *Thanks = N_("\
Many others not mentioned here contributed code, fixes,\n\
diff -Nru mutt-2.2.9/Makefile.am mutt-2.2.12/Makefile.am
--- mutt-2.2.9/Makefile.am 2022-05-11 18:57:07.000000000 +0200
+++ mutt-2.2.12/Makefile.am 2023-08-18 05:03:18.000000000 +0200
@@ -57,7 +57,7 @@
-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
-DHAVE_CONFIG_H=1
-AM_CPPFLAGS=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(AUTOCRYPT_INCLUDES) $(GPGME_CFLAGS)
+AM_CPPFLAGS=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(AUTOCRYPT_INCLUDES) $(GPGME_CFLAGS) $(GPG_ERROR_CFLAGS)
# This option allows `make distcheck` to run without encountering
# setgid errors.
diff -Nru mutt-2.2.9/Makefile.in mutt-2.2.12/Makefile.in
--- mutt-2.2.9/Makefile.in 2022-11-12 21:50:38.000000000 +0100
+++ mutt-2.2.12/Makefile.in 2023-09-09 08:45:38.000000000 +0200
@@ -566,7 +566,7 @@
mutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
$(INTLDEPS) $(LIBAUTOCRYPTDEPS)
-AM_CPPFLAGS = -I. -I$(top_srcdir) $(IMAP_INCLUDES) $(AUTOCRYPT_INCLUDES) $(GPGME_CFLAGS)
+AM_CPPFLAGS = -I. -I$(top_srcdir) $(IMAP_INCLUDES) $(AUTOCRYPT_INCLUDES) $(GPGME_CFLAGS) $(GPG_ERROR_CFLAGS)
# This option allows `make distcheck` to run without encountering
# setgid errors.
diff -Nru mutt-2.2.9/messageid.c mutt-2.2.12/messageid.c
--- mutt-2.2.9/messageid.c 2022-05-11 18:57:07.000000000 +0200
+++ mutt-2.2.12/messageid.c 2023-08-18 05:03:18.000000000 +0200
@@ -49,7 +49,7 @@
{
case 'r':
mutt_random_bytes ((char *)r_raw, sizeof(r_raw));
- mutt_to_base64 (r_out, r_raw, sizeof(r_raw), sizeof(r_out));
+ mutt_to_base64_safeurl (r_out, r_raw, sizeof(r_raw), sizeof(r_out));
mutt_format_s (dest, destlen, fmt, (const char *)r_out);
break;
@@ -65,7 +65,7 @@
for (int i = 0; i < 4; i++)
z_raw[i] = (uint8_t) (id_data->now >> (3-i)*8u);
mutt_random_bytes ((char *)z_raw + 4, sizeof(z_raw) - 4);
- mutt_to_base64 (z_out, z_raw, sizeof(z_raw), sizeof(z_out));
+ mutt_to_base64_safeurl (z_out, z_raw, sizeof(z_raw), sizeof(z_out));
mutt_format_s (dest, destlen, fmt, (const char *)z_out);
break;
diff -Nru mutt-2.2.9/mh.c mutt-2.2.12/mh.c
--- mutt-2.2.9/mh.c 2022-11-12 19:14:22.000000000 +0100
+++ mutt-2.2.12/mh.c 2023-08-18 05:03:18.000000000 +0200
@@ -2334,9 +2334,20 @@
if (ctx->hdrs[i]->deleted != p->h->deleted)
{
ctx->hdrs[i]->deleted = p->h->deleted;
+ if (ctx->hdrs[i]->deleted)
+ ctx->deleted++;
+ else
+ ctx->deleted--;
flags_changed = 1;
}
- ctx->hdrs[i]->trash = p->h->trash;
+ if (ctx->hdrs[i]->trash != p->h->trash)
+ {
+ ctx->hdrs[i]->trash = p->h->trash;
+ if (ctx->hdrs[i]->trash)
+ ctx->trashed++;
+ else
+ ctx->trashed--;
+ }
/* this is a duplicate of an existing header, so remove it */
mutt_free_header (&p->h);
diff -Nru mutt-2.2.9/mime.h mutt-2.2.12/mime.h
--- mutt-2.2.9/mime.h 2022-05-11 18:57:07.000000000 +0200
+++ mutt-2.2.12/mime.h 2023-08-18 05:03:18.000000000 +0200
@@ -63,6 +63,7 @@
extern const int Index_hex[];
extern const int Index_64[];
extern const char B64Chars[];
+extern const char B64Chars_urlsafe[];
#endif
#define hexval(c) Index_hex[(unsigned int)(c)]
diff -Nru mutt-2.2.9/mutt.h mutt-2.2.12/mutt.h
--- mutt-2.2.9/mutt.h 2022-10-08 21:51:54.000000000 +0200
+++ mutt-2.2.12/mutt.h 2023-09-01 08:32:23.000000000 +0200
@@ -383,7 +383,6 @@
/* flags for _mutt_set_flag() */
#define MUTT_SET_FLAG_UPDATE_CONTEXT (1<<0)
-#define MUTT_SET_FLAG_UPDATE_COLOR (1<<1)
/* flags for _mutt_buffer_expand_path() */
#define MUTT_EXPAND_PATH_RX (1<<0)
diff -Nru mutt-2.2.9/mutt_sasl_gnu.c mutt-2.2.12/mutt_sasl_gnu.c
--- mutt-2.2.9/mutt_sasl_gnu.c 2022-05-21 18:36:29.000000000 +0200
+++ mutt-2.2.12/mutt_sasl_gnu.c 2023-08-18 05:03:18.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Kevin J. McCarthy <kevin@8t8.us>
+ * Copyright (C) 2021-2022 Kevin J. McCarthy <kevin@8t8.us>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -Nru mutt-2.2.9/pager.c mutt-2.2.12/pager.c
--- mutt-2.2.9/pager.c 2022-10-23 00:45:20.000000000 +0200
+++ mutt-2.2.12/pager.c 2023-08-18 05:03:18.000000000 +0200
@@ -1337,7 +1337,7 @@
if (Charset_is_utf8)
{
- if (wc == 0x200B || wc == 0xFEFF)
+ if (wc == 0x200B || wc == 0x200C || wc == 0xFEFF)
{
dprint (3, (debugfile, "skip zero-width character U+%04X\n", (unsigned short)wc));
continue;
diff -Nru mutt-2.2.9/po/bg.po mutt-2.2.12/po/bg.po
--- mutt-2.2.9/po/bg.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/bg.po 2023-09-09 08:47:33.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.5.5.1\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2018-01-16 23:47+0100\n"
"Last-Translator: Velko Hristov <hristov@informatik.hu-berlin.de>\n"
"Language-Team: \n"
@@ -145,8 +145,8 @@
msgstr "���compose\" �ailcap �� %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "���������"%s\"!"
@@ -1397,7 +1397,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "��������%s: %s"
@@ -2481,7 +2481,7 @@
msgstr "����� ��"
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "��������"
@@ -2517,7 +2517,7 @@
msgstr "��� ������� � "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "��������"
@@ -2557,8 +2557,8 @@
msgid "Exit Mutt without saving?"
msgstr "��������utt � �������
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "���� �������."
@@ -2651,25 +2651,25 @@
msgid "You are on the first thread."
msgstr "�������
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "�� ����� ��"
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "��������"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "���������
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "��� �������
@@ -2677,13 +2677,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "��� �������
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "� � ������ ���@@ -2691,14 +2691,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "��� ������ "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "��� �������."
@@ -2706,20 +2706,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "��� ���."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "�� ������
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "��������"
@@ -2870,11 +2870,11 @@
msgid "Can't append to folder: %s"
msgstr "������� ���� �����: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "���������
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "��� �����
@@ -3117,7 +3117,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "�����(%s)..."
@@ -3260,7 +3260,7 @@
msgid "Error opening mailbox"
msgstr "�������������!"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "������� %s?"
@@ -3325,7 +3325,7 @@
msgid "Unsubscribed from %s"
msgstr "�����..."
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "��� �%d �� �s..."
@@ -3674,14 +3674,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3691,14 +3691,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3833,12 +3833,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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 ""
-"�����(C) 1996-2022 Michael R. Elkins ��.\n"
+"�����(C) 1996-2023 Michael R. Elkins ��.\n"
"Mutt ������ ��������; �������`mutt -vv'.\n"
"Mutt �������� �������\n"
"� ������ ���mutt -vv' ��� ����n"
@@ -6116,28 +6116,28 @@
msgid "Editing backgrounded."
msgstr "�������"
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "� ���\"boundary\" ��� [��, ���� ��
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s ������
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s ������."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "��������%s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6148,7 +6148,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6159,7 +6159,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6170,7 +6170,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6180,7 +6180,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6193,26 +6193,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "���d (%s) � �������
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "�����
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "�� %s �� �� �������������"
Binary files /home/bigeasy/tmp/v4V95EIGlA/mutt-2.2.9/po/ca.gmo and /home/bigeasy/tmp/qmuevtIpJv/mutt-2.2.12/po/ca.gmo differ
diff -Nru mutt-2.2.9/po/ca.po mutt-2.2.12/po/ca.po
--- mutt-2.2.9/po/ca.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/ca.po 2023-09-09 08:47:33.000000000 +0200
@@ -53,7 +53,7 @@
msgstr ""
"Project-Id-Version: mutt 2.2.0\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2022-08-22 17:56+0200\n"
"Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -189,8 +189,8 @@
msgstr "Cal que l’entrada «compose» de «mailcap» continga «%%s»."
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Error en executar «%s»."
@@ -1452,7 +1452,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Ha fallat stat() sobre «%s»: %s"
@@ -2582,7 +2582,7 @@
# Al darrere porta dos punts. ivb
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "No es poden esborrar els missatges"
@@ -2620,7 +2620,7 @@
# Al darrere porta dos punts. ivb
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "No es poden restaurar els missatges"
@@ -2659,8 +2659,8 @@
msgid "Exit Mutt without saving?"
msgstr "Voleu abandonar Mutt sense desar els canvis?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "No s’ha habilitat l’ús de fils."
@@ -2750,25 +2750,25 @@
msgid "You are on the first thread."
msgstr "Vos trobeu al primer fil."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "El fil conté missatges no llegits."
# Al darrere porta dos punts. ivb
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "No es pot esborrar el missatge"
# Al darrere porta dos punts. ivb
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "No es pot editar el missatge."
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "S’han canviat %d etiquetes."
@@ -2776,46 +2776,46 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "No s’ha canviat cap etiqueta."
# Al darrere porta dos punts. ivb
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "No es poden marcar els missatges com a llegits"
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "Entreu una pulsació per a la drecera: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "Drecera de teclat per a un missatge."
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "S’ha vinculat el missatge amb la drecera «%s»."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "El missatge no té identificador per a ser vinculat amb la drecera."
# Al darrere porta dos punts. ivb
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "No es pot restaurar el missatge"
@@ -2946,13 +2946,13 @@
# ivb (2001/12/08)
# ivb Així queda més clar. El programa posa l’interrogant.
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Quin senyalador voleu activar"
# ivb (2001/12/08)
# ivb Així queda més clar. El programa posa l’interrogant.
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Quin senyalador voleu desactivar"
@@ -3209,7 +3209,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "S’està autenticant (%s)…"
@@ -3348,7 +3348,7 @@
msgid "Error opening mailbox"
msgstr "Error en obrir la bústia."
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Voleu crear «%s»?"
@@ -3413,7 +3413,7 @@
msgid "Unsubscribed from %s"
msgstr "S’ha dessubscrit de «%s»."
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "S’estan copiant %d missatges a «%s»…"
@@ -3764,14 +3764,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr "^(re)(\\[[0-9]+\\])*:[ \t]*"
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3784,14 +3784,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr "C%?n?ORREU&orreu?"
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr "Mutt %?m?amb %m missatges&sense cap missatge?%?n? [%n NOUS]?"
@@ -3925,12 +3925,12 @@
#: main.c:88
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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 © 1996‐2022 Michael R. Elkins i d’altres.\n"
+"Copyright © 1996‐2023 Michael R. Elkins i d’altres.\n"
"Mutt s’ofereix SENSE CAP GARANTIA; empreu «mutt -vv» per a obtenir‐ne més\n"
"detalls. Mutt és programari lliure, i podeu, si voleu, redistribuir‐lo "
"sota\n"
@@ -6242,28 +6242,28 @@
msgid "Editing backgrounded."
msgstr "S’està editant en segon pla."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "No s’ha trobat el paràmetre «boundary» (informeu d’aquest error)."
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "«%s» ja no existeix."
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "«%s» no és un fitxer ordinari."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "No s’ha pogut obrir «%s»."
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
msgid "Decrypt message attachment?"
msgstr "Voleu desxifrar el missatge adjunt?"
@@ -6272,7 +6272,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6285,7 +6285,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6298,7 +6298,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr "Manca el tipus MIME a l’eixida de «%s»."
@@ -6308,7 +6308,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr "Manca la línia en blanc separadora a l’eixida de «%s»."
@@ -6321,30 +6321,30 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
"$send_multipart_alternative_filter no permet generar tipus «multipart»."
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "$sendmail ha d’estar establerta per a poder enviar correu."
# ivb (2001/12/08)
# ivb ABREUJAT!
# ivb Error en enviar el missatge, el procés fill ha exit amb codi %d (%s).
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Error en enviament, el fill isqué amb codi %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Eixida del procés de repartiment"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "En preparar «Resent-From»: L’IDN no és vàlid: %s"
Binary files /home/bigeasy/tmp/v4V95EIGlA/mutt-2.2.9/po/cs.gmo and /home/bigeasy/tmp/qmuevtIpJv/mutt-2.2.12/po/cs.gmo differ
diff -Nru mutt-2.2.9/po/cs.po mutt-2.2.12/po/cs.po
--- mutt-2.2.9/po/cs.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/cs.po 2023-09-09 08:47:33.000000000 +0200
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: mutt 2.2.0\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2022-01-28 20:08+01:00\n"
"Last-Translator: Petr Písař <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -150,8 +150,8 @@
msgstr "Položka mailcapu „compose“ vyžaduje %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Chyba při běhu programu \"%s\"!"
@@ -1370,7 +1370,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Chyba při volání funkce stat pro %s: %s"
@@ -2418,7 +2418,7 @@
msgstr "Číslo zprávy není správné."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "Zprávu(-y) nelze smazat"
@@ -2453,7 +2453,7 @@
msgstr "Označit zprávy shodující se s: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "Zprávu(-y) nelze obnovit"
@@ -2490,8 +2490,8 @@
msgid "Exit Mutt without saving?"
msgstr "Ukončit Mutt bez uložení změn?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Vlákna nejsou podporována."
@@ -2578,24 +2578,24 @@
msgid "You are on the first thread."
msgstr "Jste na prvním vláknu."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Vlákno obsahuje nepřečtené zprávy."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "Zprávu nelze smazat"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "Zprávu nelze upravit"
# FIXME: Pluralize
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "%d štítků změněno."
@@ -2603,44 +2603,44 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "Žádné štítky nebyly změněny."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "Zprávu(-y) nelze označit za přečtenou(-é)"
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "Zadejte značku: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "horká klávesa pro značku zprávy"
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "Zpráva svázána se značkou %s."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "ID zprávy ze značky neexistuje."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "Zprávu nelze obnovit"
@@ -2766,11 +2766,11 @@
msgid "Can't append to folder: %s"
msgstr "Ke složce nelze připojit: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Nastavit příznak"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Vypnout příznak"
@@ -3012,7 +3012,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Přihlašuje se (%s)…"
@@ -3150,7 +3150,7 @@
msgid "Error opening mailbox"
msgstr "Chyba při otevírání schránky"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Vytvořit %s?"
@@ -3216,7 +3216,7 @@
msgstr "Odběr %s odhlášen"
# TODO: Pluralize
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Kopírují se zprávy (%d) do %s…"
@@ -3548,14 +3548,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr "^(re)(\\[[0-9]+\\])*:[ \t]*"
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3568,14 +3568,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr "M%?n?AIL&ail?"
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr "Mutt %?m?s %m zprávami&bez zpráv?%?n? [NOVÉ: %n]?"
@@ -3705,12 +3705,12 @@
#: main.c:88
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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 © 1996–2022 Michael R. Elkins a další.\n"
+"Copyright © 1996–2023 Michael R. Elkins a další.\n"
"Mutt je dodáván BEZ JAKÉKOLI ZÁRUKY; podrobnosti získáte příkazem\n"
"„mutt -vv“.\n"
"Mutt je volné programové vybavení. Rozšiřování tohoto programu je vítáno,\n"
@@ -5907,28 +5907,28 @@
msgid "Editing backgrounded."
msgstr "Úprava přesunuta na pozadí."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Nebyl nalezen parametr „boundary“! [ohlaste tuto chybu]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s již neexistuje!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s není řádným souborem."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "%s nelze otevřít"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
msgid "Decrypt message attachment?"
msgstr "Dešifrovat přílohu zprávy?"
@@ -5937,7 +5937,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -5950,7 +5950,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -5963,7 +5963,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr "Ve výstupu „%s“ chybí typ MIME!"
@@ -5973,7 +5973,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr "Ve výstupu „%s“ chybí prázdný řádek oddělovače!"
@@ -5986,27 +5986,27 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
"$send_multipart_alternative_filter nepodporuje vytváření typu multipart."
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "Aby bylo možné odesílat e-maily, je třeba nastavit $sendmail."
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Chyba při zasílání zprávy, potomek ukončen %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Výstup doručovacího programu"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "Chybné IDN %s při generování „resent-from“ (odesláno z)."
diff -Nru mutt-2.2.9/po/da.po mutt-2.2.12/po/da.po
--- mutt-2.2.9/po/da.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/da.po 2023-09-09 08:47:33.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Mutt 2.0\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2020-11-19 23:05+0100\n"
"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -143,8 +143,8 @@
msgstr "Brug af \"compose\" i mailcap-fil kræver %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Fejl ved kørsel af \"%s\"!"
@@ -1373,7 +1373,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Kan ikke finde filen %s: %s"
@@ -2414,7 +2414,7 @@
msgstr "Ugyldigt mailnummer."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "Kan ikke slette mails"
@@ -2449,7 +2449,7 @@
msgstr "Udvælg mails efter mønster: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "Kan ikke fortryde sletning af mails"
@@ -2486,8 +2486,8 @@
msgid "Exit Mutt without saving?"
msgstr "Afslut Mutt uden at gemme?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Trådning er ikke i brug."
@@ -2574,23 +2574,23 @@
msgid "You are on the first thread."
msgstr "Du er ved den første tråd."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Tråden indeholder ulæste mails."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "Kan ikke slette mail"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "Kan ikke redigere mail"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "%d etiketter ændret."
@@ -2598,44 +2598,44 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "Ingen etiketter ændret."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "Kan ikke markere mails som læst"
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "Tryk makro-tast: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "mailens genvejstast"
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "Mailen er tildelt %s."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "Ingen mail-ID for makro."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "Kan ikke fortryde sletning af mail"
@@ -2772,11 +2772,11 @@
msgid "Can't append to folder: %s"
msgstr "Kan ikke føje til mailkatalog: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Sæt statusindikator"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Fjern statusindikator"
@@ -3016,7 +3016,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Godkender (%s) ..."
@@ -3154,7 +3154,7 @@
msgid "Error opening mailbox"
msgstr "Fejl ved åbning af brevboks"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Opret %s?"
@@ -3218,7 +3218,7 @@
msgid "Unsubscribed from %s"
msgstr "Afmeldt fra %s"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Kopierer %d mails til %s ..."
@@ -3551,14 +3551,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
#, fuzzy
#| msgid ""
#| "-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? "
@@ -3576,14 +3576,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr "M%?n?AIL&ail?"
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr "Mutt med %?m?%m beskeder&ingen beskeder?%?n? [%n NYE?"
@@ -3724,12 +3724,12 @@
#| "Mutt is free software, and you are welcome to redistribute it\n"
#| "under certain conditions; type `mutt -vv' for details.\n"
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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 ""
-"Ophavsret (C) 1996-2022 Michael R. Elkins m.fl.\n"
+"Ophavsret (C) 1996-2023 Michael R. Elkins m.fl.\n"
"Der følger ABSOLUT INGEN GARANTI med Mutt; tast `mutt -vv` for detaljer.\n"
"Mutt er et frit program, og du er velkommen til at redistribuere det\n"
"under visse betingelser; tast `mutt -vv` for detaljer.\n"
@@ -5926,28 +5926,28 @@
msgid "Editing backgrounded."
msgstr "Redigering sat i baggrunden."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Fandt ingen \"boundary\"-parameter! [rapportér denne fejl]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s eksisterer ikke mere!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s er ikke en almindelig fil."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Kunne ikke åbne %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -5958,7 +5958,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -5969,7 +5969,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -5980,7 +5980,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr "Manglende mime-type fra uddata af \"%s\"!"
@@ -5990,7 +5990,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr "Adskillelsesmarkering ved tom linje mangler fra uddata af \"%s\"!"
@@ -6003,7 +6003,7 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
@@ -6011,20 +6011,20 @@
"$send_multipart_alternative_filter understøtter ikke generering af multipart-"
"type."
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "$sendmail skal sættes for at sende post."
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Fejl %d under afsendelse af mail (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Uddata fra leveringsprocessen"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "Forkert IDN %s under forberedelse af \"Resent-From\"-felt."
Binary files /home/bigeasy/tmp/v4V95EIGlA/mutt-2.2.9/po/de.gmo and /home/bigeasy/tmp/qmuevtIpJv/mutt-2.2.12/po/de.gmo differ
diff -Nru mutt-2.2.9/po/de.po mutt-2.2.12/po/de.po
--- mutt-2.2.9/po/de.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/de.po 2023-09-09 08:47:33.000000000 +0200
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: Mutt 2.2\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2022-07-10 20:51+0200\n"
"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
"Language-Team: German <mutt-po@mutt.org>\n"
@@ -158,8 +158,8 @@
msgstr "„compose“-Eintrag in Mailcap-Datei erfordert %%s."
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Fehler beim Ausführen von „%s“!"
@@ -1383,7 +1383,7 @@
# FIXME Check translation
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Verzeichniseintrag für Datei %s kann nicht gelesen werden: %s"
@@ -2434,7 +2434,7 @@
msgstr "Ungültige Nachrichtennummer."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "Nachrichten können nicht gelöscht werden."
@@ -2469,7 +2469,7 @@
msgstr "Nachrichten nach Muster auswählen: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "Löschmarkierung von Nachricht(en) kann nicht entfernt werden"
@@ -2506,8 +2506,8 @@
msgid "Exit Mutt without saving?"
msgstr "Mutt verlassen, ohne Änderungen zu speichern?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Darstellung von Diskussionsfäden ist nicht eingeschaltet."
@@ -2595,23 +2595,23 @@
msgid "You are on the first thread."
msgstr "Sie haben bereits den ersten Diskussionsfaden ausgewählt."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Diskussionsfaden enthält ungelesene Nachrichten."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "Löschmarkierung kann nicht gesetzt werden."
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "Nachricht kann nicht bearbeitet werden"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "%d Label verändert."
@@ -2619,25 +2619,25 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "Keine Labels verändert."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "Nachricht(en) können nicht als gelesen markiert werden"
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "Makro-Tastenkürzel eingeben: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "Tastaturkürzel für Nachricht"
@@ -2645,19 +2645,19 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "Nachricht mit %s abrufbar."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "Keine Nachrichten-ID für Makro."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "Löschmarkierung kann nicht entfernt werden"
@@ -2787,11 +2787,11 @@
msgid "Can't append to folder: %s"
msgstr "An Postfach kann nicht angehängt werden: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Markierung setzen"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Markierung entfernen"
@@ -3037,7 +3037,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Wird authentifiziert (%s) …"
@@ -3175,7 +3175,7 @@
msgid "Error opening mailbox"
msgstr "Fehler beim Öffnen des Postfachs."
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "%s erstellen?"
@@ -3239,7 +3239,7 @@
msgid "Unsubscribed from %s"
msgstr "Abonnement von %s beendet"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "%d Nachrichten werden nach %s kopiert …"
@@ -3571,14 +3571,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr "^(re|aw)(\\[[0-9]+\\])*:[ \t]*"
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3591,14 +3591,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr "Mutt mit %?m?%m Nachrichten&keine Nachrichten?%?n? [%n NEUE]?"
@@ -3725,12 +3725,12 @@
#: main.c:88
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins und andere.\n"
+"Copyright (C) 1996-2023 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"
@@ -5940,28 +5940,28 @@
msgid "Editing backgrounded."
msgstr "Editor läuft jetzt im Hintergrund."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Kein boundary-Parameter gefunden! (bitte Fehler melden)"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s existiert nicht mehr!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s ist keine normale Datei."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "%s konnte nicht geöffnet werden."
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
msgid "Decrypt message attachment?"
msgstr "Anhang der Nachricht entschlüsseln?"
@@ -5970,7 +5970,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -5983,7 +5983,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -5996,7 +5996,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr "Fehlender MIME-Typ in der Ausgabe von „%s“!"
@@ -6006,7 +6006,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr "Fehlende Leerzeile als Trenner in Ausgabe von „%s“!"
@@ -6019,28 +6019,28 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
"$send_multipart_alternative_filter funktioniert nicht mit Typ „multipart“."
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "$sendmail muss konfiguriert werden, um E-Mails zu versenden."
# CHECK: Übersetzung zu knapp?
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Fehler %d beim Versand der Nachricht (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Ausgabe des Auslieferungs-Prozesses"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "Ungültige IDN %s bei der Vorbereitung von Resent-From."
diff -Nru mutt-2.2.9/po/el.po mutt-2.2.12/po/el.po
--- mutt-2.2.9/po/el.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/el.po 2023-09-09 08:47:33.000000000 +0200
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.5.7i\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2005-02-01 00:01GMT+2\n"
"Last-Translator: Dokianakis Fanis <madf@hellug.gr>\n"
"Language-Team: Greek <EL@li.org>\n"
@@ -168,8 +168,8 @@
#
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "��������� �\"%s\"!"
@@ -1562,7 +1562,7 @@
#
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "��� ��������: %s"
@@ -2806,7 +2806,7 @@
#
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "���� �������"
@@ -2849,7 +2849,7 @@
#
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "���� �������"
@@ -2898,8 +2898,8 @@
msgstr "���� �utt �����
#
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "������ � ������."
@@ -3006,20 +3006,20 @@
msgstr "��� ����."
#
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "��� �����������
#
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "���� �������"
#
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "��� �������@ -3027,7 +3027,7 @@
#
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "������������"
@@ -3036,14 +3036,14 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "������������"
#
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "��� ���������@ -3053,7 +3053,7 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "����eyID: "
@@ -3061,7 +3061,7 @@
#
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "� �����"
@@ -3070,7 +3070,7 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "� ������."
@@ -3078,14 +3078,14 @@
#
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "���� �������."
#
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "���� �������"
@@ -3250,12 +3250,12 @@
msgstr "��� ������ %s"
#
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "�����"
#
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "������"
@@ -3536,7 +3536,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "�����%s)..."
@@ -3697,7 +3697,7 @@
msgstr "����� ��� �������
#
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "�����%s;"
@@ -3773,7 +3773,7 @@
msgstr "��� �%s..."
#
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "��� %d ����s..."
@@ -4163,14 +4163,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -4180,14 +4180,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -4343,12 +4343,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins � ��.\n"
+"Copyright (C) 1996-2023 Michael R. Elkins � ��.\n"
"� Mutt ���������������� � ������mutt -"
"vv'.\n"
"� Mutt �������, � ��� �����
@@ -6897,24 +6897,24 @@
msgstr "��� ����"
#
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "� �����������������
#
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "� %s � ���"
#
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "� %s � �������."
#
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "��� �����%s"
@@ -6922,7 +6922,7 @@
#
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6933,7 +6933,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6944,7 +6944,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6955,7 +6955,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6965,7 +6965,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6978,28 +6978,28 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
#
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "�����������, ��� ���� %d (%s)."
#
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "�����������
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr ""
Binary files /home/bigeasy/tmp/v4V95EIGlA/mutt-2.2.9/po/eo.gmo and /home/bigeasy/tmp/qmuevtIpJv/mutt-2.2.12/po/eo.gmo differ
diff -Nru mutt-2.2.9/po/eo.po mutt-2.2.12/po/eo.po
--- mutt-2.2.9/po/eo.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/eo.po 2023-09-09 08:47:33.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.8.0\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2021-08-20 16:44+0100\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -144,8 +144,8 @@
msgstr "\"compose\" en Mailcap-dosiero postulas %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Eraro dum ruligo de \"%s\"!"
@@ -1370,7 +1370,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Ne eblas ekzameni la dosieron %s: %s"
@@ -2415,7 +2415,7 @@
msgstr "Nevalida mesaĝnumero."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "Ne eblas forviŝi mesaĝo(j)n"
@@ -2450,7 +2450,7 @@
msgstr "Marki mesaĝojn laŭ la ŝablono: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "Ne eblas malforviŝi mesaĝo(j)n"
@@ -2487,8 +2487,8 @@
msgid "Exit Mutt without saving?"
msgstr "Eliri el Mutt sen skribi?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Fadenoj ne estas ŝaltitaj."
@@ -2575,23 +2575,23 @@
msgid "You are on the first thread."
msgstr "Vi estas ĉe la unua fadeno."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Fadeno enhavas nelegitajn mesaĝojn."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "Ne eblas forviŝi mesaĝon"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "Ne eblas redakti mesaĝon"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "%d etikedoj ŝanĝiĝis."
@@ -2599,44 +2599,44 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "Neniu etikedo ŝanĝiĝis."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "Ne eblas marki mesaĝo(j)n kiel legita(j)n"
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "Tajpu makroan klavon: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "fulmklavo por mesaĝo"
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "Mesaĝo ligiĝis al %s."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "Mesaĝa ID mankas en indekso."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "Ne eblas malforviŝi mesaĝon"
@@ -2773,11 +2773,11 @@
msgid "Can't append to folder: %s"
msgstr "Ne eblas aldoni al dosierujo: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Ŝalti flagon"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Malŝalti flagon"
@@ -3015,7 +3015,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Rajtiĝas (%s)..."
@@ -3153,7 +3153,7 @@
msgid "Error opening mailbox"
msgstr "Eraro dum malfermado de poŝtfako"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Ĉu krei %s?"
@@ -3217,7 +3217,7 @@
msgid "Unsubscribed from %s"
msgstr "Malabonis %s"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Kopias %d mesaĝojn al %s..."
@@ -3548,14 +3548,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3565,14 +3565,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr "Mutt kun %?m?%m mesaĝoj&neniu mesaĝo?%?n? [%n NOVA]?"
@@ -3698,12 +3698,12 @@
#: main.c:88
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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 ""
-"Kopirajto (C) 1996-2022 Michael R. Elkins kaj aliaj.\n"
+"Kopirajto (C) 1996-2023 Michael R. Elkins kaj aliaj.\n"
"Mutt venas kun ABSOLUTE NENIA GARANTIO; por detaloj tajpu 'mutt -vv'.\n"
"Mutt estas libera programo, kaj vi rajtas pludoni kopiojn\n"
"sub difinitaj kondiĉoj; tajpu 'mutt -vv' por detaloj.\n"
@@ -5888,28 +5888,28 @@
msgid "Editing backgrounded."
msgstr "Redaktado fonigita."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Nenia limparametro trovita! (Raportu ĉi tiun cimon.)"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s ne plu ekzistas!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s ne estas normala dosiero."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Ne eblas malfermi %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
msgid "Decrypt message attachment?"
msgstr "Ĉu malĉifri kunsendaĵon?"
@@ -5918,7 +5918,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -5931,7 +5931,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -5944,7 +5944,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr "Mankas MIME-speco en eligo de \"%s\"!"
@@ -5954,7 +5954,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr "Mankas malplena linio (apartigilo) en eligo de \"%s\"!"
@@ -5967,7 +5967,7 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
@@ -5975,20 +5975,20 @@
"$send_multipart_alternative_filter ne funkcias por generado de multipart-"
"specoj."
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "Necesas difini $sendmail por povi sendi retpoŝton."
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Eraro dum sendado de mesaĝo; ido finis per %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Eligo de la liverprocezo"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "Malbona IDN %s dum kreado de resent-from."
diff -Nru mutt-2.2.9/po/es.po mutt-2.2.12/po/es.po
--- mutt-2.2.9/po/es.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/es.po 2023-09-09 08:47:33.000000000 +0200
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.4\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2001-06-08 19:44+02:00\n"
"Last-Translator: Boris Wesslowski <Boris@Wesslowski.com>\n"
"Language-Team: -\n"
@@ -139,8 +139,8 @@
msgstr "La entrada \"compose\" en el archivo Mailcap requiere %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "�Error al ejecutar \"%s\"!"
@@ -1393,7 +1393,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, fuzzy, c-format
msgid "Can't stat %s: %s"
msgstr "No se pudo encontrar en disco: %s"
@@ -2487,7 +2487,7 @@
msgstr "N� de mensaje err�."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "No hay mensajes sin suprimir."
@@ -2523,7 +2523,7 @@
msgstr "Marcar mensajes que coincidan con: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "No hay mensajes sin suprimir."
@@ -2563,8 +2563,8 @@
msgid "Exit Mutt without saving?"
msgstr "�Salir de Mutt sin guardar?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "La muestra por hilos no est�ctivada."
@@ -2657,25 +2657,25 @@
msgid "You are on the first thread."
msgstr "Ya est�n el primer hilo."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "El hilo contiene mensajes sin leer."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "No hay mensajes sin suprimir."
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "No se pudo escribir el mensaje"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "Buz�in cambios."
@@ -2683,13 +2683,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "Buz�in cambios."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "saltar al mensaje anterior en el hilo"
@@ -2697,14 +2697,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "Entre keyID para %s: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "Mensaje pospuesto."
@@ -2712,20 +2712,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "Mensaje rebotado."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "No hay mensajes en esa carpeta."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "No hay mensajes sin suprimir."
@@ -2872,11 +2872,11 @@
msgid "Can't append to folder: %s"
msgstr "No se pudo agregar a la carpeta: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Poner indicador"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Quitar indicador"
@@ -3123,7 +3123,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, fuzzy, c-format
msgid "Authenticating (%s)..."
msgstr "Verificando autentidad (APOP)..."
@@ -3268,7 +3268,7 @@
msgid "Error opening mailbox"
msgstr "�Error al escribir el buz�
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "�Crear %s?"
@@ -3335,7 +3335,7 @@
msgid "Unsubscribed from %s"
msgstr "Desuscribiendo de %s..."
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Copiando %d mensajes a %s..."
@@ -3682,14 +3682,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3699,14 +3699,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3843,12 +3843,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins y otros.\n"
+"Copyright (C) 1996-2023 Michael R. Elkins y otros.\n"
"Mutt viene con ABSOLUTAMENTE NINGUNA GARANT�; para obtener detalles\n"
"teclee `mutt -vv'. Mutt es software libre, puede redistribuirlo\n"
"bajo ciertas condiciones; teclee `mutt -vv' para m�detalles.\n"
@@ -6104,28 +6104,28 @@
msgid "Editing backgrounded."
msgstr "Enviando en un proceso en segundo plano."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "El par�tro l�te no fue encontrado. [reporte este error]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "�%s ya no existe!"
-#: sendlib.c:915
+#: sendlib.c:924
#, fuzzy, c-format
msgid "%s isn't a regular file."
msgstr "%s no es un buz�
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "No se pudo abrir %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6136,7 +6136,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6147,7 +6147,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6158,7 +6158,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6168,7 +6168,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6181,26 +6181,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Error al enviar mensaje, proceso hijo termin� (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Salida del proceso de repartici�e correo"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr ""
diff -Nru mutt-2.2.9/po/et.po mutt-2.2.12/po/et.po
--- mutt-2.2.9/po/et.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/et.po 2023-09-09 08:47:33.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.5.2\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2002-12-09 17:19+02:00\n"
"Last-Translator: Toomas Soome <tsoome@muhv.pri.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -141,8 +141,8 @@
msgstr "Mailcap koostamise kirje n� %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Viga \"%s\" k�itamisel!"
@@ -1389,7 +1389,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Ei saa lugeda %s atribuute: %s"
@@ -2467,7 +2467,7 @@
msgstr "Vigane teate number."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "Kustutamata teateid pole."
@@ -2503,7 +2503,7 @@
msgstr "M�i teated mustriga: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "Kustutamata teateid pole."
@@ -2543,8 +2543,8 @@
msgid "Exit Mutt without saving?"
msgstr "V�un Muttist salvestamata?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Teemad ei ole lubatud."
@@ -2637,25 +2637,25 @@
msgid "You are on the first thread."
msgstr "Te olete esimesel teemal."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Teema sisaldab lugemata teateid."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "Kustutamata teateid pole."
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "Teadet ei �stu kirjutada"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "Postkasti ei muudetud."
@@ -2663,13 +2663,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "Postkasti ei muudetud."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "h�eema vanemteatele"
@@ -2677,14 +2677,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "Sisestage v� ID: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "Teade j�i postitusootele."
@@ -2692,20 +2692,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "Teade on peegeldatud."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "Selles kaustas ei ole teateid."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "Kustutamata teateid pole."
@@ -2852,11 +2852,11 @@
msgid "Can't append to folder: %s"
msgstr "Kausta ei saa lisada: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Sea lipp"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Eemalda lipp"
@@ -3096,7 +3096,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, fuzzy, c-format
msgid "Authenticating (%s)..."
msgstr "Autentimine (APOP)..."
@@ -3239,7 +3239,7 @@
msgid "Error opening mailbox"
msgstr "Viga postkasti avamisel!"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Loon %s?"
@@ -3304,7 +3304,7 @@
msgid "Unsubscribed from %s"
msgstr "Loobun kaustast %s..."
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Kopeerin %d teadet kausta %s..."
@@ -3650,14 +3650,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3667,14 +3667,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3810,12 +3810,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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 ""
-"Autori�s (C) 1996-2022 Michael R. Elkins ja teised.\n"
+"Autori�s (C) 1996-2023 Michael R. Elkins ja teised.\n"
"Mutt ei paku MITTE MINGISUGUSEID GARANTIISID; detailid k�ga `mutt -vv'.\n"
"Mutt on vaba tarkvara ja te v� seda teatud tingimustel levitada;\n"
"detailsemat infot saate k�ga `mutt -vv'.\n"
@@ -6085,28 +6085,28 @@
msgid "Editing backgrounded."
msgstr "Saadan taustal."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Eraldaja puudub! [teatage sellest veast]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s ei ole enam!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s ei ole tavaline fail."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "%s ei saa avada"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6117,7 +6117,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6128,7 +6128,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6139,7 +6139,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6149,7 +6149,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6162,26 +6162,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Viga teate saatmisel, alamprotsess l�as %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "V�und saatmise protsessist"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr ""
diff -Nru mutt-2.2.9/po/eu.po mutt-2.2.12/po/eu.po
--- mutt-2.2.9/po/eu.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/eu.po 2023-09-09 08:47:33.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.5.18\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2008-05-20 22:39+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -140,8 +140,8 @@
msgstr "Mailcap konposaketa sarrerak hau behar du %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Errorea \"%s\" abiarazten!"
@@ -1386,7 +1386,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Ezin egiaztatu %s egoera: %s"
@@ -2448,7 +2448,7 @@
msgstr "Mezu zenbaki okerra."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "desezabatu mezua(k)"
@@ -2484,7 +2484,7 @@
msgstr "Horrelako mezuak markatu: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "desezabatu mezua(k)"
@@ -2522,8 +2522,8 @@
msgid "Exit Mutt without saving?"
msgstr "Mutt gorde gabe itxi?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Hari bihurketa ez dago gaiturik."
@@ -2617,25 +2617,25 @@
msgid "You are on the first thread."
msgstr "Lehenengo harian zaude."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Irakurgabeko mezuak dituen haria."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "desezabatu mezua"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "Ezin da mezua idatzi"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "Postakutxak ez du aldaketarik."
@@ -2643,13 +2643,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "Postakutxak ez du aldaketarik."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "markatu mezua(k) irakurri gisa"
@@ -2657,14 +2657,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "IDgakoa sartu: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "Mezua atzeraturik."
@@ -2672,20 +2672,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "Mezua errebotaturik."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "Ez dago mezurik karpeta honetan."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "desezabatu mezua"
@@ -2813,11 +2813,11 @@
msgid "Can't append to folder: %s"
msgstr "Ezin karpetan gehitu: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Bandera ezarri"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Bandera ezabatu"
@@ -3061,7 +3061,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Autentifikazioa (%s)..."
@@ -3203,7 +3203,7 @@
msgid "Error opening mailbox"
msgstr "Postakutxa irekitzean errorea"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Sortu %s?"
@@ -3267,7 +3267,7 @@
msgid "Unsubscribed from %s"
msgstr "%s-ra harpidetzaz ezabaturik"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "%d mezuak %s-ra kopiatzen..."
@@ -3605,14 +3605,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3622,14 +3622,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3765,7 +3765,7 @@
#: main.c:88
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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"
@@ -5987,28 +5987,28 @@
msgid "Editing backgrounded."
msgstr "Bigarren planoan bidaltzen."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Ez da birbidalketa parametroa aurkitu! [errore honen berri eman]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s ez da gehiago existitzen!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s ez da fitxategi erregularra."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Ezin da %s ireki"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6019,7 +6019,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6030,7 +6030,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6041,7 +6041,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6051,7 +6051,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6064,26 +6064,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Errorea mezua bidaltzerakoan, azpiprozesua irteten %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Postaketa prozesuaren irteera"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "%s berbidalketa inprimakia prestatzerakoan IDN okerra."
Binary files /home/bigeasy/tmp/v4V95EIGlA/mutt-2.2.9/po/fi.gmo and /home/bigeasy/tmp/qmuevtIpJv/mutt-2.2.12/po/fi.gmo differ
diff -Nru mutt-2.2.9/po/fi.po mutt-2.2.12/po/fi.po
--- mutt-2.2.9/po/fi.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/fi.po 2023-09-09 08:47:33.000000000 +0200
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: Mutt\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2022-01-31 06:30+0100\n"
"Last-Translator: Flammie A Pirinen <flammie@iki.fi>\n"
"Language-Team: Finnish\n"
@@ -150,8 +150,8 @@
msgstr "Mailcapin compose-tietueessa pitää olla %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Virhe toiminnolla %s."
@@ -1371,7 +1371,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "stat ei onnistunut %s: %s"
@@ -2424,7 +2424,7 @@
msgstr "Viestinnumero ei kelpaa."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "Ei voitu poistaa viestejä"
@@ -2459,7 +2459,7 @@
msgstr "Merkitse täsmäävät viestit: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "Ei voitu perua viestien poistoa"
@@ -2496,8 +2496,8 @@
msgid "Exit Mutt without saving?"
msgstr "Poistutaanko muttista tallentamatta?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Ketjutus ei ole päällä."
@@ -2584,23 +2584,23 @@
msgid "You are on the first thread."
msgstr "Ensimmäisessä ketjussa."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Ketjussa on lukemattomia viestejä."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "Ei voitu poistaa viestejä"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "Ei voitu muokata viestiä"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "%d merkintää muutettu."
@@ -2608,44 +2608,44 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "Ei muuttuneita merkintöjä."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "Ei voitu merkitä viestejä lukemattomiksi"
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "Makronäppäimet: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "viestin pikanäppäin"
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "Viesti yhdistetty makroon %s."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "Ei viesti-ID:tä makrolle."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "Ei voitu perua viestin poistoa"
@@ -2771,11 +2771,11 @@
msgid "Can't append to folder: %s"
msgstr "Ei voitu avata kansiota: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Aseta lippu"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Poista lippu"
@@ -3015,7 +3015,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Autentikoidaan (%s)..."
@@ -3153,7 +3153,7 @@
msgid "Error opening mailbox"
msgstr "Virhe avattaessa postilaatikkoa"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Luodaanko %s?"
@@ -3217,7 +3217,7 @@
msgid "Unsubscribed from %s"
msgstr "Kansion %s tilaus poistettu"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Kopioidaan %d viestiä kansioon %s..."
@@ -3548,14 +3548,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr "^(re|vs|sv)(\\[[0-9]+\\])*:[ \t]*"
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3568,14 +3568,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr "M%?n?AIL&ail?"
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr "Mutt %?m?%m vistieä&ei viestejä?%?n? [%n uusi]?"
@@ -3702,12 +3702,12 @@
#: main.c:88
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins ja muut.\n"
+"Copyright (C) 1996-2023 Michael R. Elkins ja muut.\n"
"Mutt comes with ABSOLUTELY NO WARRANTY; lisätietoja komennolla `mutt -vv'.\n"
"Mutt is free software, and you are welcome to redistribute it\n"
"under certain conditions; lisätietoja komennolla `mutt -vv'.\n"
@@ -5898,28 +5898,28 @@
msgid "Editing backgrounded."
msgstr "Muokkaus taustalla."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Ei rajamerkkiparametriä. (ilmoita ohjelmistovirheestä)"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s ei ole enää olemassa."
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s ei ole tavallinen tiedosto."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Ei voitu avata tiedostoa %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
msgid "Decrypt message attachment?"
msgstr "Dekryptataanko viestin liite?"
@@ -5928,7 +5928,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -5940,7 +5940,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -5952,7 +5952,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr "Mime-tyyppi puuttuu tulosteesta %s."
@@ -5962,7 +5962,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr "Tyhjä rivi -erotin puuttuu tulosteesta %s."
@@ -5975,26 +5975,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr "$send_multipart_alternative_filter ei tue multipart-tyyppien luontia."
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "$sendmail pitää olla asetettuna jotta viestejä voi lähettää."
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Virhe viestin lähetyksessä, lapsiprosessi palautti arvon %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Lähetysprosessin tuloste"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "Huono IDN %s resent-from-otsakkeen valmistelussa."
Binary files /home/bigeasy/tmp/v4V95EIGlA/mutt-2.2.9/po/fr.gmo and /home/bigeasy/tmp/qmuevtIpJv/mutt-2.2.12/po/fr.gmo differ
diff -Nru mutt-2.2.9/po/fr.po mutt-2.2.12/po/fr.po
--- mutt-2.2.9/po/fr.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/fr.po 2023-09-09 08:47:33.000000000 +0200
@@ -35,7 +35,7 @@
msgstr ""
"Project-Id-Version: Mutt 2.1.5-dev\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2022-01-28 15:10+0100\n"
"Last-Translator: Vincent Lefevre <vincent@vinc17.net>\n"
"Language-Team: Vincent Lefevre <vincent@vinc17.net>\n"
@@ -173,8 +173,8 @@
msgstr "L'entrée compose de mailcap nécessite %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Erreur en exécutant \"%s\" !"
@@ -1425,7 +1425,7 @@
# , c-format
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Impossible d'obtenir le statut de %s : %s"
@@ -2499,7 +2499,7 @@
msgstr "Numéro de message invalide."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "Impossible d'effacer le(s) message(s)"
@@ -2535,7 +2535,7 @@
msgstr "Marquer les messages correspondant à : "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "Impossible de récupérer le(s) message(s)"
@@ -2573,8 +2573,8 @@
msgid "Exit Mutt without saving?"
msgstr "Quitter Mutt sans sauvegarder ?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "L'affichage des discussions n'est pas activé."
@@ -2663,23 +2663,23 @@
msgid "You are on the first thread."
msgstr "Vous êtes sur la première discussion."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Cette discussion contient des messages non-lus."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "Impossible d'effacer le message"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "Impossible d'éditer le message"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "%d labels ont changé."
@@ -2687,12 +2687,12 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "Aucun label n'a changé."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "Impossible de marquer le(s) message(s) comme lu(s)"
@@ -2700,32 +2700,32 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "Entrez les touches de la macro : "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "hotkey (marque-page)"
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "Message lié à %s."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "Pas de Message-ID pour la macro."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "Impossible de récupérer le message"
@@ -2856,12 +2856,12 @@
msgstr "Impossible d'ajouter au dossier : %s"
# , c-format
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Positionner l'indicateur"
# , c-format
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Effacer l'indicateur"
@@ -3122,7 +3122,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Authentification (%s)..."
@@ -3264,7 +3264,7 @@
msgstr "Erreur à l'ouverture de la boîte aux lettres"
# , c-format
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Créer %s ?"
@@ -3335,7 +3335,7 @@
msgstr "Désabonné de %s"
# , c-format
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Copie de %d messages dans %s..."
@@ -3689,14 +3689,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr "^(re)(\\[[0-9]+\\])*:[ \t]*"
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3709,14 +3709,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr "C%?n?OURRIER&ourrier?"
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr "Mutt avec %?m?%m messages&aucun message?%?n? [%n NOUV.]?"
@@ -3853,12 +3853,12 @@
#: main.c:88
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins et autres.\n"
+"Copyright (C) 1996-2023 Michael R. Elkins et autres.\n"
"Mutt ne fournit ABSOLUMENT AUCUNE GARANTIE ; tapez `mutt -vv' pour les "
"détails.\n"
"Mutt est un logiciel libre, et vous êtes libre de le redistribuer\n"
@@ -6114,31 +6114,31 @@
msgid "Editing backgrounded."
msgstr "L'édition est passée en arrière-plan."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Pas de paramètre boundary trouvé ! [signalez cette erreur]"
# , c-format
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s n'existe plus !"
# , c-format
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s n'est pas un fichier ordinaire."
# , c-format
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Impossible d'ouvrir %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
msgid "Decrypt message attachment?"
msgstr "Déchiffrer l'attachement du message ?"
@@ -6147,7 +6147,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6160,7 +6160,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6173,7 +6173,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr "Type MIME manquant dans la sortie de \"%s\" !"
@@ -6183,7 +6183,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr "Ligne blanche de séparation manquante dans la sortie de \"%s\" !"
@@ -6196,7 +6196,7 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
@@ -6204,21 +6204,21 @@
"$send_multipart_alternative_filter ne supporte pas la génération de type "
"multipart."
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "$sendmail doit avoir une valeur pour pouvoir envoyer du courrier."
# , c-format
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Erreur en envoyant le message, fils terminé avec le code %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Sortie du processus de livraison"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "Mauvais IDN %s lors de la préparation du resent-from."
diff -Nru mutt-2.2.9/po/ga.po mutt-2.2.12/po/ga.po
--- mutt-2.2.9/po/ga.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/ga.po 2023-09-09 08:47:34.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.5.12\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2006-10-16 14:22-0500\n"
"Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
"Language-Team: Irish <ga@li.org>\n"
@@ -142,8 +142,8 @@
msgstr "T��e %%s in iontr� chumtha Mailcap"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Earr� agus \"%s\" �ith!"
@@ -1390,7 +1390,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "n��ir %s a `stat': %s"
@@ -2458,7 +2458,7 @@
msgstr "Uimhir neamhbhail�heachtaireachta."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "N�aon teachtaireacht nach scriosta."
@@ -2494,7 +2494,7 @@
msgstr "Clibe� teachtaireachta�t�omhoiri� le: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "N�aon teachtaireacht nach scriosta."
@@ -2533,8 +2533,8 @@
msgid "Exit Mutt without saving?"
msgstr "�righ as Mutt gan s��?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Sn�he gan cumas�
@@ -2626,25 +2626,25 @@
msgid "You are on the first thread."
msgstr "Is �eo an ch� sn�he."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "T�eachtaireachta�an l�h sa sn�he seo."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "N�aon teachtaireacht nach scriosta."
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "N��ir teachtaireacht a scr�h "
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "Bosca poist gan athr�@ -2652,13 +2652,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "Bosca poist gan athr�
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "l� go m�air-theachtaireacht sa sn�he"
@@ -2666,14 +2666,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "Iontr� aitheantas na heochrach: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "Cuireadh an teachtaireacht ar athl�
@@ -2681,20 +2681,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "Scinneadh an teachtaireacht."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "N�aon teachtaireacht san fhillte�sin."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "N�aon teachtaireacht nach scriosta."
@@ -2822,11 +2822,11 @@
msgid "Can't append to folder: %s"
msgstr "N��ir aon rud a iarcheangal leis an fhillte� %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Socraigh bratach"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Glan bratach"
@@ -3074,7 +3074,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "�fh�dheimhni�)..."
@@ -3216,7 +3216,7 @@
msgid "Error opening mailbox"
msgstr "Earr� ag oscailt an bhosca poist"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Cruthaigh %s?"
@@ -3280,7 +3280,7 @@
msgid "Unsubscribed from %s"
msgstr "D�ost�te �"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "%d teachtaireacht �c�� go %s..."
@@ -3621,14 +3621,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3638,14 +3638,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3782,12 +3782,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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 � 1996-2022 Michael R. Elkins agus daoine eile.\n"
+"Copyright � 1996-2023 Michael R. Elkins agus daoine eile.\n"
"N�bar�a AR BITH le Mutt; iontr� `mutt -vv' chun tuilleadh\n"
"eolais a fh�. Is saorbhogearra �utt: is f�ir leat �"
"a athdh�eadh, agus f�te, ach de r� coinn�lacha �ithe.\n"
@@ -6022,28 +6022,28 @@
msgid "Editing backgrounded."
msgstr "�seoladh sa ch�"
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "N� aims�h paraim�ar teorann! [seol tuairisc fhabht]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "N�%s ann n� m�
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "N�n�chomhad %s."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "N�bh fh�ir %s a oscailt"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6054,7 +6054,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6065,7 +6065,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6076,7 +6076,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6086,7 +6086,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6099,28 +6099,28 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr ""
"Earr� agus teachtaireacht �eoladh, scoir an macphr�as le st�s %d "
"(%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Aschur an phr�s seolta"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "DrochIDN %s agus resent-from �llmh�iff -Nru mutt-2.2.9/po/gl.po mutt-2.2.12/po/gl.po
--- mutt-2.2.9/po/gl.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/gl.po 2023-09-09 08:47:34.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.3\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2001-04-22 22:05+0200\n"
"Last-Translator: Roberto Suarez Soto <ask4it@bigfoot.com>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -141,8 +141,8 @@
msgstr "A entrada \"compose\" no ficheiro Mailcap require %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "�Erro executando \"%s\"!"
@@ -1397,7 +1397,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, fuzzy, c-format
msgid "Can't stat %s: %s"
msgstr "Non foi atopado: %s"
@@ -2495,7 +2495,7 @@
msgstr "N� de mensaxe inv�do."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "Non hai mensaxes recuperadas."
@@ -2531,7 +2531,7 @@
msgstr "Marcar as mensaxes que coincidan con: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "Non hai mensaxes recuperadas."
@@ -2571,8 +2571,8 @@
msgid "Exit Mutt without saving?"
msgstr "�Sa�de Mutt sen gardar?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Enfiamento non habilitado."
@@ -2665,25 +2665,25 @@
msgid "You are on the first thread."
msgstr "Est�o primeiro f�
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "O f�cont�mensaxes sen ler."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "Non hai mensaxes recuperadas."
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "Non foi posible escribi-la mensaxe"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "O buz�on cambiou."
@@ -2691,13 +2691,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "O buz�on cambiou."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "saltar �ensaxe pai no f�
@@ -2705,14 +2705,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "Introduza keyID para %s: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "Mensaxe posposta."
@@ -2720,20 +2720,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "Mensaxe rebotada."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "Non hai mensaxes nese buz�
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "Non hai mensaxes recuperadas."
@@ -2880,11 +2880,11 @@
msgid "Can't append to folder: %s"
msgstr "Non foi posible engadir �arpeta: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "P�ndicador"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Limpar indicador"
@@ -3132,7 +3132,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, fuzzy, c-format
msgid "Authenticating (%s)..."
msgstr "Autenticando (APOP)..."
@@ -3279,7 +3279,7 @@
msgid "Error opening mailbox"
msgstr "�Erro cando se estaba a escribi-lo buz�
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "�Crear %s?"
@@ -3346,7 +3346,7 @@
msgid "Unsubscribed from %s"
msgstr "Borrando a subscripci�on %s..."
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Copiando %d mensaxes a %s..."
@@ -3693,14 +3693,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3710,14 +3710,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3854,12 +3854,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 de Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 de Michael R. Elkins and others.\n"
"Mutt v�sen NING� TIPO DE GARANTIA; para ve-los detalles, escriba `mutt -"
"vv'.\n"
"Mutt �oftware libre, e vostede �envido cando desexe redistribuilo \n"
@@ -6127,28 +6127,28 @@
msgid "Editing backgrounded."
msgstr "Mandando en segundo plano."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "�Non se atopout par�tro \"boundary\"! [informe deste erro]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "�Xa non existe %s!"
-#: sendlib.c:915
+#: sendlib.c:924
#, fuzzy, c-format
msgid "%s isn't a regular file."
msgstr "%s non �n buz�
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Non foi posible abrir %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6159,7 +6159,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6170,7 +6170,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6181,7 +6181,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6191,7 +6191,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6204,26 +6204,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Erro enviando mensaxe, o proceso fillo sa�con %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Sa� do proceso de distribuci�
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr ""
diff -Nru mutt-2.2.9/po/hu.po mutt-2.2.12/po/hu.po
--- mutt-2.2.9/po/hu.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/hu.po 2023-09-09 08:47:34.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.5.4i\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2003-08-01 13:56+0000\n"
"Last-Translator: Szabolcs Horv� <horvaths@fi.inf.elte.hu>\n"
"Language-Team: LME Magyaritasok Lista <magyar@lists.linux.hu>\n"
@@ -142,8 +142,8 @@
msgstr "A mailcap-ba \"compose\" bejegyz�sz�s %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Hiba a(z) \"%s\" futtat�kor!"
@@ -1390,7 +1390,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "%s nem olvashat�s"
@@ -2475,7 +2475,7 @@
msgstr "�v�telen lev�z�"
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "Nincs vissza��tt lev�"
@@ -2511,7 +2511,7 @@
msgstr "Minta a levelek kijel��z: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "Nincs vissza��tt lev�"
@@ -2551,8 +2551,8 @@
msgid "Exit Mutt without saving?"
msgstr "Kil�z a Muttb�ent�n�l?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "A t�z�le van tiltva."
@@ -2645,25 +2645,25 @@
msgid "You are on the first thread."
msgstr "Ez az els�ma."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "A t�ban olvasatlan levelek vannak."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "Nincs vissza��tt lev�"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "Nem lehet �i a levelet"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "Postafi��ozatlan."
@@ -2671,13 +2671,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "Postafi��ozatlan."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "ugr�a lev�el�ny� ebben a t�ban"
@@ -2685,14 +2685,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "Add meg a kulcsID-t: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "A lev�el lett halasztva."
@@ -2700,20 +2700,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "Lev�visszak�"
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "Nincs lev�ebben a postafi�n."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "Nincs vissza��tt lev�"
@@ -2860,11 +2860,11 @@
msgid "Can't append to folder: %s"
msgstr "Nem lehet hozz�zni a(z) %s postafi�z"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Jelz���sa"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Jelz�rl�"
@@ -3107,7 +3107,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, fuzzy, c-format
msgid "Authenticating (%s)..."
msgstr "Azonos�s (APOP)..."
@@ -3250,7 +3250,7 @@
msgid "Error opening mailbox"
msgstr "Hiba a postafi�egnyit�or"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "%s l�ehoz�?"
@@ -3315,7 +3315,7 @@
msgid "Unsubscribed from %s"
msgstr "%s le�sa..."
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "%d lev�m�l� a %s postafi�..."
@@ -3662,14 +3662,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3679,14 +3679,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3820,12 +3820,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins �sokan m�k.\n"
+"Copyright (C) 1996-2023 Michael R. Elkins �sokan m�k.\n"
"A Mutt-ra SEMMIF�E GARANCIA NINCS; a r�letek� � be: `mutt -vv'.\n"
"A Mutt szabad szoftver, �terjesztheted az al�i felt�lek\n"
"szerint; � be a `mutt -vv'-t a r�letek�.\n"
@@ -6111,28 +6111,28 @@
msgid "Editing backgrounded."
msgstr "K�a h��en."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Nem tal�at�t�l�ram�r! [jelentsd ezt a hib�"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s t� nem l�zik!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s nem egy hagyom�os f�."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "%s nem nyithat�g"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6143,7 +6143,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6154,7 +6154,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6165,7 +6165,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6175,7 +6175,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6188,26 +6188,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Hiba a lev�elk� k�n, a gyermek folyamat kil�tt: %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "A k�es� folyamat kimenete"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "Hib�IDN %s a resent-from mez��z�sekor"
diff -Nru mutt-2.2.9/po/id.po mutt-2.2.12/po/id.po
--- mutt-2.2.9/po/id.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/id.po 2023-09-09 08:47:34.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.5.17\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2007-11-07 10:39+1100\n"
"Last-Translator: Ronny Haryanto <ronny@haryan.to>\n"
"Language-Team: Indonesian <web@linux.or.id>\n"
@@ -142,8 +142,8 @@
msgstr "'compose' di file mailcap membutuhkan %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Gagal menjalankan \"%s\"!"
@@ -1390,7 +1390,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Tidak bisa stat %s: %s"
@@ -2471,7 +2471,7 @@
msgstr "Tidak ada nomer begitu."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "tidak jadi hapus surat(-surat)"
@@ -2507,7 +2507,7 @@
msgstr "Tandai surat-surat yang: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "tidak jadi hapus surat(-surat)"
@@ -2545,8 +2545,8 @@
msgid "Exit Mutt without saving?"
msgstr "Keluar dari Mutt tanpa menyimpan?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Tidak disetting untuk melakukan threading."
@@ -2640,25 +2640,25 @@
msgid "You are on the first thread."
msgstr "Anda di thread yang pertama."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Thread berisi surat yang belum dibaca."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "tidak jadi hapus surat"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "Tidak dapat menulis surat"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "Kotak surat tidak berubah."
@@ -2666,13 +2666,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "Kotak surat tidak berubah."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "loncat ke surat induk di thread ini"
@@ -2680,14 +2680,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "Masukkan keyID: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "Surat ditunda."
@@ -2695,20 +2695,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "Surat telah dibounce."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "Tidak ada surat di kotak tersebut."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "tidak jadi hapus surat"
@@ -2836,11 +2836,11 @@
msgid "Can't append to folder: %s"
msgstr "Tidak bisa menambah ke kotak surat: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Tandai"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Batal ditandai"
@@ -3085,7 +3085,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Mengauthentikasi (%s)..."
@@ -3227,7 +3227,7 @@
msgid "Error opening mailbox"
msgstr "Error saat membuka kotak surat"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Buat %s?"
@@ -3291,7 +3291,7 @@
msgid "Unsubscribed from %s"
msgstr "Berhenti langganan dari %s"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Menyalin %d surat ke %s..."
@@ -3629,14 +3629,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3646,14 +3646,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3789,12 +3789,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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 ""
-"Hak Cipta (C) 1996-2022 Michael R. Elkins dan kawan-kawan.\n"
+"Hak Cipta (C) 1996-2023 Michael R. Elkins dan kawan-kawan.\n"
"Mutt TIDAK menyertakan jaminan dalam bentuk apapun; baca 'mutt -vv'.\n"
"Mutt adalah software bebas, anda diperbolehkan utk menyebarluaskannya\n"
"dengan beberapa persyaratan; baca 'mutt -vv' utk jelasnya.\n"
@@ -6009,28 +6009,28 @@
msgid "Editing backgrounded."
msgstr "Mengirim di latar belakang."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Tidak ada parameter batas yang bisa ditemukan! [laporkan error ini]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s tidak ada lagi!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s bukan file biasa."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Tidak bisa membuka %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6041,7 +6041,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6052,7 +6052,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6063,7 +6063,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6073,7 +6073,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6086,26 +6086,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Error mengirimkan surat, proses keluar dengan kode %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Keluaran dari proses pengiriman"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "IDN %s pada saat mempersiapkan resent-from tidak benar."
diff -Nru mutt-2.2.9/po/it.po mutt-2.2.12/po/it.po
--- mutt-2.2.9/po/it.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/it.po 2023-09-09 08:47:34.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.5.21\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2012-05-25 22:14+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: none\n"
@@ -142,8 +142,8 @@
msgstr "La voce compose di mailcap richiede %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Errore eseguendo \"%s\"!"
@@ -1382,7 +1382,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Impossibile eseguire lo stat di %s: %s"
@@ -2447,7 +2447,7 @@
msgstr "Numero del messaggio non valido."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "ripristina messaggio(i)"
@@ -2483,7 +2483,7 @@
msgstr "Segna i messaggi corrispondenti a: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "ripristina messaggio(i)"
@@ -2521,8 +2521,8 @@
msgid "Exit Mutt without saving?"
msgstr "Uscire da Mutt senza salvare?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Il threading non è attivo."
@@ -2617,25 +2617,25 @@
msgid "You are on the first thread."
msgstr "Sei al primo thread."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Il thread contiene messaggi non letti."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "ripristina messaggio"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "Impossibile scrivere il messaggio"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "La mailbox non è stata modificata."
@@ -2643,13 +2643,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "La mailbox non è stata modificata."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "segna messaggio(i) come letto(i)"
@@ -2657,14 +2657,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "Inserire il keyID: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "Il messaggio è stato rimandato."
@@ -2672,20 +2672,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "Messaggio rimbalzato."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "In questo folder non ci sono messaggi."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "ripristina messaggio"
@@ -2813,11 +2813,11 @@
msgid "Can't append to folder: %s"
msgstr "Impossibile accodare al folder: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Imposta il flag"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Cancella il flag"
@@ -3061,7 +3061,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Autenticazione in corso (%s)..."
@@ -3203,7 +3203,7 @@
msgid "Error opening mailbox"
msgstr "Errore durante l'apertura della mailbox"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Creare %s?"
@@ -3267,7 +3267,7 @@
msgid "Unsubscribed from %s"
msgstr "Sottoscrizione rimossa da %s..."
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Copia di %d messaggi in %s..."
@@ -3604,14 +3604,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3621,14 +3621,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3763,12 +3763,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins e altri.\n"
+"Copyright (C) 1996-2023 Michael R. Elkins e altri.\n"
"Mutt non ha ALCUNA GARANZIA; usare `mutt -vv' per i dettagli.\n"
"Mutt è software libero e sei invitato a ridistribuirlo\n"
"sotto certe condizioni; scrivere `mutt -vv' per i dettagli.\n"
@@ -5988,28 +5988,28 @@
msgid "Editing backgrounded."
msgstr "Invio in background."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Nessun parametro limite trovato! [segnalare questo errore]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s non esiste più!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s non è un file regolare."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Impossibile aprire %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6020,7 +6020,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6031,7 +6031,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6042,7 +6042,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6052,7 +6052,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6065,26 +6065,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Errore nell'invio del messaggio, il figlio è uscito con %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Output del processo di consegna"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "Trovato l'IDN %s non valido preparando l'header resent-from"
Binary files /home/bigeasy/tmp/v4V95EIGlA/mutt-2.2.9/po/ja.gmo and /home/bigeasy/tmp/qmuevtIpJv/mutt-2.2.12/po/ja.gmo differ
diff -Nru mutt-2.2.9/po/ja.po mutt-2.2.12/po/ja.po
--- mutt-2.2.9/po/ja.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/ja.po 2023-09-09 08:47:34.000000000 +0200
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the Mutt package.
# FIRST AUTHOR Kikutani Makoto <kikutani@Galaxy.net>, 1999.
# 2nd AUTHOR OOTA,Toshiya <ribbon@users.sourceforge.net>, 2002.
-# (with TAKAHASHI Tamotsu <ttakah@lapis.plala.or.jp>, 2003, 2004, 2005, 2007, 2008, 2009, 2011, 2013, 2015, 2016, 2017, 2018, 2019, 2020).
-# oota toshiya <ribbon@users.sourceforge.net>, 2008, 2011, 2017, 2018, 2020.
+# (with TAKAHASHI Tamotsu <ttakah@lapis.plala.or.jp>, 2003, 2004, 2005, 2007, 2008, 2009, 2011, 2013, 2015, 2016, 2017, 2018, 2019, 2020, 2023).
+# oota toshiya <ribbon@users.sourceforge.net>, 2008, 2011, 2017, 2018, 2020, 2023.
#
msgid ""
msgstr ""
-"Project-Id-Version: Mutt 1.14\n"
+"Project-Id-Version: Mutt 2.2.10\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
-"PO-Revision-Date: 2020-04-22 15:00+0900\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
+"PO-Revision-Date: 2023-06-05 16:20+0900\n"
"Last-Translator: TAKAHASHI Tamotsu <ttakah@lapis.plala.or.jp>\n"
"Language-Team: mutt-j <mutt-j-users@lists.osdn.me>\n"
"Language: ja\n"
@@ -143,8 +143,8 @@
msgstr "Mailcap 編集エントリに %%s が必要"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "\"%s\" 実行エラー!"
@@ -273,10 +273,8 @@
#. they just entered.
#.
#: autocrypt/autocrypt.c:187
-#, fuzzy
-#| msgid "That email address already has an autocrypt account"
msgid "That email address is already assigned to an autocrypt account"
-msgstr "そのアドレスには既に autocrypt アカウントがある"
+msgstr "そのアドレスは既に autocrypt アカウントに割当済み"
#. L10N:
#. Autocrypt has a setting "prefer-encrypt".
@@ -310,9 +308,8 @@
#. email when the engine is not available.
#.
#: autocrypt/autocrypt.c:543 autocrypt/autocrypt.c:551
-#, fuzzy
msgid "Autocrypt is not available."
-msgstr "親メッセージが利用できない。"
+msgstr "autocrypt が利用できない。"
#. L10N:
#. Error displayed if the user tries to force sending an Autocrypt
@@ -320,9 +317,9 @@
#. %s is the From email address used to look up the Autocrypt account.
#.
#: autocrypt/autocrypt.c:565
-#, fuzzy, c-format
+#, c-format
msgid "Autocrypt is not enabled for %s."
-msgstr "%s の (正しい) autocrypt 鍵が見つからない。"
+msgstr "%s には autocrypt が有効でない。"
#. L10N:
#. %s is an email address. Autocrypt is scanning for the keyids
@@ -991,37 +988,29 @@
#. Message when an index/pager save operation fails for some reason.
#.
#: commands.c:1049
-#, fuzzy
-#| msgid "Error sending message."
msgid "Error saving message"
-msgstr "メッセージ送信エラー。"
+msgstr "メッセージ保存エラー"
#. L10N:
#. Message when an index tagged save operation fails for some reason.
#.
#: commands.c:1054
-#, fuzzy
-#| msgid "Saving tagged messages..."
msgid "Error saving tagged messages"
-msgstr "タグ付きメッセージを保存中..."
+msgstr "タグ付きメッセージ保存エラー"
#. L10N:
#. Message when an index/pager copy operation fails for some reason.
#.
#: commands.c:1062
-#, fuzzy
-#| msgid "Error bouncing message!"
msgid "Error copying message"
-msgstr "メッセージ再送エラー!"
+msgstr "メッセージコピーエラー"
#. L10N:
#. Message when an index tagged copy operation fails for some reason.
#.
#: commands.c:1067
-#, fuzzy
-#| msgid "Copying tagged messages..."
msgid "Error copying tagged messages"
-msgstr "タグ付きメッセージをコピー中..."
+msgstr "タグ付きメッセージコピーエラー"
#: commands.c:1140
#, c-format
@@ -1296,10 +1285,8 @@
#. it's worth confirming they really meant to do it.
#.
#: compose.c:645
-#, fuzzy
-#| msgid "Really delete mailbox \"%s\"?"
msgid "Really delete the main message?"
-msgstr "本当にメールボックス \"%s\" を削除?"
+msgstr "本当にメインメッセージを削除?"
#: compose.c:746 compose.c:756 menu.c:695
msgid "You are on the last entry."
@@ -1376,7 +1363,7 @@
# system call の stat() を「属性調査」と訳している
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "%s を属性調査できない: %s"
@@ -2279,7 +2266,7 @@
#: curs_lib.c:478
#, c-format
msgid "See $%s for more information."
-msgstr ""
+msgstr "詳細な情報は $%s 変数を確認すること。"
#: curs_lib.c:532
msgid "Exit Mutt?"
@@ -2382,7 +2369,7 @@
#.
#: curs_main.c:730
msgid "Mailbox reconnected. Some changes may have been lost."
-msgstr ""
+msgstr "メールボックスに再接続した。変更が失われていることがある。"
#: curs_main.c:734
msgid "New mail in this mailbox."
@@ -2417,7 +2404,7 @@
msgstr "不正なメッセージ番号。"
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "メッセージを削除できない"
@@ -2452,7 +2439,7 @@
msgstr "メッセージにタグを付けるためのパターン: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "メッセージの削除状態を解除できない"
@@ -2489,8 +2476,8 @@
msgid "Exit Mutt without saving?"
msgstr "保存しないで Mutt を抜ける?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "スレッド表示が有効になっていない。"
@@ -2577,23 +2564,23 @@
msgid "You are on the first thread."
msgstr "すでに最初のスレッド。"
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "スレッド中に未読メッセージがある。"
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "メッセージを削除できない"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "メッセージを編集できない"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "%d 個のラベルが変更された。"
@@ -2601,12 +2588,12 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "ラベルは変更されなかった。"
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "メッセージを既読にマークできない"
@@ -2614,47 +2601,36 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "マクロ名を入力: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "(mark-message キー)"
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "メッセージは %s に割り当てられた。"
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "マクロ化するための Message-ID がない。"
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "メッセージの削除状態を解除できない"
#: edit.c:42
-#, fuzzy
-#| msgid ""
-#| "~~\t\tinsert a line beginning 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"
msgid ""
"~~\t\tinsert a line beginning with a single ~\n"
"~b addresses\tadd addresses to the Bcc: field\n"
@@ -2667,8 +2643,8 @@
"~p\t\tprint the message\n"
msgstr ""
"~~\t\t行が ~ で始まるときの最初の ~ を入力\n"
-"~b users\tBcc: フィールドにユーザを追加\n"
-"~c users\tCc: フィールドにユーザを追加\n"
+"~b addresses\tBcc: フィールドにアドレスを追加\n"
+"~c addresss\tCc: フィールドにアドレスを追加\n"
"~f messages\tメッセージを取り込み\n"
"~F messages\tヘッダも含めることを除けば ~f と同じ\n"
"~h\t\tメッセージヘッダを編集\n"
@@ -2777,11 +2753,11 @@
msgid "Can't append to folder: %s"
msgstr "フォルダに追加できない: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "フラグ設定"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "フラグ解除"
@@ -3027,7 +3003,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "認証中 (%s)..."
@@ -3036,9 +3012,9 @@
#. %s is the authentication type, for example OAUTHBEARER
#.
#: imap/auth_oauth.c:68
-#, fuzzy, c-format
+#, c-format
msgid "%s authentication failed."
-msgstr "認証に失敗した。"
+msgstr "%s 認証に失敗した。"
#: imap/auth_sasl.c:236 imap/auth_sasl_gnu.c:135 pop_auth.c:190 pop_auth.c:281
msgid "SASL authentication failed."
@@ -3101,7 +3077,7 @@
#.
#: imap/command.c:492
msgid "A fatal error occurred. Will attempt reconnection."
-msgstr ""
+msgstr "致命的なエラーが発生。再接続を試みる。"
#: imap/command.c:504
#, c-format
@@ -3139,26 +3115,23 @@
#. tries to reconnect.
#.
#: imap/imap.c:593
-#, fuzzy
msgid "Trying to reconnect..."
-msgstr "応答待ち..."
+msgstr "再接続中..."
#. L10N:
#. Message when Mutt tries to reconnect to an IMAP mailbox but is
#. unable to.
#.
#: imap/imap.c:698
-#, fuzzy
msgid "Reconnect failed. Mailbox closed."
-msgstr "事前接続コマンドが失敗。"
+msgstr "再接続が失敗。メールボックスを閉じた。"
#. L10N:
#. Message when Mutt reconnects to an IMAP mailbox after a fatal error.
#.
#: imap/imap.c:709
-#, fuzzy
msgid "Reconnect succeeded."
-msgstr "事前接続コマンドが失敗。"
+msgstr "再接続成功。"
#: imap/imap.c:819
#, c-format
@@ -3169,7 +3142,7 @@
msgid "Error opening mailbox"
msgstr "メールボックスオープン時エラー"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "%s を作成?"
@@ -3233,7 +3206,7 @@
msgid "Unsubscribed from %s"
msgstr "%s の購読を取り消した"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "%d メッセージを %s にコピー中..."
@@ -3266,10 +3239,8 @@
#. using a normal download.
#.
#: imap/message.c:821
-#, fuzzy
-#| msgid "Reopening mailbox..."
msgid "QRESYNC failed. Reopening mailbox."
-msgstr "メールボックス再オープン中..."
+msgstr "QRESYNC 失敗。メールボックス再オープン。"
#: imap/message.c:876
msgid "Unable to fetch headers from this IMAP server version."
@@ -3462,9 +3433,8 @@
msgstr "source: %s でエラー"
#: init.c:2969
-#, fuzzy
msgid "run: too many arguments"
-msgstr "push: 引数が多すぎる"
+msgstr "run: 引数が多すぎる"
#: init.c:2992
msgid "source: too many arguments"
@@ -3486,10 +3456,9 @@
#. then %s will print the function name: '<view-file>'.
#.
#: init.c:3348
-#, fuzzy, c-format
-#| msgid "%s is not a directory."
+#, c-format
msgid "Use '%s' to select a directory"
-msgstr "%s はディレクトリではない。"
+msgstr "'%s' でディレクトリを選択"
#: init.c:3680
#, c-format
@@ -3543,9 +3512,8 @@
#. $forward_attribution_trailer default value
#.
#: init.h:1339
-#, fuzzy
msgid "----- End forwarded message -----"
-msgstr "転送メッセージを編集?"
+msgstr ""
#. L10N:
#. $reply_regexp default value.
@@ -3569,14 +3537,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3586,14 +3554,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3668,53 +3636,44 @@
#: listmenu.c:51 listmenu.c:62
msgid "Post"
-msgstr ""
+msgstr "投稿"
#: listmenu.c:52 listmenu.c:63
-#, fuzzy
-#| msgid "Subscribed to %s"
msgid "Subscribe"
-msgstr "%s を購読を開始した"
+msgstr "購読開始"
#: listmenu.c:53 listmenu.c:64
-#, fuzzy
-#| msgid "Unsubscribed from %s"
msgid "Unsubscribe"
-msgstr "%s の購読を取り消した"
+msgstr "購読取消"
#: listmenu.c:54 listmenu.c:66
msgid "Owner"
-msgstr ""
+msgstr "所有者"
#: listmenu.c:65
msgid "Archives"
-msgstr ""
+msgstr "過去ログ"
#. L10N: given when an rfc 2369 action is not specified by this message
#: listmenu.c:216
-#, fuzzy, c-format
-#| msgid "No decryption engine available for message"
+#, c-format
msgid "No list action available for %s."
-msgstr "利用できる復号化エンジンがない"
+msgstr "%s に利用できるリスト動作がない。"
#. L10N: given when a message's rfc 2369 action is not mailto:
#: listmenu.c:223
msgid "List actions only support mailto: URIs. (Try a browser?)"
-msgstr ""
+msgstr "リスト動作は mailto: URI のみ対応。(ブラウザ用?)"
#. L10N: given when mailto: URI was unparsable while trying to execute it
#: listmenu.c:232
-#, fuzzy
-#| msgid "Could not reopen mailbox!"
msgid "Could not parse mailto: URI."
-msgstr "メールボックスを再オープンできなかった!"
+msgstr "mailto: URI を解析できなかった。"
#. L10N: menu name for list actions
#: listmenu.c:259
-#, fuzzy
-#| msgid "No mailing lists found!"
msgid "Available mailing list actions"
-msgstr "メーリングリストが見つからなかった!"
+msgstr "利用できるメーリングリスト動作"
#: main.c:83
msgid ""
@@ -3729,7 +3688,7 @@
#: main.c:88
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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"
@@ -3818,12 +3777,12 @@
" -D\t\t変数をすべて標準出力へ表示"
#: main.c:156
-#, fuzzy
-#| msgid " -d <level>\tlog debugging output to ~/.muttdebug0"
msgid ""
" -d <level>\tlog debugging output to ~/.muttdebug0\n"
"\t\t0 => no debugging; <0 => do not rotate .muttdebug files"
-msgstr " -d <レベル>\tデバグ出力を ~/.muttdebug0 に記録"
+msgstr ""
+" -d <レベル>\tデバッグ出力を ~/.muttdebug0 に記録\n"
+"\t\t0 はデバッグなし; マイナスは .muttdebug ファイルのローテートなし"
#: main.c:160
msgid ""
@@ -3907,10 +3866,8 @@
#. file fails for some reason.
#.
#: main.c:1173
-#, fuzzy
-#| msgid "Cannot create filter"
msgid "Cannot parse draft file\n"
-msgstr "フィルタを作成できない"
+msgstr "下書きファイルを解析できない\n"
#: main.c:1244
#, c-format
@@ -4059,7 +4016,7 @@
#: mutt_lisp.c:62
#, c-format
msgid "MuttLisp: unclosed backticks: %s"
-msgstr ""
+msgstr "MuttLisp: バッククオートが閉じていない: %s"
#. L10N:
#. Printed when a MuttLisp list is missing a matching closing
@@ -4068,7 +4025,7 @@
#: mutt_lisp.c:123
#, c-format
msgid "MuttLisp: unclosed list: %s"
-msgstr ""
+msgstr "MuttLisp: リストが閉じていない: %s"
#. L10N:
#. An error printed for the 'if' function if the condition is missing.
@@ -4077,15 +4034,15 @@
#: mutt_lisp.c:399
#, c-format
msgid "MuttLisp: missing if condition: %s"
-msgstr ""
+msgstr "MuttLisp: if の条件がない: %s"
#. L10N:
#. Printed when a function is called that is not recognized by MuttLisp.
#.
#: mutt_lisp.c:447
-#, fuzzy, c-format
+#, c-format
msgid "MuttLisp: no such function %s"
-msgstr "%s という機能はない"
+msgstr "MuttLisp: %s という機能はない"
#: mutt_sasl.c:199
msgid "Unknown SASL profile"
@@ -4157,11 +4114,11 @@
#.
#: mutt_ssl.c:222 mutt_ssl_gnutls.c:232
msgid "Warning: clearing unexpected server data before TLS negotiation"
-msgstr ""
+msgstr "警告: TLS ネゴシエーション前に予期せぬサーバデータが来たが無視する"
#: mutt_ssl.c:300 mutt_ssl.c:584
msgid "Warning: error enabling ssl_verify_partial_chains"
-msgstr "警告: ssl_verify_partial_chains エラー"
+msgstr "警告: ssl_verify_partial_chains がエラーで有効にできない"
#: mutt_ssl.c:386
msgid "Failed to find enough entropy on your system"
@@ -4254,10 +4211,8 @@
msgstr "証明書ホスト検査に不合格: %s"
#: mutt_ssl.c:1263 mutt_ssl_gnutls.c:883
-#, fuzzy
-#| msgid "Warning: Couldn't save certificate"
msgid "Untrusted server certificate"
-msgstr "警告: 証明書を保存できなかった"
+msgstr "信頼できないサーバ証明書"
#: mutt_ssl.c:1272 mutt_ssl_gnutls.c:938
msgid "This certificate belongs to:"
@@ -4339,10 +4294,9 @@
#. to decrypt the cert. %s is the hostname.
#.
#: mutt_ssl.c:1457 mutt_ssl_gnutls.c:1285
-#, fuzzy, c-format
-#| msgid "Password for %s@%s: "
+#, c-format
msgid "Password for %s client cert: "
-msgstr "%s@%s のパスワード: "
+msgstr "%s のクライアント証明書パスワード: "
#: mutt_ssl_gnutls.c:143 mutt_ssl_gnutls.c:171
msgid "Error: no TLS socket open"
@@ -4474,8 +4428,7 @@
msgstr "POP メールボックスにはメッセージを保存できない"
#: muttlib.c:2016
-#, fuzzy, c-format
-#| msgid "Append messages to %s?"
+#, c-format
msgid "Append message(s) to %s?"
msgstr "%s にメッセージを追加?"
@@ -4530,10 +4483,8 @@
#. a mailbox.
#.
#: mx.c:834
-#, fuzzy
-#| msgid "Unable to open temporary file!"
msgid "Unable to append to trash folder"
-msgstr "一時ファイルをオープンできない!"
+msgstr "ごみ箱に追加できない"
#: mx.c:843
msgid "Can't open trash folder"
@@ -4633,7 +4584,7 @@
#.
#: pager.c:2652
msgid "Already skipped past headers."
-msgstr ""
+msgstr "すでにヘッダをスキップしている。"
#. L10N:
#. Displayed if <skip-headers> is invoked in the pager, but there is
@@ -4643,7 +4594,7 @@
#.
#: pager.c:2671
msgid "No text past headers."
-msgstr ""
+msgstr "ヘッダの後にテキストがない。"
#: parse.c:715
msgid "multipart message has no boundary parameter!"
@@ -4653,223 +4604,211 @@
#. Pattern Completion Menu description for ~A
#.
#: pattern.c:71
-#, fuzzy
msgid "all messages"
-msgstr "メッセージを整列"
+msgstr "すべてのメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~b
#.
#: pattern.c:76
msgid "messages whose body matches EXPR"
-msgstr ""
+msgstr "本文が EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~B
#.
#: pattern.c:81
msgid "messages whose body or headers match EXPR"
-msgstr ""
+msgstr "本文またはヘッダが EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~c
#.
#: pattern.c:86
msgid "messages whose CC header matches EXPR"
-msgstr ""
+msgstr "CC ヘッダが EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~C
#.
#: pattern.c:91
msgid "messages whose recipient matches EXPR"
-msgstr ""
+msgstr "宛先が EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~d
#.
#: pattern.c:96
msgid "messages sent in DATERANGE"
-msgstr ""
+msgstr "DATERANGE 内に送信されたメッセージ"
-# CHECK_ACL - 「できない」が後ろに続く
#. L10N:
#. Pattern Completion Menu description for ~D
#.
#: pattern.c:101
-#, fuzzy
msgid "deleted messages"
-msgstr "メッセージを削除"
+msgstr "削除マーク付きメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~e
#.
#: pattern.c:106
msgid "messages whose Sender header matches EXPR"
-msgstr ""
+msgstr "Sender ヘッダが EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~E
#.
#: pattern.c:111
-#, fuzzy
msgid "expired messages"
-msgstr "メッセージを整列"
+msgstr "期限切れメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~f
#.
#: pattern.c:116
msgid "messages whose From header matches EXPR"
-msgstr ""
+msgstr "From ヘッダが EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~F
#.
#: pattern.c:121
-#, fuzzy
msgid "flagged messages"
-msgstr "タグ付きメッセージがない。"
+msgstr "フラグ付きメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~g
#.
#: pattern.c:126
-#, fuzzy
msgid "cryptographically signed messages"
-msgstr "書きかけのメッセージを呼び出す"
+msgstr "暗号で署名されたメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~G
#.
#: pattern.c:131
-#, fuzzy
msgid "cryptographically encrypted messages"
-msgstr "暗号化メッセージを復号化できない!"
+msgstr "暗号で暗号化されたメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~h
#.
#: pattern.c:136
msgid "messages whose header matches EXPR"
-msgstr ""
+msgstr "ヘッダが EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~H
#.
#: pattern.c:141
msgid "messages whose spam tag matches EXPR"
-msgstr ""
+msgstr "スパムタグが EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~i
#.
#: pattern.c:146
msgid "messages whose Message-ID matches EXPR"
-msgstr ""
+msgstr "Message-ID が EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~k
#.
#: pattern.c:151
-#, fuzzy
msgid "messages which contain PGP key"
-msgstr "(mark-message キー)"
+msgstr "PGP 鍵を含むメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~l
#.
#: pattern.c:156
msgid "messages addressed to known mailing lists"
-msgstr ""
+msgstr "既知のメーリングリストに宛てたメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~L
#.
#: pattern.c:161
msgid "messages whose From/Sender/To/CC matches EXPR"
-msgstr ""
+msgstr "From/Sender/To/CC が EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~m
#.
#: pattern.c:166
msgid "messages whose number is in RANGE"
-msgstr ""
+msgstr "番号が RANGE 内のメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~M
#.
#: pattern.c:171
msgid "messages with a Content-Type matching EXPR"
-msgstr ""
+msgstr "Content-Type が EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~n
#.
#: pattern.c:176
msgid "messages whose score is in RANGE"
-msgstr ""
+msgstr "score が RANGE 内のメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~N
#.
#: pattern.c:181
-#, fuzzy
msgid "new messages"
-msgstr "新着メッセージがない。"
+msgstr "新着メッセージ"
#. L10N:
#. Pattern Completion Menu description for ~O
#.
#: pattern.c:186
-#, fuzzy
msgid "old messages"
-msgstr "メッセージを整列"
+msgstr "古いメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~p
#.
#: pattern.c:191
msgid "messages addressed to you"
-msgstr ""
+msgstr "自分宛てのメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~P
#.
#: pattern.c:196
-#, fuzzy
msgid "messages from you"
-msgstr "(mark-message キー)"
+msgstr "自分からのメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~Q
#.
#: pattern.c:201
msgid "messages which have been replied to"
-msgstr ""
+msgstr "返信のあるメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~r
#.
#: pattern.c:206
msgid "messages received in DATERANGE"
-msgstr ""
+msgstr "受取が DATERANGE 内のメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~R
#.
#: pattern.c:211
-#, fuzzy
msgid "already read messages"
-msgstr "未読メッセージがない。"
+msgstr "既読メッセージ"
#. L10N:
#. Pattern Completion Menu description for ~s
#.
#: pattern.c:216
msgid "messages whose Subject header matches EXPR"
-msgstr ""
+msgstr "題名ヘッダが EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~S
@@ -4883,102 +4822,92 @@
#. referenced by another email's Supersedes header.
#.
#: pattern.c:229
-#, fuzzy
msgid "superseded messages"
-msgstr "メッセージを整列"
+msgstr "上書き済みメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~t
#.
#: pattern.c:234
msgid "messages whose To header matches EXPR"
-msgstr ""
+msgstr "To ヘッダが EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~T
#.
#: pattern.c:239
-#, fuzzy
msgid "tagged messages"
-msgstr "タグ付きメッセージがない。"
+msgstr "タグ付きメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~u
#.
#: pattern.c:244
-#, fuzzy
msgid "messages addressed to subscribed mailing lists"
-msgstr "指定済みメーリングリスト宛てに返信"
+msgstr "購読済みメーリングリスト宛てのメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~U
#.
#: pattern.c:249
-#, fuzzy
msgid "unread messages"
-msgstr "未読メッセージがない。"
+msgstr "未読メッセージ"
#. L10N:
#. Pattern Completion Menu description for ~v
#.
#: pattern.c:254
-#, fuzzy
msgid "messages in collapsed threads"
-msgstr "すべてのスレッドを展開/非展開"
+msgstr "非展開スレッド内のメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~V
#.
#: pattern.c:259
msgid "cryptographically verified messages"
-msgstr ""
+msgstr "暗号で検証されたメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~x
#.
#: pattern.c:264
msgid "messages whose References header matches EXPR"
-msgstr ""
+msgstr "References ヘッダが EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~X
#.
#: pattern.c:269
-#, fuzzy
msgid "messages with RANGE attachments"
-msgstr "MIME 添付ファイルを表示"
+msgstr "RANGE 個ファイルが添付されたメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~y
#.
#: pattern.c:274
msgid "messages whose X-Label header matches EXPR"
-msgstr ""
+msgstr "X-Label ヘッダが EXPR に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~z
#.
#: pattern.c:279
msgid "messages whose size is in RANGE"
-msgstr ""
+msgstr "サイズが RANGE 内のメッセージ"
-# CHECK_ACL - 「できない」が後ろに続く
#. L10N:
#. Pattern Completion Menu description for ~=
#.
#: pattern.c:284
-#, fuzzy
msgid "duplicated messages"
-msgstr "メッセージを削除"
+msgstr "重複したメッセージ"
-# CHECK_ACL - 「できない」が後ろに続く
#. L10N:
#. Pattern Completion Menu description for ~$
#.
#: pattern.c:289
-#, fuzzy
msgid "unreferenced messages"
-msgstr "メッセージの削除状態を解除"
+msgstr "参照されていないメッセージ"
#: pattern.c:536 pattern.c:1027
#, c-format
@@ -5010,9 +4939,9 @@
#. %c is the pattern character, i.e. "g".
#.
#: pattern.c:1093
-#, fuzzy, c-format
+#, c-format
msgid "Pattern modifier '~%c' is disabled."
-msgstr "パターン修飾子 '~%c' が無効になっている。"
+msgstr "パターン修飾子 '~%c' が無効。"
#. L10N:
#. An unknown pattern modifier was somehow invoked. This
@@ -5094,14 +5023,14 @@
#.
#: pattern.c:2235
msgid "Patterns"
-msgstr ""
+msgstr "パターン"
#. L10N:
#. Pattern Completion Menu argument type: a regular expression
#.
#: pattern.c:2257
msgid "EXPR"
-msgstr ""
+msgstr "EXPR"
#. L10N:
#. Pattern Completion Menu argument type: a numeric range.
@@ -5109,7 +5038,7 @@
#.
#: pattern.c:2264
msgid "RANGE"
-msgstr ""
+msgstr "RANGE"
#. L10N:
#. Pattern Completion Menu argument type: a date range
@@ -5117,7 +5046,7 @@
#.
#: pattern.c:2271
msgid "DATERANGE"
-msgstr ""
+msgstr "DATERANGE"
#. L10N:
#. Pattern Completion Menu argument type: a nested pattern.
@@ -5125,28 +5054,28 @@
#.
#: pattern.c:2287
msgid "PATTERN"
-msgstr ""
+msgstr "PATTERN"
#. L10N:
#. Pattern Completion Menu description for ~()
#.
#: pattern.c:2296
msgid "messages in threads containing messages matching PATTERN"
-msgstr ""
+msgstr "PATTERN に一致するメッセージを含むスレッド内のメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~<()
#.
#: pattern.c:2306
msgid "messages whose immediate parent matches PATTERN"
-msgstr ""
+msgstr "直接の親が PATTERN に一致するメッセージ"
#. L10N:
#. Pattern Completion Menu description for ~>()
#.
#: pattern.c:2316
msgid "messages having an immediate child matching PATTERN"
-msgstr ""
+msgstr "直接の子が PATTERN に一致するメッセージ"
#: pgp.c:89
msgid "Enter PGP passphrase:"
@@ -5319,8 +5248,7 @@
msgstr "コマンド UIDL をサーバがサポートしていない。"
#: pop.c:325
-#, fuzzy, c-format
-#| msgid "%d messages have been lost. Try reopening the mailbox."
+#, c-format
msgid "%d message(s) have been lost. Try reopening the mailbox."
msgstr "%d 通が消えている。メールボックスを再オープンしてみること。"
@@ -5488,10 +5416,9 @@
#. attachment menu.
#.
#: recvattach.c:476
-#, fuzzy, c-format
-#| msgid "Can't delete attachment from POP server."
+#, c-format
msgid "Convert attachment from %s to %s?"
-msgstr "POP サーバから添付ファイルを削除できない。"
+msgstr "添付ファイルを %s から %s に変換?"
#: recvattach.c:592
msgid "Saving..."
@@ -5510,7 +5437,7 @@
#: recvattach.c:667
#, c-format
msgid "Unable to save attachments to %s. Using cwd"
-msgstr ""
+msgstr "添付ファイルを %s に保存できない。カレントを使用"
#: recvattach.c:766
#, c-format
@@ -5813,10 +5740,9 @@
#. %s is the mailbox name.
#.
#: send.c:1277
-#, fuzzy, c-format
-#| msgid "Saving Fcc to %s"
+#, c-format
msgid "Warning: Fcc to %s failed"
-msgstr "Fcc を %s に保存中"
+msgstr "警告: Fcc を %s に保存失敗"
#. L10N:
#. Called when saving to $record or Fcc failed after sending.
@@ -5907,7 +5833,7 @@
#.
#: send.c:2566
msgid "Fcc failed. Aborting sending."
-msgstr ""
+msgstr "Fcc 失敗。送信を中止する。"
#: send.c:2607
msgid "Could not send the message."
@@ -5939,61 +5865,59 @@
msgid "Editing backgrounded."
msgstr "編集中のメールは裏で継続中。"
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "boundary パラメータがみつからない! [このエラーを報告せよ]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s はもはや存在しない!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s は通常のファイルではない。"
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "%s をオープンできなかった"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
-#, fuzzy
-#| msgid "Print tagged attachment(s)?"
+#: sendlib.c:1330
msgid "Decrypt message attachment?"
-msgstr "タグ付き添付ファイルを印刷?"
+msgstr "添付メッセージを復号?"
#. L10N: Prompt when forwarding a message with
#. $mime_forward_decode set, and there was a problem decoding
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
-msgstr ""
+msgstr "添付するためメッセージをデコード中に問題発生。デコードなしで再試行?"
#. L10N: Prompt when attaching or forwarding a message with
#. $forward_decrypt set, and there was a problem decrypting
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
-msgstr ""
+msgstr "添付するためメッセージを復号中に問題発生。復号なしで再試行?"
#. L10N:
#. The first line of output from $send_multipart_alternative_filter
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr "出力の一行目に MIME 形式がない! (%s)"
@@ -6003,7 +5927,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr "出力の二行目に空行がない! (%s)"
@@ -6016,7 +5940,7 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
@@ -6024,20 +5948,20 @@
"$send_multipart_alternative_filter は入れ子マルチパート生成をサポートしていな"
"い。"
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "$sendmail を設定しないとメールを送信できない。"
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "メッセージ送信エラー。子プロセスが %d (%s) で終了した。"
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "配信プロセスの出力"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "不正な IDN %s を resent-from の準備中に発見。"
@@ -6048,9 +5972,8 @@
#. This is the first part of the string: note with a trailing space.
#.
#: signal.c:115
-#, fuzzy
msgid "Caught signal "
-msgstr "シグナル %d を受け取った。終了。\n"
+msgstr "シグナルを受け取った "
#. L10N:
#. This is printed in the exit handler when a signal is caught.
@@ -6059,9 +5982,8 @@
#. signal number or name.
#.
#: signal.c:125
-#, fuzzy
msgid "... Exiting.\n"
-msgstr "%s... 終了。\n"
+msgstr "... 終了。\n"
#: smime.c:154
msgid "Enter S/MIME passphrase:"
@@ -6349,10 +6271,8 @@
#. compose menu: <view-pager>
#.
#: OPS:33
-#, fuzzy
-#| msgid "force viewing of attachment using mailcap"
msgid "view attachment in pager using copiousoutput mailcap entry"
-msgstr "mailcap を使って添付ファイルを強制表示"
+msgstr "mailcap の copiousoutput エントリを使って添付ファイルをページャに表示"
#. L10N: Help screen description for OP_ATTACH_VIEW_TEXT
#. attachment menu: <view-text>
@@ -6748,10 +6668,8 @@
#. compose menu: <view-alt-pager>
#.
#: OPS:319
-#, fuzzy
-#| msgid "view multipart/alternative using mailcap"
msgid "view multipart/alternative in pager using copiousoutput mailcap entry"
-msgstr "multipart/alternative を mailcap 利用で表示"
+msgstr "multipart/alternative を copiousoutput な mailcap でページャに表示"
#. L10N: Help screen description for OP_COMPOSE_WRITE_MESSAGE
#. compose menu: <write-fcc>
@@ -7182,40 +7100,36 @@
#. pager menu: <list-action>
#.
#: OPS:637
-#, fuzzy
-#| msgid "No mailing lists found!"
msgid "perform mailing list action"
-msgstr "メーリングリストが見つからなかった!"
+msgstr "メーリングリスト動作を実行"
#. L10N: Help screen description for OP_LIST_ARCHIVE
#. list menu: <list-archive>
#.
#: OPS:642
msgid "retrieve list archive information"
-msgstr ""
+msgstr "リスト過去ログ情報を取得"
#. L10N: Help screen description for OP_LIST_HELP
#. list menu: <list-help>
#.
#: OPS:647
msgid "retrieve list help"
-msgstr ""
+msgstr "リストヘルプを取得"
#. L10N: Help screen description for OP_LIST_OWNER
#. list menu: <list-owner>
#.
#: OPS:652
msgid "contact list owner"
-msgstr ""
+msgstr "リスト所有者に連絡"
#. L10N: Help screen description for OP_LIST_POST
#. list menu: <list-post>
#.
#: OPS:657
-#, fuzzy
-#| msgid "reply to specified mailing list"
msgid "post to mailing list"
-msgstr "指定済みメーリングリスト宛てに返信"
+msgstr "メーリングリストに投稿"
#. L10N: Help screen description for OP_LIST_REPLY
#. index menu: <list-reply>
@@ -7230,19 +7144,15 @@
#. list menu: <list-subscribe>
#.
#: OPS:669
-#, fuzzy
-#| msgid "reply to specified mailing list"
msgid "subscribe to mailing list"
-msgstr "指定済みメーリングリスト宛てに返信"
+msgstr "メーリングリストを購読開始"
#. L10N: Help screen description for OP_LIST_UNSUBSCRIBE
#. list menu: <list-unsubscribe>
#.
#: OPS:674
-#, fuzzy
-#| msgid "Unsubscribed from %s"
msgid "unsubscribe from mailing list"
-msgstr "%s の購読を取り消した"
+msgstr "メーリングリストを購読取消"
#. L10N: Help screen description for OP_MACRO
#: OPS:677
@@ -7586,10 +7496,8 @@
#. pager menu: <skip-headers>
#.
#: OPS:928
-#, fuzzy
-#| msgid "skip beyond quoted text"
msgid "skip beyond headers"
-msgstr "引用文をスキップする"
+msgstr "ヘッダをスキップする"
#. L10N: Help screen description for OP_PAGER_TOP
#. pager menu: <top>
@@ -8178,15 +8086,13 @@
msgid "show S/MIME options"
msgstr "S/MIME オプションを表示"
-#, fuzzy
#~ msgid "Warning: Fcc to an IMAP mailbox is not supported in batch mode"
-#~ msgstr "バッチモードでは IMAP メールボックスへの Fcc がサポートされていない"
+#~ msgstr ""
+#~ "警告: バッチモードでは IMAP メールボックスへの Fcc がサポートされていない"
-#, fuzzy, c-format
#~ msgid "Skipping Fcc to %s"
-#~ msgstr "Fcc を %s に保存中"
+#~ msgstr "Fcc は %s をスキップする"
-#, c-format
#~ msgid "Error: value '%s' is invalid for -d.\n"
#~ msgstr "エラー: 値 '%s' は -d には不正。\n"
diff -Nru mutt-2.2.9/po/ko.po mutt-2.2.12/po/ko.po
--- mutt-2.2.9/po/ko.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/ko.po 2023-09-09 08:47:34.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.5.6i\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2004-03-03 10:25+900\n"
"Last-Translator: Im Eunjea <eunjea@kldp.org>\n"
"Language-Team: Im Eunjea <eunjea@kldp.org>\n"
@@ -143,8 +143,8 @@
msgstr "Mailcap ��� ���%%s�� ���"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "\"%s\" �����@ -1389,7 +1389,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "%s: %s� ��� �˼��."
@@ -2464,7 +2464,7 @@
msgstr "�������
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "�� ��ҵ������
@@ -2500,7 +2500,7 @@
msgstr "�ġ�����Ͽ� ǥ��� "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "�� ��ҵ������
@@ -2540,8 +2540,8 @@
msgid "Exit Mutt without saving?"
msgstr "���� �ʰ�utt� ������?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "����� ��� �ƴ�"
@@ -2634,25 +2634,25 @@
msgid "You are on the first thread."
msgstr "ó� �������ϴ�"
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "������� �� ��� ��� ��."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "�� ��ҵ������
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "���� ��� ��
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "���������� ���."
@@ -2660,13 +2660,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "���������� ���."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "������ �������"
@@ -2674,14 +2674,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "keyID ��� "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "������."
@@ -2689,20 +2689,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "�������"
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "���������
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "�� ��ҵ������
@@ -2847,11 +2847,11 @@
msgid "Can't append to folder: %s"
msgstr "���÷��� ���: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "��������"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "��������
@@ -3091,7 +3091,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "�� � (%s)..."
@@ -3234,7 +3234,7 @@
msgid "Error opening mailbox"
msgstr "������������-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "%s�� ������
@@ -3299,7 +3299,7 @@
msgid "Unsubscribed from %s"
msgstr "%s���� ��� Ż� �..."
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "%d��� ����� %s�������.."
@@ -3645,14 +3645,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3662,14 +3662,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3803,12 +3803,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins ��\n"
+"Copyright (C) 1996-2023 Michael R. Elkins ��\n"
"Mutt� �� å��� �� �ʽ�ϴ� ���� ��� 'mutt -vv'�� Ȯ���ñ�"
"�ٶ�. Mutt� ������������� ���� �Ų�ٸ�����в��� ��\n"
"������� ����ϴ� ���� ��� 'mutt -vv'��Ȯ���ñ�ٶ�.\n"
@@ -6062,28 +6062,28 @@
msgid "Editing backgrounded."
msgstr "����� ����."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "�������! [����ٶ�
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s�� �����ġ ���!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s���ùٸ� ��� �ƴ�"
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "%s�� �� ���"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6094,7 +6094,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6105,7 +6105,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6116,7 +6116,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6126,7 +6126,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6139,26 +6139,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "���� ������� ���(%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "�� ����� ���
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "resent-from� �����������DN %s"
diff -Nru mutt-2.2.9/po/lt.po mutt-2.2.12/po/lt.po
--- mutt-2.2.9/po/lt.po 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/lt.po 2023-09-09 08:47:34.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.3.12i\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2000-11-29 21:22+0200\n"
"Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -143,8 +143,8 @@
msgstr "Mailcap k� ��reikia %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Klaida vykdant \"%s\"!"
@@ -1395,7 +1395,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, fuzzy, c-format
msgid "Can't stat %s: %s"
msgstr "Negal�u stat'inti: %s"
@@ -2495,7 +2495,7 @@
msgstr "Blogas lai�numeris."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "N� i�nt��"
@@ -2531,7 +2531,7 @@
msgstr "Pa�ym� lai�, tenkinan�s: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "N� i�nt��"
@@ -2571,8 +2571,8 @@
msgid "Exit Mutt without saving?"
msgstr "I�i i�tt nei�gojus pakeitim�
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Skirstymas gijomis neleid�iamas."
@@ -2665,25 +2665,25 @@
msgid "You are on the first thread."
msgstr "Tu esi ties pirma gija."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Gijoje yra neskaityt��"
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "N� i�nt��"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "Negaliu �� lai�
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "D�t�ra nepakeista."
@@ -2691,13 +2691,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "D�t�ra nepakeista."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "�i ��n�ai�gijoje"
@@ -2705,14 +2705,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "�esk rakto ID, skirt�s: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "Lai� atid�s."
@@ -2720,20 +2720,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "Lai� nukreiptas."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "N� lai�tame aplanke."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "N� i�nt��"
@@ -2880,11 +2880,11 @@
msgid "Can't append to folder: %s"
msgstr "Negaliu pridurti lai�prie aplanko: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "U�d� flag�
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "I�yti flag�
@@ -3130,7 +3130,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, fuzzy, c-format
msgid "Authenticating (%s)..."
msgstr "Autentikuojuosi (APOP)..."
@@ -3276,7 +3276,7 @@
msgid "Error opening mailbox"
msgstr "Klaida ra� �a�d�t�
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Sukurti %s?"
@@ -3343,7 +3343,7 @@
msgid "Unsubscribed from %s"
msgstr "Atsisakau %s..."
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Kopijuoju %d lai� �s..."
@@ -3689,14 +3689,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3706,14 +3706,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3849,12 +3849,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins ir kiti.\n"
+"Copyright (C) 1996-2023 Michael R. Elkins ir kiti.\n"
"Mutt ateina ABSOLIU�AI BE JOKIOS GARANTIJOS; d�smulkmen�eisk 'mutt -"
"vv.'\n"
"Mutt yra free software, ir tu gali laisvai j�latinti su tam\n"
@@ -6117,28 +6117,28 @@
msgid "Editing backgrounded."
msgstr "Siun� fone."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Tr� boundary parametro! [prane�i�laid�
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s nebeegzistuoja!"
-#: sendlib.c:915
+#: sendlib.c:924
#, fuzzy, c-format
msgid "%s isn't a regular file."
msgstr "%s n� pa�d�t�
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Negal�u atidaryti %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6149,7 +6149,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6160,7 +6160,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6171,7 +6171,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6181,7 +6181,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6194,26 +6194,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Klaida siun�nt lai� klaidos kodas %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Pristatymo proceso i�tis"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr ""
diff -Nru mutt-2.2.9/po/mutt.pot mutt-2.2.12/po/mutt.pot
--- mutt-2.2.9/po/mutt.pot 2022-11-12 21:56:25.000000000 +0100
+++ mutt-2.2.12/po/mutt.pot 2023-09-09 08:47:33.000000000 +0200
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: mutt 2.2.9\n"
+"Project-Id-Version: mutt 2.2.12\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -141,8 +141,8 @@
msgstr ""
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr ""
@@ -1355,7 +1355,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr ""
@@ -2356,7 +2356,7 @@
msgstr ""
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr ""
@@ -2391,7 +2391,7 @@
msgstr ""
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr ""
@@ -2428,8 +2428,8 @@
msgid "Exit Mutt without saving?"
msgstr ""
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr ""
@@ -2516,23 +2516,23 @@
msgid "You are on the first thread."
msgstr ""
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr ""
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr ""
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr ""
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr ""
@@ -2540,44 +2540,44 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr ""
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr ""
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr ""
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr ""
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr ""
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr ""
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr ""
@@ -2685,11 +2685,11 @@
msgid "Can't append to folder: %s"
msgstr ""
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr ""
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr ""
@@ -2921,7 +2921,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr ""
@@ -3059,7 +3059,7 @@
msgid "Error opening mailbox"
msgstr ""
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr ""
@@ -3123,7 +3123,7 @@
msgid "Unsubscribed from %s"
msgstr ""
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr ""
@@ -3453,14 +3453,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3470,14 +3470,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3600,7 +3600,7 @@
#: main.c:88
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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"
@@ -5711,28 +5711,28 @@
msgid "Editing backgrounded."
msgstr ""
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr ""
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr ""
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr ""
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr ""
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
msgid "Decrypt message attachment?"
msgstr ""
@@ -5741,7 +5741,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -5752,7 +5752,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -5763,7 +5763,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -5773,7 +5773,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -5786,26 +5786,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr ""
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr ""
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr ""
diff -Nru mutt-2.2.9/po/nl.po mutt-2.2.12/po/nl.po
--- mutt-2.2.9/po/nl.po 2022-11-12 21:56:26.000000000 +0100
+++ mutt-2.2.12/po/nl.po 2023-09-09 08:47:34.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.8.0\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2020-10-24 09:02-0400\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -144,8 +144,8 @@
msgstr "\"compose\"-entry in mailcap vereist %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Fout opgetreden bij het uitvoeren van \"%s\"!"
@@ -1377,7 +1377,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Kan status van %s niet opvragen: %s"
@@ -2425,7 +2425,7 @@
msgstr "Ongeldig berichtnummer."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "Kan bericht(en) niet verwijderen"
@@ -2460,7 +2460,7 @@
msgstr "Markeer berichten volgens patroon: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "Kan bericht(en) niet herstellen"
@@ -2497,8 +2497,8 @@
msgid "Exit Mutt without saving?"
msgstr "Mutt verlaten zonder op te slaan?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Het weergeven van threads is niet ingeschakeld."
@@ -2585,23 +2585,23 @@
msgid "You are on the first thread."
msgstr "U bent al bij de eerste thread."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Thread bevat ongelezen berichten."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "Kan bericht niet verwijderen"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "Kan bericht niet bewerken"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "%d labels veranderd."
@@ -2609,44 +2609,44 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "Geen labels veranderd."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "Kan bericht(en) niet als gelezen markeren"
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "Typ de macrotoetsaanslag: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "berichtsneltoets"
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "Bericht is gebonden aan %s."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "Kan geen ID van dit bericht vinden in de index."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "Kan bericht niet herstellen"
@@ -2785,11 +2785,11 @@
msgid "Can't append to folder: %s"
msgstr "Kan bericht niet toevoegen aan postvak: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Zet markering"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Verwijder markering"
@@ -3032,7 +3032,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Authenticeren (%s)..."
@@ -3173,7 +3173,7 @@
msgid "Error opening mailbox"
msgstr "Er is een fout opgetreden tijdens openen van het postvak"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "%s aanmaken?"
@@ -3237,7 +3237,7 @@
msgid "Unsubscribed from %s"
msgstr "Abonnement op %s opgezegd"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "%d berichten worden gekopieerd naar %s..."
@@ -3572,14 +3572,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3589,14 +3589,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3737,12 +3737,12 @@
#| "Mutt is free software, and you are welcome to redistribute it\n"
#| "under certain conditions; type `mutt -vv' for details.\n"
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins en anderen.\n"
+"Copyright (C) 1996-2023 Michael R. Elkins en anderen.\n"
"Mutt komt ABSOLUUT ZONDER GARANTIE; voor meer informatie 'mutt -vv'.\n"
"Mutt is vrije software, en u bent vrij om het te verspreiden\n"
"onder bepaalde voorwaarden; type 'mutt -vv' voor meer informatie.\n"
@@ -5956,28 +5956,28 @@
msgid "Editing backgrounded."
msgstr "Bericht wordt op de achtergrond bewerkt."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Geen 'boundary parameter' gevonden! [meldt deze fout!]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s bestaat niet meer!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s is geen normaal bestand."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Kan %s niet openen"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -5988,7 +5988,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -5999,7 +5999,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6010,7 +6010,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr "Ontbrekend mime-type in de uitvoer van \"%s\"!"
@@ -6020,7 +6020,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr "Missende lege regel in de uitvoer van \"%s\"!"
@@ -6033,7 +6033,7 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
@@ -6041,20 +6041,20 @@
"$send_multipart_alternative_filter ondersteund niet het aanmaken van "
"multipart-type."
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "$sendmail moet ingesteld zijn om mail te kunnen versturen."
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Fout %d opgetreden tijdens versturen van bericht: %s."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Uitvoer van het afleveringsproces"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "Ongeldige IDN %s tijdens maken resent-from header."
Binary files /home/bigeasy/tmp/v4V95EIGlA/mutt-2.2.9/po/pl.gmo and /home/bigeasy/tmp/qmuevtIpJv/mutt-2.2.12/po/pl.gmo differ
diff -Nru mutt-2.2.9/po/pl.po mutt-2.2.12/po/pl.po
--- mutt-2.2.9/po/pl.po 2022-11-12 21:56:26.000000000 +0100
+++ mutt-2.2.12/po/pl.po 2023-09-09 08:47:34.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.5.17\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2022-02-11 13:36+0100\n"
"Last-Translator: Grzegorz Szymaszek <gszymaszek@short.pl>\n"
"Language-Team: Polish <mutt-po@mutt.org>\n"
@@ -142,8 +142,8 @@
msgstr "Pole „compose” w pliku „mailcap” wymaga %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Błąd uruchomienia „%s”!"
@@ -1366,7 +1366,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Nie można ustalić stanu (stat) %s: %s"
@@ -2414,7 +2414,7 @@
msgstr "Nieprawidłowy numer listu."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "Nie można usunąć listów"
@@ -2449,7 +2449,7 @@
msgstr "Zaznacz pasujące listy: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "Nie można odtworzyć listów."
@@ -2486,8 +2486,8 @@
msgid "Exit Mutt without saving?"
msgstr "Wyjść z Mutta bez zapisywania zmian?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Wątkowanie nie zostało włączone."
@@ -2574,23 +2574,23 @@
msgid "You are on the first thread."
msgstr "To jest pierwszy wątek."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Wątek zawiera nieprzeczytane listy."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "Nie można usunąć listu"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "Nie można edytować listu"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "%d zmienionych etykiet."
@@ -2598,44 +2598,44 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "Nie zmieniono etykiet."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "Nie można zaznaczyć listów jako przeczytane."
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "Podaj makro: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "makro listu"
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "Makro %s zostało przypisane do listu."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "Nie przepisano identyfikatora listu do makra."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "Nie można przywrócić listu"
@@ -2761,11 +2761,11 @@
msgid "Can't append to folder: %s"
msgstr "Nie można dopisać do skrzynki: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Ustaw flagę"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Wyczyść flagę"
@@ -3006,7 +3006,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Uwierzytelnianie (%s)…"
@@ -3146,7 +3146,7 @@
msgid "Error opening mailbox"
msgstr "Błąd otwarcia skrzynki"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Utworzyć %s?"
@@ -3210,7 +3210,7 @@
msgid "Unsubscribed from %s"
msgstr "Odsubskrybowano %s"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Kopiowanie %d listów do %s…"
@@ -3540,14 +3540,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr "^(re|odp)(\\[[0-9]+\\])*:[ \t]*"
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3560,14 +3560,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr "P%?n?OCZTA&oczta?"
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr "Mutt: %?m?%m listów&brak listów?%?n? [%n NOWYCH]?"
@@ -3696,12 +3696,12 @@
#: main.c:88
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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–2022 Michael R. Elkins i inni.\n"
+"Copyright (C) 1996–2023 Michael R. Elkins i inni.\n"
"Mutt nie jest objęty ŻADNĄ GWARANCJĄ; szczegóły poznasz pisząc „mutt -vv”.\n"
"Mutt jest wolnym oprogramowaniem, zapraszamy do jego redystrybucji\n"
"pod pewnymi warunkami; szczegóły poznasz pisząc „mutt -vv”.\n"
@@ -5897,28 +5897,28 @@
msgid "Editing backgrounded."
msgstr "Edytowanie w tle."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Brak parametru granicznego! (Zgłoś ten błąd.)"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s już nie istnieje!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s nie jest zwykłym plikiem."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Nie można otworzyć %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
msgid "Decrypt message attachment?"
msgstr "Odszyfrować załączony list?"
@@ -5927,7 +5927,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -5940,7 +5940,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -5953,7 +5953,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr "Brak typu MIME w wyjściu „%s”!"
@@ -5963,7 +5963,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr "Brak znaku nowej linii w wyjściu „%s”!"
@@ -5976,27 +5976,27 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
"$send_multipart_alternative_filter nie obsługuje generowania typu multipart."
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "Zmienna $sendmail musi być ustawiona aby móc wysyłać listy."
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Błąd podczas wysyłania listu, proces potomny zwrócił %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Wynik procesu dostarczania"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "Błędny IDN %s w trakcie przygotowywania resent-from."
diff -Nru mutt-2.2.9/po/pt_BR.po mutt-2.2.12/po/pt_BR.po
--- mutt-2.2.9/po/pt_BR.po 2022-11-12 21:56:26.000000000 +0100
+++ mutt-2.2.12/po/pt_BR.po 2023-09-09 08:47:34.000000000 +0200
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.1.5i\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2000-03-05 01:14-0300\n"
"Last-Translator: Marcus Brito <marcus@visaotec.com.br>\n"
"Language-Team: LIE-BR (http://lie-br.conectiva.com.br)\n"
@@ -138,8 +138,8 @@
msgstr "Entrada de composi� no mailcap requer %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Erro ao executar \"%s\"!"
@@ -1398,7 +1398,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, fuzzy, c-format
msgid "Can't stat %s: %s"
msgstr "Imposs�l consultar: %s"
@@ -2497,7 +2497,7 @@
msgstr "N� de mensagem inv�do."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "Nenhuma mensagem n�removida."
@@ -2533,7 +2533,7 @@
msgstr "Marcar mensagens que casem com: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "Nenhuma mensagem n�removida."
@@ -2573,8 +2573,8 @@
msgid "Exit Mutt without saving?"
msgstr "Sair do Mutt sem salvar altera�s?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Separar discuss�n�est�tivado."
@@ -2667,25 +2667,25 @@
msgid "You are on the first thread."
msgstr "Voc�st�a primeira discuss�"
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "A discuss�cont�mensagens n�lidas."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "Nenhuma mensagem n�removida."
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "N�foi poss�l gravar a mensagem"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "A caixa de mensagens n�sofreu mudan�"
@@ -2693,13 +2693,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "A caixa de mensagens n�sofreu mudan�"
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "pula para a mensagem pai na discuss�
@@ -2707,14 +2707,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "Informe o conjunto de caracteres: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "Mensagem adiada."
@@ -2722,20 +2722,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "Mensagem repetida."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "Nenhuma mensagem naquela pasta."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "Nenhuma mensagem n�removida."
@@ -2880,11 +2880,11 @@
msgid "Can't append to folder: %s"
msgstr "N��oss�l anexar �asta: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Atribui marca"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Limpa marca"
@@ -3135,7 +3135,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, fuzzy, c-format
msgid "Authenticating (%s)..."
msgstr "Autenticando (CRAM-MD5)..."
@@ -3285,7 +3285,7 @@
msgid "Error opening mailbox"
msgstr "Erro ao gravar a caixa!"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Criar %s?"
@@ -3352,7 +3352,7 @@
msgid "Unsubscribed from %s"
msgstr "Cancelando assinatura de %s..."
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Copiando %d mensagens para %s..."
@@ -3698,14 +3698,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3715,14 +3715,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3858,12 +3858,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins e outros.\n"
+"Copyright (C) 1996-2023 Michael R. Elkins e outros.\n"
"Mutt vem sem NENHUMA GARANTIA; para mais detalhes digite `mutt -vv'.\n"
"Mutt �m programa livre, e voc� encorajado a redistribu�o\n"
"sob certas condi�s; digite `mutt -vv' para os detalhes.\n"
@@ -6151,28 +6151,28 @@
msgid "Editing backgrounded."
msgstr "Enviando em segundo plano."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Nenhum par�tro de fronteira encontrado! [relate este erro]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s n�mais existe!"
-#: sendlib.c:915
+#: sendlib.c:924
#, fuzzy, c-format
msgid "%s isn't a regular file."
msgstr "%s n��ma caixa de correio."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "N�foi poss�l abrir %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6183,7 +6183,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6194,7 +6194,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6205,7 +6205,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6215,7 +6215,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6228,26 +6228,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Erro ao enviar a mensagem, processo filho saiu com c�o %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Sa� do processo de entrega"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr ""
Binary files /home/bigeasy/tmp/v4V95EIGlA/mutt-2.2.9/po/ru.gmo and /home/bigeasy/tmp/qmuevtIpJv/mutt-2.2.12/po/ru.gmo differ
diff -Nru mutt-2.2.9/po/ru.po mutt-2.2.12/po/ru.po
--- mutt-2.2.9/po/ru.po 2022-11-12 21:56:26.000000000 +0100
+++ mutt-2.2.12/po/ru.po 2023-09-09 08:47:34.000000000 +0200
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: Mutt 2.2\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2022-01-30 17:04+0200\n"
"Last-Translator: Vsevolod Volkov <vvv@mutt.org.ua>\n"
"Language-Team: \n"
@@ -143,8 +143,8 @@
msgstr "Указанный в mailcap способ создания требует наличия параметра %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Ошибка выполнения \"%s\"!"
@@ -1366,7 +1366,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Не удалось получить информацию о %s: %s"
@@ -2417,7 +2417,7 @@
msgstr "Неверный номер сообщения."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "Не удалось удалить сообщения"
@@ -2452,7 +2452,7 @@
msgstr "Пометить сообщения по образцу: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "Не удалось восстановить сообщения"
@@ -2489,8 +2489,8 @@
msgid "Exit Mutt without saving?"
msgstr "Выйти из Mutt без сохранения изменений?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Группировка по дискуссиям не включена."
@@ -2578,23 +2578,23 @@
msgid "You are on the first thread."
msgstr "Это первая дискуссия"
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "В дискуссии присутствуют непрочитанные сообщения."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "Не удалось удалить сообщение"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "Не удалось отредактировать сообщение"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "Метки были изменены: %d"
@@ -2602,44 +2602,44 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "Ни одна метка не была изменена."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "Не удалось пометить сообщения как прочитанные"
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "Введите макрос сообщения: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "макрос сообщения"
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "Сообщение связяно с %s."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "Нет Message-ID для создания макроса."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "Не удалось восстановить сообщение"
@@ -2765,11 +2765,11 @@
msgid "Can't append to folder: %s"
msgstr "Не удалось дозаписать почтовый ящик: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Пометить"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Убрать пометку"
@@ -3012,7 +3012,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Аутентификация (%s)..."
@@ -3153,7 +3153,7 @@
msgid "Error opening mailbox"
msgstr "Ошибка открытия почтового ящика"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Создать %s?"
@@ -3217,7 +3217,7 @@
msgid "Unsubscribed from %s"
msgstr "Отключено от %s"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "%d сообщений копируются в %s..."
@@ -3549,14 +3549,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr "^(re|ha|на)(\\[[0-9]+\\])*:[ \t]*"
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3569,14 +3569,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr "M%?n?AIL&ail?"
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr "Mutt: %?m?сообщения: %m&нет сообщений?%?n? [НОВЫЕ: %n]?"
@@ -3704,12 +3704,12 @@
#: main.c:88
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins и другие.\n"
+"Copyright (C) 1996-2023 Michael R. Elkins и другие.\n"
"Mutt распространяется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; для получения более\n"
"подробной информации введите \"mutt -vv\".\n"
"Mutt является свободным программным обеспечением. Вы можете\n"
@@ -5897,28 +5897,28 @@
msgid "Editing backgrounded."
msgstr "Редактирование перенесено в фоновый режим."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Параметр boundary не найден! (Сообщите об этой ошибке)"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s больше не существует!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s не является файлом."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Не удалось открыть %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
msgid "Decrypt message attachment?"
msgstr "Расшифровать вложение?"
@@ -5927,7 +5927,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -5938,7 +5938,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -5949,7 +5949,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr "Отсутствует MIME-тип в выводе \"%s\"!"
@@ -5959,7 +5959,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr "Отсутствует пустая строка-разделитель в выводе \"%s\"!"
@@ -5972,27 +5972,27 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
"$send_multipart_alternative_filter не поддерживает генерацию типа multipart."
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "Для отправки почты должна быть установлена переменная $sendmail."
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Сообщение отправить не удалось, процесс-потомок вернул %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Результат работы программы доставки почты"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "Некорректный IDN %s при подготовке Resent-From."
diff -Nru mutt-2.2.9/po/sk.po mutt-2.2.12/po/sk.po
--- mutt-2.2.9/po/sk.po 2022-11-12 21:56:26.000000000 +0100
+++ mutt-2.2.12/po/sk.po 2023-09-09 08:47:34.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: Mutt 0.95.6i\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 1999-07-29 00:00+0100\n"
"Last-Translator: Miroslav Vasko <vasko@ies.sk>\n"
"Language-Team: Slovak <sk@li.org>\n"
@@ -141,8 +141,8 @@
msgstr "Zostavovacia polo�ka mailcap-u vy�aduje %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, fuzzy, c-format
msgid "Error running \"%s\"!"
msgstr "Chyba pri anal�resy!"
@@ -1404,7 +1404,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, fuzzy, c-format
msgid "Can't stat %s: %s"
msgstr "Nemo�no zisti� stav: %s"
@@ -2492,7 +2492,7 @@
msgstr "Neplatn��o spr�."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "�iadne odmazan�pr�."
@@ -2528,7 +2528,7 @@
msgstr "Ozna�pr� zodpovedaj�"
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "�iadne odmazan�pr�."
@@ -2568,8 +2568,8 @@
msgid "Exit Mutt without saving?"
msgstr "Ukon� Mutt bey ulo�enia?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Vl�enie nie je povolen�
@@ -2662,25 +2662,25 @@
msgid "You are on the first thread."
msgstr "Ste na prvom vl�e."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Vl�o obsahuje ne�an�pr�."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "�iadne odmazan�pr�."
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "upravi� spr�"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "Schr�a nie je zmenen�
@@ -2688,13 +2688,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "Schr�a nie je zmenen�
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "odmaza� v�etky spr� vo vl�e"
@@ -2702,14 +2702,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "Zadajte ID k��re %s: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "Spr� bola odlo�en�
@@ -2717,20 +2717,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "Spr� bola presmerovan�
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "V tejto zlo�ke nie s��."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "�iadne odmazan�pr�."
@@ -2879,11 +2879,11 @@
msgid "Can't append to folder: %s"
msgstr "Nemo�no vytvori� s�%s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Nastavi� pr�ak"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Vymaza� pr�ak"
@@ -3130,7 +3130,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, fuzzy, c-format
msgid "Authenticating (%s)..."
msgstr "Vyber�%s..."
@@ -3277,7 +3277,7 @@
msgid "Error opening mailbox"
msgstr "Chyba pri zapisovan�o schr�y!"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Vytvori� %s?"
@@ -3344,7 +3344,7 @@
msgid "Unsubscribed from %s"
msgstr "Sp�m sa s %s..."
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, fuzzy, c-format
msgid "Copying %d messages to %s..."
msgstr "Pres�pre�an�pr� do %s..."
@@ -3692,14 +3692,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3709,14 +3709,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3849,12 +3849,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins a ostatn�n"
+"Copyright (C) 1996-2023 Michael R. Elkins a ostatn�n"
"Mutt neprich�a so �IADNOU Z�UKOU; pre detaily nap�e `mutt -vv'.\n"
"Mutt je vo�n�ram, a ste v�n�� ho\n"
"za ur��dmienok; nap�e `mutt -vv' pre detaily.\n"
@@ -6132,28 +6132,28 @@
msgid "Editing backgrounded."
msgstr ""
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Nen�en�meter ohrani�ia (boundary)! [ohl�e t�hybu]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s u� viac neexistuje!"
-#: sendlib.c:915
+#: sendlib.c:924
#, fuzzy, c-format
msgid "%s isn't a regular file."
msgstr "%s nie je schr�a"
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Nemo�no otvori� %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6164,7 +6164,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6175,7 +6175,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6186,7 +6186,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6196,7 +6196,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6209,26 +6209,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, fuzzy, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Chyba pri posielan�pr�, dc�ky proces vr�l %d (%s).\n"
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr ""
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr ""
diff -Nru mutt-2.2.9/po/sv.po mutt-2.2.12/po/sv.po
--- mutt-2.2.9/po/sv.po 2022-11-12 21:56:26.000000000 +0100
+++ mutt-2.2.12/po/sv.po 2023-09-09 08:47:34.000000000 +0200
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.5.17\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2007-12-15 14:05+0100\n"
"Last-Translator: Johan Svedberg <johan@svedberg.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -139,8 +139,8 @@
msgstr "\"compose\"-posten i mailcap kräver %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Fel uppstod vid körning av \"%s\"!"
@@ -1385,7 +1385,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Kan inte ta status på %s: %s"
@@ -2453,7 +2453,7 @@
msgstr "Ogiltigt meddelandenummer."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "återställ meddelande(n)"
@@ -2489,7 +2489,7 @@
msgstr "Märk meddelanden som matchar: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "återställ meddelande(n)"
@@ -2527,8 +2527,8 @@
msgid "Exit Mutt without saving?"
msgstr "Avsluta Mutt utan att spara?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Trådning ej aktiverat."
@@ -2622,25 +2622,25 @@
msgid "You are on the first thread."
msgstr "Du är på den första tråden."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Tråden innehåller olästa meddelanden."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "återställ meddelande(n)"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "Kan inte skriva meddelande"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "Brevlåda är oförändrad."
@@ -2648,13 +2648,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "Brevlåda är oförändrad."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "markera meddelande(n) som lästa"
@@ -2662,14 +2662,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "Ange nyckel-ID: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "Meddelande uppskjutet."
@@ -2677,20 +2677,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "Meddelande återsänt."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "Inga meddelanden i den foldern."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "återställ meddelande(n)"
@@ -2818,11 +2818,11 @@
msgid "Can't append to folder: %s"
msgstr "Kan inte lägga till folder: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Sätt flagga"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Ta bort flagga"
@@ -3066,7 +3066,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Verifierar (%s)..."
@@ -3208,7 +3208,7 @@
msgid "Error opening mailbox"
msgstr "Fel vid öppning av brevlåda"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Skapa %s?"
@@ -3272,7 +3272,7 @@
msgid "Unsubscribed from %s"
msgstr "Avslutar prenumeration på %s"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Kopierar %d meddelanden till %s..."
@@ -3610,14 +3610,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3627,14 +3627,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3771,12 +3771,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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 ""
-"Upphovsrätt (C) 1996-2022 Michael R. Elkins med fler.\n"
+"Upphovsrätt (C) 1996-2023 Michael R. Elkins med fler.\n"
"Mutt levereras HELT UTAN GARANTI; för detaljer kör `mutt -vv'.\n"
"Mutt är fri mjukvara, och du är välkommen att sprida det vidare\n"
"under vissa villkor; kör `mutt -vv' för detaljer.\n"
@@ -6009,28 +6009,28 @@
msgid "Editing backgrounded."
msgstr "Skickar i bakgrunden."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Ingen begränsningsparameter hittad! [Rapportera det här felet]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s existerar inte längre!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s är inte en normal fil."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Kunde inte öppna %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6041,7 +6041,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6052,7 +6052,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6063,7 +6063,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6073,7 +6073,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6086,26 +6086,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Fel vid sändning av meddelande, barn returnerade %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Utdata från sändprocessen"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "Felaktigt IDN %s vid förberedning av \"resent-from\"."
Binary files /home/bigeasy/tmp/v4V95EIGlA/mutt-2.2.9/po/tr.gmo and /home/bigeasy/tmp/qmuevtIpJv/mutt-2.2.12/po/tr.gmo differ
diff -Nru mutt-2.2.9/po/tr.po mutt-2.2.12/po/tr.po
--- mutt-2.2.9/po/tr.po 2022-11-12 21:56:26.000000000 +0100
+++ mutt-2.2.12/po/tr.po 2023-09-09 08:47:34.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Mutt 2.2\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2022-04-21 23:00+0300\n"
"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
"Language-Team: https://gitlab.com/bitigchi/mutt\n";
@@ -141,8 +141,8 @@
msgstr "Mailcap oluşturma girdisi %%s gerektiriyor"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "\"%s\" çalıştırılırken hata!"
@@ -1360,7 +1360,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "%s incelenemiyor: %s"
@@ -2413,7 +2413,7 @@
msgstr "Geçersiz ileti numarası."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "İleti(ler) silinemiyor"
@@ -2448,7 +2448,7 @@
msgstr "Şununla eşleşen iletileri imle: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "İleti(ler) kurtarılamıyor"
@@ -2485,8 +2485,8 @@
msgid "Exit Mutt without saving?"
msgstr "Mutt'tan kaydedilmeden mi çıkılsın?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "İlmek kullanımı etkin değil."
@@ -2573,23 +2573,23 @@
msgid "You are on the first thread."
msgstr "İlk ilmektesiniz."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "İlmek okunmamış iletiler içeriyor."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "İleti silinemiyor"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "İleti düzenlenemiyor"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "%d etiket değiştirildi."
@@ -2597,44 +2597,44 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "Değiştirilen bir etiket yok."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "İleti(ler) okunmuş olarak imlenemiyor"
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "Makro vuruşu girin: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "ileti kısayol düğmesi"
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "İleti %s kısayoluna atandı."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "Makrolanacak ileti kimliği yok."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "İletiler kurtarılamıyor"
@@ -2760,11 +2760,11 @@
msgid "Can't append to folder: %s"
msgstr "Klasöre iliştirilemiyor: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Bayrağı ayarla"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Bayrağı sil"
@@ -3006,7 +3006,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Kimlik doğrulanıyor (%s)..."
@@ -3144,7 +3144,7 @@
msgid "Error opening mailbox"
msgstr "Posta kutusu açılırken hata!"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "%s oluşturulsun mu?"
@@ -3208,7 +3208,7 @@
msgid "Unsubscribed from %s"
msgstr "%s aboneliğinden çıkıldı"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "%d ileti %s posta kutusuna kopyalanıyor..."
@@ -3538,14 +3538,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr "^(re|ynt|cvp)(\\[[0-9]+\\])*:[ \t]*"
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3558,14 +3558,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr "M%?n?AIL&ail?"
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr "Mutt, %?m?%m iletiler&no iletiler?%?n? [%n YENİ] ile?"
@@ -3691,12 +3691,12 @@
#: main.c:88
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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 ""
-"Telif hakkı (C) 1996-2022 Michael R. Elkins ve diğerleri.\n"
+"Telif hakkı (C) 1996-2023 Michael R. Elkins ve diğerleri.\n"
"Mutt KESİNLİKLE BİR GARANTİ sunmaz; ayrıntılar için 'mutt -vv' yazın.\n"
"Mutt özgür yazılımdır ve belirli koşullar altında özgürce dağıtılabilir.\n"
"Ayrıntılar için `mutt -vv' yazın.\n"
@@ -5889,28 +5889,28 @@
msgid "Editing backgrounded."
msgstr "Düzenleme ardalana alındı."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Sınırlandırma parametresi bulunamadı! [bu hatayı bildirin]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s artık mevcut değil!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s düzgün bir dosya değil."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "%s açılamadı"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
msgid "Decrypt message attachment?"
msgstr "İleti eki şifresi çözülsün mü?"
@@ -5919,7 +5919,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -5932,7 +5932,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -5945,7 +5945,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr "\"%s\" çıktısından mime türü eksik!"
@@ -5955,7 +5955,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr "\"%s\" çıktısından boş satır ayırıcısı eksik!"
@@ -5968,7 +5968,7 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
@@ -5976,20 +5976,20 @@
"$send_multipart_alternative_filter çok parçalı tür oluşturmasını "
"desteklemiyor."
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "E-posta gönderebilmek için $sendmail ayarlı olmalıdır."
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "İleti gönderilirken hata, alt süreç %d ile sonlandı (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Teslim sürecinin ürettiği çıktı"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "resent-from hazırlanırken hatalı IDN %s."
Binary files /home/bigeasy/tmp/v4V95EIGlA/mutt-2.2.9/po/uk.gmo and /home/bigeasy/tmp/qmuevtIpJv/mutt-2.2.12/po/uk.gmo differ
diff -Nru mutt-2.2.9/po/uk.po mutt-2.2.12/po/uk.po
--- mutt-2.2.9/po/uk.po 2022-11-12 21:56:26.000000000 +0100
+++ mutt-2.2.12/po/uk.po 2023-09-09 08:47:35.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Mutt 2.2\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2022-01-30 16:08+0200\n"
"Last-Translator: Vsevolod Volkov <vvv@mutt.org.ua>\n"
"Language-Team: \n"
@@ -141,8 +141,8 @@
msgstr "Спосіб створення, вказаний у mailcap, потребує параметра %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "Помилка виконання \"%s\"!"
@@ -1361,7 +1361,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "Неможливо отримати дані %s: %s"
@@ -2402,7 +2402,7 @@
msgstr "Невірний номер листа."
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "Неможливо видалити повідомлення"
@@ -2437,7 +2437,7 @@
msgstr "Виділити листи за шаблоном: "
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "Неможливо відновити повідомлення"
@@ -2474,8 +2474,8 @@
msgid "Exit Mutt without saving?"
msgstr "Покинути Mutt без збереження змін?"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "Формування розмов не ввімкнено."
@@ -2562,23 +2562,23 @@
msgid "You are on the first thread."
msgstr "Це перша розмова."
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "Розмова має нечитані листи."
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "Неможливо видалити лист"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "Неможливо редагувати лист"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "Позначки було змінено: %d"
@@ -2586,44 +2586,44 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "Жодної позначки не було змінено."
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "Неможливо позначити лист(и) прочитаним(и)"
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "Введіть макрос листа: "
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "макрос листа"
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "Лист пов’язаний з %s."
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "Немає Message-ID для створення макроса."
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "Неможливо відновити лист"
@@ -2749,11 +2749,11 @@
msgid "Can't append to folder: %s"
msgstr "Неможливо дозаписати до скриньки: %s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "Встановити атрибут"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "Зняти атрибут"
@@ -2992,7 +2992,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "Аутентифікація (%s)..."
@@ -3130,7 +3130,7 @@
msgid "Error opening mailbox"
msgstr "Помилка відкриття поштової скриньки"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "Створити %s?"
@@ -3194,7 +3194,7 @@
msgid "Unsubscribed from %s"
msgstr "Відписано від %s..."
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "Копіювання %d листів до %s..."
@@ -3525,14 +3525,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr "^(re|ha|на)(\\[[0-9]+\\])*:[ \t]*"
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3545,14 +3545,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr "M%?n?AIL&ail?"
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr "Mutt: %?m?повідомлення: %m&немає повідомлень?%?n? [НОВІ: %n]?"
@@ -3679,12 +3679,12 @@
#: main.c:88
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins та інші\n"
+"Copyright (C) 1996-2023 Michael R. Elkins та інші\n"
"Mutt поставляється БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ; детальніше: mutt -vv.\n"
"Mutt -- програмне забезпечення з відкритим кодом, запрошуємо до "
"розповсюдження\n"
@@ -5862,28 +5862,28 @@
msgid "Editing backgrounded."
msgstr "Редагування перенесено в фоновий режим."
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "Немає параметру межі! [сповістіть про цю помилку]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s більше не існує!"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s не є звичайним файлом."
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "Не вийшло відкрити %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
msgid "Decrypt message attachment?"
msgstr "Розшифрувати вкладення?"
@@ -5892,7 +5892,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -5903,7 +5903,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -5914,7 +5914,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr "Відсутній MIME-тип у виводі \"%s\"!"
@@ -5924,7 +5924,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr "Відсутній порожній рядок-роздільник у виводі \"%s\"!"
@@ -5937,27 +5937,27 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
"$send_multipart_alternative_filter не підтримує генерацію типу multipart"
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "$sendmail має бути встановленим для відправки пошти."
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "Помилка відправки, код повернення %d (%s)."
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Вивід процесу доставки"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "Погане IDN %s при підготовці resent-from."
diff -Nru mutt-2.2.9/po/zh_CN.po mutt-2.2.12/po/zh_CN.po
--- mutt-2.2.9/po/zh_CN.po 2022-11-12 21:56:26.000000000 +0100
+++ mutt-2.2.12/po/zh_CN.po 2023-09-09 08:47:35.000000000 +0200
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.11.0\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2015-02-07 12:21+0800\n"
"Last-Translator: lilydjwg <lilydjwg@gmail.com>\n"
"Language-Team: \n"
@@ -143,8 +143,8 @@
msgstr "Mailcap 编写项目需要 %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "执行 \"%s\" 时出错！"
@@ -1379,7 +1379,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, c-format
msgid "Can't stat %s: %s"
msgstr "无法 stat %s：%s"
@@ -2417,7 +2417,7 @@
msgstr "无效的邮件编号。"
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
msgid "Cannot delete message(s)"
msgstr "无法删除邮件"
@@ -2452,7 +2452,7 @@
msgstr "标记符合此模式的邮件："
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
msgid "Cannot undelete message(s)"
msgstr "无法撤销删除邮件"
@@ -2489,8 +2489,8 @@
msgid "Exit Mutt without saving?"
msgstr "不保存便退出 Mutt 吗？"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "线索功能尚未启用。"
@@ -2577,23 +2577,23 @@
msgid "You are on the first thread."
msgstr "您在第一个线索上。"
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "线索中有未读邮件。"
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
msgid "Cannot delete message"
msgstr "无法删除邮件"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
msgid "Cannot edit message"
msgstr "无法编辑邮件"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, c-format
msgid "%d labels changed."
msgstr "%d 标签已改变。"
@@ -2601,44 +2601,44 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
msgid "No labels changed."
msgstr "标签没有改变。"
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
msgid "Cannot mark message(s) as read"
msgstr "无法标记邮件为已读"
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
msgid "Enter macro stroke: "
msgstr "请输入宏按键："
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
msgid "message hotkey"
msgstr "邮件热键"
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, c-format
msgid "Message bound to %s."
msgstr "邮件已绑定到 %s。"
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
msgid "No message ID to macro."
msgstr "没有邮件 ID 对应到宏。"
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
msgid "Cannot undelete message"
msgstr "无法撤销删除邮件"
@@ -2775,11 +2775,11 @@
msgid "Can't append to folder: %s"
msgstr "无法添加到文件夹末尾：%s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "设置标记"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "清除标记"
@@ -3017,7 +3017,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, c-format
msgid "Authenticating (%s)..."
msgstr "认证中 (%s)..."
@@ -3158,7 +3158,7 @@
msgid "Error opening mailbox"
msgstr "打开邮箱时出错"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "创建 %s 吗？"
@@ -3222,7 +3222,7 @@
msgid "Unsubscribed from %s"
msgstr "已退订 %s..."
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "正在复制 %d 个邮件到 %s ..."
@@ -3557,14 +3557,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3574,14 +3574,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3721,12 +3721,12 @@
#| "Mutt is free software, and you are welcome to redistribute it\n"
#| "under certain conditions; type `mutt -vv' for details.\n"
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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-2022 Michael R. Elkins 及其他人。\n"
+"Copyright (C) 1996-2023 Michael R. Elkins 及其他人。\n"
"Mutt 不提供任何保证：请键入“mutt -vv”以获取详细信息。\n"
"Mutt 是自由软件, 欢迎您在遵守指定条款的前提下再次发布；\n"
"请键入“mutt -vv”以获取详细信息。\n"
@@ -5924,28 +5924,28 @@
msgid "Editing backgrounded."
msgstr "正在后台发送。"
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "没有发现 boundary 参数！[请报告这个错误]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s 已经不存在了！"
-#: sendlib.c:915
+#: sendlib.c:924
#, c-format
msgid "%s isn't a regular file."
msgstr "%s 不是常规文件。"
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "无法打开 %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -5956,7 +5956,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -5967,7 +5967,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -5978,7 +5978,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -5988,7 +5988,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6001,26 +6001,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr "为了发送邮件，必须设置 $sendmail。"
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "发送邮件出错，子进程已退出，退出状态码 %d (%s)。"
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "送信进程的输出"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr "当准备 resent-from 时发生错误的 IDN %s。"
diff -Nru mutt-2.2.9/po/zh_TW.po mutt-2.2.12/po/zh_TW.po
--- mutt-2.2.9/po/zh_TW.po 2022-11-12 21:56:26.000000000 +0100
+++ mutt-2.2.12/po/zh_TW.po 2023-09-09 08:47:35.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: Mutt 1.3.22.1\n"
"Report-Msgid-Bugs-To: https://gitlab.com/muttmua/mutt/-/issues\n";
-"POT-Creation-Date: 2022-11-12 12:56-0800\n"
+"POT-Creation-Date: 2023-09-09 14:47+0800\n"
"PO-Revision-Date: 2001-09-06 18:25+0800\n"
"Last-Translator: Anthony Wong <ypwong@debian.org>\n"
"Language-Team: Chinese <zh@li.org>\n"
@@ -141,8 +141,8 @@
msgstr "Mailcap 編輯項目需要 %%s"
#: attach.c:141 attach.c:274 background.c:335 commands.c:343 compose.c:1852
-#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1479 sendlib.c:1517
-#: sendlib.c:1581
+#: compress.c:414 curs_lib.c:305 curs_lib.c:1059 sendlib.c:1488 sendlib.c:1526
+#: sendlib.c:1590
#, c-format
msgid "Error running \"%s\"!"
msgstr "執行 \"%s\" 時發生錯誤！"
@@ -1393,7 +1393,7 @@
#. L10N:
#. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:909
+#: compose.c:1629 editmsg.c:98 editmsg.c:122 editmsg.c:137 sendlib.c:918
#, fuzzy, c-format
msgid "Can't stat %s: %s"
msgstr "無法讀取：%s"
@@ -2487,7 +2487,7 @@
msgstr "無效的信件編號。"
#. L10N: CHECK_ACL
-#: curs_main.c:1009 curs_main.c:2234 pager.c:2796
+#: curs_main.c:1009 curs_main.c:2253 pager.c:2796
#, fuzzy
msgid "Cannot delete message(s)"
msgstr "沒有要反刪除的信件。"
@@ -2523,7 +2523,7 @@
msgstr "標記信件的條件："
#. L10N: CHECK_ACL
-#: curs_main.c:1202 curs_main.c:2590 pager.c:3049
+#: curs_main.c:1202 curs_main.c:2609 pager.c:3049
#, fuzzy
msgid "Cannot undelete message(s)"
msgstr "沒有要反刪除的信件。"
@@ -2563,8 +2563,8 @@
msgid "Exit Mutt without saving?"
msgstr "不儲存便離開 Mutt 嗎？"
-#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2100
-#: flags.c:312 thread.c:1207 thread.c:1263 thread.c:1331
+#: curs_main.c:1551 curs_main.c:1587 curs_main.c:2068 curs_main.c:2119
+#: flags.c:306 thread.c:1207 thread.c:1263 thread.c:1331
msgid "Threading is not enabled."
msgstr "序列功能尚未啟動。"
@@ -2657,25 +2657,25 @@
msgid "You are on the first thread."
msgstr "您已經在第一個序列上。"
-#: curs_main.c:2086
+#: curs_main.c:2105
msgid "Thread contains unread messages."
msgstr "序列中有尚未讀取的信件。"
#. L10N: CHECK_ACL
-#: curs_main.c:2190 pager.c:2763
+#: curs_main.c:2209 pager.c:2763
#, fuzzy
msgid "Cannot delete message"
msgstr "沒有要反刪除的信件。"
#. L10N: CHECK_ACL
-#: curs_main.c:2271
+#: curs_main.c:2290
#, fuzzy
msgid "Cannot edit message"
msgstr "無法寫信件"
#. L10N: This is displayed when the x-label on one or more
#. * messages is edited.
-#: curs_main.c:2308 pager.c:3100
+#: curs_main.c:2327 pager.c:3100
#, fuzzy, c-format
msgid "%d labels changed."
msgstr "信箱沒有變動。"
@@ -2683,13 +2683,13 @@
#. L10N: This is displayed when editing an x-label, but no messages
#. * were updated. Possibly due to canceling at the prompt or if the new
#. * label is the same as the old label.
-#: curs_main.c:2315 pager.c:3104
+#: curs_main.c:2334 pager.c:3104
#, fuzzy
msgid "No labels changed."
msgstr "信箱沒有變動。"
#. L10N: CHECK_ACL
-#: curs_main.c:2408
+#: curs_main.c:2427
#, fuzzy
msgid "Cannot mark message(s) as read"
msgstr "跳到這個序列的主信件"
@@ -2697,14 +2697,14 @@
#. L10N: This is the prompt for <mark-message>. Whatever they
#. enter will be prefixed by $mark_macro_prefix and will become
#. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2444
+#: curs_main.c:2463
#, fuzzy
msgid "Enter macro stroke: "
msgstr "請輸入字符集："
#. L10N: "message hotkey" is the key bindings menu description of a
#. macro created by <mark-message>.
-#: curs_main.c:2452
+#: curs_main.c:2471
#, fuzzy
msgid "message hotkey"
msgstr "信件被延遲寄出。"
@@ -2712,20 +2712,20 @@
#. L10N: This is echoed after <mark-message> creates a new hotkey
#. macro. %s is the hotkey string ($mark_macro_prefix followed
#. by whatever they typed at the prompt.)
-#: curs_main.c:2457
+#: curs_main.c:2476
#, fuzzy, c-format
msgid "Message bound to %s."
msgstr "郵件已被傳送。"
#. L10N: This error is printed if <mark-message> cannot find a
#. Message-ID for the currently selected message in the index.
-#: curs_main.c:2465
+#: curs_main.c:2484
#, fuzzy
msgid "No message ID to macro."
msgstr "檔案夾中沒有信件。"
#. L10N: CHECK_ACL
-#: curs_main.c:2560 pager.c:3032
+#: curs_main.c:2579 pager.c:3032
#, fuzzy
msgid "Cannot undelete message"
msgstr "沒有要反刪除的信件。"
@@ -2872,11 +2872,11 @@
msgid "Can't append to folder: %s"
msgstr "無法把資料加到檔案夾：%s"
-#: flags.c:368
+#: flags.c:362
msgid "Set flag"
msgstr "設定旗標"
-#: flags.c:368
+#: flags.c:362
msgid "Clear flag"
msgstr "清除旗標"
@@ -3123,7 +3123,7 @@
#. %s is the authentication type, such as XOAUTH2 or OAUTHBEARER
#.
#: imap/auth_oauth.c:39 imap/auth_sasl.c:109 imap/auth_sasl_gnu.c:55
-#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:861
+#: pop_auth.c:223 pop_auth.c:430 smtp.c:674 smtp.c:770 smtp.c:862
#, fuzzy, c-format
msgid "Authenticating (%s)..."
msgstr "驗證中 (APOP)…"
@@ -3268,7 +3268,7 @@
msgid "Error opening mailbox"
msgstr "開啟信箱時發生錯誤"
-#: imap/imap.c:1058 imap/imap.c:2573 imap/message.c:1584 muttlib.c:2044
+#: imap/imap.c:1058 imap/imap.c:2592 imap/message.c:1584 muttlib.c:2044
#, c-format
msgid "Create %s?"
msgstr "建立 %s？"
@@ -3334,7 +3334,7 @@
msgid "Unsubscribed from %s"
msgstr "取消訂閱 %s…"
-#: imap/imap.c:2558 imap/message.c:1548
+#: imap/imap.c:2577 imap/message.c:1548
#, c-format
msgid "Copying %d messages to %s..."
msgstr "正在複制 %d 封信件到 %s …"
@@ -3680,14 +3680,14 @@
#. can interfere with testing, so be sure to test with $header_cache
#. unset.
#.
-#: init.h:3293
+#: init.h:3290
msgid "^(re)(\\[[0-9]+\\])*:[ \t]*"
msgstr ""
#. L10N:
#. $status_format default value
#.
-#: init.h:4479
+#: init.h:4476
msgid ""
"-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:"
"%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?B? Back:%B?%?l? %l?]---(%s/%?T?%T/?"
@@ -3697,14 +3697,14 @@
#. L10N:
#. $ts_icon_format default value
#.
-#: init.h:4683
+#: init.h:4680
msgid "M%?n?AIL&ail?"
msgstr ""
#. L10N:
#. $ts_status_format default value
#.
-#: init.h:4700
+#: init.h:4697
msgid "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
msgstr ""
@@ -3838,12 +3838,12 @@
#: main.c:88
#, fuzzy
msgid ""
-"Copyright (C) 1996-2022 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2023 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 ""
-"版權所有 (C) 1996-2022 Michael R. Elkins 及其他人仕。\n"
+"版權所有 (C) 1996-2023 Michael R. Elkins 及其他人仕。\n"
"Mutt 不提供任何保證：需要更詳細的資料，請鍵入 `mutt -vv'。\n"
"Mutt 是一個自由軟體, 歡迎您在某些特定的條件上，重新將它分發。\n"
"若需要更詳細的資料, 請鍵入 `mutt -vv'\n"
@@ -6098,28 +6098,28 @@
msgid "Editing backgrounded."
msgstr "正在背景作業中傳送。"
-#: sendlib.c:459
+#: sendlib.c:468
msgid "No boundary parameter found! [report this error]"
msgstr "沒有發現分界變數！[回報錯誤]"
-#: sendlib.c:490
+#: sendlib.c:499
#, c-format
msgid "%s no longer exists!"
msgstr "%s 已經不存在！"
-#: sendlib.c:915
+#: sendlib.c:924
#, fuzzy, c-format
msgid "%s isn't a regular file."
msgstr "%s 不是信箱。"
-#: sendlib.c:1086
+#: sendlib.c:1095
#, c-format
msgid "Could not open %s"
msgstr "無法開啟 %s"
#. L10N: Prompt for $forward_decrypt when attaching or forwarding
#. a message
-#: sendlib.c:1321
+#: sendlib.c:1330
#, fuzzy
#| msgid "Print tagged attachment(s)?"
msgid "Decrypt message attachment?"
@@ -6130,7 +6130,7 @@
#. the message. If they answer yes the message will be
#. forwarded without decoding.
#.
-#: sendlib.c:1402
+#: sendlib.c:1411
msgid ""
"There was a problem decoding the message for attachment. Try again with "
"decoding turned off?"
@@ -6141,7 +6141,7 @@
#. the message. If they answer yes the message will be attached
#. without decrypting it.
#.
-#: sendlib.c:1410
+#: sendlib.c:1419
msgid ""
"There was a problem decrypting the message for attachment. Try again with "
"decryption turned off?"
@@ -6152,7 +6152,7 @@
#. should be a mime type, e.g. text/html. This error is generated
#. if that is missing.
#.
-#: sendlib.c:1495
+#: sendlib.c:1504
#, c-format
msgid "Missing mime type from output of \"%s\"!"
msgstr ""
@@ -6162,7 +6162,7 @@
#. should be a blank line. This error is generated if the blank line
#. is missing.
#.
-#: sendlib.c:1507
+#: sendlib.c:1516
#, c-format
msgid "Missing blank line separator from output of \"%s\"!"
msgstr ""
@@ -6175,26 +6175,26 @@
#. reports, this error is displayed, and the generation is blocked
#. at the filter level.
#.
-#: sendlib.c:1541
+#: sendlib.c:1550
msgid ""
"$send_multipart_alternative_filter does not support multipart type "
"generation."
msgstr ""
-#: sendlib.c:2720
+#: sendlib.c:2729
msgid "$sendmail must be set in order to send mail."
msgstr ""
-#: sendlib.c:2821
+#: sendlib.c:2830
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "寄送訊息出現錯誤，子程序已結束 %d (%s)。"
-#: sendlib.c:2827
+#: sendlib.c:2836
msgid "Output of the delivery process"
msgstr "Delivery process 的輸出"
-#: sendlib.c:2999
+#: sendlib.c:3008
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr ""
diff -Nru mutt-2.2.9/protos.h mutt-2.2.12/protos.h
--- mutt-2.2.9/protos.h 2022-05-21 18:36:29.000000000 +0200
+++ mutt-2.2.12/protos.h 2023-08-18 05:03:18.000000000 +0200
@@ -275,7 +275,7 @@
void mutt_message_hook (CONTEXT *, HEADER *, int);
void mutt_reset_child_signals (void);
void _mutt_set_flag (CONTEXT *, HEADER *, int, int, int);
-#define mutt_set_flag(a,b,c,d) _mutt_set_flag(a,b,c,d,MUTT_SET_FLAG_UPDATE_CONTEXT|MUTT_SET_FLAG_UPDATE_COLOR)
+#define mutt_set_flag(a,b,c,d) _mutt_set_flag(a,b,c,d,MUTT_SET_FLAG_UPDATE_CONTEXT)
void mutt_shell_escape (void);
void mutt_show_error (void);
void mutt_signal_init (void);
@@ -432,6 +432,7 @@
/* base64.c */
void mutt_to_base64 (unsigned char*, const unsigned char*, size_t, size_t);
+void mutt_to_base64_safeurl (unsigned char*, const unsigned char*, size_t, size_t);
int mutt_from_base64 (char*, const char*, size_t);
void mutt_buffer_to_base64 (BUFFER *, const unsigned char *, size_t);
int mutt_buffer_from_base64 (BUFFER *, const char *);
diff -Nru mutt-2.2.9/rfc2047.c mutt-2.2.12/rfc2047.c
--- mutt-2.2.9/rfc2047.c 2022-05-11 18:57:07.000000000 +0200
+++ mutt-2.2.12/rfc2047.c 2023-09-09 08:32:21.000000000 +0200
@@ -724,7 +724,7 @@
if (*pp == '=')
break;
if ((*pp & ~127) || (c = base64val(*pp)) == -1)
- continue;
+ goto error_out_0;
if (k + 6 >= 8)
{
k -= 2;
diff -Nru mutt-2.2.9/score.c mutt-2.2.12/score.c
--- mutt-2.2.9/score.c 2022-05-11 18:57:07.000000000 +0200
+++ mutt-2.2.12/score.c 2023-08-18 05:03:18.000000000 +0200
@@ -159,16 +159,13 @@
if (hdr->score <= ScoreThresholdDelete)
_mutt_set_flag (ctx, hdr, MUTT_DELETE, 1,
- (upd_ctx ? MUTT_SET_FLAG_UPDATE_CONTEXT : 0) |
- MUTT_SET_FLAG_UPDATE_COLOR);
+ upd_ctx ? MUTT_SET_FLAG_UPDATE_CONTEXT : 0);
if (hdr->score <= ScoreThresholdRead)
_mutt_set_flag (ctx, hdr, MUTT_READ, 1,
- (upd_ctx ? MUTT_SET_FLAG_UPDATE_CONTEXT : 0) |
- MUTT_SET_FLAG_UPDATE_COLOR);
+ upd_ctx ? MUTT_SET_FLAG_UPDATE_CONTEXT : 0);
if (hdr->score >= ScoreThresholdFlag)
_mutt_set_flag (ctx, hdr, MUTT_FLAG, 1,
- (upd_ctx ? MUTT_SET_FLAG_UPDATE_CONTEXT : 0) |
- MUTT_SET_FLAG_UPDATE_COLOR);
+ upd_ctx ? MUTT_SET_FLAG_UPDATE_CONTEXT : 0);
}
int mutt_parse_unscore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err)
diff -Nru mutt-2.2.9/sendlib.c mutt-2.2.12/sendlib.c
--- mutt-2.2.9/sendlib.c 2022-08-05 21:39:43.000000000 +0200
+++ mutt-2.2.12/sendlib.c 2023-09-09 08:32:21.000000000 +0200
@@ -84,6 +84,15 @@
'8', '9', '+', '/'
};
+/* RFC4648 section 5 Base 64 Encoding with URL and Filename Safe Alphabet */
+const char B64Chars_urlsafe[64] = {
+ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+ 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
+ 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
+ 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', '-', '_'
+};
+
static void transform_to_7bit (BODY *a, FILE *fpin);
static void encode_quoted (FGETCONV * fc, FILE *fout, int istext)
@@ -2121,7 +2130,7 @@
else
{
t = strchr (start, ':');
- if (!t || t > end)
+ if (!t || t >= end)
{
dprint (1, (debugfile, "mwoh: warning: header not in "
"'key: value' format!\n"));
@@ -2409,7 +2418,7 @@
/* Add any user defined headers */
for (; tmp; tmp = tmp->next)
{
- if ((p = strchr (tmp->data, ':')))
+ if ((p = strchr (NONULL (tmp->data), ':')))
{
q = p;
@@ -2457,7 +2466,7 @@
for (; h; h = h->next)
{
- if (!(p = strchr (h->data, ':')))
+ if (!(p = strchr (NONULL (h->data), ':')))
continue;
i = p - h->data;
diff -Nru mutt-2.2.9/sidebar.c mutt-2.2.12/sidebar.c
--- mutt-2.2.9/sidebar.c 2022-05-28 20:10:49.000000000 +0200
+++ mutt-2.2.12/sidebar.c 2023-08-18 05:03:18.000000000 +0200
@@ -1,7 +1,7 @@
/* Copyright (C) 2004 Justin Hibbits <jrh29@po.cwru.edu>
* Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
* Copyright (C) 2015-2016 Richard Russon <rich@flatcap.org>
- * Copyright (C) 2016-2017,2020-2021 Kevin J. McCarthy <kevin@8t8.us>
+ * Copyright (C) 2016-2017,2020-2022 Kevin J. McCarthy <kevin@8t8.us>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -Nru mutt-2.2.9/smtp.c mutt-2.2.12/smtp.c
--- mutt-2.2.9/smtp.c 2022-05-21 18:36:29.000000000 +0200
+++ mutt-2.2.12/smtp.c 2023-08-18 05:03:18.000000000 +0200
@@ -849,8 +849,9 @@
/* smtp_auth_oauth: AUTH=OAUTHBEARER support. See RFC 7628 */
static int smtp_auth_oauth (CONNECTION* conn, int xoauth2)
{
- int rc = SMTP_AUTH_FAIL;
+ int rc = SMTP_AUTH_FAIL, smtp_rc;
BUFFER *bearertoken = NULL, *authline = NULL;
+ BUFFER *input_buf = NULL, *smtp_response_buf = NULL;
const char *authtype;
authtype = xoauth2 ? "XOAUTH2" : "OAUTHBEARER";
@@ -862,16 +863,41 @@
bearertoken = mutt_buffer_pool_get ();
authline = mutt_buffer_pool_get ();
+ input_buf = mutt_buffer_pool_get ();
+ smtp_response_buf = mutt_buffer_pool_get ();
/* We get the access token from the smtp_oauth_refresh_command */
if (mutt_account_getoauthbearer (&conn->account, bearertoken, xoauth2))
goto cleanup;
- mutt_buffer_printf (authline, "AUTH %s %s\r\n", authtype, mutt_b2s (bearertoken));
+ if (xoauth2)
+ {
+ mutt_buffer_printf (authline, "AUTH %s\r\n", authtype);
+ if (mutt_socket_write (conn, mutt_b2s (authline)) == -1)
+ goto cleanup;
+ if (smtp_get_auth_response (conn, input_buf, &smtp_rc, smtp_response_buf) < 0)
+ goto saslcleanup;
+ if (smtp_rc != smtp_ready)
+ goto saslcleanup;
+
+ mutt_buffer_printf (authline, "%s\r\n", mutt_b2s (bearertoken));
+ }
+ else
+ {
+ mutt_buffer_printf (authline, "AUTH %s %s\r\n", authtype, mutt_b2s (bearertoken));
+ }
if (mutt_socket_write (conn, mutt_b2s (authline)) == -1)
goto cleanup;
- if (smtp_get_resp (conn) != 0)
+ if (smtp_get_auth_response (conn, input_buf, &smtp_rc, smtp_response_buf) < 0)
+ goto saslcleanup;
+ if (!smtp_success (smtp_rc))
+ goto saslcleanup;
+
+ rc = SMTP_AUTH_SUCCESS;
+
+saslcleanup:
+ if (rc != SMTP_AUTH_SUCCESS)
{
/* The error response was in SASL continuation, so continue the SASL
* to cause a failure and exit SASL input. See RFC 7628 3.2.3
@@ -879,13 +905,12 @@
*/
mutt_socket_write (conn, "AQ==\r\n");
smtp_get_resp (conn);
- goto cleanup;
}
- rc = SMTP_AUTH_SUCCESS;
-
cleanup:
mutt_buffer_pool_release (&bearertoken);
mutt_buffer_pool_release (&authline);
+ mutt_buffer_pool_release (&input_buf);
+ mutt_buffer_pool_release (&smtp_response_buf);
return rc;
}
diff -Nru mutt-2.2.9/thread.c mutt-2.2.12/thread.c
--- mutt-2.2.9/thread.c 2022-05-11 18:57:07.000000000 +0200
+++ mutt-2.2.12/thread.c 2023-08-18 05:03:18.000000000 +0200
@@ -1321,7 +1321,7 @@
{
THREAD *thread, *top;
HEADER *roothdr = NULL;
- int final, reverse = (Sort & SORT_REVERSE), minmsgno;
+ int final;
int num_hidden = 0, new = 0, old = 0;
int min_unread_msgno = INT_MAX, min_unread = cur->virtual;
#define CHECK_LIMIT (!ctx->pattern || cur->limited)
@@ -1340,7 +1340,6 @@
while (!thread->message)
thread = thread->child;
cur = thread->message;
- minmsgno = cur->msgno;
if (!cur->read && CHECK_LIMIT)
{
@@ -1401,12 +1400,6 @@
final = roothdr->virtual;
}
- if (reverse && (flag & MUTT_THREAD_COLLAPSE) && (cur->msgno < minmsgno) && CHECK_LIMIT)
- {
- minmsgno = cur->msgno;
- final = cur->virtual;
- }
-
if (flag & MUTT_THREAD_COLLAPSE)
{
if (cur != roothdr)
diff -Nru mutt-2.2.9/UPDATING mutt-2.2.12/UPDATING
--- mutt-2.2.9/UPDATING 2022-11-12 21:43:57.000000000 +0100
+++ mutt-2.2.12/UPDATING 2023-09-09 08:41:44.000000000 +0200
@@ -9,6 +9,20 @@
The keys used are:
!: modified feature, -: deleted feature, +: new feature
+2.2.12 (2023-09-09):
+
+ ! Bug fix release.
+
+2.2.11 (2023-08-18):
+
+ ! Bug fix release.
+
+2.2.10 (2023-03-25):
+
+ ! Bug fix release.
+ ! $message_id_format %r and %z expandos use a URL-safe Base64 encoding:
+ '-' and '_' instead of '+' and '/'.
+
2.2.9 (2022-11-12):
! Bug fix release.
diff -Nru mutt-2.2.9/VERSION mutt-2.2.12/VERSION
--- mutt-2.2.9/VERSION 2022-11-12 21:44:36.000000000 +0100
+++ mutt-2.2.12/VERSION 2023-09-09 08:42:31.000000000 +0200
@@ -1 +1 @@
-2.2.9
+2.2.12
Reply to: