Update po|pot files after changings in en:

M    po/tl/preparing.po
M    po/ro/preparing.po
M    po/pt/preparing.po
M    po/pt/preseed.po
M    po/da/preparing.po
M    po/ru/preparing.po
M    po/sv/preparing.po
M    po/ja/preparing.po
M    po/zh_TW/preparing.po
M    po/fi/preparing.po
M    po/el/preparing.po
M    po/el/preseed.po
M    po/zh_CN/preparing.po
M    po/pot/preparing.pot
M    po/es/preparing.po
M    po/ko/preparing.po
M    po/nl/preparing.po
M    po/nn/preparing.po
M    po/hu/preparing.po
M    po/vi/preparing.po

20 files changed, 1965 insertions, 1667 deletions

diff --git a/po/da/preparing.po b/po/da/preparing.po
index 3559f43db..1586b0f3e 100644
--- a/po/da/preparing.po
+++ b/po/da/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+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"
@@ -1094,10 +1094,10 @@ msgid ""
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 
 #. Tag: para
@@ -1107,10 +1107,10 @@ msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 
 #. Tag: para
@@ -1195,7 +1195,7 @@ msgstr ""
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1255,22 +1255,21 @@ msgstr ""
 #. Tag: title
 #: preparing.xml:1062
 #, no-c-format
-msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr ""
 
 #. Tag: para
 #: preparing.xml:1064
 #, no-c-format
 msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1279,41 +1278,37 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1090
+#: preparing.xml:1086
 #, no-c-format
 msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1325,13 +1320,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, no-c-format
 msgid ""
 "The BIOS provides the basic functions needed to boot your machine and to "
@@ -1345,13 +1340,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1362,7 +1357,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1371,7 +1366,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1387,7 +1382,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1396,7 +1391,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1413,7 +1408,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1424,13 +1419,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1441,7 +1436,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1453,7 +1448,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1468,7 +1463,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1482,13 +1477,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1499,7 +1494,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1512,7 +1507,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1522,7 +1517,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1535,7 +1530,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1559,7 +1554,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -1577,19 +1572,19 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -1604,7 +1599,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -1617,7 +1612,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -1633,13 +1628,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1650,13 +1645,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1667,7 +1662,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -1681,13 +1676,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -1697,7 +1692,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -1707,25 +1702,25 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, no-c-format
 msgid ""
 "If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -1737,13 +1732,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
diff --git a/po/el/preparing.po b/po/el/preparing.po
index 9d6d0c810..4c969c548 100644
--- a/po/el/preparing.po
+++ b/po/el/preparing.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+0000\n"
 "PO-Revision-Date: 2013-02-10 20:41+0200\n"
 "Last-Translator: galaxico <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -1395,17 +1395,27 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:855
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you already have an operating system on your system <phrase arch=\"any-"
+#| "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
+#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
+#| "OS/390, &hellip;) </phrase> which uses the whole disk and you want to "
+#| "stick &debian; on the same disk, you will need to repartition it. "
+#| "&debian; requires its own hard disk partitions. It cannot be installed on "
+#| "Windows or MacOS partitions. It may be able to share some partitions with "
+#| "other Unix systems, but that's not covered here. At the very least you "
+#| "will need a dedicated partition for the &debian; root filesystem."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
 "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 "Αν έχετε ήδη ένα λειτουργικό σύστημα στο μηχάνημά σας <phrase arch=\"any-"
 "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
@@ -1420,15 +1430,23 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can find information about your current partition setup by using a "
+#| "partitioning tool for your current operating system<phrase arch=\"any-"
+#| "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
+#| "phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
+#| "MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
+#| "Partitioning tools always provide a way to show existing partitions "
+#| "without making changes."
 msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 "Μπορείτε να βρείτε πληροφορίες σχετικά με την τρέχουσα διαμόρφωση των "
 "κατατμήσεων του δίσκου σας χρησιμοποιώντας ένα εργαλείο διαμέρισης για το "
@@ -1564,11 +1582,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:943
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
+#| "parttype; partitions should appear before all other partitions on the "
+#| "disk, especially MacOS boot partitions. This should be kept in mind when "
+#| "pre-partitioning; you should create a &arch-parttype; placeholder "
+#| "partition to come <emphasis>before</emphasis> the other bootable "
+#| "partitions on the disk. (The small partitions dedicated to Apple disk "
+#| "drivers are not bootable.) You can delete the placeholder with the "
+#| "&debian; partition tools later during the actual install, and replace it "
+#| "with &arch-parttype; partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1662,19 +1690,25 @@ msgstr ""
 
 #. Tag: title
 #: preparing.xml:1062
-#, no-c-format
-msgid "MacOS/OSX Partitioning"
+#, fuzzy, no-c-format
+#| msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr "Κατάτμηση από MacOS/OSX "
 
 #. Tag: para
 #: preparing.xml:1064
-#, no-c-format
-msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The <application>Apple Drive Setup</application> application can be found "
+#| "in the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#| "adjust existing partitions; it is limited to partitioning the entire disk "
+#| "at once. The disk driver partitions don't show up in <application>Drive "
+#| "Setup</application>."
+msgid ""
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 "Η εφαρμογή <application>Apple Drive Setup</application> μπορεί να βρεθεί "
 "στον κατάλογο <filename>Utilities</filename> στο CD του MacOS. Δεν μπορεί να "
@@ -1683,7 +1717,7 @@ msgstr ""
 "φαίνονται στο <application>Drive Setup</application>."
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1696,45 +1730,34 @@ msgstr ""
 "από τον εγκαταστάτη του &debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
-"Αν σχεδιάζετε να εγκαταστήσετε και το MacOS 9 και το OS X, είναι καλίτερο να "
-"δημιουργήσετε ξεχωριστές κατατμήσεις για το κάθε λειτουργικό σύστημα. Αν "
-"εγκατασταθούν στην ίδια κατάτμηση θα πρέπει να χρησιμοποιήσετε το "
-"<application>Startup Disk</application> (και βέβαια με επανεκκίνηση) για να "
-"επιλέξετε ανάμεσα στα δύο. Η επιλογή αυτή μεταξύ των δύο λειτουργικών δεν "
-"μπορεί να γίνει κατά τη στιγμή της επανεκκίνησης. Αν όμως έχετε διαφορετικές "
-"κατατμήσεις για το καθένα, τότε θα εμφανιστούν αντίστοιχα διαφορετικές "
-"επιλογές για το OS X και το MacOS 9 κρατώντας κάτω το πλήκτρο "
-"<keycap>option</keycap> κατά την εκκίνηση ενώ διαφορετικές επιλογές μπορούν "
-"να τοποθετηθούν και στο μενού εκκίνησης του <application>yaboot</"
-"application>. Επίσης το Startup Disk θα απενεργοποιήσει όλες τις άλλες "
-"προσαρτήσιμες κατατμήσεις που μπορούν να επηρρεάσουν την εκκίνηση του GNU/"
-"Linux. Οι κατατμήσεις τόσο του OS 9 όσο και του OS Χ θα είναι προσβάσιμες "
-"είτε από το OS 9 είτε το OS X."
 
 #. Tag: para
-#: preparing.xml:1090
-#, no-c-format
+#: preparing.xml:1086
+#, fuzzy, no-c-format
+#| msgid ""
+#| "GNU/Linux is unable to access information on UFS partitions, but does "
+#| "support HFS+ (aka MacOS Extended) partitions. OS X requires one of these "
+#| "two types for its boot partition. MacOS 9 can be installed on either HFS "
+#| "(aka MacOS Standard) or HFS+. To share information between the MacOS and "
+#| "GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS "
+#| "FAT partitions are supported by both MacOS and Linux."
 msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 "To GNU/Linux δεν μπορεί να προσπελάσει πληροφορία σε ένα σύστημα αρχείων "
 "UFS, αλλά υποστηρίζει κατατμήσεις HFS+ (γνωστό και σαν MacOS Extended). Το "
@@ -1746,14 +1769,14 @@ msgstr ""
 "από το Linux."
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr ""
 "Ρύθμιση του Υλικού και του Λειτουργικού συστήματος πριν την εγκατάσταση"
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1772,13 +1795,13 @@ msgstr ""
 "της πρώτης εκκίνησης (bootstrap) (μετά το άνοιγμα του υπολογιστή)."
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "Κλήση του BIOS Set-Up Menu"
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, no-c-format
 msgid ""
 "The BIOS provides the basic functions needed to boot your machine and to "
@@ -1801,13 +1824,13 @@ msgstr ""
 "πρέπει να πατήσετε για να μπείτε στην οθόνη ρυθμίσεων."
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Επιλογή συσκευής εκκίνησης"
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1824,7 +1847,7 @@ msgstr ""
 "ενεργοποίηση δικτυακής εκκίνησης μέσω του μηχανισμού PXE."
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1836,7 +1859,7 @@ msgstr ""
 "εκκίνησης, αν δεν είναι ήδη ενεργοποιημένες."
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1864,7 +1887,7 @@ msgstr ""
 "σκληρό δίσκο σαν την κανονική κύρια συσκευή εκκίνησης."
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1877,7 +1900,7 @@ msgstr ""
 "&d-i; ως κύρια συσκευή εκκίνησης."
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1907,7 +1930,7 @@ msgstr ""
 "που δεν εκκινούν από ένα κλειδί USB σε κατάσταση USB harddisk.</phrase>"
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1924,13 +1947,13 @@ msgstr ""
 "USB και διαλέξτε μια εικόνα εγκατάστασης."
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "Επίκληση του OpenFirmware"
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1947,7 +1970,7 @@ msgstr ""
 "μηχάνημά σας."
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1966,7 +1989,7 @@ msgstr ""
 "powerpc-faq;\"></ulink> για περισσότερες υποδείξεις."
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1992,7 +2015,7 @@ msgstr ""
 "με το OpenFirmware."
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2016,13 +2039,13 @@ msgstr ""
 "μνήμη nvram."
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "Κλήση του OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2039,7 +2062,7 @@ msgstr ""
 "script."
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2061,7 +2084,7 @@ msgstr ""
 "νεώτερου τύπου."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2076,7 +2099,7 @@ msgstr ""
 "χρησιμοποιείτε κάποιο διαφορετικό πρόγραμμα."
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2097,7 +2120,7 @@ msgstr ""
 "openboot;\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2141,7 +2164,7 @@ msgstr ""
 "ulink>."
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2172,19 +2195,19 @@ msgstr ""
 "</screen></informalexample> και στο Solaris:"
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1 "
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "Ρύθμιση του BIOS"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2209,7 +2232,7 @@ msgstr ""
 "based και όχι character-based."
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2230,7 +2253,7 @@ msgstr ""
 "δυνατότητα είναι διαθέσιμες."
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2257,13 +2280,13 @@ msgstr ""
 "βήματα εγκατάστασης που αφορούν ειδικά το &debian;."
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Φυσικές εγκαταστάσεις και εγκαταστάσεις σε LPAR "
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2280,13 +2303,13 @@ msgstr ""
 "Linux."
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Εγκατάσταση σαν VM guest"
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2303,7 +2326,7 @@ msgstr ""
 "για να τρέξετε Linux."
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2326,13 +2349,13 @@ msgstr ""
 "περιλαμβάνεται στις διαθέσιμες εικόνες."
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Ρύθμιση ενός server εγκατάστασης"
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2347,7 +2370,7 @@ msgstr ""
 "HTTP ή FTP."
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2362,26 +2385,26 @@ msgstr ""
 "όλων των CD εγκατάστασης σε ένα τέτοιο δέντρο καταλόγων."
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr ""
 "ΔΙΟΡΘΩΣΕ ΜΕ: χρειάζονται περισσότερες πληροφορίες &mdash; από ένα Redbook?"
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Ζητήματα που θα πρέπει να προσέξετε για το υλικό"
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "Υποστήριξη USB στο BIOS και πληκτρολόγια"
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, no-c-format
 msgid ""
 "If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -2401,13 +2424,13 @@ msgstr ""
 "keyboard support</quote>."
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Ορατότητα οθόνης σε μηχανήματα OldWorld Powermac"
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2431,6 +2454,34 @@ msgstr ""
 "quote> χρώματα."
 
 #~ msgid ""
+#~ "If you are planning to install both MacOS 9 and OS X, it is best to "
+#~ "create separate partitions for OS 9 and OS X. If they are installed on "
+#~ "the same partition, <application>Startup Disk</application> (and reboot) "
+#~ "must be used to select between the two; the choice between the two "
+#~ "systems can't be made at boot time. With separate partitions, separate "
+#~ "options for OS 9 and OS X will appear when holding the <keycap>option</"
+#~ "keycap> key at boot time, and separate options can be installed in the "
+#~ "<application>yaboot</application> boot menu as well. Also, Startup Disk "
+#~ "will de-bless all other mountable partitions, which can affect GNU/Linux "
+#~ "booting. Both OS 9 and OS X partitions will be accessible from either OS "
+#~ "9 or OS X."
+#~ msgstr ""
+#~ "Αν σχεδιάζετε να εγκαταστήσετε και το MacOS 9 και το OS X, είναι καλίτερο "
+#~ "να δημιουργήσετε ξεχωριστές κατατμήσεις για το κάθε λειτουργικό σύστημα. "
+#~ "Αν εγκατασταθούν στην ίδια κατάτμηση θα πρέπει να χρησιμοποιήσετε το "
+#~ "<application>Startup Disk</application> (και βέβαια με επανεκκίνηση) για "
+#~ "να επιλέξετε ανάμεσα στα δύο. Η επιλογή αυτή μεταξύ των δύο λειτουργικών "
+#~ "δεν μπορεί να γίνει κατά τη στιγμή της επανεκκίνησης. Αν όμως έχετε "
+#~ "διαφορετικές κατατμήσεις για το καθένα, τότε θα εμφανιστούν αντίστοιχα "
+#~ "διαφορετικές επιλογές για το OS X και το MacOS 9 κρατώντας κάτω το "
+#~ "πλήκτρο <keycap>option</keycap> κατά την εκκίνηση ενώ διαφορετικές "
+#~ "επιλογές μπορούν να τοποθετηθούν και στο μενού εκκίνησης του "
+#~ "<application>yaboot</application>. Επίσης το Startup Disk θα "
+#~ "απενεργοποιήσει όλες τις άλλες προσαρτήσιμες κατατμήσεις που μπορούν να "
+#~ "επηρρεάσουν την εκκίνηση του GNU/Linux. Οι κατατμήσεις τόσο του OS 9 όσο "
+#~ "και του OS Χ θα είναι προσβάσιμες είτε από το OS 9 είτε το OS X."
+
+#~ msgid ""
 #~ "Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; "
 #~ "CD users can boot from one of the CDs)."
 #~ msgstr ""
diff --git a/po/el/preseed.po b/po/el/preseed.po
index 9cf8678b5..0da6a5ffb 100644
--- a/po/el/preseed.po
+++ b/po/el/preseed.po
@@ -1669,69 +1669,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:794
 #, no-c-format
-#| msgid ""
-#| "# Disable network configuration entirely. This is useful for cdrom\n"
-#| "# installations on non-networked devices where the network questions,\n"
-#| "# warning and long timeouts are a nuisance.\n"
-#| "#d-i netcfg/enable boolean false\n"
-#| "\n"
-#| "# netcfg will choose an interface that has link if possible. This makes "
-#| "it\n"
-#| "# skip displaying a list if there is more than one interface.\n"
-#| "d-i netcfg/choose_interface select auto\n"
-#| "\n"
-#| "# To pick a particular interface instead:\n"
-#| "#d-i netcfg/choose_interface select eth1\n"
-#| "\n"
-#| "# To set a different link detection timeout (default is 3 seconds).\n"
-#| "# Values are interpreted as seconds.\n"
-#| "#d-i netcfg/link_detection_timeout string 10\n"
-#| "\n"
-#| "# If you have a slow dhcp server and the installer times out waiting for\n"
-#| "# it, this might be useful.\n"
-#| "#d-i netcfg/dhcp_timeout string 60\n"
-#| "\n"
-#| "# If you prefer to configure the network manually, uncomment this line "
-#| "and\n"
-#| "# the static network configuration below.\n"
-#| "#d-i netcfg/disable_dhcp boolean true\n"
-#| "\n"
-#| "# If you want the preconfiguration file to work on systems both with and\n"
-#| "# without a dhcp server, uncomment these lines and the static network\n"
-#| "# configuration below.\n"
-#| "#d-i netcfg/dhcp_failed note\n"
-#| "#d-i netcfg/dhcp_options select Configure network manually\n"
-#| "\n"
-#| "# Static network configuration.\n"
-#| "#d-i netcfg/get_nameservers string 192.168.1.1\n"
-#| "#d-i netcfg/get_ipaddress string 192.168.1.42\n"
-#| "#d-i netcfg/get_netmask string 255.255.255.0\n"
-#| "#d-i netcfg/get_gateway string 192.168.1.1\n"
-#| "#d-i netcfg/confirm_static boolean true\n"
-#| "\n"
-#| "# Any hostname and domain names assigned from dhcp take precedence over\n"
-#| "# values set here. However, setting the values still prevents the "
-#| "questions\n"
-#| "# from being shown, even if values come from dhcp.\n"
-#| "d-i netcfg/get_hostname string unassigned-hostname\n"
-#| "d-i netcfg/get_domain string unassigned-domain\n"
-#| "\n"
-#| "# If you want to force a hostname, regardless of what either the DHCP\n"
-#| "# server returns or what the reverse DNS entry for the IP is, uncomment\n"
-#| "# and adjust the following line.\n"
-#| "#d-i netcfg/hostname string somehost\n"
-#| "\n"
-#| "# Disable that annoying WEP key dialog.\n"
-#| "d-i netcfg/wireless_wep string\n"
-#| "# The wacky dhcp hostname that some ISPs use as a password of sorts.\n"
-#| "#d-i netcfg/dhcp_hostname string radish\n"
-#| "\n"
-#| "# If non-free firmware is needed for the network or other hardware, you "
-#| "can\n"
-#| "# configure the installer to always try to load it, without prompting. "
-#| "Or\n"
-#| "# change to false to disable asking.\n"
-#| "#d-i hw-detect/load_firmware boolean true"
 msgid ""
 "# Disable network configuration entirely. This is useful for cdrom\n"
 "# installations on non-networked devices where the network questions,\n"
@@ -1832,8 +1769,8 @@ msgstr ""
 "# τις ρυθμίσεις του στατικού δικτύου παρακάτω.\n"
 "#d-i netcfg/disable_dhcp boolean true\n"
 "# Αν θέλετε το αρχείο προρυθμίσεων να δουλεύει τόσο σε συστήματα με\n"
-"# όσο και χωρίς έναν εξυπηρετητή dhcp, αποσχολιάστε αυτές τις γραμμές και "
-"# τις ρυθμίσεις\n"
+"# όσο και χωρίς έναν εξυπηρετητή dhcp, αποσχολιάστε αυτές τις γραμμές και # "
+"τις ρυθμίσεις\n"
 "# του στατικού δικτύου παρακάτω.\n"
 "#d-i netcfg/dhcp_failed note\n"
 "#d-i netcfg/dhcp_options select Configure network manually\n"
diff --git a/po/es/preparing.po b/po/es/preparing.po
index b56874918..559ce936a 100644
--- a/po/es/preparing.po
+++ b/po/es/preparing.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-26 12:01+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+0000\n"
 "PO-Revision-Date: 2013-02-26 12:59+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -955,9 +955,9 @@ msgstr ""
 "compatibilidad del controlador para un chipset particular. Si una búsqueda "
 "del ID de fabricante/producto no ofrece resultados útiles, puede que ayude "
 "una búsqueda de los nombres código del chip, que habitualmente también "
-"proporcionan lsusb y lspci (<quote>RTL8111</quote>/<quote>RTL8168B</quote> en el "
-"ejemplo de la tarjeta de red, y <quote>RV710</quote> en el ejemplo de la tarjeta de "
-"vídeo)."
+"proporcionan lsusb y lspci (<quote>RTL8111</quote>/<quote>RTL8168B</quote> "
+"en el ejemplo de la tarjeta de red, y <quote>RV710</quote> en el ejemplo de "
+"la tarjeta de vídeo)."
 
 #. Tag: title
 #: preparing.xml:599
@@ -1402,17 +1402,27 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:855
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you already have an operating system on your system <phrase arch=\"any-"
+#| "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
+#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
+#| "OS/390, &hellip;) </phrase> which uses the whole disk and you want to "
+#| "stick &debian; on the same disk, you will need to repartition it. "
+#| "&debian; requires its own hard disk partitions. It cannot be installed on "
+#| "Windows or MacOS partitions. It may be able to share some partitions with "
+#| "other Unix systems, but that's not covered here. At the very least you "
+#| "will need a dedicated partition for the &debian; root filesystem."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
 "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 "Si ya tiene un sistema operativo en su sitema <phrase arch=\"any-x86\"> "
 "(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
@@ -1427,15 +1437,23 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can find information about your current partition setup by using a "
+#| "partitioning tool for your current operating system<phrase arch=\"any-"
+#| "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
+#| "phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
+#| "MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
+#| "Partitioning tools always provide a way to show existing partitions "
+#| "without making changes."
 msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 "Puede encontrar información del estado actual de sus particiones mediante "
 "una herramienta de particionado para su sistema operativo actual <phrase "
@@ -1560,11 +1578,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:943
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
+#| "parttype; partitions should appear before all other partitions on the "
+#| "disk, especially MacOS boot partitions. This should be kept in mind when "
+#| "pre-partitioning; you should create a &arch-parttype; placeholder "
+#| "partition to come <emphasis>before</emphasis> the other bootable "
+#| "partitions on the disk. (The small partitions dedicated to Apple disk "
+#| "drivers are not bootable.) You can delete the placeholder with the "
+#| "&debian; partition tools later during the actual install, and replace it "
+#| "with &arch-parttype; partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1653,19 +1681,25 @@ msgstr ""
 
 #. Tag: title
 #: preparing.xml:1062
-#, no-c-format
-msgid "MacOS/OSX Partitioning"
+#, fuzzy, no-c-format
+#| msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr "Particionado en MacOS/OSX"
 
 #. Tag: para
 #: preparing.xml:1064
-#, no-c-format
-msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The <application>Apple Drive Setup</application> application can be found "
+#| "in the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#| "adjust existing partitions; it is limited to partitioning the entire disk "
+#| "at once. The disk driver partitions don't show up in <application>Drive "
+#| "Setup</application>."
+msgid ""
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 "Puede encontrar la aplicación <application>Apple Drive Setup</application> "
 "en el directorio <filename>Utilities</filename> del CD de MacOS. Este "
@@ -1674,7 +1708,7 @@ msgstr ""
 "disco en <application>Drive Setup</application>."
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1686,42 +1720,34 @@ msgstr ""
 "sea, será borrada y reemplazada después por el instalador de &debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
-"Es mejor crear particiones separadas para OS 9 y OS X si planea instalar "
-"tanto MacOS 9 com OS X. Debe usar <application>Startup Disk</application> (y "
-"reiniciar) para elegir entre ambos si éstos están instalados en la misma "
-"partición. No podrá seleccionar uno de los dos sistemas en el momento del "
-"arranque. Aparecerán opciones separadas para OS 9 y OS X al mantener "
-"presionada la tecla <keycap>option</keycap> en el momento del arranque si "
-"dispone de particiones separadas. También podrá instalar distintas opciones "
-"en el menú de arranque de <application>yaboot</application>. Además, «Statup "
-"Disk» puede desmarcar todas las otras particiones, lo que puede afectar el "
-"arranque de GNU/Linux. Las particiones de OS 9 y OS X serán accesibles tanto "
-"desde OS 9 como desde OS X."
 
 #. Tag: para
-#: preparing.xml:1090
-#, no-c-format
+#: preparing.xml:1086
+#, fuzzy, no-c-format
+#| msgid ""
+#| "GNU/Linux is unable to access information on UFS partitions, but does "
+#| "support HFS+ (aka MacOS Extended) partitions. OS X requires one of these "
+#| "two types for its boot partition. MacOS 9 can be installed on either HFS "
+#| "(aka MacOS Standard) or HFS+. To share information between the MacOS and "
+#| "GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS "
+#| "FAT partitions are supported by both MacOS and Linux."
 msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 "GNU/Linux no es capaz de acceder a la información en particiones UFS pero sí "
 "puede hacerlo en particiones HFS+ (también conocidas como MacOS extendida). "
@@ -1732,13 +1758,13 @@ msgstr ""
 "Tanto MacOS como Linux puede acceder a particiones HFS, HFS+ y MS-DOS FAT."
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "Preinstalación de hardware y configuración del sistema operativo"
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1757,13 +1783,13 @@ msgstr ""
 "encendido)."
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "Utilización del menú de configuración de la BIOS"
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, no-c-format
 msgid ""
 "The BIOS provides the basic functions needed to boot your machine and to "
@@ -1786,13 +1812,13 @@ msgstr ""
 "configuración."
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Selección de dispositivo de arranque"
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1809,7 +1835,7 @@ msgstr ""
 "posibilidad de activar el arranque por red mediante PXE."
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1821,7 +1847,7 @@ msgstr ""
 "pertinentes si aún no están activados."
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1849,7 +1875,7 @@ msgstr ""
 "de arranque principal predeterminado."
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1862,7 +1888,7 @@ msgstr ""
 "sea el dispositivo de arranque principal."
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1893,7 +1919,7 @@ msgstr ""
 "dispositivo USB estando en modo de disco duro USB.</phrase>"
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1909,13 +1935,13 @@ msgstr ""
 "seleccione el dispositivo USB y una imagen de instalación."
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "Utilización de OpenFirmware"
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1931,7 +1957,7 @@ msgstr ""
 "que obtuvo con su máquina."
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1949,7 +1975,7 @@ msgstr ""
 "leer más consejos en <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink>."
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1975,7 +2001,7 @@ msgstr ""
 "de módem"
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1998,13 +2024,13 @@ msgstr ""
 "nvram."
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "Utilización de OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2020,7 +2046,7 @@ msgstr ""
 "máquina, como diagnósticos y programas básicos."
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2041,7 +2067,7 @@ msgstr ""
 "nueva línea de órdenes si obtiene la antigua."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2056,7 +2082,7 @@ msgstr ""
 "programa distinto."
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2077,7 +2103,7 @@ msgstr ""
 "\">Referencia de OpenBoot de Sun</ulink>."
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2120,7 +2146,7 @@ msgstr ""
 "\"&url-openboot;\">Referencia de OpenBoot de Sun</ulink>."
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2151,19 +2177,19 @@ msgstr ""
 "</screen></informalexample> y desde Solaris:"
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "# eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "Configuración de la BIOS"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2187,7 +2213,7 @@ msgstr ""
 "basada en líneas en lugar de caracteres."
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2208,7 +2234,7 @@ msgstr ""
 "de ésta opción y del HMC."
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2234,13 +2260,13 @@ msgstr ""
 "leer los pasos de instalación específicos de &debian;."
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Instalaciones nativas y LPAR"
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2256,13 +2282,13 @@ msgstr ""
 "Distribuciones</ulink> que describen cómo configurar LPAR para Linux."
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Instalación como invitado de VM"
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2279,7 +2305,7 @@ msgstr ""
 "ejecutar Linux."
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2301,13 +2327,13 @@ msgstr ""
 "filename>, que introducirá los ficheros en el orden correcto."
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Preparación de un servidor de instalación"
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2321,7 +2347,7 @@ msgstr ""
 "usando NFS, HTTP ó FTP."
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2336,25 +2362,25 @@ msgstr ""
 "instalación en un árbol de directorios como éste."
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: es necesaria más información &mdash; ¿obtenerla de un Redbook?"
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Problemas de hardware a tener en cuenta"
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "Compatibilidad de USB en la BIOS y teclados USB"
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, no-c-format
 msgid ""
 "If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -2374,13 +2400,13 @@ msgstr ""
 "<quote>Compatibilidad de teclado USB</quote>."
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Visibilidad de la pantalla en Powermacs OldWorld"
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2404,6 +2430,32 @@ msgstr ""
 "en lugar de mostrar la interfaz de usuario."
 
 #~ msgid ""
+#~ "If you are planning to install both MacOS 9 and OS X, it is best to "
+#~ "create separate partitions for OS 9 and OS X. If they are installed on "
+#~ "the same partition, <application>Startup Disk</application> (and reboot) "
+#~ "must be used to select between the two; the choice between the two "
+#~ "systems can't be made at boot time. With separate partitions, separate "
+#~ "options for OS 9 and OS X will appear when holding the <keycap>option</"
+#~ "keycap> key at boot time, and separate options can be installed in the "
+#~ "<application>yaboot</application> boot menu as well. Also, Startup Disk "
+#~ "will de-bless all other mountable partitions, which can affect GNU/Linux "
+#~ "booting. Both OS 9 and OS X partitions will be accessible from either OS "
+#~ "9 or OS X."
+#~ msgstr ""
+#~ "Es mejor crear particiones separadas para OS 9 y OS X si planea instalar "
+#~ "tanto MacOS 9 com OS X. Debe usar <application>Startup Disk</application> "
+#~ "(y reiniciar) para elegir entre ambos si éstos están instalados en la "
+#~ "misma partición. No podrá seleccionar uno de los dos sistemas en el "
+#~ "momento del arranque. Aparecerán opciones separadas para OS 9 y OS X al "
+#~ "mantener presionada la tecla <keycap>option</keycap> en el momento del "
+#~ "arranque si dispone de particiones separadas. También podrá instalar "
+#~ "distintas opciones en el menú de arranque de <application>yaboot</"
+#~ "application>. Además, «Statup Disk» puede desmarcar todas las otras "
+#~ "particiones, lo que puede afectar el arranque de GNU/Linux. Las "
+#~ "particiones de OS 9 y OS X serán accesibles tanto desde OS 9 como desde "
+#~ "OS X."
+
+#~ msgid ""
 #~ "Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; "
 #~ "CD users can boot from one of the CDs)."
 #~ msgstr ""
diff --git a/po/fi/preparing.po b/po/fi/preparing.po
index 8a20a2a39..2dd884225 100644
--- a/po/fi/preparing.po
+++ b/po/fi/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Installation Guide preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+0000\n"
 "PO-Revision-Date: 2010-05-05 06:23+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -1325,10 +1325,10 @@ msgid ""
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 "Jos koneessa on jo käyttöjärjestelmä <phrase arch=\"x86\"> (Windows 9x, "
 "Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </"
@@ -1353,10 +1353,10 @@ msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 "Tiedot levyllä jo olevista osioita löytyvät käyttöjärjestelmän "
 "osiointityökalujen avulla<phrase arch=\"x86\">, kuten fdisk tai "
@@ -1474,7 +1474,7 @@ msgstr ""
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1560,19 +1560,25 @@ msgstr ""
 
 #. Tag: title
 #: preparing.xml:1062
-#, no-c-format
-msgid "MacOS/OSX Partitioning"
+#, fuzzy, no-c-format
+#| msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr "Osioiden teko MacOS/OSX:lle"
 
 #. Tag: para
 #: preparing.xml:1064
-#, no-c-format
-msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The <application>Apple Drive Setup</application> application can be found "
+#| "in the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#| "adjust existing partitions; it is limited to partitioning the entire disk "
+#| "at once. The disk driver partitions don't show up in <application>Drive "
+#| "Setup</application>."
+msgid ""
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 "Sovellus <application>Apple Drive Setup</application> löytyy MacOS-rompun "
 "hakemistosta <filename>Utilities</filename>. Se ei muokkaa olemassa olevia "
@@ -1580,7 +1586,7 @@ msgstr ""
 "<application>Drive Setup</application> ei näytä levyajurin osioita."
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1592,43 +1598,34 @@ msgstr ""
 "korvataan myöhemmin Debianin asentimen toimesta."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
-"Mikäli tarkoituksena on asentaa sekä MacOS 9 että OS X, on parasta luoda "
-"erilliset osiot kummallekin. Jos ne asennetaan samaan osioon, sovellusta "
-"<application>Startup Disk</application> (ja uudelleenkäynnistystä) on "
-"käytettävä valitsemaan käyttöjärjestelmien välillä; käynnistyvää "
-"järjestelmää ei voi valita käynnistyksen aikana. Kun ne on asennettu "
-"erillisiin osioihin, näkyy oma valinta sekä OS 9:lle että OS X:lle kun "
-"näppäintä <keycap>option</keycap> pidettään pohjassa käynnistyksen aikana. "
-"Myös <application>yabootin</application> käynnistysvalikkoon voidaan "
-"asentaan kummallekin oma valinta. Startup Disk myöskin piilottaa kaikki muut "
-"liitettävät osiot, joka voi vaikuttaa GNU/Linuxin käynnistämiseen. Sekä OS 9 "
-"että OS X -osiot ovat käytettävissä molemmista käyttöjärjestelmistä OS 9 ja "
-"OS X."
 
 #. Tag: para
-#: preparing.xml:1090
-#, no-c-format
-msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+#: preparing.xml:1086
+#, fuzzy, no-c-format
+#| msgid ""
+#| "GNU/Linux is unable to access information on UFS partitions, but does "
+#| "support HFS+ (aka MacOS Extended) partitions. OS X requires one of these "
+#| "two types for its boot partition. MacOS 9 can be installed on either HFS "
+#| "(aka MacOS Standard) or HFS+. To share information between the MacOS and "
+#| "GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS "
+#| "FAT partitions are supported by both MacOS and Linux."
+msgid ""
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 "GNU/Linux ei voi käyttää UFS-osioilla olevia tietoja, mutta tukee HFS+ (eli "
 "MacOS Extended) -osioita. OS X vaatiin jomman kumman näistä tyypeistä "
@@ -1639,13 +1636,13 @@ msgstr ""
 "että Linuxissa."
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "Laiteasetukset ja käyttöjärjestelmän asetukset ennen asennusta"
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section will walk you through pre-installation hardware setup, if "
@@ -1672,13 +1669,13 @@ msgstr ""
 "&debian-gnu;in luotettavuuteen on korostettu."
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "BIOSin asetusvalikon käynnistäminen"
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, fuzzy, no-c-format
 #| msgid ""
 #| "BIOS provides the basic functions needed to boot your machine to allow "
@@ -1705,13 +1702,13 @@ msgstr ""
 "&debian;in asennus ei onnistu."
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Käynnistyslaitteen valinta"
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1722,7 +1719,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1731,7 +1728,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1747,7 +1744,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1756,7 +1753,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1773,7 +1770,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1784,13 +1781,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "OpenFirmwaren käynnistäminen"
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1805,7 +1802,7 @@ msgstr ""
 "valmistajittain. On luettava koneen mukana tullutta laitteiston ohjekirjaa."
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1823,7 +1820,7 @@ msgstr ""
 "<ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> lisää vinkkejä."
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1846,7 +1843,7 @@ msgstr ""
 "on käytettävä modeemiporttiin yhdistetystä toisesta koneesta pääteohjelmalla."
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1868,13 +1865,13 @@ msgstr ""
 "jolloin laiteohjelmiston korjaukset asennetaan nvram:iin."
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "OpenBootin käynnistäminen"
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1890,7 +1887,7 @@ msgstr ""
 "kuten vianmääritystä ja yksinkertaisia komentosarjoja."
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1911,7 +1908,7 @@ msgstr ""
 "<keycap>n</keycap> painamalla uudenmallinen."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1925,7 +1922,7 @@ msgstr ""
 "Jos käytät jotain muuta pääteohjelmaa, lue sen ohjeet."
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1945,7 +1942,7 @@ msgstr ""
 "Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1988,7 +1985,7 @@ msgstr ""
 "Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2019,19 +2016,19 @@ msgstr ""
 "</screen></informalexample> ja Solariksessa:"
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOSin asetukset"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2054,7 +2051,7 @@ msgstr ""
 "konsoli on rivipohjainen eikä merkkipohjainen."
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2074,7 +2071,7 @@ msgstr ""
 "jos HMC ja tämä toiminto on käytettävissä."
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2099,13 +2096,13 @@ msgstr ""
 "parissa."
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Asennus suoraan rautaan ja LPAR:iin"
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2121,13 +2118,13 @@ msgstr ""
 "Distributions</ulink> Redbook ohjeet kuinka LPAR tehdään Linuxille."
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Asennus VM vieraaksi"
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2143,7 +2140,7 @@ msgstr ""
 "Distributions</ulink> Redbook ohjeet kuinka VM vieras tehdään Linuxille."
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2166,13 +2163,13 @@ msgstr ""
 "tietueen pituudella."
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Asennuspalvelimen tekeminen"
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2186,7 +2183,7 @@ msgstr ""
 "paketit ja niiden on oltava käytettävissä NFS:llä, HTTP:llä tai FTP:llä."
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2200,25 +2197,25 @@ msgstr ""
 "voidaan myös kopioida tuollaiseen hakemistopuuhun."
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: more information needed &mdash; from a Redbook?"
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Varottavia laitetason ilmiöitä"
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "Tuki USB BIOS:lle ja näppäimistöille"
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2245,13 +2242,13 @@ msgstr ""
 "keyboard emulation</quote> tai <quote>USB keyboard support</quote>."
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Näytön pimeneminen OldWorld Powermaceissa"
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2273,6 +2270,32 @@ msgstr ""
 "quote>."
 
 #~ msgid ""
+#~ "If you are planning to install both MacOS 9 and OS X, it is best to "
+#~ "create separate partitions for OS 9 and OS X. If they are installed on "
+#~ "the same partition, <application>Startup Disk</application> (and reboot) "
+#~ "must be used to select between the two; the choice between the two "
+#~ "systems can't be made at boot time. With separate partitions, separate "
+#~ "options for OS 9 and OS X will appear when holding the <keycap>option</"
+#~ "keycap> key at boot time, and separate options can be installed in the "
+#~ "<application>yaboot</application> boot menu as well. Also, Startup Disk "
+#~ "will de-bless all other mountable partitions, which can affect GNU/Linux "
+#~ "booting. Both OS 9 and OS X partitions will be accessible from either OS "
+#~ "9 or OS X."
+#~ msgstr ""
+#~ "Mikäli tarkoituksena on asentaa sekä MacOS 9 että OS X, on parasta luoda "
+#~ "erilliset osiot kummallekin. Jos ne asennetaan samaan osioon, sovellusta "
+#~ "<application>Startup Disk</application> (ja uudelleenkäynnistystä) on "
+#~ "käytettävä valitsemaan käyttöjärjestelmien välillä; käynnistyvää "
+#~ "järjestelmää ei voi valita käynnistyksen aikana. Kun ne on asennettu "
+#~ "erillisiin osioihin, näkyy oma valinta sekä OS 9:lle että OS X:lle kun "
+#~ "näppäintä <keycap>option</keycap> pidettään pohjassa käynnistyksen "
+#~ "aikana. Myös <application>yabootin</application> käynnistysvalikkoon "
+#~ "voidaan asentaan kummallekin oma valinta. Startup Disk myöskin piilottaa "
+#~ "kaikki muut liitettävät osiot, joka voi vaikuttaa GNU/Linuxin "
+#~ "käynnistämiseen. Sekä OS 9 että OS X -osiot ovat käytettävissä molemmista "
+#~ "käyttöjärjestelmistä OS 9 ja OS X."
+
+#~ msgid ""
 #~ "Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; "
 #~ "CD users can boot from one of the CDs)."
 #~ msgstr ""
diff --git a/po/hu/preparing.po b/po/hu/preparing.po
index 1686e13df..dc25bd22b 100644
--- a/po/hu/preparing.po
+++ b/po/hu/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+0000\n"
 "PO-Revision-Date: 2007-03-18 16:25+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian>\n"
@@ -1313,10 +1313,10 @@ msgid ""
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 "Ha már van egy másik rendszered is a gépen <phrase arch=\"x86\"> (OpenBSD, "
 "NetBSD, FreeBSD, Solaris, MacOS, OS/2, Windows 9x/NT/2000/XP/2003/"
@@ -1341,10 +1341,10 @@ msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 "A már meglévő rendszerhez tartozó particionáló eszközzel megtudhatók a "
 "jelenlegi partíciók<phrase arch=\"x86\">, ilyen például az fdisk vagy "
@@ -1462,7 +1462,7 @@ msgstr ""
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1534,22 +1534,21 @@ msgstr ""
 #. Tag: title
 #: preparing.xml:1062
 #, no-c-format
-msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr ""
 
 #. Tag: para
 #: preparing.xml:1064
 #, no-c-format
 msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1558,41 +1557,37 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1090
+#: preparing.xml:1086
 #, no-c-format
 msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "Telepítés-előtti hardver és operációs rendszer beállítás"
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section will walk you through pre-installation hardware setup, if "
@@ -1618,13 +1613,13 @@ msgstr ""
 "gondokat is hangsúlyozzuk."
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "A BIOS beállító menü behívása"
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, fuzzy, no-c-format
 #| msgid ""
 #| "BIOS provides the basic functions needed to boot your machine to allow "
@@ -1651,13 +1646,13 @@ msgstr ""
 "vagy lehetetlenné válik a &debian; telepítése."
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Indító eszköz választás"
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1668,7 +1663,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1677,7 +1672,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1693,7 +1688,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1702,7 +1697,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1719,7 +1714,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1730,13 +1725,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1747,7 +1742,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1759,7 +1754,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1774,7 +1769,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1788,13 +1783,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1805,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1818,7 +1813,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1828,7 +1823,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1841,7 +1836,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1865,7 +1860,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -1883,19 +1878,19 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOS beállítás"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -1917,7 +1912,7 @@ msgstr ""
 "karakter-alapú."
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -1935,7 +1930,7 @@ msgstr ""
 "kártya olvasója vagy egy LPAR HMC része, ha a HMC és e lehetőség elérhető."
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -1958,13 +1953,13 @@ msgstr ""
 "telepítő lépésekhez."
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Natív és LPAR telepítés"
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1980,13 +1975,13 @@ msgstr ""
 "beállításához Linuxra."
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Telepítés VM ügyfélként"
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2002,7 +1997,7 @@ msgstr ""
 "ügyfél beállításához Linux futtatására."
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2024,13 +2019,13 @@ msgstr ""
 "filename> átvitele rögzített 80-karakteres bináris módban történjen."
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Egy telepítő kiszolgáló beállítása"
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2044,7 +2039,7 @@ msgstr ""
 "vagy FTP módon."
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2057,25 +2052,25 @@ msgstr ""
 "odamásolható."
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: több adat kell &mdash; egy Vörös könyvből?"
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Kivédendő hardver gondok"
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "USB BIOS támogatás és billentyűzetek"
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2102,13 +2097,13 @@ msgstr ""
 "támogatás</quote> opcióit."
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Kijelző-láthatóság régi Powermaceken"
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
diff --git a/po/ja/preparing.po b/po/ja/preparing.po
index 5945d87c9..650935a19 100644
--- a/po/ja/preparing.po
+++ b/po/ja/preparing.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+0000\n"
 "PO-Revision-Date: 2012-10-26 22:50+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -1310,10 +1310,10 @@ msgid ""
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 "システム上に既にオペレーティングシステム <phrase arch=\"any-x86\"> (Windows "
 "9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
@@ -1338,10 +1338,10 @@ msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 "現在のパーティションの設定は、<phrase arch=\"any-x86\">fdisk や "
 "PartitionMagic</phrase><phrase arch=\"powerpc\">Drive Setup、HD Toolkit、"
@@ -1446,11 +1446,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:943
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
+#| "parttype; partitions should appear before all other partitions on the "
+#| "disk, especially MacOS boot partitions. This should be kept in mind when "
+#| "pre-partitioning; you should create a &arch-parttype; placeholder "
+#| "partition to come <emphasis>before</emphasis> the other bootable "
+#| "partitions on the disk. (The small partitions dedicated to Apple disk "
+#| "drivers are not bootable.) You can delete the placeholder with the "
+#| "&debian; partition tools later during the actual install, and replace it "
+#| "with &arch-parttype; partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1536,19 +1546,25 @@ msgstr ""
 
 #. Tag: title
 #: preparing.xml:1062
-#, no-c-format
-msgid "MacOS/OSX Partitioning"
+#, fuzzy, no-c-format
+#| msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr "MacOS/OSX のパーティション分割"
 
 #. Tag: para
 #: preparing.xml:1064
-#, no-c-format
-msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The <application>Apple Drive Setup</application> application can be found "
+#| "in the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#| "adjust existing partitions; it is limited to partitioning the entire disk "
+#| "at once. The disk driver partitions don't show up in <application>Drive "
+#| "Setup</application>."
+msgid ""
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 "MacOS CD の <filename>Utilities</filename> フォルダに、<application>Apple "
 "Drive Setup</application> アプリケーションが入っているはずです。これを用いて"
@@ -1557,7 +1573,7 @@ msgstr ""
 "<application>Drive Setup</application> からは見えません。"
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1569,42 +1585,34 @@ msgstr ""
 "から、一度消して置き換えることになりますので、タイプは何でも構いません。"
 
 #. Tag: para
-#: preparing.xml:1077
-#, no-c-format
-msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
-msgstr ""
-"MacOS 9 と OS X の両方をインストールする予定でしたら、OS 9 と OS X にはそれぞ"
-"れ別々のパーティションを作るのが良いでしょう。両者を同じパーティションにイン"
-"ストールすると、起動 OS を選ぶために <application>Startup Disk</application> "
-"が (再起動時にも) 必要になります。この両者の選択は、起動時には行えないので"
-"す。別々のパーティションにしておけば、起動時に <keycap>option</keycap> キーを"
-"押しておけば、OS 9 と OS X 共に、別々の選択肢が現れます。また "
-"<application>yaboot</application> のブートメニューにも、同じように別々の選択"
-"肢をインストールできます。Startup Disk はマウント可能なパーティションをすべて"
-"いじってしまう [訳注: 原文 de-bless] ので、GNU/Linux の起動が影響されることが"
-"あります。OS 9、OS X の各パーティションは、それぞれどちらの OS からもアクセス"
-"できます。"
-
-#. Tag: para
-#: preparing.xml:1090
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1086
+#, fuzzy, no-c-format
+#| msgid ""
+#| "GNU/Linux is unable to access information on UFS partitions, but does "
+#| "support HFS+ (aka MacOS Extended) partitions. OS X requires one of these "
+#| "two types for its boot partition. MacOS 9 can be installed on either HFS "
+#| "(aka MacOS Standard) or HFS+. To share information between the MacOS and "
+#| "GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS "
+#| "FAT partitions are supported by both MacOS and Linux."
+msgid ""
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 "GNU/Linux は UFS パーティションの情報にはアクセスできませんが、HFS+ パーティ"
 "ション (MacOS 拡張パーティション) をサポートしています。OS X は、この 2 つの"
@@ -1615,13 +1623,13 @@ msgstr ""
 "でサポートされています。"
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "インストール前に行うハードウェア・OS の設定"
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section will walk you through pre-installation hardware setup, if "
@@ -1648,13 +1656,13 @@ msgstr ""
 "り扱っていく予定です。"
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "BIOS 設定メニューの起動"
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, fuzzy, no-c-format
 #| msgid ""
 #| "BIOS provides the basic functions needed to boot your machine to allow "
@@ -1681,13 +1689,13 @@ msgstr ""
 "トールができなくなるかもしれません。"
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "ブートデバイスの選択"
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1698,7 +1706,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1707,7 +1715,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1723,7 +1731,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1732,7 +1740,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1749,7 +1757,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1760,13 +1768,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "OpenFirmware の起動"
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1781,7 +1789,7 @@ msgstr ""
 "にあたる必要があるでしょう。"
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1799,7 +1807,7 @@ msgstr ""
 "faq;\"></ulink> をご覧ください。"
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1823,7 +1831,7 @@ msgstr ""
 "それをモデムポートにつなぐ必要があります。"
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1845,13 +1853,13 @@ msgstr ""
 "nvram にインストールされます。"
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "OpenBoot の起動"
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1867,7 +1875,7 @@ msgstr ""
 "て様々なことが行えます。"
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1888,7 +1896,7 @@ msgstr ""
 "ます。"
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1903,7 +1911,7 @@ msgstr ""
 "い。"
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1923,7 +1931,7 @@ msgstr ""
 "ulink> にあります。"
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1966,7 +1974,7 @@ msgstr ""
 "\">Sun OpenBoot Reference</ulink> をご覧ください。"
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -1997,19 +2005,19 @@ msgstr ""
 "</screen></informalexample> Solaris では以下のようにしてください。"
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOS 設定"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2033,7 +2041,7 @@ msgstr ""
 "アーキテクチャだからです。"
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2052,7 +2060,7 @@ msgstr ""
 "Management Console) から起動できることもあります。"
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2076,13 +2084,13 @@ msgstr ""
 "ストール手順を行っていってください。"
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "ネイティブな LPAR へのインストール"
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2098,13 +2106,13 @@ msgstr ""
 "Redbook の 3.2 章をご覧ください。"
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "VM ゲストとしてのインストール"
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2120,7 +2128,7 @@ msgstr ""
 "Distributions</ulink> Redbook の 3.1 章をご覧ください。"
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2142,13 +2150,13 @@ msgstr ""
 "ルスクリプトには、イメージを含んでいます。"
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "インストールサーバの設定"
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2162,7 +2170,7 @@ msgstr ""
 "NFS, HTTP, FTP のいずれかで提供できなければなりません。"
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2176,25 +2184,25 @@ msgstr ""
 "レクトリツリーにコピーしたのでも構いません。"
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: more information needed &mdash; from a Redbook?"
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "気をつけるべきハードウェアの問題"
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "USB BIOS サポートとキーボード"
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, no-c-format
 msgid ""
 "If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -2212,13 +2220,13 @@ msgstr ""
 "keyboard support</quote> といった BIOS 設定に入ってください。"
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "OldWorld PowerMAC でのディスプレイ表示"
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2239,6 +2247,31 @@ msgstr ""
 "してみてください。"
 
 #~ msgid ""
+#~ "If you are planning to install both MacOS 9 and OS X, it is best to "
+#~ "create separate partitions for OS 9 and OS X. If they are installed on "
+#~ "the same partition, <application>Startup Disk</application> (and reboot) "
+#~ "must be used to select between the two; the choice between the two "
+#~ "systems can't be made at boot time. With separate partitions, separate "
+#~ "options for OS 9 and OS X will appear when holding the <keycap>option</"
+#~ "keycap> key at boot time, and separate options can be installed in the "
+#~ "<application>yaboot</application> boot menu as well. Also, Startup Disk "
+#~ "will de-bless all other mountable partitions, which can affect GNU/Linux "
+#~ "booting. Both OS 9 and OS X partitions will be accessible from either OS "
+#~ "9 or OS X."
+#~ msgstr ""
+#~ "MacOS 9 と OS X の両方をインストールする予定でしたら、OS 9 と OS X にはそ"
+#~ "れぞれ別々のパーティションを作るのが良いでしょう。両者を同じパーティション"
+#~ "にインストールすると、起動 OS を選ぶために <application>Startup Disk</"
+#~ "application> が (再起動時にも) 必要になります。この両者の選択は、起動時に"
+#~ "は行えないのです。別々のパーティションにしておけば、起動時に "
+#~ "<keycap>option</keycap> キーを押しておけば、OS 9 と OS X 共に、別々の選択"
+#~ "肢が現れます。また <application>yaboot</application> のブートメニューに"
+#~ "も、同じように別々の選択肢をインストールできます。Startup Disk はマウント"
+#~ "可能なパーティションをすべていじってしまう [訳注: 原文 de-bless] ので、"
+#~ "GNU/Linux の起動が影響されることがあります。OS 9、OS X の各パーティション"
+#~ "は、それぞれどちらの OS からもアクセスできます。"
+
+#~ msgid ""
 #~ "Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; "
 #~ "CD users can boot from one of the CDs)."
 #~ msgstr ""
diff --git a/po/ko/preparing.po b/po/ko/preparing.po
index 2e7c6bb0e..fcf325d6e 100644
--- a/po/ko/preparing.po
+++ b/po/ko/preparing.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+0000\n"
 "PO-Revision-Date: 2013-01-27 05:58+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -1298,17 +1298,27 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:855
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you already have an operating system on your system <phrase arch=\"any-"
+#| "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
+#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
+#| "OS/390, &hellip;) </phrase> which uses the whole disk and you want to "
+#| "stick &debian; on the same disk, you will need to repartition it. "
+#| "&debian; requires its own hard disk partitions. It cannot be installed on "
+#| "Windows or MacOS partitions. It may be able to share some partitions with "
+#| "other Unix systems, but that's not covered here. At the very least you "
+#| "will need a dedicated partition for the &debian; root filesystem."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
 "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 "시스템에 이미 다른 운영 체제<phrase arch=\"any-x86\">(Windows 9x, Windows "
 "NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;)</"
@@ -1321,15 +1331,23 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can find information about your current partition setup by using a "
+#| "partitioning tool for your current operating system<phrase arch=\"any-"
+#| "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
+#| "phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
+#| "MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
+#| "Partitioning tools always provide a way to show existing partitions "
+#| "without making changes."
 msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 "현재 파티션 상태 정보는 현재 운영 체제의 파티션 프로그램을 이용해 알 수 있습"
 "니다. <phrase arch=\"any-x86\">윈도우의 내장 디스크 관리자 또는 DOS의 fdisk</"
@@ -1446,11 +1464,21 @@ msgstr ""
 # &debian-gnu; => 데비안 GNU/리눅스, 조사 사용 주의
 #. Tag: para
 #: preparing.xml:943
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
+#| "parttype; partitions should appear before all other partitions on the "
+#| "disk, especially MacOS boot partitions. This should be kept in mind when "
+#| "pre-partitioning; you should create a &arch-parttype; placeholder "
+#| "partition to come <emphasis>before</emphasis> the other bootable "
+#| "partitions on the disk. (The small partitions dedicated to Apple disk "
+#| "drivers are not bootable.) You can delete the placeholder with the "
+#| "&debian; partition tools later during the actual install, and replace it "
+#| "with &arch-parttype; partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1531,19 +1559,25 @@ msgstr ""
 
 #. Tag: title
 #: preparing.xml:1062
-#, no-c-format
-msgid "MacOS/OSX Partitioning"
+#, fuzzy, no-c-format
+#| msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr "맥오에스/맥오에스X 파티션하기"
 
 #. Tag: para
 #: preparing.xml:1064
-#, no-c-format
-msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The <application>Apple Drive Setup</application> application can be found "
+#| "in the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#| "adjust existing partitions; it is limited to partitioning the entire disk "
+#| "at once. The disk driver partitions don't show up in <application>Drive "
+#| "Setup</application>."
+msgid ""
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 "맥오에스 CD의 <filename>Utilities</filename> 폴더에 <application>Apple Drive "
 "Setup</application> 애플리케이션이 있습니다. 이 프로그램은 기존 파티션을 조정"
@@ -1551,7 +1585,7 @@ msgstr ""
 "이버 파티션은 <application>Drive Setup</application>에 나타나지 않습니다."
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1564,40 +1598,34 @@ msgstr ""
 "다."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
-"맥오에스 9과 OS X을 모두 설치하려는 경우, OS 9과 OS X에 별도의 파티션을 만드"
-"는 게 가장 좋습니다. 같은 파티션에 설치하는 경우 <application>Startup Disk</"
-"application>를 이용해서 두 가지 중에서 하나를 선택해야 합니다(그리고 다시 부"
-"팅). 부팅할 때는 두 시스템 사이에 하나를 선택할 수 없습니다. 별도의 파티션을 "
-"이용하면, <keycap>option</keycap> 키를 부팅할 때 누르고 있으면 OS 9과 OS X 중"
-"의 하나를 선택할 수 있습니다. 또 <application>yaboot</application> 부팅 메뉴"
-"에서도 별도 옵션을 만들 수 있습니다. 게다가 Startup Disk는 다른 마운트 가능 "
-"파티션을 없애 버리기 때문에, GNU/리눅스가 부팅하는 데 문제가 생깁니다. OS 9"
-"과 OS X 파티션은 OS 9과 OS X 모두에서 접근할 수 있습니다."
 
 #. Tag: para
-#: preparing.xml:1090
-#, no-c-format
+#: preparing.xml:1086
+#, fuzzy, no-c-format
+#| msgid ""
+#| "GNU/Linux is unable to access information on UFS partitions, but does "
+#| "support HFS+ (aka MacOS Extended) partitions. OS X requires one of these "
+#| "two types for its boot partition. MacOS 9 can be installed on either HFS "
+#| "(aka MacOS Standard) or HFS+. To share information between the MacOS and "
+#| "GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS "
+#| "FAT partitions are supported by both MacOS and Linux."
 msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 "GNU/리눅스는 UFS 파티션에 있는 정보에 접근할 수 없습니다, 그러나 HFS+(다른 말"
 "로 MacOS Extended) 파일 시스템은 지원합니다. OS X은 부팅 파티션에 이 두가지 "
@@ -1607,13 +1635,13 @@ msgstr ""
 "다. HFS, HFS+와 MS-DOS FAT 파티션은 맥오에스와 리눅스 모두에서 지원합니다."
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "설치하기 전에 할 하드웨어 및 운영 체제 설정"
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1630,13 +1658,13 @@ msgstr ""
 "되는 가장 중요한 소프트웨어입니다."
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "BIOS 설정 메뉴 들어가기"
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, no-c-format
 msgid ""
 "The BIOS provides the basic functions needed to boot your machine and to "
@@ -1656,13 +1684,13 @@ msgstr ""
 "퓨터 부팅할 때 어떤 키를 눌러야 설정 메뉴로 들어가는지 메시지를 표시합니다."
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "부팅 장치 선택"
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1677,7 +1705,7 @@ msgstr ""
 "를 통해 네트워크 부팅을 할 수도 있습니다."
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1688,7 +1716,7 @@ msgstr ""
 "를 사용할 수 있게 설정해야 할 수도 있습니다. (이미 설정되어 있지 않다면.)"
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1712,7 +1740,7 @@ msgstr ""
 "모리에서 한 번 부팅할 수 있습니다."
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1723,7 +1751,7 @@ msgstr ""
 "을 바꿔서 &d-i;가 부팅할 장치를 기본 부팅 장치로 만들어야 합니다."
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1750,7 +1778,7 @@ msgstr ""
 "지 않는 USB 메모리가 부팅할 수도 있습니다..</phrase>"
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1761,13 +1789,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "OpenFirmware 실행"
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1782,7 +1810,7 @@ msgstr ""
 "셔야 합니다."
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1800,7 +1828,7 @@ msgstr ""
 "하십시오."
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1823,7 +1851,7 @@ msgstr ""
 "를 쓸 수 있습니다."
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1844,13 +1872,13 @@ msgstr ""
 "를 눌러 펌웨어 패치를 nvram에 설치하십시오."
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "OpenBoot 실행"
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1865,7 +1893,7 @@ msgstr ""
 "지 일을 할 수 있습니다."
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1885,7 +1913,7 @@ msgstr ""
 "가 나옵니다."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1899,7 +1927,7 @@ msgstr ""
 "미널 에뮬레이터의 문서를 참고하십시오."
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1918,7 +1946,7 @@ msgstr ""
 "Reference</ulink>에서 볼 수 있습니다."
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1959,7 +1987,7 @@ msgstr ""
 "openboot;\">Sun OpenBoot Reference</ulink>를 참고하십시오."
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -1988,20 +2016,20 @@ msgstr ""
 "</screen></informalexample> 그리고 Solaris에서는:"
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOS 설정"
 
 # &debian-gnu; => 데비안 GNU/리눅스, 조사 사용 주의
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2022,7 +2050,7 @@ msgstr ""
 "3215/3270 콘솔은 문자 단위가 아니라 라인 단위입니다."
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2041,7 +2069,7 @@ msgstr ""
 "있는 경우.)"
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2064,13 +2092,13 @@ msgstr ""
 "&debian; 설치 단계를 진행하십시오."
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "네이티브 및 LPAR 설치"
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2086,13 +2114,13 @@ msgstr ""
 "드북의 3.2장을 참고하십시오."
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "VM guest로 설치"
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2108,7 +2136,7 @@ msgstr ""
 "Distributions</ulink> 레드북의 3.1장을 참고하십시오."
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2129,13 +2157,13 @@ msgstr ""
 "filename> 예제 스크립트가 이미지에 포함되어 있습니다."
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "설치 서버 준비하기"
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2148,7 +2176,7 @@ msgstr ""
 "들어 있고 그 패키지를 NFS나 HTTP나 FTP로 외부에서 접근할 수 있게 합니다."
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2161,25 +2189,25 @@ msgstr ""
 "설치 CD의 내용만 복사해 올 수도 있습니다."
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: more information needed &mdash; from a Redbook?"
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "주의해야 할 하드웨어 문제"
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "USB BIOS 지원 및 키보드"
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, no-c-format
 msgid ""
 "If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -2197,13 +2225,13 @@ msgstr ""
 "아 보십시오."
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "올드월드 파워맥에서 화면이 안 보이는 문제"
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2222,3 +2250,27 @@ msgstr ""
 "있습니다), 아니면 사용자 인터페이스가 나오기 전에 화면이 검은색으로 변하는 경"
 "우, 맥오에스에서 디스플레이 설정을 <quote>thousands</quote>나 "
 "<quote>millions</quote> 대신에 256색으로 맞추십시오."
+
+#~ msgid ""
+#~ "If you are planning to install both MacOS 9 and OS X, it is best to "
+#~ "create separate partitions for OS 9 and OS X. If they are installed on "
+#~ "the same partition, <application>Startup Disk</application> (and reboot) "
+#~ "must be used to select between the two; the choice between the two "
+#~ "systems can't be made at boot time. With separate partitions, separate "
+#~ "options for OS 9 and OS X will appear when holding the <keycap>option</"
+#~ "keycap> key at boot time, and separate options can be installed in the "
+#~ "<application>yaboot</application> boot menu as well. Also, Startup Disk "
+#~ "will de-bless all other mountable partitions, which can affect GNU/Linux "
+#~ "booting. Both OS 9 and OS X partitions will be accessible from either OS "
+#~ "9 or OS X."
+#~ msgstr ""
+#~ "맥오에스 9과 OS X을 모두 설치하려는 경우, OS 9과 OS X에 별도의 파티션을 만"
+#~ "드는 게 가장 좋습니다. 같은 파티션에 설치하는 경우 <application>Startup "
+#~ "Disk</application>를 이용해서 두 가지 중에서 하나를 선택해야 합니다(그리"
+#~ "고 다시 부팅). 부팅할 때는 두 시스템 사이에 하나를 선택할 수 없습니다. 별"
+#~ "도의 파티션을 이용하면, <keycap>option</keycap> 키를 부팅할 때 누르고 있으"
+#~ "면 OS 9과 OS X 중의 하나를 선택할 수 있습니다. 또 <application>yaboot</"
+#~ "application> 부팅 메뉴에서도 별도 옵션을 만들 수 있습니다. 게다가 Startup "
+#~ "Disk는 다른 마운트 가능 파티션을 없애 버리기 때문에, GNU/리눅스가 부팅하"
+#~ "는 데 문제가 생깁니다. OS 9과 OS X 파티션은 OS 9과 OS X 모두에서 접근할 "
+#~ "수 있습니다."
diff --git a/po/nl/preparing.po b/po/nl/preparing.po
index 3559f43db..1586b0f3e 100644
--- a/po/nl/preparing.po
+++ b/po/nl/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+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"
@@ -1094,10 +1094,10 @@ msgid ""
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 
 #. Tag: para
@@ -1107,10 +1107,10 @@ msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 
 #. Tag: para
@@ -1195,7 +1195,7 @@ msgstr ""
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1255,22 +1255,21 @@ msgstr ""
 #. Tag: title
 #: preparing.xml:1062
 #, no-c-format
-msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr ""
 
 #. Tag: para
 #: preparing.xml:1064
 #, no-c-format
 msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1279,41 +1278,37 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1090
+#: preparing.xml:1086
 #, no-c-format
 msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1325,13 +1320,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, no-c-format
 msgid ""
 "The BIOS provides the basic functions needed to boot your machine and to "
@@ -1345,13 +1340,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1362,7 +1357,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1371,7 +1366,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1387,7 +1382,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1396,7 +1391,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1413,7 +1408,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1424,13 +1419,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1441,7 +1436,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1453,7 +1448,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1468,7 +1463,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1482,13 +1477,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1499,7 +1494,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1512,7 +1507,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1522,7 +1517,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1535,7 +1530,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1559,7 +1554,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -1577,19 +1572,19 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -1604,7 +1599,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -1617,7 +1612,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -1633,13 +1628,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1650,13 +1645,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1667,7 +1662,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -1681,13 +1676,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -1697,7 +1692,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -1707,25 +1702,25 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, no-c-format
 msgid ""
 "If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -1737,13 +1732,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
diff --git a/po/nn/preparing.po b/po/nn/preparing.po
index 3559f43db..1586b0f3e 100644
--- a/po/nn/preparing.po
+++ b/po/nn/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+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"
@@ -1094,10 +1094,10 @@ msgid ""
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 
 #. Tag: para
@@ -1107,10 +1107,10 @@ msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 
 #. Tag: para
@@ -1195,7 +1195,7 @@ msgstr ""
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1255,22 +1255,21 @@ msgstr ""
 #. Tag: title
 #: preparing.xml:1062
 #, no-c-format
-msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr ""
 
 #. Tag: para
 #: preparing.xml:1064
 #, no-c-format
 msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1279,41 +1278,37 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1090
+#: preparing.xml:1086
 #, no-c-format
 msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1325,13 +1320,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, no-c-format
 msgid ""
 "The BIOS provides the basic functions needed to boot your machine and to "
@@ -1345,13 +1340,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1362,7 +1357,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1371,7 +1366,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1387,7 +1382,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1396,7 +1391,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1413,7 +1408,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1424,13 +1419,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1441,7 +1436,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1453,7 +1448,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1468,7 +1463,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1482,13 +1477,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1499,7 +1494,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1512,7 +1507,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1522,7 +1517,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1535,7 +1530,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1559,7 +1554,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -1577,19 +1572,19 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -1604,7 +1599,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -1617,7 +1612,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -1633,13 +1628,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1650,13 +1645,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1667,7 +1662,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -1681,13 +1676,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -1697,7 +1692,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -1707,25 +1702,25 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, no-c-format
 msgid ""
 "If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -1737,13 +1732,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
diff --git a/po/pot/preparing.pot b/po/pot/preparing.pot
index 4dd014c96..cfc941b1e 100644
--- a/po/pot/preparing.pot
+++ b/po/pot/preparing.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: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+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"
@@ -839,13 +839,13 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:855
 #, no-c-format
-msgid "If you already have an operating system on your system <phrase arch=\"any-x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> which uses the whole disk and you want to stick &debian; on the same disk, you will need to repartition it. &debian; requires its own hard disk partitions. It cannot be installed on Windows or MacOS partitions. It may be able to share some partitions with other Unix systems, but that's not covered here. At the very least you will need a dedicated partition for the &debian; root filesystem."
+msgid "If you already have an operating system on your system <phrase arch=\"any-x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> which uses the whole disk and you want to stick &debian; on the same disk, you will need to repartition it. &debian; requires its own hard disk partitions. It cannot be installed on Windows or Mac OS X partitions. It may be able to share some partitions with other Unix systems, but that's not covered here. At the very least you will need a dedicated partition for the &debian; root filesystem."
 msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
 #, no-c-format
-msgid "You can find information about your current partition setup by using a partitioning tool for your current operating system<phrase arch=\"any-x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. Partitioning tools always provide a way to show existing partitions without making changes."
+msgid "You can find information about your current partition setup by using a partitioning tool for your current operating system<phrase arch=\"any-x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. Partitioning tools always provide a way to show existing partitions without making changes."
 msgstr ""
 
 #. Tag: para
@@ -893,7 +893,7 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:943
 #, no-c-format
-msgid "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-parttype; partitions should appear before all other partitions on the disk, especially MacOS boot partitions. This should be kept in mind when pre-partitioning; you should create a &arch-parttype; placeholder partition to come <emphasis>before</emphasis> the other bootable partitions on the disk. (The small partitions dedicated to Apple disk drivers are not bootable.) You can delete the placeholder with the &debian; partition tools later during the actual install, and replace it with &arch-parttype; partitions."
+msgid "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-parttype; partitions should appear before all other partitions on the disk, especially Mac OS X boot partitions. This should be kept in mind when pre-partitioning; you should create a &arch-parttype; placeholder partition to come <emphasis>before</emphasis> the other bootable partitions on the disk. (The small partitions dedicated to Apple disk drivers are not bootable.) You can delete the placeholder with the &debian; partition tools later during the actual install, and replace it with &arch-parttype; partitions."
 msgstr ""
 
 #. Tag: title
@@ -929,119 +929,119 @@ msgstr ""
 #. Tag: title
 #: preparing.xml:1062
 #, no-c-format
-msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr ""
 
 #. Tag: para
 #: preparing.xml:1064
 #, no-c-format
-msgid "The <application>Apple Drive Setup</application> application can be found in the <filename>Utilities</filename> folder on the MacOS CD. It will not adjust existing partitions; it is limited to partitioning the entire disk at once. The disk driver partitions don't show up in <application>Drive Setup</application>."
+msgid "The <application>Disk Utility</application> application can be found under the <filename>Utilities</filename> menu in Mac OS X Installer. It will not adjust existing partitions; it is limited to partitioning the entire disk at once."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid "Remember to create a placeholder partition for GNU/Linux, preferably positioned first in the disk layout. it doesn't matter what type it is, it will be deleted and replaced later inside the &debian-gnu; installer."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
-msgid "If you are planning to install both MacOS 9 and OS X, it is best to create separate partitions for OS 9 and OS X. If they are installed on the same partition, <application>Startup Disk</application> (and reboot) must be used to select between the two; the choice between the two systems can't be made at boot time. With separate partitions, separate options for OS 9 and OS X will appear when holding the <keycap>option</keycap> key at boot time, and separate options can be installed in the <application>yaboot</application> boot menu as well. Also, Startup Disk will de-bless all other mountable partitions, which can affect GNU/Linux booting. Both OS 9 and OS X partitions will be accessible from either OS 9 or OS X."
+msgid "&debian; installer partition table editing tools are compatible with OS X, but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a separate hard drive. Separate options for OS 9 and OS X will appear when holding the <keycap>option</keycap> key at boot time, and separate options can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1090
+#: preparing.xml:1086
 #, no-c-format
-msgid "GNU/Linux is unable to access information on UFS partitions, but does support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS Standard) or HFS+. To share information between the MacOS and GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT partitions are supported by both MacOS and Linux."
+msgid "GNU/Linux is unable to access information on UFS partitions, but can access HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS Standard) or HFS+. To share information between the Mac OS X and GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, no-c-format
 msgid "This section will walk you through pre-installation hardware setup, if any, that you will need to do prior to installing &debian;. Generally, this involves checking and possibly changing BIOS/system firmware settings for your system. The <quote>BIOS</quote> or <quote>system firmware</quote> is the core software used by the hardware; it is most critically invoked during the bootstrap process (after power-up)."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, no-c-format
 msgid "The BIOS provides the basic functions needed to boot your machine and to allow your operating system to access your hardware. Your system provides a BIOS setup menu, which is used to configure the BIOS. To enter the BIOS setup menu you have to press a key or key combination after turning on the computer. Often it is the <keycap>Delete</keycap> or the <keycap>F2</keycap> key, but some manufacturers use other keys. Usually upon starting the computer there will be a message stating which key to press to enter the setup screen."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid "Within the BIOS setup menu, you can select which devices shall be checked in which sequence for a bootable operating system. Possible choices usually include the internal harddisks, the CD/DVD-ROM drive and USB mass storage devices such as USB sticks or external USB harddisks. On modern systems there is also often a possibility to enable network booting via PXE."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid "Depending on the installation media (CD/DVD ROM, USB stick, network boot) you have chosen you should enable the appropriate boot devices if they are not already enabled."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid "Most BIOS versions allow to call up a boot menu on system startup in which you select from which device the computer should start for the current session. If this option is available, the BIOS usually displays a short message like <quote>press <keycap>F12</keycap> for boot menu</quote> on system startup. The actual key used to select this menu varies from system to system; commonly used keys are <keycap>F12</keycap>, <keycap>F11</keycap> and <keycap>F8</keycap>. Choosing a device from this menu does not change the default boot order of the BIOS, i.e. you can start once from a USB stick while having configured the internal harddisk as the normal primary boot device."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid "If your BIOS does not provide you with a boot menu to do ad-hoc choices of the current boot device, you have to change your BIOS setup to make the device from which the &d-i; shall be booted the primary boot device."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from a USB stick might not work even if there is an appropriate option in the BIOS setup menu and the stick is selected as the primary boot device. On some of these systems using a USB stick as boot medium is impossible; others can be tricked into booting from the stick by changing the device type in the BIOS setup from the default <quote>USB harddisk</quote> or <quote>USB stick</quote> to <quote>USB ZIP</quote> or <quote>USB CDROM</quote>. <phrase condition=\"isohybrid-supported\"> In particular if you use an isohybrid CD/DVD image on a USB stick (see <xref linkend=\"usb-copy-isohybrid\"/>), changing the device type to <quote>USB CDROM</quote> helps on some BIOSes which will not boot from a USB stick in USB harddisk mode.</phrase>"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid "If you cannot manipulate the BIOS to boot directly from a USB stick you still have the option of using an ISO copied to the stick. Boot &d-i; using <xref linkend=\"boot-drive-files\"/> and, after scanning the hard drives for an installer ISO image, select the USB device and choose an installation image."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-title; systems. PReP and CHRP are equipped with OpenFirmware, but unfortunately, the means you use to invoke it vary from manufacturer to manufacturer. You'll have to consult the hardware documentation which came with your machine."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid "On &arch-title; Macintoshes, you invoke OpenFirmware with <keycombo><keycap>Command (cloverleaf/Apple)</keycap><keycap>Option</keycap><keycap>o</keycap><keycap>f</keycap></keycombo> while booting. Generally it will check for these keystrokes after the chime, but the exact timing varies from model to model. See <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> for more hints."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
       "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1051,43 +1051,43 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, is broken. These machines will most likely not be able to boot from the hard drive unless the firmware is patched. A firmware 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</guibutton> button to have the firmware patches installed to nvram."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid "OpenBoot provides the basic functions needed to boot the &arch-title; architecture. This is rather similar in function to the BIOS in the x86 architecture, although much nicer. The Sun boot PROMs have a built-in forth interpreter which lets you do quite a number of things with your machine, such as diagnostics and simple scripts."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> key (on older type 4 keyboards, use the <keycap>L1</keycap> key, if you have a PC keyboard adapter, use the <keycap>Break</keycap> key) and press the <keycap>A</keycap> key. The boot PROM will give you a prompt, either <userinput>ok</userinput> or <userinput>&gt;</userinput>. It is preferred to have the <userinput>ok</userinput> prompt. So if you get the old style prompt, hit the <keycap>n</keycap> key to get the new style prompt."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid "If you are using a serial console, send a break to the machine. With Minicom, use <keycap>Ctrl-A F</keycap>, with cu, hit <keycap>Enter</keycap>, then type <userinput>%~break</userinput>. Consult the documentation of your terminal emulator if you are using a different program."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid "You can use OpenBoot to boot from specific devices, and also to change your default boot device. However, you need to know some details about how OpenBoot names devices; it's considerably different from Linux device naming, described in <xref linkend=\"device-names\"/>. Also, the command will vary a bit, depending on what version of OpenBoot you have. More information about OpenBoot can be found in the <ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
       "Typically, with newer revisions, you can use OpenBoot devices such as <quote>floppy</quote>, <quote>cdrom</quote>, <quote>net</quote>, <quote>disk</quote>, or <quote>disk2</quote>. These have the obvious meanings; the <quote>net</quote> device is for booting from the network. Additionally, the device name can specify a particular partition of a disk, such as <quote>disk2:a</quote> to boot disk2, first partition. Full OpenBoot device names have the form: <informalexample> <screen>\n"
@@ -1098,7 +1098,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
       "To boot from a specific device, use the command <userinput>boot <replaceable>device</replaceable></userinput>. You can set this behavior as the default using the <userinput>setenv</userinput> command. However, the name of the variable to set changed between OpenBoot revisions. In OpenBoot 1.x, use the command <userinput>setenv boot-from <replaceable>device</replaceable></userinput>. In later revisions of OpenBoot, use the command <userinput>setenv boot-device <replaceable>device</replaceable></userinput>. Note, this is also configurable using the <command>eeprom</command> command on Solaris, or modifying the appropriate files in <filename>/proc/openprom/options/</filename>, for example under Linux: <informalexample><screen>\n"
@@ -1107,115 +1107,115 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid "In order to install &debian-gnu; on a &arch-title; or zSeries machine you have first boot a kernel into the system. The boot mechanism of this platform is inherently different to other ones, especially from PC-like systems: there are no floppy devices available at all. You will notice another big difference while you work with this platform: most (if not all) of the time you will work remote, with the help of some client session software like telnet, or a browser. This is due to that special system architecture where the 3215/3270 console is line-based instead of character-based."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid "Linux on this platform runs either natively on the bare machine, in a so-called LPAR (Logical Partition) or in a virtual machine supplied by the VM system. You can use a boot tape on all of those systems; you may use some other boot media, too, but those may not be generally available. For example, you can use the virtual card reader of a virtual machine, or boot from the HMC (Hardware Management Console) of an LPAR if the HMC and this option is available for you."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid "Before you actually perform an installation, you have to go over some design and preparation steps. IBM has made documentation available about the whole process, e.g. how to prepare an installation medium and how actually to boot from that medium. Duplicating that information here is neither possible nor necessary. However, we will describe here which kind of &debian;-specific data is needed and where to find it. Using both sources of information, you have to prepare your machine and the installation medium before you can perform a boot from it. When you see the welcome message in your client session, return to this document to go through the &debian;-specific installation steps."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg244987.pdf\"> Linux for &arch-title;</ulink> Redbook and chapter 3.2 of the <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and &arch-title;: Distributions</ulink> Redbook on how to set up an LPAR for Linux."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg244987.pdf\"> Linux for &arch-title;</ulink> Redbook and chapter 3.1 of the <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and &arch-title;: Distributions</ulink> Redbook on how to set up a VM guest for running Linux."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid "You need to copy all the files from the <filename>generic</filename> sub-directory to your CMS disk. Be sure to transfer <filename>kernel.debian</filename> and <filename>initrd.debian</filename> in binary mode with a fixed record length of 80 characters (by specifying <userinput>BINARY</userinput> and <userinput>LOCSITE FIX 80</userinput> in your FTP client). <filename>parmfile.debian</filename> can be in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> script, which will punch the files in the proper order, is included with the images."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid "If you don't have a connection to the Internet (either directly or via a web proxy) you need to create a local installation server that can be accessed from your S/390. This server keeps all the packages you want to install and must make them available using NFS, HTTP or FTP."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid "The installation server needs to copy the exact directory structure from any &debian-gnu; mirror, but only the s390 and architecture-independent files are required. You can also copy the contents of all installation CDs into such a directory tree."
 msgstr ""
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, no-c-format
 msgid "If you have no PS/2-style keyboard, but only a USB model, on some very old PCs you may need to enable legacy keyboard emulation in your BIOS setup to be able to use your keyboard in the bootloader menu, but this is not an issue for modern systems. If your keyboard does not work in the bootloader menu, consult your mainboard manual and look in the BIOS for <quote>Legacy keyboard emulation</quote> or <quote>USB keyboard support</quote> options."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid "Some OldWorld Powermacs, most notably those with the <quote>control</quote> display driver, may not reliably produce a colormap under Linux when the display is configured for more than 256 colors. If you are experiencing such issues with your display after rebooting (you can sometimes see data on the monitor, but on other occasions cannot see anything) or, if the screen turns black after booting the installer instead of showing you the user interface, try changing your display settings under MacOS to use 256 colors instead of <quote>thousands</quote> or <quote>millions</quote>."
 msgstr ""
diff --git a/po/pt/preparing.po b/po/pt/preparing.po
index db09c45f6..316e0ab34 100644
--- a/po/pt/preparing.po
+++ b/po/pt/preparing.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+0000\n"
 "PO-Revision-Date: 2013-02-03 09:26+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <kde-i18n-doc@kde.org>\n"
@@ -1363,17 +1363,27 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:855
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you already have an operating system on your system <phrase arch=\"any-"
+#| "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
+#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
+#| "OS/390, &hellip;) </phrase> which uses the whole disk and you want to "
+#| "stick &debian; on the same disk, you will need to repartition it. "
+#| "&debian; requires its own hard disk partitions. It cannot be installed on "
+#| "Windows or MacOS partitions. It may be able to share some partitions with "
+#| "other Unix systems, but that's not covered here. At the very least you "
+#| "will need a dedicated partition for the &debian; root filesystem."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
 "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 "Se já possuir um sistema operativo no seu sistema <phrase arch=\"any-x86\"> "
 "(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
@@ -1387,15 +1397,23 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can find information about your current partition setup by using a "
+#| "partitioning tool for your current operating system<phrase arch=\"any-"
+#| "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
+#| "phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
+#| "MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
+#| "Partitioning tools always provide a way to show existing partitions "
+#| "without making changes."
 msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 "Poderá encontrar informação acerca da sua configuração actual de partições "
 "utilizando uma ferramenta de particionamento para o seu  sistema operativo "
@@ -1519,11 +1537,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:943
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
+#| "parttype; partitions should appear before all other partitions on the "
+#| "disk, especially MacOS boot partitions. This should be kept in mind when "
+#| "pre-partitioning; you should create a &arch-parttype; placeholder "
+#| "partition to come <emphasis>before</emphasis> the other bootable "
+#| "partitions on the disk. (The small partitions dedicated to Apple disk "
+#| "drivers are not bootable.) You can delete the placeholder with the "
+#| "&debian; partition tools later during the actual install, and replace it "
+#| "with &arch-parttype; partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1610,19 +1638,25 @@ msgstr ""
 
 #. Tag: title
 #: preparing.xml:1062
-#, no-c-format
-msgid "MacOS/OSX Partitioning"
+#, fuzzy, no-c-format
+#| msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr "Particionar com MacOS/OSX"
 
 #. Tag: para
 #: preparing.xml:1064
-#, no-c-format
-msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The <application>Apple Drive Setup</application> application can be found "
+#| "in the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#| "adjust existing partitions; it is limited to partitioning the entire disk "
+#| "at once. The disk driver partitions don't show up in <application>Drive "
+#| "Setup</application>."
+msgid ""
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 "A aplicação <application>Apple Drive Setup</application> pode ser encontrada "
 "na pasta <filename>Utilities</filename> no CD de MacOS. Não irá ajustar as "
@@ -1631,7 +1665,7 @@ msgstr ""
 "application>."
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1644,42 +1678,34 @@ msgstr ""
 "&debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
-"Se está a planear instalar ambos MacOS 9 e OS X, o melhor é criar partições "
-"separadas para o OS 9 e OS X. Se estiverem instalados na mesma partição, "
-"deve ser utilizado o <application>Startup Disk</application> (e reiniciar) "
-"para escolher entre os dois; a escolha entre os dois sistemas não pode ser "
-"feita durante o arranque. Com partições separadas, aparecerão opções em "
-"separado para OS 9 e OS X quando pressionar a tecla <keycap>option</keycap> "
-"durante o arranque, e opções em separado também podem ser instaladas no menu "
-"de arranque de <application>yaboot</application>. Além disso, o Startup Disk "
-"irá tirar a bênção a outras partições que possam ser montadas, o que pode "
-"afectar o arranque de GNU/Linux. As partições de ambos OS 9 e OS X serão "
-"acessíveis quer a partir de OS 9 ou de OS X."
 
 #. Tag: para
-#: preparing.xml:1090
-#, no-c-format
+#: preparing.xml:1086
+#, fuzzy, no-c-format
+#| msgid ""
+#| "GNU/Linux is unable to access information on UFS partitions, but does "
+#| "support HFS+ (aka MacOS Extended) partitions. OS X requires one of these "
+#| "two types for its boot partition. MacOS 9 can be installed on either HFS "
+#| "(aka MacOS Standard) or HFS+. To share information between the MacOS and "
+#| "GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS "
+#| "FAT partitions are supported by both MacOS and Linux."
 msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 "GNU/Linux não consegue aceder à informação em partições UFS, mas suporta "
 "partições HFS+ (aka MacOS Extended). O OS X precisa de um destes dois tipos "
@@ -1689,13 +1715,13 @@ msgstr ""
 "e MS-DOS FAT são suportadas por ambos MacOS e Linux."
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "Pré-Instalação do Hardware e Configuração do Sistema Operativo"
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1713,13 +1739,13 @@ msgstr ""
 "mais crítico invocado durante o processo de arranque (depois de o ligar)."
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "Invocar o Menu de Configuração da BIOS"
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, no-c-format
 msgid ""
 "The BIOS provides the basic functions needed to boot your machine and to "
@@ -1743,13 +1769,13 @@ msgstr ""
 
 # index.docbook:1522, index.docbook:1865
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Selecção de Dispositivo Para Arranque"
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1766,7 +1792,7 @@ msgstr ""
 "activar o arranque pela rede através de PXE."
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1778,7 +1804,7 @@ msgstr ""
 "não estiverem activados."
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1804,7 +1830,7 @@ msgstr ""
 "rígido interno configurado para o arranque normal."
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1817,7 +1843,7 @@ msgstr ""
 "como dispositivo primário de arranque."
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1847,7 +1873,7 @@ msgstr ""
 "phrase>"
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1863,13 +1889,13 @@ msgstr ""
 "dispositivo USB e seleccione a imagem de instalação."
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "Invocar OpenFirmware"
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1885,7 +1911,7 @@ msgstr ""
 "documentação do hardware que veio com o a sua máquina."
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1903,7 +1929,7 @@ msgstr ""
 "\"&url-netbsd-powerpc-faq;\"></ulink>."
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1928,7 +1954,7 @@ msgstr ""
 "noutro computador, ligado à parta do modem."
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1951,13 +1977,13 @@ msgstr ""
 "nvram."
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "Invocar o OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1973,7 +1999,7 @@ msgstr ""
 "máquina, tais como diagnósticos e scripts simples."
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1994,7 +2020,7 @@ msgstr ""
 "carregue na tecla <keycap>n</keycap> para obter a nova linha de comandos."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2009,7 +2035,7 @@ msgstr ""
 "programa diferente."
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2030,7 +2056,7 @@ msgstr ""
 "<ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2073,7 +2099,7 @@ msgstr ""
 "<ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2104,19 +2130,19 @@ msgstr ""
 "</screen></informalexample> e em Solaris:"
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "Configuração da BIOS"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2140,7 +2166,7 @@ msgstr ""
 "linhas em vez de baseada em caracteres."
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2161,7 +2187,7 @@ msgstr ""
 "para si."
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2187,13 +2213,13 @@ msgstr ""
 "percorrer as etapas de instalação específicas de &debian;."
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Instalações Nativas e por LPAR"
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2209,13 +2235,13 @@ msgstr ""
 "Distributions</ulink> Redbook acerca de como definir uma LPAR para Linux."
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Instalação como um VM guest"
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2231,7 +2257,7 @@ msgstr ""
 "Distributions</ulink> Redbook em como definir um VM guest para correr Linux."
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2253,13 +2279,13 @@ msgstr ""
 "como exemplo, o qual irá por os ficheiros na ordem correcta."
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Preparar um servidor de instalação"
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2274,7 +2300,7 @@ msgstr ""
 "FTP."
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2289,25 +2315,25 @@ msgstr ""
 "directórios."
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: mais informação necessária &mdash; de um Redbook?"
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Assuntos de Hardware Para Estar Atento"
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "Suporte USB da BIOS e teclados"
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, no-c-format
 msgid ""
 "If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -2326,13 +2352,13 @@ msgstr ""
 "keyboard support</quote>."
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Visibilidade do ecrã em OldWorld Powermacs"
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2355,6 +2381,32 @@ msgstr ""
 "quote>."
 
 #~ msgid ""
+#~ "If you are planning to install both MacOS 9 and OS X, it is best to "
+#~ "create separate partitions for OS 9 and OS X. If they are installed on "
+#~ "the same partition, <application>Startup Disk</application> (and reboot) "
+#~ "must be used to select between the two; the choice between the two "
+#~ "systems can't be made at boot time. With separate partitions, separate "
+#~ "options for OS 9 and OS X will appear when holding the <keycap>option</"
+#~ "keycap> key at boot time, and separate options can be installed in the "
+#~ "<application>yaboot</application> boot menu as well. Also, Startup Disk "
+#~ "will de-bless all other mountable partitions, which can affect GNU/Linux "
+#~ "booting. Both OS 9 and OS X partitions will be accessible from either OS "
+#~ "9 or OS X."
+#~ msgstr ""
+#~ "Se está a planear instalar ambos MacOS 9 e OS X, o melhor é criar "
+#~ "partições separadas para o OS 9 e OS X. Se estiverem instalados na mesma "
+#~ "partição, deve ser utilizado o <application>Startup Disk</application> (e "
+#~ "reiniciar) para escolher entre os dois; a escolha entre os dois sistemas "
+#~ "não pode ser feita durante o arranque. Com partições separadas, "
+#~ "aparecerão opções em separado para OS 9 e OS X quando pressionar a tecla "
+#~ "<keycap>option</keycap> durante o arranque, e opções em separado também "
+#~ "podem ser instaladas no menu de arranque de <application>yaboot</"
+#~ "application>. Além disso, o Startup Disk irá tirar a bênção a outras "
+#~ "partições que possam ser montadas, o que pode afectar o arranque de GNU/"
+#~ "Linux. As partições de ambos OS 9 e OS X serão acessíveis quer a partir "
+#~ "de OS 9 ou de OS X."
+
+#~ msgid ""
 #~ "Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; "
 #~ "CD users can boot from one of the CDs)."
 #~ msgstr ""
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index ad4a68f22..253c70469 100644
--- a/po/pt/preseed.po
+++ b/po/pt/preseed.po
@@ -1616,69 +1616,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:794
 #, no-c-format
-#| msgid ""
-#| "# Disable network configuration entirely. This is useful for cdrom\n"
-#| "# installations on non-networked devices where the network questions,\n"
-#| "# warning and long timeouts are a nuisance.\n"
-#| "#d-i netcfg/enable boolean false\n"
-#| "\n"
-#| "# netcfg will choose an interface that has link if possible. This makes "
-#| "it\n"
-#| "# skip displaying a list if there is more than one interface.\n"
-#| "d-i netcfg/choose_interface select auto\n"
-#| "\n"
-#| "# To pick a particular interface instead:\n"
-#| "#d-i netcfg/choose_interface select eth1\n"
-#| "\n"
-#| "# To set a different link detection timeout (default is 3 seconds).\n"
-#| "# Values are interpreted as seconds.\n"
-#| "#d-i netcfg/link_detection_timeout string 10\n"
-#| "\n"
-#| "# If you have a slow dhcp server and the installer times out waiting for\n"
-#| "# it, this might be useful.\n"
-#| "#d-i netcfg/dhcp_timeout string 60\n"
-#| "\n"
-#| "# If you prefer to configure the network manually, uncomment this line "
-#| "and\n"
-#| "# the static network configuration below.\n"
-#| "#d-i netcfg/disable_dhcp boolean true\n"
-#| "\n"
-#| "# If you want the preconfiguration file to work on systems both with and\n"
-#| "# without a dhcp server, uncomment these lines and the static network\n"
-#| "# configuration below.\n"
-#| "#d-i netcfg/dhcp_failed note\n"
-#| "#d-i netcfg/dhcp_options select Configure network manually\n"
-#| "\n"
-#| "# Static network configuration.\n"
-#| "#d-i netcfg/get_nameservers string 192.168.1.1\n"
-#| "#d-i netcfg/get_ipaddress string 192.168.1.42\n"
-#| "#d-i netcfg/get_netmask string 255.255.255.0\n"
-#| "#d-i netcfg/get_gateway string 192.168.1.1\n"
-#| "#d-i netcfg/confirm_static boolean true\n"
-#| "\n"
-#| "# Any hostname and domain names assigned from dhcp take precedence over\n"
-#| "# values set here. However, setting the values still prevents the "
-#| "questions\n"
-#| "# from being shown, even if values come from dhcp.\n"
-#| "d-i netcfg/get_hostname string unassigned-hostname\n"
-#| "d-i netcfg/get_domain string unassigned-domain\n"
-#| "\n"
-#| "# If you want to force a hostname, regardless of what either the DHCP\n"
-#| "# server returns or what the reverse DNS entry for the IP is, uncomment\n"
-#| "# and adjust the following line.\n"
-#| "#d-i netcfg/hostname string somehost\n"
-#| "\n"
-#| "# Disable that annoying WEP key dialog.\n"
-#| "d-i netcfg/wireless_wep string\n"
-#| "# The wacky dhcp hostname that some ISPs use as a password of sorts.\n"
-#| "#d-i netcfg/dhcp_hostname string radish\n"
-#| "\n"
-#| "# If non-free firmware is needed for the network or other hardware, you "
-#| "can\n"
-#| "# configure the installer to always try to load it, without prompting. "
-#| "Or\n"
-#| "# change to false to disable asking.\n"
-#| "#d-i hw-detect/load_firmware boolean true"
 msgid ""
 "# Disable network configuration entirely. This is useful for cdrom\n"
 "# installations on non-networked devices where the network questions,\n"
@@ -1791,8 +1728,7 @@ msgstr ""
 "#d-i netcfg/get_nameservers string 192.168.1.1\n"
 "#d-i netcfg/confirm_static boolean true\n"
 "\n"
-"# Exemplo IPv6"
-"#d-i netcfg/get_ipaddress string fc00::2\n"
+"# Exemplo IPv6#d-i netcfg/get_ipaddress string fc00::2\n"
 "#d-i netcfg/get_netmask string ffff:ffff:ffff:ffff::\n"
 "#d-i netcfg/get_gateway string fc00::2\n"
 "#d-i netcfg/get_nameservers string fc00::1\n"
diff --git a/po/ro/preparing.po b/po/ro/preparing.po
index 3559f43db..1586b0f3e 100644
--- a/po/ro/preparing.po
+++ b/po/ro/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+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"
@@ -1094,10 +1094,10 @@ msgid ""
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 
 #. Tag: para
@@ -1107,10 +1107,10 @@ msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 
 #. Tag: para
@@ -1195,7 +1195,7 @@ msgstr ""
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1255,22 +1255,21 @@ msgstr ""
 #. Tag: title
 #: preparing.xml:1062
 #, no-c-format
-msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr ""
 
 #. Tag: para
 #: preparing.xml:1064
 #, no-c-format
 msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1279,41 +1278,37 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1090
+#: preparing.xml:1086
 #, no-c-format
 msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1325,13 +1320,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, no-c-format
 msgid ""
 "The BIOS provides the basic functions needed to boot your machine and to "
@@ -1345,13 +1340,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1362,7 +1357,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1371,7 +1366,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1387,7 +1382,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1396,7 +1391,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1413,7 +1408,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1424,13 +1419,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1441,7 +1436,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1453,7 +1448,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1468,7 +1463,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1482,13 +1477,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1499,7 +1494,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1512,7 +1507,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1522,7 +1517,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1535,7 +1530,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1559,7 +1554,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -1577,19 +1572,19 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -1604,7 +1599,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -1617,7 +1612,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -1633,13 +1628,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1650,13 +1645,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1667,7 +1662,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -1681,13 +1676,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -1697,7 +1692,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -1707,25 +1702,25 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, no-c-format
 msgid ""
 "If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -1737,13 +1732,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
diff --git a/po/ru/preparing.po b/po/ru/preparing.po
index 9963ed36e..3089d6327 100644
--- a/po/ru/preparing.po
+++ b/po/ru/preparing.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+0000\n"
 "PO-Revision-Date: 2012-10-29 12:30+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1361,17 +1361,27 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:855
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you already have an operating system on your system <phrase arch=\"any-"
+#| "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
+#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
+#| "OS/390, &hellip;) </phrase> which uses the whole disk and you want to "
+#| "stick &debian; on the same disk, you will need to repartition it. "
+#| "&debian; requires its own hard disk partitions. It cannot be installed on "
+#| "Windows or MacOS partitions. It may be able to share some partitions with "
+#| "other Unix systems, but that's not covered here. At the very least you "
+#| "will need a dedicated partition for the &debian; root filesystem."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
 "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 "Если у вас на машине уже установлена операционная система <phrase arch="
 "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
@@ -1385,15 +1395,23 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can find information about your current partition setup by using a "
+#| "partitioning tool for your current operating system<phrase arch=\"any-"
+#| "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
+#| "phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
+#| "MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
+#| "Partitioning tools always provide a way to show existing partitions "
+#| "without making changes."
 msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 "Информацию об имеющихся разделах можно получить с помощью инструментов "
 "разметки из установленной операционной системы<phrase arch=\"any-x86\">, "
@@ -1511,11 +1529,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:943
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
+#| "parttype; partitions should appear before all other partitions on the "
+#| "disk, especially MacOS boot partitions. This should be kept in mind when "
+#| "pre-partitioning; you should create a &arch-parttype; placeholder "
+#| "partition to come <emphasis>before</emphasis> the other bootable "
+#| "partitions on the disk. (The small partitions dedicated to Apple disk "
+#| "drivers are not bootable.) You can delete the placeholder with the "
+#| "&debian; partition tools later during the actual install, and replace it "
+#| "with &arch-parttype; partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1602,19 +1630,25 @@ msgstr ""
 
 #. Tag: title
 #: preparing.xml:1062
-#, no-c-format
-msgid "MacOS/OSX Partitioning"
+#, fuzzy, no-c-format
+#| msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr "Разметка MacOS/OSX"
 
 #. Tag: para
 #: preparing.xml:1064
-#, no-c-format
-msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The <application>Apple Drive Setup</application> application can be found "
+#| "in the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#| "adjust existing partitions; it is limited to partitioning the entire disk "
+#| "at once. The disk driver partitions don't show up in <application>Drive "
+#| "Setup</application>."
+msgid ""
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 "Приложение <application>Apple Drive Setup</application> можно найти в папке "
 "<filename>Utilities</filename> компакт-диске MacOS. Оно не работает с "
@@ -1622,7 +1656,7 @@ msgstr ""
 "разметки не показан в <application>Drive Setup</application>."
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1634,41 +1668,34 @@ msgstr ""
 "установки &debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
-"Если вы планируете установить сразу MacOS 9 и OS X, то лучше создать "
-"отдельный раздел для каждой из них. Если они установлены на одном разделе, "
-"то для выбора одной из них нужно воспользоваться <application>Startup Disk</"
-"application> (и перезагрузка); выбор из двух систем нельзя сделать во время "
-"загрузки. В случае отдельных разделов, появятся раздельные пункты для OS 9 и "
-"OS X, если удерживать клавишу <keycap>option</keycap> во время загрузки, и "
-"отдельный пункт можно установить в меню загрузки <application>yaboot</"
-"application>. Также, Startup Disk не показывает все остальные разделы, "
-"которые могут быть смонтированы, влияющие на загрузку GNU/Linux. Оба раздела "
-"OS 9 и OS X доступны и из OS 9 и из OS X."
 
 #. Tag: para
-#: preparing.xml:1090
-#, no-c-format
+#: preparing.xml:1086
+#, fuzzy, no-c-format
+#| msgid ""
+#| "GNU/Linux is unable to access information on UFS partitions, but does "
+#| "support HFS+ (aka MacOS Extended) partitions. OS X requires one of these "
+#| "two types for its boot partition. MacOS 9 can be installed on either HFS "
+#| "(aka MacOS Standard) or HFS+. To share information between the MacOS and "
+#| "GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS "
+#| "FAT partitions are supported by both MacOS and Linux."
 msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 "GNU/Linux недоступна информация с HFS+ (так называемый MacOS Extended) или с "
 "разделов UFS. OS X требует один из этих типов для своего загрузочного "
@@ -1678,14 +1705,14 @@ msgstr ""
 "поддерживаются и MacOS и Linux."
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr ""
 "Настройка аппаратного обеспечения и операционной системы перед установкой"
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1704,13 +1731,13 @@ msgstr ""
 "питания)."
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "Вызов меню настройки BIOS"
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, no-c-format
 msgid ""
 "The BIOS provides the basic functions needed to boot your machine and to "
@@ -1733,13 +1760,13 @@ msgstr ""
 
 # index.docbook:1535, index.docbook:1873
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Выбор загрузочного устройства"
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1755,7 +1782,7 @@ msgstr ""
 "операционные системы также можно загружать по сети с помощью PXE."
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1767,7 +1794,7 @@ msgstr ""
 "не сделано."
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1793,7 +1820,7 @@ msgstr ""
 "встроенный жёсткий диск."
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1805,7 +1832,7 @@ msgstr ""
 "BIOS, сделав устройство, с которого будет запускаться &d-i;, первым в списке."
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1834,7 +1861,7 @@ msgstr ""
 "режиме жёсткого диска USB.</phrase>"
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1845,13 +1872,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "Вход в OpenFirmware"
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1866,7 +1893,7 @@ msgstr ""
 "документации на железо, которая поставляется вместе с машиной."
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1883,7 +1910,7 @@ msgstr ""
 "модели. Подробней смотрите <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink>."
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1907,7 +1934,7 @@ msgstr ""
 "модемный порт и запустить на ней программу терминала."
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1929,13 +1956,13 @@ msgstr ""
 "установить заплатку микропрограммы в nvram."
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "Вызов OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1952,7 +1979,7 @@ msgstr ""
 "д."
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1973,7 +2000,7 @@ msgstr ""
 "чтобы получить приглашение нового типа."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1988,7 +2015,7 @@ msgstr ""
 "терминала."
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2008,7 +2035,7 @@ msgstr ""
 "openboot;\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2051,7 +2078,7 @@ msgstr ""
 "OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2082,19 +2109,19 @@ msgstr ""
 "</screen></informalexample> и в Solaris:"
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "Настройка BIOS"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2117,7 +2144,7 @@ msgstr ""
 "консоли 3215/3270."
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2138,7 +2165,7 @@ msgstr ""
 "аппаратурой)) из LPAR, если HMC и эта опция вам доступны."
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2163,13 +2190,13 @@ msgstr ""
 "для установки &debian;."
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Родная и LPAR установки"
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2185,13 +2212,13 @@ msgstr ""
 "Distributions</ulink> Redbook о том как настроить LPAR для Linux."
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Установка в качестве гостевой виртуальной машины (VM)"
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2208,7 +2235,7 @@ msgstr ""
 "запуска Linux."
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2230,13 +2257,13 @@ msgstr ""
 "в правильном порядке, поставляется вместе с образами."
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Настройка сервера установки"
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2250,7 +2277,7 @@ msgstr ""
 "установить и должен быть доступен через NFS, HTTP или FTP."
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2264,25 +2291,25 @@ msgstr ""
 "CD с таким же деревом каталогов."
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: нужно больше информации из Redbook?"
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Аппаратные проблемы, которых нужно остерегаться"
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "Поддержка USB в BIOS и клавиатуры"
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, no-c-format
 msgid ""
 "If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -2301,13 +2328,13 @@ msgstr ""
 "keyboard support</quote>."
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Изображение на мониторе OldWorld Powermac"
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2329,6 +2356,31 @@ msgstr ""
 "вместо <quote>тысяч</quote> или <quote>миллионов</quote>."
 
 #~ msgid ""
+#~ "If you are planning to install both MacOS 9 and OS X, it is best to "
+#~ "create separate partitions for OS 9 and OS X. If they are installed on "
+#~ "the same partition, <application>Startup Disk</application> (and reboot) "
+#~ "must be used to select between the two; the choice between the two "
+#~ "systems can't be made at boot time. With separate partitions, separate "
+#~ "options for OS 9 and OS X will appear when holding the <keycap>option</"
+#~ "keycap> key at boot time, and separate options can be installed in the "
+#~ "<application>yaboot</application> boot menu as well. Also, Startup Disk "
+#~ "will de-bless all other mountable partitions, which can affect GNU/Linux "
+#~ "booting. Both OS 9 and OS X partitions will be accessible from either OS "
+#~ "9 or OS X."
+#~ msgstr ""
+#~ "Если вы планируете установить сразу MacOS 9 и OS X, то лучше создать "
+#~ "отдельный раздел для каждой из них. Если они установлены на одном "
+#~ "разделе, то для выбора одной из них нужно воспользоваться "
+#~ "<application>Startup Disk</application> (и перезагрузка); выбор из двух "
+#~ "систем нельзя сделать во время загрузки. В случае отдельных разделов, "
+#~ "появятся раздельные пункты для OS 9 и OS X, если удерживать клавишу "
+#~ "<keycap>option</keycap> во время загрузки, и отдельный пункт можно "
+#~ "установить в меню загрузки <application>yaboot</application>. Также, "
+#~ "Startup Disk не показывает все остальные разделы, которые могут быть "
+#~ "смонтированы, влияющие на загрузку GNU/Linux. Оба раздела OS 9 и OS X "
+#~ "доступны и из OS 9 и из OS X."
+
+#~ msgid ""
 #~ "Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; "
 #~ "CD users can boot from one of the CDs)."
 #~ msgstr ""
diff --git a/po/sv/preparing.po b/po/sv/preparing.po
index 2ceb19d0f..8e22ef80f 100644
--- a/po/sv/preparing.po
+++ b/po/sv/preparing.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation guide 20051025 preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+0000\n"
 "PO-Revision-Date: 2012-07-30 18:24+0100\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -1338,10 +1338,10 @@ msgid ""
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 "Om du redan har ett operativsystem på ditt system <phrase arch=\"any-x86\"> "
 "(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
@@ -1366,10 +1366,10 @@ msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 "Du kan hitta information om din aktuella partitionskonfiguration genom att "
 "använda ett partitioneringsverktyg för ditt aktuella operativsystem<phrase "
@@ -1475,11 +1475,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:943
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
+#| "parttype; partitions should appear before all other partitions on the "
+#| "disk, especially MacOS boot partitions. This should be kept in mind when "
+#| "pre-partitioning; you should create a &arch-parttype; placeholder "
+#| "partition to come <emphasis>before</emphasis> the other bootable "
+#| "partitions on the disk. (The small partitions dedicated to Apple disk "
+#| "drivers are not bootable.) You can delete the placeholder with the "
+#| "&debian; partition tools later during the actual install, and replace it "
+#| "with &arch-parttype; partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1566,19 +1576,25 @@ msgstr ""
 
 #. Tag: title
 #: preparing.xml:1062
-#, no-c-format
-msgid "MacOS/OSX Partitioning"
+#, fuzzy, no-c-format
+#| msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr "MacOS/OSX-partitionering"
 
 #. Tag: para
 #: preparing.xml:1064
-#, no-c-format
-msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The <application>Apple Drive Setup</application> application can be found "
+#| "in the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#| "adjust existing partitions; it is limited to partitioning the entire disk "
+#| "at once. The disk driver partitions don't show up in <application>Drive "
+#| "Setup</application>."
+msgid ""
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 "Programmet <application>Apple Drive Setup</application> kan hittas i mappen "
 "<filename>Utilities</filename> på MacOS cd-skivan. Den kommer inte att "
@@ -1587,7 +1603,7 @@ msgstr ""
 "Setup</application>."
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1599,42 +1615,34 @@ msgstr ""
 "bort och ersättas senare av &debian-gnu;s installationsprogram."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
-"Om du planerar att installera både MacOS 9 och OS X, är det bäst att skapa "
-"separata partitioner för OS 9 och OS X. Om de installeras på samma "
-"partition, <application>Startup Disk</application> (och omstart) måste "
-"användas för att välja mellan de två; valet mellan de två systemen kan inte "
-"göra vid tid för uppstart. Med separata partitioner, kommer separata "
-"alternativ för OS 9 och OS X att visas när tangenten <keycap>option</keycap> "
-"hålls ner vid tid för uppstart, och separata alternativ kan även installeras "
-"i uppstartsmenyn i <application>yaboot</application>. Startup Disk kommer "
-"att gömma alla andra monteringsbara partitioner, något som kan påverka "
-"uppstart av GNU/Linux. Både OS 9- och OS X-partitioner kan kommas åt från "
-"antingen OS 9 eller OS X."
 
 #. Tag: para
-#: preparing.xml:1090
-#, no-c-format
-msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+#: preparing.xml:1086
+#, fuzzy, no-c-format
+#| msgid ""
+#| "GNU/Linux is unable to access information on UFS partitions, but does "
+#| "support HFS+ (aka MacOS Extended) partitions. OS X requires one of these "
+#| "two types for its boot partition. MacOS 9 can be installed on either HFS "
+#| "(aka MacOS Standard) or HFS+. To share information between the MacOS and "
+#| "GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS "
+#| "FAT partitions are supported by both MacOS and Linux."
+msgid ""
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 "GNU/Linux kan inte komma åt information på UFS-partitioner, men har stöd för "
 "HFS+-partitioner (även kallad MacOS Extended). OS X kräver en av dessa två "
@@ -1644,13 +1652,13 @@ msgstr ""
 "HFS+ och MS-DOS FAT-partitioner stöds av både MacOS och Linux."
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "Inställning av maskinvara och operativsystem före installation"
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section will walk you through pre-installation hardware setup, if "
@@ -1678,13 +1686,13 @@ msgstr ""
 "med."
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "Starta BIOS-inställningsmenyn"
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, fuzzy, no-c-format
 #| msgid ""
 #| "BIOS provides the basic functions needed to boot your machine to allow "
@@ -1711,13 +1719,13 @@ msgstr ""
 "kan leda till återkommande krascher eller att &debian; inte kan installeras."
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Val av uppstartsenhet"
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1728,7 +1736,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1737,7 +1745,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1753,7 +1761,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1762,7 +1770,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1779,7 +1787,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1790,13 +1798,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "Starta OpenFirmware"
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1812,7 +1820,7 @@ msgstr ""
 "din maskin."
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1830,7 +1838,7 @@ msgstr ""
 "<ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> för fler tips."
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1854,7 +1862,7 @@ msgstr ""
 "modemporten, för att interagera med OpenFirmware."
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1877,13 +1885,13 @@ msgstr ""
 "programvaran installerade till nvram."
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "Starta OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1899,7 +1907,7 @@ msgstr ""
 "maskin, såsom diagnostik och enkla skript."
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1920,7 +1928,7 @@ msgstr ""
 "<keycap>n</keycap> för att få den nya varianten."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1934,7 +1942,7 @@ msgstr ""
 "dokumentationen för din terminalemulator om du använder ett annat program."
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1954,7 +1962,7 @@ msgstr ""
 "\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1996,7 +2004,7 @@ msgstr ""
 "se <ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2027,19 +2035,19 @@ msgstr ""
 "</screen></informalexample> och under Solaris:"
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOS-inställning"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2063,7 +2071,7 @@ msgstr ""
 "radbaserad istället för teckenbaserad."
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2083,7 +2091,7 @@ msgstr ""
 "en LPAR om HMC och detta alternativ finns tillgängligt för dig."
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2109,13 +2117,13 @@ msgstr ""
 "&debian;-specifika installationsstegen."
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Ursprunglig och LPAR-installationer"
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2131,13 +2139,13 @@ msgstr ""
 "Distributioner</ulink> Redbook om hur man ställer in en LPAR för Linux."
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Installation som en VM-gäst"
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2154,7 +2162,7 @@ msgstr ""
 "Linux."
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2176,13 +2184,13 @@ msgstr ""
 "filerna i rätt ordning är inkluderat med avbildningarna."
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Ställa in en installationsserver"
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2196,7 +2204,7 @@ msgstr ""
 "och måste göra dem tillgängliga via NFS, HTTP eller FTP."
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2210,25 +2218,25 @@ msgstr ""
 "sådant katalogträd."
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: mer information behövs &mdash; från en Redbook?"
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Maskinvaruproblem att se upp för"
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "USB BIOS-stöd och tangentbord"
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2256,13 +2264,13 @@ msgstr ""
 "quote>."
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Skärmsynlighet på OldWorld Powermac-datorer"
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2285,6 +2293,31 @@ msgstr ""
 "<quote>tusentals</quote> eller <quote>miljoner</quote> färger."
 
 #~ msgid ""
+#~ "If you are planning to install both MacOS 9 and OS X, it is best to "
+#~ "create separate partitions for OS 9 and OS X. If they are installed on "
+#~ "the same partition, <application>Startup Disk</application> (and reboot) "
+#~ "must be used to select between the two; the choice between the two "
+#~ "systems can't be made at boot time. With separate partitions, separate "
+#~ "options for OS 9 and OS X will appear when holding the <keycap>option</"
+#~ "keycap> key at boot time, and separate options can be installed in the "
+#~ "<application>yaboot</application> boot menu as well. Also, Startup Disk "
+#~ "will de-bless all other mountable partitions, which can affect GNU/Linux "
+#~ "booting. Both OS 9 and OS X partitions will be accessible from either OS "
+#~ "9 or OS X."
+#~ msgstr ""
+#~ "Om du planerar att installera både MacOS 9 och OS X, är det bäst att "
+#~ "skapa separata partitioner för OS 9 och OS X. Om de installeras på samma "
+#~ "partition, <application>Startup Disk</application> (och omstart) måste "
+#~ "användas för att välja mellan de två; valet mellan de två systemen kan "
+#~ "inte göra vid tid för uppstart. Med separata partitioner, kommer separata "
+#~ "alternativ för OS 9 och OS X att visas när tangenten <keycap>option</"
+#~ "keycap> hålls ner vid tid för uppstart, och separata alternativ kan även "
+#~ "installeras i uppstartsmenyn i <application>yaboot</application>. Startup "
+#~ "Disk kommer att gömma alla andra monteringsbara partitioner, något som "
+#~ "kan påverka uppstart av GNU/Linux. Både OS 9- och OS X-partitioner kan "
+#~ "kommas åt från antingen OS 9 eller OS X."
+
+#~ msgid ""
 #~ "Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; "
 #~ "CD users can boot from one of the CDs)."
 #~ msgstr ""
diff --git a/po/tl/preparing.po b/po/tl/preparing.po
index 3559f43db..1586b0f3e 100644
--- a/po/tl/preparing.po
+++ b/po/tl/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+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"
@@ -1094,10 +1094,10 @@ msgid ""
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 
 #. Tag: para
@@ -1107,10 +1107,10 @@ msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 
 #. Tag: para
@@ -1195,7 +1195,7 @@ msgstr ""
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1255,22 +1255,21 @@ msgstr ""
 #. Tag: title
 #: preparing.xml:1062
 #, no-c-format
-msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr ""
 
 #. Tag: para
 #: preparing.xml:1064
 #, no-c-format
 msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1279,41 +1278,37 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1090
+#: preparing.xml:1086
 #, no-c-format
 msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1325,13 +1320,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, no-c-format
 msgid ""
 "The BIOS provides the basic functions needed to boot your machine and to "
@@ -1345,13 +1340,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1362,7 +1357,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1371,7 +1366,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1387,7 +1382,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1396,7 +1391,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1413,7 +1408,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1424,13 +1419,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1441,7 +1436,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1453,7 +1448,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1468,7 +1463,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1482,13 +1477,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1499,7 +1494,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1512,7 +1507,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1522,7 +1517,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1535,7 +1530,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1559,7 +1554,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -1577,19 +1572,19 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -1604,7 +1599,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -1617,7 +1612,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -1633,13 +1628,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1650,13 +1645,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1667,7 +1662,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -1681,13 +1676,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -1697,7 +1692,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -1707,25 +1702,25 @@ msgid ""
 msgstr ""
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, no-c-format
 msgid ""
 "If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -1737,13 +1732,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
diff --git a/po/vi/preparing.po b/po/vi/preparing.po
index 9c498f6f5..41295fd11 100644
--- a/po/vi/preparing.po
+++ b/po/vi/preparing.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+0000\n"
 "PO-Revision-Date: 2012-08-04 05:37+0700\n"
 "Last-Translator: hailang <hailangvn@gmail.com>\n"
 "Language-Team: MOST Project <du-an-most@lists.hanoilug.org>\n"
@@ -1323,10 +1323,10 @@ msgid ""
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 "Nếu máy tính của bạn đã có một hệ điều hành <phrase arch=\"any-x86\"> "
 "(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, "
@@ -1352,10 +1352,10 @@ msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 "Bạn có thể tìm thông tin về thiết lập phân vùng hiện thời của máy tính bằng "
 "cách sử dụng một công cụ phân vùng cho hệ điều hành đã có<phrase arch=\"any-"
@@ -1460,11 +1460,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:943
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
+#| "parttype; partitions should appear before all other partitions on the "
+#| "disk, especially MacOS boot partitions. This should be kept in mind when "
+#| "pre-partitioning; you should create a &arch-parttype; placeholder "
+#| "partition to come <emphasis>before</emphasis> the other bootable "
+#| "partitions on the disk. (The small partitions dedicated to Apple disk "
+#| "drivers are not bootable.) You can delete the placeholder with the "
+#| "&debian; partition tools later during the actual install, and replace it "
+#| "with &arch-parttype; partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1549,19 +1559,25 @@ msgstr ""
 
 #. Tag: title
 #: preparing.xml:1062
-#, no-c-format
-msgid "MacOS/OSX Partitioning"
+#, fuzzy, no-c-format
+#| msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr "Phân vùng MacOS/MacOSX"
 
 #. Tag: para
 #: preparing.xml:1064
-#, no-c-format
-msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The <application>Apple Drive Setup</application> application can be found "
+#| "in the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#| "adjust existing partitions; it is limited to partitioning the entire disk "
+#| "at once. The disk driver partitions don't show up in <application>Drive "
+#| "Setup</application>."
+msgid ""
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 "Ứng dụng <application>Apple Drive Setup</application> nằm trong thư mục "
 "<filename>Utilities</filename> trên đĩa CD cài đặt hệ điều hành MacOS. Nó "
@@ -1570,7 +1586,7 @@ msgstr ""
 "phân vùng dành cho trình điều khiển đĩa."
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1582,42 +1598,34 @@ msgstr ""
 "bỏ và thay thế sau này trong tiến trình cài đặt &debian-gnu;."
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
-"Nếu bạn định cài đặt cả hai hệ điều hành Mac OS9 và OSX, tốt nhất để tạo "
-"phân vùng riêng cho mỗi hệ thống. Nếu bạn cài đặt cả hai hệ thống vào cùng "
-"một phân vùng, cần phải dùng tiện ích <application>Startup Disk</"
-"application> (rồi khởi động lại) để chọn hệ thống nào khởi động máy: không "
-"thể chọn nó vào lúc khởi động. Nếu bạn cài đặt mỗi hệ điều hành OS9 và OSX "
-"vào phân vùng riêng, cũng có tùy chọn riêng sẽ xuất hiện khi bạn bấm giữ "
-"phím <keycap>option</keycap> vào lúc khởi động, và cũng có thể cài đặt tùy "
-"chọn riêng vào trình đơn khởi động của <application>yaboot</application>. "
-"Hơn nữa, tiện ích Startup Disk sẽ vô hiệu hoá các phân vùng lắp được khác có "
-"thể tác động lên khả năng khởi động GNU/Linux. Bạn sẽ cũng có thể truy cập "
-"mỗi kiểu phân vùng từ hệ điều hành hoặc OS9 hoặc OSX."
 
 #. Tag: para
-#: preparing.xml:1090
-#, no-c-format
-msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+#: preparing.xml:1086
+#, fuzzy, no-c-format
+#| msgid ""
+#| "GNU/Linux is unable to access information on UFS partitions, but does "
+#| "support HFS+ (aka MacOS Extended) partitions. OS X requires one of these "
+#| "two types for its boot partition. MacOS 9 can be installed on either HFS "
+#| "(aka MacOS Standard) or HFS+. To share information between the MacOS and "
+#| "GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS "
+#| "FAT partitions are supported by both MacOS and Linux."
+msgid ""
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 "Hệ điều hành GNU/Linux không có khả năng truy cập thông tin nằm trên phân "
 "vùng kiểu UFS, nhưng có phải hỗ trợ dạng thức phân vùng HFS+ (cũng tên Mac "
@@ -1628,13 +1636,13 @@ msgstr ""
 "hai HĐH MacOS và GNU/Linux hỗ trợ phân vùng kiểu HFS, HFS+ và MS-DOS FAT."
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "Phần cứng cài đặt sẵn và thiết lập hệ điều hành"
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section will walk you through pre-installation hardware setup, if "
@@ -1661,13 +1669,13 @@ msgstr ""
 "&debian-gnu; trên máy tính của bạn."
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "Gọi trình đơn thiết lập BIOS"
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, fuzzy, no-c-format
 #| msgid ""
 #| "BIOS provides the basic functions needed to boot your machine to allow "
@@ -1694,13 +1702,13 @@ msgstr ""
 "hoặc bạn sẽ không có khả năng cài đặt &debian;."
 
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "Chọn thiết bị khởi động"
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1711,7 +1719,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1720,7 +1728,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1736,7 +1744,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1745,7 +1753,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1762,7 +1770,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1773,13 +1781,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "Gọi OpenFirmware"
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1794,7 +1802,7 @@ msgstr ""
 "dẫn có sẵn với máy đó."
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1812,7 +1820,7 @@ msgstr ""
 "Hỏi Đáp <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> để tìm mẹo thêm."
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1837,7 +1845,7 @@ msgstr ""
 "OpenFirmware."
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1859,13 +1867,13 @@ msgstr ""
 "guibutton> (Lưu) để cài đặt các đắp vá phần vững vào bộ nhớ nvram."
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "Gọi OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1881,7 +1889,7 @@ msgstr ""
 "tập lệnh đơn giản."
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1901,7 +1909,7 @@ msgstr ""
 "phím <keycap>n</keycap> để hiển thị dấu nhắc kiểu mới."
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1916,7 +1924,7 @@ msgstr ""
 "nếu bạn chạy chương trình khác."
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1936,7 +1944,7 @@ msgstr ""
 "<ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1979,7 +1987,7 @@ msgstr ""
 "\">Sun OpenBoot Reference</ulink>."
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2012,19 +2020,19 @@ msgstr ""
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "Thiết lập BIOS"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2046,7 +2054,7 @@ msgstr ""
 "thống đặc biệt: bàn điều khiển 3215/3270 dựa vào dòng, không phải vào ký tự."
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2066,7 +2074,7 @@ msgstr ""
 "sẵn sàng."
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -2091,13 +2099,13 @@ msgstr ""
 "về tài liệu này để theo những bước cài đặt đặc trưng cho &debian;."
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "Sự cài đặt kiểu sở hữu và LPAR"
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2113,13 +2121,13 @@ msgstr ""
 "distributions</ulink> để tìm thông tin về cách thiết lập LPAR dành cho Linux."
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "Cài đặt như là khách VM"
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2136,7 +2144,7 @@ msgstr ""
 "VM để chạy Linux."
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2159,13 +2167,13 @@ msgstr ""
 "thứ tự đúng."
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "Thiết lập máy phục vụ cài đặt"
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2179,7 +2187,7 @@ msgstr ""
 "phải cung cấp chúng bằng giao thức NFS, HTTP hay FTP."
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2193,25 +2201,25 @@ msgstr ""
 "của các đĩa CD cài đặt vào cây thư mục như vậy."
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: (chưa ghi đoạn tiếng Anh)"
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "Vấn đề phần cứng cần theo dõi"
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "Hỗ trợ BIOS và bàn phím kiểu USB"
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2239,13 +2247,13 @@ msgstr ""
 "hay <quote>USB keyboard support</quote> (khả năng hỗ trợ bàn phím USB)."
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "Tầm nhìn bộ trình bày của PowerMac kiểu cũ"
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2268,6 +2276,31 @@ msgstr ""
 "(mấy nghìn) hay <quote>millions</quote> (mấy tỷ) màu sắc."
 
 #~ msgid ""
+#~ "If you are planning to install both MacOS 9 and OS X, it is best to "
+#~ "create separate partitions for OS 9 and OS X. If they are installed on "
+#~ "the same partition, <application>Startup Disk</application> (and reboot) "
+#~ "must be used to select between the two; the choice between the two "
+#~ "systems can't be made at boot time. With separate partitions, separate "
+#~ "options for OS 9 and OS X will appear when holding the <keycap>option</"
+#~ "keycap> key at boot time, and separate options can be installed in the "
+#~ "<application>yaboot</application> boot menu as well. Also, Startup Disk "
+#~ "will de-bless all other mountable partitions, which can affect GNU/Linux "
+#~ "booting. Both OS 9 and OS X partitions will be accessible from either OS "
+#~ "9 or OS X."
+#~ msgstr ""
+#~ "Nếu bạn định cài đặt cả hai hệ điều hành Mac OS9 và OSX, tốt nhất để tạo "
+#~ "phân vùng riêng cho mỗi hệ thống. Nếu bạn cài đặt cả hai hệ thống vào "
+#~ "cùng một phân vùng, cần phải dùng tiện ích <application>Startup Disk</"
+#~ "application> (rồi khởi động lại) để chọn hệ thống nào khởi động máy: "
+#~ "không thể chọn nó vào lúc khởi động. Nếu bạn cài đặt mỗi hệ điều hành OS9 "
+#~ "và OSX vào phân vùng riêng, cũng có tùy chọn riêng sẽ xuất hiện khi bạn "
+#~ "bấm giữ phím <keycap>option</keycap> vào lúc khởi động, và cũng có thể "
+#~ "cài đặt tùy chọn riêng vào trình đơn khởi động của <application>yaboot</"
+#~ "application>. Hơn nữa, tiện ích Startup Disk sẽ vô hiệu hoá các phân vùng "
+#~ "lắp được khác có thể tác động lên khả năng khởi động GNU/Linux. Bạn sẽ "
+#~ "cũng có thể truy cập mỗi kiểu phân vùng từ hệ điều hành hoặc OS9 hoặc OSX."
+
+#~ msgid ""
 #~ "Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; "
 #~ "CD users can boot from one of the CDs)."
 #~ msgstr ""
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 7c92d9791..0e7abe61c 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+0000\n"
 "PO-Revision-Date: 2012-11-26 13:45+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1248,17 +1248,27 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:855
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you already have an operating system on your system <phrase arch=\"any-"
+#| "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
+#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
+#| "OS/390, &hellip;) </phrase> which uses the whole disk and you want to "
+#| "stick &debian; on the same disk, you will need to repartition it. "
+#| "&debian; requires its own hard disk partitions. It cannot be installed on "
+#| "Windows or MacOS partitions. It may be able to share some partitions with "
+#| "other Unix systems, but that's not covered here. At the very least you "
+#| "will need a dedicated partition for the &debian; root filesystem."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
 "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 "如果在您的机器中已经安装有操作系统<phrase arch=\"x86\"> (Windows 9x、Windows "
 "NT/2000/XP/2003/Vista/7、OS/2、MacOS、Solaris、FreeBSD，&hellip;) </phrase> "
@@ -1270,15 +1280,23 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can find information about your current partition setup by using a "
+#| "partitioning tool for your current operating system<phrase arch=\"any-"
+#| "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
+#| "phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
+#| "MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
+#| "Partitioning tools always provide a way to show existing partitions "
+#| "without making changes."
 msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 "通过当前的操作系统中的分区工具，您可以获知现在的分区状况<phrase arch=\"any-"
 "x86\">，如 Windows 系统中的磁盘管理器或 DOS 下的 fdisk</phrase><phrase arch="
@@ -1384,11 +1402,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:943
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
+#| "parttype; partitions should appear before all other partitions on the "
+#| "disk, especially MacOS boot partitions. This should be kept in mind when "
+#| "pre-partitioning; you should create a &arch-parttype; placeholder "
+#| "partition to come <emphasis>before</emphasis> the other bootable "
+#| "partitions on the disk. (The small partitions dedicated to Apple disk "
+#| "drivers are not bootable.) You can delete the placeholder with the "
+#| "&debian; partition tools later during the actual install, and replace it "
+#| "with &arch-parttype; partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1465,19 +1493,25 @@ msgstr ""
 
 #. Tag: title
 #: preparing.xml:1062
-#, no-c-format
-msgid "MacOS/OSX Partitioning"
+#, fuzzy, no-c-format
+#| msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr "在 MacOS/OSX 下分区"
 
 #. Tag: para
 #: preparing.xml:1064
-#, no-c-format
-msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The <application>Apple Drive Setup</application> application can be found "
+#| "in the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#| "adjust existing partitions; it is limited to partitioning the entire disk "
+#| "at once. The disk driver partitions don't show up in <application>Drive "
+#| "Setup</application>."
+msgid ""
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 "<application>Apple Drive Setup</application> 程序可以在 MacOS CD 的 "
 "<filename>Utilities</filename> 文件夹里面找到。它并不能调整已经存在的分区，而"
@@ -1485,7 +1519,7 @@ msgstr ""
 "Setup</application> 中。"
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1496,39 +1530,34 @@ msgstr ""
 "无关紧要，在后面的 &debian-gnu; 安装程序中，它会被删除并替换。"
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
-"如果您计划同时安装 MacOS 9 与 OS X，最好为 OS 9 和 OS X 创建不同的分区。如果"
-"将它们安装在同一分区，就必须使用 <application>Startup Disk</application> (并"
-"重启)来选择它们两个，而在启动时是无法对两个操作系统进行选择的。使用不同的分"
-"区，如果在启动时按住 <keycap>option</keycap> 键就可以显示出 OS 9 和 OS X 两个"
-"不同的选项，而且这些分开的选项也可以被安装到 <application>yaboot</"
-"application> 启动菜单里面。还有，Startup Disk 将无法保证其他可挂载的分区的可"
-"靠性，这可能会影响 GNU/Linux 启动。OS 9 和 OS X 分区从 OS 9 和 OS X 中都能访"
-"问。"
 
 #. Tag: para
-#: preparing.xml:1090
-#, no-c-format
+#: preparing.xml:1086
+#, fuzzy, no-c-format
+#| msgid ""
+#| "GNU/Linux is unable to access information on UFS partitions, but does "
+#| "support HFS+ (aka MacOS Extended) partitions. OS X requires one of these "
+#| "two types for its boot partition. MacOS 9 can be installed on either HFS "
+#| "(aka MacOS Standard) or HFS+. To share information between the MacOS and "
+#| "GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS "
+#| "FAT partitions are supported by both MacOS and Linux."
 msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 "GNU/Linux 不能读取 UFS 分区，但支持 HFS+ (又称 MacOS Extended) 分区。OS X 要"
 "求使用这两个分区类型之一作为引导分区。MacOS 9 能安装到 HFS (又称 MacOS "
@@ -1536,13 +1565,13 @@ msgstr ""
 "系统间共享信息。HFS，HFS+ 和 MS-DOS FAT 分区都能被 MacOS 和 Linux 支持。"
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "安装前的硬件和操作系统的相关设置"
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, no-c-format
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
@@ -1559,13 +1588,13 @@ msgstr ""
 "(即开机之后)中起到了至关重要的作用。"
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "BIOS 设置菜单的使用"
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, no-c-format
 msgid ""
 "The BIOS provides the basic functions needed to boot your machine and to "
@@ -1585,13 +1614,13 @@ msgstr ""
 
 # index.docbook:1522, index.docbook:1865
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "选择引导设备"
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1605,7 +1634,7 @@ msgstr ""
 "系统上还可能会有使用 PXE 打开网络引导。"
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1616,7 +1645,7 @@ msgstr ""
 "引导设备。"
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1638,7 +1667,7 @@ msgstr ""
 "置硬盘作为主引导设备。"
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1649,7 +1678,7 @@ msgstr ""
 "设备设为主引导设备。"
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1673,7 +1702,7 @@ msgstr ""
 "quote> 有助于解决不能从 U 盘硬盘模式下的引导问题。</phrase>"
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1684,13 +1713,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "使用 OpenFireware"
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1704,7 +1733,7 @@ msgstr ""
 "关的硬件文档。"
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1721,7 +1750,7 @@ msgstr ""
 "阅 <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> 了解更多提示。"
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1743,7 +1772,7 @@ msgstr ""
 "调制解调器端口连接到另外一台电脑上的终端程序来与 OpenFirmware 交互。"
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1763,13 +1792,13 @@ msgstr ""
 "<guibutton>Save</guibutton> 按钮使固件补丁安装到 nvram。"
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "使用 OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1783,7 +1812,7 @@ msgstr ""
 "机做很多事情，如诊断和简单脚本。"
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1802,7 +1831,7 @@ msgstr ""
 "<keycap>n</keycap> 键得到新风格的提示符。"
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1816,7 +1845,7 @@ msgstr ""
 "档。"
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1834,7 +1863,7 @@ msgstr ""
 "Reference</ulink>。"
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1873,7 +1902,7 @@ msgstr ""
 "<ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>。"
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -1902,19 +1931,19 @@ msgstr ""
 "</screen></informalexample> 或在 Solaris下执行："
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOS 设置"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -1934,7 +1963,7 @@ msgstr ""
 "通过远程方式使用。这归因于该系统上的 3215/3270 控制台是线型，而不是字符型的。"
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -1952,7 +1981,7 @@ msgstr ""
 "上的 HMC 启动。"
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -1973,13 +2002,13 @@ msgstr ""
 "回到本文档查看 &debian; 规格的安装步骤。"
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "本地化(Native)和 LPAR 安装"
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1995,13 +2024,13 @@ msgstr ""
 "如何为 Linux 建立 LPAR 的部分。"
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "作为一个 VM guest 安装"
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2017,7 +2046,7 @@ msgstr ""
 "如何为运行 Linux 建立 VM guest 的部分。"
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, no-c-format
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2037,13 +2066,13 @@ msgstr ""
 "<filename>debian.exec</filename> 示例脚本，用于按正确次序存放文件。"
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "建立安装服务器"
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2056,7 +2085,7 @@ msgstr ""
 "HTTP 或 FTP 访问。"
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2068,25 +2097,25 @@ msgstr ""
 "些独立于体系的文件。您也可以复制所有的安装 CD 到这样的目录树中。"
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: more information needed &mdash; from a Redbook?"
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "需要留心的硬件问题"
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "USB BIOS 支持与键盘"
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, no-c-format
 msgid ""
 "If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -2103,13 +2132,13 @@ msgstr ""
 "keyboard support</quote> 选项。"
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "在 OldWorld Powermac 上正常显示"
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2126,3 +2155,25 @@ msgstr ""
 "碰到这种问题(有时可以看到显示器上的数据，有时却什么都没有)，或者引导安装程序"
 "以后黑屏，而不是显示用户界面，请试着在 MacOS 下修改显示设置为 256 色，替代 "
 "<quote>thousands</quote> 或 <quote>millions</quote>。"
+
+#~ msgid ""
+#~ "If you are planning to install both MacOS 9 and OS X, it is best to "
+#~ "create separate partitions for OS 9 and OS X. If they are installed on "
+#~ "the same partition, <application>Startup Disk</application> (and reboot) "
+#~ "must be used to select between the two; the choice between the two "
+#~ "systems can't be made at boot time. With separate partitions, separate "
+#~ "options for OS 9 and OS X will appear when holding the <keycap>option</"
+#~ "keycap> key at boot time, and separate options can be installed in the "
+#~ "<application>yaboot</application> boot menu as well. Also, Startup Disk "
+#~ "will de-bless all other mountable partitions, which can affect GNU/Linux "
+#~ "booting. Both OS 9 and OS X partitions will be accessible from either OS "
+#~ "9 or OS X."
+#~ msgstr ""
+#~ "如果您计划同时安装 MacOS 9 与 OS X，最好为 OS 9 和 OS X 创建不同的分区。如"
+#~ "果将它们安装在同一分区，就必须使用 <application>Startup Disk</"
+#~ "application> (并重启)来选择它们两个，而在启动时是无法对两个操作系统进行选"
+#~ "择的。使用不同的分区，如果在启动时按住 <keycap>option</keycap> 键就可以显"
+#~ "示出 OS 9 和 OS X 两个不同的选项，而且这些分开的选项也可以被安装到 "
+#~ "<application>yaboot</application> 启动菜单里面。还有，Startup Disk 将无法"
+#~ "保证其他可挂载的分区的可靠性，这可能会影响 GNU/Linux 启动。OS 9 和 OS X 分"
+#~ "区从 OS 9 和 OS X 中都能访问。"
diff --git a/po/zh_TW/preparing.po b/po/zh_TW/preparing.po
index 377fdca8e..9956cb8ba 100644
--- a/po/zh_TW/preparing.po
+++ b/po/zh_TW/preparing.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-02-03 09:08+0000\n"
+"POT-Creation-Date: 2013-03-04 08:23+0000\n"
 "PO-Revision-Date: 2005-07-18 13:49+0800\n"
 "Last-Translator: Jhang, Jia-Wei<dreamcryer@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -1205,10 +1205,10 @@ msgid ""
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
 "&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
 "on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or MacOS partitions. "
-"It may be able to share some partitions with other Unix systems, but that's "
-"not covered here. At the very least you will need a dedicated partition for "
-"the &debian; root filesystem."
+"hard disk partitions. It cannot be installed on Windows or Mac OS X "
+"partitions. It may be able to share some partitions with other Unix systems, "
+"but that's not covered here. At the very least you will need a dedicated "
+"partition for the &debian; root filesystem."
 msgstr ""
 "如果您已經在您的機器中安裝作業系統 <phrase arch=\"i386\"> (Windows 9x, "
 "Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </"
@@ -1225,10 +1225,10 @@ msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
 "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-"Partitioning tools always provide a way to show existing partitions without "
-"making changes."
+"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
+"phrase>. Partitioning tools always provide a way to show existing partitions "
+"without making changes."
 msgstr ""
 "您可以透過目前作業系統中的分割工具軟體來獲知您現在的分割區狀況<phrase arch="
 "\"i386\">，如 fdisk 和 PartitionMagic</phrase><phrase arch=\"powerpc\">，如 "
@@ -1341,7 +1341,7 @@ msgstr ""
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
-"especially MacOS boot partitions. This should be kept in mind when pre-"
+"especially Mac OS X boot partitions. This should be kept in mind when pre-"
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
@@ -1421,19 +1421,25 @@ msgstr ""
 
 #. Tag: title
 #: preparing.xml:1062
-#, no-c-format
-msgid "MacOS/OSX Partitioning"
+#, fuzzy, no-c-format
+#| msgid "MacOS/OSX Partitioning"
+msgid "Mac OS X Partitioning"
 msgstr "MacOS/OSX 下的分割"
 
 #. Tag: para
 #: preparing.xml:1064
-#, no-c-format
-msgid ""
-"The <application>Apple Drive Setup</application> application can be found in "
-"the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The <application>Apple Drive Setup</application> application can be found "
+#| "in the <filename>Utilities</filename> folder on the MacOS CD. It will not "
+#| "adjust existing partitions; it is limited to partitioning the entire disk "
+#| "at once. The disk driver partitions don't show up in <application>Drive "
+#| "Setup</application>."
+msgid ""
+"The <application>Disk Utility</application> application can be found under "
+"the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
 "adjust existing partitions; it is limited to partitioning the entire disk at "
-"once. The disk driver partitions don't show up in <application>Drive Setup</"
-"application>."
+"once."
 msgstr ""
 "<application>Apple Drive Setup</application> 程式可以在 MacOS CD 的 "
 "<filename>Utilities</filename> 目錄裡面找到。它並不能調整已經存在的分割區，而"
@@ -1441,7 +1447,7 @@ msgstr ""
 "<application>Drive Setup</application> 中。"
 
 #. Tag: para
-#: preparing.xml:1071
+#: preparing.xml:1070
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1452,39 +1458,34 @@ msgstr ""
 "類型無關緊要，在後面的 &debian-gnu; 安裝程式中，它會被刪除並替換。"
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1076
 #, no-c-format
 msgid ""
-"If you are planning to install both MacOS 9 and OS X, it is best to create "
-"separate partitions for OS 9 and OS X. If they are installed on the same "
-"partition, <application>Startup Disk</application> (and reboot) must be used "
-"to select between the two; the choice between the two systems can't be made "
-"at boot time. With separate partitions, separate options for OS 9 and OS X "
-"will appear when holding the <keycap>option</keycap> key at boot time, and "
-"separate options can be installed in the <application>yaboot</application> "
-"boot menu as well. Also, Startup Disk will de-bless all other mountable "
-"partitions, which can affect GNU/Linux booting. Both OS 9 and OS X "
-"partitions will be accessible from either OS 9 or OS X."
+"&debian; installer partition table editing tools are compatible with OS X, "
+"but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it "
+"is best to install OS X and &debian; on one hard drive, and put MacOS 9 on a "
+"separate hard drive. Separate options for OS 9 and OS X will appear when "
+"holding the <keycap>option</keycap> key at boot time, and separate options "
+"can be installed in the <application>yaboot</application> boot menu as well."
 msgstr ""
-"如果您計劃同時安裝 MacOS 9 與 OS X，最好為 OS 9 和 OS X 建立不同的分割區。如"
-"果將它們安裝在同一分割區，就必須使用 <application>Startup Disk</application> "
-"(並重啟) 來選擇它們兩個，而在開機時是無法對兩個作業系統進行選擇的。使用不同的"
-"分割區時，如果在開機時按住 <keycap>option</keycap> 鍵就可以顯示出 OS 9 和 OS "
-"X 兩個不同的選項，而且這些分開的選項也可以被安裝到 <application>yaboot</"
-"application> 開機選單裡面。還有，Startup Disk 將無法保證其他可掛載的分割區的"
-"可靠性，這可能會影響 GNU/Linux 的開機。從 OS 9 和 OS X 中都能讀取OS 9 和 OS "
-"X 分割區。"
 
 #. Tag: para
-#: preparing.xml:1090
-#, no-c-format
-msgid ""
-"GNU/Linux is unable to access information on UFS partitions, but does "
-"support HFS+ (aka MacOS Extended) partitions. OS X requires one of these two "
-"types for its boot partition. MacOS 9 can be installed on either HFS (aka "
-"MacOS Standard) or HFS+. To share information between the MacOS and GNU/"
-"Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT "
-"partitions are supported by both MacOS and Linux."
+#: preparing.xml:1086
+#, fuzzy, no-c-format
+#| msgid ""
+#| "GNU/Linux is unable to access information on UFS partitions, but does "
+#| "support HFS+ (aka MacOS Extended) partitions. OS X requires one of these "
+#| "two types for its boot partition. MacOS 9 can be installed on either HFS "
+#| "(aka MacOS Standard) or HFS+. To share information between the MacOS and "
+#| "GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS "
+#| "FAT partitions are supported by both MacOS and Linux."
+msgid ""
+"GNU/Linux is unable to access information on UFS partitions, but can access "
+"HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
+"for its boot partition. MacOS 9 can be installed on either HFS (aka MacOS "
+"Standard) or HFS+. To share information between the Mac OS X and GNU/Linux "
+"systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT file "
+"systems are supported by MacOS 9, Mac OS X and GNU/Linux."
 msgstr ""
 "GNU/Linux 不能讀取 UFS 分割區但是支援 HFS+ 分割區 (又稱 MacOS Extended)。OS "
 "X 要求使用這兩個分割區類型之一作為開機分割區。MacOS 9 能安裝到 HFS (又稱 "
@@ -1493,13 +1494,13 @@ msgstr ""
 "援。"
 
 #. Tag: title
-#: preparing.xml:1110
+#: preparing.xml:1106
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "安裝前硬體和作業系統的相關設定"
 
 #. Tag: para
-#: preparing.xml:1111
+#: preparing.xml:1107
 #, fuzzy, no-c-format
 #| msgid ""
 #| "This section will walk you through pre-installation hardware setup, if "
@@ -1524,13 +1525,13 @@ msgstr ""
 "些硬體問題，您系統上這些硬體問題在將會影響到 &debian-gnu; 的可靠性。"
 
 #. Tag: title
-#: preparing.xml:1126
+#: preparing.xml:1122
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "使用 BIOS 設定選單"
 
 #. Tag: para
-#: preparing.xml:1128
+#: preparing.xml:1124
 #, fuzzy, no-c-format
 #| msgid ""
 #| "BIOS provides the basic functions needed to boot your machine to allow "
@@ -1556,13 +1557,13 @@ msgstr ""
 
 # index.docbook:1522, index.docbook:1865
 #. Tag: title
-#: preparing.xml:1142 preparing.xml:1294
+#: preparing.xml:1138 preparing.xml:1290
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "選擇開機設備"
 
 #. Tag: para
-#: preparing.xml:1144
+#: preparing.xml:1140
 #, no-c-format
 msgid ""
 "Within the BIOS setup menu, you can select which devices shall be checked in "
@@ -1573,7 +1574,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1148
 #, no-c-format
 msgid ""
 "Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1582,7 +1583,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1158
+#: preparing.xml:1154
 #, no-c-format
 msgid ""
 "Most BIOS versions allow to call up a boot menu on system startup in which "
@@ -1598,7 +1599,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1172
+#: preparing.xml:1168
 #, no-c-format
 msgid ""
 "If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
@@ -1607,7 +1608,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1178
+#: preparing.xml:1174
 #, no-c-format
 msgid ""
 "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
@@ -1624,7 +1625,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1193
+#: preparing.xml:1189
 #, no-c-format
 msgid ""
 "If you cannot manipulate the BIOS to boot directly from a USB stick you "
@@ -1635,13 +1636,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preparing.xml:1211
+#: preparing.xml:1207
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "使用 OpenFireware"
 
 #. Tag: para
-#: preparing.xml:1212
+#: preparing.xml:1208
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -1655,7 +1656,7 @@ msgstr ""
 "電腦手冊中相關的硬體文件。"
 
 #. Tag: para
-#: preparing.xml:1220
+#: preparing.xml:1216
 #, fuzzy, no-c-format
 #| msgid ""
 #| "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -1679,7 +1680,7 @@ msgstr ""
 "powerpc-faq;\"></ulink> 取得更多提示。"
 
 #. Tag: para
-#: preparing.xml:1228
+#: preparing.xml:1224
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -1701,7 +1702,7 @@ msgstr ""
 "器連接埠連接到另外一台電腦上的終端程式來與 OpenFirmware 交互。"
 
 #. Tag: para
-#: preparing.xml:1241
+#: preparing.xml:1237
 #, fuzzy, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -1721,13 +1722,13 @@ msgstr ""
 "nvram。"
 
 #. Tag: title
-#: preparing.xml:1261
+#: preparing.xml:1257
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "使用 OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1263
+#: preparing.xml:1259
 #, fuzzy, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1741,7 +1742,7 @@ msgstr ""
 "做很多事情如診斷，簡單腳本，等等。"
 
 #. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1267
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1760,7 +1761,7 @@ msgstr ""
 "下 <keycap>n</keycap> 鍵得到新風格的提示符號。"
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1279
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -1774,7 +1775,7 @@ msgstr ""
 "件。"
 
 #. Tag: para
-#: preparing.xml:1296
+#: preparing.xml:1292
 #, fuzzy, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1792,7 +1793,7 @@ msgstr ""
 "Reference</ulink>。"
 
 #. Tag: para
-#: preparing.xml:1306
+#: preparing.xml:1302
 #, fuzzy, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1831,7 +1832,7 @@ msgstr ""
 "OpenBoot Reference</ulink>。"
 
 #. Tag: para
-#: preparing.xml:1329
+#: preparing.xml:1325
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -1860,19 +1861,19 @@ msgstr ""
 "</screen></informalexample> 或在 Solaris下執行："
 
 #. Tag: screen
-#: preparing.xml:1348
+#: preparing.xml:1344
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1358
+#: preparing.xml:1354
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOS 設置"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1355
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -1892,7 +1893,7 @@ msgstr ""
 "的方式使用。這歸因於該系統上的 3215/3270 控制台是線性，而不是字元型的。"
 
 #. Tag: para
-#: preparing.xml:1371
+#: preparing.xml:1367
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -1910,7 +1911,7 @@ msgstr ""
 "機。"
 
 #. Tag: para
-#: preparing.xml:1381
+#: preparing.xml:1377
 #, fuzzy, no-c-format
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
@@ -1931,13 +1932,13 @@ msgstr ""
 "回本文件查看 &debian; 規格的安裝步驟。"
 
 #. Tag: title
-#: preparing.xml:1398
+#: preparing.xml:1394
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "本地的 (Native) 和 LPAR 安裝"
 
 #. Tag: para
-#: preparing.xml:1399
+#: preparing.xml:1395
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1953,13 +1954,13 @@ msgstr ""
 "如何為 Linux 建立 LPAR 的部分。"
 
 #. Tag: title
-#: preparing.xml:1413
+#: preparing.xml:1409
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "以一個 VM guest 安裝"
 
 #. Tag: para
-#: preparing.xml:1415
+#: preparing.xml:1411
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1975,7 +1976,7 @@ msgstr ""
 "如何為運行 Linux 建立 VM guest 的部分。"
 
 #. Tag: para
-#: preparing.xml:1425
+#: preparing.xml:1421
 #, fuzzy, no-c-format
 #| msgid ""
 #| "You need to copy all the files from the <filename>generic</filename> sub-"
@@ -1997,13 +1998,13 @@ msgstr ""
 "filename> 是以固定 80 個字元長度的二進位形式進行傳輸。"
 
 #. Tag: title
-#: preparing.xml:1442
+#: preparing.xml:1438
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "設置安裝伺服器"
 
 #. Tag: para
-#: preparing.xml:1444
+#: preparing.xml:1440
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2016,7 +2017,7 @@ msgstr ""
 "NFS，HTTP 或 FTP 存取。"
 
 #. Tag: para
-#: preparing.xml:1452
+#: preparing.xml:1448
 #, fuzzy, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2028,25 +2029,25 @@ msgstr ""
 "相關和一些獨立於架構的檔案。您也可以複製所有的安裝光碟片到這樣的目錄樹中。"
 
 #. Tag: emphasis
-#: preparing.xml:1461
+#: preparing.xml:1457
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: more information needed &mdash; from a Redbook?"
 
 #. Tag: title
-#: preparing.xml:1468
+#: preparing.xml:1464
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "需要留意的硬體問題"
 
 #. Tag: title
-#: preparing.xml:1471
+#: preparing.xml:1467
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "USB BIOS 支援與鍵盤"
 
 #. Tag: para
-#: preparing.xml:1472
+#: preparing.xml:1468
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2071,13 +2072,13 @@ msgstr ""
 "<quote>USB keyboard support</quote> 選項。"
 
 #. Tag: title
-#: preparing.xml:1485
+#: preparing.xml:1481
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr ""
 
 #. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1483
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2091,6 +2092,28 @@ msgid ""
 msgstr ""
 
 #~ msgid ""
+#~ "If you are planning to install both MacOS 9 and OS X, it is best to "
+#~ "create separate partitions for OS 9 and OS X. If they are installed on "
+#~ "the same partition, <application>Startup Disk</application> (and reboot) "
+#~ "must be used to select between the two; the choice between the two "
+#~ "systems can't be made at boot time. With separate partitions, separate "
+#~ "options for OS 9 and OS X will appear when holding the <keycap>option</"
+#~ "keycap> key at boot time, and separate options can be installed in the "
+#~ "<application>yaboot</application> boot menu as well. Also, Startup Disk "
+#~ "will de-bless all other mountable partitions, which can affect GNU/Linux "
+#~ "booting. Both OS 9 and OS X partitions will be accessible from either OS "
+#~ "9 or OS X."
+#~ msgstr ""
+#~ "如果您計劃同時安裝 MacOS 9 與 OS X，最好為 OS 9 和 OS X 建立不同的分割區。"
+#~ "如果將它們安裝在同一分割區，就必須使用 <application>Startup Disk</"
+#~ "application> (並重啟) 來選擇它們兩個，而在開機時是無法對兩個作業系統進行選"
+#~ "擇的。使用不同的分割區時，如果在開機時按住 <keycap>option</keycap> 鍵就可"
+#~ "以顯示出 OS 9 和 OS X 兩個不同的選項，而且這些分開的選項也可以被安裝到 "
+#~ "<application>yaboot</application> 開機選單裡面。還有，Startup Disk 將無法"
+#~ "保證其他可掛載的分割區的可靠性，這可能會影響 GNU/Linux 的開機。從 OS 9 和 "
+#~ "OS X 中都能讀取OS 9 和 OS X 分割區。"
+
+#~ msgid ""
 #~ "Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; "
 #~ "CD users can boot from one of the CDs)."
 #~ msgstr ""