git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 15/66] i18n: commit: mark parseopt strings for translation

From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date
Aug 20, 2012, 12:32 UTC
Message-ID
<1345465975-16927-16-git-send-email-pclouds@gmail.com>
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>
---
 builtin/commit.c | 78 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 20cef95..33b78fe 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -30,7 +30,7 @@
 #include "column.h"
 
 static const char * const builtin_commit_usage[] = {
-	"git commit [options] [--] <filepattern>...",
+	N_("git commit [options] [--] <filepattern>..."),
 	NULL
 };
 
@@ -1188,7 +1188,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 		{ OPTION_STRING, 0, "ignore-submodules", &ignore_submodule_arg, "when",
 		  "ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)",
 		  PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
-		OPT_COLUMN(0, "column", &s.colopts, "list untracked files in columns"),
+		OPT_COLUMN(0, "column", &s.colopts, N_("list untracked files in columns")),
 		OPT_END(),
 	};
 
@@ -1369,53 +1369,53 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 {
 	static struct wt_status s;
 	static struct option builtin_commit_options[] = {
-		OPT__QUIET(&quiet, "suppress summary after successful commit"),
-		OPT__VERBOSE(&verbose, "show diff in commit message template"),
-
-		OPT_GROUP("Commit message options"),
-		OPT_FILENAME('F', "file", &logfile, "read message from file"),
-		OPT_STRING(0, "author", &force_author, "author", "override author for commit"),
-		OPT_STRING(0, "date", &force_date, "date", "override date for commit"),
-		OPT_CALLBACK('m', "message", &message, "message", "commit message", opt_parse_m),
-		OPT_STRING('c', "reedit-message", &edit_message, "commit", "reuse and edit message from specified commit"),
-		OPT_STRING('C', "reuse-message", &use_message, "commit", "reuse message from specified commit"),
-		OPT_STRING(0, "fixup", &fixup_message, "commit", "use autosquash formatted message to fixup specified commit"),
-		OPT_STRING(0, "squash", &squash_message, "commit", "use autosquash formatted message to squash specified commit"),
-		OPT_BOOLEAN(0, "reset-author", &renew_authorship, "the commit is authored by me now (used with -C/-c/--amend)"),
-		OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
-		OPT_FILENAME('t', "template", &template_file, "use specified template file"),
-		OPT_BOOL('e', "edit", &edit_flag, "force edit of commit"),
-		OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),
-		OPT_BOOLEAN(0, "status", &include_status, "include status in commit message template"),
-		{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, "key id",
-		  "GPG sign commit", PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
+		OPT__QUIET(&quiet, N_("suppress summary after successful commit")),
+		OPT__VERBOSE(&verbose, N_("show diff in commit message template")),
+
+		OPT_GROUP(N_("Commit message options")),
+		OPT_FILENAME('F', "file", &logfile, N_("read message from file")),
+		OPT_STRING(0, "author", &force_author, N_("author"), N_("override author for commit")),
+		OPT_STRING(0, "date", &force_date, N_("date"), N_("override date for commit")),
+		OPT_CALLBACK('m', "message", &message, N_("message"), N_("commit message"), opt_parse_m),
+		OPT_STRING('c', "reedit-message", &edit_message, N_("commit"), N_("reuse and edit message from specified commit")),
+		OPT_STRING('C', "reuse-message", &use_message, N_("commit"), N_("reuse message from specified commit")),
+		OPT_STRING(0, "fixup", &fixup_message, N_("commit"), N_("use autosquash formatted message to fixup specified commit")),
+		OPT_STRING(0, "squash", &squash_message, N_("commit"), N_("use autosquash formatted message to squash specified commit")),
+		OPT_BOOLEAN(0, "reset-author", &renew_authorship, N_("the commit is authored by me now (used with -C/-c/--amend)")),
+		OPT_BOOLEAN('s', "signoff", &signoff, N_("add Signed-off-by:")),
+		OPT_FILENAME('t', "template", &template_file, N_("use specified template file")),
+		OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")),
+		OPT_STRING(0, "cleanup", &cleanup_arg, N_("default"), N_("how to strip spaces and #comments from message")),
+		OPT_BOOLEAN(0, "status", &include_status, N_("include status in commit message template")),
+		{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key id"),
+		  N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
 		/* end commit message options */
 
-		OPT_GROUP("Commit contents options"),
-		OPT_BOOLEAN('a', "all", &all, "commit all changed files"),
-		OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"),
-		OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"),
-		OPT_BOOLEAN('p', "patch", &patch_interactive, "interactively add changes"),
-		OPT_BOOLEAN('o', "only", &only, "commit only specified files"),
-		OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
-		OPT_BOOLEAN(0, "dry-run", &dry_run, "show what would be committed"),
-		OPT_SET_INT(0, "short", &status_format, "show status concisely",
+		OPT_GROUP(N_("Commit contents options")),
+		OPT_BOOLEAN('a', "all", &all, N_("commit all changed files")),
+		OPT_BOOLEAN('i', "include", &also, N_("add specified files to index for commit")),
+		OPT_BOOLEAN(0, "interactive", &interactive, N_("interactively add files")),
+		OPT_BOOLEAN('p', "patch", &patch_interactive, N_("interactively add changes")),
+		OPT_BOOLEAN('o', "only", &only, N_("commit only specified files")),
+		OPT_BOOLEAN('n', "no-verify", &no_verify, N_("bypass pre-commit hook")),
+		OPT_BOOLEAN(0, "dry-run", &dry_run, N_("show what would be committed")),
+		OPT_SET_INT(0, "short", &status_format, N_("show status concisely"),
 			    STATUS_FORMAT_SHORT),
-		OPT_BOOLEAN(0, "branch", &s.show_branch, "show branch information"),
+		OPT_BOOLEAN(0, "branch", &s.show_branch, N_("show branch information")),
 		OPT_SET_INT(0, "porcelain", &status_format,
-			    "machine-readable output", STATUS_FORMAT_PORCELAIN),
+			    N_("machine-readable output"), STATUS_FORMAT_PORCELAIN),
 		OPT_BOOLEAN('z', "null", &s.null_termination,
-			    "terminate entries with NUL"),
-		OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
-		OPT_BOOLEAN(0, "no-post-rewrite", &no_post_rewrite, "bypass post-rewrite hook"),
-		{ OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, "mode", "show untracked files, optional modes: all, normal, no. (Default: all)", PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
+			    N_("terminate entries with NUL")),
+		OPT_BOOLEAN(0, "amend", &amend, N_("amend previous commit")),
+		OPT_BOOLEAN(0, "no-post-rewrite", &no_post_rewrite, N_("bypass post-rewrite hook")),
+		{ OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, N_("mode"), N_("show untracked files, optional modes: all, normal, no. (Default: all)"), PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
 		/* end commit contents options */
 
 		{ OPTION_BOOLEAN, 0, "allow-empty", &allow_empty, NULL,
-		  "ok to record an empty change",
+		  N_("ok to record an empty change"),
 		  PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
 		{ OPTION_BOOLEAN, 0, "allow-empty-message", &allow_empty_message, NULL,
-		  "ok to record a change with an empty message",
+		  N_("ok to record a change with an empty message"),
 		  PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
 
 		OPT_END()
-- 
1.7.12.rc2.18.g61b472e
Previous: Nguyễn Thái Ngọc DuyNext: Nguyễn Thái Ngọc Duy
Message 16 of 69 in “parseopt i18n marking (again)”
  1. 00/66 parseopt i18n marking (again)Nguyễn Thái Ngọc Duy, Aug 20, 2012
  2. 01/66 i18n: mark "style" in OPT_COLUMN() for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  3. 02/66 i18n: archive: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  4. 03/66 i18n: add: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  5. 04/66 i18n: bisect--helper: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  6. 05/66 i18n: blame: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  7. 06/66 i18n: branch: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  8. 07/66 i18n: cat-file: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  9. 08/66 i18n: check-attr: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  10. 09/66 i18n: checkout-index: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  11. 10/66 i18n: checkout: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  12. 11/66 i18n: cherry: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  13. 12/66 i18n: clean: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  14. 13/66 i18n: clone: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  15. 14/66 i18n: column: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  16. 15/66 i18n: commit: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  17. 16/66 i18n: config: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  18. 17/66 i18n: count-objects: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  19. 18/66 i18n: describe: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  20. 19/66 i18n: fast-export: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  21. 20/66 i18n: fetch: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  22. 21/66 i18n: fmt-merge-msg: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  23. 22/66 i18n: for-each-ref: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  24. 23/66 i18n: format-patch: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  25. 24/66 i18n: fsck: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  26. 25/66 i18n: gc: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  27. 26/66 i18n: grep: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  28. 27/66 i18n: hash-object: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  29. 28/66 i18n: help: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  30. 29/66 i18n: init-db: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  31. 30/66 i18n: log: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  32. 31/66 i18n: ls-files: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  33. 32/66 i18n: ls-tree: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  34. 33/66 i18n: merge-base: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  35. 34/66 i18n: merge-file: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  36. 35/66 i18n: merge: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  37. 36/66 i18n: mktree: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  38. 37/66 i18n: mv: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  39. 38/66 i18n: name-rev: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  40. 39/66 i18n: notes: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  41. 40/66 i18n: pack-objects: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  42. 41/66 i18n: pack-refs: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  43. 42/66 i18n: prune-packed: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  44. 43/66 i18n: prune: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  45. 44/66 i18n: push: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  46. 45/66 i18n: read-tree: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  47. 46/66 i18n: remote: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  48. 47/66 i18n: replace: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  49. 48/66 i18n: status: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  50. 49/66 i18n: rerere: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  51. 50/66 i18n: reset: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  52. 51/66 i18n: rev-parse: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  53. 52/66 i18n: revert, cherry-pick: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  54. 53/66 i18n: rm: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  55. 54/66 i18n: shortlog: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  56. 55/66 i18n: show-branch: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  57. 56/66 i18n: show-ref: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  58. 57/66 i18n: symbolic-ref: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  59. 58/66 i18n: tag: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  60. 59/66 i18n: update-index: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  61. 60/66 i18n: update-ref: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  62. 61/66 i18n: update-server-info: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  63. 62/66 i18n: verify-pack: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  64. 63/66 i18n: verify-tag: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  65. 64/66 i18n: write-tree: mark parseopt strings for translationNguyễn Thái Ngọc Duy, Aug 20, 2012
  66. 65/66 Reduce translations by using same terminologiesNguyễn Thái Ngọc Duy, Aug 20, 2012
  67. 66/66 Use imperative form in help usage to describe an actionNguyễn Thái Ngọc Duy, Aug 20, 2012
  68. Drew NorthupAug 22, 2012
  69. Junio C HamanoAug 20, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.