{"thread":{"id":"37458","subject":"[PATCH] Improve English grammar","startedAt":"2014-08-30T19:56:01Z","lastAt":"2014-09-09T18:58:27Z","messageCount":4,"participants":["Alex Henrie","Johan Herland","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"248658","messageId":"20140830135601.0f9fce66fe68968f56bd2879@gmail.com","threadId":"37458","inReplyTo":null,"subject":"[PATCH] Improve English grammar","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2014-08-30T19:56:01Z","receivedAt":"2014-08-30T19:56:01Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"Hi, I submitted this patch a week ago and got no reply, so I'm sending\nit again and CC'ing the original authors this time...\n\nSigned-off-by: Alex Henrie \n---\n builtin/commit.c | 2 +-\n builtin/ls-files.c | 2 +-\n builtin/merge.c | 4 ++--\n builtin/notes.c | 2 +-\n builtin/rm.c | 2 +-\n git-bisect.sh | 4 ++--\n git-stash.sh | 2 +-\n git.c | 2 +-\n 8 files changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 5ed6036..59c91ea 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -1778,7 +1778,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)\n \n \tif (commit_index_files())\n \t\tdie (_(\"Repository has been updated, but unable to write\\n\"\n-\t\t \"new_index file. Check that disk is not full or quota is\\n\"\n+\t\t \"new_index file. Check that disk is not full and quota is\\n\"\n \t\t \"not exceeded, and then \\\"git reset HEAD\\\" to recover.\"));\n \n \trerere(0);\ndiff --git a/builtin/ls-files.c b/builtin/ls-files.c\nindex 47c3880..99cee20 100644\n--- a/builtin/ls-files.c\n+++ b/builtin/ls-files.c\n@@ -474,7 +474,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)\n \t\tOPT_BOOL('k', \"killed\", &show_killed,\n \t\t\tN_(\"show files on the filesystem that need to be removed\")),\n \t\tOPT_BIT(0, \"directory\", &dir.flags,\n-\t\t\tN_(\"show 'other' directories' name only\"),\n+\t\t\tN_(\"show 'other' directories' names only\"),\n \t\t\tDIR_SHOW_OTHER_DIRECTORIES),\n \t\tOPT_NEGBIT(0, \"empty-directory\", &dir.flags,\n \t\t\tN_(\"don't show empty directories\"),\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex ce82eb2..db47200 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -1144,14 +1144,14 @@ int cmd_merge(int argc, const char **argv, const char *prefix)\n \t\t */\n \t\tif (advice_resolve_conflict)\n \t\t\tdie(_(\"You have not concluded your merge (MERGE_HEAD exists).\\n\"\n-\t\t\t\t \"Please, commit your changes before you can merge.\"));\n+\t\t\t\t \"Please, commit your changes before you merge.\"));\n \t\telse\n \t\t\tdie(_(\"You have not concluded your merge (MERGE_HEAD exists).\"));\n \t}\n \tif (file_exists(git_path(\"CHERRY_PICK_HEAD\"))) {\n \t\tif (advice_resolve_conflict)\n \t\t\tdie(_(\"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\\n\"\n-\t\t\t \"Please, commit your changes before you can merge.\"));\n+\t\t\t \"Please, commit your changes before you merge.\"));\n \t\telse\n \t\t\tdie(_(\"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\"));\n \t}\ndiff --git a/builtin/notes.c b/builtin/notes.c\nindex 820c341..0606964 100644\n--- a/builtin/notes.c\n+++ b/builtin/notes.c\n@@ -211,7 +211,7 @@ static void create_note(const unsigned char *object, struct msg_arg *msg,\n \t\tif (write_sha1_file(msg->buf.buf, msg->buf.len, blob_type, result)) {\n \t\t\terror(_(\"unable to write note object\"));\n \t\t\tif (path)\n-\t\t\t\terror(_(\"The note contents has been left in %s\"),\n+\t\t\t\terror(_(\"The note contents have been left in %s\"),\n \t\t\t\t path);\n \t\t\texit(128);\n \t\t}\ndiff --git a/builtin/rm.c b/builtin/rm.c\nindex bc6490b..2b61d3b 100644\n--- a/builtin/rm.c\n+++ b/builtin/rm.c\n@@ -65,7 +65,7 @@ static void error_removing_concrete_submodules(struct string_list *files, int *e\n \t\t\t Q_(\"the following submodule (or one of its nested \"\n \t\t\t \"submodules)\\n\"\n \t\t\t \"uses a .git directory:\",\n-\t\t\t \"the following submodules (or one of its nested \"\n+\t\t\t \"the following submodules (or one of their nested \"\n \t\t\t \"submodules)\\n\"\n \t\t\t \"use a .git directory:\", files->nr),\n \t\t\t _(\"\\n(use 'rm -rf' if you really want to remove \"\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex 1e0d602..6cda2b5 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -286,11 +286,11 @@ bisect_next_check() {\n \n \t\tif test -s \"$GIT_DIR/BISECT_START\"\n \t\tthen\n-\t\t\tgettextln \"You need to give me at least one good and one bad revisions.\n+\t\t\tgettextln \"You need to give me at least one good and one bad revision.\n (You can use \\\"git bisect bad\\\" and \\\"git bisect good\\\" for that.)\" >&2\n \t\telse\n \t\t\tgettextln \"You need to start by \\\"git bisect start\\\".\n-You then need to give me at least one good and one bad revisions.\n+You then need to give me at least one good and one bad revision.\n (You can use \\\"git bisect bad\\\" and \\\"git bisect good\\\" for that.)\" >&2\n \t\tfi\n \t\texit 1 ;;\ndiff --git a/git-stash.sh b/git-stash.sh\nindex bcc757b..a640a36 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -394,7 +394,7 @@ parse_flags_and_rev()\n \n \tREV=$(git rev-parse --quiet --symbolic --verify \"$1\" 2>/dev/null) || {\n \t\treference=\"$1\"\n-\t\tdie \"$(eval_gettext \"\\$reference is not valid reference\")\"\n+\t\tdie \"$(eval_gettext \"\\$reference is not a valid reference\")\"\n \t}\n \n \ti_commit=$(git rev-parse --quiet --verify \"$REV^2\" 2>/dev/null) &&\ndiff --git a/git.c b/git.c\nindex 9c49519..465d33a 100644\n--- a/git.c\n+++ b/git.c\n@@ -14,7 +14,7 @@ const char git_usage_string[] =\n \t\" []\";\n \n const char git_more_info_string[] =\n-\tN_(\"'git help -a' and 'git help -g' lists available subcommands and some\\n\"\n+\tN_(\"'git help -a' and 'git help -g' list available subcommands and some\\n\"\n \t \"concept guides. See 'git help ' or 'git help '\\n\"\n \t \"to read about a specific subcommand or concept.\");\n \n-- \n1.9.1\n"},{"id":"248661","messageId":"CALKQrgdd588+-L2QB1LixQfe4nGm38dLS=2RyNQVAF227xsaYg@mail.gmail.com","threadId":"37458","inReplyTo":"20140830135601.0f9fce66fe68968f56bd2879@gmail.com","subject":"Re: [PATCH] Improve English grammar","fromName":"Johan Herland","fromEmail":"johan@herland.net","sentAt":"2014-08-30T20:05:51Z","receivedAt":"2014-08-30T20:05:51Z","isPatch":true,"sender":{"key":"johan@herland.net","avatar":"https://avatars.githubusercontent.com/u/547031?v=4"},"body":"On Sat, Aug 30, 2014 at 9:56 PM, Alex Henrie wrote:\n> Hi, I submitted this patch a week ago and got no reply, so I'm sending\n> it again and CC'ing the original authors this time...\n>\n> Signed-off-by: Alex Henrie \n\nLooks good to me.\n\nAcked-by: Johan Herland \n\n-- \nJohan Herland, \nwww.herland.net\n"},{"id":"248728","messageId":"xmqqa96h26s3.fsf@gitster.dls.corp.google.com","threadId":"37458","inReplyTo":"CALKQrgdd588+-L2QB1LixQfe4nGm38dLS=2RyNQVAF227xsaYg@mail.gmail.com","subject":"Re: [PATCH] Improve English grammar","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-09-02T18:53:32Z","receivedAt":"2014-09-02T18:53:32Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johan Herland writes:\n\n> On Sat, Aug 30, 2014 at 9:56 PM, Alex Henrie wrote:\n>> Hi, I submitted this patch a week ago and got no reply, so I'm sending\n>> it again and CC'ing the original authors this time...\n>>\n>> Signed-off-by: Alex Henrie \n>\n> Looks good to me.\n>\n> Acked-by: Johan Herland \n\nLooks good to me except for the log message part ;-).\n\nThanks.\n"},{"id":"249085","messageId":"CAMMLpeTmRSsaoebcLQuk5U_PA7YV+0v_gsO0as7n9NC8P_oDcQ@mail.gmail.com","threadId":"37458","inReplyTo":"CAMMLpeThp2O3dbC0YamitW3gTaxmhgbd-HnfXBAOM5LPFOy7sw@mail.gmail.com","subject":"Re: [PATCH] Improve English grammar","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2014-09-09T18:58:27Z","receivedAt":"2014-09-09T18:58:27Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"I see it's been accepted now. Thank you!\n\n-Alex\n"}]}