i18n: fix some badly formatted i18n strings

String in submodule--helper is not correctly formatting
placeholders. The string in git-send-email is partial.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 0b8b226c8ff9e6aa3d0b04cb8802a28df3ce534a..2c87ef9364fa6d0bf1b7d387a0642c0b4963c55b 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -3082,7 +3082,7 @@ static int module_create_branch(int argc, const char **argv, const char *prefix)
                OPT_END()
        };
        const char *const usage[] = {
-               N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"),
+               N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"),
                NULL
        };
 

diff --git a/git-send-email.perl b/git-send-email.perl
index a98460bdb96580fe52e3029499c946874ac86ffc..5861e99a6eb2a16bb45e759645e124a66a50e107 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -2096,10 +2096,9 @@ sub validate_patch {
                        chdir($cwd_save) or die("chdir: $!");
                }
                if ($hook_error) {
-                       $hook_error = sprintf(__("fatal: %s: rejected by %s hook\n" .
-                                                $hook_error . "\n" .
-                                                "warning: no patches were sent\n"),
-                                             $fn, $hook_name);
+                       $hook_error = sprintf(
+                           __("fatal: %s: rejected by %s hook\n%s\nwarning: no patches were sent\n"),
+                           $fn, $hook_name, $hook_error);
                        die $hook_error;
                }
        }