Merge lp:~mvo/apt-setup/extras-ubuntu-repo into lp:~vcs-imports/apt-setup/main

[Michael Vogt]

A small branch that adds apt-setup/extras to enable support for the new
http://extras.ubuntu.com repository.

Initially I turned it 'off' by default and was thinking about selectively
enabling it in ubiquity/d-i for Ubuntu and leave it to the derivates to
enable it or not. But after some pondering I turned it on by default as there
is no risks (its only new package) and I can't think of why someone would not
want to have it (its also free software because the current review process
calls for a source code review).

I have not tested the branch with a real install but I'm happy to test dailys
once its landed (or if there is another way to test it).

[Colin Watson (cjwatson)]

I tweaked a few minor bits of spelling and such and fixed a syntax error, but otherwise fine. Merged and uploaded - you'll see it in the next d-i dailies. ubiquity-based dailies will have it after the next ubiquity upload.

review: Approve

=== added file 'apt-setup-signed-release'
--- apt-setup-signed-release	1970-01-01 00:00:00 +0000
+++ apt-setup-signed-release	2010-09-13 07:17:41 +0000
@@ -0,0 +1,52 @@
+#!/bin/sh
+# Pre-populate signed Release files for an archive.
+set -e
+
+archive_id="$1"
+sources_list="$2"
+
+chroot=
+if [ "$ROOT" ]; then
+	chroot=chroot
+fi
+
+if [ "$ROOT" ] && [ "${sources_list#$ROOT/}" = "$sources_list" ]; then
+	# Generate a new temporary file that can be accessed by APT in the
+	# chroot.
+	file="$($chroot $ROOT tempfile)"
+	cat "$sources_list" > "$ROOT$file"
+else
+	file="${sources_list#$ROOT}"
+fi
+
+# Slightly awkward output format, e.g.:
+#   'http://archive.ubuntu.com/ubuntu/dists/hardy/Release' archive.ubuntu.com_ubuntu_dists_hardy_Release 0
+lines="$($chroot $ROOT \
+	 apt-get -o APT::Get::List-Cleanup=false \
+		 -o Dir::Etc::sourcelist="$file" update --print-uris | \
+	 grep "^'.*'")"
+
+NEWLINE='
+'
+OLD_IFS="$IFS"
+IFS="$NEWLINE"
+for line in $lines; do
+	IFS="$OLD_IFS"
+	uri="$(echo "$line" | sed "s/^'//; s/'.*//")"
+	file="$(echo "$line" | sed "s/^'[^']*' //; s/ .*//")"
+	base="${uri##*/}"
+	dir="${uri%/*}"
+	codename="${dir##*/}"
+	case $base in
+	    Release|Release.gpg)
+		release="/usr/share/apt-setup/release-files/$archive_id/$codename/$base"
+		if [ -f "$release" ]; then
+			cp -a "$release" "$ROOT/var/lib/apt/lists/$file"
+		fi
+		;;
+	esac
+	IFS="$NEWLINE"
+done
+IFS="$OLD_IFS"
+
+exit 0

=== modified file 'apt-setup-verify'
--- apt-setup-verify	2010-02-02 19:26:25 +0000
+++ apt-setup-verify	2010-09-13 07:17:41 +0000
@@ -2,6 +2,8 @@
 # verify and optionally save out the file
 set -e
 
+ASV_TIMEOUT="${ASV_TIMEOUT:--o Acquire::http::Timeout=30}"
+
 NL="
 "
 
@@ -65,6 +67,11 @@
 
 	[ "${line%%:*}" != "deb cdrom" ] || return 0
 
+	# Ubuntu change: network sources are always valid; apt will cope
+	# gracefully later, even though the network may not be available
+	# now.
+	return 0
+
 	tmp=$($chroot $ROOT tempfile)
 	echo "$line" > $ROOT$tmp
 	code=0
@@ -81,6 +88,20 @@
 	fi
 }
 
+# Ubuntu change: need to run apt-get update for everything in one go here,
+# since we've disabled the run in the valid function above. Doing everything
+# in one go also allows apt-get to cache resolver failures and connection
+# timeouts and so be significantly faster when the network is unavailable.
+tmp=$($chroot $ROOT tempfile)
+cat "$file" > $ROOT$tmp
+if [ "$PROGRESS" ]; then
+	DAP_OPTS="--dlwaypoint 100 --from $PROGRESS_FROM --to $PROGRESS_TO"
+fi
+$logoutput $intarget debconf-apt-progress --logstderr $DAP_OPTS -- \
+	apt-get -o APT::Get::List-Cleanup=false \
+		-o Dir::Etc::sourcelist=$tmp $ASV_TIMEOUT update || true
+rm -f $ROOT$tmp
+
 if [ "$PROGRESS" ]; then
 	tot_items=$(grep -Ev "^(#.*|)[[:space:]]*$" $file | wc -l)
 	p_from=$PROGRESS_FROM

=== modified file 'debian/apt-mirror-setup.install'
--- debian/apt-mirror-setup.install	2005-09-22 07:51:53 +0000
+++ debian/apt-mirror-setup.install	2010-09-13 07:17:41 +0000
@@ -1,1 +1,3 @@
-generators/50mirror usr/lib/apt-setup/generators
+generators/50mirror.ubuntu usr/lib/apt-setup/generators
+release-files/archive.ubuntu.com usr/share/apt-setup/release-files
+release-files/security.ubuntu.com usr/share/apt-setup/release-files

=== modified file 'debian/apt-mirror-setup.templates-ubuntu'
--- debian/apt-mirror-setup.templates-ubuntu	2009-06-24 16:57:15 +0000
+++ debian/apt-mirror-setup.templates-ubuntu	2010-09-13 07:17:41 +0000
@@ -71,3 +71,15 @@
  Preseed this question to 'true' to test proposed updates during
  installation. Most users should leave this at 'false' unless otherwise
  recommended by a developer.
+
+Template: apt-setup/extras
+Type: boolean
+Default: true
+# This template is used by the Ubuntu version of d-i.
+# :sl2:
+_Description: Use software from the "extras" repository?
+ Additional software is available from the Ubuntu "extras"
+ repository. This software is not part of Ubuntu, but is offered by
+ Third Party Developers who want to ship their latest software
+ .
+ Please choose whether you want this software to be made available to you.

=== modified file 'debian/apt-setup-udeb.install'
--- debian/apt-setup-udeb.install	2007-08-11 16:55:14 +0000
+++ debian/apt-setup-udeb.install	2010-09-13 07:17:41 +0000
@@ -1,5 +1,6 @@
 apt-setup usr/bin
 apt-setup-verify usr/bin
+apt-setup-signed-release usr/bin
 generators/01setup usr/lib/apt-setup/generators
 generators/60local usr/lib/apt-setup/generators
 generators/90services-select usr/lib/apt-setup/generators

=== modified file 'debian/apt-setup-udeb.postinst'
--- debian/apt-setup-udeb.postinst	2007-10-20 23:36:48 +0000
+++ debian/apt-setup-udeb.postinst	2010-09-13 07:17:41 +0000
@@ -1,3 +1,24 @@
 #!/bin/sh
 set -e
+
+. /usr/share/debconf/confmodule
+
+# If we're installing from CD, then we won't need this sources.list until
+# nearly the end of pkgsel; the one generated during base system
+# installation will do just fine until then.
+if [ -f /cdrom/.disk/base_installable ]; then
+	cp -a /target/etc/apt/sources.list /target/etc/apt/sources.list.base
+fi
+
 apt-setup --log-output /target
+
+if [ -f /target/etc/apt/sources.list.base ]; then
+	logger -t apt-setup 'Using only basic sources for CD installation'
+	mv -f /target/etc/apt/sources.list \
+	      /target/etc/apt/sources.list.apt-setup
+	mv -f /target/etc/apt/sources.list.base /target/etc/apt/sources.list
+	in-target apt-get -o APT::Get::Download=false \
+			  -o APT::Get::List-Cleanup=false update
+fi
+
+exit 0

=== modified file 'debian/apt-setup-udeb.templates'
--- debian/apt-setup-udeb.templates	2008-01-23 11:24:38 +0000
+++ debian/apt-setup-udeb.templates	2010-09-13 07:17:41 +0000
@@ -34,10 +34,16 @@
 
 Template: apt-setup/security_host
 Type: string
-Default: security.debian.org
+Default: security.ubuntu.com
 Description: for internal use; can be preseeded
  Host to use for security updates
 
+Template: apt-setup/security_path
+Type: string
+Default: /ubuntu
+Description: for internal use; can be preseeded
+ Path to use for security updates
+
 Template: apt-setup/volatile_host
 Type: string
 Default: volatile.debian.org
@@ -64,7 +70,7 @@
 # including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 # :sl2:
 __Choices: security updates (from ${SEC_HOST}), volatile updates (from ${VOL_HOST})
-Default: security, volatile
+Default: security
 # :sl2:
 _Description: Services to use:
  Debian has two services that provide updates to releases: security and

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-10 18:31:24 +0000
+++ debian/changelog	2010-09-13 07:17:41 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 apt-setup (1:0.46) unstable; urgency=low
 
   [ Updated translations ]
@@ -35,6 +36,65 @@
 
  -- Christian Perrier <[e-mail]>  Sat, 10 Jul 2010 20:18:23 +0200
 
+=======
+apt-setup (1:0.45ubuntu2) UNRELEASED; urgency=low
+
+  * add support for extras.ubuntu.com (as apt-setup/extras)
+
+ -- Michael Vogt <[e-mail]>  Mon, 13 Sep 2010 08:59:41 +0200
+
+apt-setup (1:0.45ubuntu1) maverick; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Install the Ubuntu mirror generator instead of Debian's.
+    - Set apt-setup/security_host to security.ubuntu.com, or
+      ports.ubuntu.com on ports architectures; adjust directory and
+      distribution to match.
+    - Add security sources for restricted, universe, and multiverse,
+      commented out unless the respective components are enabled. Disable
+      security generator checks for contrib and non-free.
+    - For CD installs, leave the sources.list created by apt-setup in
+      /etc/apt/sources.list.apt-setup, and restore the sources.list created
+      during base installation for the rest of the installation.
+    - Honour OVERRIDE_BASE_INSTALLABLE when checking
+      /cdrom/.disk/base_installable.
+    - Set the mirror verification timeout to 30 seconds.
+    - Disable the volatile service for Ubuntu, and don't ask the
+      apt-setup/services-select question.
+    - Always disable the CD at the end of installation if any mirrors are
+      present, even if it's a complete CD.
+    - Pre-populate apt's lists directory with signed Release files for
+      archive.ubuntu.com (and mirrors) and security.ubuntu.com, to protect
+      against downgrade attacks right from initial installation.
+    - Run 'apt-get update' for all sources.list lines produced by a single
+      generator in one go, and don't comment out sources.list lines if it
+      fails.
+    - Make the path to security updates configurable, as well as the host.
+    - Remove restricted from cdrom entry if apt-setup/restricted is false.
+    - Allow preseeding apt-setup/partner to enable the partner repository.
+    - Make sure apt-cdrom doesn't unmount the CD if cd_type ends with
+      /single.
+    - Enable all network sources, including security updates, even if the
+      network is unconfigured.
+    - Honour apt-setup/restricted, apt-setup/universe, and
+      apt-setup/multiverse when writing -backports lines.
+    - Check to make sure the CD filesystem is iso9660 before remounting it
+      as such.  Do not write a CD identifier if we're not working with
+      iso9660 so pkgsel does not try to unmount such disks.
+    - Run 'apt-get update', without downloading package lists or cleaning up
+      old files, after moving the sources.list generated during base system
+      installation back into place.
+    - If OVERRIDE_LEAVE_CD_MOUNTED is set, don't unmount /cdrom; this is a
+      bad idea in a live CD environment!
+    - Bail out cleanly from cdrom generator if /cdrom/.disk/info doesn't
+      exist or has zero size.
+    - Mount /proc, /sys, and /dev in the target system if necessary when
+      running apt-cdrom.
+  * Add Release files for maverick.
+
+ -- Colin Watson <[e-mail]>  Fri, 21 May 2010 15:07:42 +0100
+
+>>>>>>> MERGE-SOURCE
 apt-setup (1:0.45) unstable; urgency=low
 
   * There's no need anymore to unmount /target/cdrom.
@@ -111,6 +171,84 @@
 
  -- Frans Pop <[e-mail]>  Wed, 23 Dec 2009 00:34:42 +0100
 
+apt-setup (1:0.42ubuntu3) lucid; urgency=low
+
+  * Mount /proc, /sys, and /dev in the target system if necessary when
+    running apt-cdrom (LP: #527641).
+
+ -- Colin Watson <[e-mail]>  Fri, 05 Mar 2010 15:07:27 +0000
+
+apt-setup (1:0.42ubuntu2) lucid; urgency=low
+
+  * Remove Release files for old releases.
+  * Backport from trunk:
+    - Guard against future multiple-CD handling changes in apt.  If multiple
+      CDs are inserted then any one can satisfy a media-change request.  We
+      don't yet deal with multiple CDs everywhere, but at least we won't
+      break when 'apt-cdrom ident' starts returning multiple labels.
+
+ -- Colin Watson <[e-mail]>  Tue, 02 Feb 2010 12:41:13 -0800
+
+apt-setup (1:0.42ubuntu1) lucid; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Install the Ubuntu mirror generator instead of Debian's.
+    - Set apt-setup/security_host to security.ubuntu.com, or
+      ports.ubuntu.com on ports architectures; adjust directory and
+      distribution to match.
+    - Add security sources for restricted, universe, and multiverse,
+      commented out unless the respective components are enabled. Disable
+      security generator checks for contrib and non-free.
+    - For CD installs, leave the sources.list created by apt-setup in
+      /etc/apt/sources.list.apt-setup, and restore the sources.list created
+      during base installation for the rest of the installation.
+    - Honour OVERRIDE_BASE_INSTALLABLE when checking
+      /cdrom/.disk/base_installable.
+    - Reduce the mirror verification timeout to 10 seconds.
+    - Disable the volatile service for Ubuntu, and don't ask the
+      apt-setup/services-select question.
+    - Always disable the CD at the end of installation if any mirrors are
+      present, even if it's a complete CD.
+    - Pre-populate apt's lists directory with signed Release files for
+      archive.ubuntu.com (and mirrors) and security.ubuntu.com, to protect
+      against downgrade attacks right from initial installation.
+    - Run 'apt-get update' for all sources.list lines produced by a single
+      generator in one go, and don't comment out sources.list lines if it
+      fails.
+    - Make the path to security updates configurable, as well as the host.
+    - Remove restricted from cdrom entry if apt-setup/restricted is false.
+    - Add Release files for intrepid and jaunty.
+    - Allow preseeding apt-setup/partner to enable the partner repository.
+    - Use cdrom-detect/cdrom_fs when remounting the CD to ensure that we do
+      so using the same filesystem.
+    - Make sure apt-cdrom doesn't unmount the CD if cd_type ends with
+      /single.
+    - Enable all network sources, including security updates, even if the
+      network is unconfigured.
+    - Fix handling of universe and multiverse in -backports lines.
+    - Honour apt-setup/restricted, apt-setup/universe, and
+      apt-setup/multiverse when writing -backports lines.
+    - Check to make sure the CD filesystem is iso9660 before remounting it
+      as such.  Do not write a CD identifier if we're not working with
+      iso9660 so pkgsel does not try to unmount such disks.
+    - Fix description of universe in generated sources.list: packages there
+      are expected to be under a free licence.
+    - Run 'apt-get update', without downloading package lists or cleaning up
+      old files, after moving the sources.list generated during base system
+      installation back into place.
+    - If OVERRIDE_LEAVE_CD_MOUNTED is set, don't unmount /cdrom; this is a
+      bad idea in a live CD environment!
+    - Bail out cleanly from cdrom generator if /cdrom/.disk/info doesn't
+      exist or has zero size.
+    - Re-enable progress bar cancellation.
+  * Add Release files for lucid.
+  * Increase the mirror verification timeout to 30 seconds, now that this
+    operation is cancellable. Some people (hi, Ara) seem to have trouble
+    getting mirror responses in 10 seconds.
+  * Correctly disable progresscancel on exiting apt-setup (LP: #462005).
+
+ -- Colin Watson <[e-mail]>  Mon, 09 Nov 2009 11:46:22 +0000
+
 apt-setup (1:0.42) unstable; urgency=low
 
   [ Colin Watson ]
@@ -144,6 +282,73 @@
        
  -- Otavio Salvador <[e-mail]>  Tue, 21 Jul 2009 12:13:34 -0300
 
+apt-setup (1:0.41ubuntu2) karmic; urgency=low
+
+  * Use debconf-apt-progress for our Ubuntu-specific all-in-one-go 'apt-get
+    update' run.
+  * Re-enable progress bar cancellation. Thanks to debian-installer-utils
+    1.70 and fixes in debconf, it all seems to work fine now (LP: #172879).
+
+ -- Colin Watson <[e-mail]>  Thu, 01 Oct 2009 23:15:04 +0100
+
+apt-setup (1:0.41ubuntu1) karmic; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Install the Ubuntu mirror generator instead of Debian's.
+    - Set apt-setup/security_host to security.ubuntu.com, or
+      ports.ubuntu.com on ports architectures; adjust directory and
+      distribution to match.
+    - Add security sources for restricted, universe, and multiverse,
+      commented out unless the respective components are enabled. Disable
+      security generator checks for contrib and non-free.
+    - For CD installs, leave the sources.list created by apt-setup in
+      /etc/apt/sources.list.apt-setup, and restore the sources.list created
+      during base installation for the rest of the installation.
+    - Honour OVERRIDE_BASE_INSTALLABLE when checking
+      /cdrom/.disk/base_installable.
+    - Enable universe and multiverse by default.
+    - If either restricted or multiverse is enabled, add commented-out lines
+      for the partner archive.
+    - Reduce the mirror verification timeout to 10 seconds.
+    - Disable the volatile service for Ubuntu, and don't ask the
+      apt-setup/services-select question.
+    - Always disable the CD at the end of installation if any mirrors are
+      present, even if it's a complete CD.
+    - Pre-populate apt's lists directory with signed Release files for
+      archive.ubuntu.com (and mirrors) and security.ubuntu.com, to protect
+      against downgrade attacks right from initial installation.
+    - Run 'apt-get update' for all sources.list lines produced by a single
+      generator in one go, and don't comment out sources.list lines if it
+      fails.
+    - Make the path to security updates configurable, as well as the host.
+    - Remove restricted from cdrom entry if apt-setup/restricted is false.
+    - Add Release files for intrepid and jaunty.
+    - Allow preseeding apt-setup/partner to enable the partner repository.
+    - Use cdrom-detect/cdrom_fs when remounting the CD to ensure that we do
+      so using the same filesystem.
+    - Make sure apt-cdrom doesn't unmount the CD if cd_type ends with
+      /single.
+    - Enable all network sources, including security updates, even if the
+      network is unconfigured.
+    - Fix handling of universe and multiverse in -backports lines.
+    - Honour apt-setup/restricted, apt-setup/universe, and
+      apt-setup/multiverse when writing -backports lines.
+    - Check to make sure the CD filesystem is iso9660 before remounting it
+      as such.  Do not write a CD identifier if we're not working with
+      iso9660 so pkgsel does not try to unmount such disks.
+    - Fix description of universe in generated sources.list: packages there
+      are expected to be under a free licence.
+    - Run 'apt-get update', without downloading package lists or cleaning up
+      old files, after moving the sources.list generated during base system
+      installation back into place.
+    - If OVERRIDE_LEAVE_CD_MOUNTED is set, don't unmount /cdrom; this is a
+      bad idea in a live CD environment!
+    - Bail out cleanly from cdrom generator if /cdrom/.disk/info doesn't
+      exist or has zero size.
+  * Add Release files for karmic.
+
+ -- Colin Watson <[e-mail]>  Wed, 24 Jun 2009 18:05:27 +0100
+
 apt-setup (1:0.41) unstable; urgency=low
 
   [ Colin Watson ]
@@ -171,6 +376,69 @@
 
  -- Christian Perrier <[e-mail]>  Thu, 11 Jun 2009 21:31:24 +0200
 
+apt-setup (1:0.40ubuntu1) karmic; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Install the Ubuntu mirror generator instead of Debian's.
+    - Set apt-setup/security_host to security.ubuntu.com, or
+      ports.ubuntu.com on ports architectures; adjust directory and
+      distribution to match.
+    - Add security sources for restricted, universe, and multiverse,
+      commented out unless the respective components are enabled. Disable
+      security generator checks for contrib and non-free.
+    - For CD installs, leave the sources.list created by apt-setup in
+      /etc/apt/sources.list.apt-setup, and restore the sources.list created
+      during base installation for the rest of the installation.
+    - Honour OVERRIDE_BASE_INSTALLABLE when checking
+      /cdrom/.disk/base_installable.
+    - Enable universe and multiverse by default.
+    - If either restricted or multiverse is enabled, add commented-out lines
+      for the partner archive.
+    - Reduce the mirror verification timeout to 10 seconds.
+    - Disable the volatile service for Ubuntu, and don't ask the
+      apt-setup/services-select question.
+    - Always disable the CD at the end of installation if any mirrors are
+      present, even if it's a complete CD.
+    - Pre-populate apt's lists directory with signed Release files for
+      archive.ubuntu.com (and mirrors) and security.ubuntu.com, to protect
+      against downgrade attacks right from initial installation.
+    - Run 'apt-get update' for all sources.list lines produced by a single
+      generator in one go, and don't comment out sources.list lines if it
+      fails.
+    - Make the path to security updates configurable, as well as the host.
+    - Remove restricted from cdrom entry if apt-setup/restricted is false.
+    - Add Release files for intrepid and jaunty.
+    - Make sure to exit services-select generator cleanly if
+      apt-setup/services-select is empty.
+    - Allow preseeding apt-setup/partner to enable the partner repository.
+    - Use cdrom-detect/cdrom_fs when remounting the CD to ensure that we do
+      so using the same filesystem.
+    - Make sure apt-cdrom doesn't unmount the CD if cd_type ends with
+      /single.
+    - Enable all network sources, including security updates, even if the
+      network is unconfigured.
+    - Fix handling of universe and multiverse in -backports lines.
+    - Honour apt-setup/restricted, apt-setup/universe, and
+      apt-setup/multiverse when writing -backports lines.
+    - Check to make sure the CD filesystem is iso9660 before remounting it
+      as such.  Do not write a CD identifier if we're not working with
+      iso9660 so pkgsel does not try to unmount such disks.
+    - Fix description of universe in generated sources.list: packages there
+      are expected to be under a free licence.
+    - Run 'apt-get update', without downloading package lists or cleaning up
+      old files, after moving the sources.list generated during base system
+      installation back into place.
+    - If OVERRIDE_LEAVE_CD_MOUNTED is set, don't unmount /cdrom; this is a
+      bad idea in a live CD environment!
+    - Bail out cleanly from cdrom generator if /cdrom/.disk/info doesn't
+      exist or has zero size.
+  * Dropped changes, merged in Debian:
+    - Initialise local variable 'file' so that apt-setup-verify doesn't get
+      excruciatingly confused when you pass file=/path on the kernel command
+      line.
+
+ -- Steve Langasek <[e-mail]>  Mon, 04 May 2009 06:41:55 -0700
+
 apt-setup (1:0.40) unstable; urgency=low
 
   [ Colin Watson ]
@@ -226,6 +494,124 @@
 
  -- Frans Pop <[e-mail]>  Mon, 28 Jul 2008 00:44:12 +0200
 
+apt-setup (1:0.37ubuntu11) jaunty; urgency=low
+
+  * Make sure to exit services-select generator cleanly if
+    apt-setup/services-select is empty.
+
+ -- Colin Watson <[e-mail]>  Fri, 27 Mar 2009 12:03:45 +0000
+
+apt-setup (1:0.37ubuntu10) jaunty; urgency=low
+
+  * Add Release files for jaunty.
+  * Allow preseeding apt-setup/partner to enable the partner repository;
+    requested by Brian Thomason.
+
+ -- Colin Watson <[e-mail]>  Tue, 24 Feb 2009 18:17:19 +0000
+
+apt-setup (1:0.37ubuntu9) jaunty; urgency=low
+
+  * Use cdrom-detect/cdrom_fs when remounting the CD to ensure that we do so
+    using the same filesystem.
+  * Make sure apt-cdrom doesn't unmount the CD in the first place if cd_type
+    ends with /single (LP: #316618).
+
+ -- Colin Watson <[e-mail]>  Wed, 14 Jan 2009 15:04:44 +0000
+
+apt-setup (1:0.37ubuntu8) jaunty; urgency=low
+
+  * Remove /var/lib/install-cd.id if cd_type ends with /single, to avoid
+    unnecessary problems remounting the CD (LP: #294365).
+  * Enable all network sources, including security updates, even if the
+    network is unconfigured (LP: #256098).
+  * Fix handling of universe and multiverse in -backports lines.
+
+ -- Colin Watson <[e-mail]>  Fri, 09 Jan 2009 15:41:53 +0000
+
+apt-setup (1:0.37ubuntu7) jaunty; urgency=low
+
+  * Honour apt-setup/restricted, apt-setup/universe, and
+    apt-setup/multiverse when writing -backports lines (LP: #314462).
+
+ -- Colin Watson <[e-mail]>  Thu, 08 Jan 2009 11:46:10 +0000
+
+apt-setup (1:0.37ubuntu6) intrepid; urgency=low
+
+  * Check to make sure the CD filesystem is iso9660 before remounting it
+    as such.  Do not write a CD identifier if we're not working with
+    iso9660 so pkgsel does not try to unmount such disks.
+
+ -- Evan Dandrea <[e-mail]>  Mon, 20 Oct 2008 01:58:26 -0400
+
+apt-setup (1:0.37ubuntu5) intrepid; urgency=low
+
+  * Fix description of universe in generated sources.list: packages there
+    are expected to be under a free licence.
+  * Run 'apt-get update', without downloading package lists or cleaning up
+    old files, after moving the sources.list generated during base system
+    installation back into place (LP: #267884).
+
+ -- Colin Watson <[e-mail]>  Thu, 09 Oct 2008 14:53:36 +0100
+
+apt-setup (1:0.37ubuntu4) intrepid; urgency=low
+
+  * Fix sense of OVERRIDE_BASE_INSTALLABLE test in cdrom generator
+    (LP: #264337).
+  * If OVERRIDE_LEAVE_CD_MOUNTED is set, don't unmount /cdrom; this is a bad
+    idea in a live CD environment!
+
+ -- Colin Watson <[e-mail]>  Sat, 06 Sep 2008 10:47:32 +0100
+
+apt-setup (1:0.37ubuntu3) intrepid; urgency=low
+
+  * Bail out cleanly from cdrom generator if /cdrom/.disk/info doesn't exist
+    or has zero size (LP: #245519).
+
+ -- Colin Watson <[e-mail]>  Sun, 27 Jul 2008 00:05:58 +0100
+
+apt-setup (1:0.37ubuntu2) intrepid; urgency=low
+
+  * Initialise local variable 'file' so that apt-setup-verify doesn't get
+    excruciatingly confused when you pass file=/path on the kernel command
+    line.
+
+ -- Colin Watson <[e-mail]>  Thu, 26 Jun 2008 18:45:38 +0100
+
+apt-setup (1:0.37ubuntu1) intrepid; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Install the Ubuntu mirror generator instead of Debian's.
+    - Set apt-setup/security_host to security.ubuntu.com, or
+      ports.ubuntu.com on ports architectures; adjust directory and
+      distribution to match.
+    - Add security sources for restricted, universe, and multiverse,
+      commented out unless the respective components are enabled. Disable
+      security generator checks for contrib and non-free.
+    - For CD installs, leave the sources.list created by apt-setup in
+      /etc/apt/sources.list.apt-setup, and restore the sources.list created
+      during base installation for the rest of the installation.
+    - Honour OVERRIDE_BASE_INSTALLABLE when checking
+      /cdrom/.disk/base_installable.
+    - Enable universe and multiverse by default.
+    - If either restricted or multiverse is enabled, add commented-out lines
+      for the partner archive.
+    - Reduce the mirror verification timeout to 10 seconds.
+    - Disable the volatile service for Ubuntu, and don't ask the
+      apt-setup/services-select question.
+    - Always disable the CD at the end of installation if any mirrors are
+      present, even if it's a complete CD.
+    - Pre-populate apt's lists directory with signed Release files for
+      archive.ubuntu.com (and mirrors) and security.ubuntu.com, to protect
+      against downgrade attacks right from initial installation.
+    - Run 'apt-get update' for all sources.list lines produced by a single
+      generator in one go, and don't comment out sources.list lines if it
+      fails.
+    - Make the path to security updates configurable, as well as the host.
+    - Remove restricted from cdrom entry if apt-setup/restricted is false.
+  * Add Release files for intrepid.
+
+ -- Colin Watson <[e-mail]>  Tue, 17 Jun 2008 12:29:09 +0100
+
 apt-setup (1:0.37) unstable; urgency=low
 
   [ Updated translations ]
@@ -390,6 +776,92 @@
 
  -- Frans Pop <[e-mail]>  Sun, 06 Jan 2008 20:35:19 +0100
 
+apt-setup (1:0.31ubuntu8) hardy-proposed; urgency=low
+
+  * Remove restricted from cdrom entry if apt-setup/restricted is false
+    (LP: #220805).
+
+ -- Colin Watson <[e-mail]>  Tue, 20 May 2008 22:24:39 +0200
+
+apt-setup (1:0.31ubuntu7) hardy; urgency=low
+
+  * Make the path to security updates configurable, as well as the host
+    (thanks, Scott Dier; LP: #51470).
+
+ -- Colin Watson <[e-mail]>  Mon, 31 Mar 2008 05:31:16 +0100
+
+apt-setup (1:0.31ubuntu6) hardy; urgency=low
+
+  * Don't bother running 'apt-get update' after disabling cdrom entries in
+    sources.list; it can be slow and is unnecessary.
+
+ -- Colin Watson <[e-mail]>  Wed, 27 Feb 2008 14:11:28 +0000
+
+apt-setup (1:0.31ubuntu5) hardy; urgency=low
+
+  * Run 'apt-get update' for all sources.list lines produced by a single
+    generator in one go, and don't comment out sources.list lines if it
+    fails (LP: #154095).
+
+ -- Colin Watson <[e-mail]>  Mon, 11 Feb 2008 15:15:22 +0000
+
+apt-setup (1:0.31ubuntu4) hardy; urgency=low
+
+  * Use different pre-populated Release files for -proposed, -updates, and
+    -backports.
+
+ -- Colin Watson <[e-mail]>  Mon, 11 Feb 2008 13:08:23 +0000
+
+apt-setup (1:0.31ubuntu3) hardy; urgency=low
+
+  * Add apt-setup/proposed question (never asked); if preseeded to true,
+    -proposed entries will be added to sources.list (LP: #181776).
+  * Pre-populate apt's lists directory with signed Release files for
+    archive.ubuntu.com (and mirrors) and security.ubuntu.com, to protect
+    against downgrade attacks right from initial installation.
+
+ -- Colin Watson <[e-mail]>  Fri, 08 Feb 2008 13:01:59 +0000
+
+apt-setup (1:0.31ubuntu2) hardy; urgency=low
+
+  * Fix Debian-style sources.list line that crept back into the security
+    generator (thanks, Timo Aaltonen).
+
+ -- Colin Watson <[e-mail]>  Tue, 11 Dec 2007 15:49:34 +0000
+
+apt-setup (1:0.31ubuntu1) hardy; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Install the Ubuntu mirror generator instead of Debian's.
+    - Set apt-setup/security_host to security.ubuntu.com, or
+      ports.ubuntu.com on ports architectures; adjust directory and
+      distribution to match.
+    - Add security sources for restricted, universe, and multiverse,
+      commented out unless the respective components are enabled. Disable
+      security generator checks for contrib and non-free.
+    - For CD installs, leave the sources.list created by apt-setup in
+      /etc/apt/sources.list.apt-setup, and restore the sources.list created
+      during base installation for the rest of the installation.
+    - Honour OVERRIDE_BASE_INSTALLABLE when checking
+      /cdrom/.disk/base_installable.
+    - Enable universe and multiverse by default.
+    - If either restricted or multiverse is enabled, add commented-out lines
+      for the partner archive.
+    - Reduce the mirror verification timeout to 10 seconds.
+  * Use archive.ubuntu.com as the default source mirror for ports
+    architectures.
+  * Disable the volatile service for Ubuntu, and don't ask the
+    apt-setup/services-select question.
+  * Always disable the CD at the end of installation if any mirrors are
+    present, even if it's a complete CD. These days it's more irritating
+    than not, and inserting the CD on a desktop system will produce a prompt
+    anyway.
+  * Default to not using a mirror if the user selected to not configure the
+    network in netcfg (copied from Debian mirror generator).
+  * Set Vcs-Bzr for Ubuntu.
+
+ -- Colin Watson <[e-mail]>  Mon, 10 Dec 2007 16:32:52 +0000
+
 apt-setup (1:0.31) unstable; urgency=low
 
   * Correct inverted test for CD sources, which caused it to skip verification
@@ -563,6 +1035,52 @@
 
  -- Frans Pop <[e-mail]>  Mon, 21 May 2007 16:15:02 +0200
 
+apt-setup (1:0.21ubuntu4) gutsy; urgency=low
+
+  * Always verify the mirror, though with a shorter timeout than before (10
+    seconds). If we don't, then 'apt-get update' isn't called to download
+    indices, which means we are never able to download language packs from
+    the network.
+
+ -- Colin Watson <[e-mail]>  Wed, 10 Oct 2007 18:16:15 +0100
+
+apt-setup (1:0.21ubuntu3) gutsy; urgency=low
+
+  * Rename the 'commercial' component to 'partner'.
+
+ -- Colin Watson <[e-mail]>  Mon, 03 Sep 2007 18:10:33 +0100
+
+apt-setup (1:0.21ubuntu2) gutsy; urgency=low
+
+  * If either restricted or multiverse is enabled, add commented-out lines
+    for the commercial component (LP: #118002).
+  * Add -updates for universe and multiverse, if enabled.
+
+ -- Colin Watson <[e-mail]>  Thu, 02 Aug 2007 11:20:05 +0100
+
+apt-setup (1:0.21ubuntu1) gutsy; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Install the Ubuntu mirror generator instead of Debian's.
+    - Set apt-setup/security_host to security.ubuntu.com, or
+      ports.ubuntu.com on ports architectures; adjust directory and
+      distribution to match.
+    - Add security sources for restricted, universe, and multiverse,
+      commented out unless the respective components are enabled. Disable
+      security generator checks for contrib and non-free.
+    - For CD installs, leave the sources.list created by apt-setup in
+      /etc/apt/sources.list.apt-setup, and restore the sources.list created
+      during base installation for the rest of the installation.
+    - Honour OVERRIDE_BASE_INSTALLABLE when deciding whether to run
+      choose-mirror.
+    - Don't bother validating network mirrors if the base system can be
+      installed from CD; apt's failure mode is sufficiently graceful
+      nowadays that we can let the user sort out problems after
+      installation.
+    - Enable universe and multiverse by default.
+
+ -- Colin Watson <[e-mail]>  Sun, 29 Apr 2007 16:25:30 +0100
+
 apt-setup (1:0.21) unstable; urgency=low
 
   * Multiply menu-item-numbers by 100.
@@ -639,6 +1157,55 @@
 
  -- Frans Pop <[e-mail]>  Mon, 29 Jan 2007 21:43:32 +0100
 
+apt-setup (1:0.16ubuntu4) feisty; urgency=low
+
+  * Set Maintainer to [e-mail].
+
+ -- Colin Watson <[e-mail]>  Fri, 16 Feb 2007 09:07:04 +0000
+
+apt-setup (1:0.16ubuntu3) feisty; urgency=low
+
+  * generators/90security: Add security sources for multiverse, commented
+    out unless multiverse is enabled (thanks, Timo Aaltonen; LP: #55509).
+  * debian/apt-mirror-setup.templates-ubuntu: Enable universe and multiverse
+    by default
+    (https://blueprints.launchpad.net/ubuntu/+spec/enabling-additional-components).
+
+ -- Colin Watson <[e-mail]>  Thu,  8 Feb 2007 14:19:38 +0000
+
+apt-setup (1:0.16ubuntu2) feisty; urgency=low
+
+  * generators/90security: Disable check for contrib and non-free
+    (LP: #56009).
+  * generators/50mirror.ubuntu: Link to
+    http://help.ubuntu.com/community/UpgradeNotes for upgrade instructions
+    (LP: #69094).
+
+ -- Colin Watson <[e-mail]>  Tue, 12 Dec 2006 15:06:11 +0000
+
+apt-setup (1:0.16ubuntu1) feisty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Install the Ubuntu mirror generator instead of Debian's.
+    - Set apt-setup/security_host to security.ubuntu.com, or
+      ports.ubuntu.com on ports architectures; adjust directory and
+      distribution to match.
+    - Add security sources for restricted and universe, commented out unless
+      the respective components are enabled.
+    - For CD installs, leave the sources.list created by apt-setup in
+      /etc/apt/sources.list.apt-setup, and restore the sources.list created
+      during base installation for the rest of the installation.
+    - Honour OVERRIDE_BASE_INSTALLABLE when deciding whether to run
+      choose-mirror.
+    - Don't bother validating network mirrors if the base system can be
+      installed from CD; apt's failure mode is sufficiently graceful
+      nowadays that we can let the user sort out problems after
+      installation.
+  * Allow back up from use network mirror question in Ubuntu mirror
+    generator.
+
+ -- Colin Watson <[e-mail]>  Tue, 31 Oct 2006 15:23:58 +0000
+
 apt-setup (1:0.16) unstable; urgency=low
 
   * Arabic (ar.po) by Ossama M. Khayat
@@ -729,6 +1296,46 @@
 
  -- Frans Pop <[e-mail]>  Thu, 13 Jul 2006 17:11:34 +0200
 
+apt-setup (1:0.11ubuntu5) edgy; urgency=low
+
+  * Don't bother validating network mirrors if the base system can be
+    installed from CD; apt's failure mode is sufficiently graceful nowadays
+    that we can let the user sort out problems after installation (closes:
+    Malone #14599, #35364).
+
+ -- Colin Watson <[e-mail]>  Wed, 18 Oct 2006 18:47:47 +0100
+
+apt-setup (1:0.11ubuntu4) edgy; urgency=low
+
+  * Backport from trunk (Joey Hess):
+    - Fix broken proxy setting code in 90security. Closes: #378868
+      Some systems installed before this fix will have Acquire::http::proxy
+      "false" set in apt.conf, which leads to breakage in some situations.
+      Also, if a proxy was set, it would not be written to the file.
+
+ -- Colin Watson <[e-mail]>  Wed, 30 Aug 2006 12:16:36 +0100
+
+apt-setup (1:0.11ubuntu3) edgy; urgency=low
+
+  * Honour OVERRIDE_BASE_INSTALLABLE when deciding whether to run
+    choose-mirror.
+
+ -- Colin Watson <[e-mail]>  Thu, 27 Jul 2006 11:48:27 +0100
+
+apt-setup (1:0.11ubuntu2) edgy; urgency=low
+
+  * Fix mirror generators not to break if apt-setup/use_mirror isn't asked.
+
+ -- Colin Watson <[e-mail]>  Wed, 19 Jul 2006 07:56:44 +0100
+
+apt-setup (1:0.11ubuntu1) edgy; urgency=low
+
+  * Resynchronise with Debian.
+  * Port mirror generator changes from 1:0.11 to Ubuntu mirror generator.
+  * Put base-installer dependency back to 1.49.
+
+ -- Colin Watson <[e-mail]>  Wed, 28 Jun 2006 12:46:49 +0100
+
 apt-setup (1:0.11) unstable; urgency=low
 
   [ Frans Pop ]
@@ -790,6 +1397,23 @@
 
  -- Joey Hess <[e-mail]>  Thu, 15 Jun 2006 13:54:54 -0400
 
+apt-setup (1:0.10ubuntu2) dapper; urgency=low
+
+  * Backport from trunk:
+    - Set $protocol in security generator so that proxy configuration works.
+  * Use ports.ubuntu.com instead of security.ubuntu.com on ports
+    architectures (closes: Malone #39342).
+
+ -- Colin Watson <[e-mail]>  Thu, 18 May 2006 00:15:34 +0100
+
+apt-setup (1:0.10ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian (UVF exception approved by mdz).
+  * Drop base-installer dependency to 1.42ubuntu11 for
+    --ignore-time-conflict removal.
+
+ -- Colin Watson <[e-mail]>  Tue, 25 Apr 2006 19:15:24 +0100
+
 apt-setup (1:0.10) unstable; urgency=low
 
   [ Frans Pop ]
@@ -947,6 +1571,51 @@
 
  -- Frans Pop <[e-mail]>  Mon, 23 Jan 2006 21:23:37 +0100
 
+apt-setup (1:0.4ubuntu6) dapper; urgency=low
+
+  * Make sure to move our sources.list aside only for CD installs, not
+    netboot, and log a message when we do so (closes: Malone #28462).
+
+ -- Colin Watson <[e-mail]>  Tue, 24 Jan 2006 11:00:40 +0000
+
+apt-setup (1:0.4ubuntu5) dapper; urgency=low
+
+  * Fix comment typo in Ubuntu mirror generator (closes: Malone #29231).
+
+ -- Colin Watson <[e-mail]>  Mon, 23 Jan 2006 15:14:17 +0000
+
+apt-setup (1:0.4ubuntu4) dapper; urgency=low
+
+  * https://bugzilla.ubuntu.com/show_bug.cgi?id=6390 returned with the
+    rewritten apt-setup. Apply this change from the previous implementation,
+    since it turns out to still be relevant:
+    - For CD installs, leave the sources.list created by apt-setup in
+      /etc/apt/sources.list.apt-setup, and restore the sources.list created
+      during base installation for the rest of the installation.
+
+ -- Colin Watson <[e-mail]>  Tue, 13 Dec 2005 19:34:13 +0000
+
+apt-setup (1:0.4ubuntu3) dapper; urgency=low
+
+  * Add security sources for restricted and universe, commented out unless
+    the respective components are enabled.
+
+ -- Colin Watson <[e-mail]>  Fri,  9 Dec 2005 12:38:55 +0000
+
+apt-setup (1:0.4ubuntu2) dapper; urgency=low
+
+  * Backport from trunk:
+    - Fix reversed logic for universe and backports in Ubuntu mirror
+      generator.
+
+ -- Colin Watson <[e-mail]>  Fri,  9 Dec 2005 12:32:28 +0000
+
+apt-setup (1:0.4ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <[e-mail]>  Fri,  9 Dec 2005 12:21:17 +0000
+
 apt-setup (1:0.4) unstable; urgency=low
 
   [ Frans Pop ]
@@ -984,6 +1653,26 @@
 
  -- Joey Hess <[e-mail]>  Mon,  5 Dec 2005 19:40:39 -0500
 
+apt-setup (1:0.2ubuntu3) dapper; urgency=low
+
+  * Include debian/apt-mirror-setup.templates-ubuntu in output
+    apt-mirror-setup templates file.
+
+ -- Colin Watson <[e-mail]>  Thu,  1 Dec 2005 14:16:11 +0000
+
+apt-setup (1:0.2ubuntu2) dapper; urgency=low
+
+  * Fix sources.list entries for Ubuntu security.
+
+ -- Colin Watson <[e-mail]>  Fri, 25 Nov 2005 14:29:25 +0000
+
+apt-setup (1:0.2ubuntu1) dapper; urgency=low
+
+  * Install the Ubuntu mirror generator instead of Debian's.
+  * Set apt-setup/security_host to security.ubuntu.com.
+
+ -- Colin Watson <[e-mail]>  Sun, 20 Nov 2005 15:46:19 +0000
+
 apt-setup (1:0.2) unstable; urgency=low
 
   [ Colin Watson ]

=== modified file 'debian/control'
--- debian/control	2010-05-18 20:15:06 +0000
+++ debian/control	2010-09-13 07:17:41 +0000
@@ -1,10 +1,19 @@
 Source: apt-setup
 Section: debian-installer
 Priority: extra
+<<<<<<< TREE
 Maintainer: Debian Install System Team <[e-mail]>
 Uploaders: Frans Pop <[e-mail]>
 Build-Depends: debhelper (>= 7.0.0), dpkg-dev (>= 1.7.0), po-debconf (>= 0.5.0)
 Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/apt-setup
+=======
+Maintainer: Ubuntu Installer Team <[e-mail]>
+XSBC-Original-Maintainer: Debian Install System Team <[e-mail]>
+Uploaders: Joey Hess <[e-mail]>, Frans Pop <[e-mail]>
+Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.7.0), po-debconf (>= 0.5.0)
+XS-Debian-Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/apt-setup
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/apt-setup/ubuntu
+>>>>>>> MERGE-SOURCE
 
 Package: apt-setup-udeb
 XC-Package-Type: udeb

=== modified file 'debian/copyright'
--- debian/copyright	2006-10-13 08:41:19 +0000
+++ debian/copyright	2010-09-13 07:17:41 +0000
@@ -1,4 +1,5 @@
-apt-setup is copyright 2005 by Joey Hess <[e-mail]>.
+apt-setup is copyright 2005 by Joey Hess <[e-mail]>;
+             copyright 2005, 2006, 2007, 2008 by Canonical Ltd.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the Free

=== modified file 'debian/po/am.po'
--- debian/po/am.po	2010-06-29 23:21:23 +0000
+++ debian/po/am.po	2010-09-13 07:17:41 +0000
@@ -70,14 +70,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "ካዝናው ጋ መድረስ አልተቻለም"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -88,7 +88,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -100,7 +100,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "የደህንነት ማሻሻያዎች (ከ ${SEC_HOST})"
 
@@ -110,21 +110,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "ጊዜያዊ ማሻሻያዎች  (ከ ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "የምጠቀመው መገልገያዎች፦"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -134,7 +134,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -143,7 +143,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/ar.po'
--- debian/po/ar.po	2009-10-20 23:19:36 +0000
+++ debian/po/ar.po	2010-09-13 07:17:41 +0000
@@ -69,14 +69,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "تعذر الوصول إلى المستودع"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -87,7 +87,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -101,7 +101,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "تحديثات الأمن (من ${SEC_HOST})"
 
@@ -111,21 +111,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "تحديثات volatile (من ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "الخدمات المطلوب استعمالها:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -134,7 +134,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -145,7 +145,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/ast.po'
--- debian/po/ast.po	2010-08-11 02:21:10 +0000
+++ debian/po/ast.po	2010-09-13 07:17:41 +0000
@@ -72,14 +72,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Nun se tien accesu al repositoriu"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -90,7 +90,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -104,7 +104,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "Anovamientos de seguridá (dende ${SEC_HOST})"
 
@@ -114,21 +114,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "anovamientos volátiles (dende ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Servicios a usar:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -139,7 +139,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -150,7 +150,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/be.po'
--- debian/po/be.po	2010-07-06 23:22:20 +0000
+++ debian/po/be.po	2010-09-13 07:17:41 +0000
@@ -81,14 +81,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Немагчыма атрымаць доступ да сховішча"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -99,7 +99,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -112,7 +112,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "абн. бяспекі: ${SEC_HOST}"
 
@@ -122,21 +122,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "надзённыя абн.: ${VOL_HOST}"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Выкарыстоўваць службы:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -147,7 +147,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -158,7 +158,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/bg.po'
--- debian/po/bg.po	2010-08-11 02:21:10 +0000
+++ debian/po/bg.po	2010-09-13 07:17:41 +0000
@@ -74,14 +74,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Грешка при достъп до хранилището"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -93,7 +93,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -106,7 +106,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "обновявания по сигурността (от ${SEC_HOST})"
 
@@ -116,21 +116,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "бързи обновявания (от ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Източници на обновявания:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -141,7 +141,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -152,7 +152,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/bn.po'
--- debian/po/bn.po	2010-02-09 23:22:04 +0000
+++ debian/po/bn.po	2010-09-13 07:17:41 +0000
@@ -81,7 +81,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "রিপোজিটরি পড়া যাচ্ছে না"
 
@@ -92,7 +92,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -106,7 +106,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -120,7 +120,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "(${SEC_HOST}হতে) নিরাপত্তা আপডেট"
 
@@ -130,14 +130,14 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "(${VOL_HOST}হতে) ভোলাটাইল আপডেট"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "ব্যবহারের সেবাসমূহ:"
 
@@ -145,7 +145,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -155,7 +155,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -166,7 +166,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/bs.po'
--- debian/po/bs.po	2010-08-07 18:30:11 +0000
+++ debian/po/bs.po	2010-09-13 07:17:41 +0000
@@ -73,14 +73,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Ne mogu pristupiti repozitoriju"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -91,7 +91,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -104,7 +104,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "sigurnosne zakrpe (sa ${SEC_HOST})"
 
@@ -114,21 +114,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "volatilne zakrpe (sa ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Servisi za koristiti:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -139,7 +139,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -150,7 +150,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/ca.po'
--- debian/po/ca.po	2010-05-11 23:21:08 +0000
+++ debian/po/ca.po	2010-09-13 07:17:41 +0000
@@ -70,14 +70,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "No es pot accedir al dipòsit"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -89,7 +89,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -103,7 +103,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "actualitzacions de seguretat (des de ${SEC_HOST})"
 
@@ -113,21 +113,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "actualitzacions volàtils (des de ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Serveis a emprar:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -138,7 +138,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -149,7 +149,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2009-07-24 13:01:42 +0000
+++ debian/po/cs.po	2010-09-13 07:17:41 +0000
@@ -68,14 +68,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Nelze se připojit k archivu"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -86,7 +86,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -100,7 +100,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "bezpečnostní opravy (z ${SEC_HOST})"
 
@@ -110,21 +110,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "rychlé aktualizace (z ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Používat služby:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -135,7 +135,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -146,7 +146,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== added file 'debian/po/cy.po.OTHER'
--- debian/po/cy.po.OTHER	1970-01-01 00:00:00 +0000
+++ debian/po/cy.po.OTHER	2010-09-13 07:17:41 +0000
@@ -0,0 +1,697 @@
+# THIS FILE IS GENERATED AUTOMATICALLY FROM THE D-I PO MASTER FILES
+# The master files can be found under packages/po/
+#
+# DO NOT MODIFY THIS FILE DIRECTLY: SUCH CHANGES WILL BE LOST
+#
+# translation of Debian Installer templates to Welsh
+# Copyright (C) 2004-2008 Software in the Public Interest, Inc.
+# This file is distributed under the same license as debian-installer.
+#
+# Jonathan Price <[e-mail]>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-06-26 22:47+0000\n"
+"PO-Revision-Date: 2008-08-20 21:58+0100\n"
+"Last-Translator: Jonathan Price <[e-mail]>\n"
+"Language-Team: Welsh <>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: text
+#. Description
+#. Main menu item
+#. MUST be kept below 55 characters/columns
+#. :sl1:
+#: ../apt-setup-udeb.templates:1001
+msgid "Configure the package manager"
+msgstr "Cyflunio'r rheolydd pecynnau"
+
+#. Type: text
+#. Description
+#. Translators, "apt" is the program name
+#. so please do NOT translate it
+#. :sl1:
+#: ../apt-setup-udeb.templates:2001
+msgid "Configuring apt"
+msgstr "Yn cyflunio apt"
+
+#. Type: text
+#. Description
+#. :sl1:
+#: ../apt-setup-udeb.templates:3001
+msgid "Running ${SCRIPT}..."
+msgstr "Yn rhedeg ${SCRIPT}..."
+
+#. Type: text
+#. Description
+#. :sl1:
+#: ../apt-setup-udeb.templates:4001
+msgid "Scanning local repositories..."
+msgstr "Sganio ystorfeydd lleol..."
+
+#. Type: text
+#. Description
+#. :sl1:
+#: ../apt-setup-udeb.templates:5001
+msgid "Scanning the security updates repository..."
+msgstr "Sganio ystorfeydd diweddarau diogelwch..."
+
+#. Type: text
+#. Description
+#. :sl1:
+#: ../apt-setup-udeb.templates:6001
+msgid "Scanning the volatile updates repository..."
+msgstr "Sganio ystorfeydd diweddarau hedegog..."
+
+#. Type: error
+#. Description
+#. :sl2:
+#: ../apt-setup-udeb.templates:10001
+msgid "Cannot access repository"
+msgstr "Methu cael mynediad i'r ystorfa"
+
+#. Type: error
+#. Description
+#. :sl2:
+#: ../apt-setup-udeb.templates:10001
+msgid ""
+"The repository on ${HOST} couldn't be accessed, so its updates will not be "
+"made available to you at this time. You should investigate this later."
+msgstr ""
+"Ni ellir cael mynediad i'r ystorfa ar ${HOST}, felly ni bydd yr uwchraddiad "
+"ar gael i chi ar hyn o bryd. Ymchwiliwch i hwn nes ymlaen."
+
+#. Type: error
+#. Description
+#. :sl2:
+#: ../apt-setup-udeb.templates:10001
+msgid ""
+"Commented out entries for ${HOST} have been added to the /etc/apt/sources."
+"list file."
+msgstr ""
+"Sylwadau ar cofnodion allan ar ${HOST} wedi'u ychwanegu i'r ffeil rhestr /"
+"etc/apt/sources."
+
+#. Type: multiselect
+#. Choices
+#. SEC_HOST and VOL_HOST are host names (e.g. security.debian.org)
+#. Translators: the *entire* string should be under 55 columns
+#. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
+#. :sl2:
+#: ../apt-setup-udeb.templates:11001
+msgid "security updates (from ${SEC_HOST})"
+msgstr "uwchraddiadau diogelwch (o ${SEC_HOST})"
+
+#. Type: multiselect
+#. Choices
+#. SEC_HOST and VOL_HOST are host names (e.g. security.debian.org)
+#. Translators: the *entire* string should be under 55 columns
+#. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
+#. :sl2:
+#: ../apt-setup-udeb.templates:11001
+msgid "volatile updates (from ${VOL_HOST})"
+msgstr "Uwchraddiadau hedegog (o ${VOL_HOST})"
+
+#. Type: multiselect
+#. Description
+#. :sl2:
+#: ../apt-setup-udeb.templates:11002
+msgid "Services to use:"
+msgstr "Gwasanaethau i'w defnyddio"
+
+#. Type: multiselect
+#. Description
+#. :sl2:
+#: ../apt-setup-udeb.templates:11002
+msgid ""
+"Debian has two services that provide updates to releases: security and "
+"volatile."
+msgstr ""
+"Mae gan Debian ddau wasanaeth sy'n rhoi uwchraddiadau: diogelwch a hedegog"
+
+#. Type: multiselect
+#. Description
+#. :sl2:
+#: ../apt-setup-udeb.templates:11002
+msgid ""
+"Security updates help to keep your system secured against attacks. Enabling "
+"this service is strongly recommended."
+msgstr ""
+"Mae uwchraddiadau diogelwch yn helpu cynnal eich system yn erbyn "
+"bygythiadau. Mae gweithredu'r gwasanaeth yma yn cael ei hargymell yn gryf."
+
+#. Type: multiselect
+#. Description
+#. :sl2:
+#: ../apt-setup-udeb.templates:11002
+msgid ""
+"Volatile updates provide more current versions for software that changes "
+"relatively frequently and where not having the latest version could reduce "
+"the usability of the software. An example is the virus signatures for a "
+"virus scanner. This service is only available for stable and oldstable "
+"releases."
+msgstr ""
+"Mae uwchraddiadau hedegog yn rhoi fersiynau cymwys o feddalwedd sy'n newid "
+"yn weddol aml a lle byddai cael hen fersiwn o'r feddalwedd yn lleihau "
+"defnyddioldeb y meddalwedd. Esiampl yw'r feirws arwyddo ar gyfer sganiwr "
+"feirws. Mae'r gwasanaeth hyn ond ar gael ar fyer fersiynau sefydlog a "
+"hensefydlog."
+
+#. Type: text
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:1001
+msgid "Scanning the CD-ROM..."
+msgstr "Yn sganio CD-ROM... "
+
+#. Type: error
+#. Description
+#. :sl2:
+#: ../apt-cdrom-setup.templates:2001
+msgid "apt configuration problem"
+msgstr "Cyfluniad APT"
+
+#. Type: error
+#. Description
+#. :sl2:
+#: ../apt-cdrom-setup.templates:2001
+msgid ""
+"An attempt to configure apt to install additional packages from the CD "
+"failed."
+msgstr "Mae cais i newid neu i gosod pecynnau ychwanegol o'r CD wedi methu."
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#. Type: boolean
+#. Description
+#. :sl1:
+#. Type: boolean
+#. Description
+#. :sl1:
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:3001 ../apt-cdrom-setup.templates:4001
+#: ../apt-cdrom-setup.templates:5001 ../apt-cdrom-setup.templates:6001
+msgid "Scan another CD or DVD?"
+msgstr "Sganio CD neu DVD arall?"
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:3001
+msgid "Your installation CD or DVD has been scanned; its label is:"
+msgstr "Mae eich CD neu DVD sefydlu wedi gael ei sganio; ei label yw:"
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:3001
+msgid ""
+"You now have the option to scan additional CDs or DVDs for use by the "
+"package manager (apt). Normally these should be from the same set as the "
+"installation CD/DVD. If you do not have any additional CDs or DVDs "
+"available, this step can just be skipped."
+msgstr ""
+"Mae nawr ganddych yr optiwn i sganio CDs neu DVDs ychwanegol ar gyfer "
+"defnydd gan y rheolwr pecynnau(apt). Fel arfer dylai rhain bod o'r un set "
+"â'r CD/DVD sefydlu. Os nad oes gennych unrhyw CDs neu DVDs ychwanegol ar "
+"gael gall y cam yma gael ei hepgor"
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:3001 ../apt-cdrom-setup.templates:4001
+msgid "If you wish to scan another CD or DVD, please insert it now."
+msgstr ""
+"Os ydych yn dymuno sganio CD neu DVD arall, mewnbynnwch nawr os gwelwch yn "
+"dda."
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:4001
+msgid "The CD or DVD with the following label has been scanned:"
+msgstr "Mae'r CD neu DVD gyda'r label canlynol wedi gael ei sganio:"
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:5001
+msgid "The CD or DVD with the following label has already been scanned:"
+msgstr "Mae'r CD neu DVD gyda'r label canlynol wedi gael ei sganio yn barod:"
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:5001
+msgid "Please replace it now if you wish to scan another CD or DVD."
+msgstr ""
+"Amnewidwch e nawr, os gwelwch yn dda, os dymunwch sganio CD neu DVD arall."
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:6001
+msgid ""
+"An attempt to configure apt to install additional packages from the CD/DVD "
+"failed."
+msgstr ""
+"Roedd cynnig i ffurddweddi apt i sefydlu pecynnau ychwanegol o'r CD/DVD wedi "
+"methu."
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:6001
+msgid "Please check that the CD/DVD has been inserted correctly."
+msgstr ""
+"Gwiriwch fod y CD/DVD wedi gael ei mewnbynnu yn gywir, os gwelwch yn dda."
+
+#. Type: text
+#. Description
+#. :sl1:
+#. This template uses the same text as used in the package apt for apt-cdrom
+#. Do not translate "/cdrom/" (the mount point)
+#: ../apt-cdrom-setup.templates:7001
+msgid "Media change"
+msgstr "Newid cyfrwng"
+
+#. Type: text
+#. Description
+#. :sl1:
+#. This template uses the same text as used in the package apt for apt-cdrom
+#. Do not translate "/cdrom/" (the mount point)
+#: ../apt-cdrom-setup.templates:7001
+msgid ""
+"/cdrom/:Please insert the disc labeled: '${LABEL}' in the drive '/cdrom/' "
+"and press enter."
+msgstr ""
+"/cdrom/:Mewnbynnwch y disg wedi labeli: '${LABEL}' mewn i'r gyrrwr '/cdrom/' "
+"a gwthiwch enter, os gwelwch yn dda."
+
+#. Type: text
+#. Description
+#. :sl1:
+#. finish-install progress bar item
+#: ../apt-cdrom-setup.templates:8001
+msgid "Disabling netinst CD in sources.list..."
+msgstr "Yn analluogi CD netinst mewn sources.list..."
+
+#. Type: text
+#. Description
+#. :sl1:
+#. Type: boolean
+#. Description
+#. :sl2:
+#: ../apt-cdrom-setup.templates:9001 ../apt-mirror-setup.templates:6001
+msgid ""
+"If you are installing from a netinst CD and choose not to use a mirror, you "
+"will end up with only a very minimal base system."
+msgstr ""
+"Os ydych yn sefydlu o CD netinst a dewisoch ddim i defnyddio drych, mi "
+"fyddech yn diweddi lan gyda ond y system lleiafswm sail."
+
+#. Type: text
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:10001
+msgid ""
+"You are installing from a netinst CD, which by itself only allows "
+"installation of a very minimal base system. Use a mirror to install a more "
+"complete system."
+msgstr ""
+"Os ydych yn sefydlu o CD netinst, sydd ar ei hunan ond yn alluogi sefydliad "
+"o system lleiafswm sail. Defnyddiwch drych i sefydlu sytem fwy cyflawn."
+
+#. Type: text
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:11001
+msgid ""
+"You are installing from a CD, which contains a limited selection of packages."
+msgstr "Rydych yn sefydlu o CD sydd ond yn cynnwys dewis cyfwng o pecynnau."
+
+#. Type: text
+#. Description
+#. :sl1:
+#. The value of %i can be 2 or 3
+#: ../apt-cdrom-setup.templates:12001
+#, no-c-format
+msgid ""
+"You have scanned %i CDs. Even though these contain a fair selection of "
+"packages, some may be missing (notably some packages needed to support "
+"languages other than English)."
+msgstr ""
+"Rydych wedi sgannio %i CD. Hyd yn oed bod rhain yn cynnwys dewis hael o "
+"pecynnau, mae'n posib bod rhai ar goll (yn enwedig rhai pecynnau sy'n angen "
+"i cynorthwyo ieithoedd ond am Saesneg)."
+
+#. Type: text
+#. Description
+#. :sl1:
+#. The value of %i can be from 4 to 8
+#: ../apt-cdrom-setup.templates:13001
+#, no-c-format
+msgid ""
+"You have scanned %i CDs. Even though these contain a large selection of "
+"packages, some may be missing."
+msgstr ""
+"Rydych wedi sgannio %i CD. Hyd yn oed bod rhain yn cynnwys dewis hael o "
+"pecynnau, mae'n posib bod rhai ar goll."
+
+#. Type: text
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:14001
+msgid ""
+"Note that using a mirror can result in a large amount of data being "
+"downloaded during the next step of the installation."
+msgstr ""
+"Nodwch fod defnyddio drych yn gallu deilio mewn niferoedd fawr o data yn "
+"gael ei lawrllwytho yn ystod y cam nesaf o'r sefydliad."
+
+#. Type: text
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:15001
+msgid ""
+"You are installing from a DVD. Even though the DVD contains a large "
+"selection of packages, some may be missing."
+msgstr ""
+"Rydych yn sefydlu ô DVD. Er bod y DVD yn cynnwys dewis fawr o pecynnau, "
+"mae'n posib bod rhai ar goll."
+
+#. Type: text
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:16001
+msgid ""
+"Unless you don't have a good Internet connection, use of a mirror is "
+"recommended, especially if you plan to install a graphical desktop "
+"environment."
+msgstr ""
+"Onid nad oes gennych cysylltiad dda i'r rhyngrwyd, mae'r defnydd ô ddrych "
+"wedi argymell, yn enwedig os ydych yn cynllunio i sefydlu amgylchedd bwrdd "
+"gwaith graffigol."
+
+#. Type: text
+#. Description
+#. :sl1:
+#: ../apt-cdrom-setup.templates:17001
+msgid ""
+"If you have a reasonably good Internet connection, use of a mirror is "
+"suggested if you plan to install a graphical desktop environment."
+msgstr ""
+"Os oes gennych cysylltiad dda i'r rhyngrwyd, mae'r defnydd ô ddrych wedi "
+"argymell, os ydych yn cynllunio i sefydlu amgylchedd bwrdd gwaith graffigol."
+
+#. Type: text
+#. Description
+#. :sl1:
+#: ../apt-mirror-setup.templates:1001
+msgid "Scanning the mirror..."
+msgstr "Sganio'r drych..."
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-mirror-setup.templates:2001
+msgid "Use non-free software?"
+msgstr "Defnyddio meddalwedd nad yw'n rhydd?"
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-mirror-setup.templates:2001
+msgid ""
+"Some non-free software has been made to work with Debian. Though this "
+"software is not at all a part of Debian, standard Debian tools can be used "
+"to install it. This software has varying licenses which may prevent you from "
+"using, modifying, or sharing it."
+msgstr ""
+"Mae peth meddalwedd nad yw'n rhydd wedi ei addasu i weithio efo Debian. Er "
+"nad yw'r meddalwedd hwn yn rhan o Debian o gwbl, gellir defnyddio offer "
+"safonol Debian i'w sefydlu. Mae gan y meddalwedd hwn drwyddedau gwahanol a "
+"all eich rhwystro rhag ei ddefnyddio, ei newid neu ei rhannu ef."
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#: ../apt-mirror-setup.templates:2001
+#: ../apt-mirror-setup.templates-ubuntu:1001
+msgid "Please choose whether you want to have it available anyway."
+msgstr "Os gwelwch yn dda, dewiswch a ddylai fod ar gael fodd bynnag."
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-mirror-setup.templates:3001
+msgid "Use contrib software?"
+msgstr "Defnyddio meddalwedd \"contrib\"?"
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-mirror-setup.templates:3001
+msgid ""
+"Some additional software has been made to work with Debian. Though this "
+"software is free, it depends on non-free software for its operation. This "
+"software is not a part of Debian, but standard Debian tools can be used to "
+"install it."
+msgstr ""
+"Mae peth meddalwedd ychwanegol wedi ei addasu i weithio gyda Debian. Er fod "
+"y meddalwedd yma'n rhydd, mae'n dibynnu ar feddalwedd nad yw'n rhyd er mwyn "
+"gweithredu. Nid yw'r meddalwedd hwn yn rhan o Debian, ond gellir defnyddio "
+"offer safonol Debian i'w sefydlu."
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#: ../apt-mirror-setup.templates:3001
+#: ../apt-mirror-setup.templates-ubuntu:2001
+#: ../apt-mirror-setup.templates-ubuntu:3001
+#: ../apt-mirror-setup.templates-ubuntu:4001
+#: ../apt-mirror-setup.templates-ubuntu:5001
+msgid ""
+"Please choose whether you want this software to be made available to you."
+msgstr ""
+"Os gwelwch yn dda, dewiswch a ddylai'r meddalwedd hwn fod ar gael i chi."
+
+#. Type: select
+#. Choices
+#. :sl2:
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../apt-mirror-setup.templates:4001
+msgid "Retry"
+msgstr "Ailgeisio"
+
+#. Type: select
+#. Choices
+#. :sl2:
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../apt-mirror-setup.templates:4001
+msgid "Change mirror"
+msgstr "Newid drych"
+
+#. Type: select
+#. Choices
+#. :sl2:
+#. These are choices of actions so this is, at least in English,
+#. an infinitive form
+#: ../apt-mirror-setup.templates:4001
+msgid "Ignore"
+msgstr "dim"
+
+#. Type: select
+#. Description
+#: ../apt-mirror-setup.templates:4002
+msgid "Downloading a file failed:"
+msgstr "Lawrlwytho ffeil wedi methu:"
+
+#. Type: select
+#. Description
+#: ../apt-mirror-setup.templates:4002
+msgid ""
+"The installer failed to access the mirror. This may be a problem with your "
+"network, or with the mirror. You can choose to retry the download, select a "
+"different mirror, or ignore the problem and continue without all the "
+"packages from this mirror."
+msgstr ""
+"Methodd y sefydlydd cyrchu y drych. Fe all hyn fod oherwydd problem gyda'ch "
+"rhwydwaith, neu gyda'r drych. Fe allwch ddewis i ailgeisio'r  lawrlwythiad, "
+"ddewis drych arall, neu anwybyddu'r problem a parhau heb y pecynnau o'r "
+"drych yma."
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-mirror-setup.templates:5001
+msgid "Use a network mirror?"
+msgstr "Defnyddio drych rhwydwaeth?"
+
+#. Type: boolean
+#. Description
+#. :sl1:
+#: ../apt-mirror-setup.templates:5001
+msgid ""
+"A network mirror can be used to supplement the software that is included on "
+"the CD-ROM. This may also make newer versions of software available."
+msgstr ""
+"Gaell drych rhwydwaeth gael ei defnyddio i atodi y meddalwedd sydd wedi "
+"cynnwys ar y CD-ROM. Gall versiynnau fwy diweddar o'r meddalwedd bod argael."
+
+#. Type: boolean
+#. Description
+#. :sl2:
+#: ../apt-mirror-setup.templates:6001
+msgid "Continue without a network mirror?"
+msgstr "Parhau heb drych rhwydwaith?"
+
+#. Type: boolean
+#. Description
+#. :sl2:
+#: ../apt-mirror-setup.templates:6001
+msgid "No network mirror was selected."
+msgstr "Ni ddewiswyd unrhyw ddrych rhwydwaith."
+
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#: ../apt-mirror-setup.templates-ubuntu:1001
+msgid "Use restricted software?"
+msgstr "Defnyddio meddalwedd cyfyngedig?"
+
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#: ../apt-mirror-setup.templates-ubuntu:1001
+msgid ""
+"Some non-free software is available in packaged form. Though this software "
+"is not a part of the main distribution, standard package management tools "
+"can be used to install it. This software has varying licenses which may "
+"prevent you from using, modifying, or sharing it."
+msgstr ""
+"Mae peth meddalwedd nad sy'n rhad ar gael mewn ffurf pecyn. Er nad yw'r "
+"feddalwedd hyn yn rhan o'r brif ddosbarthiad, gellir defnyddio pecyn offer "
+"safonol rheolwyr i'w osod. Mae gan y meddalwedd hyn gwahanol trwyddedau a "
+"all eich rhwystro rhag ei ddefnyddio, newid neu'i rannu."
+
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#: ../apt-mirror-setup.templates-ubuntu:2001
+msgid "Use software from the \"universe\" component?"
+msgstr "Defnyddiwch meddalwedd o'r \"universe\""
+
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#: ../apt-mirror-setup.templates-ubuntu:2001
+msgid ""
+"Some additional software is available in packaged form. This software is "
+"free and, though it is not a part of the main distribution, standard package "
+"management tools can be used to install it."
+msgstr ""
+"Mae peth meddalwedd ychwanegol ar gael mewn ffurf pecyn. Mae'r meddalwedd "
+"hyn yn rhad ac am ddim, er nad yw'n rhan o'r brif ddosbarthiad, gellir "
+"defnyddio pecyn offer safonol rheolwyr i'w osod."
+
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#: ../apt-mirror-setup.templates-ubuntu:3001
+msgid "Use software from the \"multiverse\" component?"
+msgstr "Defnyddiwch meddalwedd o'r \"multiverse\""
+
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#: ../apt-mirror-setup.templates-ubuntu:3001
+msgid ""
+"Some non-free software is available in packaged form. Though this software "
+"is not a part of the main distribution, standard package management tools "
+"can be used to install it. This software has varying licenses and (in some "
+"cases) patent restrictions which may prevent you from using, modifying, or "
+"sharing it."
+msgstr ""
+"Mae peth meddalwedd nad yw'n rhydd wedi ei addasu i weithio efo Debian. Er "
+"nad yw'r meddalwedd hwn yn rhan o Debian o gwbl, gellir defnyddio offer "
+"safonol Debian i'w sefydlu. Mae gan y meddalwedd hwn drwyddedau gwahanol a "
+"all eich rhwystro rhag ei ddefnyddio, ei newid neu ei rhannu ef."
+
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#: ../apt-mirror-setup.templates-ubuntu:4001
+#, fuzzy
+#| msgid "Use software from the \"universe\" component?"
+msgid "Use software from the \"partner\" repository?"
+msgstr "Defnyddiwch meddalwedd o'r \"universe\""
+
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#: ../apt-mirror-setup.templates-ubuntu:4001
+msgid ""
+"Some additional software is available from Canonical's \"partner\" "
+"repository. This software is not part of Ubuntu, but is offered by Canonical "
+"and the respective vendors as a service to Ubuntu users."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#: ../apt-mirror-setup.templates-ubuntu:5001
+msgid "Use backported software?"
+msgstr "Defnyddiwch meddalwedd ol-porth"
+
+#. Type: boolean
+#. Description
+#. This template is used by the Ubuntu version of d-i.
+#. :sl2:
+#: ../apt-mirror-setup.templates-ubuntu:5001
+msgid ""
+"Some software has been backported from the development tree to work with "
+"this release. Although this software has not gone through such complete "
+"testing as that contained in the release, it includes newer versions of some "
+"applications which may provide useful features."
+msgstr ""

=== modified file 'debian/po/da.po'
--- debian/po/da.po	2010-08-07 18:30:11 +0000
+++ debian/po/da.po	2010-09-13 07:17:41 +0000
@@ -78,14 +78,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Kan ikke tilgå programarkivet"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -96,7 +96,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -110,7 +110,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "sikkerhedsopdateringer (fra ${SEC_HOST})"
 
@@ -120,21 +120,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "ustabile opdateringer (fra ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Tjenester:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -146,7 +146,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -157,7 +157,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/de.po'
--- debian/po/de.po	2010-04-23 23:20:30 +0000
+++ debian/po/de.po	2010-09-13 07:17:41 +0000
@@ -81,14 +81,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Es konnte nicht auf das Archiv zugegriffen werden"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -101,7 +101,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -115,7 +115,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "Sicherheitsaktualisierungen (von ${SEC_HOST})"
 
@@ -125,21 +125,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "Volatile-Aktualisierungen (von ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Zu verwendende Dienste:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -150,7 +150,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -161,7 +161,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/dz.po'
--- debian/po/dz.po	2010-06-25 23:23:00 +0000
+++ debian/po/dz.po	2010-09-13 07:17:41 +0000
@@ -71,14 +71,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "མཛོད་གནས་འཛུལ་སྤྱོད་འབད་མི་བཏུབ་"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -89,7 +89,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -103,7 +103,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "(${SEC_HOST}ནང་ལས་) སྲུང་སྐྱོབ་དུས་མཐུན་"
 
@@ -113,21 +113,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "(${VOL_HOST}ནང་ལས་)བོ་ལ་ཊ་ཡིལ་དུས་མཐུན་"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "ལག་ལེན་འཐབ་ནིའི་ཞབས་ཏོག་ཚུ་:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -138,7 +138,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -149,7 +149,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/el.po'
--- debian/po/el.po	2009-11-27 23:20:54 +0000
+++ debian/po/el.po	2010-09-13 07:17:41 +0000
@@ -79,14 +79,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Αδυναμία πρόσβασης στο αποθετήριο"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -98,7 +98,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -112,7 +112,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "αναβαθμίσεις ασφαλείας (από ${SEC_HOST})"
 
@@ -122,21 +122,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "αναβαθμίσεις ευελιξίας (από ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Υπηρεσίες που θα χρησιμοποιηθούν:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -147,7 +147,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -158,7 +158,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/eo.po'
--- debian/po/eo.po	2009-07-02 20:49:11 +0000
+++ debian/po/eo.po	2010-09-13 07:17:41 +0000
@@ -71,14 +71,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Ne eblas atingi la pak-deponejon"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -89,7 +89,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -103,7 +103,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "sekurigaj ĝisdatigoj (el ${SEC_HOST})"
 
@@ -113,21 +113,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "nepermanentaj ĝisdatigoj (el ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Uzotaj servoj:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -138,7 +138,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -149,7 +149,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/es.po'
--- debian/po/es.po	2010-03-09 23:19:36 +0000
+++ debian/po/es.po	2010-09-13 07:17:41 +0000
@@ -105,14 +105,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "No se puede acceder al repositorio"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -124,7 +124,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -138,7 +138,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "actualizaciones de seguridad (de ${SEC_HOST})"
 
@@ -148,21 +148,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "actualizaciónes volátiles (de ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Servicios a utilizar:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -173,7 +173,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -184,7 +184,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/et.po'
--- debian/po/et.po	2009-08-04 23:17:54 +0000
+++ debian/po/et.po	2010-09-13 07:17:41 +0000
@@ -71,14 +71,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Ei pääse tarkvaraallikale ligi"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -89,7 +89,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -103,7 +103,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "Turvauuendused (serverist ${SEC_HOST})"
 
@@ -113,21 +113,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "Sagedased uuendused (serverist ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Kasutatavad teenused:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -138,7 +138,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -149,7 +149,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/eu.po'
--- debian/po/eu.po	2009-07-11 11:51:42 +0000
+++ debian/po/eu.po	2010-09-13 07:17:41 +0000
@@ -75,14 +75,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Ezin da biltegia ebatzi"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -93,7 +93,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -107,7 +107,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "Segurtasun eguneraketak (${SEC_HOST}(e)tik)"
 
@@ -117,21 +117,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "Eguneraketa hegazkorrak (${VOL_HOST}(e)tik)"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Erabiliko diren zerbitzuak:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -142,7 +142,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -153,7 +153,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/fi.po'
--- debian/po/fi.po	2010-08-04 02:21:23 +0000
+++ debian/po/fi.po	2010-09-13 07:17:41 +0000
@@ -74,14 +74,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Varastoa ei voitu käyttää"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -93,7 +93,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -107,7 +107,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "tietoturvapäivitykset (${SEC_HOST})"
 
@@ -117,21 +117,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "nopeat päivitykset (${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Käytettävät palvelut:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -142,7 +142,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -153,7 +153,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2010-03-20 14:17:32 +0000
+++ debian/po/fr.po	2010-09-13 07:17:41 +0000
@@ -76,14 +76,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Impossible d'accéder au dépôt"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -95,7 +95,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -110,7 +110,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "mises à jour de sécurité (${SEC_HOST})"
 
@@ -120,21 +120,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "paquets « volatils » (${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Services à utiliser :"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -144,7 +144,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -156,7 +156,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/ga.po'
--- debian/po/ga.po	2010-07-17 07:01:46 +0000
+++ debian/po/ga.po	2010-09-13 07:17:41 +0000
@@ -67,14 +67,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Ní féidir an stór a rochtain"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -86,7 +86,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -100,7 +100,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "nuashonruithe slándála (ó ${SEC_HOST})"
 
@@ -110,21 +110,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "nuashonruithe luaineacha (ó ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Seirbhísí le húsáid:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -135,7 +135,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -146,7 +146,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/gl.po'
--- debian/po/gl.po	2009-11-23 04:33:16 +0000
+++ debian/po/gl.po	2010-09-13 07:17:41 +0000
@@ -73,14 +73,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Non se pode acceder ao repositorio"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -92,7 +92,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -106,7 +106,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "actualizacións de seguridade (de ${SEC_HOST})"
 
@@ -116,21 +116,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "actualizacións volátiles (de ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Servizos a empregar:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -141,7 +141,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -152,7 +152,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/gu.po'
--- debian/po/gu.po	2010-02-27 19:10:10 +0000
+++ debian/po/gu.po	2010-09-13 07:17:41 +0000
@@ -73,14 +73,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "રેપોઝીટોરીને મેળવી શકતા નથી"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -91,7 +91,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -104,7 +104,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "સલામતી સુધારાઓ (${SEC_HOST} માંથી)"
 
@@ -114,21 +114,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "વોલેટાઇલ સુધારાઓ (${VOL_HOST} માંથી)"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "ઉપયોગ કરવા માટેની સેવાઓ:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -137,7 +137,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -148,7 +148,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/he.po'
--- debian/po/he.po	2010-04-27 23:20:11 +0000
+++ debian/po/he.po	2010-09-13 07:17:41 +0000
@@ -79,14 +79,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "לא מצליח לגשת למאגר"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -97,7 +97,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -109,7 +109,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "עדכוני אבטחה (מהשרת ${SEC_HOST})"
 
@@ -119,21 +119,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "עדכונים תכופים (מהשרת ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "שירותים לשימוש:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -142,7 +142,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -153,7 +153,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/hi.po'
--- debian/po/hi.po	2010-04-20 23:20:13 +0000
+++ debian/po/hi.po	2010-09-13 07:17:41 +0000
@@ -77,14 +77,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "पैकेज कोष ेट को नहीं ।पा सके"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -95,7 +95,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -109,7 +109,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "सुरक्षा अपडेट्स (${SEC_HOST} से)"
 
@@ -119,21 +119,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "वॉलटाइलक्षा अपडेट्स (${VOL_HOST} से)"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "नेमसर्वर पता:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -143,7 +143,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -154,7 +154,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/hr.po'
--- debian/po/hr.po	2010-07-06 23:22:20 +0000
+++ debian/po/hr.po	2010-09-13 07:17:41 +0000
@@ -69,14 +69,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Ne mogu pristupiti repozitoriju"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -87,7 +87,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -101,7 +101,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "sigurnosne nadogradnje (sa ${SEC_HOST})"
 
@@ -111,21 +111,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "volatile nadogradnje (sa ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Usluge za koristiti:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -136,7 +136,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -147,7 +147,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/hu.po'
--- debian/po/hu.po	2010-07-07 23:22:26 +0000
+++ debian/po/hu.po	2010-09-13 07:17:41 +0000
@@ -71,14 +71,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "A tároló nem érhető el"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -89,7 +89,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -103,7 +103,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "biztonsági frissítések (innen: ${SEC_HOST})"
 
@@ -113,21 +113,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "változékony frissítések (innen: ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Felhasznált szolgáltatások:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -138,7 +138,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -149,7 +149,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/id.po'
--- debian/po/id.po	2010-06-22 23:21:55 +0000
+++ debian/po/id.po	2010-09-13 07:17:41 +0000
@@ -79,14 +79,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Tidak dapat mengakses repository"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -97,7 +97,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -111,7 +111,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "Perbarui keamanan (dari ${SEC_HOST})"
 
@@ -121,21 +121,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "perbarui volatile (dari ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Layanan yang digunakan:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -146,7 +146,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -157,7 +157,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/it.po'
--- debian/po/it.po	2009-12-15 23:19:55 +0000
+++ debian/po/it.po	2010-09-13 07:17:41 +0000
@@ -82,14 +82,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Impossibile accedere al repository"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -101,7 +101,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -113,7 +113,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "aggiornamenti di sicurezza (da ${SEC_HOST})"
 
@@ -123,21 +123,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "aggiornamenti da «volatile» (da ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Servizi da usare:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -148,7 +148,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -159,7 +159,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2009-07-24 23:18:35 +0000
+++ debian/po/ja.po	2010-09-13 07:17:41 +0000
@@ -68,14 +68,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "リポジトリにアクセスできません"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -86,7 +86,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -100,7 +100,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "セキュリティアップデート (${SEC_HOST} から)"
 
@@ -110,21 +110,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "volatile アップデート (${VOL_HOST} から)"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "利用するサービス:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -135,7 +135,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -146,7 +146,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/ka.po'
--- debian/po/ka.po	2010-06-18 23:22:11 +0000
+++ debian/po/ka.po	2010-09-13 07:17:41 +0000
@@ -77,14 +77,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "საცავთან დაკავშირება ვერ ხერხდება"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -95,7 +95,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -107,7 +107,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "უსაფრთხოების განახლებები (${SEC_HOST}-იდან)"
 
@@ -117,21 +117,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "მერყევი განახლებები (from ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "სასურველი სერვერისები:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -141,7 +141,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -152,7 +152,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/kk.po'
--- debian/po/kk.po	2010-07-23 23:21:24 +0000
+++ debian/po/kk.po	2010-09-13 07:17:41 +0000
@@ -72,14 +72,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Репозиторийге қатынау мүмкін емес"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -90,7 +90,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -104,7 +104,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "қауіпсіздік жаңартулар (${SEC_HOST})"
 
@@ -114,21 +114,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "күнделікті жаңартулар (${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Қолданылатын сервистер:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -139,7 +139,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -150,7 +150,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/km.po'
--- debian/po/km.po	2010-06-25 23:23:00 +0000
+++ debian/po/km.po	2010-09-13 07:17:41 +0000
@@ -75,14 +75,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "មិន​អាច​ចូល​ដំណើរការ​ឃ្លាំង"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -93,7 +93,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -105,7 +105,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "បច្ចុប្បន្នភាព​​សុវត្ថិភាព (from ${SEC_HOST})"
 
@@ -115,21 +115,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "បច្ចុប្បន្នភាព​​ស្ថិតស្ថេរ (from ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "សេវា​ត្រូវ​ប្រើ ៖"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -138,7 +138,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -149,7 +149,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/ko.po'
--- debian/po/ko.po	2010-05-18 23:23:26 +0000
+++ debian/po/ko.po	2010-09-13 07:17:41 +0000
@@ -70,14 +70,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "저장소에 접근할 수 없습니다"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -88,7 +88,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -101,7 +101,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "보안 업데이트 (${SEC_HOST} 호스트에서)"
 
@@ -111,21 +111,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "유동 업데이트 (${VOL_HOST}에서)"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "사용할 서비스:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -136,7 +136,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -147,7 +147,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/ku.po'
--- debian/po/ku.po	2010-07-10 06:42:28 +0000
+++ debian/po/ku.po	2010-09-13 07:17:41 +0000
@@ -74,14 +74,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Depo nayê gihîştin"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -93,7 +93,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -107,7 +107,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "rojanekirinên ewlekariyê (ji ${SEC_HOST})"
 
@@ -117,21 +117,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "rojanekirinên volatile (ji ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Xizmetên werin bikaranîn:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -141,7 +141,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -152,7 +152,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/lt.po'
--- debian/po/lt.po	2010-04-09 23:21:26 +0000
+++ debian/po/lt.po	2010-09-13 07:17:41 +0000
@@ -70,14 +70,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Negaliu prieiti prie repozitorijos"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -88,7 +88,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -101,7 +101,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "saugumo atnaujinimai (iš ${SEC_HOST})"
 
@@ -111,21 +111,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "lakieji atnaujinimai (iš ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Naudoti servisus:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -136,7 +136,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -147,7 +147,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/lv.po'
--- debian/po/lv.po	2010-06-25 23:23:00 +0000
+++ debian/po/lv.po	2010-09-13 07:17:41 +0000
@@ -15,8 +15,13 @@
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2009-06-26 22:47+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2010-06-19 21:53+0300\n"
 "Last-Translator: Aigars Mahinovs <[e-mail]>\n"
+=======
+"PO-Revision-Date: 2008-09-19 00:00+0300\n"
+"Last-Translator: Viesturs Zarins <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Latvian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,14 +78,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Nevar piekļūt krātuvei"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -91,7 +96,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -104,7 +109,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "drošības atjauninājumi (no ${SEC_HOST})"
 
@@ -114,21 +119,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "nepastāvīgie atjauninājumi (no ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Izmantojamie pakalpojumi:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -139,7 +144,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -150,7 +155,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/mk.po'
--- debian/po/mk.po	2010-07-07 23:22:26 +0000
+++ debian/po/mk.po	2010-09-13 07:17:41 +0000
@@ -15,8 +15,13 @@
 "Project-Id-Version: debian-installer_packages_po_sublevel1_mk\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2009-06-26 22:47+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2010-07-07 09:44+0100\n"
 "Last-Translator: Arangel Angov <[e-mail]>\n"
+=======
+"PO-Revision-Date: 2008-09-20 13:56+0200\n"
+"Last-Translator: Georgi Stanojevski <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Macedonian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,14 +77,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Не можам да му пристапам на складиштето"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -90,7 +95,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -104,7 +109,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "безбедносни надградби (од ${SEC_HOST})"
 
@@ -114,21 +119,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "непостојани надградби (од ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "Сервиси кои што ќе се користат:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -139,7 +144,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -150,7 +155,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/ml.po'
--- debian/po/ml.po	2010-06-29 23:21:23 +0000
+++ debian/po/ml.po	2010-09-13 07:17:41 +0000
@@ -77,14 +77,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "സംഭരണിയെ സമീപിക്കാന്‍ സാധ്യമല്ല"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -95,7 +95,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -108,7 +108,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "(${SEC_HOST} ല്‍ നിന്നുമുള്ള) സുരക്ഷാപരമായ മാറ്റങ്ങള്‍"
 
@@ -118,21 +118,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "(${VOL_HOST}) ല്‍ നിന്നുമുള്ള പെട്ടെന്നു് മാറുന്ന മാറ്റങ്ങള്‍"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "ഉപയോഗിയ്ക്കേണ്ട സേവനങ്ങള്‍:"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -143,7 +143,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -154,7 +154,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/mr.po'
--- debian/po/mr.po	2010-03-13 16:31:11 +0000
+++ debian/po/mr.po	2010-09-13 07:17:41 +0000
@@ -74,14 +74,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "भांडारामध्ये प्रवेश करता येत नाही"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -92,7 +92,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -106,7 +106,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "सुरक्षा सुधारणा (${SEC_HOST} कडून)"
 
@@ -116,21 +116,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "अस्थायी सुधारणा (${VOL_HOST} कडून)"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid "Services to use:"
 msgstr "वापरायच्या सेवाः"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Debian has two services that provide updates to releases: security and "
 "volatile."
@@ -139,7 +139,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Security updates help to keep your system secured against attacks. Enabling "
 "this service is strongly recommended."
@@ -150,7 +150,7 @@
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002
+#: ../apt-setup-udeb.templates:11002
 msgid ""
 "Volatile updates provide more current versions for software that changes "
 "relatively frequently and where not having the latest version could reduce "

=== modified file 'debian/po/nb.po'
--- debian/po/nb.po	2009-11-27 23:20:54 +0000
+++ debian/po/nb.po	2010-09-13 07:17:41 +0000
@@ -73,14 +73,14 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid "Cannot access repository"
 msgstr "Fikk ikke tilgang til arkiv"
 
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "The repository on ${HOST} couldn't be accessed, so its updates will not be "
 "made available to you at this time. You should investigate this later."
@@ -91,7 +91,7 @@
 #. Type: error
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:9001
+#: ../apt-setup-udeb.templates:10001
 msgid ""
 "Commented out entries for ${HOST} have been added to the /etc/apt/sources."
 "list file."
@@ -105,7 +105,7 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "security updates (from ${SEC_HOST})"
 msgstr "sikkerhetsoppdateringer (fra ${SEC_HOST})"
 
@@ -115,21 +115,21 @@
 #. Translators: the *entire* string should be under 55 columns
 #. including host name. In short, KEEP THIS SHORT and, yes, that's tricky
 #. :sl2:
-#: ../apt-setup-udeb.templates:10001
+#: ../apt-setup-udeb.templates:11001
 msgid "volatile updates (from ${VOL_HOST})"
 msgstr "flyktige oppdateringer (fra ${VOL_HOST})"
 
 #. Type: multiselect
 #. Description
 #. :sl2:
-#: ../apt-setup-udeb.templates:10002