From: "Jean-Noël Avila" <jn.avila@free.fr> To: git@vger.kernel.org Cc: "Jean-Noël Avila" <jn.avila@free.fr>, "Jiang Xin" <worldhello.net@gmail.com> Subject: [PATCH v2] l10n: reformat some localized strings for v2.23.0 Date: Sat, 3 Aug 2019 21:59:07 +0200 Message-ID: <20190803195907.3124-1-jn.avila@free.fr> (raw) In-Reply-To: <20190730033512.7226-1-worldhello.net@gmail.com> 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(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 91f8509f85..08e19ed1ed 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_("where the checkout is 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..0e8760e5d4 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, but that\n" + "check has been disabled. To re-enable, use '--show-forced-updates' flag\n" + "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")); } } -- 2.22.0
next prev parent reply other threads:[~2019-08-03 19:59 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 ` Jean-Noël Avila [this message] 2019-08-03 23:45 ` [PATCH v2] l10n: reformat some localized strings " 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 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=20190803195907.3124-1-jn.avila@free.fr \ --to=jn.avila@free.fr \ --cc=git@vger.kernel.org \ --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
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git