mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ja/i18n-common-messages'

Browse Source 
Unify more messages to help l10n.

* ja/i18n-common-messages:
  i18n: fix some misformated placeholders in command synopsis
  i18n: remove from i18n strings that do not hold translatable parts
  i18n: factorize "invalid value" messages
  i18n: factorize more 'incompatible options' messages
This commit is contained in:
Junio C Hamano
2022-02-25 15:47:35 -08:00
parent a47fcfe871 9164d97a63
commit d21d5ddfe6
42 changed files with 137 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/log.c
View File

@ -1993,8 +1993,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (rev.show_notes)
load_display_notes(&rev.notes_opt);
if (use_stdout + rev.diffopt.close_file + !!output_directory > 1)
die(_("options '%s', '%s', and '%s' cannot be used together"), "--stdout", "--output", "--output-directory");
die_for_incompatible_opt3(use_stdout, "--stdout",
rev.diffopt.close_file, "--output",
!!output_directory, "--output-directory");
if (use_stdout) {
setup_pager();