Re: [PATCH 0 of 3] patchbomb patch-1.5.24-index_format-ToCc.1.patch

[Kevin J. McCarthy]

On Fri, Sep 18, 2015 at 05:22:18PM -0400, Derek Schrock wrote:
> patch to add %r %R index_format expandos and resize attribution to a 
> LONG_STRING 

Hi Derek,

Thanks for submitting the patch series!  I'm just getting back to my
computer after an extended break, but will take a closer look at the
series in the next couple days.

One quick comment: in your patch 2 update to the UPDATING file, it might
be better to just put "unreleased" instead of a date for "default".

-- 
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA
http://www.8t8.us/configs/gpg-key-transition-statement.txt


signature.asc
Description: PGP signature

mutt: Translation improvements.

[Brendan Cully]

changeset: 6508:61c754a8effd
user:  Kevin McCarthy 
date:  Sun Sep 20 18:58:58 2015 +0800
link:  http://dev.mutt.org/hg/mutt/rev/61c754a8effd

Translation improvements.

Thanks to TAKAHASHI Tamotsu for pointing out these ones I missed.

diffs (73 lines):

diff -r e85eda4ee425 -r 61c754a8effd pager.c
--- a/pager.c   Sun Sep 13 14:41:54 2015 +0800
+++ b/pager.c   Sun Sep 20 18:58:58 2015 +0800
@@ -79,7 +79,8 @@
 #define CHECK_ACL(aclbit,action) \
if (!mutt_bit_isset(Context->rights,aclbit)) { \
mutt_flushinp(); \
-   mutt_error (_("Cannot %s: Operation not permitted by 
ACL"), action); \
+/* L10N: %s is one of the CHECK_ACL entries below. */ \
+   mutt_error (_("%s: Operation not permitted by ACL"), 
action); \
break; \
}
 
@@ -2353,7 +2354,8 @@
   case OP_DELETE:
CHECK_MODE(IsHeader (extra));
CHECK_READONLY;
-   CHECK_ACL(M_ACL_DELETE, _("delete message"));
+/* L10N: CHECK_ACL */
+   CHECK_ACL(M_ACL_DELETE, _("Cannot delete message"));
 
mutt_set_flag (Context, extra->hdr, M_DELETE, 1);
 if (option (OPTDELETEUNTAG))
@@ -2384,7 +2386,8 @@
   case OP_DELETE_SUBTHREAD:
CHECK_MODE(IsHeader (extra));
CHECK_READONLY;
-   CHECK_ACL(M_ACL_DELETE, _("delete message(s)"));
+/* L10N: CHECK_ACL */
+   CHECK_ACL(M_ACL_DELETE, _("Cannot delete message(s)"));
 
r = mutt_thread_set_flag (extra->hdr, M_DELETE, 1,
  ch == OP_DELETE_THREAD ? 0 : 1);
@@ -2504,7 +2507,8 @@
   case OP_FLAG_MESSAGE:
CHECK_MODE(IsHeader (extra));
CHECK_READONLY;
-   CHECK_ACL(M_ACL_WRITE, "flag message");
+/* L10N: CHECK_ACL */
+   CHECK_ACL(M_ACL_WRITE, "Cannot flag message");
 
mutt_set_flag (Context, extra->hdr, M_FLAG, !extra->hdr->flagged);
redraw = REDRAW_STATUS | REDRAW_INDEX;
@@ -2660,7 +2664,8 @@
   case OP_TOGGLE_NEW:
CHECK_MODE(IsHeader (extra));
CHECK_READONLY;
-   CHECK_ACL(M_ACL_SEEN, _("toggle new"));
+/* L10N: CHECK_ACL */
+   CHECK_ACL(M_ACL_SEEN, _("Cannot toggle new"));
 
if (extra->hdr->read || extra->hdr->old)
  mutt_set_flag (Context, extra->hdr, M_NEW, 1);
@@ -2679,7 +2684,8 @@
   case OP_UNDELETE:
CHECK_MODE(IsHeader (extra));
CHECK_READONLY;
-   CHECK_ACL(M_ACL_DELETE, _("undelete message"));
+/* L10N: CHECK_ACL */
+   CHECK_ACL(M_ACL_DELETE, _("Cannot undelete message"));
 
mutt_set_flag (Context, extra->hdr, M_DELETE, 0);
redraw = REDRAW_STATUS | REDRAW_INDEX;
@@ -2694,7 +2700,8 @@
   case OP_UNDELETE_SUBTHREAD:
CHECK_MODE(IsHeader (extra));
CHECK_READONLY;
-   CHECK_ACL(M_ACL_DELETE, _("undelete message(s)"));
+/* L10N: CHECK_ACL */
+   CHECK_ACL(M_ACL_DELETE, _("Cannot undelete message(s)"));
 
r = mutt_thread_set_flag (extra->hdr, M_DELETE, 0,
  ch == OP_UNDELETE_THREAD ? 0 : 1);

mutt: Updated Japanese translation.

[Brendan Cully]

changeset: 6509:2fdec286cfb7
user:  TAKAHASHI Tamotsu 
date:  Sun Sep 20 19:05:47 2015 +0800
link:  http://dev.mutt.org/hg/mutt/rev/2fdec286cfb7

Updated Japanese translation.

diffs (truncated from 2160 to 950 lines):

diff -r 61c754a8effd -r 2fdec286cfb7 po/ja.po
--- a/po/ja.po  Sun Sep 20 18:58:58 2015 +0800
+++ b/po/ja.po  Sun Sep 20 19:05:47 2015 +0800
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.5.23\n"
+"Project-Id-Version: 1.5.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-30 10:25-0700\n"
-"PO-Revision-Date: 2015-08-25 12:20+0900\n"
+"POT-Creation-Date: 2015-09-20 15:19+0900\n"
+"PO-Revision-Date: 2015-09-20 14:32+0900\n"
 "Last-Translator: TAKAHASHI Tamotsu \n"
 "Language-Team: mutt-j \n"
 "Language: Japanese\n"
@@ -33,11 +33,11 @@
 msgid "Exit"
 msgstr "Ìá¤ë"
 
-#: addrbook.c:38 curs_main.c:483 pager.c:1538 postpone.c:42
+#: addrbook.c:38 curs_main.c:484 pager.c:1538 postpone.c:42
 msgid "Del"
 msgstr "ºï½ü"
 
-#: addrbook.c:39 curs_main.c:484 postpone.c:43
+#: addrbook.c:39 curs_main.c:485 postpone.c:43
 msgid "Undel"
 msgstr "ºï½ü¤ò¼è¤ê¾Ã¤·"
 
@@ -45,9 +45,8 @@
 msgid "Select"
 msgstr "ÁªÂò"
 
-#. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:3989 curs_main.c:489
-#: mutt_ssl.c:1045 mutt_ssl_gnutls.c:1003 pager.c:1630 pgpkey.c:522
+#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:4014 curs_main.c:490
+#: mutt_ssl.c:1049 mutt_ssl_gnutls.c:1003 pager.c:1630 pgpkey.c:522
 #: postpone.c:44 query.c:53 recvattach.c:57 smime.c:425
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
@@ -60,7 +59,7 @@
 msgid "Aliases"
 msgstr "ÊÌ̾"
 
-#. add a new alias
+#. L10N: prompt to add a new alias
 #: alias.c:260
 msgid "Alias as: "
 msgstr "ÊÌ̾ÆþÎÏ: "
@@ -112,13 +111,12 @@
 msgid "Can't match nametemplate, continue?"
 msgstr "̾Á°¤Î¥Æ¥ó¥×¥ì¡¼¥È¤Ë°ìÃפµ¤»¤é¤ì¤Ê¤¤¡£Â³¹Ô?"
 
-#. For now, editing requires a file, no piping
 #: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤Ë %%s ¤¬É¬Í×"
 
-#: attach.c:134 attach.c:266 commands.c:223 compose.c:1195 curs_lib.c:182
+#: attach.c:134 attach.c:266 commands.c:223 compose.c:1197 curs_lib.c:182
 #: curs_lib.c:555
 #, c-format
 msgid "Error running \"%s\"!"
@@ -141,7 +139,6 @@
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "%s ¤Î¤¿¤á¤Î mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤¬¤Ê¤¤¤Î¤Ç¶õ¥Õ¥¡¥¤¥ë¤òºîÀ®¡£"
 
-#. For now, editing requires a file, no piping
 #: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
@@ -356,7 +353,6 @@
 msgid "default colors not supported"
 msgstr "´ûÄêÃͤ理¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤"
 
-#. find out whether or not the verify signature
 #: commands.c:90
 msgid "Verify PGP signature?"
 msgstr "PGP ½ð̾¤ò¸¡¾Ú?"
@@ -660,7 +656,7 @@
 msgid "You may not delete the only attachment."
 msgstr "Í£°ì¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤Ï¤¤¤±¤Ê¤¤¡£"
 
-#: compose.c:611 send.c:1661
+#: compose.c:611 send.c:1664
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "\"%s\" Ãæ¤ËÉÔÀµ¤Ê IDN: '%s'"
@@ -715,55 +711,57 @@
 msgstr "¥ê¥Í¡¼¥à (°ÜÆ°) Àè: "
 
 # system call ¤Î stat() ¤ò¡Ö°À­Ä´ºº¡×¤ÈÌõ¤·¤Æ¤¤¤ë
-#: compose.c:1026 editmsg.c:96 editmsg.c:121 sendlib.c:872
+#. L10N:
+#. "stat" is a system call. Do "man 2 stat" for more information.
+#: compose.c:1028 editmsg.c:96 editmsg.c:121 sendlib.c:872
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "%s ¤ò°À­Ä´ºº¤Ç¤­¤Ê¤¤: %s"
 
-#: compose.c:1053
+#: compose.c:1055
 msgid "New file: "
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë: "
 
-#: compose.c:1066
+#: compose.c:1068
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type ¤Ï base/sub ¤È¤¤¤¦·Á¼°¤Ë¤¹¤ë¤³¤È"
 
-#: compose.c:1072
+#: compose.c:1074
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "%s ¤ÏÉÔÌÀ¤Ê Content-Type"
 
-#: compose.c:1085
+#: compose.c:1087
 #, c-format
 msgid "Can't create file %s"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Ê¤¤"
 
-#: compose.c:1093
+#: compose.c:1095
 msgid "What we have here is a failure to make an attachment"
 msgstr "¤Ä¤Þ¤êźÉÕ¥Õ¥¡¥¤¥ë¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤¿¤È¤¤¤¦¤³¤È¤À"
 
-#: compose.c:1154
+#: compose.c:1156
 msgid "Postpone this message?"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­¤«¤±¤ÇÊÝα?"
 
-#: compose.c:1213
+#: compose.c:1215
 msgid "Write message to mailbox"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë½ñ¤­¹þ¤à"
 
-#: compose.c:1216
+#: compose.c:1218
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò %s ¤Ë½ñ¤­¹þ¤ßÃæ..."
 
-#: compose.c:1225
+#: compose.c:1227
 msgid "Message written."
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï½ñ¤­¹þ¤Þ¤ì¤¿¡£"
 
-#: compose.c:1237
+#: compose.c:1239
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME ¤¬´û¤ËÁªÂò¤µ¤ì¤Æ¤¤¤ë¡£²ò½ü¤·¤Æ·Ñ³?"
 
-#: compose.c:1264
+#: compose.c:1266
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP ¤¬´û¤ËÁªÂò¤µ¤ì¤Æ¤¤¤ë¡£²ò½ü¤·¤Æ·Ñ³?"
 
@@ -782,7 +780,7 @@
 msgid "error creating gpgme data object: %s\n"
 msgstr "gpgme ¥Ç¡¼¥¿¥ª¥Ö¥¸¥§¥¯¥ÈºîÀ®¥¨¥é¡¼: %s\n"
 
-#: crypt-gpgme.c:489 crypt-gpgme.c:507 crypt-gpgme.c:1531 crypt-gpgme.c:2239
+#: crypt-gpgme.c:

Re: [Mutt] #3701: German short-license text is garbled (mutt -vv)

[Mutt]

#3701: German short-license text is garbled (mutt -vv)
+--
  Reporter:  Bat_Guano  |  Owner:  mutt-dev
  Type:  defect | Status:  new
  Priority:  trivial|  Milestone:
 Component:  mutt   |Version:
Resolution: |   Keywords:
+--

Comment (by Bat_Guano):

 Hi again.

 I do not see the need to subscribe to the developper mailing-list just to
 make this proposition once again or to finally publish the pertinent patch
 after much hassle with the rules and the tools. So I attach you the
 modified file de.po to this message and otherwise keep the modified
 program for myself. ;-)

 I still hope, that this will help in a way.

-- 
Ticket URL: 
Mutt 
The Mutt mail user agent

Re: [Mutt] #3701: German short-license text is garbled (mutt -vv)

[Mutt]

#3701: German short-license text is garbled (mutt -vv)
+--
  Reporter:  Bat_Guano  |  Owner:  mutt-dev
  Type:  defect | Status:  new
  Priority:  trivial|  Milestone:
 Component:  mutt   |Version:
Resolution: |   Keywords:
+--

Comment (by kevin8t8):

 Thank you for the fix.  I'll commit it shortly.  If you develop an
 interest in helping with the German translation, feel free to subscribe to
 mutt...@mutt.org. (It's very low volume).

-- 
Ticket URL: 
Mutt 
The Mutt mail user agent

mutt: German translation fix. (closes #3701)

[Brendan Cully]

changeset: 6510:93c6ae1ef01b
user:  bat.gu...@don.blech.e4ward.com
date:  Mon Sep 21 10:28:22 2015 +0800
link:  http://dev.mutt.org/hg/mutt/rev/93c6ae1ef01b

German translation fix.  (closes #3701)

diffs (28 lines):

diff -r 2fdec286cfb7 -r 93c6ae1ef01b po/de.po
--- a/po/de.po  Sun Sep 20 19:05:47 2015 +0800
+++ b/po/de.po  Mon Sep 21 10:28:22 2015 +0800
@@ -2664,16 +2664,16 @@
 "GNU General Public License for more details.\n"
 msgstr ""
 "Dieses Programm ist freie Software. Sie dürfen es weitergeben\n"
-"und/oder es verändern, wie es die Bedingungen der GNU General\n"
-"Public License, wie von der Free Software Foundation\n"
-"veröffentlicht, verändern; entweder unter Version 2 dieser Lizenz\n"
-"oder, wenn Sie es wünschen, jeder späteren Version.\n"
+"und/oder verändern, gemäß der Bestimmungen der GNU General\n"
+"Public License wie von der Free Software Foundation\n"
+"veröffentlicht; entweder nach Version 2 dieser Lizenz\n"
+"oder, so wie Sie es wünschen, jeder späteren Version.\n"
 "\n"
 "Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass\n"
-"es Ihnen von Nutzen sein wird, aber OHNE JEGLICHE GEWÄHRLEISTUNG,\n"
-"sogar ohne die Garantie der MARKTREIFE oder EIGNUNG FÜR EINEN\n"
-"BESTIMMTEN ZWECK. Lesen Sie die GNU General Public License, um\n"
-"mehr Details zu erfahren.\n"
+"es von Nutzen sein wird, aber OHNE JEGLICHE GEWÄHRLEISTUNG,\n"
+"nicht einmal die Garantie der MARKTREIFE oder EIGNUNG FÜR EINEN\n"
+"BESTIMMTEN ZWECK. Entnehmen Sie alle weiteren Details der\n"
+"GNU General Public License.\n"
 
 #: main.c:98
 msgid ""

Re: [Mutt] #3701: German short-license text is garbled (mutt -vv)

[Mutt]

#3701: German short-license text is garbled (mutt -vv)
+--
  Reporter:  Bat_Guano  |  Owner:  mutt-dev
  Type:  defect | Status:  closed
  Priority:  trivial|  Milestone:
 Component:  mutt   |Version:
Resolution:  fixed  |   Keywords:
+--
Changes (by bat.guano@…):

 * status:  new => closed
 * resolution:   => fixed


Comment:

 In [93c6ae1ef01b656aa864da84925428713bd14a36]:
 {{{
 #!CommitTicketReference repository=""
 revision="93c6ae1ef01b656aa864da84925428713bd14a36"
 German translation fix.  (closes #3701)
 }}}

-- 
Ticket URL: 
Mutt 
The Mutt mail user agent

Re: [PATCH 0 of 3] patchbomb patch-1.5.24-index_format-ToCc.1.patch

[Kevin J. McCarthy]

On Sun, Sep 20, 2015 at 04:12:09PM +0800, Kevin J. McCarthy wrote:
> On Fri, Sep 18, 2015 at 05:22:18PM -0400, Derek Schrock wrote:
> > patch to add %r %R index_format expandos and resize attribution to a 
> > LONG_STRING 
> 
> Thanks for submitting the patch series!  I'm just getting back to my
> computer after an extended break, but will take a closer look at the
> series in the next couple days.
> 
> One quick comment: in your patch 2 update to the UPDATING file, it might
> be better to just put "unreleased" instead of a date for "default".

This patch seems okay to me.  Does anyone have any opposition to adding
these new expandos?

-- 
Kevin J. McCarthy
GPG Fingerprint: 8975 A9B3 3AA3 7910 385C  5308 ADEF 7684 8031 6BDA
http://www.8t8.us/configs/gpg-key-transition-statement.txt


signature.asc
Description: PGP signature

Re: [PATCH 0 of 3] patchbomb patch-1.5.24-index_format-ToCc.1.patch

[Derek Schrock]

On Mon, Sep 21, 2015 at 10:58:56AM +0800, Kevin J. McCarthy wrote:
> This patch seems okay to me.  Does anyone have any opposition to adding
> these new expandos?
> 

I was going to make a small change to the expandos and make them
optional.

Seeing that there was already some objections to the delivery and
contents I was going to repatchbomb a split patch (one for %r/R and one
for attribution buffer change).

Re: [PATCH 2 of 3] update docs for %r/%R

[Cameron Simpson]

On 19Sep2015 00:30, Moritz Barsnick  wrote:

On Fri, Sep 18, 2015 at 17:22:20 -0400, Derek Schrock wrote:

+default (2015-09-18):
+  + New expando %r and %R command seperated list of To: and Cc:
+recipients respectfully


"separated" and "respectively".


+  ** .dt %r .dd comma seperated list of ``To:'' recipients
+  ** .dt %R .dd comma seperated list of ``Cc:'' recipients


Dito


Ditto :-)

Cheers,
Cameron Simpson 

When you're no longer frightened, it's time to retire.  - Mercenary proverb