Re: [PATCH 1/2] log.c: fix translation markings
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:03:24
"Kyle J. McKay" [off-list ref] 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.
quoted hunk
Signed-off-by: Kyle J. McKay <redacted> --- 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 };