All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sandy Carter <sandy.carter@savoirfairelinux.com>
To: git@vger.kernel.org
Cc: jn.avila@free.fr
Subject: Re: [PATCH v2 2/2] i18n: assure command not corrupted by _() process
Date: Mon, 10 Mar 2014 08:51:21 -0400	[thread overview]
Message-ID: <531DB549.5060304@savoirfairelinux.com> (raw)
In-Reply-To: <1393858554-4392-2-git-send-email-sandy.carter@savoirfairelinux.com>

Is there any update on this patch?

Le 2014-03-03 09:55, Sandy Carter a écrit :
> Separate message from command examples to avoid translation issues
> such as a dash being omitted in a translation.
>
> Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
> ---
>   builtin/branch.c | 10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index b4d7716..b304da8 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -1022,11 +1022,13 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
>   		 */
>   		if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&
>   		    !branch_existed && remote_tracking) {
> -			fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name);
> -			fprintf(stderr, _("    git branch -d %s\n"), branch->name);
> -			fprintf(stderr, _("    git branch --set-upstream-to %s\n"), branch->name);
> +			fprintf(stderr, "\n");
> +			fprintf(stderr, _("If you wanted to make '%s' track '%s', do this:"), head, branch->name);
> +			fprintf(stderr, "\n\n");
> +			fprintf(stderr, "    git branch -d %s\n", branch->name);
> +			fprintf(stderr, "    git branch --set-upstream-to %s\n", branch->name);
> +			fprintf(stderr, "\n");
>   		}
> -
>   	} else
>   		usage_with_options(builtin_branch_usage, options);
>
>

  reply	other threads:[~2014-03-10 12:49 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-28 20:52 [PATCH] i18n: proposed command missing leading dash Sandy Carter
2014-02-28 21:41 ` Jonathan Nieder
2014-02-28 23:31   ` Junio C Hamano
2014-03-01  0:36     ` Sandy Carter
2014-03-03 14:55 ` [PATCH v2 1/2] " Sandy Carter
2014-03-03 14:55   ` [PATCH v2 2/2] i18n: assure command not corrupted by _() process Sandy Carter
2014-03-10 12:51     ` Sandy Carter [this message]
2014-03-11 11:40       ` Duy Nguyen
2014-03-04 18:40   ` [PATCH v2 1/2] i18n: proposed command missing leading dash Junio C Hamano
2014-03-05 14:14     ` Jiang Xin
2014-03-05 21:57       ` Junio C Hamano

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=531DB549.5060304@savoirfairelinux.com \
    --to=sandy.carter@savoirfairelinux.com \
    --cc=git@vger.kernel.org \
    --cc=jn.avila@free.fr \
    /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.