mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'ah/grammofix'
* ah/grammofix: grammofix in user-facing messages
This commit is contained in:
commit
296b4c4bbf
|
@ -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);
|
||||
|
|
|
@ -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"),
|
||||
|
|
|
@ -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)."));
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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 "
|
||||
|
|
|
@ -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 ;;
|
||||
|
|
|
@ -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) &&
|
||||
|
|
2
git.c
2
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.");
|
||||
|
||||
|
|
Loading…
Reference in a new issue