Merge branch 'ah/grammofix'

* ah/grammofix:
grammofix in user-facing messages

diff --git a/builtin/commit.c b/builtin/commit.c
index 4a45bedc09d636c58a25099c4ee4b066d7a94284..b0fe7847d3cbebd2cef28611171924bf7440c467 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1826,7 +1826,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 
        if (commit_index_files())
                die (_("Repository has been updated, but unable to write\n"
-                    "new_index file. Check that disk is not full or quota is\n"
+                    "new_index file. Check that disk is not full and quota is\n"
                     "not exceeded, and then \"git reset HEAD\" to recover."));
 
        rerere(0);

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 47c38808a26a4602f8bd2c7d87f67770a625c679..99cee20fb07ce7ed03da230bfa031c277f584fc1 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -474,7 +474,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"),

diff --git a/builtin/merge.c b/builtin/merge.c
index 9da9e30d9be46a5ed2de06e8545fe61537ba3676..ec6fa9398faf2e5c61ebce198a5006cfb6dc8192 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1143,14 +1143,14 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                 */
                if (advice_resolve_conflict)
                        die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
-                                 "Please, commit your changes before you can merge."));
+                                 "Please, commit your changes before you merge."));
                else
                        die(_("You have not concluded your merge (MERGE_HEAD exists)."));
        }
        if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
                if (advice_resolve_conflict)
                        die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-                           "Please, commit your changes before you can merge."));
+                           "Please, commit your changes before you merge."));
                else
                        die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
        }

diff --git a/builtin/notes.c b/builtin/notes.c
index c25a4125103b5bb1c8571864a974105decc1a181..67d0bb14f8f18003d6a073b0c264f5b46ca12685 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -210,7 +210,7 @@ static void create_note(const unsigned char *object, struct msg_arg *msg,
                if (write_sha1_file(msg->buf.buf, msg->buf.len, blob_type, result)) {
                        error(_("unable to write note object"));
                        if (path)
-                               error(_("The note contents has been left in %s"),
+                               error(_("The note contents have been left in %s"),
                                      path);
                        exit(128);
                }

diff --git a/builtin/rm.c b/builtin/rm.c
index bc6490b8bca554c568973997568543e206ffdb3e..2b61d3bd41164286fcca3e5fe3c807387d946ff2 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -65,7 +65,7 @@ static void error_removing_concrete_submodules(struct string_list *files, int *e
                          Q_("the following submodule (or one of its nested "
                             "submodules)\n"
                             "uses a .git directory:",
-                            "the following submodules (or one of its nested "
+                            "the following submodules (or one of their nested "
                             "submodules)\n"
                             "use a .git directory:", files->nr),
                          _("\n(use 'rm -rf' if you really want to remove "

diff --git a/git-bisect.sh b/git-bisect.sh
index 1e0d602f4b156929b74d10546cf5a5ba0f8518dd..6cda2b5a601c54d138ab3126a25c59371f6f7188 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -286,11 +286,11 @@ bisect_next_check() {
 
                if test -s "$GIT_DIR/BISECT_START"
                then
-                       gettextln "You need to give me at least one good and one bad revisions.
+                       gettextln "You need to give me at least one good and one bad revision.
 (You can use \"git bisect bad\" and \"git bisect good\" for that.)" >&2
                else
                        gettextln "You need to start by \"git bisect start\".
-You then need to give me at least one good and one bad revisions.
+You then need to give me at least one good and one bad revision.
 (You can use \"git bisect bad\" and \"git bisect good\" for that.)" >&2
                fi
                exit 1 ;;

diff --git a/git-stash.sh b/git-stash.sh
index 9c1ba8e4b81a1f118af1967c2c72795ba12d6df0..0158c7338685c8ccbc31766927f905b455a444c2 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -394,7 +394,7 @@ parse_flags_and_rev()
 
        REV=$(git rev-parse --quiet --symbolic --verify "$1" 2>/dev/null) || {
                reference="$1"
-               die "$(eval_gettext "\$reference is not valid reference")"
+               die "$(eval_gettext "\$reference is not a valid reference")"
        }
 
        i_commit=$(git rev-parse --quiet --verify "$REV^2" 2>/dev/null) &&

diff --git a/git.c b/git.c
index 210f1ae9d04dda4d16f9f072ef710bf630f6d52e..523768da616c5884d2279acebc43cf57c98dd3e2 100644 (file)
--- a/git.c
+++ b/git.c
@@ -14,7 +14,7 @@ const char git_usage_string[] =
        "           <command> [<args>]";
 
 const char git_more_info_string[] =
-       N_("'git help -a' and 'git help -g' lists available subcommands and some\n"
+       N_("'git help -a' and 'git help -g' list available subcommands and some\n"
           "concept guides. See 'git help <command>' or 'git help <concept>'\n"
           "to read about a specific subcommand or concept.");