Merge branch 'ts/checkout-advice-plural'

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 47d70b2b9be9ea757a65239065089ac603569ffa..6fa2205734e435c9db787193dcf8c0392d9d2a24 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -355,7 +355,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix)
 }
 
 static const char * const ls_files_usage[] = {
-       N_("git ls-files [options] [<file>...]"),
+       N_("git ls-files [<options>] [<file>...]"),
        NULL
 };
 
@@ -431,7 +431,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
                OPT_BOOL('k', "killed", &show_killed,
                        N_("show files on the filesystem that need to be removed")),
                OPT_BIT(0, "directory", &dir.flags,
-                       N_("show 'other' directories' name only"),
+                       N_("show 'other' directories' names only"),
                        DIR_SHOW_OTHER_DIRECTORIES),
                OPT_NEGBIT(0, "empty-directory", &dir.flags,
                        N_("don't show empty directories"),