Bug#223762: netcfg: Debconf templates polishing - 2nd round
Package: netcfg
Severity: normal
Tags: patch
The recent modifications for handling DHCP network configuration have
introduced new templates in the package.
Some of these have minor inconsistencies with the existing templates, mostly
formulation (use "DHCP network configuration" instead or easier to
understand "dynamic addressing" blah bah). There are also doubles spaces
here and there because of lines ending with a space in the original
tempaltes file.
The attached patch suggests some modifications. Rationale:
Template: netcfg/get_method
Type: select
-Default: configure network with DHCP
-_Choices: configure network with DHCP, manual network configuration
-_Description: Network configuration method
- Networking can either be configure by DHCP or by manually
- entering all the information. If you choose DHCP and
+Default: Dynamic addressing (DHCP)
+_Choices: Dynamic addressing (DHCP), Static addressing (manual)
+_Description: Network configuration method:
+ Networking can either be configure by DHCP or by manually
+ entering all the information. If you choose DHCP and
debian-installer is unable to get a working configuration
from a DHCP Server on you network you will be offered to configure
your network manually after the atempt to configure it by DHCP. If
This is kinda cosmetic : use of a Cap at the beginning of choices.
Reformulate the choices....
Hmmm, while I write this, I think that probably maintainer scripts should be
updated accordingly.
@@ -30,7 +30,7 @@
Type: select
Choices: ${ifchoices}
_Description: Interface:
- Please choose the interface you want to configure. All currently
+ 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).
Final space
@@ -70,7 +70,7 @@
Type: error
_Description: No network interfaces detected
No network interfaces were found. The installation
- system was unable to find a network device.
+ 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.
Final space
diff -Nru netcfg.ori/debian/netcfg-dhcp.templates netcfg/debian/netcfg-dhcp.templates
--- netcfg.ori/debian/netcfg-dhcp.templates 2003-12-12 08:02:08.000000000 +0100
+++ netcfg/debian/netcfg-dhcp.templates 2003-12-12 08:11:16.000000000 +0100
@@ -2,7 +2,7 @@
Type: string
_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.
+ a cable modem, you might need to specify an account number here.
.
Most other users can just leave this blank.
Final space
@@ -37,13 +37,13 @@
Type: boolean
Default: false
_Description: Do you want to retry DHCP network configuration?
- No IP address was offered during DHCP network configuration. Sometimes
- DHCP servers are really slow. In this case you can retry.
+ No IP address was offered during DHCP network configuration. DHCP servers
+ are sometimes really slow. In this case you can retry.
Sounds better to me...But I'm sometimes wrong..:-)
Template: netcfg/dhcp-title
Type: text
# Title displayed when configuring this package
-_Description: DHCP Network Configuration
+_Description: Dynamic network configuration (DHCP)
For consistency with menu entries, choices, etc.
Template: debian-installer/netcfg-dhcp/title
Type: text
diff -Nru netcfg.ori/debian/netcfg-static.templates netcfg/debian/netcfg-static.templates
--- netcfg.ori/debian/netcfg-static.templates 2003-12-12 08:02:08.000000000 +0100
+++ netcfg/debian/netcfg-static.templates 2003-12-12 08:09:41.000000000 +0100
@@ -59,7 +59,7 @@
Template: netcfg/static-title
Type: text
# Title displayed when configuring this package
-_Description: Static Network Configuration
+_Description: Static network configuration
No caps everywhere. We're not german people, are we? :-)
-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux mykerinos 2.6.0-test11 #1 Sat Dec 6 08:21:32 CET 2003 i686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (ignored: LC_ALL set to fr_FR.UTF-8)
diff -Nru netcfg.ori/debian/netcfg-common.templates netcfg/debian/netcfg-common.templates
--- netcfg.ori/debian/netcfg-common.templates 2003-12-12 08:02:08.000000000 +0100
+++ netcfg/debian/netcfg-common.templates 2003-12-12 08:09:00.000000000 +0100
@@ -1,10 +1,10 @@
Template: netcfg/get_method
Type: select
-Default: configure network with DHCP
-_Choices: configure network with DHCP, manual network configuration
-_Description: Network configuration method
- Networking can either be configure by DHCP or by manually
- entering all the information. If you choose DHCP and
+Default: Dynamic addressing (DHCP)
+_Choices: Dynamic addressing (DHCP), Static addressing (manual)
+_Description: Network configuration method:
+ Networking can either be configure by DHCP or by manually
+ entering all the information. If you choose DHCP and
debian-installer is unable to get a working configuration
from a DHCP Server on you network you will be offered to configure
your network manually after the atempt to configure it by DHCP. If
@@ -30,7 +30,7 @@
Type: select
Choices: ${ifchoices}
_Description: Interface:
- Please choose the interface you want to configure. All currently
+ 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).
@@ -70,7 +70,7 @@
Type: error
_Description: No network interfaces detected
No network interfaces were found. The installation
- system was unable to find a network device.
+ 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.
diff -Nru netcfg.ori/debian/netcfg-dhcp.templates netcfg/debian/netcfg-dhcp.templates
--- netcfg.ori/debian/netcfg-dhcp.templates 2003-12-12 08:02:08.000000000 +0100
+++ netcfg/debian/netcfg-dhcp.templates 2003-12-12 08:11:16.000000000 +0100
@@ -2,7 +2,7 @@
Type: string
_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.
+ a cable modem, you might need to specify an account number here.
.
Most other users can just leave this blank.
@@ -37,13 +37,13 @@
Type: boolean
Default: false
_Description: Do you want to retry DHCP network configuration?
- No IP address was offered during DHCP network configuration. Sometimes
- DHCP servers are really slow. In this case you can retry.
+ No IP address was offered during DHCP network configuration. DHCP servers
+ are sometimes really slow. In this case you can retry.
Template: netcfg/dhcp-title
Type: text
# Title displayed when configuring this package
-_Description: DHCP Network Configuration
+_Description: Dynamic network configuration (DHCP)
Template: debian-installer/netcfg-dhcp/title
Type: text
diff -Nru netcfg.ori/debian/netcfg-static.templates netcfg/debian/netcfg-static.templates
--- netcfg.ori/debian/netcfg-static.templates 2003-12-12 08:02:08.000000000 +0100
+++ netcfg/debian/netcfg-static.templates 2003-12-12 08:09:41.000000000 +0100
@@ -59,7 +59,7 @@
Template: netcfg/static-title
Type: text
# Title displayed when configuring this package
-_Description: Static Network Configuration
+_Description: Static network configuration
Template: debian-installer/netcfg-static/title
Type: text
Reply to: