git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v4 6/7] i18n: builtin/rm.c: remove a comma ',' from string

From
Junio C Hamano <gitster@pobox.com>
Date
May 12, 2016, 21:05 UTC
Message-ID
<xmqqtwi3c7gx.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<1463083168-29213-7-git-send-email-vascomalmeida@sapo.pt>
Vasco Almeida <vascomalmeida@sapo.pt> writes:
Show 5 quoted lines
> 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.

Show 16 quoted lines
>  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) {
Previous: Vasco AlmeidaNext: Vasco Almeida
Message 21 of 23 in “i18n: index-pack: use plural string instead of normal one”
  1. 1/7 i18n: index-pack: use plural string instead of normal oneVasco Almeida, Apr 19, 2016
  2. 2/7 i18n: unpack-trees: mark strings for translationVasco Almeida, Apr 19, 2016
  3. 3/7 i18n: git-parse-remote.sh: mark strings for translationVasco Almeida, Apr 19, 2016
  4. 4/7 i18n: builtin/pull.c: mark placeholders for translationVasco Almeida, Apr 19, 2016
  5. 5/7 i18n: builtin/pull.c: split strings marked for translationVasco Almeida, Apr 19, 2016
  6. 6/7 i18n: builtin/rm.c: remove a comma ',' from stringVasco Almeida, Apr 19, 2016
  7. 7/7 i18n: builtin/branch.c: mark option for translationVasco Almeida, Apr 19, 2016
  8. Junio C HamanoApr 19, 2016
  9. Junio C HamanoApr 19, 2016
  10. 0/7 i18n miscellaneous updatesVasco Almeida, May 12, 2016
  11. 1/7 i18n: index-pack: use plural string instead of normal oneVasco Almeida, May 12, 2016
  12. 2/7 i18n: unpack-trees: mark strings for translationVasco Almeida, May 12, 2016
  13. Junio C HamanoMay 12, 2016
  14. i18n: unpack-trees: avoid substituting only a verb in sentencesVasco Almeida, May 12, 2016
  15. Junio C HamanoMay 12, 2016
  16. Junio C HamanoMay 12, 2016
  17. 3/7 i18n: git-parse-remote.sh: mark strings for translationVasco Almeida, May 12, 2016
  18. 4/7 i18n: builtin/pull.c: mark placeholders for translationVasco Almeida, May 12, 2016
  19. 5/7 i18n: builtin/pull.c: split strings marked for translationVasco Almeida, May 12, 2016
  20. 6/7 i18n: builtin/rm.c: remove a comma ',' from stringVasco Almeida, May 12, 2016
  21. Junio C HamanoMay 12, 2016
  22. 7/7 i18n: builtin/branch.c: mark option for translationVasco Almeida, May 12, 2016
  23. Junio C HamanoMay 12, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.