From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: pclouds@gmail.com
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>
Subject: [PATCH v2 11/16] repack: mark more strings for translation
Date: Mon, 5 Nov 2018 20:20:54 +0100 [thread overview]
Message-ID: <20181105192059.20303-12-pclouds@gmail.com> (raw)
In-Reply-To: <20181105192059.20303-1-pclouds@gmail.com>
Two strings are slightly updated to be consistent with the rest: die()
starts with lowercase.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/repack.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/builtin/repack.c b/builtin/repack.c
index c6a7943d5c..0af20fa0fc 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -197,7 +197,7 @@ static int write_oid(const struct object_id *oid, struct packed_git *pack,
if (cmd->in == -1) {
if (start_command(cmd))
- die("Could not start pack-objects to repack promisor objects");
+ die(_("could not start pack-objects to repack promisor objects"));
}
xwrite(cmd->in, oid_to_hex(oid), GIT_SHA1_HEXSZ);
@@ -236,7 +236,7 @@ static void repack_promisor_objects(const struct pack_objects_args *args,
char *promisor_name;
int fd;
if (line.len != 40)
- die("repack: Expecting 40 character sha1 lines only from pack-objects.");
+ die(_("repack: Expecting 40 character sha1 lines only from pack-objects."));
string_list_append(names, line.buf);
/*
@@ -247,13 +247,13 @@ static void repack_promisor_objects(const struct pack_objects_args *args,
line.buf);
fd = open(promisor_name, O_CREAT|O_EXCL|O_WRONLY, 0600);
if (fd < 0)
- die_errno("unable to create '%s'", promisor_name);
+ die_errno(_("unable to create '%s'"), promisor_name);
close(fd);
free(promisor_name);
}
fclose(out);
if (finish_command(&cmd))
- die("Could not finish pack-objects to repack promisor objects");
+ die(_("could not finish pack-objects to repack promisor objects"));
}
#define ALL_INTO_ONE 1
@@ -408,7 +408,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
out = xfdopen(cmd.out, "r");
while (strbuf_getline_lf(&line, out) != EOF) {
if (line.len != 40)
- die("repack: Expecting 40 character sha1 lines only from pack-objects.");
+ die(_("repack: Expecting 40 character sha1 lines only from pack-objects"));
string_list_append(&names, line.buf);
}
fclose(out);
@@ -417,7 +417,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
return ret;
if (!names.nr && !po_args.quiet)
- printf("Nothing new to pack.\n");
+ printf_ln(_("Nothing new to pack."));
/*
* Ok we have prepared all new packfiles.
@@ -477,13 +477,13 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
if (rollback_failure.nr) {
int i;
fprintf(stderr,
- "WARNING: Some packs in use have been renamed by\n"
- "WARNING: prefixing old- to their name, in order to\n"
- "WARNING: replace them with the new version of the\n"
- "WARNING: file. But the operation failed, and the\n"
- "WARNING: attempt to rename them back to their\n"
- "WARNING: original names also failed.\n"
- "WARNING: Please rename them in %s manually:\n", packdir);
+ _("WARNING: Some packs in use have been renamed by\n"
+ "WARNING: prefixing old- to their name, in order to\n"
+ "WARNING: replace them with the new version of the\n"
+ "WARNING: file. But the operation failed, and the\n"
+ "WARNING: attempt to rename them back to their\n"
+ "WARNING: original names also failed.\n"
+ "WARNING: Please rename them in %s manually:\n"), packdir);
for (i = 0; i < rollback_failure.nr; i++)
fprintf(stderr, "WARNING: old-%s -> %s\n",
rollback_failure.items[i].string,
--
2.19.1.1005.gac84295441
next prev parent reply other threads:[~2018-11-05 19:21 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-28 6:51 [PATCH 00/12] Mark more strings for translation Nguyễn Thái Ngọc Duy
2018-10-28 6:51 ` [PATCH 01/12] git.c: mark " Nguyễn Thái Ngọc Duy
2018-10-28 6:51 ` [PATCH 02/12] alias.c: mark split_cmdline_strerror() " Nguyễn Thái Ngọc Duy
2018-10-28 6:51 ` [PATCH 03/12] archive.c: mark more " Nguyễn Thái Ngọc Duy
2018-10-28 6:51 ` [PATCH 04/12] attr.c: mark more string " Nguyễn Thái Ngọc Duy
2018-10-28 6:51 ` [PATCH 05/12] read-cache.c: mark more strings " Nguyễn Thái Ngọc Duy
2018-10-28 6:51 ` [PATCH 06/12] read-cache.c: add missing colon separators Nguyễn Thái Ngọc Duy
2018-10-28 6:51 ` [PATCH 07/12] reflog: mark strings for translation Nguyễn Thái Ngọc Duy
2018-10-28 6:51 ` [PATCH 08/12] remote.c: mark messages " Nguyễn Thái Ngọc Duy
2018-10-29 7:56 ` Junio C Hamano
2018-10-29 16:16 ` Duy Nguyen
2018-10-28 6:51 ` [PATCH 09/12] repack: mark more strings " Nguyễn Thái Ngọc Duy
2018-10-28 6:51 ` [PATCH 10/12] parse-options: replace opterror() with optname() Nguyễn Thái Ngọc Duy
2018-10-28 6:51 ` [PATCH 11/12] parse-options.c: mark more strings for translation Nguyễn Thái Ngọc Duy
2018-10-28 6:51 ` [PATCH 12/12] fsck: mark " Nguyễn Thái Ngọc Duy
2018-10-29 10:53 ` SZEDER Gábor
2018-10-29 14:09 ` Junio C Hamano
2018-10-29 16:14 ` Duy Nguyen
2018-10-29 17:38 ` Ævar Arnfjörð Bjarmason
2018-10-29 17:43 ` Ævar Arnfjörð Bjarmason
2018-11-01 1:36 ` Jiang Xin
2018-10-30 23:27 ` Jonathan Nieder
2018-11-05 17:21 ` Duy Nguyen
2018-11-05 19:20 ` [PATCH v2 00/16] Mark more " Nguyễn Thái Ngọc Duy
2018-11-05 19:20 ` [PATCH v2 01/16] git.c: mark " Nguyễn Thái Ngọc Duy
2018-11-06 2:02 ` Junio C Hamano
2018-11-05 19:20 ` [PATCH v2 02/16] alias.c: mark split_cmdline_strerror() " Nguyễn Thái Ngọc Duy
2018-11-05 19:20 ` [PATCH v2 03/16] archive.c: mark more " Nguyễn Thái Ngọc Duy
2018-11-06 2:09 ` Junio C Hamano
2018-11-05 19:20 ` [PATCH v2 04/16] attr.c: mark more string " Nguyễn Thái Ngọc Duy
2018-11-05 19:20 ` [PATCH v2 05/16] read-cache.c: turn die("internal error") to BUG() Nguyễn Thái Ngọc Duy
2018-11-06 2:10 ` Junio C Hamano
2018-11-05 19:20 ` [PATCH v2 06/16] read-cache.c: mark more strings for translation Nguyễn Thái Ngọc Duy
2018-11-05 19:20 ` [PATCH v2 07/16] read-cache.c: add missing colon separators Nguyễn Thái Ngọc Duy
2018-11-06 2:12 ` Junio C Hamano
2018-11-05 19:20 ` [PATCH v2 08/16] reflog: mark strings for translation Nguyễn Thái Ngọc Duy
2018-11-06 2:13 ` Junio C Hamano
2018-11-05 19:20 ` [PATCH v2 09/16] remote.c: turn some error() or die() to BUG() Nguyễn Thái Ngọc Duy
2018-11-06 2:21 ` Junio C Hamano
2018-11-05 19:20 ` [PATCH v2 10/16] remote.c: mark messages for translation Nguyễn Thái Ngọc Duy
2018-11-05 19:20 ` Nguyễn Thái Ngọc Duy [this message]
2018-11-05 19:20 ` [PATCH v2 12/16] parse-options: replace opterror() with optname() Nguyễn Thái Ngọc Duy
2018-11-06 2:33 ` Junio C Hamano
2018-11-06 14:02 ` Ramsay Jones
2018-11-06 19:08 ` Jeff King
2018-11-10 4:55 ` Duy Nguyen
2018-11-10 14:59 ` Ramsay Jones
2018-11-05 19:20 ` [PATCH v2 13/16] parse-options.c: turn some die() to BUG() Nguyễn Thái Ngọc Duy
2018-11-06 3:27 ` Junio C Hamano
2018-11-05 19:20 ` [PATCH v2 14/16] parse-options.c: mark more strings for translation Nguyễn Thái Ngọc Duy
2018-11-05 19:20 ` [PATCH v2 15/16] fsck: reduce word legos to help i18n Nguyễn Thái Ngọc Duy
2018-11-06 3:41 ` Junio C Hamano
2018-11-10 4:59 ` Duy Nguyen
2018-11-05 19:20 ` [PATCH v2 16/16] fsck: mark strings for translation Nguyễn Thái Ngọc Duy
2018-11-10 5:15 ` [PATCH v3 00/16] Mark more " Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 01/16] git.c: mark " Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 02/16] alias.c: mark split_cmdline_strerror() " Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 03/16] archive.c: mark more " Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 04/16] attr.c: mark more string " Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 05/16] read-cache.c: turn die("internal error") to BUG() Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 06/16] read-cache.c: mark more strings for translation Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 07/16] read-cache.c: add missing colon separators Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 08/16] reflog: mark strings for translation Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 09/16] remote.c: turn some error() or die() to BUG() Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 10/16] remote.c: mark messages for translation Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 11/16] repack: mark more strings " Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 12/16] parse-options: replace opterror() with optname() Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 13/16] parse-options.c: turn some die() to BUG() Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 14/16] parse-options.c: mark more strings for translation Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 15/16] fsck: reduce word legos to help i18n Nguyễn Thái Ngọc Duy
2018-11-10 5:16 ` [PATCH v3 16/16] fsck: mark strings for translation 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=20181105192059.20303-12-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).