diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-08-08 14:26:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-08 14:26:10 -0700 |
| commit | c2a8c3701b25929b6df2a999b3e8d1a19ee55fc0 (patch) | |
| tree | ea4c04b1df0d3c92075a3f6161099a847a57c6cc | |
| parent | Merge branch 'en/disable-dir-rename-in-recursive-merge' (diff) | |
| parent | l10n: reformat some localized strings for v2.23.0 (diff) | |
| download | tgif-c2a8c3701b25929b6df2a999b3e8d1a19ee55fc0.tar.xz | |
Merge branch 'ja/l10n-fixes'
A few messages have been updated to help localization better.
* ja/l10n-fixes:
l10n: reformat some localized strings for v2.23.0
| -rw-r--r-- | builtin/checkout.c | 2 | ||||
| -rw-r--r-- | builtin/fetch.c | 15 |
2 files changed, 12 insertions, 5 deletions
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..717dd14e89 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 const 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 const 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")); } } |