Re: [PATCH] i18n: proposed command missing leading dash
- From
Sandy Carter <sandy.carter@savoirfairelinux.com>
- Date
- Mar 1, 2014, 00:36 UTC
- Message-ID
- <1960754503.587182.1393634176189.JavaMail.root@mail>
- In-Reply-To
- <xmqq38j2u84r.fsf@gitster.dls.corp.google.com>
Should I also update the relevant git.pot and *.po sections?
----- Original Message ----- From: "Junio C Hamano" <gitster@pobox.com> To: "Jonathan Nieder" <jrnieder@gmail.com> Cc: "Sandy Carter" <sandy.carter@savoirfairelinux.com>, git@vger.kernel.org, "jn avila" <jn.avila@free.fr>, "Carlos Martín Nieto" <cmn@elego.de> Sent: Friday, February 28, 2014 6:31:32 PM Subject: Re: [PATCH] i18n: proposed command missing leading dash
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 26 quoted lines
> To make life saner for translators, this should be either
> untranslatable or a single multi-line string, I suspect:
>
> diff --git i/builtin/branch.c w/builtin/branch.c
> index b4d7716..972040c 100644
> --- i/builtin/branch.c
> +++ w/builtin/branch.c
> @@ -1022,11 +1022,13 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
> */
> if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&
> !branch_existed && remote_tracking) {
> - fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name);
> - fprintf(stderr, _(" git branch -d %s\n"), branch->name);
> - fprintf(stderr, _(" git branch --set-upstream-to %s\n"), branch->name);
> + fprintf(stderr, "\n");
> + fprintf(stderr, _("If you wanted to make '%s' track '%s', do this:\n\n"
> + " git branch -d %s\n"
> + " git branch --set-upstream-to %s"),
> + head, branch->name, branch->name, branch->name);
> + fprintf(stderr, "\n");
> }
> -
> } else
> usage_with_options(builtin_branch_usage, options);
>
> What do you think?Yes, I think it is sensible to make sure that the command examples are not corrupted by the _() process.