French translation: incorrect translation for error message in “git push <remote>”

French translation: incorrect translation for error message in “git push <remote>”

[Sami Boukortt]

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

Re: French translation: incorrect translation for error message in “git push <remote>”

[Taylor Blau]

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/

Re: French translation: incorrect translation for error message in “git push <remote>”

[Junio C Hamano]

Taylor Blau <me@ttaylorr.com> 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 <worldhello.net@gmail.com>,
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 <jn.avila@free.fr>
    Members:	Sébastien Helleu <flashcode@flashtux.org>

My understanding is that the l10n effort mostly uses the GitHub pull
request based workflow than sending patches to this mailing list.

Thanks.

Re: French translation: incorrect translation for error message in “git push <remote>”

[Taylor Blau]

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

Re: French translation: incorrect translation for error message in “git push <remote>”

[Jean-Noël Avila]

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