From 5cdb6bd2db0b465fa616a9fd36760b14844d5c48 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 5 Dec 2018 14:19:28 +0900 Subject: 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 acbee64a6a..a8209bc2de 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 219ac3f8e2..0c9432bba2 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 5444a07598..599a6b0ecf 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 c6ba69d4e8..45989ac2ac 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 a2c9b458f5..874f4a0734 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 6cac54399a..de443345f6 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) -- cgit v1.2.3