From nobody Mon Oct 3 11:08:33 2022 X-Original-To: freebsd-translators@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mgypc73pqz4djqm for ; Mon, 3 Oct 2022 11:12:08 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mgypc1MJpz3mkQ for ; Mon, 3 Oct 2022 11:12:08 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id s30so10375425eds.1 for ; Mon, 03 Oct 2022 04:12:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date; bh=09pm7VguHXjurG1g3gMWLcDpu5tEDLWNLZuVPU7BQzk=; b=r/SkcZxXwcmWD2DNsBN7cywfl16C6b0fjyI+2YZSXPgie4H0BAD4dWZVHHwtHOJNHJ vPeeirrINDKGqPV1wUDBszzQJUHWjARQ7iqX7qhRKKN3hKpyMjXyguQLTs3uOShaDeLU Jl7+FlYrlNdgXJsmVD0d9nmf7ThlTKkTFpxiec1opL3nnHM9+W4guqoIRNiKJGd5JbjX KanAId3YhE/Gk5QAbRr9fIX5O/nw3sWE5YI+SPzmDzDJF+QFr4ymfJtqaAr3hinH9fOP af8rmXmW/IQ8y0QDsyapF2+jZZFU1JFAKnaZBFvHEM4GRSiVZYYNyPRTC7eYZ88oZiTN 9jgg== X-Gm-Message-State: ACrzQf1u/KSnAI4WPb2aMzBBGsXtCUges2iWDwu8GV4V/uZwlmuNiSXD acSgcvO/9wQTpwZsiQMLBynaCBKLsSoZxw== X-Google-Smtp-Source: AMsMyM7Rm70XmZUN+dFmZn98IeeQs5mO6keoTlFKFbAhfBT+q3RmmFdA6b+QA4IqQ4MimRaPWFI2WQ== X-Received: by 2002:a05:6402:524d:b0:459:3619:9cfa with SMTP id t13-20020a056402524d00b0045936199cfamr315785edd.227.1664795525989; Mon, 03 Oct 2022 04:12:05 -0700 (PDT) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com. [209.85.218.49]) by smtp.gmail.com with ESMTPSA id 5-20020a170906328500b0078c468bd604sm876134ejw.57.2022.10.03.04.12.05 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Oct 2022 04:12:05 -0700 (PDT) Received: by mail-ej1-f49.google.com with SMTP id au23so586412ejc.1 for ; Mon, 03 Oct 2022 04:12:05 -0700 (PDT) X-Received: by 2002:a17:907:320b:b0:780:280:7b72 with SMTP id xg11-20020a170907320b00b0078002807b72mr15345982ejb.146.1664795525118; Mon, 03 Oct 2022 04:12:05 -0700 (PDT) List-Id: Translators List-Archive: https://lists.freebsd.org/archives/freebsd-translators List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-translators@freebsd.org X-BeenThere: freebsd-translators@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Mon, 3 Oct 2022 13:08:33 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [committers-guide] Problem with stubborn string To: freebsd-translators@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4Mgypc1MJpz3mkQ X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of fernando.apesteguia@gmail.com designates 209.85.208.43 as permitted sender) smtp.mailfrom=fernando.apesteguia@gmail.com X-Spamd-Result: default: False [-2.44 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; R_MIXED_CHARSET(0.56)[subject]; FORGED_SENDER(0.30)[fernape@freebsd.org,fernandoapesteguia@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-translators@freebsd.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.43:from,209.85.218.49:received]; RCVD_TLS_LAST(0.00)[]; FROM_NEQ_ENVFROM(0.00)[fernape@freebsd.org,fernandoapesteguia@gmail.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; MLMMJ_DEST(0.00)[freebsd-translators@freebsd.org]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_NONE(0.00)[]; TO_DOM_EQ_FROM_DOM(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TAGGED_FROM(0.00)[]; R_DKIM_NA(0.00)[]; ARC_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.43:from] X-ThisMailContainsUnwantedMimeParts: N On Mon, Oct 3, 2022 at 8:54 AM Fernando Apestegu=C3=ADa wrote: > > Hi there, > > I'm having some trouble with a string in the committers guide. While > translating in Weblate, there was some clear error since there was > this string shown in the original as: > > =3D=3D=3D=3D=3D=3D Time to update When it is time to bring in a new versi= on, it is... > > Apparently that doesn't cause any problems rendering the English > version of the document, but the translated versions show the heading > and the paragraph in the same style as if everything is a heading > (bold font, etc). > > I committed a change to have two different strings: > > https://cgit.freebsd.org/doc/commit/?id=3Dfb40f7a6d80b21aa0da2d2ed43c9e90= 51b3e3f8b > > Now in Weblate we have a string with the text: > > =3D=3D=3D=3D=3D=3D Time to update > > and then the paragraph: > > When it is time to bring in a new version, it is almost the same... > > I translated both of them. > > Now, the problem is that when I try to execute translate.sh, the .po > file that is generated has everything again in a single line: > > msgid "" > "=3D=3D=3D=3D=3D=3D Time to update When it is time to bring in a new vers= ion, it is " > "almost the same as w/o the branches. You would update like you would ab= ove, " > "but there is one extra command before you update, and one after. The " > "following assumes you are starting with an unmodified tree. It is impor= tant " > "to start rebasing operations with a clean tree (Git requires this)." > > and then the doc is not rendered properly. The English original is ok, > with two separated strings though. > > Any ideas what's happening here? Well, it was PEBKAC. It is a bit embarrassing as I couldn't make it work so I deleted the branch completely and downloaded the .po file again. Now everything looks fine. Sorry for the noise. > > Thanks!