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

Re: [PATCH 1/3] rebase.c: state preserve-merges has been removed

From
Junio C Hamano <gitster@pobox.com>
Date
May 27, 2022, 15:45 UTC
Message-ID
<xmqq4k1b6ktb.fsf@gitster.g>
In-Reply-To
<9455d0af-87f2-f331-a440-3d3feb743610@iee.email>
Philip Oakley <philipoakley@iee.email> writes:
Show 7 quoted lines
> On 26/05/2022 21:33, Junio C Hamano wrote:
>>>> So there's no point in changing this string, nor to have translators
>>>> focus on it, it'll never be used.
>>>>
>>>>
> The translation change would need to be a separate patch, no? That
> would make it easy to drop if not wanted.

I think you are responding to what Ævar said, but the string this patch is modifying is already inside N_(), and modifying a string that is already marked for translation in any way (other than removing the N_() or _() around it) incurs the cost to translate the updated string already, with or without any separate patch.

If we are adding a new die() call that uses a new message, we should mark the message for translation from the beginning. The messages produced by die/warning/error are meant to be read by human users, so unless there is some very strong reason not to, they should be marked for translation.

Previous: Philip OakleyNext: Philip Oakley
Message 11 of 35 in “Die preserve ggg”
  1. 0/3 Die preserve gggPhilip Oakley via GitGitGadget, May 26, 2022
  2. 1/3 rebase.c: state preserve-merges has been removedPhilip Oakley via GitGitGadget, May 26, 2022
  3. Ævar Arnfjörð BjarmasonMay 26, 2022
  4. Philip OakleyMay 26, 2022
  5. René ScharfeMay 26, 2022
  6. Junio C HamanoMay 26, 2022
  7. René ScharfeMay 26, 2022
  8. Junio C HamanoMay 26, 2022
  9. Philip OakleyMay 27, 2022
  10. Philip OakleyMay 27, 2022
  11. Junio C HamanoMay 27, 2022
  12. Philip OakleyMay 27, 2022
  13. Ævar Arnfjörð BjarmasonMay 27, 2022
  14. 2/3 rebase: help users when dying with `preserve-merges`Philip Oakley via GitGitGadget, May 26, 2022
  15. Ævar Arnfjörð BjarmasonMay 26, 2022
  16. Philip OakleyMay 26, 2022
  17. Junio C HamanoMay 26, 2022
  18. Philip OakleyMay 27, 2022
  19. Junio C HamanoMay 27, 2022
  20. 3/3 rebase: note `preserve` merges may be a pull config optionPhilip Oakley via GitGitGadget, May 26, 2022
  21. Ævar Arnfjörð BjarmasonMay 26, 2022
  22. Philip OakleyMay 26, 2022
  23. Junio C HamanoMay 26, 2022
  24. Philip OakleyMay 27, 2022
  25. Ævar Arnfjörð BjarmasonMay 26, 2022
  26. Philip OakleyMay 26, 2022
  27. 0/4 Die preserve gggPhilip Oakley via GitGitGadget, Jun 4, 2022
  28. 3/4 rebase: note `preserve` merges may be a pull config optionPhilip Oakley via GitGitGadget, Jun 4, 2022
  29. Junio C HamanoJun 6, 2022
  30. Philip OakleyJun 11, 2022
  31. Philip OakleyJun 11, 2022
  32. Junio C HamanoJun 11, 2022
  33. 2/4 rebase: help users when dying with `preserve-merges`Philip Oakley via GitGitGadget, Jun 4, 2022
  34. 1/4 rebase.c: state preserve-merges has been removedPhilip Oakley via GitGitGadget, Jun 4, 2022
  35. 4/4 rebase: translate a die(preserve-merges) messagePhilip Oakley via GitGitGadget, Jun 4, 2022

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.