mirror of
https://github.com/git/git.git
synced 2024-12-03 23:14:23 +08:00
Merge branch 'jx/message-fixes'
Fixes to recently added messages. * jx/message-fixes: i18n: fix typos found during l10n for git 2.34.0
This commit is contained in:
commit
e2a33ef9e2
@ -1486,7 +1486,7 @@ static void rename_tmp_packfile(const char **final_name,
|
||||
if (!*final_name)
|
||||
*final_name = odb_pack_name(name, hash, ext);
|
||||
if (finalize_object_file(curr_name, *final_name))
|
||||
die(_("unable to rename temporary '*.%s' file to '%s"),
|
||||
die(_("unable to rename temporary '*.%s' file to '%s'"),
|
||||
ext, *final_name);
|
||||
} else if (make_read_only_if_same) {
|
||||
chmod(*final_name, 0444);
|
||||
|
@ -777,7 +777,7 @@ static const char *get_default_ssh_signing_key(void)
|
||||
if (keys[0] && starts_with(keys[0]->buf, "ssh-")) {
|
||||
default_key = strbuf_detach(keys[0], NULL);
|
||||
} else {
|
||||
warning(_("gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"),
|
||||
warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"),
|
||||
key_stderr.buf, key_stdout.buf);
|
||||
}
|
||||
|
||||
|
@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)
|
||||
format->quote_style == QUOTE_TCL) &&
|
||||
used_atom[at].atom_type == ATOM_RAW &&
|
||||
used_atom[at].u.raw_data.option == RAW_BARE)
|
||||
die(_("--format=%.*s cannot be used with"
|
||||
die(_("--format=%.*s cannot be used with "
|
||||
"--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2);
|
||||
cp = ep + 1;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user