| Message ID | 20190803101832.30307-1-jn.avila@free.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RFC] l10n: fix some typos for v2.23.0 | expand |
Jean-Noël Avila <jn.avila@free.fr> 于2019年8月3日周六 下午6:18写道： > > Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> > --- > builtin/checkout.c | 2 +- > builtin/fetch.c | 8 ++++---- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/builtin/checkout.c b/builtin/checkout.c > index 91f8509f85..75efc37bc7 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 to checkout from")), I'm not sure, which is better? or "where the checkout is from" > diff --git a/builtin/fetch.c b/builtin/fetch.c > index 53ce99d2bb..3422e6bdf7 100644 > --- a/builtin/fetch.c > +++ b/builtin/fetch.c > @@ -1005,12 +1005,12 @@ 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(_("Fetch normally indicates which branches had a forced update, but that check has been disabled." > + "To re-enable, use '--show-forced-updates' flag or run 'git config fetch.showForcedUpdates true'.")); It is a very long line, you should add line breaks and format the message, like: + warning(_("Fetch normally indicates which branches " + "had a forced update, but that\n" + "check has been disabled. To re-enable, " + "use '--show-forced-updates'\n" + "flag or run 'git config " + "fetch.showForcedUpdates true'.")); > } 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(_("It took %.2f seconds to check forced updates. You can use '--no-show-forced-updates'\n" > + "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"), Try to make a better format, like: + warning(_("It took %.2f seconds to check forced updates. " + "You can use\n" + "'--no-show-forced-updates' or run " + "'git config fetch.showForcedUpdates\n" + "false' to avoid this check.\n"), > forced_updates_ms / 1000.0);
diff --git a/builtin/checkout.c b/builtin/checkout.c index 91f8509f85..75efc37bc7 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 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..3422e6bdf7 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1005,12 +1005,12 @@ 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(_("Fetch normally indicates which branches had a forced update, but that check has been disabled." + "To re-enable, use '--show-forced-updates' flag or run 'git config fetch.showForcedUpdates true'.")); } 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(_("It took %.2f seconds to check forced updates. You can use '--no-show-forced-updates'\n" + "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"), forced_updates_ms / 1000.0); - warning(_("or run 'git config fetch.showForcedUpdates false' to avoid this check.\n")); } }
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> --- builtin/checkout.c | 2 +- builtin/fetch.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)