l10n: reformat some localized strings for v2.23.0
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jean-Noël Avila committed
Aug 6, 2019 at 19:19 UTC
182f59daf04e5343a8965d84abe2cdae32ed5e81
2 files changed
+12
-5
builtin/checkout.c
+1
-1
@@ -1769,7 +1769,7 @@ int cmd_restore(int argc, const char **argv, const char *prefix)
1769
struct option *options;
1770
struct option restore_options[] = {
1771
OPT_STRING('s', "source", &opts.from_treeish, "<tree-ish>",
1772
- N_("where the checkout from")),
1772
+ N_("which tree-ish to checkout from")),
1773
OPT_BOOL('S', "staged", &opts.checkout_index,
1774
N_("restore the index")),
1775
OPT_BOOL('W', "worktree", &opts.checkout_worktree,
builtin/fetch.c
+11
-4
@@ -850,6 +850,15 @@ static int iterate_ref_map(void *cb_data, struct object_id *oid)
850
return 0;
851
}
852
853
+static const char warn_show_forced_updates[] =
854
+N_("Fetch normally indicates which branches had a forced update,\n"
855
+ "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
856
+ "flag or run 'git config fetch.showForcedUpdates true'.");
857
+static const char warn_time_show_forced_updates[] =
858
+N_("It took %.2f seconds to check forced updates. You can use\n"
859
+ "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
860
+ " to avoid this check.\n");
861
+
862
static int store_updated_refs(const char *raw_url, const char *remote_name,
863
int connectivity_checked, struct ref *ref_map)
864
{
@@ -1005,12 +1014,10 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
1014
1015
if (advice_fetch_show_forced_updates) {
1016
if (!fetch_show_forced_updates) {
1008
- warning(_("Fetch normally indicates which branches had a forced update, but that check has been disabled."));
1009
- warning(_("To re-enable, use '--show-forced-updates' flag or run 'git config fetch.showForcedUpdates true'."));
1017
+ warning(_(warn_show_forced_updates));
1018
} else if (forced_updates_ms > FORCED_UPDATES_DELAY_WARNING_IN_MS) {
1011
- warning(_("It took %.2f seconds to check forced updates. You can use '--no-show-forced-updates'\n"),
1019
+ warning(_(warn_time_show_forced_updates),
1020
forced_updates_ms / 1000.0);
1013
- warning(_("or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"));
1021
}
1022
}
1023