From patchwork Thu Feb 1 12:42:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rostislav Svoboda X-Patchwork-Id: 59679 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4212527BBE2; Thu, 1 Feb 2024 12:44:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4511C27BBE9 for ; Thu, 1 Feb 2024 12:44:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVWQA-0000EJ-E9; Thu, 01 Feb 2024 07:43:58 -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 1rVWQ8-00006g-HS for guix-patches@gnu.org; Thu, 01 Feb 2024 07:43:56 -0500 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 1rVWQ7-000550-52; Thu, 01 Feb 2024 07:43:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rVWQE-0007OH-16; Thu, 01 Feb 2024 07:44:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68869] [PATCH] channels: Fix typos. Resent-From: Rostislav Svoboda Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Thu, 01 Feb 2024 12:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68869@debbugs.gnu.org Cc: Rostislav Svoboda , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.170679142428365 (code B ref -1); Thu, 01 Feb 2024 12:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Feb 2024 12:43:44 +0000 Received: from localhost ([127.0.0.1]:40481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rVWPw-0007NR-C5 for submit@debbugs.gnu.org; Thu, 01 Feb 2024 07:43:44 -0500 Received: from lists.gnu.org ([2001:470:142::17]:44530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rVWPr-0007Lw-1J for submit@debbugs.gnu.org; Thu, 01 Feb 2024 07:43:43 -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 1rVWPb-0008Of-I8 for guix-patches@gnu.org; Thu, 01 Feb 2024 07:43:23 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rVWPZ-0004wo-No for guix-patches@gnu.org; Thu, 01 Feb 2024 07:43:23 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40eacb4bfa0so7625075e9.1 for ; Thu, 01 Feb 2024 04:43:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706791399; x=1707396199; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=GYlXWTBd8Pdoc2JJjy2GwsZ6heS2pNiWqfuV/ILer2E=; b=nC7sR24u6vsRLaNuV+BXl/Bs2LJRKCf/7bMeXJJPNKD1bX53M/MbuLs4JdS/qp+9KC e93coUD+1Zvshkf5Efyr1YzqkxOkZXBaZu03/2rK4lL4+UzskpCC7Oo+a63HCQtwRcq+ NRbkKLLgJSGcEuRBmvEkUkTpEaoxi56Ut4DCPl+uv0DioiTuO7FcbglsuVLDdZkloB5y LF0OW5K5aUkYe7LmzAfE1LEbyI9o8TYTlcYaqq2jgwZpcOf04MKY1U+IaZvMelIAkWC3 6p9dUelifBcf1VdftfM6EBwkVxMXZ22QjPLHFLpIvM7npIVET82djBwbHzUQxUurZ6Bu hYrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706791399; x=1707396199; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GYlXWTBd8Pdoc2JJjy2GwsZ6heS2pNiWqfuV/ILer2E=; b=gGmWddzdwztUSWRaaIDCARDcDyEi33L5RMRP9U7ZDpj6igwIPIdWHglCTbxyWcWxEO Vt2RyB1qM7ZJex+TavMutLMcI7MrqOVHWNNaIOlb2ira5rPqqYM70g78SwF6vV78gNmE mF4vmZ2UJbtRYlv8ObvKftrrdXeZOH/N2oT/OdY3HM/Rn37k5OPt4Ci5F7cilmyny+LY sewaGlww99/g3Va+6txFeiY5Hu6Rt2R7dQFJCQOfCSSKMRm7xpN7F9ebvq82dXXghyYf T/Y02LVX7oIONJ62Xm8eJSF95sOq3XgLigGIyOQtmArHMGqZDJxd7fSKH3DBMviWjrHx iesw== X-Gm-Message-State: AOJu0Yx8n59KWhbD3+cMyow2skYga2TjlFHqHUU8mOZZdz/C2un9VlSS TLYGa/SFg/k6oNn8P702+YXfAB637xAMGG5bj/CPnqE50jJ46t5nM5udu+rMh7s= X-Google-Smtp-Source: AGHT+IFRV0yOnVW16fZnGVVZRxA7zK4D+upnfcin4BzhixxTOgzWGilQ8R2HV125HmClbKiF8TXfBw== X-Received: by 2002:a05:6000:118e:b0:33a:df1f:c18d with SMTP id g14-20020a056000118e00b0033adf1fc18dmr1417503wrx.50.1706791399043; Thu, 01 Feb 2024 04:43:19 -0800 (PST) Received: from localhost.localdomain ([85.28.89.231]) by smtp.googlemail.com with ESMTPSA id o1-20020a5d4081000000b0033ae50e2c6asm13532888wrp.83.2024.02.01.04.43.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 04:43:18 -0800 (PST) From: Rostislav Svoboda X-Google-Original-From: Rostislav Svoboda Date: Thu, 1 Feb 2024 13:42:27 +0100 Message-ID: <3b0a1ed3a25d2527e60c9a7570db3ef8dda333fe.1706791324.git.Rostislav.Svoboda@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=rostislav.svoboda@gmail.com; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/channels.scm (authenticate-channel): Pluralise commit numbers. Change-Id: I7759607f37405e6d3bd4b7f5958fd11d908db204 --- guix/channels.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) base-commit: 7bf8b7c33304d6e69f36190f0444576da1863efc diff --git a/guix/channels.scm b/guix/channels.scm index 1b07eb5221..a0df5459d4 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. ;;; @@ -361,8 +363,11 @@ (define* (authenticate-channel channel checkout commit (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)