[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
20/67: installer: Remove "selection" from all titles.
From: |
guix-commits |
Subject: |
20/67: installer: Remove "selection" from all titles. |
Date: |
Wed, 16 Jan 2019 19:00:38 -0500 (EST) |
civodul pushed a commit to branch wip-newt-installer
in repository guix.
commit d1ec62fc041112dc8d2b37302e55784cf28f01df
Author: Mathieu Othacehe <address@hidden>
Date: Wed Dec 5 14:19:28 2018 +0900
installer: Remove "selection" from all titles.
* gnu/installer/newt/hostname.scm (run-hostname-page): Remove selection from
page title,
(run-variant-page): ditto.
* gnu/installer/newt/keymap.scm (run-layout-page): Ditto.
* gnu/installer/newt/locale.scm (run-layout-page): Ditto,
(run-territory-page): ditto,
(run-codeset-page): ditto,
(run-modifier-page): ditto
* gnu/installer/newt/network.scm (run-territory-page): Ditto.
* gnu/installer/newt/timezone.scm (run-timezone-page): Ditto.
* gnu/installer/newt/wifi.scm (run-wifi-page): Ditto.
---
gnu/installer/newt/hostname.scm | 2 +-
gnu/installer/newt/keymap.scm | 4 ++--
gnu/installer/newt/locale.scm | 8 ++++----
gnu/installer/newt/network.scm | 2 +-
gnu/installer/newt/timezone.scm | 2 +-
gnu/installer/newt/wifi.scm | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/gnu/installer/newt/hostname.scm b/gnu/installer/newt/hostname.scm
index acbee64..a8209bc 100644
--- a/gnu/installer/newt/hostname.scm
+++ b/gnu/installer/newt/hostname.scm
@@ -23,4 +23,4 @@
(define (run-hostname-page)
(run-input-page (G_ "Please enter the system hostname")
- (G_ "Hostname selection")))
+ (G_ "Hostname")))
diff --git a/gnu/installer/newt/keymap.scm b/gnu/installer/newt/keymap.scm
index 219ac3f..0c9432b 100644
--- a/gnu/installer/newt/keymap.scm
+++ b/gnu/installer/newt/keymap.scm
@@ -29,7 +29,7 @@
#:export (run-keymap-page))
(define (run-layout-page layouts layout->text)
- (let ((title (G_ "Layout selection")))
+ (let ((title (G_ "Layout")))
(run-listbox-selection-page
#:title title
#:info-text (G_ "Please choose your keyboard layout.")
@@ -43,7 +43,7 @@
(&installer-step-abort)))))))
(define (run-variant-page variants variant->text)
- (let ((title (G_ "Variant selection")))
+ (let ((title (G_ "Variant")))
(run-listbox-selection-page
#:title title
#:info-text (G_ "Please choose a variant for your keyboard layout.")
diff --git a/gnu/installer/newt/locale.scm b/gnu/installer/newt/locale.scm
index 5444a07..599a6b0 100644
--- a/gnu/installer/newt/locale.scm
+++ b/gnu/installer/newt/locale.scm
@@ -30,7 +30,7 @@
#:export (run-locale-page))
(define (run-language-page languages language->text)
- (let ((title (G_ "Language selection")))
+ (let ((title (G_ "Language")))
(run-listbox-selection-page
#:title title
#:info-text (G_ "Choose the language to be used for the installation \
@@ -46,7 +46,7 @@ language for the installed system.")
(&installer-step-abort)))))))
(define (run-territory-page territories territory->text)
- (let ((title (G_ "Location selection")))
+ (let ((title (G_ "Location")))
(run-listbox-selection-page
#:title title
#:info-text (G_ "Choose your location. This is a shortlist of locations \
@@ -61,7 +61,7 @@ based on the language you selected.")
(&installer-step-abort)))))))
(define (run-codeset-page codesets)
- (let ((title (G_ "Codeset selection")))
+ (let ((title (G_ "Codeset")))
(run-listbox-selection-page
#:title title
#:info-text (G_ "Choose your codeset. If UTF-8 is available, it should be
\
@@ -77,7 +77,7 @@ preferred.")
(&installer-step-abort)))))))
(define (run-modifier-page modifiers modifier->text)
- (let ((title (G_ "Modifier selection")))
+ (let ((title (G_ "Modifier")))
(run-listbox-selection-page
#:title title
#:info-text (G_ "Choose your modifier.")
diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm
index c6ba69d..45989ac 100644
--- a/gnu/installer/newt/network.scm
+++ b/gnu/installer/newt/network.scm
@@ -56,7 +56,7 @@ Internet and return the selected technology. For now, only
technologies with
(run-listbox-selection-page
#:info-text (G_ "The install process requires an internet access.\
Please select a network technology.")
- #:title (G_ "Technology selection")
+ #:title (G_ "Internet access")
#:listbox-items (technology-items)
#:listbox-item->text technology->text
#:button-text (G_ "Cancel")
diff --git a/gnu/installer/newt/timezone.scm b/gnu/installer/newt/timezone.scm
index a2c9b45..874f4a0 100644
--- a/gnu/installer/newt/timezone.scm
+++ b/gnu/installer/newt/timezone.scm
@@ -55,7 +55,7 @@ returned."
(define (loop path)
(let ((timezones (locate-childrens timezone-tree path)))
(run-listbox-selection-page
- #:title (G_ "Timezone selection")
+ #:title (G_ "Timezone")
#:info-text (G_ "Please select a timezone.")
#:listbox-items timezones
#:listbox-item->text identity
diff --git a/gnu/installer/newt/wifi.scm b/gnu/installer/newt/wifi.scm
index 6cac543..de44334 100644
--- a/gnu/installer/newt/wifi.scm
+++ b/gnu/installer/newt/wifi.scm
@@ -219,7 +219,7 @@ force a wifi scan."
cancel-button)
(make-wrapped-grid-window
(basic-window-grid info-textbox middle-grid buttons-grid)
- (G_ "Wifi selection"))
+ (G_ "Wifi"))
(receive (exit-reason argument)
(run-form form)
- branch wip-newt-installer created (now e12a60d), guix-commits, 2019/01/16
- 01/67: guile: newt: Update revision to 3., guix-commits, 2019/01/16
- 06/67: installer: newt: Locate the logo within local-file., guix-commits, 2019/01/16
- 02/67: services: kmscon: Remove virtual-terminal requirement., guix-commits, 2019/01/16
- 09/67: guix: self: Do not install (gnu system install)., guix-commits, 2019/01/16
- 16/67: services: herd: Allow to pass arguments to start-service., guix-commits, 2019/01/16
- 11/67: installer: Rewrite welcome page., guix-commits, 2019/01/16
- 15/67: build: syscalls: Add device-in-use?., guix-commits, 2019/01/16
- 21/67: installer: Add new utils., guix-commits, 2019/01/16
- 20/67: installer: Remove "selection" from all titles.,
guix-commits <=
- 28/67: installer: Fix ethernet connection., guix-commits, 2019/01/16
- 10/67: gnu: installer: Launch the installer as kmscon login-program., guix-commits, 2019/01/16
- 19/67: file-systems: Export read-partition-label and read-partition-uuid., guix-commits, 2019/01/16
- 14/67: tests: Rename %test-encrypted-os to %test-encrypted-root-os., guix-commits, 2019/01/16
- 18/67: gnu: Add guile-parted., guix-commits, 2019/01/16
- 33/67: installer: Reorder local.mk., guix-commits, 2019/01/16
- 05/67: installer: newt: Use scheme-modules* instead of scheme-modules., guix-commits, 2019/01/16
- 17/67: gnu: guile-newt: Update to revision 4., guix-commits, 2019/01/16
- 35/67: installer: Fix compute calls., guix-commits, 2019/01/16
- 36/67: installer: Reorder partitionment step., guix-commits, 2019/01/16