Re: [PATCH] merge: don't translate literal commands
From: Junio C Hamano <hidden>
Date: 2021-05-16 04:00:12
Alex Henrie [off-list ref] writes:
These strings have not been modified in any translation, nor should they be. Signed-off-by: Alex Henrie <redacted> --- builtin/merge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Looks correct. I wish we could mark only parts of a single string for translation, so that we can just ask translaters to translate "options" and "commit", without having to teach them that "<>", "[]" and "..." must be left intact because they have specific meanings as notation (namely, "<>" are used to mark the words as placeholders, "[]" are used to mark optional parts, and "..." means zero or more repetitions). Thanks.
quoted hunk
diff --git a/builtin/merge.c b/builtin/merge.c index eddb8ae70d..a8a843b1f5 100644 --- a/builtin/merge.c +++ b/builtin/merge.c@@ -56,8 +56,8 @@ struct strategy { static const char * const builtin_merge_usage[] = { N_("git merge [<options>] [<commit>...]"), - N_("git merge --abort"), - N_("git merge --continue"), + "git merge --abort", + "git merge --continue", NULL };