# French translation: incorrect translation for error message in “git push ” 5 messages from 2020-10-19 to 2020-10-20. Participants: Sami Boukortt, Taylor Blau, Junio C Hamano, Jean-Noël Avila. Thread: https://gitlist.dev/t/54461 ## Sami Boukortt, 2020-10-19 15:59 Subject: French translation: incorrect translation for error message in “git push ” Message-ID: URL: https://gitlist.dev/e/CAAb%2BAL_xObsexRXL_fZdhj2FNQsOLzEz3_mZqd1Yz7F0%3D-havA%40mail.gmail.com ``` Hi, I just noticed a misleading translation. When running `git push foo`, one can get an error message that looks like this: > fatal: You are pushing to remote 'foo', which is not the upstream of > your current branch 'the-branch', without telling me what to push > to update which remote branch. In French, that message is: > fatal: Vous êtes en train de pousser vers la branche distante 'foo', qui n'est > pas une branche amont de votre branche courante 'the-branch', sans me dire > quoi pousser pour mettre à jour quelle branche amont. which incorrectly refers to foo as a remote *branch*, as opposed to just a remote. In the error message for `git remote rename a b`, remotes are called « serveur remote » (« fatal: Pas de serveur remote : 'a' »), so this could be what to change the message to. « qui n'est pas une branche amont » would also have to be changed. Thanks. Best, Sami ``` ## Taylor Blau, 2020-10-19 17:41 Subject: Re: French translation: incorrect translation for error message in “git push ” Message-ID: <20201019174127.GA42778@nand.local> URL: https://gitlist.dev/e/20201019174127.GA42778%40nand.local In-Reply-To: ``` Hi Sami, On Mon, Oct 19, 2020 at 05:59:54PM +0200, Sami Boukortt wrote: > Hi, > > I just noticed a misleading translation. When running `git push foo`, > one can get an error message that looks like this: > > > fatal: You are pushing to remote 'foo', which is not the upstream of > > your current branch 'the-branch', without telling me what to push > > to update which remote branch. > > In French, that message is: > > > fatal: Vous êtes en train de pousser vers la branche distante 'foo', qui n'est > > pas une branche amont de votre branche courante 'the-branch', sans me dire > > quoi pousser pour mettre à jour quelle branche amont. > > which incorrectly refers to foo as a remote *branch*, as opposed to > just a remote. Thanks for pointing it out. My French skills are poor (and getting worse each day), but this seems reasonable to my limited knowledge. > In the error message for `git remote rename a b`, remotes are called « > serveur remote » (« fatal: Pas de serveur remote : 'a' »), so this > could be what to change the message to. « qui n'est pas une branche > amont » would also have to be changed. If you are up for it, you can send a patch changing the po/fr.po file. See for more on how to do that the Documentation/SubmittingPatches, and po/README. Here [1] is an example patch that recently modified the French translation. Thanks, Taylor [1]: https://lore.kernel.org/git/20200827223527.36788-1-sandals@crustytoothpaste.net/ ``` ## Junio C Hamano, 2020-10-19 17:49 Subject: Re: French translation: incorrect translation for error message in “git push ” Message-ID: URL: https://gitlist.dev/e/xmqq5z76umvc.fsf%40gitster.c.googlers.com In-Reply-To: <20201019174127.GA42778@nand.local> ``` Taylor Blau writes: > Thanks for pointing it out. My French skills are poor (and getting worse > each day), but this seems reasonable to my limited knowledge. Thanks, both. > If you are up for it, you can send a patch changing the po/fr.po file. > See for more on how to do that the Documentation/SubmittingPatches, and > po/README. Here [1] is an example patch that recently modified the > French translation. > > Thanks, > Taylor > > [1]: https://lore.kernel.org/git/20200827223527.36788-1-sandals@crustytoothpaste.net/ The localization (l10n) coordinator, Jiang Xin , coordinates our localization effort in the l10 coordinator repository: https://github.com/git-l10n/git-po/ As a contributor for a language XX, you should first check TEAMS file in this directory to see whether a dedicated repository for your language XX exists. Fork the dedicated repository and start to work if it exists. And here is the entry in po/TEAMS file for the French team. Language: fr (French) Repository: https://github.com/jnavila/git Leader: Jean-Noël Avila Members: Sébastien Helleu My understanding is that the l10n effort mostly uses the GitHub pull request based workflow than sending patches to this mailing list. Thanks. ``` ## Taylor Blau, 2020-10-19 17:50 Subject: Re: French translation: incorrect translation for error message in “git push ” Message-ID: <20201019175059.GB42778@nand.local> URL: https://gitlist.dev/e/20201019175059.GB42778%40nand.local In-Reply-To: ``` On Mon, Oct 19, 2020 at 10:49:43AM -0700, Junio C Hamano wrote: > My understanding is that the l10n effort mostly uses the GitHub pull > request based workflow than sending patches to this mailing list. My misunderstanding. I thought that brian's patch to the list a couple of weeks ago was the typical workflow, but apparently not :). In either case, the po/README guide is authoritative, so whatever it says is good to do. Thanks, Taylor ``` ## Jean-Noël Avila, 2020-10-20 14:29 Subject: Re: French translation: incorrect translation for error message in “git push ” Message-ID: <85708905-cac0-963a-c244-f77d95ab421b@gmail.com> URL: https://gitlist.dev/e/85708905-cac0-963a-c244-f77d95ab421b%40gmail.com In-Reply-To: ``` Hi Sami, I'm in charge of the French translation of git, and you are right. Remote repo in French was usually translated as "dépôt distant" (or simply "distant" by analogy with English). So the sentence should really be: Vous êtes en train de pousser vers le dépôt distant 'foo', qui n'est pas l'amont de votre branche courante 'the-branch'.... You can either open a pull request to my repo or send me a patch. Best regards, Jean-Noël Le 19/10/2020 à 17:59, Sami Boukortt a écrit : > Hi, > > I just noticed a misleading translation. When running `git push foo`, > one can get an error message that looks like this: > >> fatal: You are pushing to remote 'foo', which is not the upstream of >> your current branch 'the-branch', without telling me what to push >> to update which remote branch. > In French, that message is: > >> fatal: Vous êtes en train de pousser vers la branche distante 'foo', qui n'est >> pas une branche amont de votre branche courante 'the-branch', sans me dire >> quoi pousser pour mettre à jour quelle branche amont. > which incorrectly refers to foo as a remote *branch*, as opposed to > just a remote. > > In the error message for `git remote rename a b`, remotes are called « > serveur remote » (« fatal: Pas de serveur remote : 'a' »), so this > could be what to change the message to. « qui n'est pas une branche > amont » would also have to be changed. > > Thanks. > > Best, > Sami ```