Skip to content

Commit f733719

Browse files
jiangxingitster
authored andcommitted
i18n: fix typos found during l10n for git 2.34.0
Emir and Jean-Noël reported typos in some i18n messages when preparing l10n for git 2.34.0. * Fix unstable spelling of config variable "gpg.ssh.defaultKeyCommand" which was introduced in commit fd9e226 (ssh signing: retrieve a default key from ssh-agent, 2021-09-10). * Add missing space between "with" and "--python" which was introduced in commit bd0708c (ref-filter: add %(raw) atom, 2021-07-26). * Fix unmatched single quote in 'builtin/index-pack.c' which was introduced in commit 8737dab (index-pack: refactor renaming in final(), 2021-09-09) [1] git-l10n#567 Reported-by: Emir Sarı <[email protected]> Reported-by: Jean-Noël Avila <[email protected]> Signed-off-by: Jiang Xin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7e27bd5 commit f733719

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

builtin/index-pack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,7 @@ static void rename_tmp_packfile(const char **final_name,
14861486
if (!*final_name)
14871487
*final_name = odb_pack_name(name, hash, ext);
14881488
if (finalize_object_file(curr_name, *final_name))
1489-
die(_("unable to rename temporary '*.%s' file to '%s"),
1489+
die(_("unable to rename temporary '*.%s' file to '%s'"),
14901490
ext, *final_name);
14911491
} else if (make_read_only_if_same) {
14921492
chmod(*final_name, 0444);

gpg-interface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ static const char *get_default_ssh_signing_key(void)
775775
if (keys[0] && starts_with(keys[0]->buf, "ssh-")) {
776776
default_key = strbuf_detach(keys[0], NULL);
777777
} else {
778-
warning(_("gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"),
778+
warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"),
779779
key_stderr.buf, key_stdout.buf);
780780
}
781781

ref-filter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)
10371037
format->quote_style == QUOTE_TCL) &&
10381038
used_atom[at].atom_type == ATOM_RAW &&
10391039
used_atom[at].u.raw_data.option == RAW_BARE)
1040-
die(_("--format=%.*s cannot be used with"
1040+
die(_("--format=%.*s cannot be used with "
10411041
"--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2);
10421042
cp = ep + 1;
10431043

0 commit comments

Comments
 (0)