From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 20/23] sequencer.c: mark more strings for translation
Date: Sat, 30 Jun 2018 11:08:15 +0200 [thread overview]
Message-ID: <20180630090818.28937-21-pclouds@gmail.com> (raw)
In-Reply-To: <20180630090818.28937-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
next prev parent reply other threads:[~2018-06-30 9:09 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-30 9:07 [PATCH 00/23] Mark strings for translation Nguyễn Thái Ngọc Duy
2018-06-30 9:07 ` [PATCH 01/23] Update messages in preparation for i18n Nguyễn Thái Ngọc Duy
2018-06-30 9:07 ` [PATCH 02/23] archive-tar.c: mark more strings for translation Nguyễn Thái Ngọc Duy
2018-06-30 9:07 ` [PATCH 03/23] archive-zip.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:07 ` [PATCH 04/23] builtin/config.c: " Nguyễn Thái Ngọc Duy
2018-07-01 5:18 ` Elijah Newren
2018-06-30 9:08 ` [PATCH 05/23] builtin/grep.c: mark strings for translation and no full stops Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 06/23] builtin/pack-objects.c: mark more strings for translation Nguyễn Thái Ngọc Duy
2018-07-01 5:28 ` Elijah Newren
2018-06-30 9:08 ` [PATCH 07/23] builtin/replace.c: " Nguyễn Thái Ngọc Duy
2018-07-01 5:34 ` Elijah Newren
2018-06-30 9:08 ` [PATCH 08/23] commit-graph.c: " Nguyễn Thái Ngọc Duy
2018-07-02 20:32 ` Derrick Stolee
2018-06-30 9:08 ` [PATCH 09/23] config.c: " Nguyễn Thái Ngọc Duy
2018-07-01 5:38 ` Elijah Newren
2018-06-30 9:08 ` [PATCH 10/23] connect.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 11/23] convert.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 12/23] dir.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 13/23] environment.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 14/23] exec-cmd.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 15/23] object.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 16/23] pkt-line.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 17/23] refs.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 18/23] refspec.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 19/23] replace-object.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` Nguyễn Thái Ngọc Duy [this message]
2018-06-30 9:08 ` [PATCH 21/23] sha1-file.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 22/23] transport.c: " Nguyễn Thái Ngọc Duy
2018-06-30 9:08 ` [PATCH 23/23] transport-helper.c: " Nguyễn Thái Ngọc Duy
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=20180630090818.28937-21-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.