From e11c42f297a4e128aa5abd11f379a250146f5cab Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 5 Dec 2016 23:25:29 +0100 Subject: offload: Fix plural of some messages. * guix/scripts/offload.scm (send-files): Use 'N_' for possibly plural message. Write "store item" instead of "store file". (retrieve-files): Likewise. --- guix/scripts/offload.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm index e20da99cbd..ed70f2267a 100644 --- a/guix/scripts/offload.scm +++ b/guix/scripts/offload.scm @@ -451,9 +451,11 @@ (define (send-files files remote) (with-store store (remove (cut valid-path? store <>) ',files))))) + (count (length missing)) (port (store-import-channel session))) - (format #t (_ "sending ~a store files to '~a'...~%") - (length missing) (session-get session 'host)) + (format #t (N_ "sending ~a store item to '~a'...~%" + "sending ~a store items to '~a'...~%" count) + count (session-get session 'host)) ;; Send MISSING in topological order. (export-paths store missing port) @@ -472,9 +474,11 @@ (define (retrieve-files files remote) "Retrieve FILES from SESSION's store, and import them." (let* ((session (channel-get-session (nix-server-socket remote))) (host (session-get session 'host)) - (port (store-export-channel session files))) - (format #t (_ "retrieving ~a files from '~a'...~%") - (length files) host) + (port (store-export-channel session files)) + (count (length files))) + (format #t (N_ "retrieving ~a store item from '~a'...~%" + "retrieving ~a store items from '~a'...~%" count) + count host) ;; We cannot use the 'import-paths' RPC here because we already ;; hold the locks for FILES. -- cgit v1.2.3