11 files changed, 107 insertions, 100 deletions
diff --git a/nl/appendix/files.xml b/nl/appendix/files.xml
index 900bfb2d0..fbf9fc7e8 100644
--- a/nl/appendix/files.xml
+++ b/nl/appendix/files.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 44436 untranslated -->
+<!-- original version: 46461 untranslated -->
 
 
  <sect1 id="linuxdevices"><title>Linux Devices</title>
@@ -256,7 +256,7 @@ is (temporarily) required in <filename>/var</filename>.
   <entry>Laptop<footnote>
   
   <para>
-  There is a large overlap of the Laptop task with the Destop environment task.
+  There is some overlap of the Laptop task with the Destop environment task.
   If you install both, the Laptop task will only require a few MB additional
   disk space.
   </para>
diff --git a/nl/appendix/graphical.xml b/nl/appendix/graphical.xml
index 5a6674310..8dcc46dd6 100644
--- a/nl/appendix/graphical.xml
+++ b/nl/appendix/graphical.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 44580 untranslated -->
+<!-- original version: 46722 untranslated -->
 
  <sect1 condition="gtk" id="graphical">
  <title>The Graphical Installer</title>
@@ -88,8 +88,8 @@ need to know. To expand a collapsed list (used for example for the selection
 of countries within continents), you can use the <keycap>+</keycap> and
 <keycap>-</keycap> keys. For questions where more than one item can be
 selected (e.g. task selection), you first need to tab to the
-<guibutton>Continue</guibutton> button after making your selections; hitting
-enter will toggle a selection, not activate <guibutton>Continue</guibutton>.
+&BTN-CONT; button after making your selections; hitting
+enter will toggle a selection, not activate &BTN-CONT;.
 
 </para><para>
 
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 89ca5d048..27d1e5749 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 45612 untranslated -->
+<!-- original version: 47624 untranslated -->
 
 <!--
 Be careful with the format of this file as it is parsed to generate
@@ -838,8 +838,9 @@ same as <classname>mirror/suite</classname>.
 
 <informalexample role="example"><screen>
 # If you select ftp, the mirror/country string does not need to be set.
-#d-i mirror/protocol string ftp
-d-i mirror/country string enter information manually
+#d-i mirror/protocol string ftp<phrase condition="etch">
+d-i mirror/country string enter information manually</phrase><phrase condition="lenny">
+d-i mirror/country string manual</phrase>
 d-i mirror/http/hostname string &archive-mirror;
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
@@ -1030,45 +1031,6 @@ d-i time/zone string US/Eastern
 
   </sect2>
 
-  <sect2 id="preseed-apt">
-  <title>Apt setup</title>
-<para>
-
-Setup of the <filename>/etc/apt/sources.list</filename> and basic configuration
-options is fully automated based on your installation method and answers to
-earlier questions. You can optionally add other (local) repositories.
-
-</para>
-
-<informalexample role="example"><screen>
-# You can choose to install non-free and contrib software.
-#d-i apt-setup/non-free boolean true
-#d-i apt-setup/contrib boolean true
-# Uncomment this if you don't want to use a network mirror.
-#d-i apt-setup/use_mirror boolean false
-# Uncomment this to avoid adding security sources, or
-# add a hostname to use a different server than security.debian.org.
-#d-i apt-setup/security_host string
-
-# Additional repositories, local[0-9] available
-#d-i apt-setup/local0/repository string \
-#       http://local.server/debian stable main
-#d-i apt-setup/local0/comment string local server
-# Enable deb-src lines
-#d-i apt-setup/local0/source boolean true
-# URL to the public key of the local repository; you must provide a key or
-# apt will complain about the unauthenticated repository and so the
-# sources.list line will be left commented out
-#d-i apt-setup/local0/key string http://local.server/key
-
-# By default the installer requires that repositories be authenticated
-# using a known gpg key. This setting can be used to disable that
-# authentication. Warning: Insecure, not recommended.
-#d-i debian-installer/allow_unauthenticated string true
-</screen></informalexample>
-
-  </sect2>
-
   <sect2 id="preseed-account">
   <title>Account setup</title>
 <para>
@@ -1148,29 +1110,41 @@ installation. The only questions asked concern the installation of the kernel.
 
   </sect2>
 
-  <sect2 id="preseed-bootloader">
-  <title>Boot loader installation</title>
+  <sect2 id="preseed-apt">
+  <title>Apt setup</title>
+<para>
 
-<informalexample role="example"><screen>
-# Grub is the default boot loader (for x86). If you want lilo installed
-# instead, uncomment this:
-#d-i grub-installer/skip boolean true
+Setup of the <filename>/etc/apt/sources.list</filename> and basic configuration
+options is fully automated based on your installation method and answers to
+earlier questions. You can optionally add other (local) repositories.
 
-# This is fairly safe to set, it makes grub install automatically to the MBR
-# if no other operating system is detected on the machine.
-d-i grub-installer/only_debian boolean true
+</para>
 
-# This one makes grub-installer install to the MBR if it also finds some other
-# OS, which is less safe as it might not be able to boot that other OS.
-d-i grub-installer/with_other_os boolean true
+<informalexample role="example"><screen>
+# You can choose to install non-free and contrib software.
+#d-i apt-setup/non-free boolean true
+#d-i apt-setup/contrib boolean true
+# Uncomment this if you don't want to use a network mirror.
+#d-i apt-setup/use_mirror boolean false
+# Uncomment this to avoid adding security sources, or
+# add a hostname to use a different server than security.debian.org.
+#d-i apt-setup/security_host string
 
-# Alternatively, if you want to install to a location other than the mbr,
-# uncomment and edit these lines:
-#d-i grub-installer/only_debian boolean false
-#d-i grub-installer/with_other_os boolean false
-#d-i grub-installer/bootdev  string (hd0,0)
-# To install grub to multiple disks:
-#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)
+# Additional repositories, local[0-9] available
+#d-i apt-setup/local0/repository string \
+#       http://local.server/debian stable main
+#d-i apt-setup/local0/comment string local server
+# Enable deb-src lines
+#d-i apt-setup/local0/source boolean true
+# URL to the public key of the local repository; you must provide a key or
+# apt will complain about the unauthenticated repository and so the
+# sources.list line will be left commented out
+#d-i apt-setup/local0/key string http://local.server/key
+
+# By default the installer requires that repositories be authenticated
+# using a known gpg key. This setting can be used to disable that
+# authentication. Warning: Insecure, not recommended.
+#d-i debian-installer/allow_unauthenticated string true
 </screen></informalexample>
 
   </sect2>
@@ -1237,9 +1211,11 @@ to be used easily on the kernel command line as well.
 </para>
 
 <informalexample role="example"><screen>
-tasksel tasksel/first multiselect standard, desktop
-#tasksel tasksel/first multiselect standard, web-server
-#tasksel tasksel/first multiselect standard, kde-desktop
+#tasksel tasksel/first multiselect standard, web-server<phrase condition="lenny">
+# If the desktop task is selected, install the kde and xfce desktops
+# instead of the default gnome desktop.
+#tasksel tasksel/desktop multiselect kde-desktop, xfce-desktop</phrase><phrase condition="etch">
+#tasksel tasksel/first multiselect standard, kde-desktop</phrase>
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
@@ -1253,6 +1229,36 @@ tasksel tasksel/first multiselect standard, desktop
 
   </sect2>
 
+  <sect2 id="preseed-bootloader">
+  <title>Boot loader installation</title>
+
+<informalexample role="example"><screen>
+# Grub is the default boot loader (for x86). If you want lilo installed
+# instead, uncomment this:
+#d-i grub-installer/skip boolean true<phrase condition="lenny">
+# To also skip installing lilo, and install no bootloader, uncomment this
+# too:
+#d-i lilo-installer/skip boolean true</phrase>
+
+# This is fairly safe to set, it makes grub install automatically to the MBR
+# if no other operating system is detected on the machine.
+d-i grub-installer/only_debian boolean true
+
+# This one makes grub-installer install to the MBR if it also finds some other
+# OS, which is less safe as it might not be able to boot that other OS.
+d-i grub-installer/with_other_os boolean true
+
+# Alternatively, if you want to install to a location other than the mbr,
+# uncomment and edit these lines:
+#d-i grub-installer/only_debian boolean false
+#d-i grub-installer/with_other_os boolean false
+#d-i grub-installer/bootdev  string (hd0,0)
+# To install grub to multiple disks:
+#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)
+</screen></informalexample>
+
+  </sect2>
+
   <sect2 id="preseed-finish">
   <title>Finishing up the first stage install</title>
 
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 63024db11..7bb456d62 100644
--- a/nl/boot-installer/parameters.xml
+++ b/nl/boot-installer/parameters.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 45239 untranslated -->
+<!-- original version: 47209 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -205,6 +205,17 @@ one device.
 </para></listitem>
 </varlistentry>
 
+<varlistentry condition="lenny">
+<term>lowmem</term>
+<listitem><para>
+
+Can be used to force the installer to a lowmem level higher than the one
+the installer sets by default based on available memory. Possible values
+are 1 and 2. See also <xref linkend="lowmem"/>.
+
+</para></listitem>
+</varlistentry>
+
 <varlistentry>
 <term>debian-installer/framebuffer (fb)</term>
 <listitem><para>
@@ -257,16 +268,6 @@ designed for visually impaired users. Set the theme by booting with
 </varlistentry>
 
 <varlistentry>
-<term>debian-installer/probe/usb</term>
-<listitem><para>
-
-Set to <userinput>false</userinput> to prevent probing for USB on
-boot, if that causes problems.
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
 <term>netcfg/disable_dhcp</term>
 <listitem><para>
 
diff --git a/nl/boot-installer/trouble.xml b/nl/boot-installer/trouble.xml
index 8a06cdd5a..62df47a1a 100644
--- a/nl/boot-installer/trouble.xml
+++ b/nl/boot-installer/trouble.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 44560 untranslated -->
+<!-- original version: 46505 untranslated -->
 
  <sect1 id="boot-troubleshooting">
  <title>Troubleshooting the Installation Process</title>
@@ -368,8 +368,7 @@ The kernel normally tries to install USB modules and the USB keyboard driver
 in order to support some non-standard USB keyboards. However, there are some
 broken USB systems where the driver hangs on loading. A possible workaround
 may be disabling the USB controller in your mainboard BIOS setup. Another option
-is passing the <userinput>debian-installer/probe/usb=false</userinput> parameter
-at the boot prompt, which will prevent the modules from being loaded.
+is passing the <userinput>nousb</userinput> parameter at the boot prompt.
 
 </para>
    </sect3>
diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml
index e4d70db61..3c706006f 100644
--- a/nl/hardware/hardware-supported.xml
+++ b/nl/hardware/hardware-supported.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43943 untranslated -->
+<!-- original version: 46426 untranslated -->
 
  <sect1 id="hardware-supported">
  <title>Supported Hardware</title>
@@ -63,8 +63,10 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="3">ARM and StrongARM</entry>
-  <entry morerows="3">arm</entry>
+  <entry morerows="3" condition="etch">ARM and StrongARM</entry>
+  <entry morerows="2" condition="lenny">ARM and StrongARM</entry>
+  <entry morerows="3" condition="etch">arm</entry>
+  <entry morerows="2" condition="lenny">arm</entry>
   <entry>Netwinder and CATS</entry>
   <entry>netwinder</entry>
 </row><row>
@@ -73,7 +75,7 @@ variations of each architecture known as <quote>flavors</quote>.
 </row><row>
   <entry>Intel IXP4xx</entry>
   <entry>ixp4xx</entry>
-</row><row>
+</row><row condition="etch">
   <entry>RiscPC</entry>
   <entry>rpc</entry>
 </row>
diff --git a/nl/hardware/installation-media.xml b/nl/hardware/installation-media.xml
index bae211b88..a6c247b2c 100644
--- a/nl/hardware/installation-media.xml
+++ b/nl/hardware/installation-media.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43773 untranslated -->
+<!-- original version: 46426 untranslated -->
 
  <sect1 id="installation-media">
  <title>Installation Media</title>
@@ -77,7 +77,7 @@ console, see the <ulink url="&url-srm-howto;">SRM HOWTO</ulink>.
 </para><para arch="arm">
 
 IDE/ATAPI CD-ROMs are supported on all ARM machines.
-On RiscPCs, SCSI CD-ROMs are also supported.
+<phrase condition="etch">On RiscPCs, SCSI CD-ROMs are also supported.</phrase>
 
 </para><para arch="mips">
 
diff --git a/nl/hardware/supported/arm.xml b/nl/hardware/supported/arm.xml
index c2ecfa177..855377d3d 100644
--- a/nl/hardware/supported/arm.xml
+++ b/nl/hardware/supported/arm.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43693 untranslated -->
+<!-- original version: 46426 untranslated -->
 
 
   <sect2 arch="arm"><title>CPU, Main Boards, and Video Support</title>
@@ -70,7 +70,7 @@ url="&url-arm-cyrius-nslu2;">installation instructions</ulink>.
 </para></listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry condition="etch">
 <term>RiscPC</term>
 <listitem><para>
 
diff --git a/nl/install-methods/download/arm.xml b/nl/install-methods/download/arm.xml
index d5c5b1014..2439251f7 100644
--- a/nl/install-methods/download/arm.xml
+++ b/nl/install-methods/download/arm.xml
@@ -1,8 +1,8 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35372 untranslated -->
+<!-- original version: 46426 untranslated -->
 
 
-   <sect3 arch="arm" id="riscpc-install-files">
+   <sect3 arch="arm" condition="etch" id="riscpc-install-files">
    <title>RiscPC Installation Files</title>
 <para>
 
diff --git a/nl/preparing/bios-setup/powerpc.xml b/nl/preparing/bios-setup/powerpc.xml
index f170eb172..12158ee07 100644
--- a/nl/preparing/bios-setup/powerpc.xml
+++ b/nl/preparing/bios-setup/powerpc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36732 untranslated -->
+<!-- original version: 46722 untranslated -->
 
 
   <sect2 arch="powerpc" id="invoking-openfirmware">
@@ -46,7 +46,7 @@ patch is included in the <application>System Disk 2.3.1</application>
 utility, available from Apple at
 <ulink url="ftp://ftp.apple.com/developer/macosxserver/utilities/SystemDisk2.3.1.smi.bin"></ulink>.
 After unpacking the utility in MacOS, and launching it, select the
-<guibutton>Save button</guibutton> to have the firmware patches
+<guibutton>Save</guibutton> button to have the firmware patches
 installed to nvram.
 
 </para>
diff --git a/nl/using-d-i/modules/x86/grub-installer.xml b/nl/using-d-i/modules/x86/grub-installer.xml
index 5a0159b01..b84162ac1 100644
--- a/nl/using-d-i/modules/x86/grub-installer.xml
+++ b/nl/using-d-i/modules/x86/grub-installer.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39622 untranslated -->
+<!-- original version: 46722 untranslated -->
 
   <sect3 arch="x86">
   <title>Install the <command>Grub</command> Boot Loader
@@ -8,7 +8,7 @@
 
 The main &architecture; boot loader is called <quote>grub</quote>.
 Grub is a flexible and robust boot loader and a good default choice for
-newbies and old hands alike.
+new users and old hands alike.
 
 </para><para>
 
@@ -18,9 +18,8 @@ can install it elsewhere. See the grub manual for complete information.
 
 </para><para>
 
-If you do not want to install grub at all, use the Back button to get to
-the main menu, and from there select whatever bootloader you would like to
-use.
+If you do not want to install grub, use the &BTN-GOBACK; button to get to the
+main menu, and from there select whatever bootloader you would like to use.
 
 </para>
   </sect3>