From: Junio C Hamano <gitster@pobox.com>
To: "Jean-Noël Avila" <jn.avila@free.fr>
Cc: git@vger.kernel.org, Jiang Xin <worldhello.net@gmail.com>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH v3] l10n: reformat some localized strings for v2.23.0
Date: Tue, 06 Aug 2019 10:54:47 -0700 [thread overview]
Message-ID: <xmqqo912ji1k.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190806171952.15588-1-jn.avila@free.fr> (=?utf-8?Q?=22Jean-?= =?utf-8?Q?No=C3=ABl?= Avila"'s message of "Tue, 6 Aug 2019 19:19:52 +0200")
Jean-Noël Avila <jn.avila@free.fr> writes:
> Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
> ---
> builtin/checkout.c | 2 +-
> builtin/fetch.c | 15 +++++++++++----
> 2 files changed, 12 insertions(+), 5 deletions(-)
Thanks. Folks, does this look sensible (it does to me)?
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index 91f8509f85..6123f732a2 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -1769,7 +1769,7 @@ int cmd_restore(int argc, const char **argv, const char *prefix)
> struct option *options;
> struct option restore_options[] = {
> OPT_STRING('s', "source", &opts.from_treeish, "<tree-ish>",
> - N_("where the checkout from")),
> + N_("which tree-ish to checkout from")),
> OPT_BOOL('S', "staged", &opts.checkout_index,
> N_("restore the index")),
> OPT_BOOL('W', "worktree", &opts.checkout_worktree,
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index 53ce99d2bb..c8bf4c651b 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -850,6 +850,15 @@ static int iterate_ref_map(void *cb_data, struct object_id *oid)
> return 0;
> }
>
> +static char warn_show_forced_updates[] =
> +N_("Fetch normally indicates which branches had a forced update,\n"
> + "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
> + "flag or run 'git config fetch.showForcedUpdates true'.");
> +static char warn_time_show_forced_updates[] =
> +N_("It took %.2f seconds to check forced updates. You can use\n"
> + "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
> + " to avoid this check.\n");
> +
> static int store_updated_refs(const char *raw_url, const char *remote_name,
> int connectivity_checked, struct ref *ref_map)
> {
> @@ -1005,12 +1014,10 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
>
> if (advice_fetch_show_forced_updates) {
> if (!fetch_show_forced_updates) {
> - warning(_("Fetch normally indicates which branches had a forced update, but that check has been disabled."));
> - warning(_("To re-enable, use '--show-forced-updates' flag or run 'git config fetch.showForcedUpdates true'."));
> + warning(_(warn_show_forced_updates));
> } else if (forced_updates_ms > FORCED_UPDATES_DELAY_WARNING_IN_MS) {
> - warning(_("It took %.2f seconds to check forced updates. You can use '--no-show-forced-updates'\n"),
> + warning(_(warn_time_show_forced_updates),
> forced_updates_ms / 1000.0);
> - warning(_("or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"));
> }
> }
next prev parent reply other threads:[~2019-08-06 17:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-30 3:35 [L10N] Kickoff for Git 2.23.0 round #1 Jiang Xin
2019-08-03 10:18 ` [RFC] l10n: fix some typos for v2.23.0 Jean-Noël Avila
2019-08-03 13:50 ` Jiang Xin
2019-08-03 19:59 ` [PATCH v2] l10n: reformat some localized strings " Jean-Noël Avila
2019-08-03 23:45 ` Jeff King
2019-08-04 11:01 ` Jean-Noël AVILA
2019-08-05 4:21 ` Jeff King
2019-08-05 18:49 ` Junio C Hamano
2019-08-05 21:15 ` Jeff King
2019-08-06 17:19 ` [PATCH v3] " Jean-Noël Avila
2019-08-06 17:54 ` Junio C Hamano [this message]
2019-08-06 18:10 ` Jeff King
2019-08-06 19:45 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqo912ji1k.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jn.avila@free.fr \
--cc=peff@peff.net \
--cc=worldhello.net@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).