diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-14 15:06:06 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-14 15:06:06 +0100 |
| commit | ebfe259f6682b43d7f0d3b57b525e25f97410052 (patch) | |
| tree | e3f09eb6159168e1736f8a629286eb3d148917a9 /gnu/installer | |
| parent | 47b3eed821cf86c350dc4b0fdbe75647cdc275b0 (diff) | |
| parent | 8cc3983a4d02a15ad4a863671c1a5a8b2b542625 (diff) | |
| download | gnu-guix-ebfe259f6682b43d7f0d3b57b525e25f97410052.tar gnu-guix-ebfe259f6682b43d7f0d3b57b525e25f97410052.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/installer')
| -rw-r--r-- | gnu/installer/newt/network.scm | 6 | ||||
| -rw-r--r-- | gnu/installer/newt/welcome.scm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm index f263b7df9d..f13176dc61 100644 --- a/gnu/installer/newt/network.scm +++ b/gnu/installer/newt/network.scm @@ -113,7 +113,7 @@ FULL-VALUE tentatives, spaced by 1 second." (let* ((full-value 5)) (run-scale-page #:title (G_ "Checking connectivity") - #:info-text (G_ "Waiting internet access is established.") + #:info-text (G_ "Waiting for Internet access establishment...") #:scale-full-value full-value #:scale-update-proc (lambda (value) @@ -123,8 +123,8 @@ FULL-VALUE tentatives, spaced by 1 second." (+ value 1)))) (unless (connman-online?) (run-error-page - (G_ "The selected network does not provide an Internet \ -access, please try again.") + (G_ "The selected network does not provide access to the \ +Internet, please try again.") (G_ "Connection error")) (raise (condition diff --git a/gnu/installer/newt/welcome.scm b/gnu/installer/newt/welcome.scm index eec98e291a..b0b5429c0f 100644 --- a/gnu/installer/newt/welcome.scm +++ b/gnu/installer/newt/welcome.scm @@ -92,8 +92,8 @@ we want this page to occupy all the screen space available." the page. Ask the user to choose between manual installation, graphical installation and reboot." (run-menu-page - (G_ "GNU GuixSD install") - (G_ "Welcome to GNU GuixSD installer! + (G_ "GNU Guix install") + (G_ "Welcome to GNU Guix system installer! Please note that the present graphical installer is still under heavy \ development, so you might want to prefer using the shell based process. \ |