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>

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 15ae406e6b7e221f720070f3abbea951e2b914a9..c23d01de7dca4240bca05e7a087adceaaef3e78f 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -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);

diff --git a/gpg-interface.c b/gpg-interface.c
index 800d8caa677d4d2baf4fcd3c8aebf9649650a8b3..68d2f29be7893a68c83da27eb4e7da157381be98 100644 (file)
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -775,7 +775,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);
                }
 

diff --git a/ref-filter.c b/ref-filter.c
index 282cdad1036e24eb1de57b97c810bbdbfda558fb..08a3f839c979ea11ada8f830f5640a965f3058b9 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -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;