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>

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 91f8509f85396cb957ee87d1b0e8ba1284c8c800..6123f732a2c84f975c576e7077a0c6da369e6b31 100644 (file)
--- 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>",
        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,
                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 53ce99d2bbc4efd0a37ad45feaad546ae2db7e13..717dd14e896117c56101f7f56df0261576c323d0 100644 (file)
--- 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;
 }
 
        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)
 {
 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) {
 
        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) {
                } 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"));

                }
        }
 
                }
        }