Update of POT and PO files for the manual

3 files changed, 116 insertions, 92 deletions

diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index f0c52dadc..4c717d4a7 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
-"POT-Creation-Date: 2001-02-09 01:25+0100\n"
+"POT-Creation-Date: 2006-01-10 21:34+0000\n"
 "PO-Revision-Date: 2005-12-26 14:25+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -2321,7 +2321,10 @@ msgid ""
 "The POWER3 processor is used in older IBM 64-bit server systems: known "
 "models include the IntelliStation POWER Model 265, the pSeries 610 and 640, "
 "and the RS/6000 7044-170, 7043-260, and 7044-270."
-msgstr "POWER3 处理器用于早期的 IBM 64 位服务器系统： 已知的型号包括 IntelliStation POWER Model 265、pSeries 610 与 640，以及 RS/6000 7044-170、7043-260 和 7044-270。"
+msgstr ""
+"POWER3 处理器用于早期的 IBM 64 位服务器系统： 已知的型号包括 IntelliStation "
+"POWER Model 265、pSeries 610 与 640，以及 RS/6000 7044-170、7043-260 和 7044-"
+"270。"
 
 #. Tag: term
 #: hardware.xml:1135
@@ -3003,13 +3006,13 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1583
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Debian's support for graphical interfaces is determined by the underlying "
-"support found in XFree86's X11 system. Most AGP, PCI and PCIe video cards "
-"work under XFree86. Details on supported graphics buses, cards, monitors, "
-"and pointing devices can be found at <ulink url=\"&url-xfree86;\"></ulink>. "
-"Debian &release; ships with XFree86 version &x11ver;."
+"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 下工作。更多的关于图形总线，显卡，显示器和指点设备的支持情况，"
@@ -3018,11 +3021,11 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1592
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The XFree86 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 "
+"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 ""
@@ -3032,9 +3035,9 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1600
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The XFree86 X11 window system is supported on some DECstation models. The "
+"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 "
@@ -3664,7 +3667,9 @@ msgstr ""
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
 "additional configuration (see <xref linkend=\"usb-keyboard-config\"/>)."
-msgstr "USB 硬件通常工作得很好，只有一些 USB 键盘需要额外的配置(请参考 <xref linkend=\"usb-keyboard-config\"/>)。"
+msgstr ""
+"USB 硬件通常工作得很好，只有一些 USB 键盘需要额外的配置(请参考 <xref linkend="
+"\"usb-keyboard-config\"/>)。"
 
 #. Tag: para
 #: hardware.xml:2031
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 74b6a13ea..4a4a7d469 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
-"POT-Creation-Date: 2006-01-08 21:39+0000\n"
+"POT-Creation-Date: 2006-01-10 21:34+0000\n"
 "PO-Revision-Date: 2006-01-09 14:22+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -192,10 +192,10 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:123
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Obviously, any questions that have been processed before the preseeding "
-"configuration file is loaded, cannot be preseeded. <xref linkend=\"preseed-"
+"configuration file is loaded cannot be preseeded. <xref linkend=\"preseed-"
 "bootparms\"/> offers a way to avoid these questions being asked."
 msgstr ""
 "显而易见，在加载预置文件之前所需要的过程都不能预置。<xref linkend=\"preseed-"
@@ -228,9 +228,9 @@ msgstr "安装过程中运行用户命令"
 
 #. Tag: para
 #: preseed.xml:208
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A very powerfull and flexible option offered by the preseeding tools is the "
+"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 ""
@@ -680,14 +680,29 @@ msgstr ""
 "显而易见，预置网络设置对于从网络加载预置文件无效。但对从 CD 和 U 盘引导很有帮"
 "助。如果您计划从网络加载预置文件，应该使用传递网络设置给内核引导参数的方式。"
 
+#. Tag: para
+#: preseed.xml:466
+#, fuzzy, 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>。"
+
 #. Tag: screen
-#: preseed.xml:468
-#, no-c-format
+#: preseed.xml:474
+#, fuzzy, 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"
 "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"
@@ -739,16 +754,16 @@ msgstr ""
 "#d-i netcfg/dhcp_hostname string radish"
 
 #. Tag: title
-#: preseed.xml:473
+#: preseed.xml:479
 #, no-c-format
 msgid "Mirror settings"
 msgstr "镜像设置"
 
 #. Tag: para
-#: preseed.xml:474
-#, no-c-format
+#: preseed.xml:480
+#, fuzzy, no-c-format
 msgid ""
-"Depending on the installation method you use, a mirror may used both to "
+"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 ""
@@ -756,7 +771,7 @@ msgstr ""
 "的系统建立 <filename>/etc/apt/sources.list</filename>。"
 
 #. Tag: para
-#: preseed.xml:481
+#: preseed.xml:487
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -765,7 +780,7 @@ msgstr ""
 "参数 <classname>mirror/suite</classname> 决定了安装好的系统使用的套件。"
 
 #. Tag: para
-#: preseed.xml:486
+#: preseed.xml:492
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/udeb/suite</classname> determines the suite "
@@ -781,7 +796,7 @@ msgstr ""
 "suite</classname> 的值相同。"
 
 #. Tag: screen
-#: preseed.xml:498
+#: preseed.xml:504
 #, no-c-format
 msgid ""
 "d-i mirror/country string enter information manually\n"
@@ -805,13 +820,13 @@ msgstr ""
 "#d-i mirror/udeb/suite string testing"
 
 #. Tag: title
-#: preseed.xml:503
+#: preseed.xml:509
 #, no-c-format
 msgid "Partitioning"
 msgstr "分区"
 
 #. Tag: para
-#: preseed.xml:504
+#: preseed.xml:510
 #, no-c-format
 msgid ""
 "Using preseeding to partition the harddisk is very much limited to what is "
@@ -828,7 +843,7 @@ msgstr ""
 "来建立 RAID 或 LVM。"
 
 #. Tag: para
-#: preseed.xml:516
+#: preseed.xml:522
 #, no-c-format
 msgid ""
 "The identification of disks is dependent on the order in which their drivers "
@@ -839,7 +854,7 @@ msgstr ""
 "确的那一个。"
 
 #. Tag: screen
-#: preseed.xml:524
+#: preseed.xml:530
 #, no-c-format
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
@@ -943,13 +958,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:529
+#: preseed.xml:535
 #, no-c-format
 msgid "Clock and time zone setup"
 msgstr "时钟与时区设置"
 
 #. Tag: screen
-#: preseed.xml:531
+#: preseed.xml:537
 #, no-c-format
 msgid ""
 "# Controls whether or not the hardware clock is set to UTC.\n"
@@ -967,13 +982,13 @@ msgstr ""
 "d-i time/zone string US/Eastern"
 
 #. Tag: title
-#: preseed.xml:536
+#: preseed.xml:542
 #, no-c-format
 msgid "Apt setup"
 msgstr "设置 apt"
 
 #. Tag: para
-#: preseed.xml:537
+#: preseed.xml:543
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -985,7 +1000,7 @@ msgstr ""
 "使用的安装方式和前面回答的问题。只有下面三个变量与预置有关。"
 
 #. Tag: screen
-#: preseed.xml:545
+#: preseed.xml:551
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -1003,13 +1018,13 @@ msgstr ""
 "#d-i apt-setup/security_host string"
 
 #. Tag: title
-#: preseed.xml:550
+#: preseed.xml:556
 #, no-c-format
 msgid "Account setup"
 msgstr "帐号设置"
 
 #. Tag: para
-#: preseed.xml:551
+#: preseed.xml:557
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -1020,7 +1035,7 @@ msgstr ""
 "或 MD5 <emphasis>hashes</emphasis> 值。"
 
 #. Tag: para
-#: preseed.xml:558
+#: preseed.xml:564
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1033,7 +1048,7 @@ msgstr ""
 "MD5 hashes 相对安全一些，但也会造成安全的假象，MD5 hash 也可以被暴力破解。"
 
 #. Tag: screen
-#: preseed.xml:568
+#: preseed.xml:574
 #, no-c-format
 msgid ""
 "# Root password, either in clear text\n"
@@ -1073,7 +1088,7 @@ msgstr ""
 "#d-i passwd/user-password-crypted password [MD5 hash]"
 
 #. Tag: para
-#: preseed.xml:570
+#: preseed.xml:576
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -1090,26 +1105,26 @@ msgstr ""
 "root 登录(例如使用 SSH key 认证或 sudo)。"
 
 #. Tag: para
-#: preseed.xml:580
+#: preseed.xml:586
 #, no-c-format
 msgid ""
 "An MD5 hash for a password can be generated using the following command."
 msgstr "密码的 MD5 hash 可以用下面命令产生。"
 
 #. Tag: screen
-#: preseed.xml:584
+#: preseed.xml:590
 #, no-c-format
 msgid "$ echo \"r00tme\" | mkpasswd -s -H MD5"
 msgstr "$ echo \"r00tme\" | mkpasswd -s -H MD5"
 
 #. Tag: title
-#: preseed.xml:590
+#: preseed.xml:596
 #, no-c-format
 msgid "Base system installation"
 msgstr "基本系统安装"
 
 #. Tag: para
-#: preseed.xml:591
+#: preseed.xml:597
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -1118,24 +1133,25 @@ msgid ""
 msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
 
 #. Tag: screen
-#: preseed.xml:598
+#: preseed.xml:604
 #, no-c-format
 msgid ""
 "# Select the initramfs generator used to generate the initrd for 2.6 "
 "kernels.\n"
 "#d-i base-installer/kernel/linux/initramfs-generators string yaird"
 msgstr ""
-"# Select the initramfs generator used to generate the initrd for 2.6 kernels.\n"
+"# Select the initramfs generator used to generate the initrd for 2.6 "
+"kernels.\n"
 "#d-i base-installer/kernel/linux/initramfs-generators string yaird"
 
 #. Tag: title
-#: preseed.xml:603
+#: preseed.xml:609
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "安装引导加载器"
 
 #. Tag: screen
-#: preseed.xml:605
+#: preseed.xml:611
 #, no-c-format
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -1179,13 +1195,13 @@ msgstr ""
 "#d-i grub-installer/with_other_os boolean false"
 
 #. Tag: title
-#: preseed.xml:610
+#: preseed.xml:616
 #, no-c-format
 msgid "Package selection"
 msgstr "选择软件包"
 
 #. Tag: para
-#: preseed.xml:611
+#: preseed.xml:617
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -1193,61 +1209,61 @@ msgid ""
 msgstr "您可以选择安装存在的任务的组合。写这篇文章时已有的任务是："
 
 #. Tag: userinput
-#: preseed.xml:620
+#: preseed.xml:626
 #, no-c-format
 msgid "Standard system"
 msgstr "标准系统"
 
 #. Tag: userinput
-#: preseed.xml:623
+#: preseed.xml:629
 #, no-c-format
 msgid "Desktop environment"
 msgstr "桌面环境"
 
 #. Tag: userinput
-#: preseed.xml:626
+#: preseed.xml:632
 #, no-c-format
 msgid "Web server"
 msgstr "web 服务器"
 
 #. Tag: userinput
-#: preseed.xml:629
+#: preseed.xml:635
 #, no-c-format
 msgid "Print server"
 msgstr "打印服务器"
 
 #. Tag: userinput
-#: preseed.xml:632
+#: preseed.xml:638
 #, no-c-format
 msgid "DNS server"
 msgstr "DNS 服务器"
 
 #. Tag: userinput
-#: preseed.xml:635
+#: preseed.xml:641
 #, no-c-format
 msgid "File server"
 msgstr "文件服务器"
 
 #. Tag: userinput
-#: preseed.xml:638
+#: preseed.xml:644
 #, no-c-format
 msgid "Mail server"
 msgstr "邮件服务器"
 
 #. Tag: userinput
-#: preseed.xml:641
+#: preseed.xml:647
 #, no-c-format
 msgid "SQL database"
 msgstr "SQL 数据库"
 
 #. Tag: userinput
-#: preseed.xml:644
+#: preseed.xml:650
 #, no-c-format
 msgid "Laptop"
 msgstr "便携机"
 
 #. Tag: para
-#: preseed.xml:648
+#: preseed.xml:654
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -1258,7 +1274,7 @@ msgstr ""
 "统</userinput> 任务。"
 
 #. Tag: screen
-#: preseed.xml:656
+#: preseed.xml:662
 #, no-c-format
 msgid ""
 "tasksel tasksel/first multiselect Standard system, Desktop environment\n"
@@ -1280,13 +1296,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:661
+#: preseed.xml:667
 #, no-c-format
 msgid "Finishing up the first stage install"
 msgstr "完成第一阶段安装"
 
 #. Tag: screen
-#: preseed.xml:663
+#: preseed.xml:669
 #, no-c-format
 msgid ""
 "# Avoid that last message about the install being complete.\n"
@@ -1304,13 +1320,13 @@ msgstr ""
 "#d-i cdrom-detect/eject boolean false"
 
 #. Tag: title
-#: preseed.xml:668
+#: preseed.xml:674
 #, no-c-format
 msgid "Mailer configuration"
 msgstr "邮件设置"
 
 #. Tag: para
-#: preseed.xml:669
+#: preseed.xml:675
 #, no-c-format
 msgid ""
 "During a normal install, exim asks only a few questions. Here's how to avoid "
@@ -1319,7 +1335,7 @@ msgstr ""
 "普通安装方式下，exim 会问一些问题。这里是避免的方法。也可以有更多的预置内容。"
 
 #. Tag: screen
-#: preseed.xml:676
+#: preseed.xml:682
 #, no-c-format
 msgid ""
 "exim4-config exim4/dc_eximconfig_configtype \\\n"
@@ -1335,13 +1351,13 @@ msgstr ""
 "exim4-config exim4/dc_postmaster string"
 
 #. Tag: title
-#: preseed.xml:681
+#: preseed.xml:687
 #, no-c-format
 msgid "X configuration"
 msgstr "设置 X"
 
 #. Tag: para
-#: preseed.xml:682
+#: preseed.xml:688
 #, no-c-format
 msgid ""
 "Preseeding Debian's X config is possible, but you probably need to know some "
@@ -1352,29 +1368,29 @@ msgstr ""
 "的 X 配置工具无法自动设置每一件事。"
 
 #. Tag: screen
-#: preseed.xml:690
-#, no-c-format
+#: preseed.xml:696
+#, fuzzy, 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"
-"#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"
 "# 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"
 msgstr ""
 "# X can detect the right driver for some cards, but if you're preseeding,\n"
@@ -1400,13 +1416,13 @@ msgstr ""
 "       select 1024x768 @ 60 Hz"
 
 #. Tag: title
-#: preseed.xml:695
+#: preseed.xml:701
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "预置其他的软件包"
 
 #. Tag: screen
-#: preseed.xml:697
+#: preseed.xml:703
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -1426,19 +1442,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:703
+#: preseed.xml:709
 #, no-c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
 #. Tag: title
-#: preseed.xml:706
+#: preseed.xml:712
 #, no-c-format
 msgid "Shell commands"
 msgstr "shell 命令"
 
 #. Tag: screen
-#: preseed.xml:708
+#: preseed.xml:714
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -1476,13 +1492,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:713
+#: preseed.xml:719
 #, no-c-format
 msgid "Chainloading preseed files"
 msgstr "预置文件链"
 
 #. Tag: para
-#: preseed.xml:714
+#: preseed.xml:720
 #, no-c-format
 msgid ""
 "It is possible to include other preseed files from a preseed file. Any "
@@ -1496,7 +1512,7 @@ msgstr ""
 "其他的文件里面。"
 
 #. Tag: screen
-#: preseed.xml:724
+#: preseed.xml:730
 #, no-c-format
 msgid ""
 "# More that one file can be listed, separated by spaces; all will be\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 0ca044d22..b9b7d9859 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
-"POT-Creation-Date: 2006-01-03 19:55+0000\n"
+"POT-Creation-Date: 2006-01-10 21:34+0000\n"
 "PO-Revision-Date: 2006-01-05 19:03+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -370,14 +370,14 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:148
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
-"xfree86;current/mouse.html\">README.mouse</ulink>."
+"<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) 直接读取数据的。欲知详情，请参阅三键鼠标的迷您指南，即 "
@@ -1217,10 +1217,13 @@ msgid ""
 "with character sets other than ASCII or latin1, please consult the "
 "appropriate localization HOWTO."
 msgstr ""
-"要配置您的 locale 设定，以便使用英语以外的其它语言，就需要安装提供 locales 支持的软件包，然后配置： <informalexample><screen>\n"
+"要配置您的 locale 设定，以便使用英语以外的其它语言，就需要安装提供 locales 支"
+"持的软件包，然后配置： <informalexample><screen>\n"
 "# apt-get install locales\n"
 "# dpkg-reconfigure locales\n"
-"</screen></informalexample> 注意：在此之前必须配置好 apt，创建 source.list 并执行 apt-get update。在使用非 ASCII 或 latin1 的字符集的 locale 之前，请先参阅相应的本地化指南(localization HOWTO)。"
+"</screen></informalexample> 注意：在此之前必须配置好 apt，创建 source.list 并"
+"执行 apt-get update。在使用非 ASCII 或 latin1 的字符集的 locale 之前，请先参"
+"阅相应的本地化指南(localization HOWTO)。"
 
 #. Tag: title
 #: random-bits.xml:566