Package: netcfg Severity: normal Tags: patch I propose the attached changes to debconf tempaltes for netcfg. Basically, this means changing the "Dynamic addressing" choice by "Automatic network configuration" choice, which is probably easier to understand (and closer to reality).
The wording for "static addressing" also changes to "Manual configuration". The proposed changes impacts the netcfg/get_method choices, so changes to scripts handling the user choices are probably needed. -- System Information: Debian Release: testing/unstable Architecture: i386 Kernel: Linux mykerinos 2.6.0-test11 #1 Fri Dec 12 10:25:56 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-16 09:45:29.000000000 +0100 +++ netcfg/debian/netcfg-common.templates 2003-12-16 09:48:32.000000000 +0100 @@ -1,14 +1,14 @@ Template: netcfg/get_method Type: select -Default: configure network with DHCP -_Choices: configure network with DHCP, manual network configuration +Default: Automatic configuration (DHCP) +_Choices: Automatic configuration (DHCP), Manual configuration _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 - unsure choose DHCP. + your network manually after the attempt to configure it by DHCP. If + unsure, choose DHCP. Template: netcfg/get_domain Type: string diff -Nru netcfg.ori/debian/netcfg-dhcp.templates netcfg/debian/netcfg-dhcp.templates --- netcfg.ori/debian/netcfg-dhcp.templates 2003-12-16 09:45:29.000000000 +0100 +++ netcfg/debian/netcfg-dhcp.templates 2003-12-16 09:47:04.000000000 +0100 @@ -43,9 +43,9 @@ Template: netcfg/dhcp-title Type: text # Title displayed when configuring this package -_Description: DHCP Network Configuration +_Description: Automatic network configuration (DHCP) Template: debian-installer/netcfg-dhcp/title Type: text # Item in the main menu to select this package -_Description: Configure the network using dynamic addressing (DHCP) +_Description: Automatically configure the network (DHCP) diff -Nru netcfg.ori/debian/netcfg-static.templates netcfg/debian/netcfg-static.templates --- netcfg.ori/debian/netcfg-static.templates 2003-12-16 09:45:29.000000000 +0100 +++ netcfg/debian/netcfg-static.templates 2003-12-16 09:46:27.000000000 +0100 @@ -59,9 +59,9 @@ Template: netcfg/static-title Type: text # Title displayed when configuring this package -_Description: Static Network Configuration +_Description: Manual network configuration Template: debian-installer/netcfg-static/title Type: text # Item in the main menu to select this package -_Description: Configure a network using static addressing +_Description: Manually configure the network
