git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Jean-Noël Avila" <avila.jn@gmail.com>
To: Sami Boukortt <sami@boukortt.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: French translation: incorrect translation for error message in “git push <remote>”
Date: Tue, 20 Oct 2020 16:29:43 +0200	[thread overview]
Message-ID: <85708905-cac0-963a-c244-f77d95ab421b@gmail.com> (raw)
In-Reply-To: <CAAb+AL_xObsexRXL_fZdhj2FNQsOLzEz3_mZqd1Yz7F0=-havA@mail.gmail.com>

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



      parent reply	other threads:[~2020-10-20 14:30 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-19 15:59 French translation: incorrect translation for error message in “git push <remote>” Sami Boukortt
2020-10-19 17:41 ` Taylor Blau
2020-10-19 17:49   ` Junio C Hamano
2020-10-19 17:50     ` Taylor Blau
2020-10-20 14:29 ` Jean-Noël Avila [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=85708905-cac0-963a-c244-f77d95ab421b@gmail.com \
    --to=avila.jn@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=sami@boukortt.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).