On Sat, Jun 2, 2018 at 12:32 AM, Nguyễn Thái Ngọc Duy <[email protected]> wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
> ---
> diff --git a/convert.c b/convert.c
> @@ -203,11 +203,11 @@ static void check_global_conv_flags_eol(const char
> *path, enum crlf_action crlf_
> if (conv_flags & CONV_EOL_RNDTRP_DIE)
> - die(_("CRLF would be replaced by LF in %s."), path);
> + die(_("CRLF would be replaced by LF in %s"), path);
> else if (conv_flags & CONV_EOL_RNDTRP_WARN)
> warning(_("CRLF will be replaced by LF in %s.\n"
> "The file will have its original line"
> - " endings in your working directory."),
> path);
> + " endings in your working directory"),
> path);
> @@ -217,7 +217,7 @@ static void check_global_conv_flags_eol(const char *path,
> enum crlf_action crlf_
> else if (conv_flags & CONV_EOL_RNDTRP_WARN)
> warning(_("LF will be replaced by CRLF in %s.\n"
> "The file will have its original line"
> - " endings in your working directory."),
> path);
> + " endings in your working directory"),
> path);
> }
> }
For these two, perhaps:
<blah> ... replace by <blah> in %s;
the file will have its original line
endings in your working directory
> @@ -492,8 +492,8 @@ static int encode_to_worktree(const char *path, const
> char *src, size_t src_len,
> dst = reencode_string_len(src, src_len, enc, default_encoding,
> &dst_len);
> if (!dst) {
> - error("failed to encode '%s' from %s to %s",
> - path, default_encoding, enc);
> + error(_("failed to encode '%s' from %s to %s"),
> + path, default_encoding, enc);
The whitespace change on the second line fixes alignment with the
opening '('. Okay.
