diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-15 15:08:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 15:08:23 -0700 |
| commit | 4bea8485e395769951c6b9eddfba1081ea7ef47f (patch) | |
| tree | c5165f024d8211bc3295a141226e0b49cf84f1bb /builtin/log.c | |
| parent | 3ec5ebee155d69eaa096c57e46be2f20300ddc01 (diff) | |
| parent | 6b5b309f5e1a5b01642c448eff78d5c5332bf340 (diff) | |
| download | git-4bea8485e395769951c6b9eddfba1081ea7ef47f.tar.gz | |
Merge branch 'nd/i18n'
Many more strings are prepared for l10n.
* nd/i18n: (23 commits)
transport-helper.c: mark more strings for translation
transport.c: mark more strings for translation
sha1-file.c: mark more strings for translation
sequencer.c: mark more strings for translation
replace-object.c: mark more strings for translation
refspec.c: mark more strings for translation
refs.c: mark more strings for translation
pkt-line.c: mark more strings for translation
object.c: mark more strings for translation
exec-cmd.c: mark more strings for translation
environment.c: mark more strings for translation
dir.c: mark more strings for translation
convert.c: mark more strings for translation
connect.c: mark more strings for translation
config.c: mark more strings for translation
commit-graph.c: mark more strings for translation
builtin/replace.c: mark more strings for translation
builtin/pack-objects.c: mark more strings for translation
builtin/grep.c: mark strings for translation
builtin/config.c: mark more strings for translation
...
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/log.c b/builtin/log.c index 574595132a..e094560d9a 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1608,14 +1608,14 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) numbered = 0; if (numbered && keep_subject) - die (_("-n and -k are mutually exclusive.")); + die(_("-n and -k are mutually exclusive")); if (keep_subject && subject_prefix) - die (_("--subject-prefix/--rfc and -k are mutually exclusive.")); + die(_("--subject-prefix/--rfc and -k are mutually exclusive")); rev.preserve_subject = keep_subject; argc = setup_revisions(argc, argv, &rev, &s_r_opt); if (argc > 1) - die (_("unrecognized argument: %s"), argv[1]); + die(_("unrecognized argument: %s"), argv[1]); if (rev.diffopt.output_format & DIFF_FORMAT_NAME) die(_("--name-only does not make sense")); |