Bug#217775: choose-mirror: Debconf templates polishing
Package: choose-mirror
Severity: normal
Tags: patch d-i
(hope the "Tags:" field will be processed properly)
Attached is a patch to choose-mirror debconf templates for using templates
consistent with the new way cdebconf will show them to users :
-select/multiselect/string templates short descriptions are a prompt, thus
treated as a prompt-->short, direct....and use ending colon
-some rephrase in templates (use of "please"...always use "select"....)
Detailed explanations follow :
--- templates 2003-10-27 11:02:03.000000000 +0100
+++ templates.ori 2003-10-27 11:02:40.000000000 +0100
@@ -2,89 +2,87 @@
Type: select
Choices: ${countries}
Default: United States
-_Description: Use a mirror from what country?
- The goal is to find a mirror that is close to you on the network -- be
- aware that nearby countries, or even your own, may not be the best choice.
+_Description: Use mirror from:
+ Please select the closest Debian mirror, relatively to network topology, not
+ necessarily to geographical reasons.
Short description is a prompt.
Long description rephrased. Probably still needs better English. "The goal
is" wasn't adapted to the new cdebconf behaviour where this phrase will
appear first.
I suggest "Please select" so that it may be adopted further in ALL other d-i
templates in such cases. Debian is a polite distribution..we don't give
orders to users, just politely ask them to do this or that....:-)
Template: mirror/protocol
Type: select
Choices: ${protocols}
Default: http
-_Description: Download files using what protocol?
- Select a protocol to use to download files. If you are unsure, choose http
+_Description: Protocol for files download:
+ Please select the file download protocol. If unsure, select "http"
as it is less prone to problems involving firewalls.
Same principle : "select" templates, thus no question, but a prompt. "Please
select".
By the way, here, the choices should be FTP and HTTP, all case, as these are
protocol names AND acronyms. This probably needs some rewrite elsewhere
Template: mirror/http/mirror
Type: select
Choices: ${mirrors}
Default: ftp.us.debian.org
-_Description: Choose the Debian mirror to use:
- Select the mirror from which Debian will be downloaded. You should select a
- mirror that is close to you on the net.
+_Description: Debian mirror:
+ Please select the closest Debian mirror, relatively to network topology, not
+ necessarily to geographical reasons.
.
- Usually, ftp.<your country code>.debian.org is a good choice.
+ The recommended choice is ftp.<your country code>.debian.org.
Again, the short description is a prompt. I use the same phrase than above
for coherency reasons.
The second paragraph is more cosmetic : I prefer more direct suggestion...
Template: mirror/http/hostname
Type: string
-_Description: Enter mirror hostname:
- Enter the hostname of the mirror from which Debian will be downloaded.
+_Description: Mirror hostname:
+ Please enter the network name of the host from which Debian will be
+ downloaded.
See above.
The long description is a bit rephrased but could be better again, I guess.
Template: mirror/http/directory
Type: string
Default: /debian
-_Description: Enter mirror directory:
- Enter the directory in which the Debian mirror is located.
+_Description: Mirror directory:
+ Please enter the directory in which the Debian mirror is located.
See above.
Template: mirror/http/proxy
Type: string
-_Description: Enter http proxy information, or leave blank for none:
- If you need to use a http proxy to access the outside world, enter the
+_Description: HTTP proxy information (blank for none):
+ If you need to use a HTTP proxy to access the outside world, please enter the
proxy information here. Otherwise, leave this blank.
.
- When entering proxy information, use the standard form of
- "http://[[user][:pass]@]host[:port]/";
+ The proxy information should be the standard form of
+ "http://[[user][:pass]@]host[:port]/";.
Again, this is a prompt, so direct prompting....and ending colon.
HTTP uppercase (moreover this enlightens the protocol name a bit)...and
"please".
Template: mirror/ftp/mirror
.../...
Same principles for FTP stuff than HTTP stuff.
Template: mirror/distribution
Type: select
Choices: sarge, sid
Default: sarge
-_Description: Select distribution to install
+_Description: Distribution to install:
Please select the distribution you want to install.
.
- sarge is the "testing" unreleased version of Debian.
- sid is "unstable" and will never be released.
+ - Sarge is the "testing" unreleased version of Debian;
+ - Sid is "unstable" and will never be released.
Again, prompting...
The hard-formatted enumeration will help translators (the translations may
use more than one line). I use the standard french typography for
enumerations (";" at the end of all lines except the last one). If english
typography uses different conventions, this should be corrected.
-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux mykerinos 2.4.22 #2 Mon Sep 29 15:12:10 CEST 2003 i686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (ignored: LC_ALL set to fr_FR.UTF-8)
--- templates.ori 2003-10-27 11:02:40.000000000 +0100
+++ templates 2003-10-27 11:02:03.000000000 +0100
@@ -2,87 +2,89 @@
Type: select
Choices: ${countries}
Default: United States
-_Description: Use a mirror from what country?
- The goal is to find a mirror that is close to you on the network -- be
- aware that nearby countries, or even your own, may not be the best choice.
+_Description: Use mirror from:
+ Please select the closest Debian mirror, relatively to network topology, not
+ necessarily to geographical reasons.
Template: mirror/protocol
Type: select
Choices: ${protocols}
Default: http
-_Description: Download files using what protocol?
- Select a protocol to use to download files. If you are unsure, choose http
+_Description: Protocol for files download:
+ Please select the file download protocol. If unsure, select "http"
as it is less prone to problems involving firewalls.
Template: mirror/http/mirror
Type: select
Choices: ${mirrors}
Default: ftp.us.debian.org
-_Description: Choose the Debian mirror to use:
- Select the mirror from which Debian will be downloaded. You should select a
- mirror that is close to you on the net.
+_Description: Debian mirror:
+ Please select the closest Debian mirror, relatively to network topology, not
+ necessarily to geographical reasons.
.
- Usually, ftp.<your country code>.debian.org is a good choice.
+ The recommended choice is ftp.<your country code>.debian.org.
Template: mirror/http/hostname
Type: string
-_Description: Enter mirror hostname:
- Enter the hostname of the mirror from which Debian will be downloaded.
+_Description: Mirror hostname:
+ Please enter the network name of the host from which Debian will be
+ downloaded.
Template: mirror/http/directory
Type: string
Default: /debian
-_Description: Enter mirror directory:
- Enter the directory in which the Debian mirror is located.
+_Description: Mirror directory:
+ Please enter the directory in which the Debian mirror is located.
Template: mirror/http/proxy
Type: string
-_Description: Enter http proxy information, or leave blank for none:
- If you need to use a http proxy to access the outside world, enter the
+_Description: HTTP proxy information (blank for none):
+ If you need to use a HTTP proxy to access the outside world, please enter the
proxy information here. Otherwise, leave this blank.
.
- When entering proxy information, use the standard form of
- "http://[[user][:pass]@]host[:port]/";
+ The proxy information should be the standard form of
+ "http://[[user][:pass]@]host[:port]/";.
Template: mirror/ftp/mirror
Type: select
Choices: ${mirrors}
Default: ftp.us.debian.org
-_Description: Choose the Debian mirror to use:
- Select the mirror from which Debian will be downloaded. You should select a
- mirror that is close to you on the net.
+_Description: Debian mirror:
+ Please select the closest Debian mirror, relatively to network topology, not
+ necessarily to geographical reasons.
.
- Usually, ftp.<your country code>.debian.org is a good choice.
+ The recommended choice is ftp.<your country code>.debian.org.
Template: mirror/ftp/hostname
Type: string
-_Description: Enter mirror hostname:
- Enter the hostname of the mirror from which Debian will be downloaded.
+_Description: Mirror hostname:
+ Please enter the network name of the host from which Debian will be
+ downloaded.
Template: mirror/ftp/directory
Type: string
Default: /debian
-_Description: Enter mirror directory:
- Enter the directory in which the Debian mirror is located.
+_Description: Mirror directory:
+ Please enter the directory in which the Debian mirror is located.
Template: mirror/ftp/proxy
Type: string
-_Description: Enter ftp proxy information, or leave blank for none:
- If you need to use a ftp proxy to access the outside world, enter the
+_Description: FTP proxy information (blank for none):
+ If you need to use a FTP proxy to access the outside world, please enter the
proxy information here. Otherwise, leave this blank.
.
- When entering proxy information, use the standard form of
- "ftp://[[user][:pass]@]host[:port]/";
+ The proxy information should be the standard form of
+ "ftp://[[user][:pass]@]host[:port]/";.
Template: mirror/distribution
Type: select
Choices: sarge, sid
Default: sarge
-_Description: Select distribution to install
+_Description: Distribution to install:
Please select the distribution you want to install.
.
- sarge is the "testing" unreleased version of Debian.
- sid is "unstable" and will never be released.
+ - Sarge is the "testing" unreleased version of Debian;
+ - Sid is "unstable" and will never be released.
Template: debian-installer/choose-mirror/title
Type: text
Reply to: