All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Jonathan Niedier" <jrnieder@gmail.com>,
	"Jiang Xin" <worldhello.net@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 66/66] Use imperative form in help usage to describe an action
Date: Mon, 20 Aug 2012 19:32:55 +0700	[thread overview]
Message-ID: <1345465975-16927-67-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1345465975-16927-1-git-send-email-pclouds@gmail.com>


Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 My guts tell me this is correct, but my English foundation is shaking
 so I say "change in the name of consistency"!

 builtin/apply.c          | 2 +-
 builtin/checkout-index.c | 4 ++--
 builtin/config.c         | 8 ++++----
 builtin/grep.c           | 2 +-
 builtin/push.c           | 2 +-
 builtin/update-ref.c     | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/builtin/apply.c b/builtin/apply.c
index d453c83..0ab81e3 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4297,7 +4297,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
 		OPT_NOOP_NOARG(0, "allow-binary-replacement"),
 		OPT_NOOP_NOARG(0, "binary"),
 		OPT_BOOLEAN(0, "numstat", &numstat,
-			N_("shows number of added and deleted lines in decimal notation")),
+			N_("show number of added and deleted lines in decimal notation")),
 		OPT_BOOLEAN(0, "summary", &summary,
 			N_("instead of applying the patch, output a summary for the input")),
 		OPT_BOOLEAN(0, "check", &check,
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 86b7d36..b1feda7 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -184,8 +184,8 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
 	int force = 0, quiet = 0, not_new = 0;
 	struct option builtin_checkout_index_options[] = {
 		OPT_BOOLEAN('a', "all", &all,
-			N_("checks out all files in the index")),
-		OPT__FORCE(&force, N_("forces overwrite of existing files")),
+			N_("check out all files in the index")),
+		OPT__FORCE(&force, N_("force overwrite of existing files")),
 		OPT__QUIET(&quiet,
 			N_("no warning for existing files and files not in index")),
 		OPT_BOOLEAN('n', "no-create", &not_new,
diff --git a/builtin/config.c b/builtin/config.c
index 41032cc..31e1354 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -59,13 +59,13 @@ static struct option builtin_config_options[] = {
 	OPT_BIT(0, "get-all", &actions, N_("get all values: key [value-regex]"), ACTION_GET_ALL),
 	OPT_BIT(0, "get-regexp", &actions, N_("get values for regexp: name-regex [value-regex]"), ACTION_GET_REGEXP),
 	OPT_BIT(0, "replace-all", &actions, N_("replace all matching variables: name value [value_regex]"), ACTION_REPLACE_ALL),
-	OPT_BIT(0, "add", &actions, N_("adds a new variable: name value"), ACTION_ADD),
-	OPT_BIT(0, "unset", &actions, N_("removes a variable: name [value-regex]"), ACTION_UNSET),
-	OPT_BIT(0, "unset-all", &actions, N_("removes all matches: name [value-regex]"), ACTION_UNSET_ALL),
+	OPT_BIT(0, "add", &actions, N_("add a new variable: name value"), ACTION_ADD),
+	OPT_BIT(0, "unset", &actions, N_("remove a variable: name [value-regex]"), ACTION_UNSET),
+	OPT_BIT(0, "unset-all", &actions, N_("remove all matches: name [value-regex]"), ACTION_UNSET_ALL),
 	OPT_BIT(0, "rename-section", &actions, N_("rename section: old-name new-name"), ACTION_RENAME_SECTION),
 	OPT_BIT(0, "remove-section", &actions, N_("remove a section: name"), ACTION_REMOVE_SECTION),
 	OPT_BIT('l', "list", &actions, N_("list all"), ACTION_LIST),
-	OPT_BIT('e', "edit", &actions, N_("opens an editor"), ACTION_EDIT),
+	OPT_BIT('e', "edit", &actions, N_("open an editor"), ACTION_EDIT),
 	OPT_STRING(0, "get-color", &get_color_slot, N_("slot"), N_("find the color configured: [default]")),
 	OPT_STRING(0, "get-colorbool", &get_colorbool_slot, N_("slot"), N_("find the color setting: [stdout-is-tty]")),
 	OPT_GROUP(N_("Type")),
diff --git a/builtin/grep.c b/builtin/grep.c
index d73841c..c9a65b3 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -682,7 +682,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		OPT_BOOLEAN(0, "cached", &cached,
 			N_("search in index instead of in the work tree")),
 		OPT_NEGBIT(0, "no-index", &use_index,
-			 N_("finds in contents not managed by git"), 1),
+			 N_("find in contents not managed by git"), 1),
 		OPT_BOOLEAN(0, "untracked", &untracked,
 			N_("search in both tracked and untracked files")),
 		OPT_SET_INT(0, "exclude-standard", &opt_exclude,
diff --git a/builtin/push.c b/builtin/push.c
index 4840bc2..8686a7a 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -364,7 +364,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 		OPT_BIT( 0,  "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN),
 		OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE),
 		{ OPTION_CALLBACK, 0, "recurse-submodules", &flags, N_("check"),
-			N_("controls recursive pushing of submodules"),
+			N_("control recursive pushing of submodules"),
 			PARSE_OPT_OPTARG, option_parse_recurse_submodules },
 		OPT_BOOLEAN( 0 , "thin", &thin, N_("use thin pack")),
 		OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", N_("receive pack program")),
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index b30394f..51d2684 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -16,7 +16,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 	int delete = 0, no_deref = 0, flags = 0;
 	struct option options[] = {
 		OPT_STRING( 'm', NULL, &msg, N_("reason"), N_("reason of the update")),
-		OPT_BOOLEAN('d', NULL, &delete, N_("deletes the reference")),
+		OPT_BOOLEAN('d', NULL, &delete, N_("delete the reference")),
 		OPT_BOOLEAN( 0 , "no-deref", &no_deref,
 					N_("update <refname> not the one it points to")),
 		OPT_END(),
-- 
1.7.12.rc2.18.g61b472e

  parent reply	other threads:[~2012-08-20 12:46 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-20 12:31 [PATCH 00/66] parseopt i18n marking (again) Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 01/66] i18n: mark "style" in OPT_COLUMN() for translation Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 02/66] i18n: archive: mark parseopt strings " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 03/66] i18n: add: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 04/66] i18n: bisect--helper: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 05/66] i18n: blame: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 06/66] i18n: branch: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 07/66] i18n: cat-file: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 08/66] i18n: check-attr: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 09/66] i18n: checkout-index: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 10/66] i18n: checkout: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 11/66] i18n: cherry: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 12/66] i18n: clean: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 13/66] i18n: clone: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 14/66] i18n: column: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 15/66] i18n: commit: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 16/66] i18n: config: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 17/66] i18n: count-objects: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 18/66] i18n: describe: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 19/66] i18n: fast-export: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 20/66] i18n: fetch: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 21/66] i18n: fmt-merge-msg: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 22/66] i18n: for-each-ref: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 23/66] i18n: format-patch: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 24/66] i18n: fsck: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 25/66] i18n: gc: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 26/66] i18n: grep: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 27/66] i18n: hash-object: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 28/66] i18n: help: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 29/66] i18n: init-db: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 30/66] i18n: log: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 31/66] i18n: ls-files: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 32/66] i18n: ls-tree: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 33/66] i18n: merge-base: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 34/66] i18n: merge-file: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 35/66] i18n: merge: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 36/66] i18n: mktree: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 37/66] i18n: mv: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 38/66] i18n: name-rev: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 39/66] i18n: notes: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 40/66] i18n: pack-objects: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 41/66] i18n: pack-refs: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 42/66] i18n: prune-packed: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 43/66] i18n: prune: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 44/66] i18n: push: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 45/66] i18n: read-tree: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 46/66] i18n: remote: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 47/66] i18n: replace: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 48/66] i18n: status: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 49/66] i18n: rerere: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 50/66] i18n: reset: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 51/66] i18n: rev-parse: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 52/66] i18n: revert, cherry-pick: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 53/66] i18n: rm: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 54/66] i18n: shortlog: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 55/66] i18n: show-branch: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 56/66] i18n: show-ref: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 57/66] i18n: symbolic-ref: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 58/66] i18n: tag: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 59/66] i18n: update-index: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 60/66] i18n: update-ref: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 61/66] i18n: update-server-info: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 62/66] i18n: verify-pack: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 63/66] i18n: verify-tag: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 64/66] i18n: write-tree: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 65/66] Reduce translations by using same terminologies Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` Nguyễn Thái Ngọc Duy [this message]
2012-08-22 18:32   ` [PATCH 66/66] Use imperative form in help usage to describe an action Drew Northup
2012-08-20 22:55 ` [PATCH 00/66] parseopt i18n marking (again) Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1345465975-16927-67-git-send-email-pclouds@gmail.com \
    --to=pclouds@gmail.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=worldhello.net@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.