undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ja/l10n-fixes'

Browse Source 
A few messages have been updated to help localization better.

* ja/l10n-fixes:
  l10n: reformat some localized strings for v2.23.0
This commit is contained in:
Junio C Hamano 2019-08-08 14:26:10 -07:00
commit c2a8c3701b
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/checkout.c
View File

@ -1769,7 +1769,7 @@ int cmd_restore(int argc, const char **argv, const char *prefix)
struct option *options; struct option *options;
struct option restore_options[] = { struct option restore_options[] = {
OPT_STRING('s', "source", &opts.from_treeish, "<tree-ish>", 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, OPT_BOOL('S', "staged", &opts.checkout_index,
N_("restore the index")), N_("restore the index")),
OPT_BOOL('W', "worktree", &opts.checkout_worktree, OPT_BOOL('W', "worktree", &opts.checkout_worktree,

15
builtin/fetch.c
View File

@ -850,6 +850,15 @@ static int iterate_ref_map(void *cb_data, struct object_id *oid)
return 0; 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, static int store_updated_refs(const char *raw_url, const char *remote_name,
int connectivity_checked, struct ref *ref_map) 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 (advice_fetch_show_forced_updates) {
if (!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(_(warn_show_forced_updates));
warning(_("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) { } 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); forced_updates_ms / 1000.0);
warning(_("or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"));
} }
} }