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

Bug#219632: partconf: Debconf templates polishing



Package: partconf
Severity: normal
Tags: patch d-i

This is the now usual debconf templates "polishing" operation for more
confirmance with th enew cdebconf templates and more consistency among d-i
templates.

Detailed rationale:

@@ -1,11 +1,11 @@
 Template: partconf/no-partitions
-Type: note
+Type: error
 _Description: No partitions found
  No partitions were found in your system. You may need to partition your
  hard drives or load additional kernel modules.

A few incorrect "note" tempaltes for errors are converted to error templates.

 Type: select
 _Choices: ${FSCHOICES}, Create swap space
 Default: Create ext2 file system
-_Description: What do you want to do with ${PARTITION}?
+_Description: Action on ${PARTITION}:
  This partition does not seem to have a file system. You can create a file
  system or swap space on it.

The short description is now shown before the choices...so adapt it to this.


 Template: partconf/mountpoint
 Type: select
 _Choices: /, /usr, /boot, /home, /var, /tmp, Don't mount it, Enter manually
-_Description: Where do you want to mount ${PARTITION}?
+_Description: Mount point for ${PARTITION}:
  When a partition is mounted, it is available to the users of the system.
  You always need a root ("/") partition, and it's often good to have a
  separate partition for /home.

Ditto.

 Template: partconf/mountpoint-manual
 Type: string
-_Description: Where do you want to mount ${PARTITION}?
+_Description: Mount point for ${PARTITION}:
  Please enter where the partition should be mounted.

Ditto.

 Template: partconf/umount-failed
 Type: error
 _Description: Failed to unmount partitions
- An error occurred while unmounting the partitions. Cannot continue.
+ An error occurred while unmounting the partitions. The partition
+ configuration process is aborted.

A bit more explicit.

 Template: partconf/internal-create-fs-choice
 Type: text
@@ -77,12 +78,12 @@
 
 Template: partconf/sanity-bad-mount
 Type: error
-_Description: You have assigned a partition to ${MOUNT}
- It makes no sense to mount a partition on ${MOUNT}. Please change this.
+_Description: Partition assigned to ${MOUNT}
+ Mounting a partition on ${MOUNT} makes no sense. Please change this.

Ditto.
Reformulation....but maybe wrong English.....

 Template: partconf/sanity-double-mount
 Type: error
-_Description: You have assigned several partitions to ${MOUNT}
+_Description: Several partitions assigned to ${MOUNT}
  You cannot assign several partitions to the same mount point. Please
  change all but one of them.

Ditto.

@@ -90,34 +91,44 @@
 Type: boolean
 Default: false
 _Description: Ready to create file systems and mount partitions?
+ File systems will be created and partitions mounted.
+ .
  WARNING: This will destroy all data on the partitions you have assigned
- file systems to!
+ file systems to.

1) Avoid showing "WARNING...." first in the template
2) Well, as you may know, I'm not in favour of yelling even for warning users.


 Template: partconf/failed-mkswap
 Type: error
 _Description: Failed to create swap space on ${PARTITION}
- An error occurred when the swap space was created on ${PARTITION}. Please
- see tty3 or /var/log/messages for more information.
+ An error occurred when the swap space was created on ${PARTITION}. 
+ .
+ Please check the error log on the third console or /var/log/messages
+ for more information.

Separated the "Please..." from the rest of the paragraph. Thus, this will
have to be translated only once..:-)

I have used the same formulation than other packages.....I think "tty3" is
mostly jargon...

.../...
 
 Template: debian-installer/partconf/title
 Type: text
 #  Main menu item
-_Description: Configure and Mount Partitions
+_Description: Configure and mount partitions

No caps.

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

--- partconf.templates.ori	2003-11-07 18:49:04.000000000 +0100
+++ partconf.templates	2003-11-07 20:01:01.000000000 +0100
@@ -1,11 +1,11 @@
 Template: partconf/no-partitions
-Type: note
+Type: error
 _Description: No partitions found
  No partitions were found in your system. You may need to partition your
  hard drives or load additional kernel modules.
 
 Template: partconf/no-filesystems
-Type: note
+Type: error
 _Description: No file systems found
  No usable file systems were found. You may need to load additional kernel
  modules.
@@ -34,21 +34,21 @@
 Type: select
 _Choices: ${FSCHOICES}, Create swap space
 Default: Create ext2 file system
-_Description: What do you want to do with ${PARTITION}?
+_Description: Action on ${PARTITION}:
  This partition does not seem to have a file system. You can create a file
  system or swap space on it.
 
 Template: partconf/mountpoint
 Type: select
 _Choices: /, /usr, /boot, /home, /var, /tmp, Don't mount it, Enter manually
-_Description: Where do you want to mount ${PARTITION}?
+_Description: Mount point for ${PARTITION}:
  When a partition is mounted, it is available to the users of the system.
  You always need a root ("/") partition, and it's often good to have a
  separate partition for /home.
 
 Template: partconf/mountpoint-manual
 Type: string
-_Description: Where do you want to mount ${PARTITION}?
+_Description: Mount point for ${PARTITION}:
  Please enter where the partition should be mounted.
 
 Template: partconf/already-mounted
@@ -63,7 +63,8 @@
 Template: partconf/umount-failed
 Type: error
 _Description: Failed to unmount partitions
- An error occurred while unmounting the partitions. Cannot continue.
+ An error occurred while unmounting the partitions. The partition
+ configuration process is aborted.
 
 Template: partconf/internal-create-fs-choice
 Type: text
@@ -77,12 +78,12 @@
 
 Template: partconf/sanity-bad-mount
 Type: error
-_Description: You have assigned a partition to ${MOUNT}
- It makes no sense to mount a partition on ${MOUNT}. Please change this.
+_Description: Partition assigned to ${MOUNT}
+ Mounting a partition on ${MOUNT} makes no sense. Please change this.
 
 Template: partconf/sanity-double-mount
 Type: error
-_Description: You have assigned several partitions to ${MOUNT}
+_Description: Several partitions assigned to ${MOUNT}
  You cannot assign several partitions to the same mount point. Please
  change all but one of them.
 
@@ -90,34 +91,44 @@
 Type: boolean
 Default: false
 _Description: Ready to create file systems and mount partitions?
+ File systems will be created and partitions mounted.
+ .
  WARNING: This will destroy all data on the partitions you have assigned
- file systems to!
+ file systems to.
 
 Template: partconf/failed-mkswap
 Type: error
 _Description: Failed to create swap space on ${PARTITION}
- An error occurred when the swap space was created on ${PARTITION}. Please
- see tty3 or /var/log/messages for more information.
+ An error occurred when the swap space was created on ${PARTITION}. 
+ .
+ Please check the error log on the third console or /var/log/messages
+ for more information.
 
 Template: partconf/failed-swapon
 Type: error
 _Description: Failed to activate the swap space on ${PARTITION}
  An error occurred when the swap space on ${PARTITION} was activated.
- Please see tty3 or /var/log/messages for more information.
+ .
+ Please check the error log on the third console or /var/log/messages
+ for more information.
 
 Template: partconf/failed-mkfs
 Type: error
 _Description: Failed to create ${FS} file system on ${PARTITION}
  An error occurred when the ${FS} file system was created on ${PARTITION}.
- Please see tty3 or /var/log/messages for more information.
+ .
+ Please check the error log on the third console or /var/log/messages
+ for more information.
 
 Template: partconf/failed-mount
 Type: error
 _Description: Failed to mount ${PARTITION} on ${MOUNT}
- An error occurred when ${PARTITION} was mounted on ${MOUNT}. Please see
- tty3 or /var/log/messages for more information.
+ An error occurred when ${PARTITION} was mounted on ${MOUNT}. 
+ .
+ Please check the error log on the third console or /var/log/messages
+ for more information.
 
 Template: debian-installer/partconf/title
 Type: text
 #  Main menu item
-_Description: Configure and Mount Partitions
+_Description: Configure and mount partitions

Reply to: