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

1 files changed, 112 insertions, 89 deletions

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 ""