From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id cF9RL5J/QGY66QAAqHPOHw:P1 (envelope-from ) for ; Sun, 12 May 2024 10:36:34 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id cF9RL5J/QGY66QAAqHPOHw (envelope-from ) for ; Sun, 12 May 2024 10:36:34 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1715502994; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=Hg+NDIXDH/j8tZ+rcX71MeVv2dLrJuAvXYbW4JHMbvY=; b=cAkvrzx5SbE4HPKCA8hoVwXfEmlkvxFWZfTzfleEe49A/ZKyOQiUSDlrG16xHBXN+HcwnI 4yMkMRFfWSgua8w5jYqg0YHwWTPGWRpv6G0y2ow4HUG2vRank8k/CTlAN5DL0ATiRJ5Xu/ 3Syv6oeW7aAPO3FOQMYS8HJ++gCrCX5N5d4XjYq7O9LdkmHbu6NXsYPlS47GJyTqCagbcx iLgBYMEpNyXiIGEkvLMeiILfen0AjMZA4iCD+ugXAp1sdql1iVfQpD+IeCZZK3osSgfCnT BUqaIJOQC2d+P+nsBQ6onzncjaUFp63/nIUlKrsV27jQ0o/55PuDmCvc/YDH4A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1715502994; a=rsa-sha256; cv=none; b=Y13nTwdpWZNlKR5X34iEeoaXz46Asj2Zg+keS502jlXdoWvk/j0DOfbcJHpzhih6SKWbpz JmQZyzHGhVdi28NZqbRKOgBzfdZZn2BQ2CAsIXbS+O2djykrYnTonGl1nF5H+Ml60wLRy0 o48PdsxwibbOU58X9l6hLJQOolLV+myPEtWCeqCP7g2+9pq+P9zZo+hQH8z4ANUggeK9E+ zwesoDIZE094hhshlSJSbhEv9oMve/bnqUm3WcM1VJzmPoDJG5Hma97Gk/vBZyZ6utHAnw KbFYHDcIAJt34llcydFxgjvby56/CjowJXHMSXrqpTpdQml+pC4UedFFQvN3jQ== 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 43D982150D for ; Sun, 12 May 2024 10:36:34 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s64gj-0007nN-3N; Sun, 12 May 2024 04:36:09 -0400 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 1s64gc-0007lH-Mg for guix-patches@gnu.org; Sun, 12 May 2024 04:36:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s64gc-00056F-D4 for guix-patches@gnu.org; Sun, 12 May 2024 04:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s64gc-00059Q-4T for guix-patches@gnu.org; Sun, 12 May 2024 04:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68869] [PATCH v2] guix: channels: Fix typos. Resent-From: Dale Mellor Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2024 08:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68869@debbugs.gnu.org Cc: guix-devel-0brg6a@rdmp.org, rostislav.svoboda@gmail.com X-Debbugs-Original-Cc: Dale Mellor , Rostislav Svoboda , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171550291919778 (code B ref -1); Sun, 12 May 2024 08:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 May 2024 08:35:19 +0000 Received: from localhost ([127.0.0.1]:53222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s64fu-00058v-Cz for submit@debbugs.gnu.org; Sun, 12 May 2024 04:35:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:56196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s64fs-00058k-Ca for submit@debbugs.gnu.org; Sun, 12 May 2024 04:35:16 -0400 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 1s64fs-0007iQ-7c for guix-patches@gnu.org; Sun, 12 May 2024 04:35:16 -0400 Received: from [195.15.247.228] (helo=rdmp.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s64fq-0004rp-MJ for guix-patches@gnu.org; Sun, 12 May 2024 04:35:15 -0400 Received: from [127.0.0.1] (helo=localhost.localdomain) by rdmp.org with esmtp (Exim 4.96.1) (envelope-from ) id 1s64fl-0003Yu-36; Sun, 12 May 2024 08:35:10 +0000 From: Dale Mellor Date: Sun, 12 May 2024 09:34:29 +0100 Message-ID: <20240512083439.2067537-1-guix-devel-0brg6a@rdmp.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <3b0a1ed3a25d2527e60c9a7570db3ef8dda333fe.1706791324.git.Rostislav.Svoboda@gmail.com> References: <3b0a1ed3a25d2527e60c9a7570db3ef8dda333fe.1706791324.git.Rostislav.Svoboda@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 195.15.247.228 (failed) Received-SPF: pass client-ip=195.15.247.228; envelope-from=guix-devel-0brg6a@rdmp.org; helo=rdmp.org X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -5.58 X-Migadu-Queue-Id: 43D982150D X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -5.58 X-TUID: +X7ctNhesaRU From: Rostislav Svoboda * guix/channels.scm (authenticate-channel): Pluralise commit numbers. Review: * Microscopic documentation change, harmless, but will invoke some i18n activity * Not sure this justifies adding two names to the copyright holders list, if any at all? * Works for me Reviewed-by: Dale Mellor Change-Id: I7759607f37405e6d3bd4b7f5958fd11d908db204 --- guix/channels.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 51024dcad4..0d7bc541cc 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -3,6 +3,8 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2024 Julien Lepiller +;;; Copyright © 2024 Rostislav Svoboda ;;; ;;; This file is part of GNU Guix. ;;; @@ -364,8 +366,11 @@ (define keyring-reference (define (make-reporter start-commit end-commit commits) (format (current-error-port) - (G_ "Authenticating channel '~a', commits ~a to ~a (~h new \ -commits)...~%") + (N_ "Authenticating channel '~a', commits ~a to ~a (~h new \ +commit)...~%" + "Authenticating channel '~a', commits ~a to ~a (~h new \ +commits)...~%" + (length commits)) (channel-name channel) (commit-short-id start-commit) (commit-short-id end-commit) -- 2.41.0