diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2021-11-01 02:14:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-01 05:49:49 (GMT) |
| commit | f73371931686f16c2b5df49cb6a4b16c5fdfe79c (patch) | |
| tree | 8a5599443cc451cba14e7f5c433ab747ec9cff32 | |
| parent | 7e27bd589d328b9daf154c2444d1a86ec3afedb0 (diff) | |
| download | git-f73371931686f16c2b5df49cb6a4b16c5fdfe79c.zip git-f73371931686f16c2b5df49cb6a4b16c5fdfe79c.tar.gz git-f73371931686f16c2b5df49cb6a4b16c5fdfe79c.tar.bz2 | |
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>
| -rw-r--r-- | builtin/index-pack.c | 2 | ||||
| -rw-r--r-- | gpg-interface.c | 2 | ||||
| -rw-r--r-- | ref-filter.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 15ae406..c23d01d 100644 --- 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 800d8ca..68d2f29 100644 --- 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 282cdad..08a3f83 100644 --- 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; |