aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-05-03 15:57:02 +0200
committerLudovic Courtès <ludo@gnu.org>2017-05-03 16:16:17 +0200
commit69daee23af49aeafcb1d250c90860f9253da719e (patch)
tree28961e4843b0a992b9cdd414ef1501f997a1bdeb /gnu
parent1c7a78f157062c796f6779da645be6212d6cd592 (diff)
downloadguix-69daee23af49aeafcb1d250c90860f9253da719e.tar
guix-69daee23af49aeafcb1d250c90860f9253da719e.tar.gz
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match' pattern for instance. See <https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>. * guix/ui.scm: Rename '_' to 'G_'. * po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly. * build-aux/compile-all.scm (warnings): Remove 'format'. * gnu/packages.scm, gnu/services.scm, gnu/services/shepherd.scm, gnu/system.scm, gnu/system/shadow.scm, guix/gnupg.scm, guix/http-client.scm, guix/import/cpan.scm, guix/import/elpa.scm, guix/import/pypi.scm, guix/nar.scm, guix/scripts.scm, guix/scripts/archive.scm, guix/scripts/authenticate.scm, guix/scripts/build.scm, guix/scripts/challenge.scm, guix/scripts/container.scm, guix/scripts/container/exec.scm, guix/scripts/copy.scm, guix/scripts/download.scm, guix/scripts/edit.scm, guix/scripts/environment.scm, guix/scripts/gc.scm, guix/scripts/graph.scm, guix/scripts/hash.scm, guix/scripts/import.scm, guix/scripts/import/cpan.scm, guix/scripts/import/cran.scm, guix/scripts/import/crate.scm, guix/scripts/import/elpa.scm, guix/scripts/import/gem.scm, guix/scripts/import/gnu.scm, guix/scripts/import/hackage.scm, guix/scripts/import/nix.scm, guix/scripts/import/pypi.scm, guix/scripts/import/stackage.scm, guix/scripts/lint.scm, guix/scripts/offload.scm, guix/scripts/pack.scm, guix/scripts/package.scm, guix/scripts/perform-download.scm, guix/scripts/publish.scm, guix/scripts/pull.scm, guix/scripts/refresh.scm, guix/scripts/size.scm, guix/scripts/substitute.scm, guix/scripts/system.scm, guix/ssh.scm, guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages.scm18
-rw-r--r--gnu/services.scm10
-rw-r--r--gnu/services/shepherd.scm4
-rw-r--r--gnu/system.scm8
-rw-r--r--gnu/system/shadow.scm4
5 files changed, 22 insertions, 22 deletions
diff --git a/gnu/packages.scm b/gnu/packages.scm
index bec8163b2b..08f1340612 100644
--- a/gnu/packages.scm
+++ b/gnu/packages.scm
@@ -89,7 +89,7 @@
"Search the patch FILE-NAME. Raise an error if not found."
(or (search-path (%patch-path) file-name)
(raise (condition
- (&message (message (format #f (_ "~a: patch not found")
+ (&message (message (format #f (G_ "~a: patch not found")
file-name)))))))
(define-syntax-rule (search-patches file-name ...)
@@ -105,7 +105,7 @@ found."
(raise (condition
(&message
(message
- (format #f (_ "could not find bootstrap binary '~a' \
+ (format #f (G_ "could not find bootstrap binary '~a' \
for system '~a'")
file-name system)))))))
@@ -157,7 +157,7 @@ returned list is sorted in alphabetical order."
result)
(const #f) ; skip
(lambda (path stat errno result)
- (warning (_ "cannot access `~a': ~a~%")
+ (warning (G_ "cannot access `~a': ~a~%")
path (strerror errno))
result)
'()
@@ -310,21 +310,21 @@ return its return value."
(match (find-best-packages-by-name name version)
((pkg . pkg*)
(unless (null? pkg*)
- (warning (_ "ambiguous package specification `~a'~%") spec)
- (warning (_ "choosing ~a@~a from ~a~%")
+ (warning (G_ "ambiguous package specification `~a'~%") spec)
+ (warning (G_ "choosing ~a@~a from ~a~%")
(package-name pkg) (package-version pkg)
(location->string (package-location pkg))))
(match (package-superseded pkg)
((? package? new)
- (info (_ "package '~a' has been superseded by '~a'~%")
+ (info (G_ "package '~a' has been superseded by '~a'~%")
(package-name pkg) (package-name new))
new)
(#f
pkg)))
(x
(if version
- (leave (_ "~A: package not found for version ~a~%") name version)
- (leave (_ "~A: unknown package~%") name)))))
+ (leave (G_ "~A: package not found for version ~a~%") name version)
+ (leave (G_ "~A: unknown package~%") name)))))
(define (specification->package spec)
"Return a package matching SPEC. SPEC may be a package name, or a package
@@ -352,6 +352,6 @@ version; if SPEC does not specify an output, return OUTPUT."
(package
(if (member sub-drv (package-outputs package))
(values package sub-drv)
- (leave (_ "package `~a' lacks output `~a'~%")
+ (leave (G_ "package `~a' lacks output `~a'~%")
(package-full-name package)
sub-drv))))))
diff --git a/gnu/services.scm b/gnu/services.scm
index b1b53fd18b..5c314748da 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -183,7 +183,7 @@ TYPE does not have a default value, an error is raised."
(condition
(&missing-value-service-error (type type) (location location))
(&message
- (message (format #f (_ "~a: no value specified \
+ (message (format #f (G_ "~a: no value specified \
for service of type '~a'")
(location->string location)
(service-type-name type)))))))
@@ -624,7 +624,7 @@ kernel."
(target-type target-type))
(&message
(message
- (format #f (_ "no target of type '~a' for service ~s")
+ (format #f (G_ "no target of type '~a' for service ~s")
(service-type-name target-type)
service))))))
(x
@@ -635,7 +635,7 @@ kernel."
(&message
(message
(format #f
- (_ "more than one target service of type '~a'")
+ (G_ "more than one target service of type '~a'")
(service-type-name target-type))))))))))
(fold add-edge edges (service-type-extensions (service-kind service))))
@@ -686,7 +686,7 @@ TARGET-TYPE; return the root service adjusted accordingly."
(service #f)
(target-type target-type))
(&message
- (message (format #f (_ "service of type '~a' not found")
+ (message (format #f (G_ "service of type '~a' not found")
(service-type-name target-type)))))))
(x
(raise
@@ -696,7 +696,7 @@ TARGET-TYPE; return the root service adjusted accordingly."
(&message
(message
(format #f
- (_ "more than one target service of type '~a'")
+ (G_ "more than one target service of type '~a'")
(service-type-name target-type)))))))))
;;; services.scm ends here.
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index 5831220541..7281746ab2 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -163,7 +163,7 @@ assertion failure."
(raise (condition
(&message
(message
- (format #f (_ "service '~a' provided more than once")
+ (format #f (G_ "service '~a' provided more than once")
symbol)))))))
(for-each assert-unique (shepherd-service-provision service))
@@ -178,7 +178,7 @@ assertion failure."
(raise (condition
(&message
(message
- (format #f (_ "service '~a' requires '~a', \
+ (format #f (G_ "service '~a' requires '~a', \
which is not provided by any service")
(match (shepherd-service-provision service)
((head . _) head)
diff --git a/gnu/system.scm b/gnu/system.scm
index 44190bdfc6..a35a416cb0 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -522,7 +522,7 @@ This is for backward-compatibility of fields that used to be strings and are
now file-like objects.."
(match thing
((? string?)
- (warning (_ "using a string for file '~a' is deprecated; \
+ (warning (G_ "using a string for file '~a' is deprecated; \
use 'plain-file' instead~%")
file-name)
(plain-file file-name thing))
@@ -538,7 +538,7 @@ and are now file-like objects."
(with-monad %store-monad
(match thing
((? procedure?)
- (warning (_ "using a monadic value for '~a' is deprecated; \
+ (warning (G_ "using a monadic value for '~a' is deprecated; \
use 'plain-file' instead~%")
file-name)
thing)
@@ -680,7 +680,7 @@ hardware-related operations as necessary when booting a Linux container."
(#f
(raise (condition
(&message
- (message (format #f (_ "~a: invalid locale name") name))))))
+ (message (format #f (G_ "~a: invalid locale name") name))))))
(def def)))
(define (operating-system-locale-directory os)
@@ -862,7 +862,7 @@ this file is the reconstruction of GRUB menu entries for old configurations."
(_ ;the old format
"/")))))
(x ;unsupported format
- (warning (_ "unrecognized boot parameters for '~a'~%")
+ (warning (G_ "unrecognized boot parameters for '~a'~%")
system)
#f)))
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index 1acfcc4866..b30ef8e390 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -220,7 +220,7 @@ set debug-file-directory ~/.guix-profile/lib/debug\n")))
(raise (condition
(&message
(message
- (format #f (_ "supplementary group '~a' \
+ (format #f (G_ "supplementary group '~a' \
of user '~a' is undeclared")
group
(user-account-name user))))))))
@@ -230,7 +230,7 @@ of user '~a' is undeclared")
(raise (condition
(&message
(message
- (format #f (_ "primary group '~a' \
+ (format #f (G_ "primary group '~a' \
of user '~a' is undeclared")
(user-account-group user)
(user-account-name user)))))))