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

[PATCH 40/65] i18n: notes: mark parseopt strings for translation

From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date
May 28, 2012, 11:13 UTC
Message-ID
<1338203657-26486-38-git-send-email-pclouds@gmail.com>
In-Reply-To
<1338203657-26486-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 builtin/notes.c | 120 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 60 insertions(+), 60 deletions(-)
diff --git a/builtin/notes.c b/builtin/notes.c
index 3644d14..423c6e8 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -20,71 +20,71 @@
 #include "notes-merge.h"
 
 static const char * const git_notes_usage[] = {
-	"git notes [--ref <notes_ref>] [list [<object>]]",
-	"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]",
-	"git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>",
-	"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]",
-	"git notes [--ref <notes_ref>] edit [<object>]",
-	"git notes [--ref <notes_ref>] show [<object>]",
-	"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>",
-	"git notes merge --commit [-v | -q]",
-	"git notes merge --abort [-v | -q]",
-	"git notes [--ref <notes_ref>] remove [<object>...]",
-	"git notes [--ref <notes_ref>] prune [-n | -v]",
-	"git notes [--ref <notes_ref>] get-ref",
+	N_("git notes [--ref <notes_ref>] [list [<object>]]"),
+	N_("git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"),
+	N_("git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"),
+	N_("git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"),
+	N_("git notes [--ref <notes_ref>] edit [<object>]"),
+	N_("git notes [--ref <notes_ref>] show [<object>]"),
+	N_("git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"),
+	N_("git notes merge --commit [-v | -q]"),
+	N_("git notes merge --abort [-v | -q]"),
+	N_("git notes [--ref <notes_ref>] remove [<object>...]"),
+	N_("git notes [--ref <notes_ref>] prune [-n | -v]"),
+	N_("git notes [--ref <notes_ref>] get-ref"),
 	NULL
 };
 
 static const char * const git_notes_list_usage[] = {
-	"git notes [list [<object>]]",
+	N_("git notes [list [<object>]]"),
 	NULL
 };
 
 static const char * const git_notes_add_usage[] = {
-	"git notes add [<options>] [<object>]",
+	N_("git notes add [<options>] [<object>]"),
 	NULL
 };
 
 static const char * const git_notes_copy_usage[] = {
-	"git notes copy [<options>] <from-object> <to-object>",
-	"git notes copy --stdin [<from-object> <to-object>]...",
+	N_("git notes copy [<options>] <from-object> <to-object>"),
+	N_("git notes copy --stdin [<from-object> <to-object>]..."),
 	NULL
 };
 
 static const char * const git_notes_append_usage[] = {
-	"git notes append [<options>] [<object>]",
+	N_("git notes append [<options>] [<object>]"),
 	NULL
 };
 
 static const char * const git_notes_edit_usage[] = {
-	"git notes edit [<object>]",
+	N_("git notes edit [<object>]"),
 	NULL
 };
 
 static const char * const git_notes_show_usage[] = {
-	"git notes show [<object>]",
+	N_("git notes show [<object>]"),
 	NULL
 };
 
 static const char * const git_notes_merge_usage[] = {
-	"git notes merge [<options>] <notes_ref>",
-	"git notes merge --commit [<options>]",
-	"git notes merge --abort [<options>]",
+	N_("git notes merge [<options>] <notes_ref>"),
+	N_("git notes merge --commit [<options>]"),
+	N_("git notes merge --abort [<options>]"),
 	NULL
 };
 
 static const char * const git_notes_remove_usage[] = {
-	"git notes remove [<object>]",
+	N_("git notes remove [<object>]"),
 	NULL
 };
 
 static const char * const git_notes_prune_usage[] = {
-	"git notes prune [<options>]",
+	N_("git notes prune [<options>]"),
 	NULL
 };
 
 static const char * const git_notes_get_ref_usage[] = {
-	"git notes get-ref",
+	N_("git notes get-ref"),
 	NULL
 };
 
@@ -531,19 +531,19 @@ static int add(int argc, const char **argv, const char *prefix)
 	const unsigned char *note;
 	struct msg_arg msg = { 0, 0, STRBUF_INIT };
 	struct option options[] = {
-		{ OPTION_CALLBACK, 'm', "message", &msg, "msg",
-			"note contents as a string", PARSE_OPT_NONEG,
+		{ OPTION_CALLBACK, 'm', "message", &msg, N_("msg"),
+			N_("note contents as a string"), PARSE_OPT_NONEG,
 			parse_msg_arg},
-		{ OPTION_CALLBACK, 'F', "file", &msg, "file",
-			"note contents in a file", PARSE_OPT_NONEG,
+		{ OPTION_CALLBACK, 'F', "file", &msg, N_("file"),
+			N_("note contents in a file"), PARSE_OPT_NONEG,
 			parse_file_arg},
-		{ OPTION_CALLBACK, 'c', "reedit-message", &msg, "object",
-			"reuse and edit specified note object", PARSE_OPT_NONEG,
+		{ OPTION_CALLBACK, 'c', "reedit-message", &msg, N_("object"),
+			N_("reuse and edit specified note object"), PARSE_OPT_NONEG,
 			parse_reedit_arg},
-		{ OPTION_CALLBACK, 'C', "reuse-message", &msg, "object",
-			"reuse specified note object", PARSE_OPT_NONEG,
+		{ OPTION_CALLBACK, 'C', "reuse-message", &msg, N_("object"),
+			N_("reuse specified note object"), PARSE_OPT_NONEG,
 			parse_reuse_arg},
-		OPT__FORCE(&force, "replace existing notes"),
+		OPT__FORCE(&force, N_("replace existing notes")),
 		OPT_END()
 	};
 
@@ -611,11 +611,11 @@ static int copy(int argc, const char **argv, const char *prefix)
 	struct notes_tree *t;
 	const char *rewrite_cmd = NULL;
 	struct option options[] = {
-		OPT__FORCE(&force, "replace existing notes"),
-		OPT_BOOLEAN(0, "stdin", &from_stdin, "read objects from stdin"),
-		OPT_STRING(0, "for-rewrite", &rewrite_cmd, "command",
-			   "load rewriting config for <command> (implies "
-			   "--stdin)"),
+		OPT__FORCE(&force, N_("replace existing notes")),
+		OPT_BOOLEAN(0, "stdin", &from_stdin, N_("read objects from stdin")),
+		OPT_STRING(0, "for-rewrite", &rewrite_cmd, N_("command"),
+			   N_("load rewriting config for <command> (implies "
+			      "--stdin)")),
 		OPT_END()
 	};
 
@@ -688,17 +688,17 @@ static int append_edit(int argc, const char **argv, const char *prefix)
 	const char * const *usage;
 	struct msg_arg msg = { 0, 0, STRBUF_INIT };
 	struct option options[] = {
-		{ OPTION_CALLBACK, 'm', "message", &msg, "msg",
-			"note contents as a string", PARSE_OPT_NONEG,
+		{ OPTION_CALLBACK, 'm', "message", &msg, N_("msg"),
+			N_("note contents as a string"), PARSE_OPT_NONEG,
 			parse_msg_arg},
-		{ OPTION_CALLBACK, 'F', "file", &msg, "file",
-			"note contents in a file", PARSE_OPT_NONEG,
+		{ OPTION_CALLBACK, 'F', "file", &msg, N_("file"),
+			N_("note contents in a file"), PARSE_OPT_NONEG,
 			parse_file_arg},
-		{ OPTION_CALLBACK, 'c', "reedit-message", &msg, "object",
-			"reuse and edit specified note object", PARSE_OPT_NONEG,
+		{ OPTION_CALLBACK, 'c', "reedit-message", &msg, N_("object"),
+			N_("reuse and edit specified note object"), PARSE_OPT_NONEG,
 			parse_reedit_arg},
-		{ OPTION_CALLBACK, 'C', "reuse-message", &msg, "object",
-			"reuse specified note object", PARSE_OPT_NONEG,
+		{ OPTION_CALLBACK, 'C', "reuse-message", &msg, N_("object"),
+			N_("reuse specified note object"), PARSE_OPT_NONEG,
 			parse_reuse_arg},
 		OPT_END()
 	};
@@ -861,19 +861,19 @@ static int merge(int argc, const char **argv, const char *prefix)
 	int verbosity = 0, result;
 	const char *strategy = NULL;
 	struct option options[] = {
-		OPT_GROUP("General options"),
+		OPT_GROUP(N_("General options")),
 		OPT__VERBOSITY(&verbosity),
-		OPT_GROUP("Merge options"),
-		OPT_STRING('s', "strategy", &strategy, "strategy",
-			   "resolve notes conflicts using the given strategy "
-			   "(manual/ours/theirs/union/cat_sort_uniq)"),
-		OPT_GROUP("Committing unmerged notes"),
+		OPT_GROUP(N_("Merge options")),
+		OPT_STRING('s', "strategy", &strategy, N_("strategy"),
+			   N_("resolve notes conflicts using the given strategy "
+			      "(manual/ours/theirs/union/cat_sort_uniq)")),
+		OPT_GROUP(N_("Committing unmerged notes")),
 		{ OPTION_BOOLEAN, 0, "commit", &do_commit, NULL,
-			"finalize notes merge by committing unmerged notes",
+			N_("finalize notes merge by committing unmerged notes"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG },
-		OPT_GROUP("Aborting notes merge resolution"),
+		OPT_GROUP(N_("Aborting notes merge resolution")),
 		{ OPTION_BOOLEAN, 0, "abort", &do_abort, NULL,
-			"abort notes merge",
+			N_("abort notes merge"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG },
 		OPT_END()
 	};
@@ -980,10 +980,10 @@ static int remove_cmd(int argc, const char **argv, const char *prefix)
 	int from_stdin = 0;
 	struct option options[] = {
 		OPT_BIT(0, "ignore-missing", &flag,
-			"attempt to remove non-existent note is not an error",
+			N_("attempt to remove non-existent note is not an error"),
 			IGNORE_MISSING),
 		OPT_BOOLEAN(0, "stdin", &from_stdin,
-			    "read object names from the standard input"),
+			    N_("read object names from the standard input")),
 		OPT_END()
 	};
 	struct notes_tree *t;
@@ -1064,8 +1064,8 @@ int cmd_notes(int argc, const char **argv, const char *prefix)
 	int result;
 	const char *override_notes_ref = NULL;
 	struct option options[] = {
-		OPT_STRING(0, "ref", &override_notes_ref, "notes_ref",
-			   "use notes from <notes_ref>"),
+		OPT_STRING(0, "ref", &override_notes_ref, N_("notes_ref"),
+			   N_("use notes from <notes_ref>")),
 		OPT_END()
 	};
 

-- 
1.7.10.2.549.g9354186
Previous: Nguyễn Thái Ngọc DuyNext: Nguyễn Thái Ngọc Duy
Message 41 of 87 in “Mark parseopt strings for translation”
  1. 00/65 Mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 6, 2012
  2. 01/65 i18n: parseopt: lookup help and argument translations when showing usageNguyễn Thái Ngọc Duy, May 6, 2012
  3. 02/65 i18n: apply: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 6, 2012
  4. 03/65 i18n: archive: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  5. 04/65 i18n: add: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  6. 05/65 i18n: bisect--helper: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  7. 06/65 i18n: blame: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  8. 07/65 i18n: branch: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  9. 08/65 i18n: cat-file: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  10. 09/65 i18n: check-attr: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  11. 10/65 i18n: checkout-index: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  12. 11/65 i18n: checkout: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  13. 12/65 i18n: cherry: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  14. 13/65 i18n: clean: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  15. 14/65 i18n: clone: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  16. 15/65 i18n: column: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  17. 16/65 i18n: commit: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  18. 17/65 i18n: config: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  19. 18/65 i18n: count-objects: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  20. 19/65 i18n: describe: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  21. 20/65 i18n: fast-export: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  22. 21/65 i18n: fetch: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  23. 22/65 i18n: fmt-merge-msg: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  24. 23/65 i18n: for-each-ref: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  25. 24/65 i18n: format-patch: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  26. 25/65 i18n: fsck: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  27. 26/65 i18n: gc: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  28. 27/65 i18n: grep: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  29. 28/65 i18n: hash-object: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  30. 29/65 i18n: help: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  31. 30/65 i18n: init-db: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  32. 31/65 i18n: log: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  33. 32/65 i18n: ls-files: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  34. 33/65 i18n: ls-tree: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  35. 34/65 i18n: merge-base: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  36. 35/65 i18n: merge-file: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  37. 36/65 i18n: merge: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  38. 37/65 i18n: mktree: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  39. 38/65 i18n: mv: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  40. 39/65 i18n: name-rev: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  41. 40/65 i18n: notes: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  42. 41/65 i18n: pack-objects: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  43. 42/65 i18n: pack-refs: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  44. 43/65 i18n: prune-packed: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  45. 44/65 i18n: prune: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  46. 45/65 i18n: push: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  47. 46/65 i18n: read-tree: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  48. 47/65 i18n: remote: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  49. 48/65 i18n: replace: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  50. 49/65 i18n: status: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  51. 50/65 i18n: rerere: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  52. 51/65 i18n: reset: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  53. 52/65 i18n: rev-parse: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  54. 53/65 i18n: revert, cherry-pick: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  55. 54/65 i18n: rm: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  56. 55/65 i18n: shortlog: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  57. 56/65 i18n: show-branch: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  58. 57/65 i18n: show-ref: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  59. 58/65 i18n: symbolic-ref: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  60. 59/65 i18n: tag: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  61. 60/65 i18n: update-index: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  62. 61/65 i18n: update-ref: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  63. 62/65 i18n: update-server-info: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  64. 63/65 i18n: verify-pack: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  65. 64/65 i18n: verify-tag: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  66. 65/65 i18n: write-tree: mark parseopt strings for translationNguyễn Thái Ngọc Duy, May 28, 2012
  67. Jonathan NiederMay 28, 2012
  68. Nguyen Thai Ngoc DuyMay 29, 2012
  69. Jonathan NiederMay 29, 2012
  70. Junio C HamanoMay 29, 2012
  71. Nguyen Thai Ngoc DuyMay 30, 2012
  72. Jonathan NiederMay 30, 2012
  73. Nguyen Thai Ngoc DuyMay 30, 2012
  74. Nguyen Thai Ngoc DuyMay 30, 2012
  75. Junio C HamanoMay 29, 2012
  76. Jonathan NiederMay 29, 2012
  77. Junio C HamanoMay 29, 2012
  78. Nguyen Thai Ngoc DuyMay 30, 2012
  79. Nguyen Thai Ngoc DuyJun 2, 2012
  80. Jonathan NiederJun 2, 2012
  81. Nguyen Thai Ngoc DuyJun 7, 2012
  82. Jonathan NiederJun 7, 2012
  83. Nguyen Thai Ngoc DuyJun 7, 2012
  84. Jonathan NiederJun 7, 2012
  85. Junio C HamanoJun 7, 2012
  86. Junio C HamanoMay 8, 2012
  87. Nguyen Thai Ngoc DuyMay 18, 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.