Skip to content

l10n: fix typo "NITES" → "NOTES" in French translation#2153

Open
tychota wants to merge 1 commit intogit:gh-pagesfrom
tychota:fix/fr-typo-notes-merge-strategy
Open

l10n: fix typo "NITES" → "NOTES" in French translation#2153
tychota wants to merge 1 commit intogit:gh-pagesfrom
tychota:fix/fr-typo-notes-merge-strategy

Conversation

@tychota
Copy link
Copy Markdown

@tychota tychota commented Apr 14, 2026

Summary

  • Fix a typo in the French translation: "STRATÉGIES DE FUSION DE NITES" → "STRATÉGIES DE FUSION DE NOTES" across 6 files (3 HTML docs for git-notes, git-log, git-config + 3 asciidoc sources).

Test plan

  • Verified all 6 occurrences have been corrected
  • Visual check on rendered French documentation pages

Assisted-by: Claude:claude-opus-4-6

Fix a typo in the French translation of git-notes merge strategy
section heading: "STRATÉGIES DE FUSION DE NITES" should be
"STRATÉGIES DE FUSION DE NOTES".

Assisted-by: Claude:claude-opus-4-6
@dscho
Copy link
Copy Markdown
Member

dscho commented Apr 14, 2026

Thank you for this fix. Unfortunately, you reached the completely wrong repository here. We are only mirroring what we get from the upstream repositories. The big indicator is the external/ prefix of the file name, and the commit history of the touched files (e.g. https://github.com/git/git-scm.com/commits/HEAD/external/docs/asciidoc/261ca1a21c465cd4848902a4a993789ef9433fde).

In this particular instance, those files are intended to be updated exclusively by the update-translated-manual-pages.yml GitHub workflow. As you can see in that workflow's definition, the ground truth is the https://github.com/jnavila/git-html-l10n repository. But that is still only containing the rendered translated manual pages. They are rendered versions of the contents of https://github.com/jnavila/git-manpages-l10n, which is the repository you actually want to target.

Now, the biggest problem there is: I cannot find any mention of NITES there, https://github.com/search?q=org%3Ajnavila+nites&type=code has only one result, and that's in git-html-l10n...

@dscho
Copy link
Copy Markdown
Member

dscho commented Apr 14, 2026

I cannot find any mention of NITES there, https://github.com/search?q=org%3Ajnavila+nites&type=code has only one result

Ah! It's just GitHub being... particular... about large files. If you clone https://github.com/jnavila/git-manpages-l10n/, you can find it immediately:

$ git grep -n NITES
po/documentation.fr.po:79240:msgstr "La stratégie de fusion à choisir lors de la fusion denote dans `refs/notes/ <nom>`. Cela remplace le plus général `notes.mergeStrategy`. Voir la section « STRATÉGIES DE FUSION DE NITES » dans linkgit:git-notes[1] pour plus d'informations sur les stratégies disponibles."

@tychota Could you please make the change in a clone of that repository, transplant your commit message to that change, and open the PR there?

@tychota
Copy link
Copy Markdown
Author

tychota commented Apr 14, 2026

Sure i will do that so let me see if i get that right:

  • clone the above directory
  • do the change in Po file there
  • get it merged

The step i'm unclear off is once merged there, how should I make sure the website is updated ? is there manual steps ?

@dscho
Copy link
Copy Markdown
Member

dscho commented Apr 14, 2026

Sure i will do that so let me see if i get that right:

  • clone the above directory
  • do the change in Po file there
  • get it merged

Excellent.

The step i'm unclear off is once merged there, how should I make sure the website is updated ? is there manual steps ?

That will all be semi-automatic and you won't have to do a thing. Probably coinciding with Git v2.54.0 on April 20th, the git-html-l10n repository will be updated (hopefully with your fix). Once that's done, a scheduled workflow run in this here repository will pick up the updated HTML files, then deploy to git-scm.com.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants