@matheusbsbs / matheus-bagliano / commits / f733719316

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 fd9e226776 (ssh signing: retrieve a default key from ssh-agent, 2021-09-10). * Add missing space between "with" and "--python" which was introduced in commit bd0708c7eb (ref-filter: add %(raw) atom, 2021-07-26). * Fix unmatched single quote in 'builtin/index-pack.c' which was introduced in commit 8737dab346 (index-pack: refactor renaming in final(), 2021-09-09) [1] https://github.com/git-l10n/git-po/pull/567 Reported-by: Emir Sarı <bitigchi@me.com> Reported-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jiang Xin committed Nov 1, 2021 at 10:14 UTC f73371931686f16c2b5df49cb6a4b16c5fdfe79c
3 files changed +3 -3
builtin/index-pack.c
+1 -1
@@ -1486,7 +1486,7 @@ static void rename_tmp_packfile(const char **final_name,
1486 if (!*final_name)
1487 *final_name = odb_pack_name(name, hash, ext);
1488 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'"),
1490 ext, *final_name);
1491 } else if (make_read_only_if_same) {
1492 chmod(*final_name, 0444);
gpg-interface.c
+1 -1
@@ -775,7 +775,7 @@ static const char *get_default_ssh_signing_key(void)
775 if (keys[0] && starts_with(keys[0]->buf, "ssh-")) {
776 default_key = strbuf_detach(keys[0], NULL);
777 } 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"),
779 key_stderr.buf, key_stdout.buf);
780 }
781
ref-filter.c
+1 -1
@@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format)
1037 format->quote_style == QUOTE_TCL) &&
1038 used_atom[at].atom_type == ATOM_RAW &&
1039 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 "
1041 "--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2);
1042 cp = ep + 1;
1043