[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#217775: marked as done (choose-mirror: Debconf templates polishing)



Your message dated Sun, 02 Nov 2003 13:17:09 -0500
with message-id <E1AGMmj-0003u6-00@auric.debian.org>
and subject line Bug#217775: fixed in choose-mirror 0.019
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 27 Oct 2003 10:34:11 +0000
>From bubulle@kheops.frmug.org Mon Oct 27 04:34:09 2003
Return-path: <bubulle@kheops.frmug.org>
Received: from lns-th2-5f-81-56-227-253.adsl.proxad.net (kheops.homeunix.org) [81.56.227.253] 
	by master.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1AE4hM-0003YW-00; Mon, 27 Oct 2003 04:34:08 -0600
Received: from localhost (localhost [127.0.0.1])
	by kheops.homeunix.org (Postfix) with ESMTP
	id E730940F6; Mon, 27 Oct 2003 11:34:06 +0100 (CET)
Received: from kheops.homeunix.org ([127.0.0.1])
	by localhost (kheops [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 03019-08; Mon, 27 Oct 2003 11:33:54 +0100 (CET)
Received: from mykerinos.kheops.frmug.org (mykerinos.kheops.frmug.org [192.168.1.3])
	by kheops.homeunix.org (Postfix) with ESMTP
	id D7F7540F2; Mon, 27 Oct 2003 11:33:53 +0100 (CET)
Received: by mykerinos.kheops.frmug.org (Postfix, from userid 7426)
	id 49B71D062; Mon, 27 Oct 2003 11:30:45 +0100 (CET)
Content-Type: multipart/mixed; boundary="===============1431012799=="
MIME-Version: 1.0
From: Christian Perrier <bubulle@debian.org>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: choose-mirror: Debconf templates polishing
X-Mailer: reportbug 2.35
Date: Mon, 27 Oct 2003 11:30:45 +0100
Message-Id: <20031027103045.49B71D062@mykerinos.kheops.frmug.org>
X-Virus-Scanned: by amavisd-new-20030616-p5 (Debian) at kheops.frmug.org
Delivered-To: submit@bugs.debian.org
X-Spam-Status: No, hits=-5.2 required=4.0
	tests=HAS_PACKAGE,HTTP_USERNAME_USED,PATCH_UNIFIED_DIFF,USERPASS
	version=2.53-bugs.debian.org_2003_10_21
X-Spam-Level: 
X-Spam-Checker-Version: SpamAssassin 2.53-bugs.debian.org_2003_10_21 (1.174.2.15-2003-03-30-exp)

This is a multi-part MIME message sent by reportbug.

--===============1431012799==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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)


--===============1431012799==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="patch"

--- 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

--===============1431012799==--

---------------------------------------
Received: (at 217775-close) by bugs.debian.org; 2 Nov 2003 18:23:27 +0000
>From katie@auric.debian.org Sun Nov 02 12:23:26 2003
Return-path: <katie@auric.debian.org>
Received: from auric.debian.org [206.246.226.45] 
	by master.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1AGMso-000634-00; Sun, 02 Nov 2003 12:23:26 -0600
Received: from katie by auric.debian.org with local (Exim 3.35 1 (Debian))
	id 1AGMmj-0003u6-00; Sun, 02 Nov 2003 13:17:09 -0500
From: Joey Hess <joeyh@debian.org>
To: 217775-close@bugs.debian.org
X-Katie: $Revision: 1.42 $
Subject: Bug#217775: fixed in choose-mirror 0.019
Message-Id: <E1AGMmj-0003u6-00@auric.debian.org>
Sender: Archive Administrator <katie@auric.debian.org>
Date: Sun, 02 Nov 2003 13:17:09 -0500
Delivered-To: 217775-close@bugs.debian.org

Source: choose-mirror
Source-Version: 0.019

We believe that the bug you reported is fixed in the latest version of
choose-mirror, which is due to be installed in the Debian FTP archive:

choose-mirror_0.019.dsc
  to pool/main/c/choose-mirror/choose-mirror_0.019.dsc
choose-mirror_0.019.tar.gz
  to pool/main/c/choose-mirror/choose-mirror_0.019.tar.gz
choose-mirror_0.019_i386.udeb
  to pool/main/c/choose-mirror/choose-mirror_0.019_i386.udeb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 217775@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Joey Hess <joeyh@debian.org> (supplier of updated choose-mirror package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Sat,  1 Nov 2003 22:21:24 -0500
Source: choose-mirror
Binary: choose-mirror
Architecture: source i386
Version: 0.019
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Joey Hess <joeyh@debian.org>
Description: 
 choose-mirror - Choose mirror to install from (udeb)
Closes: 212456 215208 217775
Changes: 
 choose-mirror (0.019) unstable; urgency=low
 .
   * Alastair McKinstry
     - Support backup capabilities.
     - Make country names translatable. Closes: #215208.
     - Set default country question priority to "medium", picking a default
       from debian-installer/language (eg. languagechooser).
     - Polish the template language. Closes: #217775.
     - Place the custom mirror choice at the top of the list, not the end;
       Closes: #212456.
     - Change "protocol" question from high to medium, default http.
     - Put choose-mirror.templates, Mirrors.masterlist in tarball to aid
       translators.
   * Christian Perrier
     - Update French translation.
   * Bart Cornelis
     - updated Dutch translation (nl.po)
   * Claus Hindsgaul
     - Update da (Danish) translation.
   * Kenshi Muto
     - Update Japanese translation (ja.po)
   * André Luís Lopes
     - Update Brazilian Portuguese (pt_BR) translation.
   * Safir Secerovic, Amila Akagic
     - Add Bosnian translation (bs.po).
   * Pierre Machard
     - Update French translation.
     - Run debconf-updatepo.
   * Joey Hess
     - Change Installer-Menu-Item from 14 to 20 as part of the 10-30
       renumbering.
     - Minor template polishing.
Files: 
 c3e1118da73eb8c9f6d646e2c2251df1 699 debian-installer optional choose-mirror_0.019.dsc
 3dc7c8d6fe086067ea36df0dba2fd435 63514 debian-installer optional choose-mirror_0.019.tar.gz
 b896c41223b1479bde0a6f2cad57430e 16694 debian-installer optional choose-mirror_0.019_i386.udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQE/pUgG2tp5zXiKP0wRAp7qAJ9GhBjjZY43MC6UAMUc+5vBi8gs5gCgs3bQ
0BQR29pZgXq9VT3v6VsVla0=
=ZVoT
-----END PGP SIGNATURE-----



Reply to: