From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gPFVGhISP1+5ZAAA0tVLHw (envelope-from ) for ; Fri, 21 Aug 2020 00:15:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id YL4qFhISP187VAAAbx9fmQ (envelope-from ) for ; Fri, 21 Aug 2020 00:15:14 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 982889402CC for ; Fri, 21 Aug 2020 00:15:13 +0000 (UTC) Received: from localhost ([::1]:57592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8ui7-0004ji-Eq for larch@yhetil.org; Thu, 20 Aug 2020 20:15:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8uhy-0004j7-D1 for bug-guix@gnu.org; Thu, 20 Aug 2020 20:15:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k8uhx-0001LF-Oi for bug-guix@gnu.org; Thu, 20 Aug 2020 20:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k8uhx-0000GO-Jk for bug-guix@gnu.org; Thu, 20 Aug 2020 20:15:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#26302: Multilingual web site is on-line! Resent-From: "pelzflorian (Florian Pelz)" Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 21 Aug 2020 00:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26302 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Julien Lepiller Received: via spool by 26302-submit@debbugs.gnu.org id=B26302.1597968877967 (code B ref 26302); Fri, 21 Aug 2020 00:15:01 +0000 Received: (at 26302) by debbugs.gnu.org; 21 Aug 2020 00:14:37 +0000 Received: from localhost ([127.0.0.1]:44484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8uhZ-0000FW-14 for submit@debbugs.gnu.org; Thu, 20 Aug 2020 20:14:37 -0400 Received: from pelzflorian.de ([5.45.111.108]:33280 helo=mail.pelzflorian.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8uhU-0000FL-J2 for 26302@debbugs.gnu.org; Thu, 20 Aug 2020 20:14:36 -0400 Received: from pelzflorian.localdomain (unknown [5.45.111.108]) by mail.pelzflorian.de (Postfix) with ESMTPSA id 2A81336055C; Fri, 21 Aug 2020 02:14:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pelzflorian.de; s=mail; t=1597968871; bh=JMIoNpbzYRA18vyefC4HGphSVLWw35ZHXxJlkcXAnO4=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=Ml1q2GQbnDC6/cD7xZ2In6gK3NMvp0+sAG6AwXZX29dKB9xQQT+eWNICT4koxUZep n4go/uU6Zk6ORAqlvsGWwMdZzae/IcBgjy9ZT6fB620Yhw8d3JlCo6nS4Nx01yzyby aeST6rSocbg5ZO+J2WfupKVEx1ATE93DWZ4ySf2g= Date: Fri, 21 Aug 2020 02:14:20 +0200 From: "pelzflorian (Florian Pelz)" Message-ID: <20200821001420.xjdk3s22q6ynjd3c@pelzflorian.localdomain> References: <20200709144524.fjri2znqer2dzn7a@pelzflorian.localdomain> <20200710172732.7a2tm7hcqt4mmhlo@pelzflorian.localdomain> <20200712061927.uoubuabreji4dw54@pelzflorian.localdomain> <87d04i2mpc.fsf_-_@gnu.org> <20200726185740.p2cobbqpyevywpkl@pelzflorian.localdomain> <20200727160101.nsznenkv75wcsuoe@pelzflorian.localdomain> <87k0yns416.fsf@gnu.org> <20200729032053.27c8ad4b@tachikoma.lepiller.eu> <20200729135338.nqtpk3tugxlsjlu2@pelzflorian.localdomain> <87ft93srur.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="d7hu55zyk5a5pbvk" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87ft93srur.fsf@gnu.org> X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniela Lura , sirgazil , 26302 <26302@debbugs.gnu.org> Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=pelzflorian.de header.s=mail header.b=Ml1q2GQb; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: 0.99 X-TUID: +kte6R/ioqF9 --d7hu55zyk5a5pbvk Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Mon, Aug 03, 2020 at 04:53:48PM +0200, Ludovic Courtès wrote: > "pelzflorian (Florian Pelz)" skribis: > > What version number should we give it? That of Guix, or a YYYYMMDD? > > I suppose the version number should be part of the POT file’s > > Project-Id-Version field and the tar filename, but I don’t know. > > I’d say YYYYMMDD. The coordinator might have suggestions. I will push the attached patch if there are no objections. > > Could you Julien or someone else send the tarball(s) off to the TP > > coordinator? > > That’d be great. Julien, let us know if you’d rather hand over this > responsibility. Is it OK if you send it when you have time after the patch is in? Regards, Florian --d7hu55zyk5a5pbvk Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-website-nls-Include-package-version-in-the-POT-file.patch" Content-Transfer-Encoding: 8bit >From 6e60fb3f7272b5e4996c2366758a151e2ebc3495 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Fri, 21 Aug 2020 02:03:08 +0200 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [PATCH] website: nls: Include package version in the POT file. Including a package version in the .pot file is probably necessary for sending it to the Translation Project. * i18n-howto.txt: Advice using '--package-version' command-line argument. * po/guix-website.pot: Recreate with '--package-version'. --- website/i18n-howto.txt | 3 ++- website/po/guix-website.pot | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/website/i18n-howto.txt b/website/i18n-howto.txt index 29b8852..98a4d00 100644 --- a/website/i18n-howto.txt +++ b/website/i18n-howto.txt @@ -34,13 +34,14 @@ The following commands are an example of the translation for locale de_DE. Adapt as necessary. We assume the software requirements mentioned in the README are installed. -To create a pot file: +To create a pot file (adjust the package version!): guile scripts/sexp-xgettext.scm -f po/POTFILES \ -o po/guix-website.pot \ --from-code=UTF-8 \ --copyright-holder="Ludovic Courtès" \ --package-name="guix-website" \ + --package-version="20200821" \ --msgid-bugs-address="ludo@gnu.org" \ --keyword=G_ \ --keyword=N_:1,2 \ diff --git a/website/po/guix-website.pot b/website/po/guix-website.pot index f200bcd..502e2de 100644 --- a/website/po/guix-website.pot +++ b/website/po/guix-website.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: guix-website\n" +"Project-Id-Version: guix-website 20200821\n" "Report-Msgid-Bugs-To: ludo@gnu.org\n" -"POT-Creation-Date: 2020-07-28 10:47+0200\n" +"POT-Creation-Date: 2020-08-21 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -228,36 +228,36 @@ msgctxt "website menu" msgid "Latest" msgstr "" -#: apps/base/templates/components.scm:406 apps/packages/templates/detailed-index.scm:31 apps/packages/templates/detailed-index.scm:38 apps/packages/templates/detailed-package-list.scm:34 apps/packages/templates/detailed-package-list.scm:43 apps/packages/templates/index.scm:31 apps/packages/templates/index.scm:37 apps/packages/templates/package-list.scm:34 apps/packages/templates/package-list.scm:40 apps/packages/templates/package.scm:36 apps/packages/templates/package.scm:41 +#: apps/base/templates/components.scm:406 apps/base/templates/help.scm:26 apps/base/templates/help.scm:30 +msgctxt "website menu" +msgid "Help" +msgstr "" + +#: apps/base/templates/components.scm:407 apps/packages/templates/detailed-index.scm:31 apps/packages/templates/detailed-index.scm:38 apps/packages/templates/detailed-package-list.scm:34 apps/packages/templates/detailed-package-list.scm:43 apps/packages/templates/index.scm:31 apps/packages/templates/index.scm:37 apps/packages/templates/package-list.scm:34 apps/packages/templates/package-list.scm:40 apps/packages/templates/package.scm:36 apps/packages/templates/package.scm:41 msgctxt "website menu" msgid "Packages" msgstr "" -#: apps/base/templates/components.scm:407 apps/blog/templates/post-list.scm:33 apps/blog/templates/post-list.scm:39 apps/blog/templates/post.scm:29 apps/blog/templates/post.scm:35 apps/blog/templates/tag.scm:37 apps/blog/templates/tag.scm:43 +#: apps/base/templates/components.scm:408 apps/blog/templates/post-list.scm:33 apps/blog/templates/post-list.scm:39 apps/blog/templates/post.scm:29 apps/blog/templates/post.scm:35 apps/blog/templates/tag.scm:37 apps/blog/templates/tag.scm:43 msgctxt "website menu" msgid "Blog" msgstr "" -#: apps/base/templates/components.scm:409 apps/media/templates/screenshot.scm:28 apps/media/templates/screenshots-overview.scm:25 apps/media/templates/video.scm:29 apps/media/templates/video-list.scm:29 +#: apps/base/templates/components.scm:410 apps/media/templates/screenshot.scm:28 apps/media/templates/screenshots-overview.scm:25 apps/media/templates/video.scm:29 apps/media/templates/video-list.scm:29 msgctxt "website menu" msgid "Media" msgstr "" -#: apps/base/templates/components.scm:412 apps/media/templates/video.scm:33 apps/media/templates/video-list.scm:33 +#: apps/base/templates/components.scm:413 apps/media/templates/video.scm:33 apps/media/templates/video-list.scm:33 msgctxt "website menu" msgid "Videos" msgstr "" -#: apps/base/templates/components.scm:413 +#: apps/base/templates/components.scm:414 msgctxt "website menu" msgid "Screenshots" msgstr "" -#: apps/base/templates/components.scm:415 apps/base/templates/help.scm:26 apps/base/templates/help.scm:30 -msgctxt "website menu" -msgid "Help" -msgstr "" - #: apps/base/templates/components.scm:416 apps/base/templates/donate.scm:26 apps/base/templates/donate.scm:29 msgctxt "website menu" msgid "Donate" -- 2.28.0 --d7hu55zyk5a5pbvk--