git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Louis Bettens <louis@bettens.info>
Cc: git@vger.kernel.org, jn.avila@free.fr, worldhello.net@gmail.com,
	Nicolas Cornu <nicolac76@yahoo.fr>
Subject: Re: [PATCH][l10n-fr] list translated to prune in command
Date: Wed, 22 Nov 2017 10:02:36 -0800	[thread overview]
Message-ID: <20171122180236.GA11671@aiede.mtv.corp.google.com> (raw)
In-Reply-To: <20171122172440.15106-1-louis@bettens.info>

Hi,

Louis Bettens wrote:

> "$ git worktree" when in a french locale shows an incorrect usage
> summary.  This comes down to this trivial issue in the i18n.

Good catch.  This comes from v2.7.0-rc3~4^2~7^2~2^2 (l10n: fr v2.7.0
round 1 (2477t), 2015-12-18).

For next time, you can send these three emails in a single email:

	Subject: l10n: fr.po: "worktree list" mistranslated as prune

	"$ git worktree" when in a french locale shows an incorrect usage
	summary.  This comes down to this trivial issue in the i18n.

	Signed-off-by: ...
	---
	Also it seems this is the only .po that has this particular quirk:

	$ grep -c "worktree prune" po/*.po
	po/bg.po:2
	po/ca.po:2
	po/de.po:2
	po/es.po:2
	po/fr.po:3  # outlier
	po/is.po:0
	po/it.po:0
	po/ko.po:2
	po/pt_PT.po:2
	po/ru.po:2
	po/sv.po:2
	po/vi.po:2
	po/zh_CN.po:2

	zero lines -> translation missing, OK
	two lines -> msgid and msgstr, OK
	three lines -> something wrong. In this case, the present issue.

	 po/fr.po | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)

	diff --git a/po/fr.po b/po/fr.po
	index 4deae3318..a12a2ae37 100644
	--- a/po/fr.po
	+++ b/po/fr.po
[...]

That way, Jean-Noel Avila or Jiang Xin can apply the patch with a
single "git am" command and the explanation (above the "---" line)
shows up in "git log".

I assume they can handle this one fine as-is.  Just pointing it out
for the future.

See the DISCUSSION section in "git help format-patch" for more details.

Thanks,
Jonathan

      parent reply	other threads:[~2017-11-22 18:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-22 17:24 [PATCH][l10n-fr] list translated to prune in command Louis Bettens
2017-11-22 17:24 ` [PATCH] fix french translation Louis Bettens
2017-11-22 17:40   ` Louis Bettens
2017-11-22 20:17   ` Jean-Noël AVILA
2017-11-22 20:39     ` Louis Bettens
2017-11-22 18:02 ` Jonathan Nieder [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171122180236.GA11671@aiede.mtv.corp.google.com \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jn.avila@free.fr \
    --cc=louis@bettens.info \
    --cc=nicolac76@yahoo.fr \
    --cc=worldhello.net@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).