xfree86 -> xorg

3 files changed, 31 insertions, 54 deletions

diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 4c717d4a7..b213200bf 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "POT-Creation-Date: 2006-01-10 21:34+0000\n"
-"PO-Revision-Date: 2005-12-26 14:25+0800\n"
+"PO-Revision-Date: 2006-01-12 17:45+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"
@@ -3006,47 +3006,36 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1583
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Debian's support for graphical interfaces is determined by the underlying "
 "support found in X.Org's X11 system. Most AGP, PCI and PCIe video cards work "
 "under X.Org. Details on supported graphics buses, cards, monitors, and "
 "pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. Debian "
 "&release; ships with X.Org version &x11ver;."
-msgstr ""
-"Debian 对显卡的支持决定于 XFree86 的 X11 系统。大多数 AGP，PCI 和 PCI 视频卡"
-"都能在 XFree86 下工作。更多的关于图形总线，显卡，显示器和指点设备的支持情况，"
-"见 <ulink url=\"&url-xfree86;\"></ulink>。Debian &release; 包含 XFree86 "
-"&x11ver; 版。"
+msgstr "Debian 对显卡的支持决定于 X.Org 的 X11 系统。大多数 AGP、PCI 和 PCI 视频卡都能在 X.Org 下工作。更多的关于图形总线、显卡、显示器和指点设备的支持情况，见 <ulink url=\"&url-xorg;\"></ulink>。Debian &release; 包含 X.Org &x11ver; 版。"
 
 #. Tag: para
 #: hardware.xml:1592
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "The X.Org X11 window system is only supported on the SGI Indy. The Broadcom "
 "BCM91250A evaluation board has standard 3.3v PCI slots and supports VGA "
 "emulation or Linux framebuffer on a selected range of graphics cards. A "
 "<ulink url=\"&url-bcm91250a-hardware;\">compatibility listing</ulink> for "
 "the BCM91250A is available."
-msgstr ""
-"XFree86 X11 window 系统仅支持 SGI Indy。Broadcom BCM91250A 评估板具有标准的 "
-"3.3v PCI 插槽，并且可选配的显示卡支持 VGA 仿真或者 Linux framebuffer。详见 "
-"BCM91250A 的 <ulink url=\"&url-bcm91250a-hardware;\">兼容列表</ulink>。"
+msgstr "X.Org X11 窗口系统仅支持 SGI Indy。Broadcom BCM91250A 评估板具有标准的 3.3v PCI 插槽，并且可选配的显示卡支持 VGA 仿真或者 Linux framebuffer。详见 BCM91250A 的 <ulink url=\"&url-bcm91250a-hardware;\">兼容列表</ulink>。"
 
 #. Tag: para
 #: hardware.xml:1600
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "The X.Org X11 window system is supported on some DECstation models. The "
 "Broadcom BCM91250A evaluation board has standard 3.3v PCI slots and supports "
 "VGA emulation or Linux framebuffer on a selected range of graphics cards. A "
 "<ulink url=\"&url-bcm91250a-hardware;\">compatibility listing</ulink> for "
 "the BCM91250A is available."
-msgstr ""
-"在某些 DEC 工作站机型上 XFree86 X11 window 系统获得支持。Broadcom BCM91250A "
-"评估板具有标准的 3.3v PCI 插槽，并且可选配的显示卡支持 VGA 仿真 或者 Linux "
-"framebuffer。详见 BCM91250A 的<ulink url=\"&url-bcm91250a-hardware;\">兼容列"
-"表</ulink>。"
+msgstr "在某些 DEC 工作站机型上 X.Org X11 窗口系统获得支持。Broadcom BCM91250A 评估板具有标准的 3.3v PCI 插槽，并且可选配的显示卡支持 VGA 仿真或者 Linux framebuffer。详见 BCM91250A 的<ulink url=\"&url-bcm91250a-hardware;\">兼容列表</ulink>。"
 
 #. Tag: title
 #: hardware.xml:1612
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 4a4a7d469..0395b1d81 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "POT-Creation-Date: 2006-01-10 21:34+0000\n"
-"PO-Revision-Date: 2006-01-09 14:22+0800\n"
+"PO-Revision-Date: 2006-01-12 17:56+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"
@@ -192,14 +192,12 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:123
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Obviously, any questions that have been processed before the preseeding "
 "configuration file is loaded cannot be preseeded. <xref linkend=\"preseed-"
 "bootparms\"/> offers a way to avoid these questions being asked."
-msgstr ""
-"显而易见，在加载预置文件之前所需要的过程都不能预置。<xref linkend=\"preseed-"
-"bootparms\"/> 提供了避免这些问题被询问的方法。"
+msgstr "显而易见，在加载预置文件之前需要的过程都不能被预置。<xref linkend=\"preseed-bootparms\"/> 提供了避免这些问题被询问的方法。"
 
 #. Tag: title
 #: preseed.xml:134
@@ -228,14 +226,12 @@ msgstr "安装过程中运行用户命令"
 
 #. Tag: para
 #: preseed.xml:208
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preseeding tools is the "
 "ability to run commands or scripts at certain points in the installation. "
 "See <xref linkend=\"preseed-shell\"/> for details."
-msgstr ""
-"预置工具的一个强大和灵活的选项，是提供了在安装过程中的一些点上可以运行命令或"
-"脚本的能力。详细情况，请參考 <xref linkend=\"preseed-shell\"/>。"
+msgstr "预置工具提供了一个非常强大和灵活的选项，可以在安装过程的一些点上运行命令或脚本。请參考 <xref linkend=\"preseed-shell\"/> 了解详细情况。"
 
 #. Tag: para
 #: preseed.xml:217
@@ -682,19 +678,17 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:466
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If you need to pick a particular interface when netbooting before loading a "
 "preseed file from the network, use a boot parameter such as "
 "<userinput>netcfg/choose_interface=<replaceable>eth1</replaceable></"
 "userinput>."
-msgstr ""
-"本地可以指定语言和国家。要在引导参数上指定本地，使用 <userinput>debian-"
-"installer/locale=<replaceable>en_US</replaceable></userinput>。"
+msgstr "如果您需要网络引导从网络加载预置文件前指定网卡，请用这种引导参数 <userinput>netcfg/choose_interface=<replaceable>eth1</replaceable></userinput>。"
 
 #. Tag: screen
 #: preseed.xml:474
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "# netcfg will choose an interface that has link if possible. This makes it\n"
 "# skip displaying a list if there is more than one interface.\n"
@@ -730,6 +724,9 @@ msgstr ""
 "# skip displaying a list if there is more than one interface.\n"
 "d-i netcfg/choose_interface select auto\n"
 "\n"
+"# To pick a particular interface instead:\n"
+"#d-i netcfg/choose_interface select eth1\n"
+"\n"
 "# If you have a slow dhcp server and the installer times out waiting for\n"
 "# it, this might be useful.\n"
 "#d-i netcfg/dhcp_timeout string 60\n"
@@ -761,14 +758,12 @@ msgstr "镜像设置"
 
 #. Tag: para
 #: preseed.xml:480
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Depending on the installation method you use, a mirror may be used both to "
 "download additional components of the installer, the base system and to set "
 "up the <filename>/etc/apt/sources.list</filename> for the installed system."
-msgstr ""
-"根据您使用的安装方式，镜像可用于下载安装程序的额外组件，基本系统以及为安装好"
-"的系统建立 <filename>/etc/apt/sources.list</filename>。"
+msgstr "根据您使用的安装方式，镜像可用于下载安装程序的额外组件，基本系统以及为安装的系统建立 <filename>/etc/apt/sources.list</filename>。"
 
 #. Tag: para
 #: preseed.xml:487
@@ -1369,7 +1364,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:696
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "# X can detect the right driver for some cards, but if you're preseeding,\n"
 "# you override whatever it chooses. Still, vesa will work most places.\n"
@@ -1395,24 +1390,23 @@ msgid ""
 msgstr ""
 "# X can detect the right driver for some cards, but if you're preseeding,\n"
 "# you override whatever it chooses. Still, vesa will work most places.\n"
-"#xserver-xfree86 xserver-xfree86/config/device/driver select vesa\n"
+"#xserver-xorg xserver-xorg/config/device/driver select vesa\n"
 "\n"
 "# A caveat with mouse autodetection is that if it fails, X will retry it\n"
 "# over and over. So if it's preseeded to be done, there is a possibility of\n"
 "# an infinite loop if the mouse is not autodetected.\n"
-"#xserver-xfree86 xserver-xfree86/autodetect_mouse boolean true\n"
+"#xserver-xorg xserver-xorg/autodetect_mouse boolean true\n"
 "\n"
 "# Monitor autodetection is recommended.\n"
-"xserver-xfree86 xserver-xfree86/autodetect_monitor boolean true\n"
+"xserver-xorg xserver-xorg/autodetect_monitor boolean true\n"
 "# Uncomment if you have an LCD display.\n"
-"#xserver-xfree86 xserver-xfree86/config/monitor/lcd boolean true\n"
+"#xserver-xorg xserver-xorg/config/monitor/lcd boolean true\n"
 "# X has three configuration paths for the monitor. Here's how to preseed\n"
-"# the \"medium\" path, which is always available. The \"simple\" path may "
-"not\n"
+"# the \"medium\" path, which is always available. The \"simple\" path may not\n"
 "# be available, and the \"advanced\" path asks too many questions.\n"
-"xserver-xfree86 xserver-xfree86/config/monitor/selection-method \\\n"
+"xserver-xorg xserver-xorg/config/monitor/selection-method \\\n"
 "       select medium\n"
-"xserver-xfree86 xserver-xfree86/config/monitor/mode-list \\\n"
+"xserver-xorg xserver-xorg/config/monitor/mode-list \\\n"
 "       select 1024x768 @ 60 Hz"
 
 #. Tag: title
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index b9b7d9859..8806cc178 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "POT-Creation-Date: 2006-01-10 21:34+0000\n"
-"PO-Revision-Date: 2006-01-05 19:03+0800\n"
+"PO-Revision-Date: 2006-01-12 17:59+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"
@@ -370,7 +370,7 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:148
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If gpm is disabled or not installed with some reason, make sure to set X to "
 "read directly from the mouse device such as /dev/psaux. For details, refer "
@@ -378,13 +378,7 @@ msgid ""
 "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) 直接读取数据的。欲知详情，请参阅三键鼠标的迷您指南，即 "
-"<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-xfree86;current/mouse.html\">README.mouse</"
-"ulink> 里设置一下，让 X 使用原始的鼠标协议。"
+msgstr "如果您禁用了 gpm，或者因为某些原因没有安装，请确保设置让 X 从鼠标设备(比如 /dev/psaux) 直接读取数据。欲知详情，请参阅三键鼠标的迷你指南，即 <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>。"
 
 #. Tag: para
 #: random-bits.xml:158