[SILENT_COMMIT] Update of POT and PO files for the manual

1 files changed, 16 insertions, 26 deletions

diff --git a/po/pot/preseed.pot b/po/pot/preseed.pot
index a75a25fd5..a5d2b690c 100644
--- a/po/pot/preseed.pot
+++ b/po/pot/preseed.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2007-09-16 00:09+0000\n"
+"POT-Creation-Date: 2007-10-22 00:09+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -837,9 +837,8 @@ msgstr ""
 #, no-c-format
 msgid ""
       "# If you select ftp, the mirror/country string does not need to be set.\n"
-      "#d-i mirror/protocol string ftp<phrase condition=\"etch\">\n"
-      "d-i mirror/country string enter information manually</phrase><phrase condition=\"lenny\">\n"
-      "d-i mirror/country string manual</phrase>\n"
+      "#d-i mirror/protocol string ftp\n"
+      "d-i mirror/country string manual\n"
       "d-i mirror/http/hostname string &archive-mirror;\n"
       "d-i mirror/http/directory string /debian\n"
       "d-i mirror/http/proxy string\n"
@@ -877,17 +876,13 @@ msgid ""
       "#d-i partman-auto/init_automatically_partition \\\n"
       "#      select Guided - use the largest continuous free space\n"
       "\n"
-      "<phrase condition=\"etch\"># Alternatively, you can specify a disk to partition. The device name\n"
-      "# can be given in either devfs or traditional non-devfs format.\n"
-      "# For example, to use the first disk:\n"
-      "d-i partman-auto/disk string /dev/discs/disc0/disc</phrase><phrase condition=\"lenny\">\n"
       "# Alternatively, you can specify a disk to partition. The device name must\n"
       "# be given in traditional non-devfs format.\n"
       "# For example, to use the first SCSI/SATA hard disk:\n"
       "d-i partman-auto/disk string /dev/sda\n"
       "# Note: If you want to use whatever disk is available, no matter\n"
       "# what its device name, comment the line above out. This will only work if\n"
-      "# the system only has one disk.</phrase>\n"
+      "# the system only has one disk.\n"
       "# In addition, you'll need to specify the method to use.\n"
       "# The presently available methods are: \"regular\", \"lvm\" and \"crypto\"\n"
       "d-i partman-auto/method string lvm\n"
@@ -1031,13 +1026,12 @@ msgid ""
       "\n"
       "# You may set this to any valid setting for $TZ; see the contents of\n"
       "# /usr/share/zoneinfo/ for valid values.\n"
-      "d-i time/zone string US/Eastern<phrase condition=\"lenny\">\n"
+      "d-i time/zone string US/Eastern\n"
       "\n"
       "# Controls whether to use NTP to set the clock during the install\n"
       "d-i clock-setup/ntp boolean true\n"
       "# NTP server to use. The default is almost always fine here.\n"
-      "#d-i clock-setup/ntp-server ntp.example.com\n"
-      "</phrase>"
+      "#d-i clock-setup/ntp-server ntp.example.com"
 msgstr ""
 
 #. Tag: title
@@ -1083,11 +1077,11 @@ msgid ""
       "# or encrypted using an MD5 hash.\n"
       "#d-i passwd/user-password-crypted password [MD5 hash]\n"
       "# Create the first user with the specified UID instead of the default.\n"
-      "#d-i passwd/user-uid string 1010<phrase condition=\"lenny\">\n"
+      "#d-i passwd/user-uid string 1010\n"
       "\n"
       "# The user account will be added to some standard initial groups. To\n"
       "# override that, use this.\n"
-      "#d-i passwd/user-default-groups string audio cdrom video</phrase>"
+      "#d-i passwd/user-default-groups string audio cdrom video"
 msgstr ""
 
 #. Tag: para
@@ -1125,11 +1119,11 @@ msgstr ""
 #, no-c-format
 msgid ""
       "# Select the initramfs generator used to generate the initrd for 2.6 kernels.\n"
-      "#d-i base-installer/kernel/linux/initramfs-generators string yaird<phrase condition=\"lenny\">\n"
+      "#d-i base-installer/kernel/linux/initramfs-generators string yaird\n"
       "\n"
       "# The kernel image (meta) package to be installed; \"none\" can be used if no\n"
       "# kernel is to be installed.\n"
-      "#d-i base-installer/kernel/image linux-image-2.6-486</phrase>"
+      "#d-i base-installer/kernel/image linux-image-2.6-486"
 msgstr ""
 
 #. Tag: title
@@ -1152,15 +1146,12 @@ msgid ""
       "#d-i apt-setup/non-free boolean true\n"
       "#d-i apt-setup/contrib boolean true\n"
       "# Uncomment this if you don't want to use a network mirror.\n"
-      "#d-i apt-setup/use_mirror boolean false<phrase condition=\"etch\">\n"
-      "# Uncomment this to avoid adding security sources, or\n"
-      "# add a hostname to use a different server than security.debian.org.\n"
-      "#d-i apt-setup/security_host string</phrase><phrase condition=\"lenny\">\n"
+      "#d-i apt-setup/use_mirror boolean false\n"
       "# Select which update services to use; define the mirrors to be used.\n"
       "# Values shown below are the normal defaults.\n"
       "#d-i apt-setup/services-select multi-select security, volatile\n"
       "#d-i apt-setup/security_host string security.debian.org\n"
-      "#d-i apt-setup/volatile_host string volatile.debian.org</phrase>\n"
+      "#d-i apt-setup/volatile_host string volatile.debian.org\n"
       "\n"
       "# Additional repositories, local[0-9] available\n"
       "#d-i apt-setup/local0/repository string \\\n"
@@ -1273,11 +1264,10 @@ msgstr ""
 #: preseed.xml:961
 #, no-c-format
 msgid ""
-      "#tasksel tasksel/first multiselect standard, web-server<phrase condition=\"lenny\">\n"
+      "#tasksel tasksel/first multiselect standard, web-server\n"
       "# If the desktop task is selected, install the kde and xfce desktops\n"
       "# instead of the default gnome desktop.\n"
-      "#tasksel tasksel/desktop multiselect kde, xfce</phrase><phrase condition=\"etch\">\n"
-      "#tasksel tasksel/first multiselect standard, kde-desktop</phrase>\n"
+      "#tasksel tasksel/desktop multiselect kde, xfce\n"
       "\n"
       "# Individual additional packages to install\n"
       "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -1301,10 +1291,10 @@ msgstr ""
 msgid ""
       "# Grub is the default boot loader (for x86). If you want lilo installed\n"
       "# instead, uncomment this:\n"
-      "#d-i grub-installer/skip boolean true<phrase condition=\"lenny\">\n"
+      "#d-i grub-installer/skip boolean true\n"
       "# To also skip installing lilo, and install no bootloader, uncomment this\n"
       "# too:\n"
-      "#d-i lilo-installer/skip boolean true</phrase>\n"
+      "#d-i lilo-installer/skip boolean true\n"
       "\n"
       "# This is fairly safe to set, it makes grub install automatically to the MBR\n"
       "# if no other operating system is detected on the machine.\n"