Bug#219469: ddetect: Debconf templates polishing
Package: ddetect
Severity: normal
Tags: patch
As usual, the following changes will make debconf templates more consistent
with other modules templates.
Detailed rationale:
diff -Nru ddetect/debian/ethdetect.templates ddetect.new/debian/ethdetect.templates
--- ddetect/debian/ethdetect.templates 2003-11-06 17:10:22.000000000 +0100
+++ ddetect.new/debian/ethdetect.templates 2003-11-06 07:10:07.000000000 +0100
@@ -2,34 +2,33 @@
Type: select
_Choices: ${CHOICES}, none of the above
Default: none of the above
-_Description: What module does your ethernet card require?
- This is a list of modules that I know about. Choose the module from the
- list that supports your card. If none of the modules do, you may need to
- load additional modules from a driver floppy; choose none of the above.
+_Description: Module needed by your ethernet card:
+ Please choose amon the known modules which one supports your card. If
+ none of the modules do, you may need to load additional modules from
+ a driver floppy. Then choose the "none of the above" option.
1) This is a string template, so avoid using a question and use a "prompt"
2) The first person use is to be avoided. So, reformulation of the extended
description.
Template: ethdetect/cannot_find
Type: error
-_Description: Cannot detect your ethernet card.
- Your ethernet card was not found.
+_Description: Ethernet card not found
+ No Ethernet card was found on the system.
1) Short description is a title
2) Nothing says that there actually *is* an Ethernet card...so avoid "your".
s/ethernet/Ethernet, by the way
Template: ethdetect/modprobe_error
Type: note
-_Description: An error occured while running '${CMD_LINE_PARAM}'
- Something must have gone wrong.
+_Description: Error while running '${CMD_LINE_PARAM}'
Well, there has been an error, so probably, yes, something went wrong..:-)
Apart from being useles, the sentence is a bit trivial, which does not sound
very professionnal to me.
Template: ethdetect/module_params
Type: string
-_Description: Please enter any additional parameters for module ${MODULE}
+_Description: Additional parameters for module ${MODULE}:
Some modules accept load-time parameters to customize their operation.
These parameters are often I/O port and IRQ numbers that vary from machine
- to machine and cannot be determined from the hardware. An example string
- looks something like "IRQ=7 IO=0x220"
+ to machine and cannot be determined from the hardware. A typical parameter
+ string is "IRQ=7 IO=0x220".
1) String template, so prompt....and possibly *short* prompt...
2) I feel this better English, but maybe someone will find something even
better
Template: ethdetect/detection_type
Type: boolean
Default: true
-_Description: Would you like me to try to detect hardware?
- I can automatically detect some hardware. If you don't use
+_Description: Try to detect hardware?
+ Some hardware may be automatically detected. If you don't use
automatic detection, you will be prompted to identify your hardware.
1) Who is "me"? The computer is not a person...So let's be more factual
2) Ditto.
Template: debian-installer/ethdetect/title
diff -Nru ddetect/debian/hw-detect.templates ddetect.new/debian/hw-detect.templates
--- ddetect/debian/hw-detect.templates 2003-11-06 17:10:22.000000000 +0100
+++ ddetect.new/debian/hw-detect.templates 2003-11-06 17:29:51.000000000 +0100
@@ -1,6 +1,6 @@
Template: hw-detect/title
Type: text
-_Description: Detecting HW and loading kernel modules
+_Description: Detecting hardware and loading kernel modules
1) Avoid jargon and obscure acronyms
Template: hw-detect/missing_modules
Type: error
@@ -18,7 +18,7 @@
Template: hw-detect/detect_progress_step
Type: text
-_Description: Detecting hardware, please wait
+_Description: Detecting hardware, please wait...
Progress step
Template: hw-detect/load_progress_title
Type: text
@@ -26,7 +26,7 @@
Template: hw-detect/load_progress_step
Type: text
-_Description: Loading module '${MODULE}' for '${CARDNAME}'
+_Description: Loading module '${MODULE}' for '${CARDNAME}'...
Ditto
Template: hw-detect/load_progress_skip_step
Type: text
@@ -34,7 +34,7 @@
Template: hw-detect/module_params
Type: string
-_Description: Please enter any additional parameters for module ${MODULE}
+_Description: Additional parameters for module ${MODULE}:
Some modules accept load-time parameters to customize their operation.
These parameters are often I/O port and IRQ numbers that vary from machine
to machine and cannot be determined from the hardware. An example string
@@ -44,5 +44,5 @@
1) String prompt-->shorten
Template: hw-detect/modprobe_error
Type: error
-_Description: An error occured while running '${CMD_LINE_PARAM}'
- Something must have gone wrong.
+_Description: Error while running '${CMD_LINE_PARAM}'
+
Same as above....
-- 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)
diff -Nru ddetect/debian/ethdetect.templates ddetect.new/debian/ethdetect.templates
--- ddetect/debian/ethdetect.templates 2003-11-06 17:10:22.000000000 +0100
+++ ddetect.new/debian/ethdetect.templates 2003-11-06 07:10:07.000000000 +0100
@@ -2,34 +2,33 @@
Type: select
_Choices: ${CHOICES}, none of the above
Default: none of the above
-_Description: What module does your ethernet card require?
- This is a list of modules that I know about. Choose the module from the
- list that supports your card. If none of the modules do, you may need to
- load additional modules from a driver floppy; choose none of the above.
+_Description: Module needed by your ethernet card:
+ Please choose amon the known modules which one supports your card. If
+ none of the modules do, you may need to load additional modules from
+ a driver floppy. Then choose the "none of the above" option.
Template: ethdetect/cannot_find
Type: error
-_Description: Cannot detect your ethernet card.
- Your ethernet card was not found.
+_Description: Ethernet card not found
+ No Ethernet card was found on the system.
Template: ethdetect/modprobe_error
Type: note
-_Description: An error occured while running '${CMD_LINE_PARAM}'
- Something must have gone wrong.
+_Description: Error while running '${CMD_LINE_PARAM}'
Template: ethdetect/module_params
Type: string
-_Description: Please enter any additional parameters for module ${MODULE}
+_Description: Additional parameters for module ${MODULE}:
Some modules accept load-time parameters to customize their operation.
These parameters are often I/O port and IRQ numbers that vary from machine
- to machine and cannot be determined from the hardware. An example string
- looks something like "IRQ=7 IO=0x220"
+ to machine and cannot be determined from the hardware. A typical parameter
+ string is "IRQ=7 IO=0x220".
Template: ethdetect/detection_type
Type: boolean
Default: true
-_Description: Would you like me to try to detect hardware?
- I can automatically detect some hardware. If you don't use
+_Description: Try to detect hardware?
+ Some hardware may be automatically detected. If you don't use
automatic detection, you will be prompted to identify your hardware.
Template: debian-installer/ethdetect/title
diff -Nru ddetect/debian/hw-detect.templates ddetect.new/debian/hw-detect.templates
--- ddetect/debian/hw-detect.templates 2003-11-06 17:10:22.000000000 +0100
+++ ddetect.new/debian/hw-detect.templates 2003-11-06 17:29:51.000000000 +0100
@@ -1,6 +1,6 @@
Template: hw-detect/title
Type: text
-_Description: Detecting HW and loading kernel modules
+_Description: Detecting hardware and loading kernel modules
Template: hw-detect/missing_modules
Type: error
@@ -18,7 +18,7 @@
Template: hw-detect/detect_progress_step
Type: text
-_Description: Detecting hardware, please wait
+_Description: Detecting hardware, please wait...
Template: hw-detect/load_progress_title
Type: text
@@ -26,7 +26,7 @@
Template: hw-detect/load_progress_step
Type: text
-_Description: Loading module '${MODULE}' for '${CARDNAME}'
+_Description: Loading module '${MODULE}' for '${CARDNAME}'...
Template: hw-detect/load_progress_skip_step
Type: text
@@ -34,7 +34,7 @@
Template: hw-detect/module_params
Type: string
-_Description: Please enter any additional parameters for module ${MODULE}
+_Description: Additional parameters for module ${MODULE}:
Some modules accept load-time parameters to customize their operation.
These parameters are often I/O port and IRQ numbers that vary from machine
to machine and cannot be determined from the hardware. An example string
@@ -44,5 +44,5 @@
Template: hw-detect/modprobe_error
Type: error
-_Description: An error occured while running '${CMD_LINE_PARAM}'
- Something must have gone wrong.
+_Description: Error while running '${CMD_LINE_PARAM}'
+
Reply to: