applied debconf templates polishing

r6035

debian/changelog

@@ -3,8 +3,11 @@ netcfg (0.31) unstable; urgency=low
   * Gaudenz Steinlin
     - remove useless and confusing dhcp
       confirm question
+    - apply debconf templates polishing
+      (Thanks to Christian Perrier and
+       Chris Tillman)
 
- -- Gaudenz Steinlin <steinlin@sowipc4.unibe.ch>  Thu, 13 Nov 2003 19:39:39 +0100
+ -- Gaudenz Steinlin <steinlin@sowipc4.unibe.ch>  Thu, 13 Nov 2003 20:10:03 +0100
 
 netcfg (0.30) unstable; urgency=low
 

debian/netcfg-common.templates

@@ -1,6 +1,6 @@
 Template: netcfg/get_domain
 Type: string
-_Description: Choose the domain name.
+_Description: Domain name:
  The domain name is the part of your Internet address to the right of your
  host name.  It is often something that ends in .com, .net, .edu, or .org. 
  If you are setting up a home network, you can make something up, but make
@@ -8,29 +8,32 @@ _Description: Choose the domain name.
 
 Template: netcfg/get_nameservers
 Type: string
-_Description: Choose the DNS Server Addresses
+_Description: Name servers addresses:
  Please enter the IP addresses (not host names) of up to 3 name servers,
- separated by spaces. Do not use commas. The servers will be queried in the
- order in which you enter them. If you don't want to use any name servers
+ separated by spaces. Do not use commas. The first server in the list will
+ be the first to be queried. If you don't want to use any name server,
  just leave this field blank.
 
 Template: netcfg/choose_interface
 Type: select
 Choices: ${ifchoices}
-_Description: Choose an interface.
- The following interfaces were detected. Choose the type of your primary
- network interface that you will need for installing the Debian system (via
- NFS or HTTP).
+_Description: Interface:
+ Please choose the interface you want to configure. All currently 
+ detected interfaces on your system are shown below. Please choose the
+ type of your primary network interface. This interface will be used
+ for installing the Debian system (via NFS or HTTP).
 
 Template: netcfg/error_cfg
 Type: error
-_Description: An error occured.
- Something went wrong when I tried to activate your network.
+_Description: Error while activating the network
+ An error occurred while activating the network.
 
 Template: netcfg/get_hostname
 Type: string
 Default: debian
-_Description: Enter the system's hostname.
+_Description: Hostname:
+ Please enter the hostname for this system.
+ .
  The hostname is a single word that identifies your system to the network. 
  If you don't know what your hostname should be, consult your network
  administrator.  If you are setting up your own home network, you can make
@@ -38,23 +41,27 @@ _Description: Enter the system's hostname.
 
 Template: netcfg/invalid_hostname
 Type: error
-_Description: The hostname "${hostname}" is invalid.
+_Description: Invalid hostname
+ The name "${hostname}" is invalid.
+ .
  A valid hostname may contain only alphanumeric characters and the minus
  sign, be between 2 and 63 characters long, and cannot begin or end with a
  minus sign.
 
 Template: netcfg/error
 Type: error
-_Description: An error occured and I cannot continue.
- Feel free to retry.
+_Description: Error
+ An error occured and the network configuration process had been aborted.
+ You may retry it from the installation main menu.
 
 Template: netcfg/no_interfaces
 Type: error
-_Description: No network interfaces were detected.
+_Description: No network interfaces detected
  No network interfaces were found.   That means that the installation
- system was unable to find a network device.  If you do have a network
- card, then it is possible that the module for it hasn't been selected
- yet.  Go back to 'Detect network hardware'.
+ system was unable to find a network device.  
+ . 
+ You may need to load a specific module for your network card, if you really
+ own one. For this, go back to the network hardware detection step.
 
 Template: netcfg/internal-none
 Type: text

debian/netcfg-dhcp.templates

@@ -1,14 +1,17 @@
 Template: netcfg/dhcp_hostname
 Type: string
-_Description: What is your dhcp hostname?
+_Description: DHCP hostname:
  You may need to supply a DHCP host name. If you are using
- a cable modem, you might need to specify an account number
- here.  Most other users can just leave this blank.
+ a cable modem, you might need to specify an account number here.  
+ .
+ Most other users can just leave this blank.
 
 Template: netcfg/confirm_dhcp
 Type: boolean
 Default: true
 _Description: Is this information correct?
+ Currently configured network parameters:
+ .
   interface      = ${interface}
   hostname       = ${hostname}
   domain         = ${domain}
@@ -24,9 +27,11 @@ Type: text
 _Description: This may take a few minutes.
 
 Template: netcfg/no_dhcp_client
-Type: note
-_Description: No dhcp client found. I cannot continue.
- This package requires pump or dhcp-client.
+Type: error
+_Description: No DHCP client found
+ No DHCP client was found. This package requires pump or dhcp-client.
+ .
+ The DHCP configuration process will be aborted.
 
 Template: netcfg/dhcp-title
 Type: text
@@ -36,4 +41,4 @@ _Description: DHCP Network Configuration
 Template: debian-installer/netcfg-dhcp/title
 Type: text
 #  Item in the main menu to select this package
-_Description: Configure the network via DHCP
+_Description: Configure the network using dynamic addressing (DHCP)

debian/netcfg-static.templates

@@ -1,22 +1,22 @@
 Template: netcfg/get_ipaddress
 Type: string
-_Description: IP address?
+_Description: IP address:
  The IP address is unique to your computer and consists of four numbers
  separated by periods.  If you don't know what to use here, consult your
  network administrator.
 
 Template: netcfg/get_pointopoint
 Type: string
-_Description: Pointopoint address?
- The pointopoint address is used to determine the other endpoint of the
+_Description: Point-to-point address:
+ The point-to-point address is used to determine the other endpoint of the
  point to point network.  Consult your network administrator if you do not
- know the value.  The pointopoint address should be entered as four numbers
+ know the value.  The point-to-point address should be entered as four numbers
  separated by periods.
 
 Template: netcfg/get_netmask
 Type: string
 Default: 255.255.255.0
-_Description: Netmask?
+_Description: Netmask:
  The netmask is used to determine which machines are local to your
  network.  Consult your network administrator if you do not know the
  value.  The netmask should be entered as four numbers separated by
@@ -24,24 +24,29 @@ _Description: Netmask?
 
 Template: netcfg/get_gateway
 Type: string
-_Description: Gateway?
- This is an IP address (four numbers separated by periods) that indicates
- the gateway router, also known as the default router.  All traffic that
- goes outside your LAN (for instance, to the Internet) is sent through this
- router.  In rare circumstances, you may have no router; in that case, you
- can leave this blank.  If you don't know the proper answer to this
- question, consult your network administrator.
+_Description: Gateway:
+ The gateway is an IP address (four numbers separated by periods) that
+ indicates the gateway router, also known as the default router.  All
+ traffic that goes outside your LAN (for instance, to the Internet) is
+ sent through this router.  In rare circumstances, you may have no
+ router; in that case, you can leave this blank.  If you don't know
+ the proper answer to this question, consult your network
+ administrator.
 
 Template: netcfg/gateway_unreachable
-Type: note
-_Description: The gateway you entered is unreachable.
+Type: error
+_Description: Unreachable gateway
+ The gateway address you entered is unreachable.
+ .
  You may have made an error entering your IP address, netmask and/or
  gateway.
 
 Template: netcfg/confirm_static
 Type: boolean
 Default: true
-_Description: Is this configuration correct?
+_Description: Is this information correct?
+ Currently configured network parameters:
+ .
   interface     = ${interface}
   hostname      = ${hostname}
   domain        = ${domain}
@@ -59,4 +64,4 @@ _Description: Static Network Configuration
 Template: debian-installer/netcfg-static/title
 Type: text
 #  Item in the main menu to select this package
-_Description: Configure a static network
+_Description: Configure a network using static addressing