From unknown Sat Aug 16 21:22:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59392] scripts: Use translations for guix.pot for service descriptions. Resent-From: "pelzflorian (Florian Pelz)" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Nov 2022 22:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 59392@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166889818720390 (code B ref -1); Sat, 19 Nov 2022 22:50:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Nov 2022 22:49:47 +0000 Received: from localhost ([127.0.0.1]:41625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owWeh-0005In-3e for submit@debbugs.gnu.org; Sat, 19 Nov 2022 17:49:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:48680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owWef-0005If-4K for submit@debbugs.gnu.org; Sat, 19 Nov 2022 17:49:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owWee-0005qp-UQ for guix-patches@gnu.org; Sat, 19 Nov 2022 17:49:44 -0500 Received: from relay.yourmailgateway.de ([188.68.61.107]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owWec-0000At-RL for guix-patches@gnu.org; Sat, 19 Nov 2022 17:49:44 -0500 Received: from mors-relay-8405.netcup.net (localhost [127.0.0.1]) by mors-relay-8405.netcup.net (Postfix) with ESMTPS id 4NF83l6tDQz74Pf for ; Sat, 19 Nov 2022 23:49:39 +0100 (CET) Authentication-Results: mors-relay-8405.netcup.net; dkim=permerror (bad message/signature format) Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8405.netcup.net (Postfix) with ESMTPS id 4NF83l6Dl2z74Pc for ; Sat, 19 Nov 2022 23:49:39 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net X-Spam-Flag: NO X-Spam-Score: -2.899 X-Spam-Level: X-Spam-Status: No, score=-2.899 required=6.31 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, URIBL_BLOCKED=0.001] autolearn=ham autolearn_force=no Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4NF83l2NZ3z8sf6 for ; Sat, 19 Nov 2022 23:49:39 +0100 (CET) Received: from florianrock64 (ip5b40a50f.dynamic.kabel-deutschland.de [91.64.165.15]) by mxe217.netcup.net (Postfix) with ESMTPSA id 09C249E9E1 for ; Sat, 19 Nov 2022 23:49:38 +0100 (CET) From: "pelzflorian (Florian Pelz)" Date: Sat, 19 Nov 2022 23:49:37 +0100 Message-ID: <87leo6muf2.fsf@pelzflorian.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 09C249E9E1 X-Spamd-Result: default: False [-5.60 / 15.00]; BAYES_HAM(-5.50)[100.00%]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; ASN(0.00)[asn:3209, ipnet:91.64.0.0/14, country:DE]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_NONE(0.00)[] X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: OyPpMTndMRWuSBwqFvZgrc/lnO8i9KQrJ43Qbnij7JQTVe0gttrKB8go Received-SPF: none client-ip=188.68.61.107; envelope-from=pelzflorian@pelzflorian.de; helo=relay.yourmailgateway.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Previously, service descriptions appeared in both guix.pot and packages.pot, but only translations of packages.pot were used. Now, translations are only done with guix.pot. This is better, because translators are more likely to translate guix.pot, and is also easier, because files in gnu/{home/,}services need to be in po/guix/POTFILES.in anyway and po/guix/Makevars already acts on the 'description' keyword because of lint checkers. * guix/scripts/home.scm (service-type-description-string): Use translations from guix.pot. * guix/scripts/system/search.scm (service-type-description-string) (service-type->recutils): Likewise. * po/packages/POTFILES.in: Move files in gnu/services to ... * po/guix/POTFILES.in: ... here. --- P.S. I hope the subject line `scripts: =E2=80=A6' is correct, instead of `nls: =E2=80=A6'. guix/scripts/home.scm | 2 +- guix/scripts/system/search.scm | 4 ++-- po/guix/POTFILES.in | 4 ++++ po/packages/POTFILES.in | 5 ----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index 754001a5b8..1c481ccf91 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -705,7 +705,7 @@ (define service-type-name* (define (service-type-description-string type) "Return the rendered and localised description of TYPE, a service type." (and=3D> (service-type-description type) - (compose texi->plain-text P_))) + (compose texi->plain-text G_))) =20 (define %service-type-metrics ;; Metrics used to estimate the relevance of a search result. diff --git a/guix/scripts/system/search.scm b/guix/scripts/system/search.scm index 44f00194cd..d978884518 100644 --- a/guix/scripts/system/search.scm +++ b/guix/scripts/system/search.scm @@ -127,7 +127,7 @@ (define highlighting* (parameterize ((%text-width width*)) (texi->plain-text (string-append "description: " - (or (and=3D> (service-type-description ty= pe) P_) + (or (and=3D> (service-type-description ty= pe) G_) "")))) #\newline))))) =20 @@ -144,7 +144,7 @@ (define highlighting* (define (service-type-description-string type) "Return the rendered and localised description of TYPE, a service type." (and=3D> (service-type-description type) - (compose texi->plain-text P_))) + (compose texi->plain-text G_))) =20 (define %service-type-metrics ;; Metrics used to estimate the relevance of a search result. diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index 228ce04240..7009fc756c 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -4,10 +4,14 @@ gnu.scm gnu/packages.scm gnu/services.scm gnu/system.scm +gnu/services/base.scm +gnu/services/certbot.scm gnu/services/configuration.scm +gnu/services/file-sharing.scm gnu/services/networking.scm gnu/services/shepherd.scm gnu/services/samba.scm +gnu/services/version-control.scm gnu/home/services.scm gnu/home/services/ssh.scm gnu/home/services/symlink-manager.scm diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in index 398f9adfdf..32d34d6456 100644 --- a/po/packages/POTFILES.in +++ b/po/packages/POTFILES.in @@ -57,8 +57,3 @@ gnu/packages/webkit.scm gnu/packages/web.scm gnu/packages/wordnet.scm gnu/packages/xiph.scm -gnu/services/base.scm -gnu/services/certbot.scm -gnu/services/file-sharing.scm -gnu/services/networking.scm -gnu/services/version-control.scm base-commit: bb04b5e0ceb606c8d33d53bf06f7fc8855a2c56b --=20 2.38.0 From unknown Sat Aug 16 21:22:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59392] scripts: Use translations for guix.pot for service descriptions. Resent-From: "pelzflorian (Florian Pelz)" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Nov 2022 13:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 59392@debbugs.gnu.org Cc: Julien Lepiller , Thiago Jung Bauermann Received: via spool by 59392-submit@debbugs.gnu.org id=B59392.166894922814519 (code B ref 59392); Sun, 20 Nov 2022 13:01:02 +0000 Received: (at 59392) by debbugs.gnu.org; 20 Nov 2022 13:00:28 +0000 Received: from localhost ([127.0.0.1]:42622 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owjvv-0003m7-LE for submit@debbugs.gnu.org; Sun, 20 Nov 2022 08:00:27 -0500 Received: from relay.yourmailgateway.de ([188.68.63.162]:36057) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owjvp-0003lt-Tc for 59392@debbugs.gnu.org; Sun, 20 Nov 2022 08:00:25 -0500 Received: from mors-relay-8201.netcup.net (localhost [127.0.0.1]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4NFVxJ2JvWz4BhQ; Sun, 20 Nov 2022 14:00:20 +0100 (CET) Authentication-Results: mors-relay-8201.netcup.net; dkim=permerror (bad message/signature format) Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4NFVxJ1bwtz4BhK; Sun, 20 Nov 2022 14:00:20 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at policy02-mors.netcup.net X-Spam-Flag: NO X-Spam-Score: -2.9 X-Spam-Level: X-Spam-Status: No, score=-2.9 required=6.31 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9] autolearn=ham autolearn_force=no Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4NFVxH4jrRz8sZP; Sun, 20 Nov 2022 14:00:18 +0100 (CET) Received: from florianrock64 (ip5b40a50f.dynamic.kabel-deutschland.de [91.64.165.15]) by mxe217.netcup.net (Postfix) with ESMTPSA id 056A59EB41; Sun, 20 Nov 2022 14:00:15 +0100 (CET) From: "pelzflorian (Florian Pelz)" References: <87leo6muf2.fsf@pelzflorian.de> Date: Sun, 20 Nov 2022 14:00:15 +0100 In-Reply-To: <87leo6muf2.fsf@pelzflorian.de> (pelzflorian@pelzflorian.de's message of "Sat, 19 Nov 2022 23:49:37 +0100") Message-ID: <8735adn5ls.fsf@pelzflorian.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 056A59EB41 X-Spamd-Result: default: False [-3.85 / 15.00]; BAYES_HAM(-3.75)[95.32%]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_THREE(0.00)[3]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:3209, ipnet:91.64.0.0/14, country:DE]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[] X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: qotonCKbmQUFcs3Fpk3LM8UnLxyIg/gh7MFXbd1MKKraU7DCq2loorn8 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Forgot to put translation team in Cc. No change to Julien=E2=80=99s proxy repository guix-translations.git is nee= ded as far as I can tell. Regards, Florian From unknown Sat Aug 16 21:22:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59392] scripts: Use translations for guix.pot for service descriptions. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Nov 2022 13:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: "pelzflorian (Florian Pelz)" , 59392@debbugs.gnu.org Cc: Thiago Jung Bauermann Received: via spool by 59392-submit@debbugs.gnu.org id=B59392.166894967015158 (code B ref 59392); Sun, 20 Nov 2022 13:08:01 +0000 Received: (at 59392) by debbugs.gnu.org; 20 Nov 2022 13:07:50 +0000 Received: from localhost ([127.0.0.1]:42630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owk33-0003wQ-RI for submit@debbugs.gnu.org; Sun, 20 Nov 2022 08:07:50 -0500 Received: from lepiller.eu ([89.234.186.109]:48118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owk31-0003wD-MR for 59392@debbugs.gnu.org; Sun, 20 Nov 2022 08:07:49 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id a7e74c07; Sun, 20 Nov 2022 13:07:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:in-reply-to:references:message-id:mime-version :content-type:content-transfer-encoding; s=dkim; bh=axCO6bnhTcP6 UjFVwCE6e3HIW1Bxq0jzR6zIcwolUms=; b=Vgdjb2Q8b8ncY62jF2fFjENCUtN/ I0oRxpnqtAie/wO/enQykLC4zBDEqfWzNKgB0rEM3LbobNo2mG0kY/ow4rWI7HP2 tHYU3gJ+i/ZD8F/ALCKrNpo13S5qPwYocRWYZ6p760Mue32pShJd4VWB0hrgX+5q 7YwWXh1r65IHylrEGskT5bp5wwgF5UaR9KMJrAy+NtTlee6IzohjZBhl06VOsU6x ER9KynCgHSfi6Y383I8YWuujmgvcnxzZqygX53CCvPx5NyNujamhkhxjXz7YtSjB bjwH1M4xUd8oT6xZgNhCVC8zySfxKSLcchxoT3ur1+mKxxnj8co0IZiw8g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 2d7c76b2 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Sun, 20 Nov 2022 13:07:45 +0000 (UTC) Date: Sun, 20 Nov 2022 14:07:42 +0100 From: Julien Lepiller User-Agent: K-9 Mail for Android In-Reply-To: <8735adn5ls.fsf@pelzflorian.de> References: <87leo6muf2.fsf@pelzflorian.de> <8735adn5ls.fsf@pelzflorian.de> Message-ID: <3835A7B2-E367-42EA-82C0-186A3E5BD905@lepiller.eu> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary=----Y09PAGFAHGCWQJYC9VJQ9UXCXDM9WU Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) ------Y09PAGFAHGCWQJYC9VJQ9UXCXDM9WU Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable LGTM :) Le 20 novembre 2022 14:00:15 GMT+01:00, "pelzflorian (Florian Pelz)" a =C3=A9crit=C2=A0: >Forgot to put translation team in Cc=2E > >No change to Julien=E2=80=99s proxy repository guix-translations=2Egit is= needed >as far as I can tell=2E > >Regards, >Florian ------Y09PAGFAHGCWQJYC9VJQ9UXCXDM9WU Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable LGTM :)

Le 20 no= vembre 2022 14:00:15 GMT+01:00, "pelzflorian (Florian Pelz)" <pelzfloria= n@pelzflorian=2Ede> a =C3=A9crit=C2=A0:
Forgot to put translation team in Cc=2E=


No change to Julien=E2=80=99s proxy repository guix-translations=2E=
git is needed
as far as I can tell=2E

Regards,
Florian
------Y09PAGFAHGCWQJYC9VJQ9UXCXDM9WU-- From unknown Sat Aug 16 21:22:53 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: "pelzflorian (Florian Pelz)" Subject: bug#59392: closed (Re: [bug#59392] scripts: Use translations for guix.pot for service descriptions.) Message-ID: References: <878rk5acia.fsf@pelzflorian.de> <87leo6muf2.fsf@pelzflorian.de> X-Gnu-PR-Message: they-closed 59392 X-Gnu-PR-Package: guix-patches Reply-To: 59392@debbugs.gnu.org Date: Sun, 20 Nov 2022 15:10:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1668957002-28736-1" This is a multi-part message in MIME format... ------------=_1668957002-28736-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #59392: scripts: Use translations for guix.pot for service descriptions. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 59392@debbugs.gnu.org. --=20 59392: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D59392 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1668957002-28736-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 59392-done) by debbugs.gnu.org; 20 Nov 2022 15:09:44 +0000 Received: from localhost ([127.0.0.1]:44321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owlx2-0007Sw-4T for submit@debbugs.gnu.org; Sun, 20 Nov 2022 10:09:44 -0500 Received: from relay.yourmailgateway.de ([46.38.247.119]:42465) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owlwx-0007Sl-W9 for 59392-done@debbugs.gnu.org; Sun, 20 Nov 2022 10:09:42 -0500 Received: from mors-relay-8404.netcup.net (localhost [127.0.0.1]) by mors-relay-8404.netcup.net (Postfix) with ESMTPS id 4NFYpV31fNz87wX; Sun, 20 Nov 2022 16:09:38 +0100 (CET) Authentication-Results: mors-relay-8404.netcup.net; dkim=permerror (bad message/signature format) Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8404.netcup.net (Postfix) with ESMTPS id 4NFYpV2dlbz58r0; Sun, 20 Nov 2022 16:09:38 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net X-Spam-Flag: NO X-Spam-Score: -2.899 X-Spam-Level: X-Spam-Status: No, score=-2.899 required=6.31 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, URIBL_BLOCKED=0.001] autolearn=ham autolearn_force=no Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4NFYpT4r7jz8t3r; Sun, 20 Nov 2022 16:09:36 +0100 (CET) Received: from florianrock64 (ip5b40a50f.dynamic.kabel-deutschland.de [91.64.165.15]) by mxe217.netcup.net (Postfix) with ESMTPSA id 19E099EB19; Sun, 20 Nov 2022 16:09:34 +0100 (CET) From: "pelzflorian (Florian Pelz)" To: Julien Lepiller Subject: Re: [bug#59392] scripts: Use translations for guix.pot for service descriptions. References: <87leo6muf2.fsf@pelzflorian.de> <8735adn5ls.fsf@pelzflorian.de> <3835A7B2-E367-42EA-82C0-186A3E5BD905@lepiller.eu> Date: Sun, 20 Nov 2022 16:09:33 +0100 In-Reply-To: <3835A7B2-E367-42EA-82C0-186A3E5BD905@lepiller.eu> (Julien Lepiller's message of "Sun, 20 Nov 2022 14:07:42 +0100") Message-ID: <878rk5acia.fsf@pelzflorian.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 19E099EB19 X-Spamd-Result: default: False [-5.42 / 15.00]; BAYES_HAM(-5.32)[99.58%]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_THREE(0.00)[3]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:3209, ipnet:91.64.0.0/14, country:DE]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[] X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: HpC2T8SzlwSdISd0lprAEUGsh6IdklXSvaMlWlPQXal8d4FLXDixiKrs X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59392-done Cc: 59392-done@debbugs.gnu.org, Thiago Jung Bauermann X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Julien Lepiller writes: > LGTM :) Thank you! Pushed as da6c6763fa72585a1df3021781f8d33c3b64dcc8. Closing. Regards, Florian ------------=_1668957002-28736-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 19 Nov 2022 22:49:47 +0000 Received: from localhost ([127.0.0.1]:41625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owWeh-0005In-3e for submit@debbugs.gnu.org; Sat, 19 Nov 2022 17:49:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:48680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owWef-0005If-4K for submit@debbugs.gnu.org; Sat, 19 Nov 2022 17:49:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owWee-0005qp-UQ for guix-patches@gnu.org; Sat, 19 Nov 2022 17:49:44 -0500 Received: from relay.yourmailgateway.de ([188.68.61.107]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owWec-0000At-RL for guix-patches@gnu.org; Sat, 19 Nov 2022 17:49:44 -0500 Received: from mors-relay-8405.netcup.net (localhost [127.0.0.1]) by mors-relay-8405.netcup.net (Postfix) with ESMTPS id 4NF83l6tDQz74Pf for ; Sat, 19 Nov 2022 23:49:39 +0100 (CET) Authentication-Results: mors-relay-8405.netcup.net; dkim=permerror (bad message/signature format) Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8405.netcup.net (Postfix) with ESMTPS id 4NF83l6Dl2z74Pc for ; Sat, 19 Nov 2022 23:49:39 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net X-Spam-Flag: NO X-Spam-Score: -2.899 X-Spam-Level: X-Spam-Status: No, score=-2.899 required=6.31 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, URIBL_BLOCKED=0.001] autolearn=ham autolearn_force=no Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4NF83l2NZ3z8sf6 for ; Sat, 19 Nov 2022 23:49:39 +0100 (CET) Received: from florianrock64 (ip5b40a50f.dynamic.kabel-deutschland.de [91.64.165.15]) by mxe217.netcup.net (Postfix) with ESMTPSA id 09C249E9E1 for ; Sat, 19 Nov 2022 23:49:38 +0100 (CET) From: "pelzflorian (Florian Pelz)" To: guix-patches@gnu.org Subject: scripts: Use translations for guix.pot for service descriptions. Date: Sat, 19 Nov 2022 23:49:37 +0100 Message-ID: <87leo6muf2.fsf@pelzflorian.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 09C249E9E1 X-Spamd-Result: default: False [-5.60 / 15.00]; BAYES_HAM(-5.50)[100.00%]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; ASN(0.00)[asn:3209, ipnet:91.64.0.0/14, country:DE]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_NONE(0.00)[] X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: OyPpMTndMRWuSBwqFvZgrc/lnO8i9KQrJ43Qbnij7JQTVe0gttrKB8go Received-SPF: none client-ip=188.68.61.107; envelope-from=pelzflorian@pelzflorian.de; helo=relay.yourmailgateway.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Previously, service descriptions appeared in both guix.pot and packages.pot, but only translations of packages.pot were used. Now, translations are only done with guix.pot. This is better, because translators are more likely to translate guix.pot, and is also easier, because files in gnu/{home/,}services need to be in po/guix/POTFILES.in anyway and po/guix/Makevars already acts on the 'description' keyword because of lint checkers. * guix/scripts/home.scm (service-type-description-string): Use translations from guix.pot. * guix/scripts/system/search.scm (service-type-description-string) (service-type->recutils): Likewise. * po/packages/POTFILES.in: Move files in gnu/services to ... * po/guix/POTFILES.in: ... here. --- P.S. I hope the subject line `scripts: =E2=80=A6' is correct, instead of `nls: =E2=80=A6'. guix/scripts/home.scm | 2 +- guix/scripts/system/search.scm | 4 ++-- po/guix/POTFILES.in | 4 ++++ po/packages/POTFILES.in | 5 ----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index 754001a5b8..1c481ccf91 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -705,7 +705,7 @@ (define service-type-name* (define (service-type-description-string type) "Return the rendered and localised description of TYPE, a service type." (and=3D> (service-type-description type) - (compose texi->plain-text P_))) + (compose texi->plain-text G_))) =20 (define %service-type-metrics ;; Metrics used to estimate the relevance of a search result. diff --git a/guix/scripts/system/search.scm b/guix/scripts/system/search.scm index 44f00194cd..d978884518 100644 --- a/guix/scripts/system/search.scm +++ b/guix/scripts/system/search.scm @@ -127,7 +127,7 @@ (define highlighting* (parameterize ((%text-width width*)) (texi->plain-text (string-append "description: " - (or (and=3D> (service-type-description ty= pe) P_) + (or (and=3D> (service-type-description ty= pe) G_) "")))) #\newline))))) =20 @@ -144,7 +144,7 @@ (define highlighting* (define (service-type-description-string type) "Return the rendered and localised description of TYPE, a service type." (and=3D> (service-type-description type) - (compose texi->plain-text P_))) + (compose texi->plain-text G_))) =20 (define %service-type-metrics ;; Metrics used to estimate the relevance of a search result. diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index 228ce04240..7009fc756c 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -4,10 +4,14 @@ gnu.scm gnu/packages.scm gnu/services.scm gnu/system.scm +gnu/services/base.scm +gnu/services/certbot.scm gnu/services/configuration.scm +gnu/services/file-sharing.scm gnu/services/networking.scm gnu/services/shepherd.scm gnu/services/samba.scm +gnu/services/version-control.scm gnu/home/services.scm gnu/home/services/ssh.scm gnu/home/services/symlink-manager.scm diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in index 398f9adfdf..32d34d6456 100644 --- a/po/packages/POTFILES.in +++ b/po/packages/POTFILES.in @@ -57,8 +57,3 @@ gnu/packages/webkit.scm gnu/packages/web.scm gnu/packages/wordnet.scm gnu/packages/xiph.scm -gnu/services/base.scm -gnu/services/certbot.scm -gnu/services/file-sharing.scm -gnu/services/networking.scm -gnu/services/version-control.scm base-commit: bb04b5e0ceb606c8d33d53bf06f7fc8855a2c56b --=20 2.38.0 ------------=_1668957002-28736-1--