unfuzzy

2 files changed, 8 insertions, 149 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 902027c7a..022814805 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2007-01-22 23:21+0000\n"
-"PO-Revision-Date: 2007-01-10 16:08+0800\n"
+"PO-Revision-Date: 2007-01-25 09:35+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -1340,7 +1340,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:751
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "d-i mirror/country string enter information manually\n"
 "d-i mirror/http/hostname string &archive-mirror;\n"
@@ -1353,7 +1353,7 @@ msgid ""
 "#d-i mirror/udeb/suite string testing"
 msgstr ""
 "d-i mirror/country string enter information manually\n"
-"d-i mirror/http/hostname string http.us.debian.org\n"
+"d-i mirror/http/hostname string &archive-mirror;\n"
 "d-i mirror/http/directory string /debian\n"
 "d-i mirror/http/proxy string\n"
 "\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 7a4367da5..2d0d1e750 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2007-01-23 19:59+0000\n"
-"PO-Revision-Date: 2007-01-12 11:00+0800\n"
+"PO-Revision-Date: 2007-01-25 10:37+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -334,7 +334,7 @@ msgid ""
 "<userinput>ExplorerPS/2</userinput> in X. The respective configuration files "
 "are <filename>/etc/gpm.conf</filename> and <filename>/etc/X11/xorg.conf</"
 "filename>."
-msgstr ""
+msgstr "鼠标可以在 Linux 控制台(通过 gpm)和 X window 下使用。通常，这只是安装 <filename>gpm</filename> 和 X server 的简单事情。它们都可以使用 <filename>/dev/input/mice</filename> 作为鼠标设备来配置。gpm 里正确的鼠标协议名为 <userinput>exps2</userinput>，X 里面是 <userinput>ExplorerPS/2</userinput>。<filename>/etc/gpm.conf</filename> 和 <filename>/etc/X11/xorg.conf</filename> 分别是各自的配置文件。"
 
 #. Tag: para
 #: random-bits.xml:137
@@ -358,7 +358,7 @@ msgid ""
 "informaltable> To load a mouse driver module, you can use the "
 "<command>modconf</command> command (from the package with the same name) and "
 "look in the category <userinput>kernel/drivers/input/mouse</userinput>."
-msgstr ""
+msgstr "使用鼠标需要加载特定的内核模块。大多时候会自动检测正确的模块，但不一定适用于旧的串口和 bus 鼠标<footnote> <para> 串口鼠标具有一个 9 针的 D 型插头；bus 鼠标使用的是 8 针的圆形插头，请不要和 PS/2 鼠标的 6 针圆形插头或 ADB 鼠标的 4 针圆形插头搞混。</para> </footnote>，它们在很早的计算机上使用。Linux 内核模块使用不同的鼠标类型有：<informaltable><tgroup cols=\"2\"><thead> <row> <entry>模块</entry> <entry>说明</entry> </row> </thead><tbody> <row> <entry>psmouse</entry> <entry>PS/2 鼠标(将自动识别)</entry> </row> <row> <entry>usbhid</entry> <entry>USB 鼠标(将自动识别)</entry> </row> <row> <entry>sermouse</entry> <entry>大多数串口鼠标</entry> </row> <row> <entry>logibm</entry> <entry>连在 Logitech 接口卡上的 bus 鼠标</entry> </row> <row> <entry>inport</entry> <entry>连在 ATI 或 Microsoft InPort 卡上的 bus 鼠标</entry> </row> </tbody></tgroup></informaltable> 要加载鼠标驱动模块，您可以使用 <command>modconf</command> 命令(软件包使用同样的名字)并查看 <userinput>kernel/drivers/input/mouse</userinput> 下的分类。"
 
 #. Tag: para
 #: random-bits.xml:184
@@ -901,19 +901,14 @@ msgstr "运行 <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:457
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
 "the archive when you run it. You can substitute any Debian archive mirror "
 "for <userinput>&archive-mirror;/debian</userinput> in the command example "
 "below, preferably a mirror close to you network-wise. Mirrors are listed at "
 "<ulink url=\"http://www.debian.org/misc/README.mirrors\"></ulink>."
-msgstr ""
-"<command>debootstrap</command> 执行后，它会自己从归档文件库直接下载所需的文"
-"件。您可以把下面的命令行例子中的 <userinput>http.us.debian.org/debian</"
-"userinput> 替换成任何一个 Debian 归档文件库的镜像。选择镜像时，可以根据您的网"
-"络情况选择较近的一个。镜像的列表在 <ulink url=\"http://www.debian.org/misc/"
-"README.mirrors\"></ulink>。"
+msgstr "<command>debootstrap</command> 执行后，它自己会从 archive 直接下载所需的文件。在下面的命令行例子中，您可以将 <userinput>&archive-mirror;/debian</userinput> 替换成任何一个 Debian archive 镜像，根据您的网络情况建议选择较近的一个。镜像列表位于 <ulink url=\"http://www.debian.org/misc/README.mirrors\"></ulink>。"
 
 #. Tag: para
 #: random-bits.xml:466
@@ -2116,139 +2111,3 @@ msgid ""
 msgstr ""
 "由于无法生成随机的密钥，对于创建加密分区的支持仍然有限。但可以使用密码作为密"
 "钥来建立加密分区。"
-
-#~ msgid "1267"
-#~ msgstr "1267"
-
-#~ msgid "<entry>420</entry>"
-#~ msgstr "<entry>420</entry>"
-
-#~ msgid "1667"
-#~ msgstr "1667"
-
-#~ msgid "<entry>50</entry>"
-#~ msgstr "<entry>50</entry>"
-
-#~ msgid "<entry>17</entry>"
-#~ msgstr "<entry>17</entry>"
-
-#~ msgid "<entry>67</entry>"
-#~ msgstr "<entry>67</entry>"
-
-#~ msgid "<entry>35</entry>"
-#~ msgstr "<entry>35</entry>"
-
-#~ msgid "<entry>11</entry>"
-#~ msgstr "<entry>11</entry>"
-
-#~ msgid "<entry>46</entry>"
-#~ msgstr "<entry>46</entry>"
-
-#~ msgid "<entry>277</entry>"
-#~ msgstr "<entry>277</entry>"
-
-#~ msgid "<entry>79</entry>"
-#~ msgstr "<entry>79</entry>"
-
-#~ msgid "<entry>356</entry>"
-#~ msgstr "<entry>356</entry>"
-
-#~ msgid "<entry>2</entry>"
-#~ msgstr "<entry>2</entry>"
-
-#~ msgid "<entry>1</entry>"
-#~ msgstr "<entry>1</entry>"
-
-#~ msgid "<entry>3</entry>"
-#~ msgstr "<entry>3</entry>"
-
-#~ msgid "<entry>49</entry>"
-#~ msgstr "<entry>49</entry>"
-
-#~ msgid "<entry>21</entry>"
-#~ msgstr "<entry>21</entry>"
-
-#~ msgid "<entry>70</entry>"
-#~ msgstr "<entry>70</entry>"
-
-#~ msgid "<entry>13</entry>"
-#~ msgstr "<entry>13</entry>"
-
-#~ msgid "<entry>5</entry>"
-#~ msgstr "<entry>5</entry>"
-
-#~ msgid "<entry>18</entry>"
-#~ msgstr "<entry>18</entry>"
-
-#~ msgid "<entry>24</entry>"
-#~ msgstr "<entry>24</entry>"
-
-#~ msgid "<entry>8</entry>"
-#~ msgstr "<entry>8</entry>"
-
-#~ msgid "<entry>32</entry>"
-#~ msgstr "<entry>32</entry>"
-
-#~ msgid ""
-#~ "The mouse can be used in both the Linux console (with gpm) and the X "
-#~ "window environment. The two uses can be made compatible if the gpm "
-#~ "repeater is used to allow the signal to flow to the X server as shown: "
-#~ "<informalexample><screen>\n"
-#~ "mouse =&gt; /dev/psaux  =&gt; gpm =&gt; /dev/gpmdata -&gt; /dev/mouse "
-#~ "=&gt; X\n"
-#~ "         /dev/ttyS0             (repeater)        (symlink)\n"
-#~ "         /dev/ttyS1\n"
-#~ "</screen></informalexample> Set the repeater protocol to be raw (in "
-#~ "<filename>/etc/gpm.conf</filename>) while setting X to the original mouse "
-#~ "protocol in <filename>/etc/X11/XF86Config</filename> or <filename>/etc/"
-#~ "X11/XF86Config-4</filename>."
-#~ msgstr ""
-#~ "无论在 Linux 的控制台(console)里(通过 gpm)，还是在 X 窗口环境之中，您都可"
-#~ "以使用鼠标。这两种用法是可以兼容的，只要设置 gpm 转发器，令其让信号流往 X "
-#~ "服务器： <informalexample><screen>\n"
-#~ "mouse =&gt; /dev/psaux  =&gt; gpm =&gt; /dev/gpmdata -&gt; /dev/mouse "
-#~ "=&gt; X\n"
-#~ "         /dev/ttyS0             (repeater)        (symlink)\n"
-#~ "         /dev/ttyS1\n"
-#~ "</screen></informalexample> 把转发器的协议设为直接(raw)模式(在 <filename>/"
-#~ "etc/gpm.conf</filename> 里)，同时在 <filename>/etc/X11/XF86Config</"
-#~ "filename> 或者 <filename>/etc/X11/XF86Config-4</filename> 里设置一下，让 "
-#~ "X 使用原始的鼠标协议。"
-
-#~ msgid ""
-#~ "This approach to use gpm even in X has advantages when the mouse is "
-#~ "unplugged inadvertently. Simply restarting gpm with "
-#~ "<informalexample><screen>\n"
-#~ "# /etc/init.d/gpm restart\n"
-#~ "</screen></informalexample> will re-connect the mouse in software without "
-#~ "restarting X."
-#~ msgstr ""
-#~ "用这种方法使用 gpm 的话，就算在 X 里也有其优势。如果不小心把鼠标拔下来后，"
-#~ "只要像这样重新启动 gpm 就可以了： <informalexample><screen>\n"
-#~ "# /etc/init.d/gpm restart\n"
-#~ "</screen></informalexample> 如此就可以在软件层面上重新连接鼠标，而不用重"
-#~ "启 X 了。"
-
-#~ msgid ""
-#~ "If gpm is disabled or not installed for some reason, make sure to set X "
-#~ "to read directly from a mouse device such as /dev/psaux. For details, "
-#~ "refer to the 3-Button Mouse mini-Howto at <filename>/usr/share/doc/HOWTO/"
-#~ "en-txt/mini/3-Button-Mouse.gz</filename>, <userinput>man gpm</userinput>, "
-#~ "<filename>/usr/share/doc/gpm/FAQ.gz</filename>, and <ulink url=\"&url-"
-#~ "xorg;current/doc/html/mouse.html\">README.mouse</ulink>."
-#~ msgstr ""
-#~ "如果禁用了 gpm，或者因为某些原因没有安装，请确保设置 X 从鼠标设备，比如 /"
-#~ "dev/psaux 上直接读取数据。详情情况，请参阅三键鼠标的 mini-Howto "
-#~ "<filename>/usr/share/doc/HOWTO/en-txt/mini/3-Button-Mouse.gz</filename>、"
-#~ "<userinput>man gpm</userinput>、<filename>/usr/share/doc/gpm/FAQ.gz</"
-#~ "filename> 以及 <ulink url=\"&url-xorg;current/doc/html/mouse.html"
-#~ "\">README.mouse</ulink>。"
-
-#~ msgid ""
-#~ "For PowerPC, in <filename>/etc/X11/XF86Config</filename> or <filename>/"
-#~ "etc/X11/XF86Config-4</filename>, set the mouse device to <userinput>\"/"
-#~ "dev/input/mice\"</userinput>."
-#~ msgstr ""
-#~ "对 PowerPC 来说，需要在<filename>/etc/X11/XF86Config</filename>或者 "
-#~ "<filename>/etc/X11/XF86Config-4</filename> 设置鼠标设备里或者 <userinput>"
-#~ "\"/dev/input/mice\"</userinput>。"