Web lists-archives.com

Re: [PATCH 07/23] builtin/replace.c: mark more strings for translation




On Sat, Jun 30, 2018 at 2:08 AM, Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
> ---
>  builtin/replace.c | 82 +++++++++++++++++++++++------------------------
>  1 file changed, 41 insertions(+), 41 deletions(-)
>

> -               return error("invalid replace format '%s'\n"
> -                            "valid formats are 'short', 'medium' and 'long'\n",
> +               return error(_("invalid replace format '%s'\n"
> +                              "valid formats are 'short', 'medium' and 'long'"),

Was the removal of the trailing newline intentional?  If so, move it to patch 1?

> @@ -456,10 +456,10 @@ static int create_graft(int argc, const char **argv, int force, int gentle)
>                 return -1;
>         }
>
> -       if (remove_signature(&buf)) {
> -               warning(_("the original commit '%s' has a gpg signature."), old_ref);
> -               warning(_("the signature will be removed in the replacement commit!"));
> -       }
> +       if (remove_signature(&buf))
> +               warning(_("the original commit '%s' has a gpg signature.\n"
> +                         "The signature will be removed in the replacement commit!"),
> +                       old_ref);

More message changes that probably belong in patch 1 for consistency.