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

Reply via email to