{"thread":{"id":"54461","subject":"French translation: incorrect translation for error message in “git push <remote>”","startedAt":"2020-10-19T16:00:11Z","lastAt":"2020-10-20T14:30:08Z","messageCount":5,"participants":["Sami Boukortt","Taylor Blau","Junio C Hamano","Jean-Noël Avila"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"407879","messageId":"CAAb+AL_xObsexRXL_fZdhj2FNQsOLzEz3_mZqd1Yz7F0=-havA@mail.gmail.com","threadId":"54461","inReplyTo":null,"subject":"French translation: incorrect translation for error message in “git push <remote>”","fromName":"Sami Boukortt","fromEmail":"sami@boukortt.com","sentAt":"2020-10-19T15:59:54Z","receivedAt":"2020-10-19T16:00:11Z","isPatch":false,"sender":{"key":"sami@boukortt.com","avatar":"https://gravatar.com/avatar/92e155a3cfcf052810561e533ec02436a192a9679ec8dc42cb13141737f450fb?d=mp&s=160"},"body":"Hi,\n\nI just noticed a misleading translation. When running `git push foo`,\none can get an error message that looks like this:\n\n> fatal: You are pushing to remote 'foo', which is not the upstream of\n> your current branch 'the-branch', without telling me what to push\n> to update which remote branch.\n\nIn French, that message is:\n\n> fatal: Vous êtes en train de pousser vers la branche distante 'foo', qui n'est\n> pas une branche amont de votre branche courante 'the-branch', sans me dire\n> quoi pousser pour mettre à jour quelle branche amont.\n\nwhich incorrectly refers to foo as a remote *branch*, as opposed to\njust a remote.\n\nIn the error message for `git remote rename a b`, remotes are called «\nserveur remote » (« fatal: Pas de serveur remote : 'a' »), so this\ncould be what to change the message to. « qui n'est pas une branche\namont » would also have to be changed.\n\nThanks.\n\nBest,\nSami\n"},{"id":"407885","messageId":"20201019174127.GA42778@nand.local","threadId":"54461","inReplyTo":"CAAb+AL_xObsexRXL_fZdhj2FNQsOLzEz3_mZqd1Yz7F0=-havA@mail.gmail.com","subject":"Re: French translation: incorrect translation for error message in “git push <remote>”","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2020-10-19T17:41:27Z","receivedAt":"2020-10-19T17:41:33Z","isPatch":false,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"Hi Sami,\n\nOn Mon, Oct 19, 2020 at 05:59:54PM +0200, Sami Boukortt wrote:\n> Hi,\n>\n> I just noticed a misleading translation. When running `git push foo`,\n> one can get an error message that looks like this:\n>\n> > fatal: You are pushing to remote 'foo', which is not the upstream of\n> > your current branch 'the-branch', without telling me what to push\n> > to update which remote branch.\n>\n> In French, that message is:\n>\n> > fatal: Vous êtes en train de pousser vers la branche distante 'foo', qui n'est\n> > pas une branche amont de votre branche courante 'the-branch', sans me dire\n> > quoi pousser pour mettre à jour quelle branche amont.\n>\n> which incorrectly refers to foo as a remote *branch*, as opposed to\n> just a remote.\n\nThanks for pointing it out. My French skills are poor (and getting worse\neach day), but this seems reasonable to my limited knowledge.\n\n> In the error message for `git remote rename a b`, remotes are called «\n> serveur remote » (« fatal: Pas de serveur remote : 'a' »), so this\n> could be what to change the message to. « qui n'est pas une branche\n> amont » would also have to be changed.\n\nIf you are up for it, you can send a patch changing the po/fr.po file.\nSee for more on how to do that the Documentation/SubmittingPatches, and\npo/README. Here [1] is an example patch that recently modified the\nFrench translation.\n\nThanks,\nTaylor\n\n[1]: https://lore.kernel.org/git/20200827223527.36788-1-sandals@crustytoothpaste.net/\n"},{"id":"407886","messageId":"xmqq5z76umvc.fsf@gitster.c.googlers.com","threadId":"54461","inReplyTo":"20201019174127.GA42778@nand.local","subject":"Re: French translation: incorrect translation for error message in “git push <remote>”","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-10-19T17:49:43Z","receivedAt":"2020-10-19T17:49:48Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Taylor Blau <me@ttaylorr.com> writes:\n\n> Thanks for pointing it out. My French skills are poor (and getting worse\n> each day), but this seems reasonable to my limited knowledge.\n\nThanks, both.\n\n> If you are up for it, you can send a patch changing the po/fr.po file.\n> See for more on how to do that the Documentation/SubmittingPatches, and\n> po/README. Here [1] is an example patch that recently modified the\n> French translation.\n>\n> Thanks,\n> Taylor\n>\n> [1]: https://lore.kernel.org/git/20200827223527.36788-1-sandals@crustytoothpaste.net/\n\nThe localization (l10n) coordinator, Jiang Xin <worldhello.net@gmail.com>,\ncoordinates our localization effort in the l10 coordinator repository:\n\n        https://github.com/git-l10n/git-po/\n\nAs a contributor for a language XX, you should first check TEAMS file in\nthis directory to see whether a dedicated repository for your language XX\nexists. Fork the dedicated repository and start to work if it exists.\n\nAnd here is the entry in po/TEAMS file for the French team.\n\n    Language:\tfr (French)\n    Repository:\thttps://github.com/jnavila/git\n    Leader:\t\tJean-Noël Avila <jn.avila@free.fr>\n    Members:\tSébastien Helleu <flashcode@flashtux.org>\n\nMy understanding is that the l10n effort mostly uses the GitHub pull\nrequest based workflow than sending patches to this mailing list.\n\nThanks.\n\n\n"},{"id":"407887","messageId":"20201019175059.GB42778@nand.local","threadId":"54461","inReplyTo":"xmqq5z76umvc.fsf@gitster.c.googlers.com","subject":"Re: French translation: incorrect translation for error message in “git push <remote>”","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2020-10-19T17:50:59Z","receivedAt":"2020-10-19T17:51:05Z","isPatch":false,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Mon, Oct 19, 2020 at 10:49:43AM -0700, Junio C Hamano wrote:\n> My understanding is that the l10n effort mostly uses the GitHub pull\n> request based workflow than sending patches to this mailing list.\n\nMy misunderstanding. I thought that brian's patch to the list a couple\nof weeks ago was the typical workflow, but apparently not :). In either\ncase, the po/README guide is authoritative, so whatever it says is good\nto do.\n\nThanks,\nTaylor\n"},{"id":"407990","messageId":"85708905-cac0-963a-c244-f77d95ab421b@gmail.com","threadId":"54461","inReplyTo":"CAAb+AL_xObsexRXL_fZdhj2FNQsOLzEz3_mZqd1Yz7F0=-havA@mail.gmail.com","subject":"Re: French translation: incorrect translation for error message in “git push <remote>”","fromName":"Jean-Noël Avila","fromEmail":"avila.jn@gmail.com","sentAt":"2020-10-20T14:29:43Z","receivedAt":"2020-10-20T14:30:08Z","isPatch":false,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"Hi Sami,\n\nI'm in charge of the French translation of git, and you are right.\n\nRemote repo in French was usually translated as \"dépôt distant\"\n(or simply \"distant\" by analogy with English). So the sentence should\nreally be:\n\nVous êtes en train de pousser vers le dépôt distant 'foo', qui n'est\npas l'amont de votre branche courante 'the-branch'....\n\nYou can either open a pull request to my repo or send me a patch.\n\nBest regards,\n\nJean-Noël\n\nLe 19/10/2020 à 17:59, Sami Boukortt a écrit :\n> Hi,\n>\n> I just noticed a misleading translation. When running `git push foo`,\n> one can get an error message that looks like this:\n>\n>> fatal: You are pushing to remote 'foo', which is not the upstream of\n>> your current branch 'the-branch', without telling me what to push\n>> to update which remote branch.\n> In French, that message is:\n>\n>> fatal: Vous êtes en train de pousser vers la branche distante 'foo', qui n'est\n>> pas une branche amont de votre branche courante 'the-branch', sans me dire\n>> quoi pousser pour mettre à jour quelle branche amont.\n> which incorrectly refers to foo as a remote *branch*, as opposed to\n> just a remote.\n>\n> In the error message for `git remote rename a b`, remotes are called «\n> serveur remote » (« fatal: Pas de serveur remote : 'a' »), so this\n> could be what to change the message to. « qui n'est pas une branche\n> amont » would also have to be changed.\n>\n> Thanks.\n>\n> Best,\n> Sami\n\n\n"}]}