From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 1F68F1F66E for ; Fri, 28 Aug 2020 16:11:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726344AbgH1QLR convert rfc822-to-8bit (ORCPT ); Fri, 28 Aug 2020 12:11:17 -0400 Received: from smtpfb2-g21.free.fr ([212.27.42.10]:46674 "EHLO smtpfb2-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725814AbgH1QLR (ORCPT ); Fri, 28 Aug 2020 12:11:17 -0400 X-Greylist: delayed 598 seconds by postgrey-1.27 at vger.kernel.org; Fri, 28 Aug 2020 12:11:15 EDT Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by smtpfb2-g21.free.fr (Postfix) with ESMTP id 94E204356E1 for ; Fri, 28 Aug 2020 17:54:05 +0200 (CEST) Received: from cayenne.localnet (unknown [IPv6:2a01:e0a:d1:f360:e110:de7a:39e9:b10d]) by smtp3-g21.free.fr (Postfix) with ESMTP id 16F2913F87C; Fri, 28 Aug 2020 17:53:32 +0200 (CEST) From: =?ISO-8859-1?Q?Jean=2DNo=EBl?= AVILA To: "brian m. carlson" , Junio C Hamano Cc: git@vger.kernel.org Subject: Re: [PATCH] po: add missing letter for French message Date: Fri, 28 Aug 2020 17:53:32 +0200 Message-ID: <2398329.Am1n9C2Xzm@cayenne> In-Reply-To: References: <20200827223527.36788-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset="iso-8859-1" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Friday, 28 August 2020 01:04:02 CEST Junio C Hamano wrote: > "brian m. carlson" writes: > > > Add the missing "e" in "de". While it is possible in French to omit it, > > that only occurs with an apostrophe and only when the next word starts > > with a vowel or mute h, which is not the case here. > > > > Signed-off-by: brian m. carlson > > --- > > I noticed this the other day when trying to delete a remote branch that > > I'd already deleted. I'm not sure what the preferred approach is for > > this, whether Junio should pick it up or whether Jean-Noël will want to > > incorporate it first, but I've CC'd both so y'all can fight it out. > > Unless it is in the pre-release period (in which case I'd prefer not > to touch po/ myself at all, to give i18n/l10n teams a stable base to > work from), I can take it dircetly as long as somebody from the l10n > team for the language gives an Ack, as I cannot read most of the > files under po/ directory. > > Thanks. > Acked-by: Jean-Noël Avila > > > po/fr.po | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/po/fr.po b/po/fr.po > > index d20fc440ab..75b1e75f6a 100644 > > --- a/po/fr.po > > +++ b/po/fr.po > > @@ -6503,7 +6503,7 @@ msgstr "'%s' ne peut pas être résolue comme une branche" > > #: remote.c:1088 > > #, c-format > > msgid "unable to delete '%s': remote ref does not exist" > > -msgstr "suppression d '%s' impossible : la référence distante n'existe pas" > > +msgstr "suppression de '%s' impossible : la référence distante n'existe pas" > > > > #: remote.c:1100 > > #, c-format