Re-use translations for 25 strings that were moved from boot-new to using-d-i for PO based translations

1 files changed, 58 insertions, 10 deletions

diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 8119a03b0..8c3324205 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -1871,9 +1871,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:1258
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Configuring Your Time Zone"
-msgstr "配置网络"
+msgstr "配置您的时区"
 
 #. Tag: para
 #: using-d-i.xml:1260
@@ -1927,13 +1927,13 @@ msgstr ""
 #: using-d-i.xml:1312
 #, no-c-format
 msgid "Setting Up Users And Passwords"
-msgstr ""
+msgstr "设置用户和密码"
 
 #. Tag: title
 #: using-d-i.xml:1315
 #, no-c-format
 msgid "Set the Root Password"
-msgstr ""
+msgstr "设置 root 密码"
 
 #. Tag: para
 #: using-d-i.xml:1317
@@ -1944,6 +1944,9 @@ msgid ""
 "system. The root account should only be used to perform system "
 "administration, and only used for as short a time as possible."
 msgstr ""
+"<emphasis>root</emphasis> 帐户也被称为 <emphasis>超级用户</emphasis>系统中的"
+"所有的安全防护措施对超级用户身份登陆者都是无效的。root 帐户应该仅用来进行系统"
+"管理，而且使用时间应该尽可能短。"
 
 #. Tag: para
 #: using-d-i.xml:1325
@@ -1955,6 +1958,9 @@ msgid ""
 "such a powerful account. Avoid dictionary words or use of any personal "
 "information which could be guessed."
 msgstr ""
+"您所创建的任何密码都应该包含至少 6 个字符，同时包含大小写字母，并且最好带有标"
+"点符号等特殊字符。因为超级用户具有最高权限，因此在您设置 root 密码时尤其需要"
+"小心。请避免采用能够在字典中查到的单词或者很容易猜测的个人信息。"
 
 #. Tag: para
 #: using-d-i.xml:1333
@@ -1964,12 +1970,14 @@ msgid ""
 "You should normally never give your root password out, unless you are "
 "administering a machine with more than one system administrator."
 msgstr ""
+"如果他人向您索取您的 root 密码，您也需要特别谨慎。除非您所管理的系统有多位管"
+"理员，否则您通常不应该将超级用户密码交给别人。"
 
 #. Tag: title
 #: using-d-i.xml:1343
 #, no-c-format
 msgid "Create an Ordinary User"
-msgstr ""
+msgstr "创建一个普通用户"
 
 #. Tag: para
 #: using-d-i.xml:1345
@@ -1980,6 +1988,9 @@ msgid ""
 "<emphasis>not</emphasis> use the root account for daily use or as your "
 "personal login."
 msgstr ""
+"系统会询问您现在是否希望创建一个普通帐户。您将使用该帐户进行日常登陆操作。切"
+"记，平时 <emphasis>不要</emphasis> 使用 root 帐户登陆或者将其作为个人帐号使"
+"用。"
 
 #. Tag: para
 #: using-d-i.xml:1352
@@ -1993,6 +2004,11 @@ msgid ""
 "Unix system administration will cover this topic in more detail &mdash; "
 "consider reading one if it is new to you."
 msgstr ""
+"为什么呢？避免使用 root 特权帐户的一个原因是，它很容易对系统造成无法挽回的破"
+"坏。另一个原因是，您有可能被恶意诱使运行 <emphasis>特洛伊木马</emphasis> 程"
+"序 &mdash; 这是一种利用您的超级用户权限在您未知的情况下损害您的系统安全的程"
+"序。任何合格的 Unix 系统管理书籍中都会涉及到这一主题 &mdash; 如果您不是很了解"
+"这方面的内容，建议您找一本进行学习。"
 
 #. Tag: para
 #: using-d-i.xml:1362
@@ -2003,6 +2019,8 @@ msgid ""
 "similar will suffice and indeed will be the default. Finally, you will be "
 "prompted for a password for this account."
 msgstr ""
+"您首先会被要求输入用户的全名。然后要求输入用户帐号名； 通常名或者类似的便满足"
+"要求，并为缺省值。最后，您将要求输入该帐号的密码。"
 
 #. Tag: para
 #: using-d-i.xml:1369
@@ -2011,6 +2029,8 @@ msgid ""
 "If at any point after installation you would like to create another account, "
 "use the <command>adduser</command> command."
 msgstr ""
+"如果在安装完毕后您还希望建立其它新帐户，请使用 <command>adduser</command> 命"
+"令。"
 
 #. Tag: title
 #: using-d-i.xml:1381
@@ -2173,6 +2193,8 @@ msgid ""
 "Once you've selected your tasks, select <guibutton>Ok</guibutton>. At this "
 "point, <command>aptitude</command> will install the packages you've selected."
 msgstr ""
+"一旦您选择了任务，选择 <guibutton>Ok</guibutton>。此时，<command>aptitude</"
+"command> 将安装您选中的软件包。"
 
 #. Tag: para
 #: using-d-i.xml:1528
@@ -2206,7 +2228,7 @@ msgstr ""
 #: using-d-i.xml:1552
 #, no-c-format
 msgid "Configuring Your Mail Transport Agent"
-msgstr ""
+msgstr "配置您的邮件传输代理(MTA)"
 
 #. Tag: para
 #: using-d-i.xml:1554
@@ -2218,6 +2240,9 @@ msgid ""
 "<command>exim4</command>, which is relatively small, flexible, and easy to "
 "learn."
 msgstr ""
+"今天，电子邮件已经成为很多人生活中不可或缺的部份，所以，Debian 让您在安装过程"
+"中配置邮件传输代理，并不是件奇怪的事。Debian 中的标准邮件传输代理是 "
+"<command>exim4</command>。这是一个非常小巧、灵活并且容易理解的工具。"
 
 #. Tag: para
 #: using-d-i.xml:1562
@@ -2228,6 +2253,10 @@ msgid ""
 "utilities (like <command>cron</command>, <command>quota</command>, "
 "<command>aide</command>, &hellip;) may send you important notices via email."
 msgstr ""
+"您可能会问，我的电脑并没有连接到网络上，是否也需要做这一步工作呢？ 简短的答"
+"案：是。稍长一些的解释：部份系统工具(比如 <command>cron</command>, "
+"<command>quota</command>, <command>aide</command> 等)的重要通知都是通过邮件发"
+"送的。"
 
 #. Tag: para
 #: using-d-i.xml:1570
@@ -2236,12 +2265,14 @@ msgid ""
 "So on the first screen you will be presented with several common mail "
 "scenarios. Choose the one that most closely resembles your needs:"
 msgstr ""
+"所以，在第一个屏幕上您可以看到几个常见的邮件配置方案。请选择一个最适合您需求"
+"的。"
 
 #. Tag: term
 #: using-d-i.xml:1579
 #, no-c-format
 msgid "internet site"
-msgstr ""
+msgstr "互联网站"
 
 #. Tag: para
 #: using-d-i.xml:1580
@@ -2252,12 +2283,14 @@ msgid ""
 "questions, like your machine's mail name, or a list of domains for which you "
 "accept or relay mail."
 msgstr ""
+"您的系统被连接到网络上，并且您通过 SMTP 直接收发邮件。在接下来的几页中，程序"
+"会询问您一些基本问题，如：您的机器的邮件名称、您接受或转发邮件的域等等。"
 
 #. Tag: term
 #: using-d-i.xml:1591
 #, no-c-format
 msgid "mail sent by smarthost"
-msgstr ""
+msgstr "用 smarthost 发信"
 
 #. Tag: para
 #: using-d-i.xml:1592
@@ -2270,12 +2303,16 @@ msgid ""
 "mail from the smarthost via programs like fetchmail. This option is suitable "
 "for dial-up users."
 msgstr ""
+"在这个方案中，您的外发邮件将被另一台我们称之为 <quote>smarthost</quote>主机转"
+"发，由它来完成实际的邮件发送工作。Smarthost 通常也能存放将要投递到您的电脑上"
+"的邮件，因此您并不需要永远在线。也就是说，您必须通过诸如 fetchmail 之类的程序"
+"将邮件从 smarthost 下载回来。这一选项通常适合拨号用户。"
 
 #. Tag: term
 #: using-d-i.xml:1605
 #, no-c-format
 msgid "local delivery only"
-msgstr ""
+msgstr "仅在本地投递"
 
 #. Tag: para
 #: using-d-i.xml:1606
@@ -2288,12 +2325,16 @@ msgid ""
 "This option is also convenient for new users, because it doesn't ask any "
 "further questions."
 msgstr ""
+"您的系统并未连接网络，而且邮件仅仅在本地用户间传递时。即使您不打算发送任何邮"
+"件，我们也建议您选择此选项，因为部份系统工具可能随时会发送一些警告信息(比如："
+"可爱的 <quote>Disk quota exceeded</quote>)。由于选择此项后不需要回答任何问"
+"题，因此这一选项也非常适合新手。"
 
 #. Tag: term
 #: using-d-i.xml:1619
 #, no-c-format
 msgid "no configuration at this time"
-msgstr ""
+msgstr "现在不进行配置"
 
 #. Tag: para
 #: using-d-i.xml:1620
@@ -2304,6 +2345,9 @@ msgid ""
 "configure it, you won't be able to send or receive any mail and you may miss "
 "some important messages from your system utilities."
 msgstr ""
+"除非您真的知道这是在干什么，否则请不要选择这一选项。这会留下一个未配置的邮件"
+"系统 &mdash; 在您再次配置它之前，您都无法收发任何邮件，并且可能会错过一些系统"
+"工具发来的重要信息。"
 
 #. Tag: para
 #: using-d-i.xml:1631
@@ -2315,6 +2359,10 @@ msgid ""
 "about <command>exim4</command> may be found under <filename>/usr/share/doc/"
 "exim4</filename>."
 msgstr ""
+"如果以上的方案都不适合您的需求，或者您需要一个更好的配置，在安装完毕后，您可"
+"以编辑 <filename>/etc/exim4</filename> 目录下的配置文件。您还可以在 "
+"<command>exim4</command>下找到更多关于 <filename>/usr/share/doc/exim4</"
+"filename> 的资料。"
 
 #. Tag: title
 #: using-d-i.xml:1646