From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 06 Jan 2015 19:29:02 GMT
Subject: Re: [PATCH 1/2] log.c: fix translation markings
Message-ID: <xmqqzj9voght.fsf@gitster.dls.corp.google.com>
In-Reply-To: <ecb18f9d6ac56da0a61c3b98f8f2236@74d39fa044aa309eaea14b9f57fe79c>

"Kyle J. McKay" <mackyle@gmail.com> writes:

> Fix this by properly separating the two N_ marked strings with
> a comma ...

Sensible.

> ... and removing the embedded "\n" and "   or:" that are
> properly supplied by the parse_options API.

Wow.  I learn new things or reminded of old things every day.

Thanks.

>
> Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
> ---
>  builtin/log.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/log.c b/builtin/log.c
> index f2a9f015..923ffe72 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -38,8 +38,8 @@ static const char *fmt_patch_subject_prefix = "PATCH";
>  static const char *fmt_pretty;
>  
>  static const char * const builtin_log_usage[] = {
> -	N_("git log [<options>] [<revision range>] [[--] <path>...]\n")
> -	N_("   or: git show [options] <object>..."),
> +	N_("git log [<options>] [<revision range>] [[--] <path>...]"),
> +	N_("git show [options] <object>..."),
>  	NULL
>  };