From: Ammaar Bakshi via GitGitGadget Date: Sat, 17 Oct 2026 06:40:39 GMT Subject: [PATCH] difftool: translate "combined diff formats" error message Message-ID: From: AMMAAR-IC The error shown when "git difftool --dir-diff" is given a combined diff format ('-c' or '--cc') is wrapped in N_(), which only marks the string for extraction by xgettext and does nothing at runtime. As the string is passed straight to die(), users always see it in English, even though it already has translations in the po files. Use _() instead, and adjust the indentation of the continuation lines to match. Signed-off-by: AMMAAR-IC --- difftool: translate "combined diff formats" error message Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2447%2FAmmaarBakshi%2Fdifftool-i18n-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2447/AmmaarBakshi/difftool-i18n-v1 Pull-Request: https://github.com/git/git/pull/2447 builtin/difftool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/difftool.c b/builtin/difftool.c index bc7b2ea443..13b3d3ce47 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -450,9 +450,9 @@ static int run_dir_diff(struct repository *repo, const char *src_path, *dst_path; if (starts_with(info.buf, "::")) - die(N_("combined diff formats ('-c' and '--cc') are " - "not supported in\n" - "directory diff mode ('-d' and '--dir-diff').")); + die(_("combined diff formats ('-c' and '--cc') are " + "not supported in\n" + "directory diff mode ('-d' and '--dir-diff').")); if (parse_index_info(repo, info.buf, &lmode, &rmode, &loid, &roid, &status)) break; base-commit: 6de20f6092dcf9bdb1c8efe03db4b70c82b423dd -- gitgitgadget