Merge lp:~xnox/hw-detect/fix-firmware-order into lp:hw-detect

[Dimitri John Ledkov]

[lp:~xnox/hw-detect/fix-firmware-order]

1485. By Dimitri John Ledkov on 2013-08-23

Move installation of in-target debs from driver-injection-disk from
post-base-installer.d to pre-pkgsel.d phase. Such that those firmware
debs are installed just after the kernel has been, but before
initramfs is updated. (LP: #1209287) (LP: #1216043)

1486. By Dimitri John Ledkov on 2013-09-05

catch up from trunk

1487. By Dimitri John Ledkov on 2013-09-05

revert initial implementation

1488. By Dimitri John Ledkov on 2013-09-05

* Make driver-injection-disk use a directory which is different from the
  one firmware injection uses.
* Move driver-injection-disk debs installation to pre-pkgsel.d stage,
  such that it is after the kernel has been installed. In cases injected
  driver .debs depend on particular kernel packages.

1489. By Dimitri John Ledkov on 2013-09-05

Enable nonfree repositories in install-firmware, if there are injected
drivers to install later.

1490. By Dimitri John Ledkov on 2013-09-06

Move firmware/injected drivers' .deb packages installation from
post-base-installer.d stage to pre-pkgsel.d stage.

1491. By Dimitri John Ledkov on 2013-09-11

Bump question to load driver injection disk from medium to high, and
raise driver-injection-disk package priority to standard. Thus the
udeb will be loaded by default, but before installing any debs from
the OEMDRM a confirmation question will be asked (default true, can be
pre-seeded)

1492. By Dimitri John Ledkov on 2013-09-19

OEMDRV typo

1493. By Dimitri John Ledkov on 2013-09-20

Add bug #

Unmerged revisions

1493. By Dimitri John Ledkov on 2013-09-20

Add bug #

1492. By Dimitri John Ledkov on 2013-09-19

OEMDRV typo

1491. By Dimitri John Ledkov on 2013-09-11

Bump question to load driver injection disk from medium to high, and
raise driver-injection-disk package priority to standard. Thus the
udeb will be loaded by default, but before installing any debs from
the OEMDRM a confirmation question will be asked (default true, can be
pre-seeded)

1490. By Dimitri John Ledkov on 2013-09-06

Move firmware/injected drivers' .deb packages installation from
post-base-installer.d stage to pre-pkgsel.d stage.

1489. By Dimitri John Ledkov on 2013-09-05

Enable nonfree repositories in install-firmware, if there are injected
drivers to install later.

1488. By Dimitri John Ledkov on 2013-09-05

* Make driver-injection-disk use a directory which is different from the
  one firmware injection uses.
* Move driver-injection-disk debs installation to pre-pkgsel.d stage,
  such that it is after the kernel has been installed. In cases injected
  driver .debs depend on particular kernel packages.

1487. By Dimitri John Ledkov on 2013-09-05

revert initial implementation

1486. By Dimitri John Ledkov on 2013-09-05

catch up from trunk

1485. By Dimitri John Ledkov on 2013-08-23

Move installation of in-target debs from driver-injection-disk from
post-base-installer.d to pre-pkgsel.d phase. Such that those firmware
debs are installed just after the kernel has been, but before
initramfs is updated. (LP: #1209287) (LP: #1216043)

1484. By Colin Watson on 2013-02-18

releasing version 1.92ubuntu1

=== modified file 'Makefile'
--- Makefile	2010-05-23 09:01:40 +0000
+++ Makefile	2013-08-23 18:07:28 +0000
@@ -27,6 +27,8 @@
 sharedir=$(DESTDIR)/usr/share/hw-detect/
 postbaseinstallerdir=$(DESTDIR)/usr/lib/post-base-installer.d/
 prepkgseldir=$(DESTDIR)/usr/lib/pre-pkgsel.d/
+usrbindir=$(DESTDIR)/usr/bin
+man1dir=$(DESTDIR)/usr/share/man/man1
 
 INSTALL=install
 INSTALL_DATA = ${INSTALL} -m 644
@@ -92,8 +94,10 @@
 	$(INSTALL) archdetect $(bindir)
 
 install-archdetect-deb: archdetect
-	$(INSTALL) -d $(bindir)
-	$(INSTALL) archdetect $(bindir)
+	$(INSTALL) -d $(usrbindir)
+	$(INSTALL) archdetect $(usrbindir)
+	$(INSTALL) -d $(man1dir)
+	$(INSTALL) archdetect.1 $(man1dir)
 
 archdetect: archdetect.o 
 	${CC} ${LDFLAGS} -o $@ $^ -ldebian-installer

=== added file 'archdetect.1'
--- archdetect.1	1970-01-01 00:00:00 +0000
+++ archdetect.1	2013-08-23 18:07:28 +0000
@@ -0,0 +1,35 @@
+.Dd January 10, 2011
+.Os Debian
+.ds volume-operating-system Debian
+.Dt ARCHDETECT 1
+.Sh NAME
+.Nm archdetect
+.Nd detect hardware architecture
+.Sh SYNOPSIS
+.Nm
+.Op Fl g
+.Sh DESCRIPTION
+.Nm
+displays the current machine architecture and subarchitecture.
+The architecture corresponds to that built into
+.Ic dpkg ,
+and describes the CPU (and possibly kernel) types; the subarchitecture
+distinguishes machines with different boot arrangements that require special
+handling.
+.Pp
+The following option is available:
+.Bl -tag -width 4n
+.It Fl g
+When bringing up new subarchitectures,
+.Nm
+may not yet have been taught about this specific machine.
+This option asks that
+.Nm
+try to guess a generic subarchitecture that may be compatible with this
+machine.
+This is only necessary on certain architectures, and simply has no effect
+elsewhere.
+.El
+.Sh AUTHORS
+.Nm
+was written by the Debian Installer team.

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-16 12:47:10 +0000
+++ debian/changelog	2013-08-23 18:07:28 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 hw-detect (1.95) unstable; urgency=low
 
   [ Updated translations ]
@@ -21,6 +22,52 @@
 
  -- Christian Perrier <[e-mail]>  Fri, 17 May 2013 19:34:43 +0200
 
+=======
+hw-detect (1.92ubuntu2) UNRELEASED; urgency=low
+
+  * Move installation of in-target debs from driver-injection-disk from
+    post-base-installer.d to pre-pkgsel.d phase. Such that those firmware
+    debs are installed just after the kernel has been, but before
+    initramfs is updated. (LP: #1209287) (LP: #1216043)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Fri, 23 Aug 2013 18:32:58 +0100
+
+hw-detect (1.92ubuntu1) raring; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+    - disk-detect.sh: Do not check the kernel command line for any option
+      to enable dmraid support. If functional dmraid arrays are found, the
+      user will be asked if they wish to activate them.
+    - Make dmraid logging a bit neater.
+    - 'dmraid -c -s' changed its output format; cope with both old and new.
+    - Remove dm-emc from the multipath modules, since it's gone since
+      2.6.27.
+    - Improve checks for dm-* drivers being present to avoid relying on them
+      being built as modules.
+    - Offer iSCSI targets for preseeding if partman-iscsi is available and
+      no disk devices are found.
+    - Stop installing acpi, acpid, and acpi-support-base if acpi is
+      available.
+    - Add an 'archdetect-deb' package, containing /usr/bin/archdetect.  Add
+      an archdetect(1) manual page.
+    - Refer to /usr/share/common-licenses/GPL-2 in debian/copyright.
+    - Load xenbus_probe_frontend if we're running under the Xen hypervisor.
+    - Redirect update-dev output to /dev/null, as it is in principle
+      possible for it to write to stdout and that would interfere with
+      debconf.
+
+ -- Colin Watson <[e-mail]>  Mon, 18 Feb 2013 16:45:36 +0000
+
+>>>>>>> MERGE-SOURCE
 hw-detect (1.92) unstable; urgency=low
 
   [ Updated translations ]
@@ -28,6 +75,41 @@
 
  -- Christian Perrier <[e-mail]>  Mon, 10 Dec 2012 22:08:28 +0100
 
+hw-detect (1.91ubuntu1) raring; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+    - disk-detect.sh: Do not check the kernel command line for any option
+      to enable dmraid support. If functional dmraid arrays are found, the
+      user will be asked if they wish to activate them.
+    - Make dmraid logging a bit neater.
+    - 'dmraid -c -s' changed its output format; cope with both old and new.
+    - Remove dm-emc from the multipath modules, since it's gone since
+      2.6.27.
+    - Improve checks for dm-* drivers being present to avoid relying on them
+      being built as modules.
+    - Offer iSCSI targets for preseeding if partman-iscsi is available and
+      no disk devices are found.
+    - Stop installing acpi, acpid, and acpi-support-base if acpi is
+      available.
+    - Add an 'archdetect-deb' package, containing /usr/bin/archdetect.  Add
+      an archdetect(1) manual page.
+    - Refer to /usr/share/common-licenses/GPL-2 in debian/copyright.
+    - Load xenbus_probe_frontend if we're running under the Xen hypervisor.
+    - Redirect update-dev output to /dev/null, as it is in principle
+      possible for it to write to stdout and that would interfere with
+      debconf.
+
+ -- Colin Watson <[e-mail]>  Wed, 28 Nov 2012 15:40:15 +0000
+
 hw-detect (1.91) unstable; urgency=low
 
   * Replace XC-Package-Type by Package-Type in debian/control
@@ -47,6 +129,40 @@
 
  -- Christian Perrier <[e-mail]>  Thu, 26 Jul 2012 02:08:00 +0200
 
+hw-detect (1.89ubuntu1) quantal; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+    - disk-detect.sh: Do not check the kernel command line for any option
+      to enable dmraid support. If functional dmraid arrays are found, the
+      user will be asked if they wish to activate them.
+    - Make dmraid logging a bit neater.
+    - 'dmraid -c -s' changed its output format; cope with both old and new.
+    - Remove dm-emc from the multipath modules, since it's gone since
+      2.6.27.
+    - Improve checks for dm-* drivers being present to avoid relying on them
+      being built as modules.
+    - Offer iSCSI targets for preseeding if partman-iscsi is available and
+      no disk devices are found.
+    - Stop installing acpi, acpid, and acpi-support-base if acpi is
+      available.
+    - Add an 'archdetect-deb' package, containing /usr/bin/archdetect.  Add
+      an archdetect(1) manual page.
+    - Refer to /usr/share/common-licenses/GPL-2 in debian/copyright.
+    - Load xenbus_probe_frontend if we're running under the Xen hypervisor.
+  * Redirect update-dev output to /dev/null, as it is in principle possible
+    for it to write to stdout and that would interfere with debconf.
+
+ -- Colin Watson <[e-mail]>  Fri, 13 Jul 2012 10:15:53 +0100
+
 hw-detect (1.89) unstable; urgency=low
 
   * Team upload
@@ -80,6 +196,44 @@
 
  -- Christian Perrier <[e-mail]>  Fri, 15 Jun 2012 07:21:09 +0200
 
+hw-detect (1.88ubuntu2) precise; urgency=low
+
+  * Update Ubuntu-specific translations from Launchpad.
+
+ -- Colin Watson <[e-mail]>  Wed, 11 Apr 2012 11:45:59 +0100
+
+hw-detect (1.88ubuntu1) precise; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+    - disk-detect.sh: Do not check the kernel command line for any option
+      to enable dmraid support. If functional dmraid arrays are found, the
+      user will be asked if they wish to activate them.
+    - Make dmraid logging a bit neater.
+    - 'dmraid -c -s' changed its output format; cope with both old and new.
+    - Remove dm-emc from the multipath modules, since it's gone since
+      2.6.27.
+    - Improve checks for dm-* drivers being present to avoid relying on them
+      being built as modules.
+    - Offer iSCSI targets for preseeding if partman-iscsi is available and
+      no disk devices are found.
+    - Stop installing acpi, acpid, and acpi-support-base if acpi is
+      available.
+    - Add an 'archdetect-deb' package, containing /usr/bin/archdetect.  Add
+      an archdetect(1) manual page.
+    - Refer to /usr/share/common-licenses/GPL-2 in debian/copyright.
+    - Load xenbus_probe_frontend if we're running under the Xen hypervisor.
+
+ -- Colin Watson <[e-mail]>  Mon, 28 Nov 2011 15:43:43 +0000
+
 hw-detect (1.88) unstable; urgency=low
 
   [ Milan Kupcevic ]
@@ -96,6 +250,38 @@
 
  -- Joey Hess <[e-mail]>  Thu, 17 Nov 2011 12:38:54 -0400
 
+hw-detect (1.87ubuntu1) precise; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+    - disk-detect.sh: Do not check the kernel command line for any option
+      to enable dmraid support. If functional dmraid arrays are found, the
+      user will be asked if they wish to activate them.
+    - Make dmraid logging a bit neater.
+    - 'dmraid -c -s' changed its output format; cope with both old and new.
+    - Remove dm-emc from the multipath modules, since it's gone since
+      2.6.27.
+    - Improve checks for dm-* drivers being present to avoid relying on them
+      being built as modules.
+    - Offer iSCSI targets for preseeding if partman-iscsi is available and
+      no disk devices are found.
+    - Stop installing acpi, acpid, and acpi-support-base if acpi is
+      available.
+    - Add an 'archdetect-deb' package, containing /usr/bin/archdetect.  Add
+      an archdetect(1) manual page.
+    - Refer to /usr/share/common-licenses/GPL-2 in debian/copyright.
+    - Load xenbus_probe_frontend if we're running under the Xen hypervisor.
+
+ -- Colin Watson <[e-mail]>  Sun, 23 Oct 2011 20:08:42 +0100
+
 hw-detect (1.87) unstable; urgency=low
 
   [ Jurij Smakov ]
@@ -186,6 +372,51 @@
 
  -- Otavio Salvador <[e-mail]>  Wed, 24 Nov 2010 09:52:34 -0200
 
+hw-detect (1.81ubuntu3) oneiric; urgency=low
+
+  * Load xenbus_probe_frontend if we're running under the Xen hypervisor
+    (LP: #857662).
+
+ -- Colin Watson <[e-mail]>  Fri, 23 Sep 2011 23:21:48 +0100
+
+hw-detect (1.81ubuntu2) natty; urgency=low
+
+  * Add an 'archdetect-deb' package, containing /usr/bin/archdetect.  Add an
+    archdetect(1) manual page.
+  * Refer to /usr/share/common-licenses/GPL-2 in debian/copyright.
+
+ -- Colin Watson <[e-mail]>  Mon, 10 Jan 2011 12:14:44 -0600
+
+hw-detect (1.81ubuntu1) natty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+    - disk-detect.sh: Do not check the kernel command line for any option
+      to enable dmraid support. If functional dmraid arrays are found, the
+      user will be asked if they wish to activate them.
+    - Make dmraid logging a bit neater.
+    - 'dmraid -c -s' changed its output format; cope with both old and new.
+    - Reinstate snd-powermac for i2s-a devices since apparently the lock-up
+      has been fixed.
+    - Remove dm-emc from the multipath modules, since it's gone since
+      2.6.27.
+    - Improve checks for dm-* drivers being present to avoid relying on them
+      being built as modules.
+    - Offer iSCSI targets for preseeding if partman-iscsi is available and
+      no disk devices are found.
+    - Stop installing acpi, acpid, and acpi-support-base if acpi is
+      available.
+
+ -- Colin Watson <[e-mail]>  Mon, 15 Nov 2010 10:45:26 +0000
+
 hw-detect (1.81) unstable; urgency=low
 
   [ Thibaut Girka ]
@@ -204,6 +435,36 @@
 
  -- Otavio Salvador <[e-mail]>  Fri, 12 Nov 2010 14:42:31 -0200
 
+hw-detect (1.80ubuntu1) natty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+    - disk-detect.sh: Do not check the kernel command line for any option
+      to enable dmraid support. If functional dmraid arrays are found, the
+      user will be asked if they wish to activate them.
+    - Make dmraid logging a bit neater.
+    - 'dmraid -c -s' changed its output format; cope with both old and new.
+    - Reinstate snd-powermac for i2s-a devices since apparently the lock-up
+      has been fixed.
+    - Remove dm-emc from the multipath modules, since it's gone since
+      2.6.27.
+    - Improve checks for dm-* drivers being present to avoid relying on them
+      being built as modules.
+    - Offer iSCSI targets for preseeding if partman-iscsi is available and
+      no disk devices are found.
+    - Stop installing acpi, acpid, and acpi-support-base if acpi is
+      available.
+
+ -- Colin Watson <[e-mail]>  Fri, 15 Oct 2010 13:21:28 +0100
+
 hw-detect (1.80) unstable; urgency=low
 
   * Add -g/--guess option to archdetect to ask for heuristics that make it
@@ -432,6 +693,74 @@
 
  -- Frans Pop <[e-mail]>  Thu, 24 Dec 2009 03:23:27 +0100
 
+hw-detect (1.73ubuntu5) maverick; urgency=low
+
+  * Backport from trunk:
+    - Add -g/--guess option to archdetect to ask for heuristics that make it
+      easier to bring up new boards, based on a patch from Michael
+      Casadevall.  See
+      http://lists.debian.org/debian-boot/2010/08/msg00641.html for
+      rationale.  Requires libdebian-installer4-dev (>= 0.76).
+
+ -- Colin Watson <[e-mail]>  Tue, 14 Sep 2010 18:46:00 +0100
+
+hw-detect (1.73ubuntu4) lucid; urgency=low
+
+  * Enable backup while running iscsi_login, to match behaviour when running
+    iscsi_login from partman.
+
+ -- Colin Watson <[e-mail]>  Fri, 23 Apr 2010 21:09:45 +0100
+
+hw-detect (1.73ubuntu3) lucid; urgency=low
+
+  * Update Ubuntu-specific translations from Launchpad.
+
+ -- Colin Watson <[e-mail]>  Thu, 15 Apr 2010 00:17:52 +0100
+
+hw-detect (1.73ubuntu2) lucid; urgency=low
+
+  * Don't try to install libc6-vfp any more; it hasn't been built since
+    eglibc 2.10.1-0ubuntu10 in karmic.
+
+ -- Colin Watson <[e-mail]>  Wed, 10 Feb 2010 12:26:38 +0000
+
+hw-detect (1.73ubuntu1) lucid; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - Install mouseemu on systems likely to have single-button mice (i.e.
+      non-desktop Macs), but not powerpc64 since that causes an oops in the
+      input layer.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+    - disk-detect.sh: Do not check the kernel command line for any option
+      to enable dmraid support. If functional dmraid arrays are found, the
+      user will be asked if they wish to activate them.
+    - Make dmraid logging a bit neater.
+    - 'dmraid -c -s' changed its output format; cope with both old and new.
+    - Reinstate snd-powermac for i2s-a devices since apparently the lock-up
+      has been fixed.
+    - Remove dm-emc from the multipath modules, since it's gone since
+      2.6.27.
+    - Improve checks for dm-* drivers being present to avoid relying on them
+      being built as modules.
+    - Install libc6-vfp on armel systems where the vfp word is found in the
+      /proc/cpuinfo features.
+    - Offer iSCSI targets for preseeding if partman-iscsi is available and
+      no disk devices are found.
+    - Stop installing acpi, acpid, and acpi-support-base if acpi is
+      available.
+    - Add support for Dell Driver Injection disk v1, an integrated flash
+      media based solution for adding in drivers after OS launches.
+
+ -- Colin Watson <[e-mail]>  Mon, 09 Nov 2009 10:38:34 +0000
+
 hw-detect (1.73) unstable; urgency=low
 
   [ Otavio Salvador ]
@@ -456,6 +785,80 @@
 
  -- Colin Watson <[e-mail]>  Thu, 23 Jul 2009 16:40:23 +0100
 
+hw-detect (1.72ubuntu5) karmic; urgency=low
+
+  * Fix db_fget arguments when checking for partman-iscsi preseeding.
+
+ -- Colin Watson <[e-mail]>  Wed, 14 Oct 2009 20:51:53 +0100
+
+hw-detect (1.72ubuntu4) karmic; urgency=low
+
+  [ Colin Watson ]
+  * Drop disk-detect/iscsi/enable template, which is no longer used.
+  * Don't install mouseemu on Intel Mac desktops (LP: #251830).
+
+  [ Mario Limonciello ]
+  * Add support for Dell Driver Injection disk v1, an integrated flash media based 
+    solution for adding in drivers after OS launches.  This feature will be on 
+    upcoming Dell servers. (LP: #341526)
+
+ -- Colin Watson <[e-mail]>  Fri, 28 Aug 2009 09:59:27 +0100
+
+hw-detect (1.72ubuntu3) karmic; urgency=low
+
+  * Support preseeding of partman-iscsi/login/address.
+  * Don't call 'anna-install open-iscsi-udeb' if the iSCSI login choice is
+    selected; partman-iscsi must already be installed for this choice to be
+    offered, and it depends on open-iscsi-udeb already.
+
+ -- Colin Watson <[e-mail]>  Mon, 10 Aug 2009 18:05:43 +0100
+
+hw-detect (1.72ubuntu2) karmic; urgency=low
+
+  * Default iSCSI configuration to true, and stop installing open-iscsi-udeb
+    unconditionally here; partman-iscsi will take care of that. Instead,
+    offer iSCSI targets as a choice if partman-iscsi is available and no
+    disk devices are found, and implement compatibility with old-style
+    open-iscsi/targets preseeding (LP: #237460).
+  * Stop installing acpi, acpid, and acpi-support-base if acpi is available.
+    Most of these are going away and desktop facilities should take care of
+    whatever's left.
+
+ -- Colin Watson <[e-mail]>  Mon, 10 Aug 2009 13:24:35 +0100
+
+hw-detect (1.72ubuntu1) karmic; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - Install mouseemu on systems likely to have single-button mice (i.e.
+      Macs), but not powerpc64 since that causes an oops in the input layer.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+    - Add hooks for iSCSI support.
+    - disk-detect.sh: Do not check the kernel command line for any option
+      to enable dmraid support. If functional dmraid arrays are found, the
+      user will be asked if they wish to activate them.
+    - Make dmraid logging a bit neater.
+    - 'dmraid -c -s' changed its output format; cope with both old and new.
+    - Reinstate snd-powermac for i2s-a devices since apparently the lock-up
+      has been fixed.
+    - Remove dm-emc from the multipath modules, since it's gone since
+      2.6.27.
+    - Improve checks for dm-* drivers being present to avoid relying on them
+      being built as modules.
+    - Install libc6-vfp on armel systems where the vfp word is found in the
+      /proc/cpuinfo features.
+  * Don't use 'grep -w' in VFP-detection code, since busybox doesn't
+    implement it (LP: #359915).
+
+ -- Colin Watson <[e-mail]>  Tue, 02 Jun 2009 17:14:06 +0100
+
 hw-detect (1.72) unstable; urgency=low
 
   [ Colin Watson ]
@@ -483,6 +886,75 @@
 
  -- Frans Pop <[e-mail]>  Fri, 08 May 2009 07:45:48 +0200
 
+hw-detect (1.71ubuntu6) jaunty; urgency=low
+
+  [ Loic Minier ]
+  * Install libc6-vfp on armel systems where the vfp word is found in the
+    /proc/cpuinfo features.
+
+ -- Colin Watson <[e-mail]>  Fri, 27 Mar 2009 11:52:40 +0000
+
+hw-detect (1.71ubuntu5) jaunty; urgency=low
+
+  * Use 'update-dev --settle' rather than 'update-dev' after loading modules
+    (although not after installing new module packages, which may still
+    require a trigger). Requires di-utils 1.66.
+
+ -- Colin Watson <[e-mail]>  Wed, 04 Mar 2009 16:31:50 +0000
+
+hw-detect (1.71ubuntu4) jaunty; urgency=low
+
+  * Check dmraid's exit code as well as parsing its output, the latter for
+    backward compatibility with dmraid << 1.0.0.rc15-1~exp4 only
+    (LP: #325947).
+
+ -- Colin Watson <[e-mail]>  Thu, 12 Feb 2009 10:19:04 +0000
+
+hw-detect (1.71ubuntu3) jaunty; urgency=low
+
+  * Improve checks for dm-* drivers being present to avoid relying on them
+    being built as modules.
+
+ -- Colin Watson <[e-mail]>  Tue, 30 Dec 2008 14:38:36 +0000
+
+hw-detect (1.71ubuntu2) jaunty; urgency=low
+
+  * Backport from trunk:
+    - Ask the correct parameters question if modprobe fails.
+    - Cope with dm-mod being built-in.
+
+ -- Colin Watson <[e-mail]>  Mon, 29 Dec 2008 21:28:16 +0000
+
+hw-detect (1.71ubuntu1) jaunty; urgency=low
+
+  [ Timo Aaltonen ]
+  * disk-detect.sh: Remove dm-emc from the multipath modules, since
+    it's gone since 2.6.27.
+
+  [ Colin Watson ]
+  * Resynchronise with Debian. Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - Install mouseemu on systems likely to have single-button mice (i.e.
+      Macs), but not powerpc64 since that causes an oops in the input layer.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+    - Add hooks for iSCSI support.
+    - disk-detect.sh: Do not check the kernel command line for any option
+      to enable dmraid support. If functional dmraid arrays are found, the
+      user will be asked if they wish to activate them.
+    - Make dmraid logging a bit neater.
+    - 'dmraid -c -s' changed its output format; cope with both old and new.
+    - Reinstate snd-powermac for i2s-a devices since apparently the lock-up
+      has been fixed.
+
+ -- Colin Watson <[e-mail]>  Tue, 23 Dec 2008 19:01:16 +0000
+
 hw-detect (1.71) unstable; urgency=low
 
   * Pass all_generic_ide as a plain boot option instead of with the value 1 as
@@ -491,6 +963,41 @@
 
  -- Frans Pop <[e-mail]>  Wed, 17 Dec 2008 20:54:19 +0100
 
+hw-detect (1.70ubuntu3) jaunty; urgency=low
+
+  * Reinstate snd-powermac for i2s-a devices since apparently the lock-up
+    has been fixed (LP: #87652).
+
+ -- Colin Watson <[e-mail]>  Thu, 27 Nov 2008 17:46:21 +0000
+
+hw-detect (1.70ubuntu2) jaunty; urgency=low
+
+  * Make dmraid logging a bit neater.
+  * 'dmraid -c -s' changed its output format; cope with both old and new.
+
+ -- Colin Watson <[e-mail]>  Thu, 20 Nov 2008 18:20:39 +0000
+
+hw-detect (1.70ubuntu1) jaunty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - Install mouseemu on systems likely to have single-button mice (i.e.
+      Macs), but not powerpc64 since that causes an oops in the input layer.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+    - Add hooks for iSCSI support.
+    - disk-detect.sh: Do not check the kernel command line for any option
+      to enable dmraid support. If functional dmraid arrays are found, the
+      user will be asked if they wish to activate them.
+
+ -- Luke Yelavich <[e-mail]>  Wed, 05 Nov 2008 10:56:29 +1100
+
 hw-detect (1.70) unstable; urgency=low
 
   [ Frans Pop ]
@@ -653,6 +1160,47 @@
 
  -- Joey Hess <[e-mail]>  Mon, 07 Jul 2008 13:50:33 -0400
 
+hw-detect (1.63ubuntu4) intrepid; urgency=low
+
+  * disk-detect.sh, debian/disk-detect.templates: If dmraid arrays are found,
+    ask the user if they want to use them. (LP: #279288)
+
+ -- Luke Yelavich <[e-mail]>  Wed, 15 Oct 2008 09:41:15 +1100
+
+hw-detect (1.63ubuntu3) intrepid; urgency=low
+
+  * disk-detect.sh: Do not pass the complete device node path to
+    dmraid-activate, since it no longer uses basename.
+
+ -- Luke Yelavich <[e-mail]>  Thu, 25 Sep 2008 11:09:36 +1000
+
+hw-detect (1.63ubuntu2) intrepid; urgency=low
+
+  * disk-detect.sh: Do not check the kernel command line for any option
+    to enable dmraid support. If functional dmraid arrays are found, they
+    will be activated.
+  * debian/disk-detect.templates: Remove disk-detect/dmraid/enable template.
+
+ -- Luke Yelavich <[e-mail]>  Thu, 28 Aug 2008 00:13:21 +1000
+
+hw-detect (1.63ubuntu1) intrepid; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - Install mouseemu on systems likely to have single-button mice (i.e.
+      Macs), but not powerpc64 since that causes an oops in the input layer.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+    - Add hooks for iSCSI support.
+
+ -- Colin Watson <[e-mail]>  Thu, 26 Jun 2008 13:00:09 +0100
+
 hw-detect (1.63) unstable; urgency=low
 
   [ Colin Watson, Frans Pop ]
@@ -668,6 +1216,24 @@
 
  -- Frans Pop <[e-mail]>  Tue, 17 Jun 2008 14:08:02 +0200
 
+hw-detect (1.62ubuntu1) intrepid; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - Install mouseemu on systems likely to have single-button mice (i.e.
+      Macs), but not powerpc64 since that causes an oops in the input layer.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+    - Add hooks for iSCSI support.
+
+ -- Colin Watson <[e-mail]>  Sun, 15 Jun 2008 22:37:38 +0100
+
 hw-detect (1.62) unstable; urgency=low
 
   [ Updated translations ]
@@ -731,6 +1297,30 @@
 
  -- Otavio Salvador <[e-mail]>  Fri, 15 Feb 2008 08:14:58 -0200
 
+hw-detect (1.58ubuntu2) hardy; urgency=low
+
+  * Add hooks for iSCSI support.
+
+ -- Soren Hansen <[e-mail]>  Fri, 08 Feb 2008 17:08:44 +0100
+
+hw-detect (1.58ubuntu1) hardy; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - Install mouseemu on systems likely to have single-button mice (i.e.
+      Macs), but not powerpc64 since that causes an oops in the input layer.
+    - On powerpc/ps3 systems, load ps3rom, ps3disk, and ps3_gelic, and add
+      snd_ps3 to /etc/modules.
+    - Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+  * Set Vcs-Bzr for Ubuntu.
+
+ -- Colin Watson <[e-mail]>  Tue, 27 Nov 2007 14:13:59 +0000
+
 hw-detect (1.58) unstable; urgency=low
 
   * Install acpi-support-base, needed now to get power button shutdowns to
@@ -823,6 +1413,35 @@
 
  -- Frans Pop <[e-mail]>  Fri, 06 Jul 2007 00:17:19 +0200
 
+hw-detect (1.53ubuntu3) gutsy; urgency=low
+
+  * We now need to use ps3rom and ps3disk rather than ps3_storage.
+  * gelic_net was renamed to ps3_gelic.
+
+ -- Colin Watson <[e-mail]>  Thu, 27 Sep 2007 14:28:19 +0100
+
+hw-detect (1.53ubuntu2) gutsy; urgency=low
+
+  * Install elfspe2 on Cell (powerpc/ps3 and powerpc/cell) platforms.
+
+ -- Colin Watson <[e-mail]>  Thu, 20 Sep 2007 21:42:09 +0100
+
+hw-detect (1.53ubuntu1) gutsy; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - Install mouseemu on systems likely to have single-button mice (i.e.
+      Macs), but not powerpc64 since that causes an oops in the input layer.
+    - On powerpc/ps3 systems, load ps3_storage and gelic_net and add snd_ps3
+      to /etc/modules.
+
+ -- Evan Dandrea <[e-mail]>  Mon, 11 Jun 2007 10:31:27 -0400
+
 hw-detect (1.53) unstable; urgency=low
 
   [ Joey Hess ]
@@ -834,6 +1453,29 @@
 
  -- Frans Pop <[e-mail]>  Mon, 21 May 2007 16:38:31 +0200
 
+hw-detect (1.52ubuntu2) gutsy; urgency=low
+
+  * Install ps3pf-utils on powerpc/ps3 systems.
+
+ -- Colin Watson <[e-mail]>  Thu, 17 May 2007 14:58:59 +0100
+
+hw-detect (1.52ubuntu1) gutsy; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - Depend on pciutils-udeb for lspci.
+    - Install mouseemu on systems likely to have single-button mice (i.e.
+      Macs), but not powerpc64 since that causes an oops in the input layer.
+    - On powerpc/ps3 systems, load ps3_storage and gelic_net and add snd_ps3
+      to /etc/modules.
+
+ -- Colin Watson <[e-mail]>  Thu, 26 Apr 2007 15:30:32 +0100
+
 hw-detect (1.52) unstable; urgency=low
 
   * Code cleanup:
@@ -918,6 +1560,47 @@
 
  -- Frans Pop <[e-mail]>  Thu, 21 Dec 2006 16:24:44 +0100
 
+hw-detect (1.45ubuntu5) feisty; urgency=low
+
+  * Don't install mouseemu on powerpc64 for now; it causes a kernel oops
+    somewhere in the input layer (thanks, Benjamin Herrenschmidt).
+
+ -- Colin Watson <[e-mail]>  Sun, 15 Apr 2007 10:06:28 +0100
+
+hw-detect (1.45ubuntu4) feisty; urgency=low
+
+  * Load ps3_storage and gelic_net on powerpc/ps3 systems. (The initramfs
+    will take care of loading them on the installed system.)
+
+ -- Colin Watson <[e-mail]>  Wed, 11 Apr 2007 03:10:38 +0100
+
+hw-detect (1.45ubuntu3) feisty; urgency=low
+
+  * Add snd_ps3 to /etc/modules on powerpc/ps3 systems.
+
+ -- Colin Watson <[e-mail]>  Fri, 30 Mar 2007 17:59:32 +0100
+
+hw-detect (1.45ubuntu2) feisty; urgency=low
+
+  * Install mouseemu on systems likely to have single-button mice (i.e.
+    Macs).
+  * Set Maintainer to [e-mail].
+
+ -- Colin Watson <[e-mail]>  Fri, 23 Feb 2007 14:59:32 +0000
+
+hw-detect (1.45ubuntu1) feisty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - Depend on pciutils-udeb for lspci.
+
+ -- Colin Watson <[e-mail]>  Tue, 19 Dec 2006 14:07:25 +0000
+
 hw-detect (1.45) unstable; urgency=low
 
   * Add sbus-discover back in as sysfs support for sbus turns out to be
@@ -955,6 +1638,19 @@
 
  -- Frans Pop <[e-mail]>  Thu, 30 Nov 2006 15:33:36 +0100
 
+hw-detect (1.43ubuntu1) feisty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Remove FireWire Ethernet support.
+    - Register lp module on i386 and amd64.
+    - Exit zero if you continue all the way through ethdetect's errors about
+      having no network interfaces.
+    - Register rtc module on amd64.
+    - Drop priorities of a couple of ethdetect questions to medium.
+    - Depend on pciutils-udeb for lspci.
+
+ -- Colin Watson <[e-mail]>  Wed, 22 Nov 2006 12:01:12 +0000
+
 hw-detect (1.43) unstable; urgency=low
 
   [ Updated translations ]
@@ -1043,6 +1739,20 @@
 
  -- Frans Pop <[e-mail]>  Sat, 16 Sep 2006 11:38:58 +0200
 
+hw-detect (1.41ubuntu2) edgy; urgency=low
+
+  * Backport from trunk:
+    - Use list-devices to check for disks if parted_devices if unavailable.
+      Requires di-utils 1.33.
+
+ -- Colin Watson <[e-mail]>  Tue, 29 Aug 2006 11:13:10 +0100
+
+hw-detect (1.41ubuntu1) edgy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <[e-mail]>  Tue, 29 Aug 2006 10:25:30 +0100
+
 hw-detect (1.41) unstable; urgency=low
 
   [ Colin Watson ]
@@ -1098,6 +1808,28 @@
 
  -- Frans Pop <[e-mail]>  Tue, 25 Jul 2006 13:04:38 +0200
 
+hw-detect (1.38ubuntu3) edgy; urgency=low
+
+  * If /proc/sys/kernel/hotplug is empty or /sbin/udevsend, then
+    HOTPLUG_TYPE is always udev even if /etc/hotplug is present (closes:
+    Malone #53400).
+
+ -- Colin Watson <[e-mail]>  Wed, 19 Jul 2006 07:35:48 +0100
+
+hw-detect (1.38ubuntu2) edgy; urgency=low
+
+  * Backport from trunk:
+    - Fix disk_found to return 1 (no disks found) if it falls off the end of
+      its loop.
+
+ -- Colin Watson <[e-mail]>  Tue, 18 Jul 2006 15:29:49 +0100
+
+hw-detect (1.38ubuntu1) edgy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <[e-mail]>  Wed, 28 Jun 2006 13:21:11 +0100
+
 hw-detect (1.38) unstable; urgency=low
 
   * Change ethdetect menu item number from 15 to 18. cdrom-detect, load-iso,
@@ -1293,6 +2025,47 @@
 
  -- Frans Pop <[e-mail]>  Wed,  1 Feb 2006 15:40:33 +0100
 
+hw-detect (1.32ubuntu6) dapper; urgency=low
+
+  * Backport from trunk:
+    - Fix sysfs-update-devnames not to try to use 'local' outside a
+      function, which bash doesn't like.
+
+ -- Colin Watson <[e-mail]>  Mon,  8 May 2006 11:48:09 +0100
+
+hw-detect (1.32ubuntu5) dapper; urgency=low
+
+  * Take floppy back out of /etc/modules; turns out the kernel's PnP
+    subsystem is broken.
+
+ -- Colin Watson <[e-mail]>  Thu,  2 Mar 2006 13:11:19 +0000
+
+hw-detect (1.32ubuntu4) dapper; urgency=low
+
+  * Add floppy to /etc/modules (closes: Malone #32599).
+
+ -- Colin Watson <[e-mail]>  Tue, 28 Feb 2006 11:03:44 +0000
+
+hw-detect (1.32ubuntu3) dapper; urgency=low
+
+  * Remove old hack to register specific sparc modules.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Fri, 24 Feb 2006 11:28:14 +0100
+
+hw-detect (1.32ubuntu2) dapper; urgency=low
+
+  * Stop registering mousedev, which is built into the kernel now.
+
+ -- Colin Watson <[e-mail]>  Thu,  2 Feb 2006 18:15:21 +0000
+
+hw-detect (1.32ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+  * Drop casper symlinks, no longer required following casper's
+    reimplementation as initramfs hooks.
+
+ -- Colin Watson <[e-mail]>  Wed, 18 Jan 2006 01:06:30 +0000
+
 hw-detect (1.32) unstable; urgency=low
 
   * I observed a scsi disk that required three seconds from the end of
@@ -1336,6 +2109,20 @@
 
  -- Joey Hess <[e-mail]>  Sat,  3 Dec 2005 12:55:10 -0500
 
+hw-detect (1.29ubuntu2) dapper; urgency=low
+
+  * Replace another udevsynthesize call with update-dev.
+
+ -- Colin Watson <[e-mail]>  Mon,  5 Dec 2005 22:50:30 +0000
+
+hw-detect (1.29ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+  * Depend on udev-udeb ahead of discover to make sure germinate doesn't get
+    confused.
+
+ -- Colin Watson <[e-mail]>  Fri,  2 Dec 2005 11:31:56 +0000
+
 hw-detect (1.29) unstable; urgency=low
 
   * Add udev-udeb as alternate dependency for discover.
@@ -1345,6 +2132,12 @@
 
  -- Colin Watson <[e-mail]>  Fri,  2 Dec 2005 10:38:29 +0000
 
+hw-detect (1.28ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <[e-mail]>  Thu,  1 Dec 2005 13:26:37 +0000
+
 hw-detect (1.28) unstable; urgency=low
 
   [ Frans Pop ]
@@ -1374,6 +2167,12 @@
 
  -- Colin Watson <[e-mail]>  Tue, 22 Nov 2005 21:16:15 +0000
 
+hw-detect (1.26ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <[e-mail]>  Mon, 21 Nov 2005 13:03:49 +0000
+
 hw-detect (1.26) unstable; urgency=low
 
   [ Colin Watson ]
@@ -1406,6 +2205,12 @@
 
  -- Frans Pop <[e-mail]>  Tue, 15 Nov 2005 20:55:09 +0100
 
+hw-detect (1.24ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <[e-mail]>  Thu, 27 Oct 2005 12:07:54 +0100
+
 hw-detect (1.24) unstable; urgency=low
 
   * Use log-output.
@@ -1440,6 +2245,25 @@
 
  -- Joey Hess <[e-mail]>  Wed, 17 Aug 2005 09:29:46 -0400
 
+hw-detect (1.22ubuntu3) breezy; urgency=low
+
+  * Sparc only change: remove sunlance, sunbmac and sunqe autoprobe.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Sat, 01 Oct 2005 17:29:03 +0200
+
+hw-detect (1.22ubuntu2) breezy; urgency=low
+
+  * Sparc only change: be sure to load modules for devices that can be on sbus
+    (not hotplug friendly yet)
+
+ -- Fabio M. Di Nitto <[e-mail]>  Thu, 29 Sep 2005 15:45:59 +0200
+
+hw-detect (1.22ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <[e-mail]>  Thu, 28 Jul 2005 16:30:32 +0100
+
 hw-detect (1.22) unstable; urgency=low
 
   [ Joey Hess ]
@@ -1463,6 +2287,12 @@
 
  -- Colin Watson <[e-mail]>  Thu, 28 Jul 2005 10:59:46 +0100
 
+hw-detect (1.21ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <[e-mail]>  Wed, 20 Jul 2005 14:43:23 +0100
+
 hw-detect (1.21) unstable; urgency=low
 
   * Updated translations: 
@@ -1538,6 +2368,19 @@
 
  -- Joey Hess <[e-mail]>  Fri, 17 Jun 2005 23:06:58 -0400
 
+ddetect (1.18ubuntu2) breezy; urgency=low
+
+  * Don't register ide-* modules; hotplug is responsible for loading them
+    now (closes: Ubuntu #9099).
+
+ -- Colin Watson <[e-mail]>  Wed, 29 Jun 2005 12:59:14 +0100
+
+ddetect (1.18ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <[e-mail]>  Tue,  7 Jun 2005 21:07:06 +0100
+
 ddetect (1.18) unstable; urgency=low
 
   * Joey Hess
@@ -1569,6 +2412,12 @@
 
  -- Colin Watson <[e-mail]>  Mon, 30 May 2005 01:08:39 +0100
 
+ddetect (1.17ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <[e-mail]>  Wed, 11 May 2005 14:35:22 +0100
+
 ddetect (1.17) unstable; urgency=low
 
   * Joey Hess
@@ -1650,6 +2499,12 @@
 
  -- Joey Hess <[e-mail]>  Sun,  1 May 2005 16:51:56 -0400
 
+ddetect (1.14ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <[e-mail]>  Thu, 14 Apr 2005 19:38:00 +0100
+
 ddetect (1.14) unstable; urgency=low
 
   * Kurt Roeckx
@@ -1693,6 +2548,94 @@
 
  -- Joey Hess <[e-mail]>  Mon, 10 Jan 2005 15:56:59 -0500
 
+ddetect (1.11ubuntu13) hoary; urgency=low
+
+  * Don't install pcmcia-cs if hw-detect/start_pcmcia=false (closes: Ubuntu
+    #8678).
+
+ -- Colin Watson <[e-mail]>  Tue,  5 Apr 2005 14:14:20 +0100
+
+ddetect (1.11ubuntu12) hoary; urgency=low
+
+  * Add draft Xhosa translation.
+
+ -- Colin Watson <[e-mail]>  Tue, 22 Mar 2005 13:55:05 +0000
+
+ddetect (1.11ubuntu11) hoary; urgency=low
+
+  * Move udevstart call to the end of hw-detect, in an attempt to make
+    device creation more reliable.
+
+ -- Colin Watson <[e-mail]>  Tue,  8 Mar 2005 11:50:12 +0000
+
+ddetect (1.11ubuntu10) hoary; urgency=low
+
+  * Don't exit early if there are no modules to load (as can easily happen,
+    since Ubuntu's rootskel coldplugs everything it can at boot time when
+    using hotplug).
+
+ -- Colin Watson <[e-mail]>  Sat,  5 Mar 2005 16:17:27 +0000
+
+ddetect (1.11ubuntu9) hoary; urgency=low
+
+  * Run udevstart after running hotplug scripts, to make sure that it
+    creates device nodes synchronously.
+
+ -- Colin Watson <[e-mail]>  Mon, 28 Feb 2005 19:35:55 +0000
+
+ddetect (1.11ubuntu8) hoary; urgency=low
+
+  * Escape commas in lspci output for devnames.
+
+ -- Colin Watson <[e-mail]>  Thu, 24 Feb 2005 15:45:28 +0000
+
+ddetect (1.11ubuntu7) hoary; urgency=low
+
+  * Add pciutils-udeb dependency to ethdetect too so that cdrom installs
+    pull it in.
+  * Check that lspci is available before updating devnames from sysfs.
+
+ -- Colin Watson <[e-mail]>  Fri, 18 Feb 2005 11:14:10 +0000
+
+ddetect (1.11ubuntu6) hoary; urgency=low
+
+  * After each hardware detection run, update /etc/network/devnames from
+    /sys/class/net, using lspci to get the network device name.
+
+ -- Colin Watson <[e-mail]>  Tue,  8 Feb 2005 18:06:24 +0000
+
+ddetect (1.11ubuntu5) hoary; urgency=low
+
+  * Add link to prebaseconfig script in /usr/lib/casper/pre.d.
+
+ -- Colin Watson <[e-mail]>  Tue, 18 Jan 2005 20:02:09 +0000
+
+ddetect (1.11ubuntu4) hoary; urgency=low
+
+  * Test for the /etc/hotplug directory rather than hotplug.real or udevsend
+    to decide whether we're using real hotplug.
+
+ -- Colin Watson <[e-mail]>  Wed, 12 Jan 2005 15:10:49 +0000
+
+ddetect (1.11ubuntu3) hoary; urgency=low
+
+  * Acknowledge the presence of udevsend, as well as hotplug.real, when
+    deciding whether we are using real hotplug
+
+ -- Matt Zimmerman <[e-mail]>  Wed, 12 Jan 2005 00:26:01 -0800
+
+ddetect (1.11ubuntu2) hoary; urgency=low
+
+  * Drop priorities of a couple of ethdetect questions to medium.
+
+ -- Colin Watson <[e-mail]>  Sat,  1 Jan 2005 23:50:49 +0000
+
+ddetect (1.11ubuntu1) hoary; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <[e-mail]>  Sun,  5 Dec 2004 16:09:34 +0000
+
 ddetect (1.11) unstable; urgency=low
 
   * Colin Watson
@@ -1722,6 +2665,34 @@
 
  -- Joey Hess <[e-mail]>  Wed,  1 Dec 2004 16:14:06 -0500
 
+ddetect (1.10ubuntu4) hoary; urgency=low
+
+  * Test $HOTPLUG_TYPE, not $hotplug_type.
+
+ -- Colin Watson <[e-mail]>  Wed, 24 Nov 2004 17:44:59 +0000
+
+ddetect (1.10ubuntu3) hoary; urgency=low
+
+  * Depend on hotplug-udeb | discover rather than just discover.
+
+ -- Colin Watson <[e-mail]>  Tue, 23 Nov 2004 20:23:47 +0000
+
+ddetect (1.10ubuntu2) hoary; urgency=low
+
+  * Add integration with hotplug:
+    - Re-run hotplug rc scripts during hardware detection.
+    - Hook into net events so that we can record them for netcfg.
+    - Remove firmware loading support. hotplug itself should be able to
+      handle this now.
+
+ -- Colin Watson <[e-mail]>  Tue, 23 Nov 2004 18:08:04 +0000
+
+ddetect (1.10ubuntu1) hoary; urgency=low
+
+  * Resynchronise with Debian (thanks, Scott James Remnant).
+
+ -- Colin Watson <[e-mail]>  Thu, 28 Oct 2004 19:41:11 +0100
+
 ddetect (1.10) unstable; urgency=low
 
   * Colin Watson
@@ -1854,6 +2825,114 @@
 
  -- Joey Hess <[e-mail]>  Fri,  3 Sep 2004 15:06:55 -0400
 
+ddetect (1.03ubuntu14) warty; urgency=low
+
+  * register-module rtc on amd64 (closes: Ubuntu #1659).
+
+ -- Colin Watson <[e-mail]>  Sun, 17 Oct 2004 20:13:52 +0100
+
+ddetect (1.03ubuntu13) warty; urgency=low
+
+  * Create /sbin! Both /sbin/hotplug and (on powerpc) /bin/discover-mac-io
+    go missing otherwise.
+
+ -- Colin Watson <[e-mail]>  Sat,  2 Oct 2004 18:49:19 +0100
+
+ddetect (1.03ubuntu12) warty; urgency=low
+
+  * Look through all of /proc/device-tree/, not just the mac-io bus. Slower
+    but apparently necessary for at least the therm_* fan controllers, which
+    are on uni-n here (closes: Ubuntu #1606).
+
+ -- Colin Watson <[e-mail]>  Thu, 30 Sep 2004 20:46:05 +0100
+
+ddetect (1.03ubuntu11) warty; urgency=low
+
+  * Copy firmware loading code from hotplug-pcmcia.sh to hotplug-misc.sh,
+    installed as /sbin/hotplug, so that firmware loading works for
+    non-PCMCIA devices.
+
+ -- Colin Watson <[e-mail]>  Wed, 29 Sep 2004 00:46:27 +0100
+
+ddetect (1.03ubuntu10) warty; urgency=low
+
+  * Use /lib/hotplug/firmware rather than /lib/firmware, to match current
+    hotplug.
+
+ -- Colin Watson <[e-mail]>  Wed, 29 Sep 2004 00:15:12 +0100
+
+ddetect (1.03ubuntu9) warty; urgency=low
+
+  * Register ide-disk in /etc/modules if IDE devices are present (closes:
+    Warty #1400).
+
+ -- Colin Watson <[e-mail]>  Mon, 20 Sep 2004 14:35:28 +0100
+
+ddetect (1.03ubuntu8) warty; urgency=low
+
+  * Several improvements to discover-mac-io, backported from Debian:
+    - Detect mesh SCSI controller.
+    - Detect mace Ethernet controller.
+    - Detect mac53c94 SCSI controller.
+    - Detect therm_adt746x and therm_windtunnel fan controllers, although
+      only post-reboot for now since those modules aren't in
+      linux-kernel-di-powerpc-*.
+    - Cope with /proc/device-tree/aliases/mac-io pointing to a symlink.
+
+ -- Colin Watson <[e-mail]>  Mon, 20 Sep 2004 13:53:10 +0100
+
+ddetect (1.03ubuntu7) warty; urgency=low
+
+  * Search for firmware in /lib/firmware as well as
+    /usr/lib/hotplug/firmware.
+  * Search for firmware with filenames including the kernel version number
+    (closes: Warty #1316).
+
+ -- Colin Watson <[e-mail]>  Fri, 17 Sep 2004 20:28:37 +0100
+
+ddetect (1.03ubuntu6) warty; urgency=low
+
+  * Add the ability to back up from the error messages you get if ethdetect
+    can't find any network interfaces.
+  * Exit zero if you continue all the way through said errors. The warnings
+    are scary enough, and netcfg handles the no-interfaces case reasonably
+    gracefully.
+
+ -- Colin Watson <[e-mail]>  Sun, 12 Sep 2004 16:16:20 +0100
+
+ddetect (1.03ubuntu5) warty; urgency=low
+
+  * Unconditionally load the psmouse module for i386. 
+
+ -- Daniel Stone <[e-mail]>  Sun, 12 Sep 2004 02:07:17 +1000
+
+ddetect (1.03ubuntu4) warty; urgency=low
+
+  * Add firmware loading support (somewhat temporarily hacked-up until we
+    get a real hotplug-udeb).
+  * Register lp module on i386 and amd64 (closes: Warty #1039).
+
+ -- Colin Watson <[e-mail]>  Mon,  6 Sep 2004 15:09:51 +0100
+
+ddetect (1.03ubuntu3) warty; urgency=low
+
+  * Register mousedev module, unconditionally.
+
+ -- Colin Watson <[e-mail]>  Fri,  3 Sep 2004 03:56:45 +0100
+
+ddetect (1.03ubuntu2) warty; urgency=low
+
+  * Register apm_emu module on powerpc systems with a via-pmu (closes: Warty
+    #974).
+
+ -- Colin Watson <[e-mail]>  Fri,  3 Sep 2004 03:35:28 +0100
+
+ddetect (1.03ubuntu1) warty; urgency=low
+
+  * Merge from Debian to get mac-io detection improvements.
+
+ -- Colin Watson <[e-mail]>  Thu,  2 Sep 2004 14:51:54 +0100
+
 ddetect (1.03) unstable; urgency=low
 
   * Martin Michlmayr
@@ -1924,6 +3003,12 @@
 
  -- Joshua Kwan <[e-mail]>  Mon, 23 Aug 2004 01:44:51 -0700
 
+ddetect (1.00ubuntu1) warty; urgency=low
+
+  * Remove FireWire Ethernet support. We'll be removing it from hotplug too.
+
+ -- Colin Watson <[e-mail]>  Wed,  1 Sep 2004 17:46:06 +0100
+
 ddetect (1.00) unstable; urgency=low
 
   * Updated translations: 

=== modified file 'debian/control'
--- debian/control	2013-06-07 00:01:41 +0000
+++ debian/control	2013-08-23 18:07:28 +0000
@@ -1,11 +1,19 @@
 Source: hw-detect
 Section: debian-installer
 Priority: standard
-Maintainer: Debian Install System Team <[e-mail]>
+Maintainer: Ubuntu Installer Team <[e-mail]>
+XSBC-Original-Maintainer: Debian Install System Team <[e-mail]>
 Uploaders: Petter Reinholdtsen <[e-mail]>, Colin Watson <[e-mail]>, Christian Perrier <[e-mail]>
+<<<<<<< TREE
 Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.9.0), po-debconf (>= 0.5.0), libdebian-installer4-dev (>= 0.76)
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/hw-detect.git
 Vcs-Git: git://anonscm.debian.org/d-i/hw-detect.git
+=======
+Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.9.0), po-debconf (>= 0.5.0), libdebian-installer4-dev (>= 0.76)
+XS-Debian-Vcs-Browser: http://git.debian.org/?p=d-i/hw-detect.git
+XS-Debian-Vcs-Git: git://git.debian.org/d-i/hw-detect.git
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/hw-detect/ubuntu
+>>>>>>> MERGE-SOURCE
 
 Package: hw-detect
 Package-Type: udeb
@@ -46,3 +54,17 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Hardware architecture detector
+
+Package: archdetect-deb
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Hardware architecture detector
+ This package provides the 'archdetect' tool, which displays the current
+ machine architecture and subarchitecture.  The architecture corresponds to
+ that built into dpkg, and describes the CPU (and possibly kernel) types;
+ the subarchitecture distinguishes machines with different boot arrangements
+ that require special handling.
+ .
+ This package would be called 'archdetect', but a udeb of that name already
+ existed for use in the installer.

=== modified file 'debian/copyright'
--- debian/copyright	2000-11-25 21:13:53 +0000
+++ debian/copyright	2013-08-23 18:07:28 +0000
@@ -4,4 +4,5 @@
 
 Copyright 2000 David Whedon <[e-mail]>
 
-The copyright of this package is GPL, version 2 or later.
+The copyright of this package is GPL, version 2 or later.  On Debian
+systems, a copy is available in /usr/share/common-licenses/GPL-2.

=== modified file 'debian/disk-detect.templates'
--- debian/disk-detect.templates	2008-05-06 14:43:45 +0000
+++ debian/disk-detect.templates	2013-08-23 18:07:28 +0000
@@ -11,6 +11,7 @@
 
 Template: disk-detect/module_select
 Type: select
+Choices-C: continue, ${CHOICES-C}, none
 # :sl2:
 #flag:translate!:2
 #flag:comment:3
@@ -30,15 +31,19 @@
  .
  Please check that a hard disk is attached to this machine.
 
-Template: disk-detect/dmraid/enable
-Type: boolean
-Default: false
-Description: for internal use; can be preseeded
- Check for the presence of Serial ATA RAID (dmraid) disks?
-
 Template: disk-detect/multipath/enable
 Type: boolean
 Default: false
 Description: for internal use; can be preseeded
  Check for the presence of multipath devices?
 
+Template: disk-detect/activate_dmraid
+Type: boolean
+Default: true
+_Description: Activate Serial ATA RAID devices?
+ One or more drives containing Serial ATA RAID configurations have been found.
+ Do you wish to activate these RAID devices?
+
+Template: disk-detect/iscsi_choice
+Type: text
+_Description: login to iSCSI targets

=== modified file 'debian/po/am.po'
--- debian/po/am.po	2011-07-06 20:38:29 +0000
+++ debian/po/am.po	2013-08-23 18:07:28 +0000
@@ -160,6 +160,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "እባክዎ ዲስክ ማጫወቻው አስሊው ውስጥ በትክክል መያያዙን ያረጋግጡ።"
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ar.po'
--- debian/po/ar.po	2011-07-06 20:38:29 +0000
+++ debian/po/ar.po	2013-08-23 18:07:28 +0000
@@ -164,6 +164,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "الرجاء التحقق من وجود قرصٍ صلب موصول بهذا الجهاز."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "تفعيل أجهزة Serial ATA RAID؟"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"عثر واحد أو أكثر من محركات الأقراص المحتوية على تكوينات Serial ATA RAID . "
+"أترغب في تنشيط أجهزة RAID هذه؟"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "الولوج لوجهات iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ast.po'
--- debian/po/ast.po	2012-10-09 22:19:33 +0000
+++ debian/po/ast.po	2013-08-23 18:07:28 +0000
@@ -172,6 +172,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Por favor, tate seguru de que se coneutó un discu duru a esti equipu."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "¿Activar preseos serie ATA RAID?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Alcontráronse ún o más preseos que contienen configuración serie ATA RAID. "
+"¿Quier activar estos preseos?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "accesu a oxetivos iSCi"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/be.po'
--- debian/po/be.po	2012-11-08 06:17:07 +0000
+++ debian/po/be.po	2013-08-23 18:07:28 +0000
@@ -175,6 +175,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Калі ласка, праверце,каб да машыны быў падключаны жорсткі дыск."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Актываваць прылады Serial ATA RAID?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Знойдзены адзін або некалькі дыскаў, якія зьмяшчаюць канфігурацыі SATA RAID. "
+"Хочаце ўключыць гэтыя RAID прылады?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "далучыцца да прылады iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/bg.po'
--- debian/po/bg.po	2012-02-25 23:05:17 +0000
+++ debian/po/bg.po	2013-08-23 18:07:28 +0000
@@ -187,6 +187,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Моля, проверете дали е прикачен твърд диск към тази машина."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Активиране на Serial ATA RAID устройства?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Беше намерено едно или повече устройства, които са конфигурирани в Serial "
+"ATA RAID. Искате ли тези устройства да се използват?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "влизане в iSCSI устройства"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/bn.po'
--- debian/po/bn.po	2011-07-06 20:38:29 +0000
+++ debian/po/bn.po	2013-08-23 18:07:28 +0000
@@ -175,6 +175,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "অনুগ্রহপূর্বক এই কম্পিউটারে কোন হার্ডডিস্ক সংযুক্ত আছে কিনা তা নিশ্চিত হন।"
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "সিরিয়াল ATA RAID ডিভাইস সক্রিয় করা হবে কি?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"সিরিয়াল ATA RAID কনফিগারেশন সম্বলিত এক বা একাধিক ড্রাইভ পাওয়া গেছে। আপনি কি এই "
+"RAID ডিভাইসগুলো সক্রিয় করতে চান?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "iSCSI টারগেটে লগইন"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/bo.po'
--- debian/po/bo.po	2012-04-16 07:00:03 +0000
+++ debian/po/bo.po	2013-08-23 18:07:28 +0000
@@ -155,6 +155,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "སྲ་སྡེར་དེ་འཕྲུལ་ཆས་འདི་དང་སྦྲེལ་ཡོད་པར་དག་ཐེར་བྱེད་རོགས"
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/bs.po'
--- debian/po/bs.po	2011-07-06 20:38:29 +0000
+++ debian/po/bs.po	2013-08-23 18:07:28 +0000
@@ -167,6 +167,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Molim provjerite da li je hard disk priključen na ovu mašinu."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktiviraj Serijske ATA RAID uređaje?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Pronađeni su jedan ili više diskova koji sadrže Serial ATA RAID "
+"konfiguraciju. Da li želiš aktivirati ove RAID uređaje?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "spajam se na iSCSI mete"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ca.po'
--- debian/po/ca.po	2012-12-03 22:20:49 +0000
+++ debian/po/ca.po	2013-08-23 18:07:28 +0000
@@ -174,6 +174,28 @@
 msgstr ""
 "Si us plau, comproveu que hi ha un disc dur connectat a aquest ordinador."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Voleu activar els dispositius RAID de tipus ATA en sèrie?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"S'han trobat un o més dispositius que contenen configuracions RAID de tipus "
+"ATA en sèrie. Voleu activar aquests dispositius RAID?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "entrada a objectius iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2011-07-06 20:38:29 +0000
+++ debian/po/cs.po	2013-08-23 18:07:28 +0000
@@ -163,6 +163,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Zkontrolujte, zda je k tomuto počítači připojen pevný disk."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktivovat SATA RAID zařízení?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Bylo nalezeno jeden nebo více disků obsahujících konfigurace SATA RAID. "
+"Přejete si aktivovat tato RAID zařízení?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "příhlásit k iSCSI cílům"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/cy.po'
--- debian/po/cy.po	2012-06-14 21:06:23 +0000
+++ debian/po/cy.po	2013-08-23 18:07:28 +0000
@@ -173,6 +173,26 @@
 msgstr ""
 "Gwiriwch fod disg galed wedi ei gysylltu i'r peiriant hwn, os gwelwch yn dda."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/da.po'
--- debian/po/da.po	2011-07-06 20:38:29 +0000
+++ debian/po/da.po	2013-08-23 18:07:28 +0000
@@ -172,6 +172,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Tjek at der er en harddisk forbundet til denne maskine."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktivér seriel ATA-RAID-enheder?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Der er blevet fundet et eller flere drev, som indeholder seriel ATA-RAID-"
+"konfigurationer. Vil du aktivere disse RAID-enheder?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "logind til iSCSI-mål"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/de.po'
--- debian/po/de.po	2011-08-14 23:05:42 +0000
+++ debian/po/de.po	2013-08-23 18:07:28 +0000
@@ -189,6 +189,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Bitte prüfen Sie, ob eine Festplatte angeschlossen ist."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Serielle ATA-RAID-Geräte aktivieren?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Ein oder mehrere Laufwerke, die serielle ATA-RAID-Konfigurationen "
+"beinhalten, wurden gefunden. Möchten Sie diese RAID-Geräte aktivieren?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "Bei iSCSI-Zielen anmelden"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/dz.po'
--- debian/po/dz.po	2012-09-22 06:43:20 +0000
+++ debian/po/dz.po	2013-08-23 18:07:28 +0000
@@ -171,6 +171,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "ཧརཊི་ཌིཀིསི་དེ་གློག་འཕྲུལ་འདི་ལུ་མཉམ་སྦྲགས་འབད་ནུག་ག་ཞིབ་དཔྱད་འབད་གནང་།"
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/el.po'
--- debian/po/el.po	2011-07-06 20:38:29 +0000
+++ debian/po/el.po	2013-08-23 18:07:28 +0000
@@ -175,6 +175,28 @@
 msgstr ""
 "Παρακαλώ βεβαιωθείτε ότι υπάρχει δίσκος τοποθετημένος σ' αυτό το μηχάνημα."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Να ενεργοποιηθούν οι συσκευές Serial ATA RAID;"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Εντοπίστηκαν μία ή περισσότερες συσκευές που περιέχουν ρυθμίσεις Serial ATA "
+"RAID. Θέλετε να ενεργοποιήσετε αυτές τις συσκευές RAID;"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "σύνδεση σε προορισμούς iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/eo.po'
--- debian/po/eo.po	2011-07-06 20:38:29 +0000
+++ debian/po/eo.po	2013-08-23 18:07:28 +0000
@@ -166,6 +166,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Bonvolu kontroli ĉu la fiksita disko estas konektita al tiu ĉi maŝino."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktivigi Serial ATA RAID-aparatojn?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Unu aŭ pli da diskiloj kiuj enhavas Serial ATA RAID-agordojn estas trovitaj. "
+"Ĉu vi volas aktivigi tiujn RAID-aparatojn?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "ensaluti al iSCSI-celoj"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/es.po'
--- debian/po/es.po	2011-07-06 20:38:29 +0000
+++ debian/po/es.po	2013-08-23 18:07:28 +0000
@@ -203,6 +203,28 @@
 msgstr ""
 "Por favor, asegúrese de que se ha conectado un disco duro a este equipo."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "¿Activar dispositivos serie ATA RAID?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Uno o más dispositivos que contienen configuración serie ATA RAID han sido "
+"encontrados. ¿Desea activar estos dispositivos?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "acceso a objetivos iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/et.po'
--- debian/po/et.po	2012-02-17 23:07:33 +0000
+++ debian/po/et.po	2013-08-23 18:07:28 +0000
@@ -183,6 +183,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Palun veendu, et arvutis on kõvaketas."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Kas aktiveerida Serial ATA RAID-seadmed?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Leiti üks või enam ketast, millel on seadistatud Serial ATA RAID. Kas soovid "
+"need RAID-seadmed aktiveerida?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "iSCSI sihtkohtadesse sisselogimine"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/eu.po'
--- debian/po/eu.po	2012-04-14 06:02:27 +0000
+++ debian/po/eu.po	2013-08-23 18:07:28 +0000
@@ -178,6 +178,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Egiaztatu disko gogor bat makina honi konektatuta dagoela."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Serial ATA RAID gailuak gaitu?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Serial ATA RAID konfigurazioak dituzten gailuak aurkitu dira. RAID gailu "
+"hauek gaitu nahi al dituzu?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "iSCSI helburuetara sartzen"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/fa.po'
--- debian/po/fa.po	2011-07-06 20:38:29 +0000
+++ debian/po/fa.po	2013-08-23 18:07:28 +0000
@@ -163,6 +163,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "لطفاً چک کنید که دیسک‌سخت به این ماشین متصل است."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/fi.po'
--- debian/po/fi.po	2011-07-06 20:38:29 +0000
+++ debian/po/fi.po	2013-08-23 18:07:28 +0000
@@ -169,6 +169,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Tarkista, että laitteistossa on kiintolevy asennettuna."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktivoidaanko Serial ATA RAID -laitteet?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Löydettiin yksi tai useampi levy jossa on Serial ATA RAID -konfiguraatio. "
+"Haluatko aktivoida nämä RAID-laitteet?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "kirjaudu iSCSI-kohteisiin"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2012-07-23 22:25:17 +0000
+++ debian/po/fr.po	2013-08-23 18:07:28 +0000
@@ -182,6 +182,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Veuillez vérifier qu'un disque dur est bien présent sur cette machine."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Activer les périphériques RAID SATA ?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Un ou plusieurs lecteurs ayant des configurations RAID SATA ont été trouvés. "
+"Souhaitez-vous activer ces périphériques RAID ?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "s'identifier sur des cibles iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ga.po'
--- debian/po/ga.po	2011-07-06 20:38:29 +0000
+++ debian/po/ga.po	2013-08-23 18:07:28 +0000
@@ -162,6 +162,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Cinntigh go bhfuil diosca crua ceangailte leis an ríomhaire seo."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/gl.po'
--- debian/po/gl.po	2012-10-11 22:20:37 +0000
+++ debian/po/gl.po	2013-08-23 18:07:28 +0000
@@ -174,6 +174,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Comprobe que teña un disco duro conectado á máquina."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Activar os dispositivos ATA RAID?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Atopáronse un ou máis discos que conteñen configuracións de RAID ATA serie. "
+"Quere activar estes dispositivos RAID?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "Inicio de sesión para destinos iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/gu.po'
--- debian/po/gu.po	2011-07-06 20:38:29 +0000
+++ debian/po/gu.po	2013-08-23 18:07:28 +0000
@@ -167,6 +167,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "મહેરબાની કરી તપાસો કે હાર્ડ ડિસ્ક મશીન જોડે જોડાયેલ છે."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/he.po'
--- debian/po/he.po	2011-10-26 23:05:04 +0000
+++ debian/po/he.po	2013-08-23 18:07:28 +0000
@@ -187,6 +187,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "בדוק שדיסק קשיח מחובר למחשב זה."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "האם להפעיל התקני SATA RAID?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"נמצא כונן אחד או יותר המכילים תצורות SATA RAID. האם ברצונך להפעיל התקני RAID "
+"אלו?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "התחברות ליעדי iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/hi.po'
--- debian/po/hi.po	2011-09-17 23:05:17 +0000
+++ debian/po/hi.po	2013-08-23 18:07:28 +0000
@@ -182,6 +182,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "कृपया जाँचें कि इस मशीन में हार्ड डिस्क जुड़ी है."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "सिरियल ATA RAID उपकरणों को सक्रिय करें?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"एकाधिक सिरियल ATA RAID संरुप वाले ड्राइव पाये गए। क्या आप इन RAID उपकरणों को सक्रिय "
+"करना चाहते हैं?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "iSCSI लक्ष्यों में लाँगइन"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/hr.po'
--- debian/po/hr.po	2013-04-17 22:21:40 +0000
+++ debian/po/hr.po	2013-08-23 18:07:28 +0000
@@ -175,6 +175,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Molim provjerite je li tvrdi disk spojen na ovo računalo."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktivirati  Serijske ATA RAID uređaje?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Pronađen je jedan ili više pogona koji sadržavaju Serijske ATA RAID "
+"konfiguracije. Želite li aktivirati te RAID uređaje?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "prijava na iSCSI odredišta"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/hu.po'
--- debian/po/hu.po	2011-07-06 20:38:29 +0000
+++ debian/po/hu.po	2013-08-23 18:07:28 +0000
@@ -166,6 +166,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Ellenőrizd a merevlemez és gép tényleges csatlakozását!"
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktiválja a soros ATA RAID eszközöket?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Soros ATA RAID beállításokat tartalmazó lemezek vannak a gépben. Szeretné "
+"aktiválni ezeket a RAID eszközöket?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "Bejelentkezés iSCSI célokra"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/id.po'
--- debian/po/id.po	2012-02-12 23:09:36 +0000
+++ debian/po/id.po	2013-08-23 18:07:28 +0000
@@ -184,6 +184,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Silakan periksa bahwa pada komputer ini terpasang sebuah Hard Disk."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktifkan perangkat RAID Serial ATA?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Satu atau lebih drive berisi konfigurasi RAID Serial ATA ditemukan. Apakah "
+"Anda ingin mengaktifkan perangkat RAID tersebut?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "log masuk ke target iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/is.po'
--- debian/po/is.po	2011-12-27 23:05:30 +0000
+++ debian/po/is.po	2013-08-23 18:07:28 +0000
@@ -176,6 +176,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Gakktu úr skugga um að harður diskur sé tengdur við þessa vél."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Virkja Serial ATA RAID tæki?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Eitt eða fleiri drif með Serial ATA RAID uppsetningum fundust. Viltu virkja "
+"þessi RAID tæki?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "tengist iSCSI tækjum"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/it.po'
--- debian/po/it.po	2011-08-21 23:04:54 +0000
+++ debian/po/it.po	2013-08-23 18:07:28 +0000
@@ -192,6 +192,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Verificare che un disco fisso sia collegato a questo computer."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Attivare i dispositivi Serial ATA RAID?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Sono state trovate una o più unità contenenti configurazioni Serial ATA "
+"RAID. Attivare questi dispositivi RAID?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "Accedere a elementi iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2011-07-06 20:38:29 +0000
+++ debian/po/ja.po	2013-08-23 18:07:28 +0000
@@ -164,6 +164,28 @@
 msgstr ""
 "このマシンに接続されているハードディスクがあるかどうか確認してください。"
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "シリアルATA RAIDデバイスを有効にしますか?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"１つ以上のシリアルATA RAID設定が見つかりました。これらのRAIDデバイスを有効に"
+"しますか？"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "iSCSIターゲットにログインします"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ka.po'
--- debian/po/ka.po	2011-07-06 20:38:29 +0000
+++ debian/po/ka.po	2013-08-23 18:07:28 +0000
@@ -173,6 +173,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "გთხოვთ გადაამოწმოთ, რომ ამ კომპიუტერს მყარი დისკი მიერთებული აქვს."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "ჩაირთოს Serial ATA RAID მოწყობილობები?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/kk.po'
--- debian/po/kk.po	2011-11-07 23:05:15 +0000
+++ debian/po/kk.po	2013-08-23 18:07:28 +0000
@@ -174,6 +174,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Қатты дисктің машинаға қосылғанын тексеріңіз."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "SATA RAID құрылғысын қосайын ба?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Бір немесе одан да көп SATA RAID конфигурациясы бар дискілер анықталынды. "
+"Бұл RAID құрылғыларды қосамын дейсіз бе?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "iSCSI басқару бағдарламасына кіру"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/km.po'
--- debian/po/km.po	2011-07-06 20:38:29 +0000
+++ debian/po/km.po	2013-08-23 18:07:28 +0000
@@ -168,6 +168,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "សូមពិនិត្យ​មើល​ថា បាន​ភ្ជាប់​ថាស​រឹង​ទៅ​ម៉ាស៊ីន​នេះ​ហើយ​ឬ​នៅ ។"
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "ធ្វើ​ឲ្យ​ឧបករណ៍​ ATA RAID សៀរៀល​សកម្ម ?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"ដ្រាយ​​មួយ​ ឬ​ច្រើន​​ដែល​មាន​ការ​កំណត់​រចនាសម្ព័ន្ធ​ Serial ATA RAID ត្រូវ​បាន​រក​ឃើញ​ ។​ ​តើ​អ្នក​ចង់​ធ្វើ​ឲ្យ​"
+"ឧបករណ៍​ RAID ​នេះ​សកម្ម​ឬ​ ?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "ចុចចូលទៅគោលដៅ iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/kn.po'
--- debian/po/kn.po	2012-01-25 23:05:21 +0000
+++ debian/po/kn.po	2013-08-23 18:07:28 +0000
@@ -172,6 +172,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "ಈ ಗಣಕಕ್ಕೆ ಒಂದು ಹಾರ್ಡ್ ಡಿಸ್ಕ್ ಜೋಡಿಸಲಾಗಿದೆಯೇ ಎಂದು ಪರಿಶೀಲಿಸಿ."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ko.po'
--- debian/po/ko.po	2011-09-13 23:05:27 +0000
+++ debian/po/ko.po	2013-08-23 18:07:28 +0000
@@ -179,6 +179,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "이 컴퓨터에 하드 디스크가 있는 지 확인하십시오."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "S-ATA 레이드를 활성화합니까?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"하나 이상의 S-ATA 레이드 디바이스를 발견했습니다. 레이드 디바이스를 활성화합"
+"니까?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "iSCSI에 로그인"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ku.po'
--- debian/po/ku.po	2011-07-06 20:38:29 +0000
+++ debian/po/ku.po	2013-08-23 18:07:28 +0000
@@ -167,6 +167,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Kontol bike ka hard dîskek girêdayî vê makînayê ye yan na."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/lo.po'
--- debian/po/lo.po	2011-07-06 20:38:29 +0000
+++ debian/po/lo.po	2013-08-23 18:07:28 +0000
@@ -162,6 +162,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "ກາລຸນາກວດສອບໃຫ້ໝັ້ນໃຈວ່າໄດ້ຕໍ່ຮາດດິກເຂົ້າກັບເຄື່ອງ."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/lt.po'
--- debian/po/lt.po	2012-05-29 23:06:17 +0000
+++ debian/po/lt.po	2013-08-23 18:07:28 +0000
@@ -178,6 +178,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Patikrinkite ar kietas diskas prijungtas prie šio kompiuterio."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktyvinti Serial ATA RAID įrenginius?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Rastas vienas ar daugiau diskų, turinčių Serial ATA RAID konfigūraciją. Ar "
+"norite aktyvinti šiuos RAID įrenginius?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "prisijungti prie iSCSI paskirčių"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/lv.po'
--- debian/po/lv.po	2012-05-27 23:05:37 +0000
+++ debian/po/lv.po	2013-08-23 18:07:28 +0000
@@ -181,6 +181,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Lūdzu, pārliecinieties, ka šim datoram ir pievienots cietais disks."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktivizēt Serial ATA RAID iekārtas?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Ir atrasta viena vai vairākas ierīces, kuras satur Serial ATA RAID "
+"konfigurāciju. Vai vēlaties aktivizēt šīs RAID ierīces?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "pieslēgties iSCSI ierīcēm"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/mk.po'
--- debian/po/mk.po	2012-04-12 23:06:25 +0000
+++ debian/po/mk.po	2013-08-23 18:07:28 +0000
@@ -176,6 +176,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Провери дали хард дискот е поврзан со компјутерот."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ml.po'
--- debian/po/ml.po	2012-11-01 17:45:59 +0000
+++ debian/po/ml.po	2013-08-23 18:07:28 +0000
@@ -179,6 +179,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "ഈ കമ്പ്യൂട്ടറില്‍ ഒരു ഹാര്‍ഡ് ഡിസ്‌ക്ക് ഘടിപ്പിച്ചിട്ടുണ്ടെന്നു് ഉറപ്പുവരുത്തുക."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/mr.po'
--- debian/po/mr.po	2011-07-06 20:38:29 +0000
+++ debian/po/mr.po	2013-08-23 18:07:28 +0000
@@ -169,6 +169,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "कृपया हार्ड डिस्क मशिनला जोडली आहे का ते तपासा."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Serial ATA RAID उपकरणे सक्रिय करायचे का?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"एक किंवा अधिक सीरिअल एटीए रेड असलेल्या ड्राईव्हज सापडल्या आहेत. ह्या रेड ड्राईव्हज "
+"तुम्हाला सुरु करायच्या आहेत?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "आइएससीएसआइ(iSCSI) उद्दिष्टांत प्रवेश करा"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/nb.po'
--- debian/po/nb.po	2011-07-06 20:38:29 +0000
+++ debian/po/nb.po	2013-08-23 18:07:28 +0000
@@ -167,6 +167,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Se etter at det er koblet til en harddisk til denne maskinen."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktivere serielle ATA RAID komponenter?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"En eller flere komponenter med serielle ATA RAID konfigurasjoner er funnet, "
+"Ønsker du å aktivere RAID for disse?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "logg in på iSCSI-mål"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ne.po'
--- debian/po/ne.po	2011-07-06 20:38:29 +0000
+++ debian/po/ne.po	2013-08-23 18:07:28 +0000
@@ -171,6 +171,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "कृपया एउटा हार्ड डिस्क यो मेसिन सँग सलग्न छ भन्ने कुरा जाँच गर्नुहोस् ।"
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2011-07-06 20:38:29 +0000
+++ debian/po/nl.po	2013-08-23 18:07:28 +0000
@@ -168,6 +168,28 @@
 msgstr ""
 "Controleer a.u.b. of er een harde schijf is aangesloten op deze machine."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Serial ATA RAID-apparaten activeren?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Eén of meer schijven met een Serial ATA RAID-configuratie zijn gevonden. "
+"Wilt u deze RAID-apparaten inschakelen?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "aanmelden in iSCSI-doelen"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/nn.po'
--- debian/po/nn.po	2011-07-06 20:38:29 +0000
+++ debian/po/nn.po	2013-08-23 18:07:28 +0000
@@ -167,6 +167,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Sjå etter at det er kobla til ein harddisk til denne maskina."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktivera serielle ATA RAID einingar?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Ein eller fleire stasjonar med seriell ATA RAID konfigurasjon er funnen. "
+"Ønskjer du å aktivera RAID for desse?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "Logg på iSCSI-mål"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/pa.po'
--- debian/po/pa.po	2012-05-06 23:06:16 +0000
+++ debian/po/pa.po	2013-08-23 18:07:28 +0000
@@ -177,6 +177,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "ਜਾਂਚ ਕਰੋ ਕਿ ਹਾਰਡ ਡਿਸਕ ਇਸ ਮਸ਼ੀਨ ਨਾਲ ਜੁੜੀ ਹੈ ਜੀ।"
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "ਸੀਰੀਅਲ ATA RAID ਜੰਤਰ ਐਕਟੀਵੇਟ ਕਰਨੇ ਹਨ?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "iSCSI ਟਾਰਗੇਟ ਉੱਤੇ ਲਾਗਇਨ"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/pl.po'
--- debian/po/pl.po	2011-09-26 23:05:18 +0000
+++ debian/po/pl.po	2013-08-23 18:07:28 +0000
@@ -182,6 +182,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Proszę sprawdzić czy twardy dysk jest podłączony do komputera."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Uaktywnić urządzenia Serial ATA RAID?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Znaleziono jedno lub więcej urządzeń zawierające konfigurację Serial ATA "
+"RAID. Czy chcesz uaktywnić te urządzenia RAID?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "zaloguj do obiektów docelowych iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/pt.po'
--- debian/po/pt.po	2011-07-06 20:38:29 +0000
+++ debian/po/pt.po	2013-08-23 18:07:28 +0000
@@ -166,6 +166,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Por favor verifique se um disco rígido está ligado a esta máquina."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Activar dispositivos ATA RAID de série?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Encontraram-se um ou mais discos contendo configurações ATA RAID de série. "
+"Deseja activar estes dispositivos RAID?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "entrar nos alvos iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2012-04-08 23:05:22 +0000
+++ debian/po/pt_BR.po	2013-08-23 18:07:28 +0000
@@ -176,6 +176,28 @@
 "Por favor, confira se realmente existe um disco rígido conectado a esta "
 "máquina."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Ativar dispositivos RAID Serial ATA?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Um ou mais dispositivos contendo configurações RAID Serial ATA foram "
+"encontrados. Você deseja ativar esses dispositivos RAID?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "login para alvos iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ro.po'
--- debian/po/ro.po	2011-09-17 23:05:17 +0000
+++ debian/po/ro.po	2013-08-23 18:07:28 +0000
@@ -190,6 +190,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Vă rugăm sa verificați că aveți un disc fix atașat la acest sistem."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Se activează dispozitivele Serial ATA RAID?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Unul sau mai multe discuri conținând configurații Serial ATA RAID au fost "
+"găsite. Doriți să activați aceste componente RAID?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "autentificare la destinații iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2011-07-06 20:38:29 +0000
+++ debian/po/ru.po	2013-08-23 18:07:28 +0000
@@ -172,6 +172,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Проверьте, подключён ли к компьютеру жёсткий диск."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Включить устройства SATA RAID?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Найдены один или несколько дисков, содержащих конфигурации SATA RAID. Вы "
+"желаете включить эти RAID устройства?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "войти в программу контроля iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/se.po'
--- debian/po/se.po	2011-07-06 20:38:29 +0000
+++ debian/po/se.po	2013-08-23 18:07:28 +0000
@@ -165,6 +165,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr ""
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/si.po'
--- debian/po/si.po	2011-11-30 23:05:26 +0000
+++ debian/po/si.po	2013-08-23 18:07:28 +0000
@@ -169,6 +169,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "කරුණාකර මෙම යන්ත්‍රයට ඈදා ඇති දෘඩ තැටිය පිරික්සන්න."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "iSCSI ඉලක්ක වෙත ප්‍රවිෂ්ට වෙමින්"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/sk.po'
--- debian/po/sk.po	2011-07-06 20:38:29 +0000
+++ debian/po/sk.po	2013-08-23 18:07:28 +0000
@@ -167,6 +167,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Skontrolujte pripojenie pevného disku k počítaču."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktivovať zariadenia Serial ATA RAID?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Boli nájdené konfigurácie jedného alebo viacerých zariadení Serial ATA RAID. "
+"Želáte si aktivovať tieto zariadenia RAID?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "prihlásiť sa k cieľom iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/sl.po'
--- debian/po/sl.po	2011-07-06 20:38:29 +0000
+++ debian/po/sl.po	2013-08-23 18:07:28 +0000
@@ -178,6 +178,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Preverite, ali je trdi disk priključen."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Ali naj se omogočijo naprave SATA RAID?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Najden je bil en ali več pogonov, ki vsebujejo nastavitve za SATA RAID. Ali "
+"želite omogočiti te naprave RAID?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "prijavi se v tarče iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/sq.po'
--- debian/po/sq.po	2012-06-16 23:05:36 +0000
+++ debian/po/sq.po	2013-08-23 18:07:28 +0000
@@ -169,6 +169,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Të lutem kontrollo nëse ky kompjuter ka një disk të ngurtë të lidhur."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Ti aktivizoj pajisjet Serial ATA RAID?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Është gjetur një apo më tepër draive që përmbajnë konfigurimin Serial ATA "
+"RAID. Dëshironi ti aktivizoni këto pajisje RAID?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "duke hyrë në shënjestrat iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/sr.po'
--- debian/po/sr.po	2011-07-06 20:38:29 +0000
+++ debian/po/sr.po	2013-08-23 18:07:28 +0000
@@ -169,6 +169,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Проверите да ли је хард диск закачен за ову машину."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Активирати серијске ATA RAID уређаје?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Пронађене су једна или више јединица које садрже серијску ATA RAID "
+"конфигурацију. Да ли желите да активирате те RAID уређаје?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "пријава на iSCSI циљеве"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/sv.po'
--- debian/po/sv.po	2011-07-06 20:38:29 +0000
+++ debian/po/sv.po	2013-08-23 18:07:28 +0000
@@ -172,6 +172,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Kontrollera att en hårddisk är ansluten till den här datorn."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Aktivera Serial ATA RAID-enheter?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"En eller flera enheter som innehåller Serial ATA RAID-konfigurationer har "
+"hittats. Vill du aktivera dessa RAID-enheter?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "inloggning till iSCSI-mål"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ta.po'
--- debian/po/ta.po	2011-07-06 20:38:29 +0000
+++ debian/po/ta.po	2013-08-23 18:07:28 +0000
@@ -168,6 +168,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "வட்டு இந்த சாதனத்துடன் இணைக்கப்பட்டுள்ளதா என்பதை சரிபார்க்கவும்."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/te.po'
--- debian/po/te.po	2011-07-06 20:38:29 +0000
+++ debian/po/te.po	2013-08-23 18:07:28 +0000
@@ -164,6 +164,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "హార్డ్ డిస్క్  ఈ మెషిన్ కి జతచేశారా లేదా తనిఖీ చేయుము."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "సీరియల్ ATA RAID పరికరాలని ఉత్తేజపరచాలా?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/templates.pot'
--- debian/po/templates.pot	2010-06-01 22:48:44 +0000
+++ debian/po/templates.pot	2013-08-23 18:07:28 +0000
@@ -152,6 +152,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr ""
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/th.po'
--- debian/po/th.po	2011-07-06 20:38:29 +0000
+++ debian/po/th.po	2013-08-23 18:07:28 +0000
@@ -164,6 +164,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "กรุณาตรวจสอบให้แน่ใจว่าได้ต่อฮาร์ดดิสก์เข้ากับเครื่อง"
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "ใช้อุปกรณ์ Serial ATA RAID หรือไม่?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr "เจออุปกรณ์ที่สามารถใช้ Serial ATA RAID คุณต้องการที่จะใช้มันหรือไม่?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "เข้าระบบไปที่ iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/tl.po'
--- debian/po/tl.po	2011-07-06 20:38:29 +0000
+++ debian/po/tl.po	2013-08-23 18:07:28 +0000
@@ -172,6 +172,26 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Pakisuri na may hard disk na nakakabit sa makinang ito."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr ""
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/tr.po'
--- debian/po/tr.po	2011-07-06 20:38:29 +0000
+++ debian/po/tr.po	2013-08-23 18:07:28 +0000
@@ -172,6 +172,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Lütfen bu makineye bir sabit disk takılı olduğundan emin olun."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Serial ATA RAID aygıtları etkinleştirilsin mi?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Serial ATA RAID yapılandırmaları içeren bir ya da daha fazla sürücü "
+"bulunmuştur. Bu RAID aygıtlarını aktifleştirmek ister misiinz?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "iSCSI hedeflerine giriş"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/ug.po'
--- debian/po/ug.po	2011-07-06 20:38:29 +0000
+++ debian/po/ug.po	2013-08-23 18:07:28 +0000
@@ -168,6 +168,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "قاتتىق دىسكىنىڭ كومپيۇتېرغا چېتىلغان چېتىلمىغانلىقىنى تەكشۈرۈڭ."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "ئارقىمۇئارقا ATA RAID ئۈسكۈنىسىنى ئاكتىپلاشتۇرامسىز؟"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"ئارقىمۇئارقا ATA RAID ئۈسكۈنىسىدىن بىرنەچچىسى تېپىلدى، ھەممىسىنى "
+"ئاكتىپلاشتۇرامسىز؟"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "iSCSI نىشانغا كىرىش"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/uk.po'
--- debian/po/uk.po	2011-12-19 07:08:51 +0000
+++ debian/po/uk.po	2013-08-23 18:07:28 +0000
@@ -174,6 +174,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Перевірте, чи приєднаний жорсткий диск до цієї машини."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "Активувати Serial ATA RAID пристрої?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Було знайдено один або більше пристроїв, що містять конфігурацію Serial ATA "
+"RAID. Ви бажаєте активувати ці RAID пристрої?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "Увійти в iSCSI target"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/vi.po'
--- debian/po/vi.po	2011-07-06 20:38:29 +0000
+++ debian/po/vi.po	2013-08-23 18:07:28 +0000
@@ -168,6 +168,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "Hãy kiểm tra xem có đĩa cứng được kết nối đến máy này."
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "kích hoạt thiết bị Serial ATA RAID?"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"Một hoặc nhiều ổ đĩa chứa Serial ATA RAID cấu hình đã được tìm thấy. Bạn có "
+"muốn kích hoạt các thiết bị RAID?"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "đăng nhập vào các mục tiêu iSCSI"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/zh_CN.po'
--- debian/po/zh_CN.po	2011-08-11 23:05:55 +0000
+++ debian/po/zh_CN.po	2013-08-23 18:07:28 +0000
@@ -182,6 +182,27 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "请您检查这台计算机是否接有硬盘。"
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "启用 串行 ATA RAID 设备吗？"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"发现了一个或多个包含串行 ATA RAID 配置的设备。您想启用这些 RAID 设备吗？"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "登录到 iSCSI 目标"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'debian/po/zh_TW.po'
--- debian/po/zh_TW.po	2012-04-02 23:05:14 +0000
+++ debian/po/zh_TW.po	2013-08-23 18:07:28 +0000
@@ -182,6 +182,28 @@
 msgid "Please check that a hard disk is attached to this machine."
 msgstr "請確認在該機器上是否有安裝硬碟。"
 
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid "Activate Serial ATA RAID devices?"
+msgstr "是否啟用 SATA 磁碟陣列(RAID)裝置？"
+
+#. Type: boolean
+#. Description
+#: ../disk-detect.templates:7001
+msgid ""
+"One or more drives containing Serial ATA RAID configurations have been "
+"found. Do you wish to activate these RAID devices?"
+msgstr ""
+"發現到有一個或者更多的SATA磁碟陣列(RAID)的設置。您想要啟用這些磁碟陣列的硬碟"
+"嗎？"
+
+#. Type: text
+#. Description
+#: ../disk-detect.templates:8001
+msgid "login to iSCSI targets"
+msgstr "登入到 iSCSI 目標"
+
 #. Type: text
 #. Description
 #. :sl1:

=== modified file 'disk-detect.sh'
--- disk-detect.sh	2011-02-19 23:45:44 +0000
+++ disk-detect.sh	2013-08-23 18:07:28 +0000
@@ -2,6 +2,9 @@
 
 set -e
 . /usr/share/debconf/confmodule
+if [ -e /lib/partman/lib/iscsi-base.sh ]; then
+	. /lib/partman/lib/iscsi-base.sh
+fi
 #set -x
 
 if [ "$(uname)" != Linux ]; then
@@ -124,14 +127,44 @@
 	log "hw-detect exited nonzero"
 fi
 
+# Compatibility with old iSCSI preseeding
+db_get open-iscsi/targets || RET=
+if [ "$RET" ]; then
+	if ! pidof iscsid >/dev/null; then
+		iscsi-start
+	fi
+	for portal in $RET; do
+		iscsi_discovery "$portal" -l
+	done
+fi
+
+# New-style preseeding
+if db_fget partman-iscsi/login/address seen && [ "$RET" = true ] && \
+   db_get partman-iscsi/login/address && [ "$RET" ]; then
+	if ! pidof iscsid >/dev/null; then
+		iscsi-start
+	fi
+	db_capb backup
+	iscsi_login
+	db_capb
+fi
+
 while ! disk_found; do
+	CHOICES_C=""
 	CHOICES=""
-	for mod in $(list_disk_modules | sort); do
+	if type iscsi_login >/dev/null 2>&1; then
+		CHOICES_C="${CHOICES_C:+$CHOICES_C, }iscsi"
+		db_metaget disk-detect/iscsi_choice description
+		CHOICES="${CHOICES:+$CHOICES, }$RET"
+	fi
+	for mod in $(list_disk_modules | grep -v iscsi | sort); do
+		CHOICES_C="${CHOICES_C:+$CHOICES_C, }$mod"
 		CHOICES="${CHOICES:+$CHOICES, }$mod"
 	done
 
 	if [ -n "$CHOICES" ]; then
 		db_capb backup
+		db_subst disk-detect/module_select CHOICES-C "$CHOICES_C"
 		db_subst disk-detect/module_select CHOICES "$CHOICES"
 		db_input high disk-detect/module_select || [ $? -eq 30 ]
 		if ! db_go; then
@@ -140,9 +173,17 @@
 		db_capb
 
 		db_get disk-detect/module_select
-		if [ "$RET" = "continue with no disk drive" ]; then
+		if [ "$RET" = continue ]; then
 			exit 0
-		elif [ "$RET" != "none of the above" ]; then
+		elif [ "$RET" = iscsi ]; then
+			if ! pidof iscsid >/dev/null; then
+				iscsi-start
+			fi
+			db_capb backup
+			iscsi_login
+			db_capb
+			continue
+		elif [ "$RET" != none ]; then
 			module="$RET"
 			if [ -n "$module" ] && is_not_loaded "$module" ; then
 				register-module "$module"
@@ -176,25 +217,33 @@
 done
 
 # Activate support for Serial ATA RAID
-db_get disk-detect/dmraid/enable
-if [ "$RET" = true ]; then
-	if anna-install dmraid-udeb; then
-		# Device mapper support is required to run dmraid
-		if is_not_loaded dm-mod; then
-			module_probe dm-mod || true
-		fi
-
-		if dmraid -c -s >/dev/null 2>&1; then
-			logger -t disk-detect "Serial ATA RAID disk(s) detected; enabling dmraid support"
+if anna-install dmraid-udeb; then
+	# Device mapper support is required to run dmraid
+	if ! dmsetup version >/dev/null 2>&1; then
+		module_probe dm-mod || true
+	fi
+
+	if dmraid -c -s >/dev/null 2>&1; then
+		logger -t disk-detect "Serial ATA RAID disk(s) detected."
+		# Ask the user whether they want to activate dmraid devices.
+		db_input high disk-detect/activate_dmraid || true
+		db_go
+		db_get disk-detect/activate_dmraid
+		activate_dmraid=$RET
+
+		if [ "$activate_dmraid" = true ]; then
+			mkdir -p /var/lib/disk-detect
+			touch /var/lib/disk-detect/activate_dmraid
+			logger -t disk-detect "Enabling dmraid support."
 			# Activate only those arrays which have all disks
 			# present.
 			for dev in $(dmraid -r -c); do
 				[ -e "$dev" ] || continue
 				log-output -t disk-detect dmraid-activate "$(basename "$dev")"
 			done
-		else
-			logger -t disk-detect "No Serial ATA RAID disks detected"
 		fi
+	else
+		logger -t disk-detect "No Serial ATA RAID disks detected"
 	fi
 fi
 
@@ -202,14 +251,16 @@
 db_get disk-detect/multipath/enable
 if [ "$RET" = true ]; then
 	if anna-install multipath-udeb; then
-		MODULES="dm-mod dm-multipath dm-round-robin dm-emc"
 		# We need some dm modules...
 		depmod -a >/dev/null 2>&1 || true
-		for MODULE in $MODULES; do
-			if is_not_loaded $MODULE; then
-				module_probe $MODULE || true
-			fi
-		done
+		if ! dmsetup version >/dev/null 2>&1; then
+			module_probe dm-mod || true
+		fi
+		if ! dmsetup targets | cut -d' ' -f1 | grep -q '^multipath$'; then
+			module_probe dm-multipath || true
+		fi
+		# No way to check whether this is loaded already?
+		log-output -t disk-detect modprobe -v dm-round-robin || true
 
 		# Look for multipaths...
 		if multipath_probe; then

=== modified file 'ethdetect.sh'
--- ethdetect.sh	2010-11-23 16:55:42 +0000
+++ ethdetect.sh	2013-08-23 18:07:28 +0000
@@ -29,8 +29,8 @@
 
 	case "$module" in
 	    "plip")
-		module_probe parport_pc high
-		priority=high
+		module_probe parport_pc medium
+		priority=medium
 		;;
 	esac
 
@@ -203,7 +203,7 @@
 	if [ -n "$CHOICES" ]; then
 		db_capb backup
 		db_subst ethdetect/module_select CHOICES "$CHOICES"
-		db_input high ethdetect/module_select || [ $? -eq 30 ]
+		db_input medium ethdetect/module_select || [ $? -eq 30 ]
 		if ! db_go; then
 			cleanup
 			exit 10
@@ -250,7 +250,7 @@
 	if [ -z "$CHOICES" ]; then
 		sysfs-update-devnames || true
 		cleanup
-		exit 1
+		exit 0
 	fi
 done
 

=== renamed file 'hw-detect.post-base-installer.d/50install-firmware' => 'hw-detect.pre-pkgsel.d/50install-firmware'
=== modified file 'hw-detect.sh' (properties changed: +x to -x)
--- hw-detect.sh	2010-10-16 20:33:29 +0000
+++ hw-detect.sh	2013-08-23 18:07:28 +0000
@@ -161,6 +161,14 @@
 	esac
 }
 
+get_rtc_info() {
+	# On i386, this gets loaded by hotplug through isapnp, but that
+	# doesn't work on amd64.
+	case $SUBARCH in
+		amd64/*) register-module rtc ;;
+	esac
+}
+
 # Manually load modules to enable things we can't detect.
 # XXX: This isn't the best way to do this; we should autodetect.
 # The order of these modules are important.
@@ -173,6 +181,16 @@
 		echo "ide-disk:Linux ATA DISK"
 		echo "ide-cd:Linux ATAPI CD-ROM"
 	fi
+	get_rtc_info
+
+	case $SUBARCH in
+		powerpc/ps3)
+			echo "ps3rom:PS3 internal CD-ROM drive"
+			echo "ps3disk:PS3 internal disk drive"
+			echo "ps3_gelic:PS3 Gigabit Ethernet"
+			register-module snd_ps3
+		;;
+	esac
 }
 
 # Should be greater than the number of kernel modules we can reasonably
@@ -212,11 +230,25 @@
 	register-module g_ether
 fi
 
+# Load xenbus_probe_frontend if we're running under the Xen hypervisor, so
+# that it can deal with autoloading such things as xen-blkfront and
+# xen-netfront.
+if [ "$(cat /sys/hypervisor/type 2>/dev/null || true)" = xen ] && \
+   [ ! -d /sys/bus/xen ]; then
+	db_subst hw-detect/load_progress_step CARDNAME "Xen frontend"
+	db_subst hw-detect/load_progress_step MODULE "xenbus_probe_frontend"
+	db_progress INFO hw-detect/load_progress_step
+
+	log "Detected Xen hypervisor, loading xenbus_probe_frontend"
+	load_module xenbus_probe_frontend
+	register-module -i xenbus_probe_frontend
+fi
+
 # If using real hotplug, re-run the rc scripts to pick up new modules.
 # TODO: this just loads modules itself, rather than handing back a list
 # Since we've just run depmod, new modules might be available, so we
 # must trigger as well as settle.
-update-dev
+update-dev >/dev/null
 
 ALL_HW_INFO=$(get_detected_hw_info; get_manual_hw_info)
 db_progress STEP $OTHER_STEPSIZE
@@ -312,12 +344,12 @@
 # be done unconditionally.
 if [ -z "$LOAD_IDE" ] && is_not_loaded ide-generic && \
    [ -e /sys/bus/isa ] && is_available ide-generic; then
-	update-dev --settle
+	update-dev --settle >/dev/null
 	blockdev_count=$(ls /sys/block | wc -w)
 
 	log "ISA bus detected; loading module 'ide-generic'"
 	load_module ide-generic
-	update-dev --settle
+	update-dev --settle >/dev/null
 	if [ $(ls /sys/block | wc -w) -gt $blockdev_count ]; then
 		log "New devices detected after loading ide-generic"
 
@@ -354,23 +386,15 @@
 		fi
 	fi
 	db_progress STEP $OTHER_STEPSIZE
-
-	# also try to enable firewire ethernet (The right way to do this is
-	# really to catch the hotplug events from the kernel.)
-	if is_not_loaded eth1394; then
-		if is_available eth1394; then
-			db_subst hw-detect/load_progress_step CARDNAME "FireWire ethernet support"
-			db_subst hw-detect/load_progress_step MODULE "eth1394"
-			db_progress INFO hw-detect/load_progress_step
-			load_module eth1394 "FireWire ethernet"
-			# do not call register-module; udev/hotplug will load it
-			# on the installed system
-		else
-			missing_module eth1394 "FireWire ethernet"
-		fi
-	fi
 fi
 
+# Always load the printer driver on i386 and amd64; it's hard to autodetect.
+case $SUBARCH in
+	i386/*|amd64/*)
+		register-module lp
+		;;
+esac
+
 apply_pcmcia_resource_opts() {
 	local config_opts=/etc/pcmcia/config.opts
 	
@@ -482,11 +506,6 @@
 	apt-install usbutils || true
 fi
 
-# Install acpi
-if [ -d /proc/acpi ]; then
-	apt-install acpi acpid acpi-support-base || true
-fi
-
 # If hardware has support for pmu, install pbbuttonsd
 if [ -d /sys/class/misc/pmu/ ]; then
 	apt-install pbbuttonsd || true
@@ -519,6 +538,20 @@
 	;;
 esac
 
+# Install PS3 utilities
+case $SUBARCH in
+	powerpc/ps3)
+		apt-install ps3pf-utils || true
+		;;
+esac
+
+# Install Cell utilities
+case $SUBARCH in
+	powerpc/ps3|powerpc/cell)
+		apt-install elfspe2 || true
+		;;
+esac
+
 db_progress SET $MAX_STEPS
 db_progress STOP
 
@@ -531,6 +564,6 @@
 sysfs-update-devnames
 
 # Let userspace /dev tools rescan the devices
-update-dev --settle
+update-dev --settle >/dev/null
 
 exit 0