summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/administrivia.po20
-rw-r--r--po/zh_CN/boot-installer.po11
-rw-r--r--po/zh_CN/gpl.po88
-rw-r--r--po/zh_CN/hardware.po36
-rw-r--r--po/zh_CN/installation-howto.po18
-rw-r--r--po/zh_CN/partitioning.po253
-rw-r--r--po/zh_CN/post-install.po125
-rw-r--r--po/zh_CN/preseed.po21
-rw-r--r--po/zh_CN/using-d-i.po353
9 files changed, 502 insertions, 423 deletions
diff --git a/po/zh_CN/administrivia.po b/po/zh_CN/administrivia.po
index 0e28b3d4b..275df5c60 100644
--- a/po/zh_CN/administrivia.po
+++ b/po/zh_CN/administrivia.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: 2018-06-03 06:59+0000\n"
+"POT-Creation-Date: 2019-08-06 18:46+0000\n"
"PO-Revision-Date: 2010-10-26 19:59+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -70,9 +70,10 @@ msgid ""
"Translators can use this paragraph to acknowledge the people responsible for "
"the translation of the manual. Translation teams are advised to just mention "
"the coordinator and maybe major contributors and thank everybody else in a "
-"phrase like \"all translators and reviewers from the translation team for "
-"{your language} at {your l10n mailinglist}\". See build/lang-options/README "
-"on how to enable this paragraph. Its condition is \"about-langteam\"."
+"phrase like <quote>all translators and reviewers from the translation team "
+"for {your language} at {your l10n mailinglist}</quote>. See build/lang-"
+"options/README on how to enable this paragraph. Its condition is "
+"<quote>about-langteam</quote>."
msgstr ""
"Debian 安装手册简体中文版翻译项目由 Carlos Z.F. Liu 发起组织,参加翻译和校对"
"的人员有(按字母和拼音排列):Carlos Liu、Huaxia Zhao、Kov Tchai、Ming Hua、"
@@ -136,11 +137,12 @@ msgid ""
"manual-readme;\">README</ulink> from the source root directory."
msgstr ""
"更佳的途径是取得一份本文档的 DocBook 源文件拷贝,给它打一个补丁。DocBook 的源"
-"文件位于 <ulink url=\"&url-d-i-project-salsa;\">installation-guide project on salsa</ulink>。如"
-"果您不熟悉 DocBook,别发愁:在 manuals 目录下有一个简单的 cheatsheet 文件,可"
-"以帮您起步。它像 html 文件,但更侧重于文字的含义而不是显示。欢迎将补丁提交到 "
-"debian-boot 邮件列表(见下)。关于如何从 SVN 检出(check out)源文件,请参考源文"
-"件目录中的 <ulink url=\"&url-manual-readme;\">README</ulink>。"
+"文件位于 <ulink url=\"&url-d-i-project-salsa;\">installation-guide project "
+"on salsa</ulink>。如果您不熟悉 DocBook,别发愁:在 manuals 目录下有一个简单"
+"的 cheatsheet 文件,可以帮您起步。它像 html 文件,但更侧重于文字的含义而不是"
+"显示。欢迎将补丁提交到 debian-boot 邮件列表(见下)。关于如何从 SVN 检出(check "
+"out)源文件,请参考源文件目录中的 <ulink url=\"&url-manual-readme;\">README</"
+"ulink>。"
#. Tag: para
#: administrivia.xml:82
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 37262e24c..09c3cbc5c 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-06-18 23:08+0000\n"
+"POT-Creation-Date: 2019-08-06 20:58+0000\n"
"PO-Revision-Date: 2017-06-11 22:36+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -1394,8 +1394,9 @@ msgid ""
"Choosing the <quote>Help</quote> entry will result in the first help screen "
"being displayed which gives an overview of all available help screens. To "
"return to the boot menu after the help screens have been displayed, type "
-"'menu' at the boot prompt and press &enterkey;. All help screens have a boot "
-"prompt at which the boot command can be typed: <informalexample><screen>\n"
+"<quote>menu</quote> at the boot prompt and press &enterkey;. All help "
+"screens have a boot prompt at which the boot command can be typed: "
+"<informalexample><screen>\n"
"Press F1 for the help index, or ENTER to boot:\n"
"</screen></informalexample> At this boot prompt you can either just press "
"&enterkey; to boot the installer with default options or enter a specific "
@@ -1406,8 +1407,8 @@ msgid ""
"the first parameter (e.g., <userinput>install fb=false</userinput>)."
msgstr ""
"选择 <quote>Help</quote> 项将进入第一个帮助界面,显示可用的帮助界面概要。当出"
-"现帮助界面后要返回引导菜单,需要在引导提示符后输入 'menu' 并按 &enterkey;。所"
-"有的帮助界面在引导命令可以输入的地方都有一个引导提示:"
+"现帮助界面后要返回引导菜单,需要在引导提示符后输入 <quote>menu</quote> 并按 "
+"&enterkey;。所有的帮助界面在引导命令可以输入的地方都有一个引导提示:"
"<informalexample><screen>\n"
"Press F1 for the help index, or ENTER to boot:\n"
"</screen></informalexample> 在这个引导提示的地方您可以按下 &enterkey; 使用默"
diff --git a/po/zh_CN/gpl.po b/po/zh_CN/gpl.po
index b2ab32810..db9c99a89 100644
--- a/po/zh_CN/gpl.po
+++ b/po/zh_CN/gpl.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: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2019-08-07 21:24+0000\n"
"PO-Revision-Date: 2010-04-07 12:20+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -219,19 +219,21 @@ msgid ""
"<emphasis role=\"bold\">0.</emphasis> This License applies to any program or "
"other work which contains a notice placed by the copyright holder saying it "
"may be distributed under the terms of this General Public License. The "
-"\"Program\", below, refers to any such program or work, and a \"work based "
-"on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language. (Hereinafter, translation is included without limitation in the "
-"term \"modification\".) Each licensee is addressed as \"you\"."
+"<quote>Program</quote>, below, refers to any such program or work, and a "
+"<quote>work based on the Program</quote> means either the Program or any "
+"derivative work under copyright law: that is to say, a work containing the "
+"Program or a portion of it, either verbatim or with modifications and/or "
+"translated into another language. (Hereinafter, translation is included "
+"without limitation in the term <quote>modification</quote>.) Each licensee "
+"is addressed as <quote>you</quote>."
msgstr ""
"<emphasis role=\"bold\">0.</emphasis> 凡著作权人在其程序或其他著作中声明,该"
-"程序或著作会在通用公共授权条款下发布,本授权对其均有适用。以下所称的\"程序"
-"\",是指任何一种适用通用公共授权的程序或著作;并且一个\"基于本程序的著作\","
-"则指本程序或任何基于著作权法所产生的衍生著作,换言之,是指包含本程序全部或一"
-"部的著作,不论是完整的或经过修改的程序,以及(或)翻译成其他语言的程序(以下"
-"\"修改\"一词包括但不限于翻译行为在內)。被授权人则称为\"您\"。"
+"程序或著作会在通用公共授权条款下发布,本授权对其均有适用。以下所称的<quote>程"
+"序</quote>,是指任何一种适用通用公共授权的程序或著作;并且一个<quote>基于本程"
+"序的著作</quote>,则指本程序或任何基于著作权法所产生的衍生著作,换言之,是指"
+"包含本程序全部或一部的著作,不论是完整的或经过修改的程序,以及(或)翻译成其"
+"他语言的程序(以下<quote>修改</quote>一词包括但不限于翻译行为在內)。被授权人"
+"则称为<quote>您</quote>。"
#. Tag: para
#: gpl.xml:134
@@ -606,18 +608,19 @@ msgid ""
"to time. Such new versions will be similar in spirit to the present version, "
"but may differ in detail to address new problems or concerns. Each version "
"is given a distinguishing version number. If the Program specifies a version "
-"number of this License which applies to it and \"any later version\", you "
-"have the option of following the terms and conditions either of that version "
-"or of any later version published by the Free Software Foundation. If the "
-"Program does not specify a version number of this License, you may choose "
-"any version ever published by the Free Software Foundation."
+"number of this License which applies to it and <quote>any later version</"
+"quote>, you have the option of following the terms and conditions either of "
+"that version or of any later version published by the Free Software "
+"Foundation. If the Program does not specify a version number of this "
+"License, you may choose any version ever published by the Free Software "
+"Foundation."
msgstr ""
"<emphasis role=\"bold\">9.</emphasis> 自由软件基金会得随时发表通用公共授权的"
"修正版与/或新版本。新版本在精神上将近似于目前的版本,然而在细节上或所不同以"
"因应新的问题或状况。每一个版本都有个別的版本号码。若本程序指定有授权版本号"
-"码,表示其适用该版本或是\"任何新版本\"时,您可以选择遵循该版本或任何由自由软"
-"件基金会日后所发表新版本的条款与条件。若本程序并未指定授权版本号码时,您可以"
-"选择任一自由软件基金会所发表的版本。"
+"码,表示其适用该版本或是<quote>任何新版本</quote>时,您可以选择遵循该版本或任"
+"何由自由软件基金会日后所发表新版本的条款与条件。若本程序并未指定授权版本号码"
+"时,您可以选择任一自由软件基金会所发表的版本。"
#. Tag: para
#: gpl.xml:383
@@ -651,12 +654,12 @@ msgid ""
"<emphasis role=\"bold\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED FREE "
"OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY "
"APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT "
-"HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY "
-"OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE "
-"IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. "
-"THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH "
-"YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL "
-"NECESSARY SERVICING, REPAIR OR CORRECTION."
+"HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM <quote>AS IS</quote> "
+"WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT "
+"NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE "
+"PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST "
+"OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
msgstr ""
"<emphasis role=\"bold\">11.</emphasis> 由于本程序是无偿授权,因此在法律许可范"
"围內,本授权对本程序并不负担保责任。非经书面声明,著作权人与/或其他提供程序"
@@ -714,8 +717,9 @@ msgstr ""
msgid ""
"To do so, attach the following notices to the program. It is safest to "
"attach them to the start of each source file to most effectively convey the "
-"exclusion of warranty; and each file should have at least the \"copyright\" "
-"line and a pointer to where the full notice is found."
+"exclusion of warranty; and each file should have at least the "
+"<quote>copyright</quote> line and a pointer to where the full notice is "
+"found."
msgstr ""
"为了做到这一点,请将以下声明附加到程序上。最安全的作法,是将声明放在每份源码"
"挡案的起始处,以有效传达无担保责任的讯息;且每份挡案至少应有「著作权」列以及"
@@ -779,8 +783,10 @@ msgid ""
"Gnomovision version 69, Copyright (C) <replaceable>year name of author</"
"replaceable>\n"
"Gnomovision comes with absolutely no warranty; for details\n"
-"type `show w'. This is free software, and you are welcome\n"
-"to redistribute it under certain conditions; type `show c'\n"
+"type <userinput>show w</userinput>. This is free software, and you are "
+"welcome\n"
+"to redistribute it under certain conditions; type <userinput>show c</"
+"userinput>\n"
"for details."
msgstr ""
"Gnomovision 第69版,著作权所有 (C) <replaceable>年份 作者姓名</replaceable>\n"
@@ -791,22 +797,23 @@ msgstr ""
#: gpl.xml:462
#, no-c-format
msgid ""
-"The hypothetical commands `show w' and `show c' should show the appropriate "
-"parts of the General Public License. Of course, the commands you use may be "
-"called something other than `show w' and `show c'; they could even be mouse-"
-"clicks or menu items &mdash; whatever suits your program."
+"The hypothetical commands <quote>show w</quote> and <quote>show c</quote> "
+"should show the appropriate parts of the General Public License. Of course, "
+"the commands you use may be called something other than <quote>show w</"
+"quote> and <quote>show c</quote>; they could even be mouse-clicks or menu "
+"items &mdash; whatever suits your program."
msgstr ""
-"所假设的指令'show w'与'show c'应显示通用公共授权的相对应条款。当然,您可以使"
-"用'show w'与'show c'以外的指令名称;甚至以鼠标键击或选菜单方式进行-只要是合于"
-"您程序需要的方式都可以。"
+"所假设的指令<quote>show w</quote>与<quote>show c</quote>应显示通用公共授权的"
+"相对应条款。当然,您可以使用<quote>show w</quote>与<quote>show c</quote>以外"
+"的指令名称;甚至以鼠标键击或选菜单方式进行-只要是合于您程序需要的方式都可以。"
#. Tag: para
#: gpl.xml:470
#, no-c-format
msgid ""
"You should also get your employer (if you work as a programmer) or your "
-"school, if any, to sign a \"copyright disclaimer\" for the program, if "
-"necessary. Here is a sample; alter the names:"
+"school, if any, to sign a <quote>copyright disclaimer</quote> for the "
+"program, if necessary. Here is a sample; alter the names:"
msgstr ""
"如有需要,您亦应取得您的雇主(若您的工作为程序设计師)或学校就本程序所签署的"
"「著作权放弃承諾书」。其范例如下,您只要修改姓名即可:"
@@ -816,7 +823,8 @@ msgstr ""
#, no-c-format
msgid ""
"Yoyodyne, Inc., hereby disclaims all copyright interest in the\n"
-"program `Gnomovision' (which makes passes at compilers) written\n"
+"program <userinput>Gnomovision</userinput> (which makes passes at compilers) "
+"written\n"
"by James Hacker.\n"
"\n"
"<replaceable>signature of Ty Coon</replaceable>, 1 April 1989\n"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 8c5ef9159..7dd7f39d1 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2017-07-12 09:14+0000\n"
+"POT-Creation-Date: 2019-08-11 15:17+0000\n"
"PO-Revision-Date: 2017-06-12 15:07+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -110,52 +110,52 @@ msgstr "Flavor"
#. Tag: entry
#: hardware.xml:60
#, no-c-format
+msgid "AMD64 &amp; Intel 64"
+msgstr "AMD64 &amp; Intel 64"
+
+#. Tag: entry
+#: hardware.xml:61
+#, no-c-format
+msgid "amd64"
+msgstr "amd64"
+
+#. Tag: entry
+#: hardware.xml:67
+#, no-c-format
msgid "Intel x86-based"
msgstr "基于 Intel x86"
#. Tag: entry
-#: hardware.xml:61
+#: hardware.xml:68
#, no-c-format
msgid "i386"
msgstr "i386"
#. Tag: entry
-#: hardware.xml:62
+#: hardware.xml:69
#, no-c-format
msgid "default x86 machines"
msgstr "默认的 x86 机器"
#. Tag: entry
-#: hardware.xml:63
+#: hardware.xml:70
#, no-c-format
msgid "default"
msgstr "default"
#. Tag: entry
-#: hardware.xml:65
+#: hardware.xml:72
#, no-c-format
msgid "Xen PV domains only"
msgstr "仅 Xen PV 域"
#. Tag: entry
-#: hardware.xml:66
+#: hardware.xml:73
#, no-c-format
msgid "<entry>xen</entry>"
msgstr "<entry>xen</entry>"
#. Tag: entry
-#: hardware.xml:70
-#, no-c-format
-msgid "AMD64 &amp; Intel 64"
-msgstr "AMD64 &amp; Intel 64"
-
-#. Tag: entry
-#: hardware.xml:71
-#, no-c-format
-msgid "amd64"
-msgstr "amd64"
-
-#. Tag: entry
#: hardware.xml:77
#, no-c-format
msgid "<entry>ARM</entry>"
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index d84a0f862..f67cbb94c 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2018-11-09 18:04+0000\n"
+"POT-Creation-Date: 2019-08-06 21:54+0000\n"
"PO-Revision-Date: 2017-06-11 22:12+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -117,17 +117,17 @@ msgstr "CDROM"
msgid ""
"The netinst CD image is a popular image which can be used to install "
"&releasename; with the &d-i;. This image is intended to boot from CD and "
-"install additional packages over a network; hence the name 'netinst'. The "
-"image has the software components needed to run the installer and the base "
-"packages to provide a minimal &releasename; system. If you'd rather, you can "
-"get a full size CD image which will not need the network to install. You "
-"only need the first CD of the set."
+"install additional packages over a network; hence the name <quote>netinst</"
+"quote>. The image has the software components needed to run the installer "
+"and the base packages to provide a minimal &releasename; system. If you'd "
+"rather, you can get a full size CD image which will not need the network to "
+"install. You only need the first CD of the set."
msgstr ""
"netinst CD 映像是常用的映像可以用来通过 &d-i; 安装 &releasename;。使用该映像"
"文件让计算机从光盘启动,再由安装程序从网络上下载安装其它的软件包,因此称做 "
-"'netinst'。该映像含有运行安装程序的软件模块,以及提供一个最小 &releasename; "
-"系统的基本软件包。如果您乐意,可以下载一个标准大小的 CD 映像文件,用它的话就"
-"可以不借助网络安装了。这只需要一套光盘中的第一张就行了。"
+"<quote>netinst</quote>。该映像含有运行安装程序的软件模块,以及提供一个最小 "
+"&releasename; 系统的基本软件包。如果您乐意,可以下载一个标准大小的 CD 映像文"
+"件,用它的话就可以不借助网络安装了。这只需要一套光盘中的第一张就行了。"
#. Tag: para
#: installation-howto.xml:77
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index d860957b4..2a1ce1376 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.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-04-15 20:29+0000\n"
+"POT-Creation-Date: 2019-08-11 15:17+0000\n"
"PO-Revision-Date: 2012-11-26 00:20+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -364,8 +364,8 @@ msgid ""
"The root partition <filename>/</filename> must always physically contain "
"<filename>/etc</filename>, <filename>/bin</filename>, <filename>/sbin</"
"filename>, <filename>/lib</filename> and <filename>/dev</filename>, "
-"otherwise you won't be able to boot. Typically &root-system-size-min;&ndash;&root-system-size-max;MB is needed for "
-"the root partition."
+"otherwise you won't be able to boot. Typically &root-system-size-min;&ndash;"
+"&root-system-size-max;MB is needed for the root partition."
msgstr ""
"根分区 <filename>/</filename> 必须总是物理地包含 <filename>/etc</filename>、"
"<filename>/bin</filename>、<filename>/sbin</filename>、<filename>/lib</"
@@ -466,14 +466,18 @@ msgstr "推荐的分区方案"
#. Tag: para
#: partitioning.xml:236
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For new users, personal &debian; boxes, home systems, and other single-"
+#| "user setups, a single <filename>/</filename> partition (plus swap) is "
+#| "probably the easiest, simplest way to go. However, if your partition is "
+#| "larger than around 6GB, choose ext3 as your partition type. Ext2 "
+#| "partitions need periodic file system integrity checking, and this can "
+#| "cause delays during booting when the partition is large."
msgid ""
"For new users, personal &debian; boxes, home systems, and other single-user "
"setups, a single <filename>/</filename> partition (plus swap) is probably "
-"the easiest, simplest way to go. However, if your partition is larger than "
-"around 6GB, choose ext3 as your partition type. Ext2 partitions need "
-"periodic file system integrity checking, and this can cause delays during "
-"booting when the partition is large."
+"the easiest, simplest way to go. The recommended partition type is ext4."
msgstr ""
"对于新用户,个人 &debian; 系统、家庭系统以及其它单用户配置来说,一个单一 "
"<filename>/</filename> 分区(加上交换分区)可能是最容易的方案。但是如果您的分区"
@@ -481,7 +485,7 @@ msgstr ""
"分区很大的时候,这将导致引导期间的延迟。"
#. Tag: para
-#: partitioning.xml:245
+#: partitioning.xml:243
#, no-c-format
msgid ""
"For multi-user systems or systems with lots of disk space, it's best to put "
@@ -489,23 +493,31 @@ msgid ""
"filename> each on their own partitions separate from the <filename>/</"
"filename> partition."
msgstr ""
-"对于多用户系统或者有大量磁盘空间的系统,最好将 "
-"<filename>/var</filename>、<filename>/tmp</filename> 和 <filename>/home</"
-"filename> 分配到他们各自的分区,与 <filename>/</filename> 分区分离开来。"
+"对于多用户系统或者有大量磁盘空间的系统,最好将 <filename>/var</filename>、"
+"<filename>/tmp</filename> 和 <filename>/home</filename> 分配到他们各自的分"
+"区,与 <filename>/</filename> 分区分离开来。"
#. Tag: para
-#: partitioning.xml:253
-#, no-c-format
+#: partitioning.xml:251
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You might need a separate <filename>/usr/local</filename> partition if "
+#| "you plan to install many programs that are not part of the &debian; "
+#| "distribution. If your machine will be a mail server, you might need to "
+#| "make <filename>/var/mail</filename> a separate partition. Often, putting "
+#| "<filename>/tmp</filename> on its own partition, for instance "
+#| "20&ndash;50MB, is a good idea. If you are setting up a server with lots "
+#| "of user accounts, it's generally good to have a separate, large "
+#| "<filename>/home</filename> partition. In general, the partitioning "
+#| "situation varies from computer to computer depending on its uses."
msgid ""
"You might need a separate <filename>/usr/local</filename> partition if you "
"plan to install many programs that are not part of the &debian; "
"distribution. If your machine will be a mail server, you might need to make "
-"<filename>/var/mail</filename> a separate partition. Often, putting "
-"<filename>/tmp</filename> on its own partition, for instance 20&ndash;50MB, "
-"is a good idea. If you are setting up a server with lots of user accounts, "
-"it's generally good to have a separate, large <filename>/home</filename> "
-"partition. In general, the partitioning situation varies from computer to "
-"computer depending on its uses."
+"<filename>/var/mail</filename> a separate partition. If you are setting up a "
+"server with lots of user accounts, it's generally good to have a separate, "
+"large <filename>/home</filename> partition. In general, the partitioning "
+"situation varies from computer to computer depending on its uses."
msgstr ""
"如果您计划安装 &debian; 发布版以外的程序,也许需要一个独立的 <filename>/usr/"
"local</filename> 分区。如果您的机器是一个邮件服务器,也许需要为 <filename>/"
@@ -515,7 +527,7 @@ msgstr ""
"好。一般来说,分区状况在每台计算机都不同,这取决于它们的用途。"
#. Tag: para
-#: partitioning.xml:265
+#: partitioning.xml:262
#, no-c-format
msgid ""
"For very complex systems, you should see the <ulink url=\"&url-multidisk-"
@@ -527,15 +539,20 @@ msgstr ""
"有用。"
#. Tag: para
-#: partitioning.xml:272
-#, no-c-format
+#: partitioning.xml:269
+#, fuzzy, no-c-format
+#| msgid ""
+#| "With respect to the issue of swap partition size, there are many views. "
+#| "One rule of thumb which works well is to use as much swap as you have "
+#| "system memory. It also shouldn't be smaller than 16MB, in most cases. Of "
+#| "course, there are exceptions to these rules. If you are trying to solve "
+#| "10000 simultaneous equations on a machine with 256MB of memory, you may "
+#| "need a gigabyte (or more) of swap."
msgid ""
"With respect to the issue of swap partition size, there are many views. One "
"rule of thumb which works well is to use as much swap as you have system "
-"memory. It also shouldn't be smaller than 16MB, in most cases. Of course, "
-"there are exceptions to these rules. If you are trying to solve 10000 "
-"simultaneous equations on a machine with 256MB of memory, you may need a "
-"gigabyte (or more) of swap."
+"memory. It also shouldn't be smaller than 512MB, in most cases. Of course, "
+"there are exceptions to these rules."
msgstr ""
"在交换分区大小方面,这里有很多观点。其中一条经验是使用和内存相同大小的交换分"
"区。在大多数情况下它也不应该小于16MB。当然,这里有一些例外。如果您正在尝试在"
@@ -543,29 +560,19 @@ msgstr ""
"交换分区。"
#. Tag: para
-#: partitioning.xml:281
-#, no-c-format
-msgid ""
-"On some 32-bit architectures (m68k and PowerPC), the maximum size of a swap "
-"partition is 2GB. That should be enough for nearly any installation. "
-"However, if your swap requirements are this high, you should probably try to "
-"spread the swap across different disks (also called <quote>spindles</quote>) "
-"and, if possible, different SCSI or IDE channels. The kernel will balance "
-"swap usage between multiple swap partitions, giving better performance."
-msgstr ""
-"在 32 位体系结构(m68k 和 PowerPC)下,最大的交换分区尺寸是 2GB。这应该基本满足"
-"任何安装情况。但是如果您的交换分区需求非常大,您或许该将交换分区散布到不同磁"
-"盘中(也叫做 <quote>spindles</quote>),并且如果可能的话,使用不同的 SCSI 或者 "
-"IDE 通道。内核将平衡使用多个交换分区以达到更好的性能。"
-
-#. Tag: para
-#: partitioning.xml:291
-#, no-c-format
-msgid ""
-"As an example, an older home machine might have 32MB of RAM and a 1.7GB IDE "
-"drive on <filename>/dev/sda</filename>. There might be a 500MB partition for "
-"another operating system on <filename>/dev/sda1</filename>, a 32MB swap "
-"partition on <filename>/dev/sda3</filename> and about 1.2GB on <filename>/"
+#: partitioning.xml:276
+#, fuzzy, no-c-format
+#| msgid ""
+#| "As an example, an older home machine might have 32MB of RAM and a 1.7GB "
+#| "IDE drive on <filename>/dev/sda</filename>. There might be a 500MB "
+#| "partition for another operating system on <filename>/dev/sda1</filename>, "
+#| "a 32MB swap partition on <filename>/dev/sda3</filename> and about 1.2GB "
+#| "on <filename>/dev/sda2</filename> as the Linux partition."
+msgid ""
+"As an example, an older home machine might have 512MB of RAM and a 20GB SATA "
+"drive on <filename>/dev/sda</filename>. There might be a 8GB partition for "
+"another operating system on <filename>/dev/sda1</filename>, a 512MB swap "
+"partition on <filename>/dev/sda3</filename> and about 11.4GB on <filename>/"
"dev/sda2</filename> as the Linux partition."
msgstr ""
"举一个例子,一个较老的家用机器上,可能有 32MB 内存和一个 <filename>/dev/sda</"
@@ -575,7 +582,7 @@ msgstr ""
"区。"
#. Tag: para
-#: partitioning.xml:300
+#: partitioning.xml:285
#, no-c-format
msgid ""
"For an idea of the space taken by tasks you might be interested in adding "
@@ -586,13 +593,13 @@ msgstr ""
"道,请查阅 <xref linkend=\"tasksel-size-list\"/>。"
#. Tag: title
-#: partitioning.xml:316
+#: partitioning.xml:301
#, no-c-format
msgid "Device Names in Linux"
msgstr "Linux 里面的设备名称"
#. Tag: para
-#: partitioning.xml:317
+#: partitioning.xml:302
#, no-c-format
msgid ""
"Linux disks and partition names may be different from other operating "
@@ -603,26 +610,26 @@ msgstr ""
"Linux 所使用的设备名称。这里是基本的命名方案:"
#. Tag: para
-#: partitioning.xml:325
+#: partitioning.xml:310
#, no-c-format
msgid "The first floppy drive is named <filename>/dev/fd0</filename>."
msgstr "第一个软盘驱动器被命名为 <filename>/dev/fd0</filename>。"
#. Tag: para
-#: partitioning.xml:330
+#: partitioning.xml:315
#, no-c-format
msgid "The second floppy drive is named <filename>/dev/fd1</filename>."
msgstr "第二个软盘驱动器被命名为 <filename>/dev/fd1</filename>。"
#. Tag: para
-#: partitioning.xml:335
+#: partitioning.xml:320
#, fuzzy, no-c-format
#| msgid "The first DASD device is named <filename>/dev/dasda</filename>."
msgid "The first hard disk detected is named <filename>/dev/sda</filename>."
msgstr "第一个 DASD 设备被命名为 <filename>/dev/dasda</filename>。"
#. Tag: para
-#: partitioning.xml:340
+#: partitioning.xml:325
#, fuzzy, no-c-format
#| msgid ""
#| "The second DASD device is named <filename>/dev/dasdb</filename>, and so "
@@ -633,7 +640,7 @@ msgid ""
msgstr "第二个 DASD 设备被命名为 <filename>/dev/dasdb</filename>,等等。"
#. Tag: para
-#: partitioning.xml:346
+#: partitioning.xml:331
#, no-c-format
msgid ""
"The first SCSI CD-ROM is named <filename>/dev/scd0</filename>, also known as "
@@ -643,20 +650,20 @@ msgstr ""
"<filename>/dev/sr0</filename>。"
#. Tag: para
-#: partitioning.xml:355
+#: partitioning.xml:340
#, no-c-format
msgid "The first DASD device is named <filename>/dev/dasda</filename>."
msgstr "第一个 DASD 设备被命名为 <filename>/dev/dasda</filename>。"
#. Tag: para
-#: partitioning.xml:361
+#: partitioning.xml:346
#, no-c-format
msgid ""
"The second DASD device is named <filename>/dev/dasdb</filename>, and so on."
msgstr "第二个 DASD 设备被命名为 <filename>/dev/dasdb</filename>,等等。"
#. Tag: para
-#: partitioning.xml:369
+#: partitioning.xml:354
#, no-c-format
msgid ""
"The partitions on each disk are represented by appending a decimal number to "
@@ -669,7 +676,7 @@ msgstr ""
"一个和第二个分区。"
#. Tag: para
-#: partitioning.xml:376
+#: partitioning.xml:361
#, no-c-format
msgid ""
"Here is a real-life example. Let's assume you have a system with 2 SCSI "
@@ -688,7 +695,7 @@ msgstr ""
"filename> 及其分区。"
#. Tag: para
-#: partitioning.xml:387
+#: partitioning.xml:372
#, no-c-format
msgid ""
"Note that if you have two SCSI host bus adapters (i.e., controllers), the "
@@ -700,7 +707,7 @@ msgstr ""
"的解决方案是观察引导信息,如果您知道驱动器型号和/或者容量。"
#. Tag: para
-#: partitioning.xml:394
+#: partitioning.xml:379
#, fuzzy, no-c-format
#| msgid ""
#| "Linux represents the primary partitions as the drive name, plus the "
@@ -725,7 +732,7 @@ msgstr ""
"适用。"
#. Tag: para
-#: partitioning.xml:404
+#: partitioning.xml:389
#, no-c-format
msgid ""
"Sun disk partitions allow for 8 separate partitions (or slices). The third "
@@ -733,12 +740,12 @@ msgid ""
"quote> partition. This partition references all of the sectors of the disk, "
"and is used by the boot loader (either SILO, or Sun's)."
msgstr ""
-"Sun 磁盘分区允许8个独立的分区(或者片)。第三个分区通常是(一般也被建议设置为)"
-"<quote>Whole Disk</quote>分区。这个分区代表磁盘上所有的扇区,并且将被启动引导"
-"器(SILO 或者 SUN 的)使用。"
+"Sun 磁盘分区允许8个独立的分区(或者片)。第三个分区通常是(一般也被建议设置"
+"为)<quote>Whole Disk</quote>分区。这个分区代表磁盘上所有的扇区,并且将被启动"
+"引导器(SILO 或者 SUN 的)使用。"
#. Tag: para
-#: partitioning.xml:411
+#: partitioning.xml:396
#, no-c-format
msgid ""
"The partitions on each disk are represented by appending a decimal number to "
@@ -751,13 +758,13 @@ msgstr ""
"个 DASD 设备的第一个以及第二个分区。"
#. Tag: title
-#: partitioning.xml:426
+#: partitioning.xml:411
#, no-c-format
msgid "&debian; Partitioning Programs"
msgstr "&debian; 分区程序"
#. Tag: para
-#: partitioning.xml:427
+#: partitioning.xml:412
#, no-c-format
msgid ""
"Several varieties of partitioning programs have been adapted by &debian; "
@@ -769,7 +776,7 @@ msgstr ""
"合您的体系的程序列表。"
#. Tag: para
-#: partitioning.xml:440
+#: partitioning.xml:425
#, no-c-format
msgid ""
"Recommended partitioning tool in &debian;. This Swiss army knife can also "
@@ -782,13 +789,13 @@ msgstr ""
"区至挂接点。"
#. Tag: para
-#: partitioning.xml:452
+#: partitioning.xml:437
#, no-c-format
msgid "The original Linux disk partitioner, good for gurus."
msgstr "最早的 Linux 磁盘分区工具,对于老手很好用。"
#. Tag: para
-#: partitioning.xml:456
+#: partitioning.xml:441
#, no-c-format
msgid ""
"Be careful if you have existing FreeBSD partitions on your machine. The "
@@ -802,13 +809,13 @@ msgstr ""
"参阅 <ulink url=\"&url-linux-freebsd;\">Linux+FreeBSD HOWTO</ulink>。"
#. Tag: para
-#: partitioning.xml:469
+#: partitioning.xml:454
#, no-c-format
msgid "A simple-to-use, full-screen disk partitioner for the rest of us."
msgstr "一个简单易用、全屏幕的磁盘分区程序。供其他人员使用。"
#. Tag: para
-#: partitioning.xml:473
+#: partitioning.xml:458
#, no-c-format
msgid ""
"Note that <command>cfdisk</command> doesn't understand FreeBSD partitions at "
@@ -818,25 +825,25 @@ msgstr ""
"设备名称与结果可能不同。"
#. Tag: para
-#: partitioning.xml:483
+#: partitioning.xml:468
#, no-c-format
msgid "Atari-aware version of <command>fdisk</command>."
msgstr "Atari 版本的 <command>fdisk</command>。"
#. Tag: para
-#: partitioning.xml:492
+#: partitioning.xml:477
#, no-c-format
msgid "Amiga-aware version of <command>fdisk</command>."
msgstr "Amiga-aware 版本的 <command>fdisk</command>。"
#. Tag: para
-#: partitioning.xml:501
+#: partitioning.xml:486
#, no-c-format
msgid "Mac-aware version of <command>fdisk</command>."
msgstr "Mac-aware 版本的 <command>fdisk</command>。"
#. Tag: para
-#: partitioning.xml:510
+#: partitioning.xml:495
#, no-c-format
msgid ""
"PowerMac-aware version of <command>fdisk</command>, also used by BVM and "
@@ -846,7 +853,7 @@ msgstr ""
"VMEbus 系统。"
#. Tag: para
-#: partitioning.xml:520
+#: partitioning.xml:505
#, no-c-format
msgid ""
"&arch-title; version of <command>fdisk</command>; Please read the fdasd "
@@ -861,7 +868,7 @@ msgstr ""
"\"Installation Commands</ulink> 的第 13 章获得详细信息。"
#. Tag: para
-#: partitioning.xml:531
+#: partitioning.xml:516
#, no-c-format
msgid ""
"One of these programs will be run by default when you select "
@@ -874,13 +881,13 @@ msgstr ""
"式。"
#. Tag: para
-#: partitioning.xml:538
+#: partitioning.xml:523
#, no-c-format
msgid "Remember to mark your boot partition as <quote>Bootable</quote>."
msgstr "要记得标记您的引导分区为 <quote>Bootable</quote>。"
#. Tag: para
-#: partitioning.xml:541
+#: partitioning.xml:526
#, no-c-format
msgid ""
"One key point when partitioning for Mac type disks is that the swap "
@@ -897,14 +904,14 @@ msgstr ""
# index.docbook:612, index.docbook:672, index.docbook:696, index.docbook:793, index.docbook:912, index.docbook:989
#. Tag: title
-#: partitioning.xml:557 partitioning.xml:581 partitioning.xml:677
-#: partitioning.xml:791 partitioning.xml:868
+#: partitioning.xml:542 partitioning.xml:566 partitioning.xml:662
+#: partitioning.xml:776 partitioning.xml:853
#, no-c-format
msgid "Partitioning for &arch-title;"
msgstr "为 &arch-title; 准备分区"
#. Tag: para
-#: partitioning.xml:558
+#: partitioning.xml:543
#, no-c-format
msgid ""
"PALO, the HPPA boot loader, requires a partition of type <quote>F0</quote> "
@@ -930,7 +937,7 @@ msgstr ""
"25&ndash;50 MB 一般来说应该足够了。"
#. Tag: para
-#: partitioning.xml:582
+#: partitioning.xml:567
#, no-c-format
msgid ""
"If you have an existing other operating system such as DOS or Windows and "
@@ -947,7 +954,7 @@ msgstr ""
"<guimenuitem>Manual</guimenuitem> 选项,然后只需选择已有的分区,更改其尺寸。"
#. Tag: para
-#: partitioning.xml:592
+#: partitioning.xml:577
#, no-c-format
msgid ""
"The PC BIOS generally adds additional constraints for disk partitioning. "
@@ -965,7 +972,7 @@ msgstr ""
"的介绍,帮助您在大多数情况下进行规划。"
#. Tag: para
-#: partitioning.xml:602
+#: partitioning.xml:587
#, no-c-format
msgid ""
"<quote>Primary</quote> partitions are the original partitioning scheme for "
@@ -983,7 +990,7 @@ msgstr ""
"一个扩展分区。"
#. Tag: para
-#: partitioning.xml:613
+#: partitioning.xml:598
#, no-c-format
msgid ""
"Linux limits the partitions per drive to 255 partitions for SCSI disks (3 "
@@ -999,7 +1006,7 @@ msgstr ""
"过 20 个的分区,除非您首先为这些分区手工创建了设备文件。"
#. Tag: para
-#: partitioning.xml:623
+#: partitioning.xml:608
#, no-c-format
msgid ""
"If you have a large IDE disk, and are using neither LBA addressing, nor "
@@ -1013,7 +1020,7 @@ msgstr ""
"盘第一个 1024 柱面内(在没有 BIOS 转换的情况下,大约有 524MB)。"
#. Tag: para
-#: partitioning.xml:631
+#: partitioning.xml:616
#, no-c-format
msgid ""
"This restriction doesn't apply if you have a BIOS newer than around "
@@ -1037,7 +1044,7 @@ msgstr ""
"&arch-kernel; 并不使用 BIOS 来进行磁盘寻址。"
#. Tag: para
-#: partitioning.xml:645
+#: partitioning.xml:630
#, no-c-format
msgid ""
"If you have a large disk, you might have to use cylinder translation "
@@ -1057,7 +1064,7 @@ msgstr ""
"</emphasis>的 1024 柱面内。"
#. Tag: para
-#: partitioning.xml:657
+#: partitioning.xml:642
#, no-c-format
msgid ""
"The recommended way of accomplishing this is to create a small "
@@ -1077,7 +1084,7 @@ msgstr ""
"起作用,甚至也不管您的 BIOS 是否支持大硬盘访问扩展。"
#. Tag: para
-#: partitioning.xml:678
+#: partitioning.xml:663
#, no-c-format
msgid ""
"The <command>partman</command> disk partitioner is the default partitioning "
@@ -1091,13 +1098,13 @@ msgstr ""
"<command>parted</command> 来进行磁盘分区的。"
#. Tag: title
-#: partitioning.xml:690
+#: partitioning.xml:675
#, no-c-format
msgid "EFI Recognized Formats"
msgstr "EFI 能够识别的格式"
#. Tag: para
-#: partitioning.xml:691
+#: partitioning.xml:676
#, no-c-format
msgid ""
"The IA-64 EFI firmware supports two partition table (or disk label) formats, "
@@ -1114,7 +1121,7 @@ msgstr ""
"DOS 分区表。"
#. Tag: para
-#: partitioning.xml:703
+#: partitioning.xml:688
#, no-c-format
msgid ""
"The automatic partitioning recipes for <command>partman</command> allocate "
@@ -1128,7 +1135,7 @@ msgstr ""
"配置分区。其方法类似设置一个 <emphasis>交换</emphasis> 分区。"
#. Tag: para
-#: partitioning.xml:711
+#: partitioning.xml:696
#, no-c-format
msgid ""
"The <command>partman</command> partitioner will handle most disk layouts. "
@@ -1173,13 +1180,13 @@ msgstr ""
"它可能要扫描坏区。"
#. Tag: title
-#: partitioning.xml:736
+#: partitioning.xml:721
#, no-c-format
msgid "Boot Loader Partition Requirements"
msgstr "启动引导器分区要求"
#. Tag: para
-#: partitioning.xml:737
+#: partitioning.xml:722
#, no-c-format
msgid ""
"ELILO, the IA-64 boot loader, requires a partition containing a FAT file "
@@ -1194,7 +1201,7 @@ msgstr ""
"个内核的话,128MB 也许更好。"
#. Tag: para
-#: partitioning.xml:746
+#: partitioning.xml:731
#, no-c-format
msgid ""
"The EFI Boot Manager and the EFI Shell fully support the GPT table so the "
@@ -1216,7 +1223,7 @@ msgstr ""
"入一个 EFI 分区。"
#. Tag: para
-#: partitioning.xml:761
+#: partitioning.xml:746
#, no-c-format
msgid ""
"It is strongly recommended that you allocate the EFI boot partition on the "
@@ -1226,13 +1233,13 @@ msgstr ""
"盘上。"
#. Tag: title
-#: partitioning.xml:769
+#: partitioning.xml:754
#, no-c-format
msgid "EFI Diagnostic Partitions"
msgstr "EFI 诊断分区"
#. Tag: para
-#: partitioning.xml:770
+#: partitioning.xml:755
#, no-c-format
msgid ""
"The EFI firmware is significantly more sophisticated than the usual BIOS "
@@ -1251,7 +1258,7 @@ msgstr ""
"区的时候。"
#. Tag: para
-#: partitioning.xml:792
+#: partitioning.xml:777
#, no-c-format
msgid ""
"SGI machines require an SGI disk label in order to make the system bootable "
@@ -1267,13 +1274,13 @@ msgstr ""
"入。注意 volume header 必须从 0 号扇区开始。"
#. Tag: title
-#: partitioning.xml:809
+#: partitioning.xml:794
#, no-c-format
msgid "Partitioning Newer PowerMacs"
msgstr "为较新的 PowerMacs 分区"
#. Tag: para
-#: partitioning.xml:810
+#: partitioning.xml:795
#, no-c-format
msgid ""
"If you are installing onto a NewWorld PowerMac you must create a special "
@@ -1295,7 +1302,7 @@ msgstr ""
"command> 里面使用 <userinput>b</userinput> 命令。"
#. Tag: para
-#: partitioning.xml:823
+#: partitioning.xml:808
#, no-c-format
msgid ""
"The special partition type Apple_Bootstrap is required to prevent MacOS from "
@@ -1306,7 +1313,7 @@ msgstr ""
"为里面 含有一些特殊修改的模式来让 OpenFirmware 能够自动启动它。"
#. Tag: para
-#: partitioning.xml:830
+#: partitioning.xml:815
#, no-c-format
msgid ""
"Note that the bootstrap partition is only meant to hold 3 very small files: "
@@ -1323,7 +1330,7 @@ msgstr ""
"command> 工具可以用来维护这个分区。"
#. Tag: para
-#: partitioning.xml:840
+#: partitioning.xml:825
#, no-c-format
msgid ""
"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
@@ -1343,7 +1350,7 @@ msgstr ""
"顺序。"
#. Tag: para
-#: partitioning.xml:852
+#: partitioning.xml:837
#, no-c-format
msgid ""
"Apple disks normally have several small driver partitions. If you intend to "
@@ -1357,7 +1364,7 @@ msgstr ""
"启动的时候,会初始化没有任何激活的 MacOS 分区以及驱动分区的磁盘。"
#. Tag: para
-#: partitioning.xml:869
+#: partitioning.xml:854
#, no-c-format
msgid ""
"Make sure you create a <quote>Sun disk label</quote> on your boot disk. This "
@@ -1370,7 +1377,7 @@ msgstr ""
"<keycap>s</keycap> 中用 <command>fdisk</command> 键来创建 Sun 磁盘标记。"
#. Tag: para
-#: partitioning.xml:877
+#: partitioning.xml:862
#, no-c-format
msgid ""
"Furthermore, on &arch-title; disks, make sure your first partition on your "
@@ -1389,7 +1396,7 @@ msgstr ""
"或者 UFS 分区在那里;它们将隔离分区表和引导块。"
#. Tag: para
-#: partitioning.xml:888
+#: partitioning.xml:873
#, no-c-format
msgid ""
"It is also advised that the third partition should be of type <quote>Whole "
@@ -1402,6 +1409,20 @@ msgstr ""
"command> 启动引导器工作良好。"
#~ msgid ""
+#~ "On some 32-bit architectures (m68k and PowerPC), the maximum size of a "
+#~ "swap partition is 2GB. That should be enough for nearly any installation. "
+#~ "However, if your swap requirements are this high, you should probably try "
+#~ "to spread the swap across different disks (also called <quote>spindles</"
+#~ "quote>) and, if possible, different SCSI or IDE channels. The kernel will "
+#~ "balance swap usage between multiple swap partitions, giving better "
+#~ "performance."
+#~ msgstr ""
+#~ "在 32 位体系结构(m68k 和 PowerPC)下,最大的交换分区尺寸是 2GB。这应该基本"
+#~ "满足任何安装情况。但是如果您的交换分区需求非常大,您或许该将交换分区散布到"
+#~ "不同磁盘中(也叫做 <quote>spindles</quote>),并且如果可能的话,使用不同的 "
+#~ "SCSI 或者 IDE 通道。内核将平衡使用多个交换分区以达到更好的性能。"
+
+#~ msgid ""
#~ "The first SCSI disk (SCSI ID address-wise) is named <filename>/dev/sda</"
#~ "filename>."
#~ msgstr ""
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index 5b547cc44..1ae62a519 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2018-08-31 23:21+0000\n"
+"POT-Creation-Date: 2019-08-11 15:17+0000\n"
"PO-Revision-Date: 2017-06-11 22:15+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -447,10 +447,19 @@ msgstr "默认的 E-Mail 配置"
#. Tag: para
#: post-install.xml:295
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Even if you are planning to use a graphical mail program, it is important "
+#| "that a traditional MTA/MDA is also installed and correctly set up on your "
+#| "&debian-gnu; system. Reason is that various utilities running on the "
+#| "system<footnote> <para> Examples are: <command>cron</command>, "
+#| "<command>quota</command>, <command>logcheck</command>, <command>aide</"
+#| "command>, &hellip; </para> </footnote> can send important notices by e-"
+#| "mail to inform the system administrator of (potential) problems or "
+#| "changes."
msgid ""
-"Even if you are planning to use a graphical mail program, it is important "
-"that a traditional MTA/MDA is also installed and correctly set up on your "
+"Even if you are planning to use a graphical mail program, it would be "
+"useful, to have a traditional MTA/MDA installed and correctly set up on your "
"&debian-gnu; system. Reason is that various utilities running on the "
"system<footnote> <para> Examples are: <command>cron</command>, "
"<command>quota</command>, <command>logcheck</command>, <command>aide</"
@@ -465,19 +474,31 @@ msgstr ""
#. Tag: para
#: post-install.xml:310
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For this reason the packages <classname>exim4</classname> and "
+#| "<classname>mutt</classname> will be installed by default (provided you "
+#| "did not unselect the <quote>standard</quote> task during the "
+#| "installation). <classname>exim4</classname> is a combination MTA/MDA that "
+#| "is relatively small but very flexible. By default it will be configured "
+#| "to only handle e-mail local to the system itself and e-mails addressed to "
+#| "the system administrator (root account) will be delivered to the regular "
+#| "user account created during the installation<footnote> <para> The "
+#| "forwarding of mail for root to the regular user account is configured in "
+#| "<filename>/etc/aliases</filename>. If no regular user account was "
+#| "created, the mail will of course be delivered to the root account itself. "
+#| "</para> </footnote>."
msgid ""
-"For this reason the packages <classname>exim4</classname> and "
-"<classname>mutt</classname> will be installed by default (provided you did "
-"not unselect the <quote>standard</quote> task during the installation). "
-"<classname>exim4</classname> is a combination MTA/MDA that is relatively "
-"small but very flexible. By default it will be configured to only handle e-"
-"mail local to the system itself and e-mails addressed to the system "
-"administrator (root account) will be delivered to the regular user account "
-"created during the installation<footnote> <para> The forwarding of mail for "
-"root to the regular user account is configured in <filename>/etc/aliases</"
-"filename>. If no regular user account was created, the mail will of course "
-"be delivered to the root account itself. </para> </footnote>."
+"For this you can install <classname>exim4</classname> and <classname>mutt</"
+"classname> with <command>apt install exim4 mutt</command>. <classname>exim4</"
+"classname> is a combination MTA/MDA that is relatively small but very "
+"flexible. By default it will be configured to only handle e-mail local to "
+"the system itself and e-mails addressed to the system administrator (root "
+"account) will be delivered to the regular user account created during the "
+"installation<footnote> <para> The forwarding of mail for root to the regular "
+"user account is configured in <filename>/etc/aliases</filename>. If no "
+"regular user account was created, the mail will of course be delivered to "
+"the root account itself. </para> </footnote>."
msgstr ""
"正因为如此,默认会安装 <classname>exim4</classname> 和 <classname>mutt</"
"classname> 软件包 (安装过程中您没有取消 <quote>standard</quote> 任务将提供它"
@@ -488,7 +509,7 @@ msgstr ""
"会发送给 root 帐号。</para> </footnote>。"
#. Tag: para
-#: post-install.xml:329
+#: post-install.xml:328
#, no-c-format
msgid ""
"When system e-mails are delivered they are added to a file in <filename>/var/"
@@ -500,13 +521,13 @@ msgstr ""
"<command>mutt</command> 读取。"
#. Tag: title
-#: post-install.xml:339
+#: post-install.xml:338
#, no-c-format
msgid "Sending E-Mails Outside The System"
msgstr "发送邮件到系统之外"
#. Tag: para
-#: post-install.xml:340
+#: post-install.xml:339
#, no-c-format
msgid ""
"As mentioned earlier, the installed &debian; system is only set up to handle "
@@ -517,7 +538,7 @@ msgstr ""
"收其他系统的邮件。"
#. Tag: para
-#: post-install.xml:346
+#: post-install.xml:345
#, no-c-format
msgid ""
"If you would like <classname>exim4</classname> to handle external e-mail, "
@@ -528,7 +549,7 @@ msgstr ""
"可以使用的基本配置选项。确认邮件可以正确地发送和接收。"
#. Tag: para
-#: post-install.xml:352
+#: post-install.xml:351
#, no-c-format
msgid ""
"If you intend to use a graphical mail program and use a mail server of your "
@@ -543,7 +564,7 @@ msgstr ""
"(配置方法超出了本手册的范围)。"
#. Tag: para
-#: post-install.xml:361
+#: post-install.xml:360
#, no-c-format
msgid ""
"However, in that case you may need to configure individual utilities to "
@@ -557,7 +578,7 @@ msgstr ""
"应的 bug 报告。它默认是使用 <classname>exim4</classname> 来提交 bug 报告。"
#. Tag: para
-#: post-install.xml:369
+#: post-install.xml:368
#, no-c-format
msgid ""
"To correctly set up <command>reportbug</command> to use an external mail "
@@ -570,13 +591,13 @@ msgstr ""
"<quote>no</quote>。您接着将会被问到使用哪个 SMTP 服务器来提交 bug 报告。"
#. Tag: title
-#: post-install.xml:380
+#: post-install.xml:379
#, no-c-format
msgid "Configuring the Exim4 Mail Transport Agent"
msgstr "配置 Exim4 MTA"
#. Tag: para
-#: post-install.xml:381
+#: post-install.xml:380
#, no-c-format
msgid ""
"If you would like your system to also handle external e-mail, you will need "
@@ -589,13 +610,13 @@ msgstr ""
"MTA/MDA。</para> </footnote>:"
#. Tag: screen
-#: post-install.xml:393
+#: post-install.xml:392
#, no-c-format
msgid "# dpkg-reconfigure exim4-config"
msgstr "# dpkg-reconfigure exim4-config"
#. Tag: para
-#: post-install.xml:395
+#: post-install.xml:394
#, no-c-format
msgid ""
"After entering that command (as root), you will be asked if you want split "
@@ -606,7 +627,7 @@ msgstr ""
"不准,就选择默认选项。"
#. Tag: para
-#: post-install.xml:401
+#: post-install.xml:400
#, no-c-format
msgid ""
"Next you will be presented with several common mail scenarios. Choose the "
@@ -614,13 +635,13 @@ msgid ""
msgstr "接着您将看到几个常见的邮件方案,请选择一个最近似您需求的那个。"
#. Tag: term
-#: post-install.xml:410
+#: post-install.xml:409
#, no-c-format
msgid "internet site"
msgstr "internet site"
#. Tag: para
-#: post-install.xml:411
+#: post-install.xml:410
#, no-c-format
msgid ""
"Your system is connected to a network and your mail is sent and received "
@@ -632,13 +653,13 @@ msgstr ""
"会询问您一些基本问题,如:您的机器的邮件名称、您接受或转发邮件的域等等。"
#. Tag: term
-#: post-install.xml:422
+#: post-install.xml:421
#, no-c-format
msgid "mail sent by smarthost"
msgstr "mail sent by smarthost"
#. Tag: para
-#: post-install.xml:423
+#: post-install.xml:422
#, no-c-format
msgid ""
"In this scenario your outgoing mail is forwarded to another machine, called "
@@ -654,7 +675,7 @@ msgstr ""
"载邮件。"
#. Tag: para
-#: post-install.xml:433
+#: post-install.xml:432
#, no-c-format
msgid ""
"In a lot of cases the smarthost will be your ISP's mail server, which makes "
@@ -665,13 +686,13 @@ msgstr ""
"司的邮件服务器,或是您自己网络中的另外一台机器。"
#. Tag: term
-#: post-install.xml:443
+#: post-install.xml:442
#, no-c-format
msgid "mail sent by smarthost; no local mail"
msgstr "mail sent by smarthost; no local mail"
#. Tag: para
-#: post-install.xml:444
+#: post-install.xml:443
#, no-c-format
msgid ""
"This option is basically the same as the previous one except that the system "
@@ -682,25 +703,25 @@ msgstr ""
"mail domain。在本系统上的邮件(比如,给系统管理员的)还是会被处理。"
#. Tag: term
-#: post-install.xml:455
+#: post-install.xml:454
#, no-c-format
msgid "local delivery only"
msgstr "local delivery only"
#. Tag: para
-#: post-install.xml:456
+#: post-install.xml:455
#, no-c-format
msgid "This is the option your system is configured for by default."
msgstr "本选项是系统默认的配置。"
#. Tag: term
-#: post-install.xml:464
+#: post-install.xml:463
#, no-c-format
msgid "no configuration at this time"
msgstr "no configuration at this time"
#. Tag: para
-#: post-install.xml:465
+#: post-install.xml:464
#, no-c-format
msgid ""
"Choose this if you are absolutely convinced you know what you are doing. "
@@ -713,7 +734,7 @@ msgstr ""
"工具发来的重要信息。"
#. Tag: para
-#: post-install.xml:476
+#: post-install.xml:475
#, no-c-format
msgid ""
"If none of these scenarios suits your needs, or if you need a finer grained "
@@ -731,7 +752,7 @@ msgstr ""
"classname> 配置方面的细节,并说明从哪里找到更多的文档。"
#. Tag: para
-#: post-install.xml:487
+#: post-install.xml:486
#, no-c-format
msgid ""
"Note that sending mail directly to the Internet when you don't have an "
@@ -749,13 +770,13 @@ msgstr ""
"filename>。"
#. Tag: title
-#: post-install.xml:505
+#: post-install.xml:504
#, no-c-format
msgid "Compiling a New Kernel"
msgstr "编译新内核"
#. Tag: para
-#: post-install.xml:506
+#: post-install.xml:505
#, no-c-format
msgid ""
"Why would someone want to compile a new kernel? It is most probably not "
@@ -764,7 +785,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: post-install.xml:512
+#: post-install.xml:511
#, no-c-format
msgid ""
"If you want to compile your own kernel nevertheless, this is of course "
@@ -774,13 +795,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: post-install.xml:527
+#: post-install.xml:526
#, no-c-format
msgid "Recovering a Broken System"
msgstr "修复损坏的系统"
#. Tag: para
-#: post-install.xml:528
+#: post-install.xml:527
#, no-c-format
msgid ""
"Sometimes, things go wrong, and the system you've carefully installed is no "
@@ -796,7 +817,7 @@ msgstr ""
"一个可以工作的系统,rescue 模式正好用于此目的。"
#. Tag: para
-#: post-install.xml:538
+#: post-install.xml:537
#, no-c-format
msgid ""
"To access rescue mode, select <userinput>rescue</userinput> from the boot "
@@ -816,7 +837,7 @@ msgstr ""
"大的硬件探测能力,确保修复系统的时候硬盘,网络设备等等可以使用。"
#. Tag: para
-#: post-install.xml:555
+#: post-install.xml:554
#, no-c-format
msgid ""
"Instead of the partitioning tool, you should now be presented with a list of "
@@ -830,7 +851,7 @@ msgstr ""
"创建一样。"
#. Tag: para
-#: post-install.xml:563
+#: post-install.xml:562
#, no-c-format
msgid ""
"If possible, the installer will now present you with a shell prompt in the "
@@ -846,7 +867,7 @@ msgstr ""
"userinput> 完成。</phrase>"
#. Tag: para
-#: post-install.xml:575
+#: post-install.xml:574
#, no-c-format
msgid ""
"If the installer cannot run a usable shell in the root file system you "
@@ -862,13 +883,13 @@ msgstr ""
"统将挂载到 <filename>/target</filename> 目录。"
#. Tag: para
-#: post-install.xml:584
+#: post-install.xml:583
#, no-c-format
msgid "In either case, after you exit the shell, the system will reboot."
msgstr "无论哪种情况,退出 shell 之后,系统将重启。"
#. Tag: para
-#: post-install.xml:588
+#: post-install.xml:587
#, no-c-format
msgid ""
"Finally, note that repairing broken systems can be difficult, and this "
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 4123f4cf8..0a7f0b6e1 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-06-22 16:23+0000\n"
+"POT-Creation-Date: 2019-08-16 23:12+0000\n"
"PO-Revision-Date: 2017-06-11 22:15+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -1125,13 +1125,14 @@ msgstr ""
#, no-c-format
msgid ""
"Note that the above example limits this filename to DHCP clients that "
-"identify themselves as \"d-i\", so it will not affect regular DHCP clients, "
-"but only the installer. You can also put the text in a stanza for only one "
-"particular host to avoid preseeding all installs on your network."
+"identify themselves as <quote>d-i</quote>, so it will not affect regular "
+"DHCP clients, but only the installer. You can also put the text in a stanza "
+"for only one particular host to avoid preseeding all installs on your "
+"network."
msgstr ""
-"注意,上面的例子中使用的文件名限定 DHCP 客户端自己是 \"d-i\",因此仅适用于安"
-"装程序,而对普通的 DHCP 客户端无效。您可以将只用于一个特殊主机的文字放在一"
-"段,以避免预置网络中的其他安装。"
+"注意,上面的例子中使用的文件名限定 DHCP 客户端自己是 <quote>d-i</quote>,因此"
+"仅适用于安装程序,而对普通的 DHCP 客户端无效。您可以将只用于一个特殊主机的文"
+"字放在一段,以避免预置网络中的其他安装。"
#. Tag: para
#: preseed.xml:582
@@ -2677,8 +2678,12 @@ msgid ""
"#d-i apt-setup/local0/source boolean true\n"
"# URL to the public key of the local repository; you must provide a key or\n"
"# apt will complain about the unauthenticated repository and so the\n"
-"# sources.list line will be left commented out\n"
+"# sources.list line will be left commented out.\n"
"#d-i apt-setup/local0/key string http://local.server/key\n"
+"# If the provided key file ends in \".asc\" the key file needs to be an\n"
+"# ASCII-armoured PGP key, if it ends in \".gpg\" it needs to use the\n"
+"# \"GPG key public keyring\" format, the \"keybox database\" format is\n"
+"# currently not supported.\n"
"\n"
"# By default the installer requires that repositories be authenticated\n"
"# using a known gpg key. This setting can be used to disable that\n"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index b6e6d1449..4d7e6cb9f 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.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: 2019-07-03 23:05+0000\n"
+"POT-Creation-Date: 2019-08-16 23:12+0000\n"
"PO-Revision-Date: 2012-11-26 15:04+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -377,10 +377,13 @@ msgstr "console-setup"
#. Tag: para
#: using-d-i.xml:212
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Shows a list of keyboards, from which the user chooses the model which "
+#| "matches his own."
msgid ""
-"Shows a list of keyboards, from which the user chooses the model which "
-"matches his own."
+"Shows a list of keyboard (layouts), from which the user chooses the one "
+"which matches his own model."
msgstr "显示键盘列表,用户在其中选择与自己匹配的模式。"
#. Tag: term
@@ -582,8 +585,8 @@ msgstr "显示分区列表,按用户指令为选择的分区创建文件系统
#. Tag: term
#: using-d-i.xml:348
#, no-c-format
-msgid "lvmcfg"
-msgstr "lvmcfg"
+msgid "partman-lvm"
+msgstr "partman-lvm"
#. Tag: para
#: using-d-i.xml:348
@@ -596,8 +599,8 @@ msgstr "协助用户配置 <firstterm>LVM</firstterm> (Logical Volume Manager)
#. Tag: term
#: using-d-i.xml:357
#, no-c-format
-msgid "mdcfg"
-msgstr "mdcfg"
+msgid "partman-md"
+msgstr "partman-md"
#. Tag: para
#: using-d-i.xml:357
@@ -2361,15 +2364,15 @@ msgid ""
"If you have more than one harddrive<footnote><para> To be honest, you can "
"construct an MD device even from partitions residing on single physical "
"drive, but that won't give any benefits. </para></footnote> in your "
-"computer, you can use <command>mdcfg</command> to set up your drives for "
-"increased performance and/or better reliability of your data. The result is "
-"called <firstterm>Multidisk Device</firstterm> (or after its most famous "
+"computer, you can use <command>partman-md</command> to set up your drives "
+"for increased performance and/or better reliability of your data. The result "
+"is called <firstterm>Multidisk Device</firstterm> (or after its most famous "
"variant <firstterm>software RAID</firstterm>)."
msgstr ""
"如果您的计算机上有多个硬盘<footnote><para> 其实,您可以从单个物理硬盘上不同分"
"区创建 MD 设备,但这样做不会给您带来任何好处。</para></footnote>,可以用 "
-"<command>mdcfg</command> 配置硬盘以提升效能和/或更好的数据可靠性。这种结果称"
-"为<firstterm>多磁盘设备(Multidisk Device)</firstterm>(或者更流行的 "
+"<command>partman-md</command> 配置硬盘以提升效能和/或更好的数据可靠性。这种结"
+"果称为<firstterm>多磁盘设备(Multidisk Device)</firstterm>(或者更流行的 "
"<firstterm>软 RAID</firstterm>)。"
#. Tag: para
@@ -2664,7 +2667,7 @@ msgid ""
"Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
"from the main <command>partman</command> menu. (The menu will only appear "
"after you mark at least one partition for use as <guimenuitem>physical "
-"volume for RAID</guimenuitem>.) On the first screen of <command>mdcfg</"
+"volume for RAID</guimenuitem>.) On the first screen of <command>partman-md</"
"command> simply select <guimenuitem>Create MD device</guimenuitem>. You will "
"be presented with a list of supported types of MD devices, from which you "
"should choose one (e.g. RAID1). What follows depends on the type of MD you "
@@ -2673,7 +2676,7 @@ msgstr ""
"下一步,您应该从 <command>partman</command> 主菜单选择 "
"<guimenuitem>Configure software RAID</guimenuitem>。(菜单只会在您用 "
"<guimenuitem>physical volume for RAID</guimenuitem> 标记了至少一个分区时出"
-"现。)在 <command>mdcfg</command> 第一个画面选择 <guimenuitem>Create MD "
+"现。)在 <command>partman-md</command> 第一个画面选择 <guimenuitem>Create MD "
"device</guimenuitem>。您将看到被支持的 MD 设备列表,您应从其中选择一项(如 "
"RAID1)。后续操作会根据您选择的 MD 类型而定。"
@@ -2764,13 +2767,13 @@ msgstr ""
#, no-c-format
msgid ""
"After you set up MD devices to your liking, you can <guimenuitem>Finish</"
-"guimenuitem> <command>mdcfg</command> to return back to the "
+"guimenuitem> <command>partman-md</command> to return back to the "
"<command>partman</command> to create filesystems on your new MD devices and "
"assign them the usual attributes like mountpoints."
msgstr ""
"按您需要配置 MD 设备之后,您可以 <guimenuitem>Finish</guimenuitem> "
-"<command>mdcfg</command> 返回到 <command>partman</command>,去创建文件系统到"
-"您的新 MD 设备,并分配挂载点这样的属性。"
+"<command>partman-md</command> 返回到 <command>partman</command>,去创建文件系"
+"统到您的新 MD 设备,并分配挂载点这样的属性。"
#. Tag: title
#: using-d-i.xml:1825
@@ -3796,12 +3799,16 @@ msgstr "选择网络镜像"
#. Tag: para
#: using-d-i.xml:2475
-#, no-c-format
-msgid ""
-"If you have selected to use a network mirror during the installation "
-"(optional for CD/DVD installs, required for netboot images), you will be "
-"presented with a list of geographically nearby (and therefore hopefully "
-"fast) network mirrors, based upon your country selection earlier in the "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you have selected to use a network mirror during the installation "
+#| "(optional for CD/DVD installs, required for netboot images), you will be "
+#| "presented with a list of geographically nearby (and therefore hopefully "
+#| "fast) network mirrors, based upon your country selection earlier in the "
+#| "installation process. Choosing the offered default is usually fine."
+msgid ""
+"Unless you chose not to use a network mirror, you will be presented with a "
+"list of network mirrors based upon your country selection earlier in the "
"installation process. Choosing the offered default is usually fine."
msgstr ""
"如果在安装过程中选择网络镜像(CD/DVD 安装时为选项,netboot 为必须),根据安装步"
@@ -3809,18 +3816,28 @@ msgstr ""
"列表。通常选择默认的就行。"
#. Tag: para
-#: using-d-i.xml:2483
+#: using-d-i.xml:2482
+#, no-c-format
+msgid ""
+"The offered default is deb.debian.org, which is not a mirror itself but will "
+"redirect to a mirror that should be up-to-date and fast. These mirrors "
+"support TLS (https protocol) and IPv6. This service is maintained by the "
+"Debian System Administration (DSA) team."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:2489
#, no-c-format
msgid ""
"A mirror can also be specified by hand by choosing <quote>enter information "
"manually</quote> . You can then specify a mirror host name and an optional "
-"port number. As of Wheezy, that actually has to be a URL base, i.e. when "
-"specifying an IPv6 address, one has to add square brackets around it, for "
-"instance <quote>[2001:db8::1]</quote>."
+"port number. This actually has to be a URL base, i.e. when specifying an "
+"IPv6 address, one has to add square brackets around it, for instance "
+"<quote>[2001:db8::1]</quote>."
msgstr ""
#. Tag: para
-#: using-d-i.xml:2491
+#: using-d-i.xml:2497
#, no-c-format
msgid ""
"If your computer is on an IPv6-only network (which is probably not the case "
@@ -3843,31 +3860,14 @@ msgstr ""
"debian.org</quote> 作为镜像名,这是 IPv6 上的一个镜像别名,它有可能不是速度最"
"快的哪个。"
-#. Tag: para
-#: using-d-i.xml:2505
-#, no-c-format
-msgid ""
-"Another option when choosing to specify the mirror manually is to use "
-"<quote>httpredir.debian.org</quote> as your mirror. <quote>httpredir.debian."
-"org</quote> is not a physical mirror but a mirror redirection service, i.e. "
-"it automatically refers your system to a real mirror near you in terms of "
-"network topology. It takes into account by which protocol you connect to it, "
-"i.e. if you use IPv6, it will refer you to an IPv6-capable mirror near you."
-msgstr ""
-"另一种选择是手动选取镜像,指定 <quote>httpredir.debian.org</quote> 作为您的镜"
-"像服务器。<quote>httpredir.debian.org</quote> 并不是一个物理镜像,而是一个重"
-"定向服务,也就是它能根据您的网络路径自动转换成一个真实的镜像服务器。它还能考"
-"虑到您连接所采用的协议,比如使用 IPv6,它将自动将您引到最近的 IPv6 镜像服务"
-"器。"
-
#. Tag: title
-#: using-d-i.xml:2524
+#: using-d-i.xml:2520
#, no-c-format
msgid "Selecting and Installing Software"
msgstr "选择和安装软件"
#. Tag: para
-#: using-d-i.xml:2526
+#: using-d-i.xml:2522
#, no-c-format
msgid ""
"During the installation process, you are given the opportunity to select "
@@ -3882,7 +3882,7 @@ msgstr ""
"来快速建立您的计算机应对各种任务。"
#. Tag: para
-#: using-d-i.xml:2535
+#: using-d-i.xml:2531
#, no-c-format
msgid ""
"These tasks loosely represent a number of different jobs or things you want "
@@ -3909,7 +3909,7 @@ msgstr ""
"空间。"
#. Tag: para
-#: using-d-i.xml:2561
+#: using-d-i.xml:2557
#, no-c-format
msgid ""
"Some tasks may be pre-selected based on the characteristics of the computer "
@@ -3920,7 +3920,7 @@ msgstr ""
"这些任务。此时甚至可以不选中任何任务。"
#. Tag: para
-#: using-d-i.xml:2568
+#: using-d-i.xml:2564
#, no-c-format
msgid ""
"In the standard user interface of the installer, you can use the space bar "
@@ -3928,7 +3928,7 @@ msgid ""
msgstr "在安装程序的标准用户界面下,您可以使用空格键切换任务的选择。"
#. Tag: para
-#: using-d-i.xml:2574
+#: using-d-i.xml:2570
#, fuzzy, no-c-format
#| msgid ""
#| "Unless you are using the special KDE or Xfce/LXDE CDs, the <quote>Desktop "
@@ -3941,7 +3941,7 @@ msgstr ""
"GNOME 桌面环境。"
#. Tag: para
-#: using-d-i.xml:2579
+#: using-d-i.xml:2575
#, no-c-format
msgid ""
"By default, &d-i; installs the <phrase arch=\"x86\">Gnome</phrase> <phrase "
@@ -3952,7 +3952,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:2587
+#: using-d-i.xml:2583
#, fuzzy, no-c-format
#| msgid ""
#| "Note that this will only work if the packages needed for the desired "
@@ -3975,7 +3975,7 @@ msgstr ""
"Xfce 或 LXDE 同样适用于 DVD 映象或其他的安装方法。"
#. Tag: para
-#: using-d-i.xml:2597
+#: using-d-i.xml:2593
#, no-c-format
msgid ""
"The various server tasks will install software roughly as follows. Web "
@@ -3984,7 +3984,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:2604
+#: using-d-i.xml:2600
#, no-c-format
msgid ""
"The <quote>Standard system</quote> task will install any package that has a "
@@ -3998,7 +3998,7 @@ msgstr ""
"并需要一个最小化的系统,您应该让该任务选中。"
#. Tag: para
-#: using-d-i.xml:2612
+#: using-d-i.xml:2608
#, no-c-format
msgid ""
"If during language selection a default locale other than the <quote>C</"
@@ -4015,7 +4015,7 @@ msgstr ""
"(如果存在)还会安装该桌面对应的本地化软件包。"
#. Tag: para
-#: using-d-i.xml:2622
+#: using-d-i.xml:2618
#, no-c-format
msgid ""
"Once you've selected your tasks, select &BTN-CONT;. At this point, "
@@ -4027,7 +4027,7 @@ msgstr ""
"任务的软件包。假如某个程序需要用户输入信息,它将提示您指定。"
#. Tag: para
-#: using-d-i.xml:2629
+#: using-d-i.xml:2625
#, no-c-format
msgid ""
"You should be aware that especially the Desktop task is very large. "
@@ -4042,7 +4042,7 @@ msgstr ""
"间。一旦启动,安装软件包过程将无法取消。"
#. Tag: para
-#: using-d-i.xml:2638
+#: using-d-i.xml:2634
#, no-c-format
msgid ""
"Even when packages are included on the CD-ROM, the installer may still "
@@ -4057,13 +4057,13 @@ msgstr ""
"新);如果您安装的是测试版本,这会出现在使用旧映像安装时。"
#. Tag: title
-#: using-d-i.xml:2653
+#: using-d-i.xml:2649
#, no-c-format
msgid "Making Your System Bootable"
msgstr "创建启动系统"
#. Tag: para
-#: using-d-i.xml:2655
+#: using-d-i.xml:2651
#, no-c-format
msgid ""
"If you are installing a diskless workstation, obviously, booting off the "
@@ -4076,13 +4076,13 @@ msgstr ""
"linkend=\"boot-dev-select-sun\"/>。</phrase>"
#. Tag: title
-#: using-d-i.xml:2670
+#: using-d-i.xml:2666
#, no-c-format
msgid "Detecting other operating systems"
msgstr "检测其他的操作系统"
#. Tag: para
-#: using-d-i.xml:2672
+#: using-d-i.xml:2668
#, no-c-format
msgid ""
"Before a boot loader is installed, the installer will attempt to probe for "
@@ -4096,7 +4096,7 @@ msgstr ""
"&debian; 一起,计算机也将配置为可以启动其他操作系统。"
#. Tag: para
-#: using-d-i.xml:2680
+#: using-d-i.xml:2676
#, no-c-format
msgid ""
"Note that multiple operating systems booting on a single machine is still "
@@ -4110,13 +4110,13 @@ msgstr ""
"管理器的文档了解更多信息。"
#. Tag: title
-#: using-d-i.xml:2698
+#: using-d-i.xml:2694
#, no-c-format
msgid "<command>palo</command>-installer"
msgstr "<command>palo</command>-installer"
#. Tag: para
-#: using-d-i.xml:2699
+#: using-d-i.xml:2695
#, no-c-format
msgid ""
"The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
@@ -4131,19 +4131,19 @@ msgstr ""
"<command>PALO</command> 能真正地读 Linux 分区。"
#. Tag: para
-#: using-d-i.xml:2708
+#: using-d-i.xml:2704
#, no-c-format
msgid "hppa FIXME ( need more info )"
msgstr "hppa FIXME ( need more info )"
#. Tag: title
-#: using-d-i.xml:2720 using-d-i.xml:2993
+#: using-d-i.xml:2716 using-d-i.xml:2989
#, no-c-format
msgid "Install the <command>Grub</command> Boot Loader on a Hard Disk"
msgstr "硬盘上 <command>Grub</command> Boot Loader 的安装"
#. Tag: para
-#: using-d-i.xml:2722 using-d-i.xml:2995
+#: using-d-i.xml:2718 using-d-i.xml:2991
#, no-c-format
msgid ""
"The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
@@ -4154,7 +4154,7 @@ msgstr ""
"定的 boot loader,它对新手和老手都是一个不错的缺省选择。"
#. Tag: para
-#: using-d-i.xml:2728
+#: using-d-i.xml:2724
#, no-c-format
msgid ""
"By default, grub will be installed into the Master Boot Record (MBR), where "
@@ -4166,7 +4166,7 @@ msgstr ""
"请参阅 grub 的手册。"
#. Tag: para
-#: using-d-i.xml:2734
+#: using-d-i.xml:2730
#, no-c-format
msgid ""
"If you do not want to install grub, use the &BTN-GOBACK; button to get to "
@@ -4177,13 +4177,13 @@ msgstr ""
"用的任何 bootloader。"
#. Tag: title
-#: using-d-i.xml:2747
+#: using-d-i.xml:2743
#, no-c-format
msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
msgstr "硬盘上 <command>LILO</command> Boot Loader 的安装"
#. Tag: para
-#: using-d-i.xml:2749
+#: using-d-i.xml:2745
#, no-c-format
msgid ""
"The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -4199,7 +4199,7 @@ msgstr ""
"HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:2759
+#: using-d-i.xml:2755
#, no-c-format
msgid ""
"Currently the LILO installation will only create menu entries for other "
@@ -4212,7 +4212,7 @@ msgstr ""
"统。"
#. Tag: para
-#: using-d-i.xml:2767
+#: using-d-i.xml:2763
#, no-c-format
msgid ""
"&d-i; offers you three choices on where to install the <command>LILO</"
@@ -4220,13 +4220,13 @@ msgid ""
msgstr "&d-i; 提供给您三种选择去哪安装 <command>LILO</command> boot loader:"
#. Tag: term
-#: using-d-i.xml:2774
+#: using-d-i.xml:2770
#, no-c-format
msgid "Master Boot Record (MBR)"
msgstr "主引导区(MBR)"
#. Tag: para
-#: using-d-i.xml:2774
+#: using-d-i.xml:2770
#, no-c-format
msgid ""
"This way the <command>LILO</command> will take complete control of the boot "
@@ -4234,13 +4234,13 @@ msgid ""
msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
#. Tag: term
-#: using-d-i.xml:2781
+#: using-d-i.xml:2777
#, no-c-format
msgid "new &debian; partition"
msgstr "新 &debian; 分区"
#. Tag: para
-#: using-d-i.xml:2781
+#: using-d-i.xml:2777
#, no-c-format
msgid ""
"Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -4251,13 +4251,13 @@ msgstr ""
"新 &debian; 分区的起始位置,并能作为第二 boot loader。"
#. Tag: term
-#: using-d-i.xml:2790
+#: using-d-i.xml:2786
#, no-c-format
msgid "Other choice"
msgstr "其它选择"
#. Tag: para
-#: using-d-i.xml:2790
+#: using-d-i.xml:2786
#, fuzzy, no-c-format
#| msgid ""
#| "Useful for advanced users who want to install <command>LILO</command> "
@@ -4274,7 +4274,7 @@ msgstr ""
"filename> 或 <filename>/dev/sda</filename>。"
#. Tag: para
-#: using-d-i.xml:2800
+#: using-d-i.xml:2796
#, no-c-format
msgid ""
"If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -4288,13 +4288,13 @@ msgstr ""
"录 &mdash; 但这也意味着您要使用其他方法才能启动 &debian;!"
#. Tag: title
-#: using-d-i.xml:2816
+#: using-d-i.xml:2812
#, no-c-format
msgid "Install the <command>ELILO</command> Boot Loader on a Hard Disk"
msgstr "安装 <command>ELILO</command> Boot Loader 到硬盘"
#. Tag: para
-#: using-d-i.xml:2818
+#: using-d-i.xml:2814
#, no-c-format
msgid ""
"The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -4319,7 +4319,7 @@ msgstr ""
"和启动 Linux 内核的工作。"
#. Tag: para
-#: using-d-i.xml:2834
+#: using-d-i.xml:2830
#, no-c-format
msgid ""
"The <quote>elilo</quote> configuration and installation is done as the last "
@@ -4334,13 +4334,13 @@ msgstr ""
"<emphasis>root</emphasis> 文件系统相同的磁盘。"
#. Tag: title
-#: using-d-i.xml:2846
+#: using-d-i.xml:2842
#, no-c-format
msgid "Choose the correct partition!"
msgstr "选择正确的分区!"
#. Tag: para
-#: using-d-i.xml:2848
+#: using-d-i.xml:2844
#, no-c-format
msgid ""
"The criterion for selecting a partition is that it must be a FAT format "
@@ -4356,13 +4356,13 @@ msgstr ""
"容!"
#. Tag: title
-#: using-d-i.xml:2863
+#: using-d-i.xml:2859
#, no-c-format
msgid "EFI Partition Contents"
msgstr "EFI 分区内容"
#. Tag: para
-#: using-d-i.xml:2865
+#: using-d-i.xml:2861
#, no-c-format
msgid ""
"The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -4388,13 +4388,13 @@ msgstr ""
"间,系统更新或重新配置,文件系统中也许会有其他文件。"
#. Tag: filename
-#: using-d-i.xml:2887
+#: using-d-i.xml:2883
#, no-c-format
msgid "elilo.conf"
msgstr "elilo.conf"
#. Tag: para
-#: using-d-i.xml:2888
+#: using-d-i.xml:2884
#, no-c-format
msgid ""
"This is the configuration file read by the boot loader when it starts. It is "
@@ -4405,13 +4405,13 @@ msgstr ""
"filename> 的复制,其文件名重写成 EFI 分区上的文件。"
#. Tag: filename
-#: using-d-i.xml:2897
+#: using-d-i.xml:2893
#, no-c-format
msgid "elilo.efi"
msgstr "elilo.efi"
#. Tag: para
-#: using-d-i.xml:2898
+#: using-d-i.xml:2894
#, no-c-format
msgid ""
"This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -4424,13 +4424,13 @@ msgstr ""
"<quote>EFI Boot Manager</quote> 命令菜单。"
#. Tag: filename
-#: using-d-i.xml:2908
+#: using-d-i.xml:2904
#, no-c-format
msgid "initrd.img"
msgstr "initrd.img"
#. Tag: para
-#: using-d-i.xml:2909
+#: using-d-i.xml:2905
#, no-c-format
msgid ""
"This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -4443,13 +4443,13 @@ msgstr ""
"filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
#. Tag: filename
-#: using-d-i.xml:2921
+#: using-d-i.xml:2917
#, no-c-format
msgid "readme.txt"
msgstr "readme.txt"
#. Tag: para
-#: using-d-i.xml:2922
+#: using-d-i.xml:2918
#, no-c-format
msgid ""
"This is a small text file warning you that the contents of the directory are "
@@ -4460,13 +4460,13 @@ msgstr ""
"任何本地修改在下次 <filename>/usr/sbin/elilo</filename> 运行时将丢失。"
#. Tag: filename
-#: using-d-i.xml:2932
+#: using-d-i.xml:2928
#, no-c-format
msgid "vmlinuz"
msgstr "vmlinuz"
#. Tag: para
-#: using-d-i.xml:2933
+#: using-d-i.xml:2929
#, no-c-format
msgid ""
"This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -4479,13 +4479,13 @@ msgstr ""
"<filename>/vmlinuz</filename> 指向的文件。"
#. Tag: title
-#: using-d-i.xml:2957
+#: using-d-i.xml:2953
#, no-c-format
msgid "Install <command>Yaboot</command> on a Hard Disk"
msgstr "安装 <command>Yaboot</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:2958
+#: using-d-i.xml:2954
#, no-c-format
msgid ""
"Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -4503,13 +4503,13 @@ msgstr ""
"设为启动 &debian-gnu;。"
#. Tag: title
-#: using-d-i.xml:2976
+#: using-d-i.xml:2972
#, no-c-format
msgid "Install <command>Quik</command> on a Hard Disk"
msgstr "安装 <command>Quik</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:2977
+#: using-d-i.xml:2973
#, no-c-format
msgid ""
"The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -4522,7 +4522,7 @@ msgstr ""
"以工作在 7200,7300 和 7600 Powermacs,以及一些 Power Computing 克隆。"
#. Tag: para
-#: using-d-i.xml:3001
+#: using-d-i.xml:2997
#, fuzzy, no-c-format
#| msgid ""
#| "By default, grub will be installed into the Master Boot Record (MBR), "
@@ -4538,13 +4538,13 @@ msgstr ""
"请参阅 grub 的手册。"
#. Tag: title
-#: using-d-i.xml:3014
+#: using-d-i.xml:3010
#, no-c-format
msgid "<command>zipl</command>-installer"
msgstr "<command>zipl</command>-installer"
#. Tag: para
-#: using-d-i.xml:3015
+#: using-d-i.xml:3011
#, no-c-format
msgid ""
"The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -4559,13 +4559,13 @@ msgstr ""
"Commands</quote>,它位于 IBM 的 developerWorks 网站<command>ZIPL</command>。"
#. Tag: title
-#: using-d-i.xml:3032
+#: using-d-i.xml:3028
#, no-c-format
msgid "Install the <command>SILO</command> Boot Loader on a Hard Disk"
msgstr "安装 <command>SILO</command> Boot Loader 到硬盘"
#. Tag: para
-#: using-d-i.xml:3034
+#: using-d-i.xml:3030
#, no-c-format
msgid ""
"The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -4592,13 +4592,13 @@ msgstr ""
"区启动。这对于安装 GNU/Linux 到一个已经存在 SunOS/Solaris 的系统很有用。"
#. Tag: title
-#: using-d-i.xml:3059
+#: using-d-i.xml:3055
#, no-c-format
msgid "Making the system bootable with flash-kernel"
msgstr ""
#. Tag: para
-#: using-d-i.xml:3060
+#: using-d-i.xml:3056
#, no-c-format
msgid ""
"As there is no common firmware interface on all ARM platforms, the steps "
@@ -4611,7 +4611,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3071
+#: using-d-i.xml:3067
#, no-c-format
msgid ""
"On devices which boot from internal NOR- or NAND-flash memory, flash-kernel "
@@ -4623,7 +4623,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3081
+#: using-d-i.xml:3077
#, no-c-format
msgid ""
"For ARM systems that use U-Boot as their system firmware and boot the kernel "
@@ -4633,13 +4633,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: using-d-i.xml:3097
+#: using-d-i.xml:3093
#, no-c-format
msgid "Continue Without Boot Loader"
msgstr "不使用 boot loader 继续进行"
#. Tag: para
-#: using-d-i.xml:3099
+#: using-d-i.xml:3095
#, no-c-format
msgid ""
"This option can be used to complete the installation even when no boot "
@@ -4650,7 +4650,7 @@ msgstr ""
"是因为不想要(比如,您想使用已经存在的 boot loader)"
#. Tag: para
-#: using-d-i.xml:3106
+#: using-d-i.xml:3102
#, no-c-format
msgid ""
"If you plan to manually configure your bootloader, you should check the name "
@@ -4669,13 +4669,13 @@ msgstr ""
"filename> 到一个独立的分区,还需要 <filename>/boot</filename> 文件系统。"
#. Tag: title
-#: using-d-i.xml:3123
+#: using-d-i.xml:3119
#, no-c-format
msgid "Finishing the Installation"
msgstr "完成安装"
#. Tag: para
-#: using-d-i.xml:3124
+#: using-d-i.xml:3120
#, no-c-format
msgid ""
"This is the last step in the &debian; installation process during which the "
@@ -4686,13 +4686,13 @@ msgstr ""
"&d-i; 之后的清理。"
#. Tag: title
-#: using-d-i.xml:3137
+#: using-d-i.xml:3133
#, no-c-format
msgid "Setting the System Clock"
msgstr "设置系统时钟"
#. Tag: para
-#: using-d-i.xml:3139
+#: using-d-i.xml:3135
#, no-c-format
msgid ""
"The installer may ask you if the computer's clock is set to UTC. Normally "
@@ -4704,7 +4704,7 @@ msgstr ""
"装程序依据是否有其他系统已经安装这类事情,来决定时钟要不要设为 UTC。"
#. Tag: para
-#: using-d-i.xml:3146
+#: using-d-i.xml:3142
#, no-c-format
msgid ""
"In expert mode you will always be able to choose whether or not the clock is "
@@ -4720,7 +4720,7 @@ msgstr ""
"常设为本地时间。如果您需要多重引导,请选择本地时间而不是 GMT。</phrase>"
#. Tag: para
-#: using-d-i.xml:3157
+#: using-d-i.xml:3153
#, no-c-format
msgid ""
"At this point &d-i; will also attempt to save the current time to the "
@@ -4731,13 +4731,13 @@ msgstr ""
"决于刚才的选择。"
#. Tag: title
-#: using-d-i.xml:3172
+#: using-d-i.xml:3168
#, no-c-format
msgid "Reboot the System"
msgstr "重新启动系统"
#. Tag: para
-#: using-d-i.xml:3174
+#: using-d-i.xml:3170
#, no-c-format
msgid ""
"You will be prompted to remove the boot media (CD, floppy, etc) that you "
@@ -4748,7 +4748,7 @@ msgstr ""
"&debian; 系统。"
#. Tag: para
-#: using-d-i.xml:3180
+#: using-d-i.xml:3176
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
@@ -4760,13 +4760,13 @@ msgstr ""
"上的 IPL &debian-gnu;,它在安装步骤第一步里被选做根文件系统。"
#. Tag: title
-#: using-d-i.xml:3193
+#: using-d-i.xml:3189
#, no-c-format
msgid "Troubleshooting"
msgstr "排除故障"
#. Tag: para
-#: using-d-i.xml:3194
+#: using-d-i.xml:3190
#, no-c-format
msgid ""
"The components listed in this section are usually not involved in the "
@@ -4777,13 +4777,13 @@ msgstr ""
"题。"
#. Tag: title
-#: using-d-i.xml:3207
+#: using-d-i.xml:3203
#, no-c-format
msgid "Saving the installation logs"
msgstr "保存安装记录"
#. Tag: para
-#: using-d-i.xml:3209
+#: using-d-i.xml:3205
#, no-c-format
msgid ""
"If the installation is successful, the logfiles created during the "
@@ -4794,7 +4794,7 @@ msgstr ""
"的 <filename>/var/log/installer/</filename>。"
#. Tag: para
-#: using-d-i.xml:3216
+#: using-d-i.xml:3212
#, no-c-format
msgid ""
"Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -4808,13 +4808,13 @@ msgstr ""
"其它系统上研究记录,或者用于报告的附件。"
#. Tag: title
-#: using-d-i.xml:3236
+#: using-d-i.xml:3232
#, no-c-format
msgid "Using the Shell and Viewing the Logs"
msgstr "使用 Shell 查看记录"
#. Tag: para
-#: using-d-i.xml:3238
+#: using-d-i.xml:3234
#, no-c-format
msgid ""
"There are several methods you can use to get a shell while running an "
@@ -4838,13 +4838,13 @@ msgstr ""
"安装程序。"
#. Tag: para
-#: using-d-i.xml:3256
+#: using-d-i.xml:3252
#, no-c-format
msgid "For the graphical installer see also <xref linkend=\"gtk-using\"/>."
msgstr "对于图形安装程序,请参阅 <xref linkend=\"gtk-using\"/>。"
#. Tag: para
-#: using-d-i.xml:3260
+#: using-d-i.xml:3256
#, no-c-format
msgid ""
"If you cannot switch consoles, there is also an <guimenuitem>Execute a "
@@ -4859,7 +4859,7 @@ msgstr ""
"到安装程序。"
#. Tag: para
-#: using-d-i.xml:3268
+#: using-d-i.xml:3264
#, no-c-format
msgid ""
"At this point you are booted from the RAM disk, and there is a limited set "
@@ -4875,7 +4875,7 @@ msgstr ""
"Bourne shell 的克隆,有一些如自动完成与历史纪录这样的好特性。"
#. Tag: para
-#: using-d-i.xml:3277
+#: using-d-i.xml:3273
#, no-c-format
msgid ""
"To edit and view files, use the text editor <command>nano</command>. Log "
@@ -4886,7 +4886,7 @@ msgstr ""
"以在 <filename>/var/log</filename> 目录找到。"
#. Tag: para
-#: using-d-i.xml:3284
+#: using-d-i.xml:3280
#, no-c-format
msgid ""
"Although you can do basically anything in a shell that the available "
@@ -4897,7 +4897,7 @@ msgstr ""
"题时进行调试。"
#. Tag: para
-#: using-d-i.xml:3290
+#: using-d-i.xml:3286
#, no-c-format
msgid ""
"Doing things manually from the shell may interfere with the installation "
@@ -4909,13 +4909,13 @@ msgstr ""
"该让安装程序激活交换分区,而不是在 shell 里面自己动手。"
#. Tag: title
-#: using-d-i.xml:3306
+#: using-d-i.xml:3302
#, no-c-format
msgid "Installation Over the Network"
msgstr "通过网络安装"
#. Tag: para
-#: using-d-i.xml:3308
+#: using-d-i.xml:3304
#, no-c-format
msgid ""
"One of the more interesting components is <firstterm>network-console</"
@@ -4930,7 +4930,7 @@ msgstr ""
"先建立网络。(您可以使用 <xref linkend=\"automatic-install\"/> 做这部分工作。)"
#. Tag: para
-#: using-d-i.xml:3318
+#: using-d-i.xml:3314
#, no-c-format
msgid ""
"This component is not loaded into the main installation menu by default, so "
@@ -4950,7 +4950,7 @@ msgstr ""
"SSH</guimenuitem>。"
#. Tag: para
-#: using-d-i.xml:3331
+#: using-d-i.xml:3327
#, no-c-format
msgid ""
"For installations on &arch-title;, this is the default method after setting "
@@ -4958,7 +4958,7 @@ msgid ""
msgstr "在 &arch-title; 上安装,建立网络之后这是默认的方法。"
#. Tag: para
-#: using-d-i.xml:3336
+#: using-d-i.xml:3332
#, no-c-format
msgid ""
"<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
@@ -4977,7 +4977,7 @@ msgstr ""
"fingerprint。您需要安全地传输该 fingerprint 给那些要继续远程安装的人。"
#. Tag: para
-#: using-d-i.xml:3348
+#: using-d-i.xml:3344
#, no-c-format
msgid ""
"Should you decide to continue with the installation locally, you can always "
@@ -4988,7 +4988,7 @@ msgstr ""
"他的组件。"
#. Tag: para
-#: using-d-i.xml:3354
+#: using-d-i.xml:3350
#, no-c-format
msgid ""
"Now let's switch to the other side of the wire. As a prerequisite, you need "
@@ -5016,7 +5016,7 @@ msgstr ""
"确认是否正确。"
#. Tag: para
-#: using-d-i.xml:3371
+#: using-d-i.xml:3367
#, no-c-format
msgid ""
"The <command>ssh</command> server in the installer uses a default "
@@ -5037,7 +5037,7 @@ msgstr ""
"接在安装过程中的哪一点断开,您在连接之后可能继续,也可能无法继续安装过程。"
#. Tag: para
-#: using-d-i.xml:3384
+#: using-d-i.xml:3380
#, no-c-format
msgid ""
"You may be able to avoid the connection being dropped by adding the option "
@@ -5057,7 +5057,7 @@ msgstr ""
"需要的时候采用。"
#. Tag: para
-#: using-d-i.xml:3397
+#: using-d-i.xml:3393
#, no-c-format
msgid ""
"If you install several computers in turn and they happen to have the same IP "
@@ -5079,7 +5079,7 @@ msgstr ""
"footnote>,再重新来过。"
#. Tag: para
-#: using-d-i.xml:3413
+#: using-d-i.xml:3409
#, no-c-format
msgid ""
"After the login you will be presented with an initial screen where you have "
@@ -5096,7 +5096,7 @@ msgstr ""
"的系统。在安装菜单只能打开一个 SSH 会话,但 shell 可以打开多个。"
#. Tag: para
-#: using-d-i.xml:3423
+#: using-d-i.xml:3419
#, no-c-format
msgid ""
"After you have started the installation remotely over SSH, you should not go "
@@ -5109,13 +5109,13 @@ msgstr ""
"配置的数据库。结果可能导致安装失败或者安装完成的系统出现问题。"
#. Tag: title
-#: using-d-i.xml:3442
+#: using-d-i.xml:3438
#, no-c-format
msgid "Loading Missing Firmware"
msgstr "加载缺失的固件"
#. Tag: para
-#: using-d-i.xml:3443
+#: using-d-i.xml:3439
#, no-c-format
msgid ""
"As described in <xref linkend=\"hardware-firmware\"/>, some devices require "
@@ -5128,7 +5128,7 @@ msgstr ""
"强功能就无法使用。"
#. Tag: para
-#: using-d-i.xml:3451
+#: using-d-i.xml:3447
#, no-c-format
msgid ""
"If a device driver requests firmware that is not available, &d-i; will "
@@ -5144,7 +5144,7 @@ msgstr ""
"序模块。"
#. Tag: para
-#: using-d-i.xml:3461
+#: using-d-i.xml:3457
#, no-c-format
msgid ""
"Which devices are scanned and which file systems are supported depends on "
@@ -5160,7 +5160,7 @@ msgstr ""
"phrase>"
#. Tag: para
-#: using-d-i.xml:3471
+#: using-d-i.xml:3467
#, no-c-format
msgid ""
"Note that it is possible to skip loading the firmware if you know the device "
@@ -5171,7 +5171,7 @@ msgstr ""
"固件。"
#. Tag: para
-#: using-d-i.xml:3477
+#: using-d-i.xml:3473
#, no-c-format
msgid ""
"&d-i; only prompts for firmware needed by kernel modules loaded during the "
@@ -5185,13 +5185,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: using-d-i.xml:3491
+#: using-d-i.xml:3487
#, no-c-format
msgid "Preparing a medium"
msgstr "准备介质"
#. Tag: para
-#: using-d-i.xml:3492
+#: using-d-i.xml:3488
#, no-c-format
msgid ""
"Official CD images do not include non-free firmware. The most common method "
@@ -5211,7 +5211,7 @@ msgstr ""
"下。推荐使用 FAT 文件系统,因为在安装过程的早期阶段它肯定能被支持。"
#. Tag: para
-#: using-d-i.xml:3505
+#: using-d-i.xml:3501
#, no-c-format
msgid ""
"Tarballs and zip files containing current packages for the most common "
@@ -5225,7 +5225,7 @@ msgstr ""
"itemizedlist> 下载对应版本的压缩包或 zip 文件,然后解压到介质的文件系统里面。"
#. Tag: para
-#: using-d-i.xml:3519
+#: using-d-i.xml:3515
#, no-c-format
msgid ""
"If the firmware you need is not included in the tarball, you can also "
@@ -5238,7 +5238,7 @@ msgstr ""
"件。以下概要列出大多数固件软件包,但不保证完整,有些还是非固件软件包:"
#. Tag: para
-#: using-d-i.xml:3533
+#: using-d-i.xml:3529
#, no-c-format
msgid ""
"It is also possible to copy individual firmware files to the medium. Loose "
@@ -5249,13 +5249,13 @@ msgstr ""
"造商那里获得。"
#. Tag: title
-#: using-d-i.xml:3542
+#: using-d-i.xml:3538
#, no-c-format
msgid "Firmware and the Installed System"
msgstr "固件和安装好的系统"
#. Tag: para
-#: using-d-i.xml:3543
+#: using-d-i.xml:3539
#, no-c-format
msgid ""
"Any firmware loaded during the installation will be copied automatically to "
@@ -5270,7 +5270,7 @@ msgstr ""
"序不同的内核版本,有可能由于版本的偏差造成固件不能加载。"
#. Tag: para
-#: using-d-i.xml:3552
+#: using-d-i.xml:3548
#, no-c-format
msgid ""
"If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -5284,7 +5284,7 @@ msgstr ""
"做的优点在于如果有固件的新版本存在会自动更新。"
#. Tag: para
-#: using-d-i.xml:3560
+#: using-d-i.xml:3556
#, no-c-format
msgid ""
"If loading the firmware was skipped during the installation, the relevant "
@@ -5295,7 +5295,7 @@ msgstr ""
"安装好固件或软件包。"
#. Tag: para
-#: using-d-i.xml:3567
+#: using-d-i.xml:3563
#, no-c-format
msgid ""
"If the firmware was loaded from loose firmware files, the firmware copied to "
@@ -5306,6 +5306,27 @@ msgstr ""
"如果固件从不严格的固件文件加载,复制到安装好的系统的固件将<emphasis>不会</"
"emphasis>自动更新,除非对应的固件软件包(如果有的话)在系统安装之后安装。"
+#~ msgid "lvmcfg"
+#~ msgstr "lvmcfg"
+
+#~ msgid "mdcfg"
+#~ msgstr "mdcfg"
+
+#~ msgid ""
+#~ "Another option when choosing to specify the mirror manually is to use "
+#~ "<quote>httpredir.debian.org</quote> as your mirror. <quote>httpredir."
+#~ "debian.org</quote> is not a physical mirror but a mirror redirection "
+#~ "service, i.e. it automatically refers your system to a real mirror near "
+#~ "you in terms of network topology. It takes into account by which protocol "
+#~ "you connect to it, i.e. if you use IPv6, it will refer you to an IPv6-"
+#~ "capable mirror near you."
+#~ msgstr ""
+#~ "另一种选择是手动选取镜像,指定 <quote>httpredir.debian.org</quote> 作为您"
+#~ "的镜像服务器。<quote>httpredir.debian.org</quote> 并不是一个物理镜像,而是"
+#~ "一个重定向服务,也就是它能根据您的网络路径自动转换成一个真实的镜像服务器。"
+#~ "它还能考虑到您连接所采用的协议,比如使用 IPv6,它将自动将您引到最近的 "
+#~ "IPv6 镜像服务器。"
+
#~ msgid "<command>arcboot</command>-installer"
#~ msgstr "<command>arcboot</command>-installer"