summaryrefslogtreecommitdiff
path: root/po/zh_CN/using-d-i.po
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2015-04-17 14:01:33 +0000
committerSamuel Thibault <sthibault@debian.org>2015-04-17 14:01:33 +0000
commitfff601e78b57142033c9397015a8051c292ab535 (patch)
treee92f150d88918b21fde6b3030a0aac0154b2e187 /po/zh_CN/using-d-i.po
parent72525d74ceeb13c360c78c5b876577f770e828b0 (diff)
downloadinstallation-guide-fff601e78b57142033c9397015a8051c292ab535.zip
unfuzzy more
Diffstat (limited to 'po/zh_CN/using-d-i.po')
-rw-r--r--po/zh_CN/using-d-i.po56
1 files changed, 7 insertions, 49 deletions
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 07461fcc0..c427b94de 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -2194,27 +2194,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1425
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you select some free space, you will have the opportunity to create a "
-#| "new partition. You will have to answer a quick series of questions about "
-#| "its size, type (primary or logical), and location (beginning or end of "
-#| "the free space). After this, you will be presented with a detailed "
-#| "overview of your new partition. The main setting is <guimenuitem>Use as:</"
-#| "guimenuitem>, which determines if the partition will have a file system "
-#| "on it, or be used for swap,<phrase arch=\"linux-any\"> software RAID, "
-#| "LVM, an encrypted file system,</phrase> or not be used at all. Other "
-#| "settings include mountpoint, mount options, and bootable flag; which "
-#| "settings are shown depends on how the partition is to be used. If you "
-#| "don't like the preselected defaults, feel free to change them to your "
-#| "liking. E.g. by selecting the option <guimenuitem>Use as:</guimenuitem>, "
-#| "you can choose a different filesystem for this partition, including "
-#| "options to use the partition for swap,<phrase arch=\"linux-any\"> "
-#| "software RAID, LVM,</phrase> or not use it at all. Another nice feature "
-#| "is the ability to copy data from an existing partition onto this one. "
-#| "When you are satisfied with your new partition, select <guimenuitem>Done "
-#| "setting up the partition</guimenuitem> and you will return to "
-#| "<command>partman</command>'s main screen."
+#, no-c-format
msgid ""
"If you select some free space, you will have the opportunity to create a new "
"partition. You will have to answer a quick series of questions about its "
@@ -2243,8 +2223,8 @@ msgstr ""
"否显示由分区的使用方式决定。如果您不喜欢预选的缺省设置的话,尽可按照自己的喜"
"好更改。比如说,选中 <guimenuitem>Use as:</guimenuitem> 选项,然后您可以让这"
"个分区改用其他的文件系统,把它用作交换分区<phrase arch=\"linux-any\">、软 "
-"RAID、LVM</phrase>,或者根本就放着不用。另外还有个不错的功能,就是可以把现有"
-"分区的数据复制到新分区上。一旦您对新分区的设置感到满意了,就可以选择 "
+"RAID、LVM</phrase>,或者根本就放着不用。"
+"一旦您对新分区的设置感到满意了,就可以选择 "
"<guimenuitem>Done setting up the partition</guimenuitem>,然后退回到 "
"<command>partman</command> 的主界面。"
@@ -3087,19 +3067,14 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:2017
-#, fuzzy, no-c-format
-#| msgid ""
-#| "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
-#| "userinput> is currently the least vulnerable to known attacks. Use the "
-#| "other alternatives only when you need to ensure compatibility with some "
-#| "previously installed system that is not able to use newer algorithms."
+#, no-c-format
msgid ""
"From the provided alternatives, the default <userinput>xts-plain64</"
"userinput> is currently the least vulnerable to known attacks. Use the other "
"alternatives only when you need to ensure compatibility with some previously "
"installed system that is not able to use newer algorithms."
msgstr ""
-"与其替代者比较,默认的 <userinput>cbc-essiv:sha256</userinput> 是当前已知的具"
+"与其替代者比较,默认的 <userinput>xts-plain64</userinput> 是当前已知的具"
"有最少的攻击漏洞。您只有在需要保持与以前安装的系统兼容,而它们无法使用新的算"
"法时,才使用其他的算法。"
@@ -3448,23 +3423,7 @@ msgstr "配置 apt"
#. Tag: para
#: using-d-i.xml:2262
-#, fuzzy, no-c-format
-#| msgid ""
-#| "One of the tools used to install packages on a &debian-gnu; system is a "
-#| "program called <command>apt-get</command>, from the <classname>apt</"
-#| "classname> package<footnote> <para> Note that the program which actually "
-#| "installs the packages is called <command>dpkg</command>. However, this "
-#| "program is more of a low-level tool. <command>apt-get</command> is a "
-#| "higher-level tool, which will invoke <command>dpkg</command> as "
-#| "appropriate. It knows how to retrieve packages from your CD, the network, "
-#| "or wherever. It is also able to automatically install other packages "
-#| "which are required to make the package you're trying to install work "
-#| "correctly. </para> </footnote>. Other front-ends for package management, "
-#| "like <command>aptitude</command> and <command>synaptic</command>, are "
-#| "also in use. These front-ends are recommended for new users, since they "
-#| "integrate some additional features (package searching and status checks) "
-#| "in a nice user interface. In fact, <command>aptitude</command> is now the "
-#| "recommended utility for package management."
+#, no-c-format
msgid ""
"One of the tools used to install packages on a &debian-gnu; system is a "
"program called <command>apt-get</command>, from the <classname>apt</"
@@ -3488,8 +3447,7 @@ msgstr ""
"在安装某个软件包时自动安装所需的其它软件包。</para> </footnote>。其他的包管理"
"前端程序,像 <command>aptitude</command> 和 <command>synaptic</command> 也在"
"使用。这些前端软件推荐给新用户使用,因为它们在良好的用户界面下集成了一些其他"
-"特性(搜索包与状态检验)。事实上,<command>aptitude</command> 现在已经建议作为"
-"软件包管理工具使用。"
+"特性(搜索包与状态检验)。"
#. Tag: para
#: using-d-i.xml:2285