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

[PATCH v2 20/23] sequencer.c: mark more strings for translation

From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date
Jul 18, 2018, 16:10 UTC
Message-ID
<20180718161101.19765-21-pclouds@gmail.com>
In-Reply-To
<20180718161101.19765-1-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 sequencer.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 6b6162d194..f7c2f2422d 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -716,7 +716,7 @@ static const char *read_author_ident(struct strbuf *buf)
 	/* dequote values and construct ident line in-place */
 	for (in = out = buf->buf; i < 3 && in - buf->buf < buf->len; i++) {
 		if (!skip_prefix(in, keys[i], (const char **)&in)) {
-			warning("could not parse '%s' (looking for '%s'",
+			warning(_("could not parse '%s' (looking for '%s'"),
 				rebase_path_author_script(), keys[i]);
 			return NULL;
 		}
@@ -738,7 +738,7 @@ static const char *read_author_ident(struct strbuf *buf)
 	}
 
 	if (i < 3) {
-		warning("could not parse '%s' (looking for '%s')",
+		warning(_("could not parse '%s' (looking for '%s')"),
 			rebase_path_author_script(), keys[i]);
 		return NULL;
 	}
@@ -1444,7 +1444,7 @@ static const char *command_to_string(const enum todo_command command)
 {
 	if (command < TODO_COMMENT)
 		return todo_command_info[command].str;
-	die("unknown command: %d", command);
+	die(_("unknown command: %d"), command);
 }
 
 static char command_to_char(const enum todo_command command)
@@ -2600,15 +2600,17 @@ static int error_with_patch(struct commit *commit,
 		if (intend_to_amend())
 			return -1;
 
-		fprintf(stderr, "You can amend the commit now, with\n"
-			"\n"
-			"  git commit --amend %s\n"
-			"\n"
-			"Once you are satisfied with your changes, run\n"
-			"\n"
-			"  git rebase --continue\n", gpg_sign_opt_quoted(opts));
+		fprintf(stderr,
+			_("You can amend the commit now, with\n"
+			  "\n"
+			  "  git commit --amend %s\n"
+			  "\n"
+			  "Once you are satisfied with your changes, run\n"
+			  "\n"
+			  "  git rebase --continue\n"),
+			gpg_sign_opt_quoted(opts));
 	} else if (exit_code)
-		fprintf_ln(stderr, "Could not apply %s... %.*s",
+		fprintf_ln(stderr, _("Could not apply %s... %.*s"),
 			short_commit_name(commit), subject_len, subject);
 
 	return exit_code;
@@ -2719,7 +2721,7 @@ static int do_label(const char *name, int len)
 	struct object_id head_oid;
 
 	if (len == 1 && *name == '#')
-		return error("illegal label name: '%.*s'", len, name);
+		return error(_("illegal label name: '%.*s'"), len, name);
 
 	strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name);
 	strbuf_addf(&msg, "rebase -i (label) '%.*s'", len, name);
-- 
2.18.0.rc2.476.g39500d3211
Previous: Nguyễn Thái Ngọc DuyNext: Nguyễn Thái Ngọc Duy
Message 31 of 58 in “Mark strings for translation”
  1. 00/23 Mark strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  2. 02/23 archive-tar.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  3. Junio C HamanoJul 19, 2018
  4. Duy NguyenJul 21, 2018
  5. 03/23 archive-zip.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  6. Junio C HamanoJul 19, 2018
  7. Duy NguyenJul 19, 2018
  8. Junio C HamanoJul 19, 2018
  9. 01/23 Update messages in preparation for i18nNguyễn Thái Ngọc Duy, Jul 18, 2018
  10. Junio C HamanoJul 19, 2018
  11. Junio C HamanoJul 19, 2018
  12. Duy NguyenJul 21, 2018
  13. 04/23 builtin/config.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  14. 05/23 builtin/grep.c: mark strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  15. 06/23 builtin/pack-objects.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  16. Junio C HamanoJul 19, 2018
  17. 08/23 commit-graph.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  18. 07/23 builtin/replace.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  19. 09/23 config.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  20. 10/23 connect.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  21. Junio C HamanoJul 19, 2018
  22. 11/23 convert.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  23. 13/23 environment.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  24. 12/23 dir.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  25. 14/23 exec-cmd.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  26. 15/23 object.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  27. 16/23 pkt-line.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  28. 17/23 refs.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  29. 18/23 refspec.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  30. 19/23 replace-object.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  31. 20/23 sequencer.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  32. 21/23 sha1-file.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  33. 22/23 transport.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  34. 23/23 transport-helper.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 18, 2018
  35. 00/23 Mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  36. 01/23 Update messages in preparation for i18nNguyễn Thái Ngọc Duy, Jul 21, 2018
  37. 05/23 builtin/grep.c: mark strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  38. 03/23 archive-zip.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  39. 04/23 builtin/config.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  40. 06/23 builtin/pack-objects.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  41. 08/23 commit-graph.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  42. 07/23 builtin/replace.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  43. 10/23 connect.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  44. 12/23 dir.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  45. 13/23 environment.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  46. 15/23 object.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  47. 14/23 exec-cmd.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  48. 11/23 convert.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  49. 16/23 pkt-line.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  50. 18/23 refspec.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  51. 19/23 replace-object.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  52. 20/23 sequencer.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  53. 17/23 refs.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  54. 21/23 sha1-file.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  55. 22/23 transport.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  56. 23/23 transport-helper.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  57. 09/23 config.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018
  58. 02/23 archive-tar.c: mark more strings for translationNguyễn Thái Ngọc Duy, Jul 21, 2018

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.