summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
authorHolger Wansing <linux@wansing-online.de>2015-03-21 16:58:02 +0000
committerHolger Wansing <linux@wansing-online.de>2015-03-21 16:58:02 +0000
commit47f6428abde1fad1513434efd5a1505a64845ad0 (patch)
tree342dbe967ad3c8e001f5ac6d7b3b6449cca5654f /po/zh_CN
parentb333b47df9ef46723af892dd3920c7299f78e289 (diff)
downloadinstallation-guide-47f6428abde1fad1513434efd5a1505a64845ad0.zip
Update po and pot files after changings in en
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/boot-installer.po4
-rw-r--r--po/zh_CN/hardware.po527
-rw-r--r--po/zh_CN/preseed.po12
3 files changed, 279 insertions, 264 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 13daa2422..a82085bd7 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.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: 2015-01-09 19:07+0000\n"
+"POT-Creation-Date: 2015-03-21 16:42+0000\n"
"PO-Revision-Date: 2012-11-25 16:26+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -313,7 +313,7 @@ msgid ""
"is no operating system installed, plugging in the USB stick and powering up "
"the system should result in starting the installer. You can also initiate "
"the USB-boot process any time from the u-boot prompt by entering the "
-"<quote>run usb_boot</quote> command."
+"<quote>run bootcmd_usb0</quote> command."
msgstr ""
#. Tag: para
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 0729a50d1..657ec80fb 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.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: 2015-01-09 19:07+0000\n"
+"POT-Creation-Date: 2015-03-21 16:42+0000\n"
"PO-Revision-Date: 2012-11-25 23:22+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -467,8 +467,8 @@ msgstr "AMD64 和 Intel 64 处理器都获得支持。"
# index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
#. Tag: title
-#: hardware.xml:282 hardware.xml:627 hardware.xml:646 hardware.xml:704
-#: hardware.xml:762 hardware.xml:792
+#: hardware.xml:282 hardware.xml:637 hardware.xml:656 hardware.xml:714
+#: hardware.xml:772 hardware.xml:802
#, no-c-format
msgid "CPU, Main Boards, and Video Support"
msgstr "CPU,主板和视频支持"
@@ -481,7 +481,7 @@ msgid ""
"architecture, where all systems share a common system firmware (BIOS or/and "
"UEFI) which handles the board-specific basic hardware initialization in a "
"standardized way. The ARM architecture is used mainly in so-called "
-"<quote>systems-on-chip</quote> (SOCs). These SOCs are designed by many "
+"<quote>systems-on-chip</quote> (SoCs). These SoCs are designed by many "
"different companies with vastly varying hardware components even for the "
"very basic functionality required to bring the system up. Systems using them "
"usually lack a common system firmware interface and as a result, on ARM "
@@ -699,7 +699,7 @@ msgstr ""
#. Tag: para
#: hardware.xml:466
#, no-c-format
-msgid "The IMX53QSB is a development board based on the i.MX53 SOC."
+msgid "The IMX53QSB is a development board based on the i.MX53 SoC."
msgstr ""
#. Tag: term
@@ -728,57 +728,59 @@ msgstr ""
#, no-c-format
msgid ""
"The armmp kernel supports several development boards and embedded systems "
-"based on the Allwinner A10 (architecture codename <quote>sun4i</quote>) and "
-"A20 (architecture codename <quote>sun7i</quote>) SOCs. Full installer "
-"support is currently available for the following sunXi-based systems:"
+"based on the Allwinner A10 (architecture codename <quote>sun4i</quote>), "
+"A10s/A13 (architecture codename <quote>sun5i</quote>) and A20 (architecture "
+"codename <quote>sun7i</quote>) SoCs. Full installer support is currently "
+"available for the following sunXi-based systems:"
msgstr ""
#. Tag: para
-#: hardware.xml:494
+#: hardware.xml:495
#, no-c-format
msgid "Cubietech Cubieboard 1 + 2 / Cubietruck"
msgstr ""
#. Tag: para
-#: hardware.xml:497
+#: hardware.xml:498
#, no-c-format
-msgid "LeMaker Banana Pi"
+msgid "LeMaker Banana Pi and Banana Pro"
msgstr ""
#. Tag: para
-#: hardware.xml:500
+#: hardware.xml:501
#, no-c-format
msgid "LinkSprite pcDuino"
msgstr ""
#. Tag: para
-#: hardware.xml:503
+#: hardware.xml:504
#, no-c-format
msgid "Mele A1000"
msgstr ""
#. Tag: para
-#: hardware.xml:506
+#: hardware.xml:507
#, no-c-format
msgid "Miniand Hackberry"
msgstr ""
#. Tag: para
-#: hardware.xml:509
+#: hardware.xml:510
#, no-c-format
msgid ""
"Olimex A10-Olinuxino-LIME / A10s-Olinuxino Micro / A13-Olinuxino / A13-"
-"Olinuxino Micro / A20-Olinuxino-LIME / A20-Olinuxino Micro"
+"Olinuxino Micro / A20-Olinuxino-LIME / A20-Olinuxino-LIME2 / A20-Olinuxino "
+"Micro"
msgstr ""
#. Tag: para
-#: hardware.xml:514
+#: hardware.xml:515
#, no-c-format
msgid "PineRiver Mini X-Plus"
msgstr ""
#. Tag: para
-#: hardware.xml:520
+#: hardware.xml:521
#, no-c-format
msgid ""
"System support for Allwinner sunXi-based devices is limited to drivers and "
@@ -787,27 +789,38 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:526
+#: hardware.xml:527
#, no-c-format
msgid ""
"The mainline Linux kernel generally supports serial console, ethernet, SATA, "
-"USB and MMC/SD-cards on Allwinner A10 and A20 SOCs, but it does not have "
-"local display (HDMI/VGA/LVDS) and audio support. The NAND flash memory that "
-"is built into some sunXi-based systems is not supported."
+"USB and MMC/SD-cards on Allwinner A10, A10s/A13 and A20 SoCs, but it does "
+"not have native drivers for the display (HDMI/VGA/LCD) and audio hardware in "
+"these SoCs. The NAND flash memory that is built into some sunXi-based "
+"systems is not supported."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:535
+#, no-c-format
+msgid ""
+"Using a local display is technically possible without native display drivers "
+"via the <quote>simplefb</quote> infrastructure in the mainline kernel, which "
+"relies on the <quote>u-boot</quote> bootloader for initializing the display "
+"hardware, but this is not supported by the u-boot version in &debian; 8."
msgstr ""
#. Tag: term
-#: hardware.xml:537
+#: hardware.xml:547
#, no-c-format
msgid "SolidRun Cubox-i2eX / Cubox-i4Pro"
msgstr ""
#. Tag: para
-#: hardware.xml:539
+#: hardware.xml:549
#, no-c-format
msgid ""
"The Cubox-i series is a set of small, cubical-shaped systems based on the "
-"Freescale i.MX6 SOC family. System support for the Cubox-i series is limited "
+"Freescale i.MX6 SoC family. System support for the Cubox-i series is limited "
"to drivers and device-tree information available in the mainline Linux "
"kernel; the Freescale 3.0 kernel series for the Cubox-i is not supported by "
"Debian. Available drivers in the mainline kernel include serial console, "
@@ -816,13 +829,13 @@ msgid ""
msgstr ""
#. Tag: term
-#: hardware.xml:554
+#: hardware.xml:564
#, no-c-format
msgid "Wandboard Quad"
msgstr ""
#. Tag: para
-#: hardware.xml:556
+#: hardware.xml:566
#, no-c-format
msgid ""
"The Wandboard Quad is a development board based on the Freescale i.MX6 Quad "
@@ -836,7 +849,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:574
+#: hardware.xml:584
#, no-c-format
msgid ""
"Generally, the ARM multiplatform support in the Linux kernel allows running "
@@ -849,7 +862,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:585
+#: hardware.xml:595
#, no-c-format
msgid ""
"When using &d-i; on such systems, you have to manually make the system "
@@ -858,19 +871,19 @@ msgid ""
msgstr ""
#. Tag: title
-#: hardware.xml:594
+#: hardware.xml:604
#, no-c-format
msgid "Platforms no longer supported by Debian/armhf"
msgstr ""
#. Tag: term
-#: hardware.xml:598
+#: hardware.xml:608
#, no-c-format
msgid "EfikaMX"
msgstr ""
#. Tag: para
-#: hardware.xml:599
+#: hardware.xml:609
#, no-c-format
msgid ""
"The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) has "
@@ -881,7 +894,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:607
+#: hardware.xml:617
#, no-c-format
msgid ""
"Using the armmp multiplatform kernel on the EfikaMX platform would require "
@@ -889,7 +902,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:628
+#: hardware.xml:638
#, no-c-format
msgid ""
"There are two major support <emphasis>&architecture;</emphasis> flavors: PA-"
@@ -905,7 +918,7 @@ msgstr ""
"位的 userland。"
#. Tag: para
-#: hardware.xml:647
+#: hardware.xml:657
#, no-c-format
msgid ""
"Complete information concerning supported peripherals can be found at <ulink "
@@ -917,13 +930,13 @@ msgstr ""
# index.docbook:808, index.docbook:914
#. Tag: title
-#: hardware.xml:655 hardware.xml:739
+#: hardware.xml:665 hardware.xml:749
#, no-c-format
msgid "<title>CPU</title>"
msgstr "<title>CPU</title>"
#. Tag: para
-#: hardware.xml:656
+#: hardware.xml:666
#, no-c-format
msgid ""
"Nearly all x86-based (IA-32) processors still in use in personal computers "
@@ -936,7 +949,7 @@ msgstr ""
"Athlon XP 和 Intel P4 Xeon 这些处理器。"
#. Tag: para
-#: hardware.xml:663
+#: hardware.xml:673
#, no-c-format
msgid ""
"However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> run "
@@ -949,7 +962,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:675
+#: hardware.xml:685
#, no-c-format
msgid ""
"If your system has a 64-bit processor from the AMD64 or Intel 64 families, "
@@ -960,13 +973,13 @@ msgstr ""
"安装程序替代 (32位) i386 架构的安装程序。"
#. Tag: title
-#: hardware.xml:684
+#: hardware.xml:694
#, no-c-format
msgid "I/O Bus"
msgstr "I/O 总线"
#. Tag: para
-#: hardware.xml:685
+#: hardware.xml:695
#, no-c-format
msgid ""
"The system bus is the part of the motherboard which allows the CPU to "
@@ -980,7 +993,7 @@ msgstr ""
"线)。近年来出售的个人电脑都会使用里面的一种。"
#. Tag: para
-#: hardware.xml:705
+#: hardware.xml:715
#, no-c-format
msgid ""
"&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -1010,7 +1023,7 @@ msgstr ""
"\"> debian-&arch-listname; mailing list</ulink>。"
#. Tag: para
-#: hardware.xml:740
+#: hardware.xml:750
#, no-c-format
msgid ""
"On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
@@ -1023,7 +1036,7 @@ msgstr ""
"持 R5000。"
#. Tag: para
-#: hardware.xml:746
+#: hardware.xml:756
#, no-c-format
msgid ""
"Some MIPS machines can be operated in both big and little endian mode. For "
@@ -1034,7 +1047,7 @@ msgstr ""
"endian MIPS,请阅读 mipsel 体系的相关文档。"
#. Tag: para
-#: hardware.xml:763
+#: hardware.xml:773
#, fuzzy, no-c-format
#| msgid ""
#| "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -1071,7 +1084,7 @@ msgstr ""
"mailing list</ulink>。"
#. Tag: para
-#: hardware.xml:793
+#: hardware.xml:803
#, no-c-format
msgid ""
"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and "
@@ -1081,13 +1094,13 @@ msgstr ""
"PreP 子体系获得支持。"
#. Tag: title
-#: hardware.xml:814
+#: hardware.xml:824
#, no-c-format
msgid "Kernel Flavours"
msgstr "内核变种"
#. Tag: para
-#: hardware.xml:816
+#: hardware.xml:826
#, no-c-format
msgid ""
"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
@@ -1095,13 +1108,13 @@ msgid ""
msgstr "在 &debian; 中有两种基于 CPU 类型的 powerpc 内核:"
#. Tag: term
-#: hardware.xml:823
+#: hardware.xml:833
#, no-c-format
msgid "<term>powerpc</term>"
msgstr "<term>powerpc</term>"
#. Tag: para
-#: hardware.xml:824
+#: hardware.xml:834
#, fuzzy, no-c-format
#| msgid ""
#| "Most systems use this kernel flavour, which supports the PowerPC 601, "
@@ -1116,31 +1129,31 @@ msgstr ""
"器。所有 Apple PowerMac 以后的系统包括 G4 都使用这其中的处理器。"
#. Tag: term
-#: hardware.xml:834
+#: hardware.xml:844
#, no-c-format
msgid "powerpc-smp"
msgstr ""
#. Tag: para
-#: hardware.xml:835
+#: hardware.xml:845
#, no-c-format
msgid "All Apple PowerMac G4 SMP machines."
msgstr ""
#. Tag: term
-#: hardware.xml:843
+#: hardware.xml:853
#, no-c-format
msgid "power64"
msgstr "power64"
#. Tag: para
-#: hardware.xml:844
+#: hardware.xml:854
#, no-c-format
msgid "The power64 kernel flavour supports the following CPUs:"
msgstr "power64 内核支持以下的 CPU:"
#. Tag: para
-#: hardware.xml:848
+#: hardware.xml:858
#, no-c-format
msgid ""
"The POWER3 processor is used in older IBM 64-bit server systems: known "
@@ -1152,7 +1165,7 @@ msgstr ""
"7044-270。"
#. Tag: para
-#: hardware.xml:854
+#: hardware.xml:864
#, no-c-format
msgid ""
"The POWER4 processor is used in more recent IBM 64-bit server systems: known "
@@ -1162,7 +1175,7 @@ msgstr ""
"630、650、655、670 和 690。"
#. Tag: para
-#: hardware.xml:859
+#: hardware.xml:869
#, fuzzy, no-c-format
#| msgid ""
#| "Systems using the Apple G5 (PPC970FX processor) are also based on the "
@@ -1175,19 +1188,19 @@ msgstr ""
"采用 Apple G5 (PPC970FX 处理器) 的系统也是基于 POWER4 体系,并使用这种内核。"
#. Tag: para
-#: hardware.xml:865
+#: hardware.xml:875
#, no-c-format
msgid "Newer IBM systems using POWER5, POWER6, and POWER7 processors."
msgstr ""
#. Tag: title
-#: hardware.xml:898
+#: hardware.xml:908
#, no-c-format
msgid "Power Macintosh (pmac) subarchitecture"
msgstr "Power Macintosh (pmac) 子体系"
#. Tag: para
-#: hardware.xml:900
+#: hardware.xml:910
#, no-c-format
msgid ""
"Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
@@ -1200,7 +1213,7 @@ msgstr ""
"(&debian; 没有支持)、OldWorld PCI 和 NewWorld。"
#. Tag: para
-#: hardware.xml:907
+#: hardware.xml:917
#, no-c-format
msgid ""
"OldWorld systems are most Power Macintoshes with a floppy drive and a PCI "
@@ -1213,7 +1226,7 @@ msgstr ""
"些 Apple iMac PowerPC 前身使用 4 位数字命名方式,它们都是 OldWorld 的。"
#. Tag: para
-#: hardware.xml:915
+#: hardware.xml:925
#, no-c-format
msgid ""
"The so called NewWorld PowerMacs are any PowerMacs in translucent colored "
@@ -1228,7 +1241,7 @@ msgstr ""
"MacOS 的系统。"
#. Tag: para
-#: hardware.xml:923
+#: hardware.xml:933
#, no-c-format
msgid ""
"Specifications for Apple hardware are available at <ulink url=\"http://www."
@@ -1243,397 +1256,397 @@ msgstr ""
# index.docbook:1240, index.docbook:1375, index.docbook:1419, index.docbook:1448
#. Tag: entry
-#: hardware.xml:939 hardware.xml:1074 hardware.xml:1118 hardware.xml:1151
+#: hardware.xml:949 hardware.xml:1084 hardware.xml:1128 hardware.xml:1161
#, no-c-format
msgid "Model Name/Number"
msgstr "型号名称/编号"
#. Tag: entry
-#: hardware.xml:940
+#: hardware.xml:950
#, no-c-format
msgid "Generation"
msgstr "世代"
#. Tag: entry
-#: hardware.xml:946
+#: hardware.xml:956
#, no-c-format
msgid "Apple"
msgstr "Apple"
#. Tag: entry
-#: hardware.xml:947
+#: hardware.xml:957
#, no-c-format
msgid "iMac Bondi Blue, 5 Flavors, Slot Loading"
msgstr "iMac Bondi Blue, 5 Flavors, Slot Loading"
# index.docbook:1249, index.docbook:1252, index.docbook:1255, index.docbook:1258, index.docbook:1261, index.docbook:1264, index.docbook:1267, index.docbook:1270, index.docbook:1273, index.docbook:1276, index.docbook:1279, index.docbook:1282, index.docbook:1285, index.docbook:1288, index.docbook:1291, index.docbook:1294
#. Tag: entry
-#: hardware.xml:948 hardware.xml:951 hardware.xml:954 hardware.xml:957
-#: hardware.xml:960 hardware.xml:963 hardware.xml:966 hardware.xml:969
-#: hardware.xml:972 hardware.xml:975 hardware.xml:978 hardware.xml:981
-#: hardware.xml:984 hardware.xml:987 hardware.xml:990 hardware.xml:993
+#: hardware.xml:958 hardware.xml:961 hardware.xml:964 hardware.xml:967
+#: hardware.xml:970 hardware.xml:973 hardware.xml:976 hardware.xml:979
+#: hardware.xml:982 hardware.xml:985 hardware.xml:988 hardware.xml:991
+#: hardware.xml:994 hardware.xml:997 hardware.xml:1000 hardware.xml:1003
#, no-c-format
msgid "NewWorld"
msgstr "NewWorld"
#. Tag: entry
-#: hardware.xml:950
+#: hardware.xml:960
#, no-c-format
msgid "iMac Summer 2000, Early 2001"
msgstr "iMac Summer 2000, Early 2001"
#. Tag: entry
-#: hardware.xml:953
+#: hardware.xml:963
#, no-c-format
msgid "iMac G5"
msgstr "iMac G5"
#. Tag: entry
-#: hardware.xml:956
+#: hardware.xml:966
#, no-c-format
msgid "iBook, iBook SE, iBook Dual USB"
msgstr "iBook, iBook SE, iBook Dual USB"
#. Tag: entry
-#: hardware.xml:959
+#: hardware.xml:969
#, no-c-format
msgid "iBook2"
msgstr "iBook2"
#. Tag: entry
-#: hardware.xml:962
+#: hardware.xml:972
#, no-c-format
msgid "iBook G4"
msgstr "iBook G4"
#. Tag: entry
-#: hardware.xml:965
+#: hardware.xml:975
#, no-c-format
msgid "Power Macintosh Blue and White (B&amp;W) G3"
msgstr "Power Macintosh Blue and White (B&amp;W) G3"
#. Tag: entry
-#: hardware.xml:968
+#: hardware.xml:978
#, no-c-format
msgid "Power Macintosh G4 PCI, AGP, Cube"
msgstr "Power Macintosh G4 PCI, AGP, Cube"
#. Tag: entry
-#: hardware.xml:971
+#: hardware.xml:981
#, no-c-format
msgid "Power Macintosh G4 Gigabit Ethernet"
msgstr "Power Macintosh G4 Gigabit Ethernet"
#. Tag: entry
-#: hardware.xml:974
+#: hardware.xml:984
#, no-c-format
msgid "Power Macintosh G4 Digital Audio, Quicksilver"
msgstr "Power Macintosh G4 Digital Audio, Quicksilver"
#. Tag: entry
-#: hardware.xml:977
+#: hardware.xml:987
#, no-c-format
msgid "Power Macintosh G5"
msgstr "Power Macintosh G5"
#. Tag: entry
-#: hardware.xml:980
+#: hardware.xml:990
#, no-c-format
msgid "PowerBook G3 FireWire Pismo (2000)"
msgstr "PowerBook G3 FireWire Pismo (2000)"
#. Tag: entry
-#: hardware.xml:983
+#: hardware.xml:993
#, no-c-format
msgid "PowerBook G3 Lombard (1999)"
msgstr "PowerBook G3 Lombard (1999)"
#. Tag: entry
-#: hardware.xml:986
+#: hardware.xml:996
#, no-c-format
msgid "PowerBook G4 Titanium"
msgstr "PowerBook G4 Titanium"
#. Tag: entry
-#: hardware.xml:989
+#: hardware.xml:999
#, no-c-format
msgid "PowerBook G4 Aluminum"
msgstr "PowerBook G4 Aluminum"
#. Tag: entry
-#: hardware.xml:992
+#: hardware.xml:1002
#, no-c-format
msgid "Xserve G5"
msgstr "Xserve G5"
#. Tag: entry
-#: hardware.xml:995
+#: hardware.xml:1005
#, no-c-format
msgid "Performa 4400, 54xx, 5500"
msgstr "Performa 4400, 54xx, 5500"
# index.docbook:1297, index.docbook:1300, index.docbook:1303, index.docbook:1306, index.docbook:1309, index.docbook:1312, index.docbook:1315, index.docbook:1318, index.docbook:1321, index.docbook:1324, index.docbook:1327, index.docbook:1330, index.docbook:1336, index.docbook:1339, index.docbook:1345, index.docbook:1351, index.docbook:1357
#. Tag: entry
-#: hardware.xml:996 hardware.xml:999 hardware.xml:1002 hardware.xml:1005
-#: hardware.xml:1008 hardware.xml:1011 hardware.xml:1014 hardware.xml:1017
-#: hardware.xml:1020 hardware.xml:1023 hardware.xml:1026 hardware.xml:1029
-#: hardware.xml:1035 hardware.xml:1038 hardware.xml:1044 hardware.xml:1050
-#: hardware.xml:1056
+#: hardware.xml:1006 hardware.xml:1009 hardware.xml:1012 hardware.xml:1015
+#: hardware.xml:1018 hardware.xml:1021 hardware.xml:1024 hardware.xml:1027
+#: hardware.xml:1030 hardware.xml:1033 hardware.xml:1036 hardware.xml:1039
+#: hardware.xml:1045 hardware.xml:1048 hardware.xml:1054 hardware.xml:1060
+#: hardware.xml:1066
#, no-c-format
msgid "OldWorld"
msgstr "OldWorld"
#. Tag: entry
-#: hardware.xml:998
+#: hardware.xml:1008
#, no-c-format
msgid "Performa 6360, 6400, 6500"
msgstr "Performa 6360, 6400, 6500"
#. Tag: entry
-#: hardware.xml:1001
+#: hardware.xml:1011
#, no-c-format
msgid "Power Macintosh 4400, 5400"
msgstr "Power Macintosh 4400, 5400"
#. Tag: entry
-#: hardware.xml:1004
+#: hardware.xml:1014
#, no-c-format
msgid "Power Macintosh 7200, 7300, 7500, 7600"
msgstr "Power Macintosh 7200, 7300, 7500, 7600"
#. Tag: entry
-#: hardware.xml:1007
+#: hardware.xml:1017
#, no-c-format
msgid "Power Macintosh 8200, 8500, 8600"
msgstr "Power Macintosh 8200, 8500, 8600"
#. Tag: entry
-#: hardware.xml:1010
+#: hardware.xml:1020
#, no-c-format
msgid "Power Macintosh 9500, 9600"
msgstr "Power Macintosh 9500, 9600"
#. Tag: entry
-#: hardware.xml:1013
+#: hardware.xml:1023
#, no-c-format
msgid "Power Macintosh (Beige) G3 Minitower"
msgstr "Power Macintosh (Beige) G3 Minitower"
#. Tag: entry
-#: hardware.xml:1016
+#: hardware.xml:1026
#, no-c-format
msgid "Power Macintosh (Beige) Desktop, All-in-One"
msgstr "Power Macintosh (Beige) Desktop, All-in-One"
#. Tag: entry
-#: hardware.xml:1019
+#: hardware.xml:1029
#, no-c-format
msgid "PowerBook 2400, 3400, 3500"
msgstr "PowerBook 2400, 3400, 3500"
#. Tag: entry
-#: hardware.xml:1022
+#: hardware.xml:1032
#, no-c-format
msgid "PowerBook G3 Wallstreet (1998)"
msgstr "PowerBook G3 Wallstreet (1998)"
#. Tag: entry
-#: hardware.xml:1025
+#: hardware.xml:1035
#, no-c-format
msgid "Twentieth Anniversary Macintosh"
msgstr "Twentieth Anniversary Macintosh"
#. Tag: entry
-#: hardware.xml:1028
+#: hardware.xml:1038
#, no-c-format
msgid "Workgroup Server 7250, 7350, 8550, 9650, G3"
msgstr "Workgroup Server 7250, 7350, 8550, 9650, G3"
#. Tag: entry
-#: hardware.xml:1033
+#: hardware.xml:1043
#, no-c-format
msgid "Power Computing"
msgstr "Power Computing"
#. Tag: entry
-#: hardware.xml:1034
+#: hardware.xml:1044
#, no-c-format
msgid "PowerBase, PowerTower / Pro, PowerWave"
msgstr "PowerBase, PowerTower / Pro, PowerWave"
#. Tag: entry
-#: hardware.xml:1037
+#: hardware.xml:1047
#, no-c-format
msgid "PowerCenter / Pro, PowerCurve"
msgstr "PowerCenter / Pro, PowerCurve"
#. Tag: entry
-#: hardware.xml:1042
+#: hardware.xml:1052
#, no-c-format
msgid "UMAX"
msgstr "UMAX"
#. Tag: entry
-#: hardware.xml:1043
+#: hardware.xml:1053
#, no-c-format
msgid "C500, C600, J700, S900"
msgstr "C500, C600, J700, S900"
#. Tag: entry
-#: hardware.xml:1048
+#: hardware.xml:1058
#, no-c-format
msgid "<entry>APS</entry>"
msgstr "<entry>APS</entry>"
#. Tag: entry
-#: hardware.xml:1049
+#: hardware.xml:1059
#, no-c-format
msgid "APS Tech M*Power 604e/2000"
msgstr "APS Tech M*Power 604e/2000"
# index.docbook:1355, index.docbook:1381
#. Tag: entry
-#: hardware.xml:1054 hardware.xml:1080
+#: hardware.xml:1064 hardware.xml:1090
#, no-c-format
msgid "Motorola"
msgstr "Motorola"
#. Tag: entry
-#: hardware.xml:1055
+#: hardware.xml:1065
#, no-c-format
msgid "Starmax 3000, 4000, 5000, 5500"
msgstr "Starmax 3000, 4000, 5000, 5500"
#. Tag: title
-#: hardware.xml:1064
+#: hardware.xml:1074
#, no-c-format
msgid "PReP subarchitecture"
msgstr "PReP 子体系"
#. Tag: entry
-#: hardware.xml:1081
+#: hardware.xml:1091
#, no-c-format
msgid "Firepower, PowerStack Series E, PowerStack II"
msgstr "Firepower, PowerStack Series E, PowerStack II"
#. Tag: entry
-#: hardware.xml:1083
+#: hardware.xml:1093
#, no-c-format
msgid "MPC 7xx, 8xx"
msgstr "MPC 7xx, 8xx"
#. Tag: entry
-#: hardware.xml:1085
+#: hardware.xml:1095
#, no-c-format
msgid "MTX, MTX+"
msgstr "MTX, MTX+"
#. Tag: entry
-#: hardware.xml:1087
+#: hardware.xml:1097
#, no-c-format
msgid "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
msgstr "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
#. Tag: entry
-#: hardware.xml:1089
+#: hardware.xml:1099
#, no-c-format
msgid "MCP(N)750"
msgstr "MCP(N)750"
# index.docbook:1394, index.docbook:1425
#. Tag: entry
-#: hardware.xml:1093 hardware.xml:1124
+#: hardware.xml:1103 hardware.xml:1134
#, no-c-format
msgid "IBM RS/6000"
msgstr "IBM RS/6000"
#. Tag: entry
-#: hardware.xml:1094
+#: hardware.xml:1104
#, no-c-format
msgid "40P, 43P"
msgstr "40P, 43P"
#. Tag: entry
-#: hardware.xml:1096
+#: hardware.xml:1106
#, no-c-format
msgid "Power 830/850/860 (6070, 6050)"
msgstr "Power 830/850/860 (6070, 6050)"
#. Tag: entry
-#: hardware.xml:1098
+#: hardware.xml:1108
#, no-c-format
msgid "6030, 7025, 7043"
msgstr "6030, 7025, 7043"
#. Tag: entry
-#: hardware.xml:1100
+#: hardware.xml:1110
#, no-c-format
msgid "p640"
msgstr "p640"
#. Tag: title
-#: hardware.xml:1108
+#: hardware.xml:1118
#, fuzzy, no-c-format
#| msgid "PReP subarchitecture"
msgid "CHRP subarchitecture"
msgstr "PReP 子体系"
#. Tag: entry
-#: hardware.xml:1125
+#: hardware.xml:1135
#, no-c-format
msgid "B50, 43P-150, 44P"
msgstr "B50, 43P-150, 44P"
#. Tag: entry
-#: hardware.xml:1128
+#: hardware.xml:1138
#, no-c-format
msgid "Genesi"
msgstr "Genesi"
#. Tag: entry
-#: hardware.xml:1129
+#: hardware.xml:1139
#, no-c-format
msgid "Pegasos I, Pegasos II"
msgstr "Pegasos I, Pegasos II"
#. Tag: entry
-#: hardware.xml:1132
+#: hardware.xml:1142
#, no-c-format
msgid "Fixstars"
msgstr ""
#. Tag: entry
-#: hardware.xml:1133
+#: hardware.xml:1143
#, no-c-format
msgid "YDL PowerStation"
msgstr ""
#. Tag: title
-#: hardware.xml:1141
+#: hardware.xml:1151
#, no-c-format
msgid "APUS subarchitecture (unsupported)"
msgstr "APUS 子体系 (不支持)"
#. Tag: entry
-#: hardware.xml:1157
+#: hardware.xml:1167
#, no-c-format
msgid "Amiga Power-UP Systems (APUS)"
msgstr "Amiga Power-UP Systems (APUS)"
#. Tag: entry
-#: hardware.xml:1158
+#: hardware.xml:1168
#, no-c-format
msgid "A1200, A3000, A4000"
msgstr "A1200, A3000, A4000"
#. Tag: title
-#: hardware.xml:1166
+#: hardware.xml:1176
#, no-c-format
msgid "Nubus PowerMac subarchitecture (unsupported)"
msgstr "Nubus PowerMac 子体系 (不支持)"
#. Tag: para
-#: hardware.xml:1168
+#: hardware.xml:1178
#, no-c-format
msgid ""
"NuBus systems are not currently supported by &debian;/powerpc. The "
@@ -1657,13 +1670,13 @@ msgstr ""
"nubus-pmac.sourceforge.net/\"></ulink>"
#. Tag: title
-#: hardware.xml:1205
+#: hardware.xml:1215
#, no-c-format
msgid "Non-PowerPC Macs"
msgstr "Non-PowerPC Macs"
#. Tag: para
-#: hardware.xml:1207
+#: hardware.xml:1217
#, no-c-format
msgid ""
"Macintosh computers using the 680x0 series of processors are <emphasis>not</"
@@ -1679,7 +1692,7 @@ msgstr ""
"字,像 Mac IIcx、LCIII 或 Quadra 950。"
#. Tag: para
-#: hardware.xml:1216
+#: hardware.xml:1226
#, no-c-format
msgid ""
"This model range started with the Mac II (Mac II, IIx, IIcx, IIci, IIsi, "
@@ -1694,7 +1707,7 @@ msgstr ""
"840AV, 900, 950), 最后是 Performa 200-640CD。"
#. Tag: para
-#: hardware.xml:1224
+#: hardware.xml:1234
#, no-c-format
msgid ""
"In laptops, it started with the Mac Portable, then the PowerBook 100-190cs "
@@ -1705,13 +1718,13 @@ msgstr ""
"Duo 210-550c (不包含带有 Nubus 的 PowerBook 500,见前面说明。)"
#. Tag: title
-#: hardware.xml:1240
+#: hardware.xml:1250
#, no-c-format
msgid "zSeries and System z machine types"
msgstr "zSeries 和 System z 机器类型"
#. Tag: para
-#: hardware.xml:1241
+#: hardware.xml:1251
#, no-c-format
msgid ""
"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
@@ -1733,13 +1746,13 @@ msgstr ""
"ulink>。"
#. Tag: title
-#: hardware.xml:1258
+#: hardware.xml:1268
#, no-c-format
msgid "PAV and HyperPAV"
msgstr "PAV 和 HyperPAV"
#. Tag: para
-#: hardware.xml:1259
+#: hardware.xml:1269
#, no-c-format
msgid ""
"PAV and HyperPAV are supported transparently, multipathing is not needed to "
@@ -1752,13 +1765,13 @@ msgstr ""
# index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
#. Tag: title
-#: hardware.xml:1275
+#: hardware.xml:1285
#, no-c-format
msgid "CPU and Main Boards Support"
msgstr "CPU 和主板支持"
#. Tag: para
-#: hardware.xml:1276
+#: hardware.xml:1286
#, no-c-format
msgid ""
"Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1770,13 +1783,13 @@ msgstr ""
"sun4m、sun4u 或 sun4v。下面说明包括哪些机器,以及每个获得支持的级别。"
#. Tag: term
-#: hardware.xml:1287
+#: hardware.xml:1297
#, no-c-format
msgid "sun4, sun4c, sun4d, sun4m"
msgstr "sun4, sun4c, sun4d, sun4m"
#. Tag: para
-#: hardware.xml:1289
+#: hardware.xml:1299
#, no-c-format
msgid ""
"None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1789,7 +1802,7 @@ msgstr ""
"SPARCstation page</ulink>。"
#. Tag: para
-#: hardware.xml:1296
+#: hardware.xml:1306
#, no-c-format
msgid ""
"The last &debian; release to support sparc32 was Etch, but even then only "
@@ -1800,13 +1813,13 @@ msgstr ""
"32 位子体系在上一版本后已经停止支持。"
#. Tag: term
-#: hardware.xml:1306
+#: hardware.xml:1316
#, no-c-format
msgid "sun4u"
msgstr ""
#. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1318
#, no-c-format
msgid ""
"This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1822,13 +1835,13 @@ msgstr ""
"到 UP 和 SMP 配置中。"
#. Tag: term
-#: hardware.xml:1321
+#: hardware.xml:1331
#, no-c-format
msgid "sun4v"
msgstr ""
#. Tag: para
-#: hardware.xml:1323
+#: hardware.xml:1333
#, no-c-format
msgid ""
"This is the newest addition to the Sparc family, which includes machines "
@@ -1841,7 +1854,7 @@ msgstr ""
"smp 内核。"
#. Tag: para
-#: hardware.xml:1334
+#: hardware.xml:1344
#, no-c-format
msgid ""
"Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1851,13 +1864,13 @@ msgstr ""
"持而得不到支持。"
#. Tag: title
-#: hardware.xml:1343
+#: hardware.xml:1353
#, no-c-format
msgid "Laptops"
msgstr "便携机"
#. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1354
#, no-c-format
msgid ""
"From a technical point of view, laptops are normal PCs, so all information "
@@ -1879,13 +1892,13 @@ msgstr ""
# index.docbook:1624, index.docbook:1649, index.docbook:1672
#. Tag: title
-#: hardware.xml:1361 hardware.xml:1381 hardware.xml:1408 hardware.xml:1431
+#: hardware.xml:1371 hardware.xml:1391 hardware.xml:1418 hardware.xml:1441
#, no-c-format
msgid "Multiple Processors"
msgstr "多处理器"
#. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1372
#, fuzzy, no-c-format
#| msgid ""
#| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -1912,7 +1925,7 @@ msgstr ""
"集成在一个物理芯片上。"
#. Tag: para
-#: hardware.xml:1372
+#: hardware.xml:1382
#, no-c-format
msgid ""
"The standard &debian; &release; kernel image has been compiled with SMP "
@@ -1922,7 +1935,7 @@ msgstr ""
"使用也没有问题。"
#. Tag: para
-#: hardware.xml:1383
+#: hardware.xml:1393
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1938,7 +1951,7 @@ msgstr ""
"者核心)数量,并可以在单处理器系统上关闭 SMP 功能。"
#. Tag: para
-#: hardware.xml:1392
+#: hardware.xml:1402
#, fuzzy, no-c-format
#| msgid ""
#| "Having multiple processors in a computer was originally only an issue for "
@@ -1958,7 +1971,7 @@ msgstr ""
"两个或多个称为<quote>核心</quote>的处理器单元集成在一个物理芯片上。"
#. Tag: para
-#: hardware.xml:1399
+#: hardware.xml:1409
#, no-c-format
msgid ""
"The 586 flavour of the &debian; kernel image packages for &arch-title; is "
@@ -1966,7 +1979,7 @@ msgid ""
msgstr "&arch-title; 的 586 &debian; 内核映像软件包没有支持 SMP 。"
#. Tag: para
-#: hardware.xml:1409
+#: hardware.xml:1419
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1981,7 +1994,7 @@ msgstr ""
"核仅使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1418
+#: hardware.xml:1428
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you'll have to replace "
@@ -1997,7 +2010,7 @@ msgstr ""
"</quote> 中选中 <quote>&smp-config-option;</quote>。</phrase>"
#. Tag: para
-#: hardware.xml:1432
+#: hardware.xml:1442
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -2013,7 +2026,7 @@ msgstr ""
"装,因为非 SMP 的内核也能在 SMP 的系统下启动,只不过内核只使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1442
+#: hardware.xml:1452
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you should check to see "
@@ -2024,7 +2037,7 @@ msgstr ""
"一个合适的内核软件包。"
#. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1458
#, no-c-format
msgid ""
"You can also build your own customized kernel to support SMP.<phrase arch="
@@ -2039,13 +2052,13 @@ msgstr ""
"<quote>&smp-config-option;</quote>。</phrase>"
#. Tag: title
-#: hardware.xml:1459
+#: hardware.xml:1469
#, no-c-format
msgid "Graphics Card Support"
msgstr "图形卡支持"
#. Tag: para
-#: hardware.xml:1460
+#: hardware.xml:1470
#, no-c-format
msgid ""
"&debian;'s support for graphical interfaces is determined by the underlying "
@@ -2066,7 +2079,7 @@ msgstr ""
"功能也需要安装额外的固件,但这是罕有的例子。"
#. Tag: para
-#: hardware.xml:1473
+#: hardware.xml:1483
#, no-c-format
msgid ""
"Details on supported graphics cards and pointing devices can be found at "
@@ -2077,13 +2090,13 @@ msgstr ""
"&debian; &release; 包含 X.Org &x11ver; 版。"
#. Tag: para
-#: hardware.xml:1478
+#: hardware.xml:1488
#, no-c-format
msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
msgstr "X.Org 的 X 窗口系统仅支持 SGI Indy 和 O2。"
#. Tag: para
-#: hardware.xml:1483
+#: hardware.xml:1493
#, no-c-format
msgid ""
"Most graphics options commonly found on Sparc-based machines are supported. "
@@ -2102,7 +2115,7 @@ msgstr ""
"卡。"
#. Tag: para
-#: hardware.xml:1493
+#: hardware.xml:1503
#, no-c-format
msgid ""
"It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -2125,13 +2138,13 @@ msgstr ""
"自动激活串口控制台。"
#. Tag: title
-#: hardware.xml:1515
+#: hardware.xml:1525
#, no-c-format
msgid "Network Connectivity Hardware"
msgstr "网络连接硬件"
#. Tag: para
-#: hardware.xml:1516
+#: hardware.xml:1526
#, no-c-format
msgid ""
"Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -2146,7 +2159,7 @@ msgstr ""
"很好。</phrase>"
#. Tag: para
-#: hardware.xml:1526
+#: hardware.xml:1536
#, no-c-format
msgid ""
"This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -2154,61 +2167,61 @@ msgid ""
msgstr "这包括一些通用 PCI 卡(对于支持 PCI 的系统)和来自 Sun 的网卡:"
#. Tag: para
-#: hardware.xml:1532
+#: hardware.xml:1542
#, no-c-format
msgid "Sun LANCE"
msgstr "Sun LANCE"
#. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1547
#, no-c-format
msgid "Sun Happy Meal"
msgstr "Sun Happy Meal"
#. Tag: para
-#: hardware.xml:1542
+#: hardware.xml:1552
#, no-c-format
msgid "Sun BigMAC"
msgstr "Sun BigMAC"
#. Tag: para
-#: hardware.xml:1547
+#: hardware.xml:1557
#, no-c-format
msgid "Sun QuadEthernet"
msgstr "Sun QuadEthernet"
#. Tag: para
-#: hardware.xml:1552
+#: hardware.xml:1562
#, no-c-format
msgid "MyriCOM Gigabit Ethernet"
msgstr "MyriCOM Gigabit Ethernet"
#. Tag: para
-#: hardware.xml:1559
+#: hardware.xml:1569
#, no-c-format
msgid "The list of supported network devices is:"
msgstr "支持的网络设备有:"
#. Tag: para
-#: hardware.xml:1564
+#: hardware.xml:1574
#, no-c-format
msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
msgstr "Channel to Channel (CTC) 和 ESCON connection (实际或模拟)"
#. Tag: para
-#: hardware.xml:1569
+#: hardware.xml:1579
#, no-c-format
msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
msgstr "OSA-2 Token Ring/Ethernet 和 OSA-Express Fast Ethernet (non-QDIO)"
#. Tag: para
-#: hardware.xml:1574
+#: hardware.xml:1584
#, no-c-format
msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
msgstr "QDIO 模式的 OSA-Express,HiperSockets 和 Guest-LANs"
#. Tag: para
-#: hardware.xml:1583
+#: hardware.xml:1593
#, no-c-format
msgid ""
"On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2218,19 +2231,19 @@ msgstr ""
"块。"
#. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1598
#, no-c-format
msgid "ISDN is supported, but not during the installation."
msgstr "ISDN 虽也获得支持,不过不能在安装阶段使用。"
#. Tag: title
-#: hardware.xml:1595
+#: hardware.xml:1605
#, no-c-format
msgid "Wireless Network Cards"
msgstr "无线网卡"
#. Tag: para
-#: hardware.xml:1596
+#: hardware.xml:1606
#, no-c-format
msgid ""
"Wireless networking is in general supported as well and a growing number of "
@@ -2241,7 +2254,7 @@ msgstr ""
"核能支持的无线网卡也越来越多。"
#. Tag: para
-#: hardware.xml:1603
+#: hardware.xml:1613
#, no-c-format
msgid ""
"If firmware is needed, the installer will prompt you to load firmware. See "
@@ -2252,7 +2265,7 @@ msgstr ""
"> 了解如何在安装过程中加载固件的更多信息。"
#. Tag: para
-#: hardware.xml:1608
+#: hardware.xml:1618
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2263,7 +2276,7 @@ msgstr ""
"作,但是却不能在安装过程中使用。"
#. Tag: para
-#: hardware.xml:1613
+#: hardware.xml:1623
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
@@ -2279,7 +2292,7 @@ msgstr ""
"件,并手动配置网络。"
#. Tag: para
-#: hardware.xml:1623
+#: hardware.xml:1633
#, no-c-format
msgid ""
"In some cases the driver you need may not be available as a &debian; "
@@ -2295,13 +2308,13 @@ msgstr ""
"classname> 软件包,它让您使用 Windows 的驱动程序。</phrase>"
#. Tag: title
-#: hardware.xml:1637
+#: hardware.xml:1647
#, no-c-format
msgid "Known Issues for &arch-title;"
msgstr "&arch-title; 的一些已知问题"
#. Tag: para
-#: hardware.xml:1638
+#: hardware.xml:1648
#, no-c-format
msgid ""
"There are a couple of issues with specific network cards that are worth "
@@ -2309,13 +2322,13 @@ msgid ""
msgstr "有些特定的网卡事项需要在此提及。"
#. Tag: title
-#: hardware.xml:1645
+#: hardware.xml:1655
#, no-c-format
msgid "Conflict between tulip and dfme drivers"
msgstr "tulip 和 dfme 驱动程序之间的冲突"
#. Tag: para
-#: hardware.xml:1647
+#: hardware.xml:1657
#, no-c-format
msgid ""
"There are various PCI network cards that have the same PCI identification, "
@@ -2331,7 +2344,7 @@ msgstr ""
"如果使用不正确的驱动程序,网卡可能不工作,或者工作不正常。"
#. Tag: para
-#: hardware.xml:1657
+#: hardware.xml:1667
#, no-c-format
msgid ""
"This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2344,7 +2357,7 @@ msgstr ""
"\"module-blacklist\"/> 将错误的驱动模块加入黑名单,以阻止这种情况发生。"
#. Tag: para
-#: hardware.xml:1665
+#: hardware.xml:1675
#, no-c-format
msgid ""
"An alternative solution during the installation is to switch to a shell and "
@@ -2361,13 +2374,13 @@ msgstr ""
"之后错误的模块可能还会加载。"
#. Tag: title
-#: hardware.xml:1678
+#: hardware.xml:1688
#, no-c-format
msgid "Sun B100 blade"
msgstr "Sun B100 blade"
#. Tag: para
-#: hardware.xml:1680
+#: hardware.xml:1690
#, no-c-format
msgid ""
"The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2376,13 +2389,13 @@ msgstr ""
"<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
#. Tag: title
-#: hardware.xml:1695
+#: hardware.xml:1705
#, no-c-format
msgid "Braille Displays"
msgstr "盲文点触设备(Braille Display)"
#. Tag: para
-#: hardware.xml:1696
+#: hardware.xml:1706
#, no-c-format
msgid ""
"Support for braille displays is determined by the underlying support found "
@@ -2399,13 +2412,13 @@ msgstr ""
"的 <classname>brltty</classname> 版本是 &brlttyver; 。"
#. Tag: title
-#: hardware.xml:1710
+#: hardware.xml:1720
#, no-c-format
msgid "Hardware Speech Synthesis"
msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
-#: hardware.xml:1711
+#: hardware.xml:1721
#, no-c-format
msgid ""
"Support for hardware speech synthesis devices is determined by the "
@@ -2424,13 +2437,13 @@ msgstr ""
"gnu; &release; 配备的 <classname>speakup</classname> 版本是 &speakupver;。"
#. Tag: title
-#: hardware.xml:1731
+#: hardware.xml:1741
#, no-c-format
msgid "Peripherals and Other Hardware"
msgstr "外围设备与其他硬件"
#. Tag: para
-#: hardware.xml:1732
+#: hardware.xml:1742
#, fuzzy, no-c-format
#| msgid ""
#| "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2445,7 +2458,7 @@ msgstr ""
"设备。然而,在安装系统的时候,并不需要其中的大部分设备。"
#. Tag: para
-#: hardware.xml:1738
+#: hardware.xml:1748
#, no-c-format
msgid ""
"USB hardware generally works fine. On some very old PC systems some USB "
@@ -2458,7 +2471,7 @@ msgstr ""
"要任何额外的配置就能工作。"
#. Tag: para
-#: hardware.xml:1747
+#: hardware.xml:1757
#, no-c-format
msgid ""
"Package installations from XPRAM and tape are not supported by this system. "
@@ -2469,13 +2482,13 @@ msgstr ""
"通过 NFS、HTTP、FTP 从网络上取得。"
#. Tag: title
-#: hardware.xml:1760
+#: hardware.xml:1770
#, no-c-format
msgid "Devices Requiring Firmware"
msgstr "需要固件的设备"
#. Tag: para
-#: hardware.xml:1761
+#: hardware.xml:1771
#, no-c-format
msgid ""
"Besides the availability of a device driver, some hardware also requires so-"
@@ -2494,7 +2507,7 @@ msgstr ""
"系统中。"
#. Tag: para
-#: hardware.xml:1772
+#: hardware.xml:1782
#, no-c-format
msgid ""
"On many older devices which require firmware to work, the firmware file was "
@@ -2508,7 +2521,7 @@ msgstr ""
"主系统上传到设备中。"
#. Tag: para
-#: hardware.xml:1780
+#: hardware.xml:1790
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
@@ -2523,7 +2536,7 @@ msgstr ""
"gnu; 可以合法地发布固件,它通常被单独地放置在仓库的 non-free 区里面。"
#. Tag: para
-#: hardware.xml:1789
+#: hardware.xml:1799
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
@@ -2538,7 +2551,7 @@ msgstr ""
"\"loading-firmware\"/> 了解如何在安装时加载固件文件或软件包的的详细信息。"
#. Tag: para
-#: hardware.xml:1798
+#: hardware.xml:1808
#, no-c-format
msgid ""
"If the &d-i; prompts for a firmware file and you do not have this firmware "
@@ -2555,13 +2568,13 @@ msgstr ""
"卡上)。"
#. Tag: title
-#: hardware.xml:1815
+#: hardware.xml:1825
#, no-c-format
msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
msgstr "特别为 GNU/&arch-kernel; 采购硬件"
#. Tag: para
-#: hardware.xml:1817
+#: hardware.xml:1827
#, no-c-format
msgid ""
"There are several vendors, who ship systems with &debian; or other "
@@ -2575,7 +2588,7 @@ msgstr ""
"心,因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
#. Tag: para
-#: hardware.xml:1825
+#: hardware.xml:1835
#, no-c-format
msgid ""
"If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2589,7 +2602,7 @@ msgstr ""
"<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
#. Tag: para
-#: hardware.xml:1833
+#: hardware.xml:1843
#, no-c-format
msgid ""
"Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2605,13 +2618,13 @@ msgstr ""
"&arch-kernel; 友好的硬件销售商。"
#. Tag: title
-#: hardware.xml:1844
+#: hardware.xml:1854
#, no-c-format
msgid "Avoid Proprietary or Closed Hardware"
msgstr "避免专有或封闭的硬件"
#. Tag: para
-#: hardware.xml:1845
+#: hardware.xml:1855
#, no-c-format
msgid ""
"Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2626,7 +2639,7 @@ msgstr ""
"于我们未被授权使用这些文档,造成它们无法在 &arch-kernel; 下工作。"
#. Tag: para
-#: hardware.xml:1855
+#: hardware.xml:1865
#, no-c-format
msgid ""
"In many cases there are standards (or at least some de-facto standards) "
@@ -2646,7 +2659,7 @@ msgstr ""
"所有设备都是符合标准的。"
#. Tag: para
-#: hardware.xml:1867
+#: hardware.xml:1877
#, no-c-format
msgid ""
"In other fields, among them e.g. printers, this is unfortunately not the "
@@ -2664,7 +2677,7 @@ msgstr ""
"于厂商提供的闭源驱动程序。"
#. Tag: para
-#: hardware.xml:1878
+#: hardware.xml:1888
#, no-c-format
msgid ""
"Even if there is a vendor-provided closed-source driver for such hardware "
@@ -2685,7 +2698,7 @@ msgstr ""
"统升级造成的不便。"
#. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1901
#, no-c-format
msgid ""
"You can help improve this situation by encouraging manufacturers of closed "
@@ -2696,13 +2709,13 @@ msgstr ""
"来改变这种状况。"
#. Tag: title
-#: hardware.xml:1906
+#: hardware.xml:1916
#, no-c-format
msgid "Installation Media"
msgstr "安装介质"
#. Tag: para
-#: hardware.xml:1908
+#: hardware.xml:1918
#, no-c-format
msgid ""
"This section will help you determine which different media types you can use "
@@ -2716,13 +2729,13 @@ msgstr ""
"读那一章的时候,可能需要回过头来参考本页。"
#. Tag: title
-#: hardware.xml:1918
+#: hardware.xml:1928
#, no-c-format
msgid "Floppies"
msgstr "软盘"
#. Tag: para
-#: hardware.xml:1919
+#: hardware.xml:1929
#, no-c-format
msgid ""
"In some cases, you'll have to do your first boot from floppy disks. "
@@ -2733,19 +2746,19 @@ msgstr ""
"(1440 千字节)软驱。"
#. Tag: para
-#: hardware.xml:1925
+#: hardware.xml:1935
#, no-c-format
msgid "For CHRP, floppy support is currently broken."
msgstr "用于 CHRP 的软盘支持已经被停止。"
#. Tag: title
-#: hardware.xml:1932
+#: hardware.xml:1942
#, no-c-format
msgid "CD-ROM/DVD-ROM"
msgstr "CD-ROM/DVD-ROM"
#. Tag: para
-#: hardware.xml:1934
+#: hardware.xml:1944
#, no-c-format
msgid ""
"Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2756,19 +2769,19 @@ msgstr ""
"作系统的角度看,它们所用的技术是相同的。"
#. Tag: para
-#: hardware.xml:1940
+#: hardware.xml:1950
#, no-c-format
msgid "CD-ROM based installation is supported for most architectures."
msgstr "大多数体系都支持基于 CD-ROM 的安装程序"
#. Tag: para
-#: hardware.xml:1944
+#: hardware.xml:1954
#, no-c-format
msgid "On PCs SATA, IDE/ATAPI and SCSI CD-ROMs are supported."
msgstr "PC 上的 SATA、IDE/ATAPI 和 SCSI CD-ROM 都获得支持。"
#. Tag: para
-#: hardware.xml:1948
+#: hardware.xml:1958
#, no-c-format
msgid ""
"USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2778,13 +2791,13 @@ msgstr ""
"获得支持。"
#. Tag: para
-#: hardware.xml:1953
+#: hardware.xml:1963
#, no-c-format
msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
#. Tag: para
-#: hardware.xml:1957
+#: hardware.xml:1967
#, no-c-format
msgid ""
"On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2802,13 +2815,13 @@ msgstr ""
"固件上选择 <quote>System installation</quote> 项。"
#. Tag: title
-#: hardware.xml:1971
+#: hardware.xml:1981
#, no-c-format
msgid "USB Memory Stick"
msgstr "U 盘"
#. Tag: para
-#: hardware.xml:1973
+#: hardware.xml:1983
#, no-c-format
msgid ""
"USB flash disks a.k.a. USB memory sticks have become a commonly used and "
@@ -2823,13 +2836,13 @@ msgstr ""
"CD/DVD-ROM 驱动器,从 U 盘引导是安装操作系统的标准方法。"
#. Tag: title
-#: hardware.xml:1985
+#: hardware.xml:1995
#, no-c-format
msgid "Network"
msgstr "网络"
#. Tag: para
-#: hardware.xml:1987
+#: hardware.xml:1997
#, no-c-format
msgid ""
"The network can be used during the installation to retrieve files needed for "
@@ -2846,7 +2859,7 @@ msgstr ""
"用 ISDN 和 PPP。"
#. Tag: para
-#: hardware.xml:1997
+#: hardware.xml:2007
#, no-c-format
msgid ""
"You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2865,7 +2878,7 @@ msgstr ""
"安装技术。</phrase>"
#. Tag: para
-#: hardware.xml:2010
+#: hardware.xml:2020
#, no-c-format
msgid ""
"Diskless installation, using network booting from a local area network and "
@@ -2875,13 +2888,13 @@ msgstr ""
"择。"
#. Tag: title
-#: hardware.xml:2019
+#: hardware.xml:2029
#, no-c-format
msgid "Hard Disk"
msgstr "硬盘"
#. Tag: para
-#: hardware.xml:2021
+#: hardware.xml:2031
#, no-c-format
msgid ""
"Booting the installation system directly from a hard disk is another option "
@@ -2893,7 +2906,7 @@ msgstr ""
"安装程序。该方式建议只用在没有其他安装方式可以选的情况下。"
#. Tag: para
-#: hardware.xml:2028
+#: hardware.xml:2038
#, no-c-format
msgid ""
"Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2903,13 +2916,13 @@ msgstr ""
"(UFS slices)进行安装。"
#. Tag: title
-#: hardware.xml:2037
+#: hardware.xml:2047
#, no-c-format
msgid "Un*x or GNU system"
msgstr "Un*x 或 GNU 系统"
#. Tag: para
-#: hardware.xml:2039
+#: hardware.xml:2049
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
@@ -2926,13 +2939,13 @@ msgstr ""
">。这种安装方法只建议给高级用户在没有其他安装方法可选的情况下使用。"
#. Tag: title
-#: hardware.xml:2052
+#: hardware.xml:2062
#, no-c-format
msgid "Supported Storage Systems"
msgstr "受支持的存储系统"
#. Tag: para
-#: hardware.xml:2054
+#: hardware.xml:2064
#, no-c-format
msgid ""
"The &debian; installer contains a kernel which is built to maximize the "
@@ -2940,7 +2953,7 @@ msgid ""
msgstr "&debian; 安装程序包含的内核能运行在最大数量的系统上。"
#. Tag: para
-#: hardware.xml:2058
+#: hardware.xml:2068
#, no-c-format
msgid ""
"Generally, the &debian; installation system includes support for IDE (also "
@@ -2952,7 +2965,7 @@ msgstr ""
"动器、USB 和 FireWire。支持的文件系统有 FAT、Win-32 FAT 扩展(VFAT) 和 NTFS。"
#. Tag: para
-#: hardware.xml:2075
+#: hardware.xml:2085
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2974,7 +2987,7 @@ msgstr ""
"以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
#. Tag: para
-#: hardware.xml:2108
+#: hardware.xml:2118
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2985,7 +2998,7 @@ msgstr ""
"支持 CHRP 系统上的软盘。"
#. Tag: para
-#: hardware.xml:2114
+#: hardware.xml:2124
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2996,7 +3009,7 @@ msgstr ""
"支持软驱。"
#. Tag: para
-#: hardware.xml:2120
+#: hardware.xml:2130
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3004,7 +3017,7 @@ msgid ""
msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
#. Tag: para
-#: hardware.xml:2125
+#: hardware.xml:2135
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3016,13 +3029,13 @@ msgstr ""
"持。"
#. Tag: title
-#: hardware.xml:2142
+#: hardware.xml:2152
#, no-c-format
msgid "Memory and Disk Space Requirements"
msgstr "内存与磁盘空间的需求"
#. Tag: para
-#: hardware.xml:2144
+#: hardware.xml:2154
#, no-c-format
msgid ""
"You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -3035,7 +3048,7 @@ msgstr ""
"hardware-reqts\"/>。"
#. Tag: para
-#: hardware.xml:2151
+#: hardware.xml:2161
#, fuzzy, no-c-format
#| msgid ""
#| "Installation on systems with less memory<footnote condition=\"gtk\"> "
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index e9441e38e..f1a9e2c44 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.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: 2015-02-23 20:58+0000\n"
+"POT-Creation-Date: 2015-03-21 16:42+0000\n"
"PO-Revision-Date: 2012-11-26 13:49+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -2878,6 +2878,12 @@ msgid ""
"# OS, which is less safe as it might not be able to boot that other OS.\n"
"d-i grub-installer/with_other_os boolean true\n"
"\n"
+"# Due notably to potential USB sticks, the location of the MBR can not be\n"
+"# determined safely in general, so this needs to be specified:\n"
+"#d-i grub-installer/bootdev string /dev/sda\n"
+"# To install to the first device (assuming it is not a USB stick):\n"
+"#d-i grub-installer/bootdev string default\n"
+"\n"
"# Alternatively, if you want to install to a location other than the mbr,\n"
"# uncomment and edit these lines:\n"
"#d-i grub-installer/only_debian boolean false\n"
@@ -2885,10 +2891,6 @@ msgid ""
"#d-i grub-installer/bootdev string (hd0,1)\n"
"# To install grub to multiple disks:\n"
"#d-i grub-installer/bootdev string (hd0,1) (hd1,1) (hd2,1)\n"
-"# To install to a particular device:\n"
-"#d-i grub-installer/bootdev string /dev/sda\n"
-"# To install to the first device:\n"
-"#d-i grub-installer/bootdev string default\n"
"\n"
"# Optional password for grub, either in clear text\n"
"#d-i grub-installer/password password r00tme\n"