* Reworked the documentation with respect to the use of "MD" and "RAID", and

    added a FAQ entry on the meaning of "MD". Thanks to Frans Pop for his
    help!

16 files changed, 423 insertions, 149 deletions

diff --git a/debian/FAQ b/debian/FAQ
index 0d93651b..0f2feec1 100644
--- a/debian/FAQ
+++ b/debian/FAQ
@@ -3,6 +3,18 @@ Frequently asked questions -- Debian mdadm
 
 Also see /usr/share/doc/mdadm/README.recipes.gz
 
+0. What does MD stand for?
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+MD is an abbreviation for "multi device". The Linux MD implementation
+implements various strategies for combining multiple physical devices into
+single logical ones. The most common use case is commonly known as "Software
+RAID". Linux supports RAID levels 1, 5, 6, and 10, as well as the
+"pseudo-redundant" RAID level 0. In addition, the MD implementation covers
+linear and multipath configurations.
+
+Most people refer to MD as RAID. Since the original name of the RAID
+configuration software is "md"adm, I chose to use MD consistently instead.
+
 1. How do I overwrite ("zero") the superblock?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   mdadm --zero-superblock /dev/mdX
@@ -26,7 +38,7 @@ Also see /usr/share/doc/mdadm/README.recipes.gz
     this may not be what you want. Instead, zeroing the superblock will
     (permanently) prevent a device from being considered as part of an array.
 
-2. How do I change the preferred minor of a MD array (RAID)?
+2. How do I change the preferred minor of an MD array (RAID)?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   See item 12 in /usr/share/doc/mdadm/README.recipes.gz and read the mdadm
   manpage (search for 'preferred').
diff --git a/debian/README.recipes b/debian/README.recipes
index 2994c34c..a6dd7ab6 100644
--- a/debian/README.recipes
+++ b/debian/README.recipes
@@ -125,7 +125,7 @@ Enjoy. Submissions welcome.
     mount /dev/md0 /home    # also change /etc/fstab
     mdadm --add /dev/md0 /dev/sda1
 
-12. change the preferred minor of a MD array (RAID)
+12. change the preferred minor of an MD array (RAID)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # you need to manually assemble the array to change the preferred minor
     # if you manually assemble, the superblock will be updated to reflect
diff --git a/debian/bugscript b/debian/bugscript
index 1ba81dba..cd81794b 100644
--- a/debian/bugscript
+++ b/debian/bugscript
@@ -13,7 +13,7 @@
 set -eu
 
 if [ ! -r /proc/mdstat ]; then
-  echo "The local system does not have MD (RAID) support (no drivers loaded)."
+  echo "The local system does not have MD (RAID) support: no drivers loaded."
   echo "Without MD support, I cannot collect as much information as I'd like."
 
   #yesno "Are you sure you want to report a bug at this time? " yep
diff --git a/debian/changelog b/debian/changelog
index ea5522bf..52e8d903 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-mdadm (2.5.3.git200608202239-3) UNRELEASED; urgency=high
+mdadm (2.5.3.git200608202239-3) unstable; urgency=medium
 
-  * Urgency high because an RC bug is being fixed:
+  * Urgency medium because an RC bug is being fixed:
     Add versioned dependency to debconf. #385994
     TODO still!
   * Do not override the superblock default version in mdadm.conf to prevent
@@ -12,6 +12,9 @@ mdadm (2.5.3.git200608202239-3) UNRELEASED; urgency=high
     bug/reportbug include information on how the system is booted with respect
     to RAID (the root partition).
   * Added LSB headers to init scripts.
+  * Reworked the documentation with respect to the use of "MD" and "RAID", and
+    added a FAQ entry on the meaning of "MD". Thanks to Frans Pop for his
+    help!
   * Updated debconf translations:
     - Czech by Miroslav Kure (closes: #384754).
     - French by Florentin Duneau (closes: #385690).
diff --git a/debian/checkarray b/debian/checkarray
index 881db287..d57f5fb5 100644
--- a/debian/checkarray
+++ b/debian/checkarray
@@ -99,7 +99,7 @@ if [ $cron = 1 ] && ! is_true ${AUTOCHECK:-false}; then
 fi
 
 if [ ! -f /proc/mdstat ]; then
-  [ $quiet -lt 2 ] && echo "$PROGNAME: E: MD (RAID) subsystem not loaded, or /proc unavailable." >&2
+  [ $quiet -lt 2 ] && echo "$PROGNAME: E: MD subsystem not loaded, or /proc unavailable." >&2
   exit 2
 fi
 
@@ -109,7 +109,7 @@ if [ ! -d /sys/block ]; then
 fi
 
 if [ -z "$(ls /sys/block/md* 2>/dev/null)" ]; then
-  [ $quiet -lt 2 ] && echo "$PROGNAME: W: no active MD arrays (RAIDs) found." >&2
+  [ $quiet -lt 2 ] && echo "$PROGNAME: W: no active MD arrays found." >&2
   [ $quiet -lt 2 ] && echo "$PROGNAME: W: (maybe uninstall the mdadm package?)" >&2
   exit 5
 fi
diff --git a/debian/mdadm.templates b/debian/mdadm.templates
index 00193227..d5afc473 100644
--- a/debian/mdadm.templates
+++ b/debian/mdadm.templates
@@ -1,7 +1,7 @@
 Template: mdadm/initrdstart
 Type: string
 Default: all
-_Description: MD arrays (RAIDs) needed for the root filesystem:
+_Description: MD arrays needed for the root filesystem:
  ${msg}
  .
  Please enter a space-separated list of devices, 'all', or 'none'. You may
@@ -9,8 +9,8 @@ _Description: MD arrays (RAIDs) needed for the root filesystem:
 
 Template: mdadm/initrdstart_msg_intro
 Type: text
-_Description: 
- If your system has its root filesystem on a MD array (RAID), it needs to be
+_Description: for internal use - only the long description is needed.
+ If your system has its root filesystem on an MD array (RAID), it needs to be
  started early during the boot sequence. If your root filesystem is on
  a logical volume (LVM), which is on MD, all constituent arrays need to be
  started.
@@ -37,7 +37,7 @@ _Description:
 Template: mdadm/initrdstart_msg_errmd
 Type: text
 _Description:
- An error occurred: not a MD array (RAID)
+ An error occurred: not an MD array
 
 Template: mdadm/initrdstart_msg_errconf
 Type: text
@@ -64,18 +64,17 @@ _Description: Proceed with starting arrays not listed in mdadm.conf?
 Template: mdadm/autostart
 Type: boolean
 Default: true
-_Description: Do you want to start MD arrays (RAIDs) automatically?
+_Description: Do you want to start MD arrays automatically?
  Once the base system has come up, mdadm can start all MD arrays (RAIDs)
  specified in /etc/mdadm/mdadm.conf, which have not yet been started. Unless
- you have compiled MD support into the kernel (in which case all MD arrays
- with partitions of type 0xfd (and only those) are started automatically
- anyway),
- this is probably what you want.
+ you have compiled multi-device (MD) support into the kernel and marked all
+ partitions part of MD arrays with type 0xfd (as those and only those will be
+ started automatically by the kernel), this is probably what you want.
 
 Template: mdadm/autocheck
 Type: boolean
 Default: true
-_Description: Should mdadm run monthly redundancy checks of the MD arrays (RAIDs)?
+_Description: Should mdadm run monthly redundancy checks of the MD arrays?
  If your kernel supports it (>> 2.6.14), mdadm can periodically check the
  redundancy of your MD arrays (RAIDs). This may be a resource-intensive process,
  depending on your setup, but it could help prevent rare cases of data loss.
@@ -89,7 +88,7 @@ _Description: Should mdadm run monthly redundancy checks of the MD arrays (RAIDs
 Template: mdadm/start_daemon
 Type: boolean
 Default: true
-_Description: Do you want to start the MD (RAID) monitoring daemon?
+_Description: Do you want to start the MD monitoring daemon?
  The MD (RAID) monitor daemon sends email notifications in response to
  important MD events (such as a disk failure). You probably want to enable it.
 
@@ -98,4 +97,4 @@ Type: string
 Default: root
 _Description: Recipient for email notifications:
  Please enter the email address of the user who should get the email
- notification for important MD (RAID) events.
+ notification for important MD events.
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 0e29cf0f..618128da 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdadm\n"
 "Report-Msgid-Bugs-To: pkg-mdadm-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-11 18:15+0200\n"
+"POT-Creation-Date: 2006-09-13 10:30+0200\n"
 "PO-Revision-Date: 2006-08-26 13:58+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:1001
 #, fuzzy
-msgid "MD arrays (RAIDs) needed for the root filesystem:"
+msgid "MD arrays needed for the root filesystem:"
 msgstr "MD pole vyžadovaná pro kořenový souborový systém:"
 
 #. Type: string
@@ -50,9 +50,15 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:2001
+msgid "for internal use - only the long description is needed."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../mdadm.templates:2001
 #, fuzzy
 msgid ""
-"If your system has its root filesystem on a MD array (RAID), it needs to be "
+"If your system has its root filesystem on an MD array (RAID), it needs to be "
 "started early during the boot sequence. If your root filesystem is on a "
 "logical volume (LVM), which is on MD, all constituent arrays need to be "
 "started."
@@ -65,12 +71,12 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:2001
+#, fuzzy
 msgid ""
 "If you know exactly which arrays are needed to bring up the root filesystem, "
 "and you want to postpone starting all other arrays to a later point in the "
 "boot sequence, enter the arrays to start here. Alternatively, enter 'all' to "
-"simply start all available arrays. If you do not need or want to start any "
-"arrays for the root filesystem, leave the answer blank (or enter 'none')."
+"simply start all available arrays."
 msgstr ""
 "Jestliže přesně víte, která pole jsou potřeba pro připojení kořenového "
 "souborového systému a zároveň chcete pozdržet spuštění ostatních polí na "
@@ -81,6 +87,15 @@ msgstr ""
 
 #. Type: text
 #. Description
+#: ../mdadm.templates:2001
+msgid ""
+"If you do not need or want to start any arrays for the root filesystem, "
+"leave the answer blank (or enter 'none'). This may be the case if you are "
+"using kernel autostart or do not need any arrays to boot."
+msgstr ""
+
+#. Type: text
+#. Description
 #: ../mdadm.templates:3001
 msgid "An error occurred: device node does not exist"
 msgstr "Vyskytla se chyba: uzel zařízení neexistuje"
@@ -95,7 +110,7 @@ msgstr "Vyskytla se chyba: není blokovým zařízením"
 #. Description
 #: ../mdadm.templates:5001
 #, fuzzy
-msgid "An error occurred: not a MD array (RAID)"
+msgid "An error occurred: not an MD array"
 msgstr "Vyskytla se chyba: není MD polem"
 
 #. Type: text
@@ -134,9 +149,20 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+#: ../mdadm.templates:7001
+msgid ""
+"This warning is only relevant if you need arrays to be started from the "
+"initial ramdisk to be able to boot. If you use kernel autostarting, or do "
+"not need any arrays to be started as early as the initial ramdisk is loaded, "
+"you can simply continue. Alternatively, choose not to continue and enter "
+"'none' when prompted which arrays to start from the initial ramdisk."
+msgstr ""
+
+#. Type: boolean
+#. Description
 #: ../mdadm.templates:8001
 #, fuzzy
-msgid "Do you want to start MD arrays (RAIDs) automatically?"
+msgid "Do you want to start MD arrays automatically?"
 msgstr "Chcete spouštět MD zařízení automaticky?"
 
 #. Type: boolean
@@ -146,9 +172,9 @@ msgstr "Chcete spouštět MD zařízení automaticky?"
 msgid ""
 "Once the base system has come up, mdadm can start all MD arrays (RAIDs) "
 "specified in /etc/mdadm/mdadm.conf, which have not yet been started. Unless "
-"you have compiled MD support into the kernel (in which case all MD arrays "
-"with partitions of type 0xfd (and only those) are started automatically "
-"anyway), this is probably what you want."
+"you have compiled multi-device (MD) support into the kernel and marked all "
+"partitions part of MD arrays with type 0xfd (as those and only those will be "
+"started automatically by the kernel), this is probably what you want."
 msgstr ""
 "Po zavedení základního systému může mdadm spustit všechna dosud nespuštěná "
 "MD zařízení uvedená v souboru /etc/mdadm/mdadm.conf. Pokud nemáte "
@@ -160,7 +186,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:9001
 #, fuzzy
-msgid "Should mdadm run monthly redundancy checks of the MD arrays (RAIDs)?"
+msgid "Should mdadm run monthly redundancy checks of the MD arrays?"
 msgstr "Má mdadm spouštět měsíční kontroly MD polí?"
 
 #. Type: boolean
@@ -196,7 +222,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:10001
 #, fuzzy
-msgid "Do you want to start the MD (RAID) monitoring daemon?"
+msgid "Do you want to start the MD monitoring daemon?"
 msgstr "Chcete spustit daemon pro monitorování MD?"
 
 #. Type: boolean
@@ -222,7 +248,7 @@ msgstr "Příjemce emailových upozornění:"
 #, fuzzy
 msgid ""
 "Please enter the email address of the user who should get the email "
-"notification for important MD (RAID) events."
+"notification for important MD events."
 msgstr ""
 "Zadejte emailovou adresu uživatele, který má dostávat emailová upozornění "
 "při výskytu významných MD událostí."
diff --git a/debian/po/de.po b/debian/po/de.po
index e4b5b399..eee10b4d 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdadm\n"
 "Report-Msgid-Bugs-To: pkg-mdadm-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-11 18:15+0200\n"
+"POT-Creation-Date: 2006-09-13 10:30+0200\n"
 "PO-Revision-Date: 2006-07-10 21:12+0200\n"
 "Last-Translator: Mario Joussen <joussen@debian.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:1001
 #, fuzzy
-msgid "MD arrays (RAIDs) needed for the root filesystem:"
+msgid "MD arrays needed for the root filesystem:"
 msgstr "F�r das Wurzeldateisystem ben�tigte RAID Verb�nde:"
 
 #. Type: string
@@ -50,9 +50,15 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:2001
+msgid "for internal use - only the long description is needed."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../mdadm.templates:2001
 #, fuzzy
 msgid ""
-"If your system has its root filesystem on a MD array (RAID), it needs to be "
+"If your system has its root filesystem on an MD array (RAID), it needs to be "
 "started early during the boot sequence. If your root filesystem is on a "
 "logical volume (LVM), which is on MD, all constituent arrays need to be "
 "started."
@@ -71,8 +77,7 @@ msgid ""
 "If you know exactly which arrays are needed to bring up the root filesystem, "
 "and you want to postpone starting all other arrays to a later point in the "
 "boot sequence, enter the arrays to start here. Alternatively, enter 'all' to "
-"simply start all available arrays. If you do not need or want to start any "
-"arrays for the root filesystem, leave the answer blank (or enter 'none')."
+"simply start all available arrays."
 msgstr ""
 "Wenn Sie genau wissen welche Verb�nde ben�tigt werden, um das "
 "Wurzeldateisystem zu starten, geben Sie diese hier ein. Alternativ geben Sie "
@@ -82,6 +87,15 @@ msgstr ""
 
 #. Type: text
 #. Description
+#: ../mdadm.templates:2001
+msgid ""
+"If you do not need or want to start any arrays for the root filesystem, "
+"leave the answer blank (or enter 'none'). This may be the case if you are "
+"using kernel autostart or do not need any arrays to boot."
+msgstr ""
+
+#. Type: text
+#. Description
 #: ../mdadm.templates:3001
 msgid "An error occurred: device node does not exist"
 msgstr ""
@@ -95,7 +109,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:5001
-msgid "An error occurred: not a MD array (RAID)"
+msgid "An error occurred: not an MD array"
 msgstr ""
 
 #. Type: text
@@ -129,9 +143,20 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+#: ../mdadm.templates:7001
+msgid ""
+"This warning is only relevant if you need arrays to be started from the "
+"initial ramdisk to be able to boot. If you use kernel autostarting, or do "
+"not need any arrays to be started as early as the initial ramdisk is loaded, "
+"you can simply continue. Alternatively, choose not to continue and enter "
+"'none' when prompted which arrays to start from the initial ramdisk."
+msgstr ""
+
+#. Type: boolean
+#. Description
 #: ../mdadm.templates:8001
 #, fuzzy
-msgid "Do you want to start MD arrays (RAIDs) automatically?"
+msgid "Do you want to start MD arrays automatically?"
 msgstr "M�chten Sie die RAID Laufwerke automatisch starten?"
 
 #. Type: boolean
@@ -141,9 +166,9 @@ msgstr "M�chten Sie die RAID Laufwerke automatisch starten?"
 msgid ""
 "Once the base system has come up, mdadm can start all MD arrays (RAIDs) "
 "specified in /etc/mdadm/mdadm.conf, which have not yet been started. Unless "
-"you have compiled MD support into the kernel (in which case all MD arrays "
-"with partitions of type 0xfd (and only those) are started automatically "
-"anyway), this is probably what you want."
+"you have compiled multi-device (MD) support into the kernel and marked all "
+"partitions part of MD arrays with type 0xfd (as those and only those will be "
+"started automatically by the kernel), this is probably what you want."
 msgstr ""
 "Sobald das Grundsystem hochgefahren ist, kann mdadm alle RAID Verb�nde "
 "starten, die es findet und die noch nicht gestartet sind. Falls Sie keine "
@@ -154,7 +179,7 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../mdadm.templates:9001
-msgid "Should mdadm run monthly redundancy checks of the MD arrays (RAIDs)?"
+msgid "Should mdadm run monthly redundancy checks of the MD arrays?"
 msgstr ""
 
 #. Type: boolean
@@ -181,7 +206,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:10001
 #, fuzzy
-msgid "Do you want to start the MD (RAID) monitoring daemon?"
+msgid "Do you want to start the MD monitoring daemon?"
 msgstr "M�chten Sie den RAID �berwachungsd�mon starten?"
 
 #. Type: boolean
@@ -208,7 +233,7 @@ msgstr "Empf�nger der Emailbenachrichtungen:"
 #, fuzzy
 msgid ""
 "Please enter the email address of the user who should get the email "
-"notification for important MD (RAID) events."
+"notification for important MD events."
 msgstr ""
 "Geben Sie bitte die Emailadresse des Benutzers an, der die "
 "Emailbenachrichtigung f�r diese wichtigen RAID Ereignisse erhalten soll."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 7b0ac1a5..66507cf0 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdadm\n"
 "Report-Msgid-Bugs-To: pkg-mdadm-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-11 18:15+0200\n"
+"POT-Creation-Date: 2006-09-13 10:30+0200\n"
 "PO-Revision-Date: 2006-08-29 17:47+0200\n"
 "Last-Translator: Florentin Duneau <f.baced@wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -30,7 +30,8 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../mdadm.templates:1001
-msgid "MD arrays (RAIDs) needed for the root filesystem:"
+#, fuzzy
+msgid "MD arrays needed for the root filesystem:"
 msgstr "Ensembles MD requis par le système de fichiers racine :"
 
 #. Type: string
@@ -53,8 +54,15 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:2001
+msgid "for internal use - only the long description is needed."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../mdadm.templates:2001
+#, fuzzy
 msgid ""
-"If your system has its root filesystem on a MD array (RAID), it needs to be "
+"If your system has its root filesystem on an MD array (RAID), it needs to be "
 "started early during the boot sequence. If your root filesystem is on a "
 "logical volume (LVM), which is on MD, all constituent arrays need to be "
 "started."
@@ -67,12 +75,12 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:2001
+#, fuzzy
 msgid ""
 "If you know exactly which arrays are needed to bring up the root filesystem, "
 "and you want to postpone starting all other arrays to a later point in the "
 "boot sequence, enter the arrays to start here. Alternatively, enter 'all' to "
-"simply start all available arrays. If you do not need or want to start any "
-"arrays for the root filesystem, leave the answer blank (or enter 'none')."
+"simply start all available arrays."
 msgstr ""
 "Si vous savez exactement quels sont les ensembles MD nécessaires au "
 "démarrage du système de fichiers racine et si vous souhaitez différer le "
@@ -83,6 +91,15 @@ msgstr ""
 
 #. Type: text
 #. Description
+#: ../mdadm.templates:2001
+msgid ""
+"If you do not need or want to start any arrays for the root filesystem, "
+"leave the answer blank (or enter 'none'). This may be the case if you are "
+"using kernel autostart or do not need any arrays to boot."
+msgstr ""
+
+#. Type: text
+#. Description
 #: ../mdadm.templates:3001
 msgid "An error occurred: device node does not exist"
 msgstr "Erreur : périphérique inconnu"
@@ -96,7 +113,8 @@ msgstr "Erreur : ce n'est pas périphérique en mode bloc"
 #. Type: text
 #. Description
 #: ../mdadm.templates:5001
-msgid "An error occurred: not a MD array (RAID)"
+#, fuzzy
+msgid "An error occurred: not an MD array"
 msgstr "Erreur : ce n'est pas un ensemble MD"
 
 #. Type: text
@@ -137,19 +155,32 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+#: ../mdadm.templates:7001
+msgid ""
+"This warning is only relevant if you need arrays to be started from the "
+"initial ramdisk to be able to boot. If you use kernel autostarting, or do "
+"not need any arrays to be started as early as the initial ramdisk is loaded, "
+"you can simply continue. Alternatively, choose not to continue and enter "
+"'none' when prompted which arrays to start from the initial ramdisk."
+msgstr ""
+
+#. Type: boolean
+#. Description
 #: ../mdadm.templates:8001
-msgid "Do you want to start MD arrays (RAIDs) automatically?"
+#, fuzzy
+msgid "Do you want to start MD arrays automatically?"
 msgstr "Faut-il démarrer automatiquement les périphériques MD ?"
 
 #. Type: boolean
 #. Description
 #: ../mdadm.templates:8001
+#, fuzzy
 msgid ""
 "Once the base system has come up, mdadm can start all MD arrays (RAIDs) "
 "specified in /etc/mdadm/mdadm.conf, which have not yet been started. Unless "
-"you have compiled MD support into the kernel (in which case all MD arrays "
-"with partitions of type 0xfd (and only those) are started automatically "
-"anyway), this is probably what you want."
+"you have compiled multi-device (MD) support into the kernel and marked all "
+"partitions part of MD arrays with type 0xfd (as those and only those will be "
+"started automatically by the kernel), this is probably what you want."
 msgstr ""
 "Lorsque le système de base a démarré, mdadm peut démarrer tous les "
 "périphériques MD spécifiés dans /etc/mdadm/mdadm.conf qui n'ont pas été "
@@ -160,7 +191,8 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../mdadm.templates:9001
-msgid "Should mdadm run monthly redundancy checks of the MD arrays (RAIDs)?"
+#, fuzzy
+msgid "Should mdadm run monthly redundancy checks of the MD arrays?"
 msgstr "Faut-il vérifier tous les mois la redondance des ensembles MD ?"
 
 #. Type: boolean
@@ -195,7 +227,8 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../mdadm.templates:10001
-msgid "Do you want to start the MD (RAID) monitoring daemon?"
+#, fuzzy
+msgid "Do you want to start the MD monitoring daemon?"
 msgstr "Faut-il démarrer le démon de surveillance MD ?"
 
 #. Type: boolean
@@ -218,9 +251,10 @@ msgstr "Destinataire des notifications par courriel :"
 #. Type: string
 #. Description
 #: ../mdadm.templates:11001
+#, fuzzy
 msgid ""
 "Please enter the email address of the user who should get the email "
-"notification for important MD (RAID) events."
+"notification for important MD events."
 msgstr ""
 "Veuillez indiquer l'adresse électronique qui doit recevoir les notifications "
 "lors d'importants événements MD."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 5fdc233f..087604ed 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdadm 2.5.2-2\n"
 "Report-Msgid-Bugs-To: pkg-mdadm-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-11 18:15+0200\n"
+"POT-Creation-Date: 2006-09-13 10:30+0200\n"
 "PO-Revision-Date: 2006-07-14 20:33+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -28,7 +28,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:1001
 #, fuzzy
-msgid "MD arrays (RAIDs) needed for the root filesystem:"
+msgid "MD arrays needed for the root filesystem:"
 msgstr "root ファイルシステムには RAID アレイが必要です:"
 
 #. Type: string
@@ -51,9 +51,15 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:2001
+msgid "for internal use - only the long description is needed."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../mdadm.templates:2001
 #, fuzzy
 msgid ""
-"If your system has its root filesystem on a MD array (RAID), it needs to be "
+"If your system has its root filesystem on an MD array (RAID), it needs to be "
 "started early during the boot sequence. If your root filesystem is on a "
 "logical volume (LVM), which is on MD, all constituent arrays need to be "
 "started."
@@ -71,8 +77,7 @@ msgid ""
 "If you know exactly which arrays are needed to bring up the root filesystem, "
 "and you want to postpone starting all other arrays to a later point in the "
 "boot sequence, enter the arrays to start here. Alternatively, enter 'all' to "
-"simply start all available arrays. If you do not need or want to start any "
-"arrays for the root filesystem, leave the answer blank (or enter 'none')."
+"simply start all available arrays."
 msgstr ""
 "どのアレイが root ファイルシステムを立ち上げるのに必要かを正確に知っているな"
 "ら、ここで入力してください。分からない場合は、'all' と入力して単に全ての利用"
@@ -82,6 +87,15 @@ msgstr ""
 
 #. Type: text
 #. Description
+#: ../mdadm.templates:2001
+msgid ""
+"If you do not need or want to start any arrays for the root filesystem, "
+"leave the answer blank (or enter 'none'). This may be the case if you are "
+"using kernel autostart or do not need any arrays to boot."
+msgstr ""
+
+#. Type: text
+#. Description
 #: ../mdadm.templates:3001
 msgid "An error occurred: device node does not exist"
 msgstr ""
@@ -95,7 +109,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:5001
-msgid "An error occurred: not a MD array (RAID)"
+msgid "An error occurred: not an MD array"
 msgstr ""
 
 #. Type: text
@@ -129,9 +143,20 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+#: ../mdadm.templates:7001
+msgid ""
+"This warning is only relevant if you need arrays to be started from the "
+"initial ramdisk to be able to boot. If you use kernel autostarting, or do "
+"not need any arrays to be started as early as the initial ramdisk is loaded, "
+"you can simply continue. Alternatively, choose not to continue and enter "
+"'none' when prompted which arrays to start from the initial ramdisk."
+msgstr ""
+
+#. Type: boolean
+#. Description
 #: ../mdadm.templates:8001
 #, fuzzy
-msgid "Do you want to start MD arrays (RAIDs) automatically?"
+msgid "Do you want to start MD arrays automatically?"
 msgstr "RAID デバイスを自動的に起動しますか?"
 
 #. Type: boolean
@@ -141,9 +166,9 @@ msgstr "RAID デバイスを自動的に起動しますか?"
 msgid ""
 "Once the base system has come up, mdadm can start all MD arrays (RAIDs) "
 "specified in /etc/mdadm/mdadm.conf, which have not yet been started. Unless "
-"you have compiled MD support into the kernel (in which case all MD arrays "
-"with partitions of type 0xfd (and only those) are started automatically "
-"anyway), this is probably what you want."
+"you have compiled multi-device (MD) support into the kernel and marked all "
+"partitions part of MD arrays with type 0xfd (as those and only those will be "
+"started automatically by the kernel), this is probably what you want."
 msgstr ""
 "一旦ベースシステムが起動すると、mdadm は認識した起動されていない全ての RAID "
 "デバイスを起動出来ます。RAID をサポートするようにカーネルでコンパイルしてい"
@@ -153,7 +178,7 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../mdadm.templates:9001
-msgid "Should mdadm run monthly redundancy checks of the MD arrays (RAIDs)?"
+msgid "Should mdadm run monthly redundancy checks of the MD arrays?"
 msgstr ""
 
 #. Type: boolean
@@ -180,7 +205,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:10001
 #, fuzzy
-msgid "Do you want to start the MD (RAID) monitoring daemon?"
+msgid "Do you want to start the MD monitoring daemon?"
 msgstr "RAID 監視デーモンを起動しますか?"
 
 #. Type: boolean
@@ -206,7 +231,7 @@ msgstr "メール通知の宛先:"
 #, fuzzy
 msgid ""
 "Please enter the email address of the user who should get the email "
-"notification for important MD (RAID) events."
+"notification for important MD events."
 msgstr ""
 "RAID 関連の重大なイベントが発生した際、メールでの通知を受け取る必要があるユー"
 "ザのメールアドレスを入力してください。"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index e3feae58..049bf9e5 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdadm_2.5.2-2\n"
 "Report-Msgid-Bugs-To: pkg-mdadm-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-11 18:15+0200\n"
+"POT-Creation-Date: 2006-09-13 10:30+0200\n"
 "PO-Revision-Date: 2006-07-05 17:30+0200\n"
 "Last-Translator: Frans Pop <aragorn@tiscali.nl>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:1001
 #, fuzzy
-msgid "MD arrays (RAIDs) needed for the root filesystem:"
+msgid "MD arrays needed for the root filesystem:"
 msgstr "Voor het basisbestandssysteem benodigde RAID-reeksen:"
 
 #. Type: string
@@ -53,9 +53,15 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:2001
+msgid "for internal use - only the long description is needed."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../mdadm.templates:2001
 #, fuzzy
 msgid ""
-"If your system has its root filesystem on a MD array (RAID), it needs to be "
+"If your system has its root filesystem on an MD array (RAID), it needs to be "
 "started early during the boot sequence. If your root filesystem is on a "
 "logical volume (LVM), which is on MD, all constituent arrays need to be "
 "started."
@@ -73,8 +79,7 @@ msgid ""
 "If you know exactly which arrays are needed to bring up the root filesystem, "
 "and you want to postpone starting all other arrays to a later point in the "
 "boot sequence, enter the arrays to start here. Alternatively, enter 'all' to "
-"simply start all available arrays. If you do not need or want to start any "
-"arrays for the root filesystem, leave the answer blank (or enter 'none')."
+"simply start all available arrays."
 msgstr ""
 "Als u exact weet welke reeksen nodig zijn om het basisbestandssysteem te "
 "activeren, geef deze dan hier in. Als alternatief kunt u 'all' opgeven wat "
@@ -84,6 +89,15 @@ msgstr ""
 
 #. Type: text
 #. Description
+#: ../mdadm.templates:2001
+msgid ""
+"If you do not need or want to start any arrays for the root filesystem, "
+"leave the answer blank (or enter 'none'). This may be the case if you are "
+"using kernel autostart or do not need any arrays to boot."
+msgstr ""
+
+#. Type: text
+#. Description
 #: ../mdadm.templates:3001
 msgid "An error occurred: device node does not exist"
 msgstr ""
@@ -97,7 +111,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:5001
-msgid "An error occurred: not a MD array (RAID)"
+msgid "An error occurred: not an MD array"
 msgstr ""
 
 #. Type: text
@@ -131,9 +145,20 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+#: ../mdadm.templates:7001
+msgid ""
+"This warning is only relevant if you need arrays to be started from the "
+"initial ramdisk to be able to boot. If you use kernel autostarting, or do "
+"not need any arrays to be started as early as the initial ramdisk is loaded, "
+"you can simply continue. Alternatively, choose not to continue and enter "
+"'none' when prompted which arrays to start from the initial ramdisk."
+msgstr ""
+
+#. Type: boolean
+#. Description
 #: ../mdadm.templates:8001
 #, fuzzy
-msgid "Do you want to start MD arrays (RAIDs) automatically?"
+msgid "Do you want to start MD arrays automatically?"
 msgstr "RAID-apparaten automatisch starten?"
 
 #. Type: boolean
@@ -143,9 +168,9 @@ msgstr "RAID-apparaten automatisch starten?"
 msgid ""
 "Once the base system has come up, mdadm can start all MD arrays (RAIDs) "
 "specified in /etc/mdadm/mdadm.conf, which have not yet been started. Unless "
-"you have compiled MD support into the kernel (in which case all MD arrays "
-"with partitions of type 0xfd (and only those) are started automatically "
-"anyway), this is probably what you want."
+"you have compiled multi-device (MD) support into the kernel and marked all "
+"partitions part of MD arrays with type 0xfd (as those and only those will be "
+"started automatically by the kernel), this is probably what you want."
 msgstr ""
 "Nadat het basissysteem eenmaal is opgestart, kan mdadm zorg dragen voor het "
 "activeren van alle RAID-apparaten die nog niet zijn gestart. "
@@ -156,7 +181,7 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../mdadm.templates:9001
-msgid "Should mdadm run monthly redundancy checks of the MD arrays (RAIDs)?"
+msgid "Should mdadm run monthly redundancy checks of the MD arrays?"
 msgstr ""
 
 #. Type: boolean
@@ -183,7 +208,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:10001
 #, fuzzy
-msgid "Do you want to start the MD (RAID) monitoring daemon?"
+msgid "Do you want to start the MD monitoring daemon?"
 msgstr "Wilt u de achtergronddienst voor de RAID-monitor starten?"
 
 #. Type: boolean
@@ -210,7 +235,7 @@ msgstr "Adres voor mailberichten:"
 #, fuzzy
 msgid ""
 "Please enter the email address of the user who should get the email "
-"notification for important MD (RAID) events."
+"notification for important MD events."
 msgstr ""
 "Geef het mailadres in van de gebruiker die een mailbericht dient te "
 "ontvangen voor belangrijke gebeurtenissen met betrekking tot RAID."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index deaddd62..0ca4bfc4 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdadm\n"
 "Report-Msgid-Bugs-To: pkg-mdadm-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-11 18:15+0200\n"
+"POT-Creation-Date: 2006-09-13 10:30+0200\n"
 "PO-Revision-Date: 2006-06-30 01:06-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs."
 "org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:1001
 #, fuzzy
-msgid "MD arrays (RAIDs) needed for the root filesystem:"
+msgid "MD arrays needed for the root filesystem:"
 msgstr "\"Arrays\" RAID necessários para o sistema de arquivos raiz:"
 
 #. Type: string
@@ -53,9 +53,15 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:2001
+msgid "for internal use - only the long description is needed."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../mdadm.templates:2001
 #, fuzzy
 msgid ""
-"If your system has its root filesystem on a MD array (RAID), it needs to be "
+"If your system has its root filesystem on an MD array (RAID), it needs to be "
 "started early during the boot sequence. If your root filesystem is on a "
 "logical volume (LVM), which is on MD, all constituent arrays need to be "
 "started."
@@ -73,8 +79,7 @@ msgid ""
 "If you know exactly which arrays are needed to bring up the root filesystem, "
 "and you want to postpone starting all other arrays to a later point in the "
 "boot sequence, enter the arrays to start here. Alternatively, enter 'all' to "
-"simply start all available arrays. If you do not need or want to start any "
-"arrays for the root filesystem, leave the answer blank (or enter 'none')."
+"simply start all available arrays."
 msgstr ""
 "Se você sabe exatamente quais \"arrays\" são necessários para ativar o "
 "sistema de arquivos raiz, informe-os aqui. Como alternativa, informe 'all' "
@@ -84,6 +89,15 @@ msgstr ""
 
 #. Type: text
 #. Description
+#: ../mdadm.templates:2001
+msgid ""
+"If you do not need or want to start any arrays for the root filesystem, "
+"leave the answer blank (or enter 'none'). This may be the case if you are "
+"using kernel autostart or do not need any arrays to boot."
+msgstr ""
+
+#. Type: text
+#. Description
 #: ../mdadm.templates:3001
 msgid "An error occurred: device node does not exist"
 msgstr ""
@@ -97,7 +111,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:5001
-msgid "An error occurred: not a MD array (RAID)"
+msgid "An error occurred: not an MD array"
 msgstr ""
 
 #. Type: text
@@ -131,9 +145,20 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+#: ../mdadm.templates:7001
+msgid ""
+"This warning is only relevant if you need arrays to be started from the "
+"initial ramdisk to be able to boot. If you use kernel autostarting, or do "
+"not need any arrays to be started as early as the initial ramdisk is loaded, "
+"you can simply continue. Alternatively, choose not to continue and enter "
+"'none' when prompted which arrays to start from the initial ramdisk."
+msgstr ""
+
+#. Type: boolean
+#. Description
 #: ../mdadm.templates:8001
 #, fuzzy
-msgid "Do you want to start MD arrays (RAIDs) automatically?"
+msgid "Do you want to start MD arrays automatically?"
 msgstr "Você deseja iniciar os dispositivos RAID automaticamente?"
 
 #. Type: boolean
@@ -143,9 +168,9 @@ msgstr "Você deseja iniciar os dispositivos RAID automaticamente?"
 msgid ""
 "Once the base system has come up, mdadm can start all MD arrays (RAIDs) "
 "specified in /etc/mdadm/mdadm.conf, which have not yet been started. Unless "
-"you have compiled MD support into the kernel (in which case all MD arrays "
-"with partitions of type 0xfd (and only those) are started automatically "
-"anyway), this is probably what you want."
+"you have compiled multi-device (MD) support into the kernel and marked all "
+"partitions part of MD arrays with type 0xfd (as those and only those will be "
+"started automatically by the kernel), this is probably what you want."
 msgstr ""
 "Uma vez que o sistema básico esteja disponível, mdadm pode iniciar todos os "
 "dispositivos RAID que encontrar e que ainda não tenham sido iniciados. A "
@@ -156,7 +181,7 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../mdadm.templates:9001
-msgid "Should mdadm run monthly redundancy checks of the MD arrays (RAIDs)?"
+msgid "Should mdadm run monthly redundancy checks of the MD arrays?"
 msgstr ""
 
 #. Type: boolean
@@ -183,7 +208,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:10001
 #, fuzzy
-msgid "Do you want to start the MD (RAID) monitoring daemon?"
+msgid "Do you want to start the MD monitoring daemon?"
 msgstr "Você deseja iniciar o \"daemon\" de monitoramento RAID?"
 
 #. Type: boolean
@@ -210,7 +235,7 @@ msgstr "Destinatário para os e-mails de notificações:"
 #, fuzzy
 msgid ""
 "Please enter the email address of the user who should get the email "
-"notification for important MD (RAID) events."
+"notification for important MD events."
 msgstr ""
 "Por favor, informe o endereço de e-mail do usuário que deverá receber os e-"
 "mails de notificações para estes eventos RAID importantes."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 01d619df..9d2b113a 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdadm_1.12.0-1_ru\n"
 "Report-Msgid-Bugs-To: pkg-mdadm-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-11 18:15+0200\n"
+"POT-Creation-Date: 2006-09-13 10:30+0200\n"
 "PO-Revision-Date: 2006-06-30 22:29+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:1001
 #, fuzzy
-msgid "MD arrays (RAIDs) needed for the root filesystem:"
+msgid "MD arrays needed for the root filesystem:"
 msgstr "RAID массивы, нужные для корневой файловой системы:"
 
 #. Type: string
@@ -53,9 +53,15 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:2001
+msgid "for internal use - only the long description is needed."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../mdadm.templates:2001
 #, fuzzy
 msgid ""
-"If your system has its root filesystem on a MD array (RAID), it needs to be "
+"If your system has its root filesystem on an MD array (RAID), it needs to be "
 "started early during the boot sequence. If your root filesystem is on a "
 "logical volume (LVM), which is on MD, all constituent arrays need to be "
 "started."
@@ -73,8 +79,7 @@ msgid ""
 "If you know exactly which arrays are needed to bring up the root filesystem, "
 "and you want to postpone starting all other arrays to a later point in the "
 "boot sequence, enter the arrays to start here. Alternatively, enter 'all' to "
-"simply start all available arrays. If you do not need or want to start any "
-"arrays for the root filesystem, leave the answer blank (or enter 'none')."
+"simply start all available arrays."
 msgstr ""
 "Если вы точно знаете какие массивы требуются для получения корневой файловой "
 "системы, введите их здесь. Иначе, введите слово 'all', чтобы просто "
@@ -84,6 +89,15 @@ msgstr ""
 
 #. Type: text
 #. Description
+#: ../mdadm.templates:2001
+msgid ""
+"If you do not need or want to start any arrays for the root filesystem, "
+"leave the answer blank (or enter 'none'). This may be the case if you are "
+"using kernel autostart or do not need any arrays to boot."
+msgstr ""
+
+#. Type: text
+#. Description
 #: ../mdadm.templates:3001
 msgid "An error occurred: device node does not exist"
 msgstr ""
@@ -97,7 +111,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:5001
-msgid "An error occurred: not a MD array (RAID)"
+msgid "An error occurred: not an MD array"
 msgstr ""
 
 #. Type: text
@@ -131,9 +145,20 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+#: ../mdadm.templates:7001
+msgid ""
+"This warning is only relevant if you need arrays to be started from the "
+"initial ramdisk to be able to boot. If you use kernel autostarting, or do "
+"not need any arrays to be started as early as the initial ramdisk is loaded, "
+"you can simply continue. Alternatively, choose not to continue and enter "
+"'none' when prompted which arrays to start from the initial ramdisk."
+msgstr ""
+
+#. Type: boolean
+#. Description
 #: ../mdadm.templates:8001
 #, fuzzy
-msgid "Do you want to start MD arrays (RAIDs) automatically?"
+msgid "Do you want to start MD arrays automatically?"
 msgstr "Запускать RAID устройства автоматически?"
 
 #. Type: boolean
@@ -143,9 +168,9 @@ msgstr "Запускать RAID устройства автоматически?
 msgid ""
 "Once the base system has come up, mdadm can start all MD arrays (RAIDs) "
 "specified in /etc/mdadm/mdadm.conf, which have not yet been started. Unless "
-"you have compiled MD support into the kernel (in which case all MD arrays "
-"with partitions of type 0xfd (and only those) are started automatically "
-"anyway), this is probably what you want."
+"you have compiled multi-device (MD) support into the kernel and marked all "
+"partitions part of MD arrays with type 0xfd (as those and only those will be "
+"started automatically by the kernel), this is probably what you want."
 msgstr ""
 "После старта базовой системы mdadm может обнаружить и запустить все RAID "
 "устройства, которые ещё не были запущены. Этот параметр нужно включить, если "
@@ -155,7 +180,7 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../mdadm.templates:9001
-msgid "Should mdadm run monthly redundancy checks of the MD arrays (RAIDs)?"
+msgid "Should mdadm run monthly redundancy checks of the MD arrays?"
 msgstr ""
 
 #. Type: boolean
@@ -182,7 +207,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:10001
 #, fuzzy
-msgid "Do you want to start the MD (RAID) monitoring daemon?"
+msgid "Do you want to start the MD monitoring daemon?"
 msgstr "Запускать демон-монитор RAID?"
 
 #. Type: boolean
@@ -209,7 +234,7 @@ msgstr "Получатель уведомительных писем:"
 #, fuzzy
 msgid ""
 "Please enter the email address of the user who should get the email "
-"notification for important MD (RAID) events."
+"notification for important MD events."
 msgstr ""
 "Введите адрес электронной почты пользователя, который будет получать "
 "почтовые уведомления о важных изменениях в состоянии RAID."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index a49b18c3..89eb7d80 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdadm 1.12.0-1\n"
 "Report-Msgid-Bugs-To: pkg-mdadm-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-11 18:15+0200\n"
+"POT-Creation-Date: 2006-09-13 10:30+0200\n"
 "PO-Revision-Date: 2006-06-29 22:06+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -26,7 +26,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:1001
 #, fuzzy
-msgid "MD arrays (RAIDs) needed for the root filesystem:"
+msgid "MD arrays needed for the root filesystem:"
 msgstr "RAID-kedjor som beh?vs f?r rotfilsystemet:"
 
 #. Type: string
@@ -49,9 +49,15 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:2001
+msgid "for internal use - only the long description is needed."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../mdadm.templates:2001
 #, fuzzy
 msgid ""
-"If your system has its root filesystem on a MD array (RAID), it needs to be "
+"If your system has its root filesystem on an MD array (RAID), it needs to be "
 "started early during the boot sequence. If your root filesystem is on a "
 "logical volume (LVM), which is on MD, all constituent arrays need to be "
 "started."
@@ -68,8 +74,7 @@ msgid ""
 "If you know exactly which arrays are needed to bring up the root filesystem, "
 "and you want to postpone starting all other arrays to a later point in the "
 "boot sequence, enter the arrays to start here. Alternatively, enter 'all' to "
-"simply start all available arrays. If you do not need or want to start any "
-"arrays for the root filesystem, leave the answer blank (or enter 'none')."
+"simply start all available arrays."
 msgstr ""
 "Om du vet exakt vilka kedjor som beh?vs f?r att ta upp rotfilsystemet, ange "
 "dem h?r. Alternativt, ange \"all\" f?r att helt enkelt starta alla tillg?"
@@ -78,6 +83,15 @@ msgstr ""
 
 #. Type: text
 #. Description
+#: ../mdadm.templates:2001
+msgid ""
+"If you do not need or want to start any arrays for the root filesystem, "
+"leave the answer blank (or enter 'none'). This may be the case if you are "
+"using kernel autostart or do not need any arrays to boot."
+msgstr ""
+
+#. Type: text
+#. Description
 #: ../mdadm.templates:3001
 msgid "An error occurred: device node does not exist"
 msgstr ""
@@ -91,7 +105,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:5001
-msgid "An error occurred: not a MD array (RAID)"
+msgid "An error occurred: not an MD array"
 msgstr ""
 
 #. Type: text
@@ -125,9 +139,20 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+#: ../mdadm.templates:7001
+msgid ""
+"This warning is only relevant if you need arrays to be started from the "
+"initial ramdisk to be able to boot. If you use kernel autostarting, or do "
+"not need any arrays to be started as early as the initial ramdisk is loaded, "
+"you can simply continue. Alternatively, choose not to continue and enter "
+"'none' when prompted which arrays to start from the initial ramdisk."
+msgstr ""
+
+#. Type: boolean
+#. Description
 #: ../mdadm.templates:8001
 #, fuzzy
-msgid "Do you want to start MD arrays (RAIDs) automatically?"
+msgid "Do you want to start MD arrays automatically?"
 msgstr "Vill du starta RAID-enheter automatiskt?"
 
 #. Type: boolean
@@ -137,9 +162,9 @@ msgstr "Vill du starta RAID-enheter automatiskt?"
 msgid ""
 "Once the base system has come up, mdadm can start all MD arrays (RAIDs) "
 "specified in /etc/mdadm/mdadm.conf, which have not yet been started. Unless "
-"you have compiled MD support into the kernel (in which case all MD arrays "
-"with partitions of type 0xfd (and only those) are started automatically "
-"anyway), this is probably what you want."
+"you have compiled multi-device (MD) support into the kernel and marked all "
+"partitions part of MD arrays with type 0xfd (as those and only those will be "
+"started automatically by the kernel), this is probably what you want."
 msgstr ""
 "N?r grundsystemet har kommit upp kan mdadm starta alla RAID-enheter som den "
 "kan hitta och som inte har startats. S?vida du har byggt in RAID-st?d i k?"
@@ -149,7 +174,7 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../mdadm.templates:9001
-msgid "Should mdadm run monthly redundancy checks of the MD arrays (RAIDs)?"
+msgid "Should mdadm run monthly redundancy checks of the MD arrays?"
 msgstr ""
 
 #. Type: boolean
@@ -176,7 +201,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:10001
 #, fuzzy
-msgid "Do you want to start the MD (RAID) monitoring daemon?"
+msgid "Do you want to start the MD monitoring daemon?"
 msgstr "Vil du starta RAID-?vervakningsdemonen?"
 
 #. Type: boolean
@@ -202,7 +227,7 @@ msgstr "Mottagare f?r e-postnotifieringar:"
 #, fuzzy
 msgid ""
 "Please enter the email address of the user who should get the email "
-"notification for important MD (RAID) events."
+"notification for important MD events."
 msgstr ""
 "Ange e-postadressen till den anv?ndare som ska ta emot e-postnotifieringar f?"
 "r dessa viktiga RAID-h?ndelser."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index d5f9278f..6d0bce9e 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pkg-mdadm-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-11 18:15+0200\n"
+"POT-Creation-Date: 2006-09-13 10:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../mdadm.templates:1001
-msgid "MD arrays (RAIDs) needed for the root filesystem:"
+msgid "MD arrays needed for the root filesystem:"
 msgstr ""
 
 #. Type: string
@@ -39,8 +39,14 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:2001
+msgid "for internal use - only the long description is needed."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../mdadm.templates:2001
 msgid ""
-"If your system has its root filesystem on a MD array (RAID), it needs to be "
+"If your system has its root filesystem on an MD array (RAID), it needs to be "
 "started early during the boot sequence. If your root filesystem is on a "
 "logical volume (LVM), which is on MD, all constituent arrays need to be "
 "started."
@@ -53,8 +59,16 @@ msgid ""
 "If you know exactly which arrays are needed to bring up the root filesystem, "
 "and you want to postpone starting all other arrays to a later point in the "
 "boot sequence, enter the arrays to start here. Alternatively, enter 'all' to "
-"simply start all available arrays. If you do not need or want to start any "
-"arrays for the root filesystem, leave the answer blank (or enter 'none')."
+"simply start all available arrays."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../mdadm.templates:2001
+msgid ""
+"If you do not need or want to start any arrays for the root filesystem, "
+"leave the answer blank (or enter 'none'). This may be the case if you are "
+"using kernel autostart or do not need any arrays to boot."
 msgstr ""
 
 #. Type: text
@@ -72,7 +86,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:5001
-msgid "An error occurred: not a MD array (RAID)"
+msgid "An error occurred: not an MD array"
 msgstr ""
 
 #. Type: text
@@ -106,8 +120,19 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+#: ../mdadm.templates:7001
+msgid ""
+"This warning is only relevant if you need arrays to be started from the "
+"initial ramdisk to be able to boot. If you use kernel autostarting, or do "
+"not need any arrays to be started as early as the initial ramdisk is loaded, "
+"you can simply continue. Alternatively, choose not to continue and enter "
+"'none' when prompted which arrays to start from the initial ramdisk."
+msgstr ""
+
+#. Type: boolean
+#. Description
 #: ../mdadm.templates:8001
-msgid "Do you want to start MD arrays (RAIDs) automatically?"
+msgid "Do you want to start MD arrays automatically?"
 msgstr ""
 
 #. Type: boolean
@@ -116,15 +141,15 @@ msgstr ""
 msgid ""
 "Once the base system has come up, mdadm can start all MD arrays (RAIDs) "
 "specified in /etc/mdadm/mdadm.conf, which have not yet been started. Unless "
-"you have compiled MD support into the kernel (in which case all MD arrays "
-"with partitions of type 0xfd (and only those) are started automatically "
-"anyway), this is probably what you want."
+"you have compiled multi-device (MD) support into the kernel and marked all "
+"partitions part of MD arrays with type 0xfd (as those and only those will be "
+"started automatically by the kernel), this is probably what you want."
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../mdadm.templates:9001
-msgid "Should mdadm run monthly redundancy checks of the MD arrays (RAIDs)?"
+msgid "Should mdadm run monthly redundancy checks of the MD arrays?"
 msgstr ""
 
 #. Type: boolean
@@ -150,7 +175,7 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../mdadm.templates:10001
-msgid "Do you want to start the MD (RAID) monitoring daemon?"
+msgid "Do you want to start the MD monitoring daemon?"
 msgstr ""
 
 #. Type: boolean
@@ -172,5 +197,5 @@ msgstr ""
 #: ../mdadm.templates:11001
 msgid ""
 "Please enter the email address of the user who should get the email "
-"notification for important MD (RAID) events."
+"notification for important MD events."
 msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 3157039f..e1970e26 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdadm 2.5.2-2\n"
 "Report-Msgid-Bugs-To: pkg-mdadm-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-11 18:15+0200\n"
+"POT-Creation-Date: 2006-09-13 10:30+0200\n"
 "PO-Revision-Date: 2006-07-31 21:42+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -20,7 +20,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:1001
 #, fuzzy
-msgid "MD arrays (RAIDs) needed for the root filesystem:"
+msgid "MD arrays needed for the root filesystem:"
 msgstr "Các mảng RAID cần thiết cho hệ thống tập tin gốc:"
 
 #. Type: string
@@ -43,9 +43,15 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:2001
+msgid "for internal use - only the long description is needed."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../mdadm.templates:2001
 #, fuzzy
 msgid ""
-"If your system has its root filesystem on a MD array (RAID), it needs to be "
+"If your system has its root filesystem on an MD array (RAID), it needs to be "
 "started early during the boot sequence. If your root filesystem is on a "
 "logical volume (LVM), which is on MD, all constituent arrays need to be "
 "started."
@@ -63,8 +69,7 @@ msgid ""
 "If you know exactly which arrays are needed to bring up the root filesystem, "
 "and you want to postpone starting all other arrays to a later point in the "
 "boot sequence, enter the arrays to start here. Alternatively, enter 'all' to "
-"simply start all available arrays. If you do not need or want to start any "
-"arrays for the root filesystem, leave the answer blank (or enter 'none')."
+"simply start all available arrays."
 msgstr ""
 "Nếu bạn biết chính xác những mảng nào cần thiết để kích hoạt hệ thống tập "
 "tin gốc, hãy nhập chúng vào đây. Hoặc nhập « all » (tất cả) để khởi chạy đơn "
@@ -73,6 +78,15 @@ msgstr ""
 
 #. Type: text
 #. Description
+#: ../mdadm.templates:2001
+msgid ""
+"If you do not need or want to start any arrays for the root filesystem, "
+"leave the answer blank (or enter 'none'). This may be the case if you are "
+"using kernel autostart or do not need any arrays to boot."
+msgstr ""
+
+#. Type: text
+#. Description
 #: ../mdadm.templates:3001
 msgid "An error occurred: device node does not exist"
 msgstr ""
@@ -86,7 +100,7 @@ msgstr ""
 #. Type: text
 #. Description
 #: ../mdadm.templates:5001
-msgid "An error occurred: not a MD array (RAID)"
+msgid "An error occurred: not an MD array"
 msgstr ""
 
 #. Type: text
@@ -120,9 +134,20 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+#: ../mdadm.templates:7001
+msgid ""
+"This warning is only relevant if you need arrays to be started from the "
+"initial ramdisk to be able to boot. If you use kernel autostarting, or do "
+"not need any arrays to be started as early as the initial ramdisk is loaded, "
+"you can simply continue. Alternatively, choose not to continue and enter "
+"'none' when prompted which arrays to start from the initial ramdisk."
+msgstr ""
+
+#. Type: boolean
+#. Description
 #: ../mdadm.templates:8001
 #, fuzzy
-msgid "Do you want to start MD arrays (RAIDs) automatically?"
+msgid "Do you want to start MD arrays automatically?"
 msgstr "Bạn có muốn khởi động tự động những thiết bị RAID không?"
 
 #. Type: boolean
@@ -132,9 +157,9 @@ msgstr "Bạn có muốn khởi động tự động những thiết bị RAID k
 msgid ""
 "Once the base system has come up, mdadm can start all MD arrays (RAIDs) "
 "specified in /etc/mdadm/mdadm.conf, which have not yet been started. Unless "
-"you have compiled MD support into the kernel (in which case all MD arrays "
-"with partitions of type 0xfd (and only those) are started automatically "
-"anyway), this is probably what you want."
+"you have compiled multi-device (MD) support into the kernel and marked all "
+"partitions part of MD arrays with type 0xfd (as those and only those will be "
+"started automatically by the kernel), this is probably what you want."
 msgstr ""
 "Một khi hệ thống cơ bản được kích hoạt, mdadm có khả năng khởi động mọi "
 "thiết bị RAID nó tìm mà chưa được khởi động. Trừ bạn đã biên dịch khả năng "
@@ -144,7 +169,7 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../mdadm.templates:9001
-msgid "Should mdadm run monthly redundancy checks of the MD arrays (RAIDs)?"
+msgid "Should mdadm run monthly redundancy checks of the MD arrays?"
 msgstr ""
 
 #. Type: boolean
@@ -171,7 +196,7 @@ msgstr ""
 #. Description
 #: ../mdadm.templates:10001
 #, fuzzy
-msgid "Do you want to start the MD (RAID) monitoring daemon?"
+msgid "Do you want to start the MD monitoring daemon?"
 msgstr "Bạn có muốn khởi chạy trình nền theo dõi RAID không?"
 
 #. Type: boolean
@@ -197,7 +222,7 @@ msgstr "Người nhận thư thông báo :"
 #, fuzzy
 msgid ""
 "Please enter the email address of the user who should get the email "
-"notification for important MD (RAID) events."
+"notification for important MD events."
 msgstr ""
 "Hãy nhập địa chỉ thư của người dùng nên nhận thư thông báo về sự kiện RAID "
 "quan trọng như vậy."