Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Vasco Almeida <vascomalmeida@sapo.pt>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v4 6/7] i18n: builtin/rm.c: remove a comma ',' from string
Date: Thu, 12 May 2016 14:05:50 -0700	[thread overview]
Message-ID: <xmqqtwi3c7gx.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1463083168-29213-7-git-send-email-vascomalmeida@sapo.pt> (Vasco Almeida's message of "Thu, 12 May 2016 19:59:27 +0000")

Vasco Almeida <vascomalmeida@sapo.pt> writes:

> Remove a comma from string marked for translation. Make the string match the
> one in builtin/mv.c. Now translators have do handle this string only once.
>
> Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
> ---

Looks good.  BTW, I think you just added two more "Please," in
"i18n: unpack-trees" patch by repeating a set of very similar
messages.

>  builtin/rm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/rm.c b/builtin/rm.c
> index 8829b09..be83c43 100644
> --- a/builtin/rm.c
> +++ b/builtin/rm.c
> @@ -314,7 +314,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
>  		list.entry[list.nr].is_submodule = S_ISGITLINK(ce->ce_mode);
>  		if (list.entry[list.nr++].is_submodule &&
>  		    !is_staging_gitmodules_ok())
> -			die (_("Please, stage your changes to .gitmodules or stash them to proceed"));
> +			die (_("Please stage your changes to .gitmodules or stash them to proceed"));
>  	}
>  
>  	if (pathspec.nr) {

  reply	other threads:[~2016-05-12 21:05 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-19 13:19 [PATCH v3 1/7] i18n: index-pack: use plural string instead of normal one Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 2/7] i18n: unpack-trees: mark strings for translation Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 3/7] i18n: git-parse-remote.sh: " Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 4/7] i18n: builtin/pull.c: mark placeholders " Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 5/7] i18n: builtin/pull.c: split strings marked " Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 6/7] i18n: builtin/rm.c: remove a comma ',' from string Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 7/7] i18n: builtin/branch.c: mark option for translation Vasco Almeida
2016-04-19 19:06 ` [PATCH v3 1/7] i18n: index-pack: use plural string instead of normal one Junio C Hamano
2016-04-19 19:46   ` Junio C Hamano
2016-05-12 19:59 ` [PATCH v4 0/7] i18n miscellaneous updates Vasco Almeida
2016-05-12 21:10   ` Junio C Hamano
2016-05-12 19:59 ` [PATCH v4 1/7] i18n: index-pack: use plural string instead of normal one Vasco Almeida
2016-05-12 19:59 ` [PATCH v4 2/7] i18n: unpack-trees: mark strings for translation Vasco Almeida
2016-05-12 22:50   ` Junio C Hamano
2016-05-12 23:16     ` [PATCH] i18n: unpack-trees: avoid substituting only a verb in sentences Vasco Almeida
2016-05-12 23:28       ` Junio C Hamano
2016-05-12 23:30         ` Junio C Hamano
2016-05-12 19:59 ` [PATCH v4 3/7] i18n: git-parse-remote.sh: mark strings for translation Vasco Almeida
2016-05-12 19:59 ` [PATCH v4 4/7] i18n: builtin/pull.c: mark placeholders " Vasco Almeida
2016-05-12 19:59 ` [PATCH v4 5/7] i18n: builtin/pull.c: split strings marked " Vasco Almeida
2016-05-12 19:59 ` [PATCH v4 6/7] i18n: builtin/rm.c: remove a comma ',' from string Vasco Almeida
2016-05-12 21:05   ` Junio C Hamano [this message]
2016-05-12 19:59 ` [PATCH v4 7/7] i18n: builtin/branch.c: mark option for translation Vasco Almeida

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=xmqqtwi3c7gx.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=vascomalmeida@sapo.pt \
    /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