Branch 'f11-tx' - po/zh_CN.po

[Transifex System User]

 po/zh_CN.po | 3960 +++++++++++-------------------------------------------------
 1 file changed, 755 insertions(+), 3205 deletions(-)

New commits:
commit 2a15b5eeed1854739506a53d12ffcbe92bd702f4
Author: tiansworld <tiansworld at fedoraproject.org>
Date:   Fri May 8 08:38:06 2009 +0000

    Sending translation for Chinese (Simplified)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4f97281..3e5ee4a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: docs-release-notes.f11-tx\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2009-05-02 00:43+0000\n"
-"PO-Revision-Date: 2009-04-26 14:12+0800\n"
+"PO-Revision-Date: 2009-05-08 16:36+0800\n"
 "Last-Translator: TianShixiong <tiansworld at gmail.com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation at lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -30,30 +30,14 @@ msgstr "å¯¹ä¸šä½™æ— çº¿ç”µçˆ±å¥½è€…æ¥è¯´æœ‰ä»€ä¹ˆæ–°ç‰¹æ€§ï¼Ÿ"
 #. Tag: remark
 #: AmateurRadio.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/AmateurRadio\">https://fedoraproject.org/wiki/Docs/Beats/"
-"AmateurRadio</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/AmateurRadio\">https://fedoraproject.org/wiki/Docs/Beats/"
-"AmateurRadio</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/AmateurRadio\">https://fedoraproject.org/wiki/Docs/Beats/AmateurRadio</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/AmateurRadio\">https://fedoraproject.org/wiki/Docs/Beats/AmateurRadio</ulink>"
 
 #. Tag: para
 #: AmateurRadio.xml:9
 #, no-c-format
-msgid ""
-"Fedora 11 includes a number of applications and libraries that are of "
-"interest to amateur radio operators and electronic hobbyists. Many of these "
-"applications are included in the Fedora Electronic Lab spin. For a complete "
-"list of amateur radio applications available within Fedora see <ulink type="
-"\"http\" url=\"https://fedoraproject.org/wiki/Applications_for_Amateur_Radio"
-"\">Applications for amateur radio</ulink> on the wiki."
-msgstr ""
-"Fedora 11 ä¸­åŒ…å«å¾ˆå¤šä¸šä½™æ— çº¿ç”µå’Œç”µå­çˆ±å¥½è€…æ„Ÿå…´è¶£çš„åº”ç”¨ç¨‹åºå’Œç¨‹åºåº“ã€‚Fedora 电"
-"子实验室 spin ä¸­æœ‰å¾ˆå¤šè¿™æ ·çš„ç¨‹åºã€‚Fedora ä¸­çš„å¯ç”¨å®Œæ•´ä¸šä½™æ— çº¿ç”µåº”ç”¨ç¨‹åºåˆ—è¡¨è¯·"
-"参考 wiki 中的 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Applications_for_Amateur_Radio\">ä¸šä½™æ— çº¿ç”µåº”ç”¨ç¨‹åº</ulink>。"
+msgid "Fedora 11 includes a number of applications and libraries that are of interest to amateur radio operators and electronic hobbyists. Many of these applications are included in the Fedora Electronic Lab spin. For a complete list of amateur radio applications available within Fedora see <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Applications_for_Amateur_Radio\">Applications for amateur radio</ulink> on the wiki."
+msgstr "Fedora 11 ä¸­åŒ…å«å¾ˆå¤šä¸šä½™æ— çº¿ç”µå’Œç”µå­çˆ±å¥½è€…æ„Ÿå…´è¶£çš„åº”ç”¨ç¨‹åºå’Œç¨‹åºåº“ã€‚Fedora 电子实验室 spin ä¸­æœ‰å¾ˆå¤šè¿™æ ·çš„ç¨‹åºã€‚Fedora ä¸­çš„å¯ç”¨å®Œæ•´ä¸šä½™æ— çº¿ç”µåº”ç”¨ç¨‹åºåˆ—è¡¨è¯·å‚è€ƒ wiki 中的 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Applications_for_Amateur_Radio\">ä¸šä½™æ— çº¿ç”µåº”ç”¨ç¨‹åº</ulink>。"
 
 #. Tag: title
 #: AmateurRadio.xml:19
@@ -70,19 +54,8 @@ msgstr "fldigi"
 #. Tag: para
 #: AmateurRadio.xml:22
 #, no-c-format
-msgid ""
-"Fedora 11 includes version 3.10 of <application>fldigi</application>. "
-"Changes from Fedora 10 include many enhancements to the waterfall and "
-"logging, along with dozens of minor changes to the user interface and bug "
-"fixes. For a complete list of changes see the upstream project's site at "
-"<ulink type=\"http\" url=\"http://www.w1hkj.com/fldigi-distro/\">http://www."
-"w1hkj.com/fldigi-distro/</ulink>"
-msgstr ""
-"Fedora 11 中包括 <application>fldigi</application> 的 3.10 版。与 Fedora 10 "
-"相比，除了对用户界面以及 bug 修复有很多小改动之外，在 waterfall 和日志记录方"
-"é¢ä¹ŸåŠ å¼ºäº†å¾ˆå¤šã€‚æœ‰å…³æ”¹åŠ¨çš„å®Œæ•´åˆ—è¡¨è¯·æŸ¥çœ‹ä¸Šæ¸¸é¡¹ç›®ç½‘é¡µ <ulink type=\"http\" "
-"url=\"http://www.w1hkj.com/fldigi-distro/\">http://www.w1hkj.com/fldigi-"
-"distro/</ulink>。"
+msgid "Fedora 11 includes version 3.10 of <application>fldigi</application>. Changes from Fedora 10 include many enhancements to the waterfall and logging, along with dozens of minor changes to the user interface and bug fixes. For a complete list of changes see the upstream project's site at <ulink type=\"http\" url=\"http://www.w1hkj.com/fldigi-distro/\">http://www.w1hkj.com/fldigi-distro/</ulink>"
+msgstr "Fedora 11 中包括 <application>fldigi</application> çš„ 3.10 版。与 Fedora 10 相比，除了对用户界面以及 bug 修复有很多小改动之外，在 waterfall å’Œæ—¥å¿—è®°å½•æ–¹é¢ä¹ŸåŠ å¼ºäº†å¾ˆå¤šã€‚æœ‰å…³æ”¹åŠ¨çš„å®Œæ•´åˆ—è¡¨è¯·æŸ¥çœ‹ä¸Šæ¸¸é¡¹ç›®ç½‘é¡µ <ulink type=\"http\" url=\"http://www.w1hkj.com/fldigi-distro/\">http://www.w1hkj.com/fldigi-distro/</ulink>。"
 
 #. Tag: title
 #: AmateurRadio.xml:33
@@ -93,17 +66,8 @@ msgstr "xfhell"
 #. Tag: para
 #: AmateurRadio.xml:34
 #, no-c-format
-msgid ""
-"Version 1.9 of <application>xfhell</application> includes some improvements "
-"in handling the PTT line and additional flexibility in adjusting window "
-"sizes, as well as some bug fixes. The project's site is at <ulink type=\"http"
-"\" url=\"http://5b4az.chronos.org.uk/pages/digital.html\">http://5b4az."
-"chronos.org.uk/pages/digital.html</ulink>"
-msgstr ""
-"<application>xfhell</application> 的版本 1.9 包括一下阿处理 PTT 行的改进以及"
-"在调整窗口大小的额外的灵活性，还修复了一些 bug。该项目的网页为 <ulink type="
-"\"http\" url=\"http://5b4az.chronos.org.uk/pages/digital.html\">http://5b4az."
-"chronos.org.uk/pages/digital.html</ulink>。"
+msgid "Version 1.9 of <application>xfhell</application> includes some improvements in handling the PTT line and additional flexibility in adjusting window sizes, as well as some bug fixes. The project's site is at <ulink type=\"http\" url=\"http://5b4az.chronos.org.uk/pages/digital.html\">http://5b4az.chronos.org.uk/pages/digital.html</ulink>"
+msgstr "<application>xfhell</application> 的版本 1.9 包括一下阿处理 PTT 行的改进以及在调整窗口大小的额外的灵活性，还修复了一些 bug。该项目的网页为 <ulink type=\"http\" url=\"http://5b4az.chronos.org.uk/pages/digital.html\">http://5b4az.chronos.org.uk/pages/digital.html</ulink>。"
 
 #. Tag: title
 #: AmateurRadio.xml:43
@@ -114,18 +78,8 @@ msgstr "soundmodem"
 #. Tag: para
 #: AmateurRadio.xml:44
 #, no-c-format
-msgid ""
-"<application>soundmodem</application> is now back in Fedora. "
-"<application>soundmodem</application> 0.10 provides a way to use your sound "
-"card as a modem for digital applications such as AX.25. The upstream's "
-"project page is <ulink type=\"http\" url=\"http://www.baycom.org/~tom/ham/"
-"soundmodem/\">http://www.baycom.org/~tom/ham/soundmodem/</ulink>"
-msgstr ""
-"Fedora çŽ°åœ¨åˆé‡æ–°æ·»åŠ äº† <application>soundmodem</application>。"
-"<application>soundmodem</application> 0.10 提供为数字应用程序（比如 AX.25）将"
-"您的声卡作为调制解调器使用的方法。该上游项目页面为 <ulink type=\"http\" url="
-"\"http://www.baycom.org/~tom/ham/soundmodem/\">http://www.baycom.org/~tom/"
-"ham/soundmodem/</ulink>。"
+msgid "<application>soundmodem</application> is now back in Fedora. <application>soundmodem</application> 0.10 provides a way to use your sound card as a modem for digital applications such as AX.25. The upstream's project page is <ulink type=\"http\" url=\"http://www.baycom.org/~tom/ham/soundmodem/\">http://www.baycom.org/~tom/ham/soundmodem/</ulink>"
+msgstr "Fedora çŽ°åœ¨åˆé‡æ–°æ·»åŠ äº† <application>soundmodem</application>。<application>soundmodem</application> 0.10 提供为数字应用程序（比如 AX.25）将您的声卡作为调制解调器使用的方法。该上游项目页面为 <ulink type=\"http\" url=\"http://www.baycom.org/~tom/ham/soundmodem/\">http://www.baycom.org/~tom/ham/soundmodem/</ulink>。"
 
 #. Tag: title
 #: AmateurRadio.xml:54
@@ -136,17 +90,8 @@ msgstr "HamFax"
 #. Tag: para
 #: AmateurRadio.xml:55
 #, no-c-format
-msgid ""
-"<application>HamFax</application> 0.54 is new to Fedora. "
-"<application>HamFax</application> is an application for sending and "
-"receiving facsimiles in amateur radio and for receiving public facsimile "
-"broadcasts like weather maps. Supported interfaces are sound cards and the "
-"SCS-PTCII from Special Communication Systems."
-msgstr ""
-"<application>HamFax</application> 0.54 æ˜¯æ–°æ·»åŠ åˆ° Fedora 中的。"
-"<application>HamFax</application> æ˜¯ä¸€ä¸ªä¸šä½™æ— çº¿ç”µçˆ±å¥½è€…å‘é€å’ŒæŽ¥æ”¶ä¼ çœŸçš„åº”ç”¨"
-"程序，并可接收公共通信广播，比如气象图。支持的接口是来自特殊通信系统的声卡和 "
-"SCS-PTCII。"
+msgid "<application>HamFax</application> 0.54 is new to Fedora. <application>HamFax</application> is an application for sending and receiving facsimiles in amateur radio and for receiving public facsimile broadcasts like weather maps. Supported interfaces are sound cards and the SCS-PTCII from Special Communication Systems."
+msgstr "<application>HamFax</application> 0.54 æ˜¯æ–°æ·»åŠ åˆ° Fedora 中的。<application>HamFax</application> æ˜¯ä¸€ä¸ªä¸šä½™æ— çº¿ç”µçˆ±å¥½è€…å‘é€å’ŒæŽ¥æ”¶ä¼ çœŸçš„åº”ç”¨ç¨‹åºï¼Œå¹¶å¯æŽ¥æ”¶å…¬å…±é€šä¿¡å¹¿æ’­ï¼Œæ¯”å¦‚æ°”è±¡å›¾ã€‚æ”¯æŒçš„æŽ¥å£æ˜¯æ¥è‡ªç‰¹æ®Šé€šä¿¡ç³»ç»Ÿçš„å£°å¡å’Œ SCS-PTCII。"
 
 #. Tag: title
 #: AmateurRadio.xml:65
@@ -157,14 +102,8 @@ msgstr "wxapt"
 #. Tag: para
 #: AmateurRadio.xml:66
 #, no-c-format
-msgid ""
-"<application>wxapt</application> is a console application for decoding and "
-"saving weather images transmitted in the APT format of NOAA and METEOR "
-"satellites. <application>wxapt</application> is a new addition to Fedora."
-msgstr ""
-"<application>wxapt</application> æ˜¯ä¸€ä¸ªç”¨æ¥è§£ç å’Œä¿å­˜ NOAA å’Œ METEOR çš„ APT "
-"æ ¼å¼çš„æ°”è±¡å›¾ä¼ è¾“çš„åº”ç”¨ç¨‹åºã€‚<application>wxapt</application> æ˜¯æ–°æ·»åŠ åˆ° "
-"Fedora 中的。"
+msgid "<application>wxapt</application> is a console application for decoding and saving weather images transmitted in the APT format of NOAA and METEOR satellites. <application>wxapt</application> is a new addition to Fedora."
+msgstr "<application>wxapt</application> æ˜¯ä¸€ä¸ªç”¨æ¥è§£ç å’Œä¿å­˜ NOAA å’Œ METEOR çš„ APT æ ¼å¼çš„æ°”è±¡å›¾ä¼ è¾“çš„åº”ç”¨ç¨‹åºã€‚<application>wxapt</application> æ˜¯æ–°æ·»åŠ åˆ° Fedora 中的。"
 
 #. Tag: title
 #: AmateurRadio.xml:76
@@ -181,12 +120,8 @@ msgstr "gnuradio"
 #. Tag: para
 #: AmateurRadio.xml:79
 #, no-c-format
-msgid ""
-"<application>gnuradio</application> has been updated to version 3.1.3. This "
-"is largely a bugfix update."
-msgstr ""
-"已将 <application>gnuradio</application> 更新到版本 3.1.3。这是一个完成了很"
-"多 bug 修复的更新。"
+msgid "<application>gnuradio</application> has been updated to version 3.1.3. This is largely a bugfix update."
+msgstr "已将 <application>gnuradio</application> 更新到版本 3.1.3。这是一个完成了很多 bug 修复的更新。"
 
 #. Tag: title
 #: AmateurRadio.xml:86
@@ -197,23 +132,8 @@ msgstr "电路升级及模拟"
 #. Tag: para
 #: AmateurRadio.xml:87
 #, no-c-format
-msgid ""
-"The gEDA suite has been updated to 20081231. This includes the packages "
-"<package>geda-docs</package>, <package>geda-examples</package>, "
-"<package>geda-gattrib</package>, <package>geda-gnetlist</package>, "
-"<package>geda-gschem</package>, <package>geda-gsymcheck</package>, "
-"<package>geda-symbols</package> and <package>geda-utils</package>. These are "
-"all bugfix releases. In addition, <package>gerbv</package>, <package>pcb</"
-"package>, and <package>ngspice</package> are a part of the gEDA suite, but "
-"released separately."
-msgstr ""
-"已将 gEDA 套件更新至 20081231。这包含软件包 <package>geda-docs</package>、"
-"<package>geda-examples</package>、<package>geda-gattrib</package>、"
-"<package>geda-gnetlist</package>、<package>geda-gschem</package>、"
-"<package>geda-gsymcheck</package>、<package>geda-symbols</package> 和 "
-"<package>geda-utils</package>。这些都是修复 bug 后的发布。另外，gEDA 套件中还"
-"包括 <package>gerbv</package>、<package>pcb</package> 和 <package>ngspice</"
-"package>，但是分别发行的。"
+msgid "The gEDA suite has been updated to 20081231. This includes the packages <package>geda-docs</package>, <package>geda-examples</package>, <package>geda-gattrib</package>, <package>geda-gnetlist</package>, <package>geda-gschem</package>, <package>geda-gsymcheck</package>, <package>geda-symbols</package> and <package>geda-utils</package>. These are all bugfix releases. In addition, <package>gerbv</package>, <package>pcb</package>, and <package>ngspice</package> are a part of the gEDA suite, but released separately."
+msgstr "已将 gEDA 套件更新至 20081231。这包含软件包 <package>geda-docs</package>、<package>geda-examples</package>、<package>geda-gattrib</package>、<package>geda-gnetlist</package>、<package>geda-gschem</package>、<package>geda-gsymcheck</package>、<package>geda-symbols</package> 和 <package>geda-utils</package>。这些都是修复 bug 后的发布。另外，gEDA 套件中还包括 <package>gerbv</package>、<package>pcb</package> 和 <package>ngspice</package>，但是分别发行的。"
 
 #. Tag: title
 #: AmateurRadio.xml:103
@@ -224,17 +144,8 @@ msgstr "gerbv"
 #. Tag: para
 #: AmateurRadio.xml:104
 #, no-c-format
-msgid ""
-"<application>gerbv</application> 2.1.0 includes improvements to object "
-"selection, improved exporting, and more flexibility in dealing with drill "
-"files. The complete release notes for this package can be found at <ulink "
-"type=\"http\" url=\"http://gerbv.sourceforge.net/ANNOUNCEMENT-2.1.0\">http://"
-"gerbv.sourceforge.net/ANNOUNCEMENT-2.1.0</ulink>"
-msgstr ""
-"<application>gerbv</application> 2.1.0 的改进包括对象选择、改善的导出以及处"
-"理 drill 文件时更多的灵活性。这个软件包的完整发行主机位于 <ulink type=\"http"
-"\" url=\"http://gerbv.sourceforge.net/ANNOUNCEMENT-2.1.0\">http://gerbv."
-"sourceforge.net/ANNOUNCEMENT-2.1.0</ulink>。"
+msgid "<application>gerbv</application> 2.1.0 includes improvements to object selection, improved exporting, and more flexibility in dealing with drill files. The complete release notes for this package can be found at <ulink type=\"http\" url=\"http://gerbv.sourceforge.net/ANNOUNCEMENT-2.1.0\">http://gerbv.sourceforge.net/ANNOUNCEMENT-2.1.0</ulink>"
+msgstr "<application>gerbv</application> 2.1.0 的改进包括对象选择、改善的导出以及处理 drill 文件时更多的灵活性。这个软件包的完整发行主机位于 <ulink type=\"http\" url=\"http://gerbv.sourceforge.net/ANNOUNCEMENT-2.1.0\">http://gerbv.sourceforge.net/ANNOUNCEMENT-2.1.0</ulink>。"
 
 #. Tag: title
 #: AmateurRadio.xml:113
@@ -245,20 +156,8 @@ msgstr "<title>pcb</title>"
 #. Tag: para
 #: AmateurRadio.xml:114
 #, no-c-format
-msgid ""
-"<application>pcb</application> has been updated to 20081128. Included among "
-"the improvements is a new 'Ben mode' that exports a 'photograph' of the "
-"board as a .png file. There are also some minor improvements in drill "
-"handling and a number of bug fixes. The complete release notes for this "
-"version are available at <ulink type=\"http\" url=\"http://pcb.sourceforge."
-"net/news.html#20081128\">http://pcb.sourceforge.net/news.html#20081128</"
-"ulink>"
-msgstr ""
-"已将 <application>pcb</application> 更新至 20081128。在这些改进中包含一个新"
-"的‘Ben 模式’，它可将画图版‘图片’导出成一个 .png 文件。另外还有一些操作处理的"
-"微小改进以及大量 bug 修复。这个版本的完整发行注记位于 <ulink type=\"http\" "
-"url=\"http://pcb.sourceforge.net/news.html#20081128\">http://pcb.sourceforge."
-"net/news.html#20081128</ulink>"
+msgid "<application>pcb</application> has been updated to 20081128. Included among the improvements is a new 'Ben mode' that exports a 'photograph' of the board as a .png file. There are also some minor improvements in drill handling and a number of bug fixes. The complete release notes for this version are available at <ulink type=\"http\" url=\"http://pcb.sourceforge.net/news.html#20081128\">http://pcb.sourceforge.net/news.html#20081128</ulink>"
+msgstr "已将 <application>pcb</application> 更新至 20081128。在这些改进中包含一个新的‘Ben 模式’，它可将画图版‘图片’导出成一个 .png 文件。另外还有一些操作处理的微小改进以及大量 bug 修复。这个版本的完整发行注记位于 <ulink type=\"http\" url=\"http://pcb.sourceforge.net/news.html#20081128\">http://pcb.sourceforge.net/news.html#20081128</ulink>"
 
 #. Tag: title
 #: AmateurRadio.xml:125
@@ -269,20 +168,14 @@ msgstr "ngspice"
 #. Tag: para
 #: AmateurRadio.xml:126
 #, no-c-format
-msgid ""
-"<application>ngspice</application> has been updated to version 18. Changes "
-"include:"
+msgid "<application>ngspice</application> has been updated to version 18. Changes include:"
 msgstr "已将 <application>ngspice</application> 更新至版本 18。改动包括："
 
 #. Tag: para
 #: AmateurRadio.xml:131
 #, no-c-format
-msgid ""
-"Tclspice simulator library has been merged with ngspice. Now you can compile "
-"ngspice or tclspice by asserting a configure switch. See README.tcl"
-msgstr ""
-"已将 spice 模拟器程序库与 ngspice 合并。现在您可以通过插入配置切换编译 "
-"ngspice 或者 tclspice。详见 RADME.tcl"
+msgid "Tclspice simulator library has been merged with ngspice. Now you can compile ngspice or tclspice by asserting a configure switch. See README.tcl"
+msgstr "已将 spice 模拟器程序库与 ngspice 合并。现在您可以通过插入配置切换编译 ngspice 或者 tclspice。详见 RADME.tcl"
 
 #. Tag: para
 #: AmateurRadio.xml:138
@@ -293,11 +186,8 @@ msgstr "引进了新选项：brief、listing、autostop 和 scale"
 #. Tag: para
 #: AmateurRadio.xml:144
 #, no-c-format
-msgid ""
-"Support for .lib file has been introduced. This allows the use of third "
-"party model libraries in ngspice."
-msgstr ""
-"引进了对 .lib æ–‡ä»¶çš„æ”¯æŒã€‚è¿™æ ·å°±å¯ä»¥åœ¨ ngspice 中使用第三方模式程序库。"
+msgid "Support for .lib file has been introduced. This allows the use of third party model libraries in ngspice."
+msgstr "引进了对 .lib æ–‡ä»¶çš„æ”¯æŒã€‚è¿™æ ·å°±å¯ä»¥åœ¨ ngspice 中使用第三方模式程序库。"
 
 #. Tag: para
 #: AmateurRadio.xml:150
@@ -308,9 +198,7 @@ msgstr ".measure 状态：avg、integ、rms、max、min、delay、param"
 #. Tag: para
 #: AmateurRadio.xml:156
 #, no-c-format
-msgid ""
-".global statements t support for global nodes whose name is not expanded "
-"when flattening the netlist."
+msgid ".global statements t support for global nodes whose name is not expanded when flattening the netlist."
 msgstr ""
 
 #. Tag: para
@@ -346,12 +234,8 @@ msgstr "iverilog"
 #. Tag: para
 #: AmateurRadio.xml:189
 #, no-c-format
-msgid ""
-"<application>iverliog</application> has been updated to 0.9.20081118. This "
-"is largely a bugfix update."
-msgstr ""
-"已将 <application>iverliog</application> 更新至 0.9.20081118。这是一个重大 "
-"bug 修复更新。"
+msgid "<application>iverliog</application> has been updated to 0.9.20081118. This is largely a bugfix update."
+msgstr "已将 <application>iverliog</application> 更新至 0.9.20081118。这是一个重大 bug 修复更新。"
 
 #. Tag: title
 #: AmateurRadio.xml:196
@@ -374,17 +258,8 @@ msgstr "已将 LinLog 更新至 0.4。"
 #. Tag: para
 #: AmateurRadio.xml:202
 #, no-c-format
-msgid ""
-"Before updating to 0.4 you should export your database to ADIF. Then install "
-"0.4, create a new database, and import the ADIF. Step-by-step instructions "
-"are available at <ulink type=\"http\" url=\"http://linlogbook.sourceforge."
-"net/doc/LinLocDoc.html\">http://linlogbook.sourceforge.net/doc/LinLocDoc."
-"html</ulink>"
-msgstr ""
-"更新到 0.4 之前，您应该将您的数据库导出到 ADIF。然后安装 0.4，创建一个新数据"
-"库，并导入 ADIF。具体步骤详见 <ulink type=\"http\" url=\"http://linlogbook."
-"sourceforge.net/doc/LinLocDoc.html\">http://linlogbook.sourceforge.net/doc/"
-"LinLocDoc.html</ulink>。"
+msgid "Before updating to 0.4 you should export your database to ADIF. Then install 0.4, create a new database, and import the ADIF. Step-by-step instructions are available at <ulink type=\"http\" url=\"http://linlogbook.sourceforge.net/doc/LinLocDoc.html\">http://linlogbook.sourceforge.net/doc/LinLocDoc.html</ulink>"
+msgstr "更新到 0.4 之前，您应该将您的数据库导出到 ADIF。然后安装 0.4，创建一个新数据库，并导入 ADIF。具体步骤详见 <ulink type=\"http\" url=\"http://linlogbook.sourceforge.net/doc/LinLocDoc.html\">http://linlogbook.sourceforge.net/doc/LinLocDoc.html</ulink>。"
 
 #. Tag: title
 #: AmateurRadio.xml:213
@@ -395,14 +270,8 @@ msgstr "<title>qle</title>"
 #. Tag: para
 #: AmateurRadio.xml:214
 #, no-c-format
-msgid ""
-"<application>qle</application> 0.0.10 is new to Fedora 11. <application>qle</"
-"application> is a graphic QSO log viewer, log editor and QSO logger. It logs "
-"(or modifies) QSOs directly in a fast and light-weight SQLite database."
-msgstr ""
-"<application>qle</application> 0.0.10 是 Fedora 11 ä¸­æ–°æ·»åŠ çš„å†…å®¹ã€‚"
-"<application>qle</application> 是一个图形 QSO 日志浏览器、日志编辑器和 QSO 记"
-"å½•å™¨ã€‚å®ƒå¯åœ¨ä¸€ä¸ªå¿«é€Ÿå’Œè¯·åŠ æƒçš„ SQLite 数据库中直接记录（或者修改）QSO。 "
+msgid "<application>qle</application> 0.0.10 is new to Fedora 11. <application>qle</application> is a graphic QSO log viewer, log editor and QSO logger. It logs (or modifies) QSOs directly in a fast and light-weight SQLite database."
+msgstr "<application>qle</application> 0.0.10 是 Fedora 11 ä¸­æ–°æ·»åŠ çš„å†…å®¹ã€‚<application>qle</application> 是一个图形 QSO 日志浏览器、日志编辑器和 QSO è®°å½•å™¨ã€‚å®ƒå¯åœ¨ä¸€ä¸ªå¿«é€Ÿå’Œè¯·åŠ æƒçš„ SQLite 数据库中直接记录（或者修改）QSO。 "
 
 #. Tag: title
 #: AmateurRadio.xml:222
@@ -413,19 +282,8 @@ msgstr "<title>ibp</title>"
 #. Tag: para
 #: AmateurRadio.xml:223
 #, no-c-format
-msgid ""
-"A tool to show which IBP beacons are transmitting. The International Beacon "
-"Project is a set of 18 amateur (ham) radio transmitters around the world, "
-"each of which transmit every 3 minutes on a set of 5 short-wave frequencies. "
-"This allows short-wave radio users to quickly assess the current worldwide "
-"propagation conditions. Much more information can be found on <ulink type="
-"\"http\" url=\"http://www.ncdxf.org/beacons.html\">http://www.ncdxf.org/"
-"beacons.html</ulink>"
-msgstr ""
-"一个用来显示哪个IBP灯塔在发报的工具。国际灯塔工程实际就是全世界18个业余(ham)"
-"æ— çº¿å‘æŠ¥å™¨ï¼Œæ¯ä¸€ä¸ªæ¯éš”3分钟在5个短波频率上进行发报。这让短波用户迅速获取最新"
-"çš„å…¨çƒæ— çº¿ç”µä¼ æ’­æ¡ä»¶ã€‚æ›´å¤šä¿¡æ¯å¯å‚è€ƒ<ulink type=\"http\" url=\"http://www."
-"ncdxf.org/beacons.html\">http://www.ncdxf.org/beacons.html</ulink>"
+msgid "A tool to show which IBP beacons are transmitting. The International Beacon Project is a set of 18 amateur (ham) radio transmitters around the world, each of which transmit every 3 minutes on a set of 5 short-wave frequencies. This allows short-wave radio users to quickly assess the current worldwide propagation conditions. Much more information can be found on <ulink type=\"http\" url=\"http://www.ncdxf.org/beacons.html\">http://www.ncdxf.org/beacons.html</ulink>"
+msgstr "一个用来显示哪个IBP灯塔在发报的工具。国际灯塔工程实际就是全世界18个业余(ham)æ— çº¿å‘æŠ¥å™¨ï¼Œæ¯ä¸€ä¸ªæ¯éš”3分钟在5ä¸ªçŸ­æ³¢é¢‘çŽ‡ä¸Šè¿›è¡Œå‘æŠ¥ã€‚è¿™è®©çŸ­æ³¢ç”¨æˆ·è¿…é€ŸèŽ·å–æœ€æ–°çš„å…¨çƒæ— çº¿ç”µä¼ æ’­æ¡ä»¶ã€‚æ›´å¤šä¿¡æ¯å¯å‚è€ƒ<ulink type=\"http\" url=\"http://www.ncdxf.org/beacons.html\">http://www.ncdxf.org/beacons.html</ulink>"
 
 #. Tag: title
 #: AmateurRadio.xml:235
@@ -436,25 +294,14 @@ msgstr "xwota"
 #. Tag: para
 #: AmateurRadio.xml:236
 #, no-c-format
-msgid ""
-"xwota is intended for amateur radio operators who want to make use of the "
-"WOTA database. It can be used to find out who is on the air, the band and "
-"frequency they are operating on, and their location by country, state, "
-"county, grid, and latitude/longitude. xwota is new to Fedora 11."
-msgstr ""
-"xwota意在为那些想使用WOTAæ•°æ®åº“çš„ä¸šä½™æ— çº¿ç”µäººå‘˜è€ŒæœåŠ¡ã€‚å¯ä»¥é€šè¿‡å®ƒæ¥æŸ¥è¯¢ç”µæ³¢æƒ…"
-"况，波段、频率，谁在使用，他们所在的国家，州，县(郡)，以及经纬度。xwota为"
-"Fedora 11新增。"
+msgid "xwota is intended for amateur radio operators who want to make use of the WOTA database. It can be used to find out who is on the air, the band and frequency they are operating on, and their location by country, state, county, grid, and latitude/longitude. xwota is new to Fedora 11."
+msgstr "xwota意在为那些想使用WOTAæ•°æ®åº“çš„ä¸šä½™æ— çº¿ç”µäººå‘˜è€ŒæœåŠ¡ã€‚å¯ä»¥é€šè¿‡å®ƒæ¥æŸ¥è¯¢ç”µæ³¢æƒ…å†µï¼Œæ³¢æ®µã€é¢‘çŽ‡ï¼Œè°åœ¨ä½¿ç”¨ï¼Œä»–ä»¬æ‰€åœ¨çš„å›½å®¶ï¼Œå·žï¼ŒåŽ¿(郡)，以及经纬度。xwota为Fedora 11新增。"
 
 #. Tag: para
 #: AmateurRadio.xml:244
 #, fuzzy, no-c-format
-msgid ""
-"If you don't known what is the WOTA database, please refer to <ulink type="
-"\"http\" url=\"http://www.wotadb.org\">http://www.wotadb.org</ulink>."
-msgstr ""
-"如果您不了解 WOTA 数据库，请查看以下资料 <ulink type=\"http\" url=\"http://"
-"www.wotadb.org\">http://www.wotadb.org</ulink>。"
+msgid "If you don't known what is the WOTA database, please refer to <ulink type=\"http\" url=\"http://www.wotadb.org\">http://www.wotadb.org</ulink>."
+msgstr "如果您不了解 WOTA 数据库，请查看以下资料 <ulink type=\"http\" url=\"http://www.wotadb.org\">http://www.wotadb.org</ulink>。"
 
 #. Tag: title
 #: AmateurRadio.xml:251
@@ -471,19 +318,8 @@ msgstr "xnec2c"
 #. Tag: para
 #: AmateurRadio.xml:254
 #, no-c-format
-msgid ""
-"Fedora includes <package>nec2c</package>, the powerful antenna modeling "
-"program, and <package>xnec2c</package> which provides a graphical user "
-"interface to <package>nec2c</package>. Both of these packages have been "
-"updated to version 1.2 in Fedora 11. The changes are minor bugfixes. Project "
-"site: <ulink type=\"http\" url=\"http://5b4az.chronos.org.uk/pages/nec2.html"
-"\">http://5b4az.chronos.org.uk/pages/nec2.html</ulink>"
-msgstr ""
-"Fedora 包含强大的天线模拟程序 <package>nec2c</package> 以及为 "
-"<package>nec2c</package> 提供图形用户界面的 <package>xnec2c</package>。这两个"
-"软件包都已将在 Fedora 11 中更新至版本 1.2。有一些小的 bug 修复更改。项目网页"
-"位于 <ulink type=\"http\" url=\"http://5b4az.chronos.org.uk/pages/nec2.html"
-"\">http://5b4az.chronos.org.uk/pages/nec2.html</ulink>。"
+msgid "Fedora includes <package>nec2c</package>, the powerful antenna modeling program, and <package>xnec2c</package> which provides a graphical user interface to <package>nec2c</package>. Both of these packages have been updated to version 1.2 in Fedora 11. The changes are minor bugfixes. Project site: <ulink type=\"http\" url=\"http://5b4az.chronos.org.uk/pages/nec2.html\">http://5b4az.chronos.org.uk/pages/nec2.html</ulink>"
+msgstr "Fedora 包含强大的天线模拟程序 <package>nec2c</package> 以及为 <package>nec2c</package> 提供图形用户界面的 <package>xnec2c</package>。这两个软件包都已将在 Fedora 11 中更新至版本 1.2。有一些小的 bug 修复更改。项目网页位于 <ulink type=\"http\" url=\"http://5b4az.chronos.org.uk/pages/nec2.html\">http://5b4az.chronos.org.uk/pages/nec2.html</ulink>。"
 
 #. Tag: title
 #: AmateurRadio.xml:267
@@ -500,12 +336,8 @@ msgstr "thebridge"
 #. Tag: para
 #: AmateurRadio.xml:270
 #, no-c-format
-msgid ""
-"<application>thebridge</application> is an ILink/EchoLink compatible "
-"conference bridge. This is a new feature in Fedora 11."
-msgstr ""
-"<application>thebridge</application> 是一个 ILink/EchoLink 可编译会议电话桥接"
-"器。这是 Fedora 11 中的一个新特性。"
+msgid "<application>thebridge</application> is an ILink/EchoLink compatible conference bridge. This is a new feature in Fedora 11."
+msgstr "<application>thebridge</application> 是一个 ILink/EchoLink 可编译会议电话桥接器。这是 Fedora 11 中的一个新特性。"
 
 #. Tag: title
 #: AmateurRadio.xml:277
@@ -516,9 +348,7 @@ msgstr "cwirc"
 #. Tag: para
 #: AmateurRadio.xml:278
 #, fuzzy, no-c-format
-msgid ""
-"X-Chat plugin for sending and receiving raw Morse code over IRC. New to "
-"Fedora 11."
+msgid "X-Chat plugin for sending and receiving raw Morse code over IRC. New to Fedora 11."
 msgstr "用来在IRCä¸Šå‘é€å’ŒæŽ¥æ”¶åŽŸå§‹èŽ«å°”æ–¯ç çš„X-Chat插件。Fedora 11新增。"
 
 #. Tag: title
@@ -530,22 +360,8 @@ msgstr "svxlink-server"
 #. Tag: para
 #: AmateurRadio.xml:285
 #, no-c-format
-msgid ""
-"<application>svxlink server</application> is a general purpose voice "
-"services system for ham radio use. Each voice service is implemented as a "
-"plugin called a module. Some examples of voice services are: Help system, "
-"Simplex repeater, EchoLink connection. The core of the system handles the "
-"radio interface and is quite flexible as well. It can act both as a simplex "
-"node and as a repeater controller. <package>svxlink-server</package> 0.10.1 "
-"is new to Fedora with this release. For programmers, there is also a "
-"development package, <package>svxlink-server-devel</package>."
-msgstr ""
-"<application>svxlink server</application> 是一个用于 ham æ— çº¿ç”µä½¿ç”¨çš„ä¸€èˆ¬æ„ä¹‰"
-"的声音服务系统。每个声音服务都是作为名为模块的插件部署的。一些声音服务示例"
-"为：帮助系统、简单转发器、Echolink è¿žæŽ¥ã€‚å¤„ç†æ— çº¿ç”µç•Œé¢çš„ç³»ç»Ÿæ ¸å¿ƒä¹Ÿå…·æœ‰å¾ˆå¤§çš„"
-"灵活性。它可作为简单节点，也可以作为转发器控制程序动作。<package>svxlink-"
-"server</package> 0.10.1 在这个 Fedora 发行本中是新的。对于程序员来说，还有一"
-"个开发软件包 <package>svxlink-server-devel</package>。"
+msgid "<application>svxlink server</application> is a general purpose voice services system for ham radio use. Each voice service is implemented as a plugin called a module. Some examples of voice services are: Help system, Simplex repeater, EchoLink connection. The core of the system handles the radio interface and is quite flexible as well. It can act both as a simplex node and as a repeater controller. <package>svxlink-server</package> 0.10.1 is new to Fedora with this release. For programmers, there is also a development package, <package>svxlink-server-devel</package>."
+msgstr "<application>svxlink server</application> 是一个用于 ham æ— çº¿ç”µä½¿ç”¨çš„ä¸€èˆ¬æ„ä¹‰çš„å£°éŸ³æœåŠ¡ç³»ç»Ÿã€‚æ¯ä¸ªå£°éŸ³æœåŠ¡éƒ½æ˜¯ä½œä¸ºåä¸ºæ¨¡å—çš„æ’ä»¶éƒ¨ç½²çš„ã€‚ä¸€äº›å£°éŸ³æœåŠ¡ç¤ºä¾‹ä¸ºï¼šå¸®åŠ©ç³»ç»Ÿã€ç®€å•è½¬å‘å™¨ã€Echolink è¿žæŽ¥ã€‚å¤„ç†æ— çº¿ç”µç•Œé¢çš„ç³»ç»Ÿæ ¸å¿ƒä¹Ÿå…·æœ‰å¾ˆå¤§çš„çµæ´»æ€§ã€‚å®ƒå¯ä½œä¸ºç®€å•èŠ‚ç‚¹ï¼Œä¹Ÿå¯ä»¥ä½œä¸ºè½¬å‘å™¨æŽ§åˆ¶ç¨‹åºåŠ¨ä½œã€‚<package>svxlink-server</package> 0.10.1 在这个 Fedora 发行本中是新的。对于程序员来说，还有一个开发软件包 <package>svxlink-server-devel</package>。"
 
 #. Tag: title
 #: AmateurRadio.xml:300
@@ -556,16 +372,8 @@ msgstr "qtel"
 #. Tag: para
 #: AmateurRadio.xml:301
 #, no-c-format
-msgid ""
-"<application>qtel</application> 0.11.1 is an Echolink client. Note that it "
-"is a client only, not a full link. If you want to create a link, install "
-"<package>svxlink-server</package>. If you need a conference bridge, use "
-"thebridge. <package>qtel</package> is new with Fedora 11."
-msgstr ""
-"<application>qtel</application> 0.11.1是一个Echolink的客户端。注意这仅是客户"
-"端而已，并不是完全的。如果您想要创建一个连接，请安装<package>svxlink-server</"
-"package>。如果您需要会议桥，请使用thebridge。 <package>qtel</package>为"
-"Fedora 11新增。"
+msgid "<application>qtel</application> 0.11.1 is an Echolink client. Note that it is a client only, not a full link. If you want to create a link, install <package>svxlink-server</package>. If you need a conference bridge, use thebridge. <package>qtel</package> is new with Fedora 11."
+msgstr "<application>qtel</application> 0.11.1是一个Echolink的客户端。注意这仅是客户端而已，并不是完全的。如果您想要创建一个连接，请安装<package>svxlink-server</package>。如果您需要会议桥，请使用thebridge。 <package>qtel</package>为Fedora 11新增。"
 
 #. Tag: title
 #: AmateurRadio.xml:313
@@ -582,17 +390,8 @@ msgstr "hamlib"
 #. Tag: para
 #: AmateurRadio.xml:316
 #, no-c-format
-msgid ""
-"Fedora 11 includes version 1.28 of <application>hamlib</application>. There "
-"are a large number of new models supported and fixes to support for existing "
-"models. There are a number of new commands. See the project's website at "
-"<ulink type=\"http\" url=\"http://hamlib.sourceforge.net\">http://hamlib."
-"sourceforge.net</ulink> for complete details."
-msgstr ""
-"Fedora 11使用了1.28版本的<application>hamlib</application>。该版本支持了大量"
-"的新模块并对已支持的模块进行了修复。同时引入许多新的命令。完整信息请见该项目"
-"站点： <ulink type=\"http\" url=\"http://hamlib.sourceforge.net\">http://"
-"hamlib.sourceforge.net</ulink>。"
+msgid "Fedora 11 includes version 1.28 of <application>hamlib</application>. There are a large number of new models supported and fixes to support for existing models. There are a number of new commands. See the project's website at <ulink type=\"http\" url=\"http://hamlib.sourceforge.net\">http://hamlib.sourceforge.net</ulink> for complete details."
+msgstr "Fedora 11使用了1.28版本的<application>hamlib</application>。该版本支持了大量的新模块并对已支持的模块进行了修复。同时引入许多新的命令。完整信息请见该项目站点： <ulink type=\"http\" url=\"http://hamlib.sourceforge.net\">http://hamlib.sourceforge.net</ulink>。"
 
 #. Tag: title
 #: AmateurRadio.xml:327
@@ -603,9 +402,7 @@ msgstr "<title>xdx</title>"
 #. Tag: para
 #: AmateurRadio.xml:328
 #, fuzzy, no-c-format
-msgid ""
-"The DX cluster client <package>xdx</package> has been updated to 2.4.1. This "
-"is a bugfix update."
+msgid "The DX cluster client <package>xdx</package> has been updated to 2.4.1. This is a bugfix update."
 msgstr "DX簇客户端<package>xdx</package>升级到2.4.1。更新修正了之前的bug。"
 
 #. Tag: title
@@ -617,11 +414,8 @@ msgstr "xdemorse"
 #. Tag: para
 #: AmateurRadio.xml:335
 #, no-c-format
-msgid ""
-"<application>xdemorse</application> has been updated to 1.3. This is a "
-"bugfix update."
-msgstr ""
-"已将 <application>xdemorse</application> 更新至 1.3。这是一个 bug 修复更新。"
+msgid "<application>xdemorse</application> has been updated to 1.3. This is a bugfix update."
+msgstr "已将 <application>xdemorse</application> 更新至 1.3。这是一个 bug 修复更新。"
 
 #. Tag: title
 #: AmateurRadio.xml:341
@@ -632,15 +426,8 @@ msgstr "ssbd"
 #. Tag: para
 #: AmateurRadio.xml:342
 #, no-c-format
-msgid ""
-"<application>ssbd</application> (Single-Side Band daemon) is voice keyer for "
-"hamradio use. It's written as part of Tucnak, contest log for VHF contests, "
-"but is possible to use ssbd with any other program. <application>ssbd</"
-"application> is new to Fedora with this release."
-msgstr ""
-"<application>ssbd</application>（单边带守护进程）是使用 ham æ— çº¿ç”µçš„å£°éŸ³æŽ§åˆ¶"
-"器。它是 Tucnak 的一部分。为 VHF 竞赛进行记录，但可能在另一个程序中与 ssbd 一"
-"同使用。<application>ssbd</application> 是 Fedora 这个发行本中的新内容。"
+msgid "<application>ssbd</application> (Single-Side Band daemon) is voice keyer for hamradio use. It's written as part of Tucnak, contest log for VHF contests, but is possible to use ssbd with any other program. <application>ssbd</application> is new to Fedora with this release."
+msgstr "<application>ssbd</application>（单边带守护进程）是使用 ham æ— çº¿ç”µçš„å£°éŸ³æŽ§åˆ¶å™¨ã€‚å®ƒæ˜¯ Tucnak 的一部分。为 VHF 竞赛进行记录，但可能在另一个程序中与 ssbd 一同使用。<application>ssbd</application> 是 Fedora 这个发行本中的新内容。"
 
 #. Tag: title
 #: AmateurRadio.xml:351
@@ -651,14 +438,8 @@ msgstr "gpsman"
 #. Tag: para
 #: AmateurRadio.xml:352
 #, fuzzy, no-c-format
-msgid ""
-"<application>gpsman</application> has been updated to 6.4. See the details "
-"at <ulink type=\"http\" url=\"http://www.ncc.up.pt/gpsman/wGPSMan_4.html"
-"\">http://www.ncc.up.pt/gpsman/wGPSMan_4.html</ulink>."
-msgstr ""
-"<application>gpsman</application>更新至 6.4。详细信息请见<ulink type=\"http"
-"\" url=\"http://www.ncc.up.pt/gpsman/wGPSMan_4.html\">http://www.ncc.up.pt/"
-"gpsman/wGPSMan_4.html</ulink>。"
+msgid "<application>gpsman</application> has been updated to 6.4. See the details at <ulink type=\"http\" url=\"http://www.ncc.up.pt/gpsman/wGPSMan_4.html\">http://www.ncc.up.pt/gpsman/wGPSMan_4.html</ulink>."
+msgstr "<application>gpsman</application>更新至 6.4。详细信息请见<ulink type=\"http\" url=\"http://www.ncc.up.pt/gpsman/wGPSMan_4.html\">http://www.ncc.up.pt/gpsman/wGPSMan_4.html</ulink>。"
 
 #. Tag: title
 #: AmateurRadio.xml:359
@@ -669,15 +450,8 @@ msgstr "splat"
 #. Tag: para
 #: AmateurRadio.xml:360
 #, no-c-format
-msgid ""
-"<package>splat-utils</package> has been removed from Fedora and the contents "
-"included in the <package>splat</package> package. It is no longer necessary "
-"to install <package>splat-utils</package> to use <application>splat</"
-"application>."
-msgstr ""
-"此版本Fedora移除了<package>splat-utils</package>及<package>splat</package>包"
-"中对应的内容。使用<application>splat</application>时不需再安装<package>splat-"
-"utils</package>。"
+msgid "<package>splat-utils</package> has been removed from Fedora and the contents included in the <package>splat</package> package. It is no longer necessary to install <package>splat-utils</package> to use <application>splat</application>."
+msgstr "此版本Fedora移除了<package>splat-utils</package>及<package>splat</package>包中对应的内容。使用<application>splat</application>时不需再安装<package>splat-utils</package>。"
 
 #. Tag: title
 #: ArchSpecific.xml:6
@@ -688,21 +462,13 @@ msgstr "特定构架注记"
 #. Tag: remark
 #: ArchSpecific.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/ArchSpecific\">https://fedoraproject.org/wiki/Docs/Beats/"
-"ArchSpecific</ulink>"
-msgstr ""
-"这个beat在： <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/"
-"Beats/ArchSpecific\">https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific</"
-"ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific\">https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific</ulink>"
+msgstr "这个beat在： <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific\">https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific</ulink>"
 
 #. Tag: para
 #: ArchSpecific.xml:9
 #, no-c-format
-msgid ""
-"This section provides notes that are specific to the supported hardware "
-"architectures of Fedora."
+msgid "This section provides notes that are specific to the supported hardware architectures of Fedora."
 msgstr "本节包含在特定硬件平台上运行 Fedora 所需要的信息。"
 
 #. Tag: title
@@ -714,21 +480,13 @@ msgstr "Fedora 特定的 PPC"
 #. Tag: remark
 #: ArchSpecific-PPC.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/ArchSpecific/PPC\">https://fedoraproject.org/wiki/Docs/"
-"Beats/ArchSpecific/PPC</ulink>"
-msgstr ""
-"这个beat位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/"
-"Beats/ArchSpecific/PPC\">https://fedoraproject.org/wiki/Docs/Beats/"
-"ArchSpecific/PPC</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific/PPC\">https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific/PPC</ulink>"
+msgstr "这个beat位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific/PPC\">https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific/PPC</ulink>"
 
 #. Tag: para
 #: ArchSpecific-PPC.xml:9
 #, no-c-format
-msgid ""
-"This section covers specific information about Fedora and the PPC hardware "
-"platform."
+msgid "This section covers specific information about Fedora and the PPC hardware platform."
 msgstr "本节覆盖有关 Fedora 和 PPC 硬件平台的具体资料。"
 
 #. Tag: title
@@ -740,21 +498,13 @@ msgstr "Fedora 特定的 x86_64"
 #. Tag: remark
 #: ArchSpecific-x86_64.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/ArchSpecific/x86_64\">https://fedoraproject.org/wiki/"
-"Docs/Beats/ArchSpecific/x86_64</ulink>"
-msgstr ""
-"这个beat位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/"
-"Beats/ArchSpecific/x86_64\">https://fedoraproject.org/wiki/Docs/Beats/"
-"ArchSpecific/x86_64</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific/x86_64\">https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific/x86_64</ulink>"
+msgstr "这个beat位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific/x86_64\">https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific/x86_64</ulink>"
 
 #. Tag: para
 #: ArchSpecific-x86_64.xml:9
 #, no-c-format
-msgid ""
-"This section covers specific information about Fedora and the x86_64 "
-"hardware platform."
+msgid "This section covers specific information about Fedora and the x86_64 hardware platform."
 msgstr "本节包含要在 x86_64 硬件平台上运行 Fedora 所需了解的信息。"
 
 #. Tag: title
@@ -766,21 +516,13 @@ msgstr "Fedora 特定的 x86"
 #. Tag: remark
 #: ArchSpecific-x86.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/ArchSpecific/x86\">https://fedoraproject.org/wiki/Docs/"
-"Beats/ArchSpecific/x86</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/ArchSpecific/x86\">https://fedoraproject.org/wiki/Docs/Beats/"
-"ArchSpecific/x86</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific/x86\">https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific/x86</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific/x86\">https://fedoraproject.org/wiki/Docs/Beats/ArchSpecific/x86</ulink>"
 
 #. Tag: para
 #: ArchSpecific-x86.xml:10
 #, no-c-format
-msgid ""
-"By default, the PAE kernel is used on 32-bit hardware, where supported by "
-"the hardware."
+msgid "By default, the PAE kernel is used on 32-bit hardware, where supported by the hardware."
 msgstr "默认情况下，PAEå†…æ ¸ç”¨åœ¨32ä½ç¡¬ä»¶ä¸‹ï¼Œå› ä¸ºå¯ä»¥è¢«ç¡¬ä»¶æ”¯æŒã€‚"
 
 #. Tag: title
@@ -817,7 +559,8 @@ msgstr "<firstname>Dale</firstname> <surname>Bewley</surname>"
 #. Tag: contrib
 #. #-#-#-#-#  Virtualization.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Tag: title
-#: Author_Group.xml:10 Virtualization.xml:7
+#: Author_Group.xml:10
+#: Virtualization.xml:7
 #, fuzzy, no-c-format
 msgid "Virtualization"
 msgstr "安装"
@@ -844,7 +587,8 @@ msgstr "<firstname>Chitlesh</firstname> <surname>Goorah</surname>"
 #. Tag: contrib
 #. #-#-#-#-#  ElectronicDesignAssistants.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Tag: title
-#: Author_Group.xml:20 ElectronicDesignAssistants.xml:6
+#: Author_Group.xml:20
+#: ElectronicDesignAssistants.xml:6
 #, no-c-format
 msgid "Electronic Design Automation"
 msgstr ""
@@ -919,7 +663,8 @@ msgstr "<firstname>David</firstname> <surname>Nalley</surname>"
 #. Tag: contrib
 #. #-#-#-#-#  FileSystems.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Tag: title
-#: Author_Group.xml:50 FileSystems.xml:6
+#: Author_Group.xml:50
+#: FileSystems.xml:6
 #, fuzzy, no-c-format
 msgid "File Systems"
 msgstr "文件服务器"
@@ -934,7 +679,8 @@ msgstr "<firstname>Zachary</firstname> <surname>Oglesby</surname>"
 #. Tag: contrib
 #. #-#-#-#-#  Multimedia.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Tag: title
-#: Author_Group.xml:55 Multimedia.xml:6
+#: Author_Group.xml:55
+#: Multimedia.xml:6
 #, fuzzy, no-c-format
 msgid "Multimedia"
 msgstr "多媒体 Beat"
@@ -961,7 +707,8 @@ msgstr "<firstname>Rahul</firstname> <surname>Sundaram</surname>"
 #. Tag: contrib
 #. #-#-#-#-#  Kernel.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Tag: title
-#: Author_Group.xml:65 Kernel.xml:6
+#: Author_Group.xml:65
+#: Kernel.xml:6
 #, fuzzy, no-c-format
 msgid "Linux Kernel"
 msgstr "å†…æ ¸"
@@ -994,7 +741,8 @@ msgstr "å†…æ ¸"
 #. Tag: title
 #. #-#-#-#-#  Devel-Runtime.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Tag: term
-#: BackwardsCompatibility.xml:6 Devel-Runtime.xml:10
+#: BackwardsCompatibility.xml:6
+#: Devel-Runtime.xml:10
 #, no-c-format
 msgid "Backwards Compatibility"
 msgstr "向下兼容"
@@ -1002,36 +750,18 @@ msgstr "向下兼容"
 #. Tag: remark
 #: BackwardsCompatibility.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/BackwardsCompatibility\">https://fedoraproject.org/wiki/"
-"Docs/Beats/BackwardsCompatibility</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/BackwardsCompatibility\">https://fedoraproject.org/wiki/Docs/"
-"Beats/BackwardsCompatibility</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/BackwardsCompatibility\">https://fedoraproject.org/wiki/Docs/Beats/BackwardsCompatibility</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/BackwardsCompatibility\">https://fedoraproject.org/wiki/Docs/Beats/BackwardsCompatibility</ulink>"
 
 #. Tag: para
 #: BackwardsCompatibility.xml:9
 #, no-c-format
 msgid ""
-"Fedora provides legacy system libraries for compatibility with older "
-"software. This software is part of the Legacy Software Development group, "
-"which is not installed by default. Users who require this functionality may "
-"select this group either during installation or after the installation "
-"process is complete. To install the package group on a Fedora system, use "
-"<guimenu>Applications</guimenu><guimenuitem>Add/Remove Software</"
-"guimenuitem> or enter the following command in a terminal window: <screen>\n"
-"      <command>su -c 'yum groupinstall \"Legacy Software Development\"'</"
-"command>\n"
+"Fedora provides legacy system libraries for compatibility with older software. This software is part of the Legacy Software Development group, which is not installed by default. Users who require this functionality may select this group either during installation or after the installation process is complete. To install the package group on a Fedora system, use <guimenu>Applications</guimenu><guimenuitem>Add/Remove Software</guimenuitem> or enter the following command in a terminal window: <screen>\n"
+"      <command>su -c 'yum groupinstall \"Legacy Software Development\"'</command>\n"
 "    </screen> Enter the password for the root account when prompted."
 msgstr ""
-"Fedora 提供以前的系统程序库以便与其它老软件兼容。这个软件是 "
-"<menuchoice><guimenuitem>Legacy Software Development</guimenuitem></"
-"menuchoice> 组群的一部分，默认没有安装。需要这个功能的用户可能通过在安装过程"
-"中或者安装后选择这个组群。要在 Fedora 系统中安装软件包组，请使用 <guimenu>应"
-"用程序</guimenu><guimenuitem>æ·»åŠ /åˆ é™¤è½¯ä»¶</guimenuitem> 或者在终端窗口输入以"
-"下命令： <screen>\n"
+"Fedora 提供以前的系统程序库以便与其它老软件兼容。这个软件是 <menuchoice><guimenuitem>Legacy Software Development</guimenuitem></menuchoice> 组群的一部分，默认没有安装。需要这个功能的用户可能通过在安装过程中或者安装后选择这个组群。要在 Fedora 系统中安装软件包组，请使用 <guimenu>应用程序</guimenu><guimenuitem>æ·»åŠ /åˆ é™¤è½¯ä»¶</guimenuitem> 或者在终端窗口输入以下命令： <screen>\n"
 "<command>su -c 'yum groupinstall \"Legacy Software Development\"'</command>\n"
 "    </screen>提示时输入rootç”¨æˆ·å¯†ç ã€‚"
 
@@ -1044,62 +774,38 @@ msgstr "Fedora 11 引导时"
 #. Tag: remark
 #: Boot.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Boot\">https://fedoraproject.org/wiki/Docs/Beats/Boot</"
-"ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Boot\">https://fedoraproject.org/wiki/Docs/Beats/Boot</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Boot\">https://fedoraproject.org/wiki/Docs/Beats/Boot</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Boot\">https://fedoraproject.org/wiki/Docs/Beats/Boot</ulink>"
 
 #. Tag: para
 #: Boot.xml:9
 #, no-c-format
-msgid ""
-"To reduce boot time, the <systemitem class=\"daemon\">setroubleshootd</"
-"systemitem> daemon and several small bottlenecks were removed. Regressions "
-"in using the readahead service were removed by setting low I/O priorities. "
-"Readahead now profiles the system every time the RPM database changes."
-msgstr ""
-"ä¸ºäº†å‡å°‘å¼•å¯¼æ—¶é—´ï¼Œåˆ é™¤äº† <systemitem class=\"daemon\">setroubleshootd</"
-"systemitem> å®ˆæŠ¤è¿›ç¨‹å’Œå‡ ä¸ªå°çš„ç“¶é¢ˆã€‚å°† I/O 优先权设定为 low 可除去预先读取服"
-"åŠ¡é€ æˆçš„å€’é€€ã€‚çŽ°åœ¨ï¼Œreadahead 每次在 RPM 数据库有变动时重新描述系统。"
+msgid "To reduce boot time, the <systemitem class=\"daemon\">setroubleshootd</systemitem> daemon and several small bottlenecks were removed. Regressions in using the readahead service were removed by setting low I/O priorities. Readahead now profiles the system every time the RPM database changes."
+msgstr "ä¸ºäº†å‡å°‘å¼•å¯¼æ—¶é—´ï¼Œåˆ é™¤äº† <systemitem class=\"daemon\">setroubleshootd</systemitem> å®ˆæŠ¤è¿›ç¨‹å’Œå‡ ä¸ªå°çš„ç“¶é¢ˆã€‚å°† I/O 优先权设定为 low å¯é™¤åŽ»é¢„å…ˆè¯»å–æœåŠ¡é€ æˆçš„å€’é€€ã€‚çŽ°åœ¨ï¼Œreadahead 每次在 RPM 数据库有变动时重新描述系统。"
 
 #. Tag: title
 #: Boot.xml:17
 #, no-c-format
 msgid "Disabling graphical boot (Plymouth)"
-msgstr ""
+msgstr "禁用图形化引导(Plymouth)"
 
 #. Tag: para
 #: Boot.xml:18
 #, no-c-format
-msgid ""
-"When troubleshooting problems with graphical boot, one step is to disable "
-"the kernel mode setting feature."
+msgid "When troubleshooting problems with graphical boot, one step is to disable the kernel mode setting feature."
 msgstr ""
 
 #. Tag: para
 #: Boot.xml:22
 #, no-c-format
-msgid ""
-"Adding <command>nomodeset</command> to the kernel boot prompt in <code>grub</"
-"code> disables modesetting. This can be specified during normal boot by "
-"entering the <code>GRUB</code> menu and appending <command>nomodeset</"
-"command> to the line that begins <code>kernel /vmlinuz...</code>. It can be "
-"disabled in configuration by adding the <command>nomodeset</command> option "
-"to the same line in <filename>/etc/grub.conf</filename>."
+msgid "Adding <command>nomodeset</command> to the kernel boot prompt in <code>grub</code> disables modesetting. This can be specified during normal boot by entering the <code>GRUB</code> menu and appending <command>nomodeset</command> to the line that begins <code>kernel /vmlinuz...</code>. It can be disabled in configuration by adding the <command>nomodeset</command> option to the same line in <filename>/etc/grub.conf</filename>."
 msgstr ""
 
 #. Tag: para
 #: Boot.xml:31
 #, no-c-format
-msgid ""
-"If you are having problems with the graphical boot, be sure to file or "
-"comment on an existing bug report at <ulink type=\"http\" url=\"https://"
-"bugzilla.redhat.com/enter_bug.cgi?product=Fedora\"></ulink> under the "
-"<package>plymouth</package> component."
-msgstr ""
+msgid "If you are having problems with the graphical boot, be sure to file or comment on an existing bug report at <ulink type=\"http\" url=\"https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora\"></ulink> under the <package>plymouth</package> component."
+msgstr "如果您在图形化引导上有问题，请到<package>plymouth</package>组件下的<ulink type=\"http\" url=\"https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora\"></ulink>提交bug或者为已有的bugä¸Šæ·»åŠ è¯„è®ºã€‚"
 
 #. Tag: title
 #: Clusters.xml:6
@@ -1110,21 +816,13 @@ msgstr "HA 群集构架"
 #. Tag: remark
 #: Clusters.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Cluster\">https://fedoraproject.org/wiki/Docs/Beats/"
-"Cluster</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Cluster\">https://fedoraproject.org/wiki/Docs/Beats/Cluster</"
-"ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Cluster\">https://fedoraproject.org/wiki/Docs/Beats/Cluster</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Cluster\">https://fedoraproject.org/wiki/Docs/Beats/Cluster</ulink>"
 
 #. Tag: para
 #: Clusters.xml:8
 #, no-c-format
-msgid ""
-"This section highlights changes and additions to the clustering tools in "
-"Fedora 10."
+msgid "This section highlights changes and additions to the clustering tools in Fedora 10."
 msgstr "这部分突出了对 Fedora 10 ä¸­ç¾¤é›†å·¥å…·çš„æ›´æ”¹å’Œæ·»åŠ ã€‚"
 
 #. Tag: title
@@ -1148,8 +846,7 @@ msgstr "Corosync 群集引擎"
 #. Tag: para
 #: Clusters.xml:20
 #, no-c-format
-msgid ""
-"Plug-in based cluster engine using the virtual synchrony communication model"
+msgid "Plug-in based cluster engine using the virtual synchrony communication model"
 msgstr "采用虚拟同步交流模式的基于插件的群集引擎"
 
 #. Tag: para
@@ -1161,11 +858,8 @@ msgstr "仔细检查过的插件模型和插件 API"
 #. Tag: para
 #: Clusters.xml:31
 #, fuzzy, no-c-format
-msgid ""
-"Ultra-high performance messaging, up to 300k messages/second to a group of "
-"32 nodes for service engine developers."
-msgstr ""
-"超强性能报文发送，可为服务引擎开发者提供高达 300k 报文/秒的 32 字节组。"
+msgid "Ultra-high performance messaging, up to 300k messages/second to a group of 32 nodes for service engine developers."
+msgstr "超强性能报文发送，可为服务引擎开发者提供高达 300k 报文/秒的 32 字节组。"
 
 #. Tag: para
 #: Clusters.xml:38
@@ -1176,17 +870,13 @@ msgstr "为服务引擎开发者提供大多数服务"
 #. Tag: para
 #: Clusters.xml:44
 #, no-c-format
-msgid ""
-"Standard on many other Linux distributions for portable application "
-"development."
+msgid "Standard on many other Linux distributions for portable application development."
 msgstr "为可移动程序开发提供很多其它 Linux å‘å¸ƒæ ‡å‡†ã€‚"
 
 #. Tag: para
 #: Clusters.xml:50
 #, no-c-format
-msgid ""
-"Works with mixed 32/64 bit user applications, 32/64 bit big and little "
-"endian support."
+msgid "Works with mixed 32/64 bit user applications, 32/64 bit big and little endian support."
 msgstr "可用于 32/64 位混合用户程序，32/64 位大尾和小尾支持。"
 
 #. Tag: para
@@ -1210,9 +900,7 @@ msgstr "为群集通信关闭进程组通信 C API"
 #. Tag: para
 #: Clusters.xml:75
 #, no-c-format
-msgid ""
-"Extended Virtual Synchrony passthrough C API for cluster communications at a "
-"lower level."
+msgid "Extended Virtual Synchrony passthrough C API for cluster communications at a lower level."
 msgstr "在较低运行等级为群集通信提供扩展的虚拟同步转移规向 C API。"
 
 #. Tag: para
@@ -1248,20 +936,14 @@ msgstr "Totem单环和冗余环组播协议库"
 #. Tag: para
 #: Clusters.xml:113
 #, no-c-format
-msgid ""
-"Shared memory IPC library with sync and async communications models usable "
-"by other projects"
+msgid "Shared memory IPC library with sync and async communications models usable by other projects"
 msgstr "其它项目可使用带 sync 和 async 通信模型的共享内存 IPC 程序库"
 
 #. Tag: para
 #: Clusters.xml:119
 #, no-c-format
-msgid ""
-"logsys flight recorder which allows logging and tracing of complex "
-"applications and records state in core files or at user command library"
-msgstr ""
-"logsys flight recorder å¯å…è®¸è®°å½•å’Œè·Ÿè¸ªå¤æ‚ç¨‹åºå¹¶åœ¨æ ¸æ–‡ä»¶æˆ–è€…ç”¨æˆ·å‘½ä»¤ç¨‹åºåº“ä¸­"
-"记录状态"
+msgid "logsys flight recorder which allows logging and tracing of complex applications and records state in core files or at user command library"
+msgstr "logsys flight recorder å¯å…è®¸è®°å½•å’Œè·Ÿè¸ªå¤æ‚ç¨‹åºå¹¶åœ¨æ ¸æ–‡ä»¶æˆ–è€…ç”¨æˆ·å‘½ä»¤ç¨‹åºåº“ä¸­è®°å½•çŠ¶æ€"
 
 #. Tag: para
 #: Clusters.xml:126
@@ -1272,14 +954,8 @@ msgstr "æ•°æ®å—ä¸Žå¥æŸ„ç¡®è®¤æ ‡å¤´æ˜ å°„çš„ 64 位句柄"
 #. Tag: para
 #: Clusters.xml:137
 #, no-c-format
-msgid ""
-"The openais Standards Based Cluster Framework which provides an "
-"implementation of the Service Availability Forum Application Interface "
-"Specification to provide high availability through application clustering:"
-msgstr ""
-"基于 openais æ ‡å‡†çš„ç¾¤é›†æ¡†æž¶å¯ä¸ºé€šè¿‡ç¾¤é›†çš„é«˜å¯èƒ½æ€§æä¾›æœåŠ¡å¯ç”¨æ€§è®ºå›åº”ç”¨ç•Œé¢è§„"
-"èŒƒå’Œç¡¬ä»¶è§„æ ¼ï¼ˆService Availability Forum Application Interface "
-"Specification）："
+msgid "The openais Standards Based Cluster Framework which provides an implementation of the Service Availability Forum Application Interface Specification to provide high availability through application clustering:"
+msgstr "基于 openais æ ‡å‡†çš„ç¾¤é›†æ¡†æž¶å¯ä¸ºé€šè¿‡ç¾¤é›†çš„é«˜å¯èƒ½æ€§æä¾›æœåŠ¡å¯ç”¨æ€§è®ºå›åº”ç”¨ç•Œé¢è§„èŒƒå’Œç¡¬ä»¶è§„æ ¼ï¼ˆService Availability Forum Application Interface Specification）："
 
 #. Tag: para
 #: Clusters.xml:145
@@ -1290,9 +966,7 @@ msgstr "打包及设计更改"
 #. Tag: para
 #: Clusters.xml:150
 #, no-c-format
-msgid ""
-"All core features from openais related to clustering merged into The "
-"Corosync Cluster Engine."
+msgid "All core features from openais related to clustering merged into The Corosync Cluster Engine."
 msgstr "将所有来自 openis 与群集相关的特性合并到 Corosync 群集引擎中。"
 
 #. Tag: para
@@ -1304,9 +978,7 @@ msgstr "将 openis 修改为 Corosync 群集引擎插件"
 #. Tag: para
 #: Clusters.xml:165
 #, no-c-format
-msgid ""
-"Provides implementation of various Service Availability Forum AIS "
-"Specifications as corosync service engines and C APIs:"
+msgid "Provides implementation of various Service Availability Forum AIS Specifications as corosync service engines and C APIs:"
 msgstr "使用不同服务可用性论坛 AIS è§„æ ¼ä½œä¸º corosync 服务引擎和 C API："
 
 #. Tag: para
@@ -1412,7 +1084,8 @@ msgid "Enhanced configuration-free running"
 msgstr "增强的免配置运行"
 
 #. Tag: para
-#: Clusters.xml:267 Clusters.xml:317
+#: Clusters.xml:267
+#: Clusters.xml:317
 #, no-c-format
 msgid "Better handling of configuration updates"
 msgstr "更好的配置更新处理"
@@ -1444,9 +1117,7 @@ msgstr "输出别名及端口号的新操作 'list'"
 #. Tag: para
 #: Clusters.xml:294
 #, no-c-format
-msgid ""
-"Support for new devices and firmware: LPAR HMC v3, Cisco MDS, interfaces MIB "
-"(ifmib)"
+msgid "Support for new devices and firmware: LPAR HMC v3, Cisco MDS, interfaces MIB (ifmib)"
 msgstr "对新设备和固件的支持：LPAR HMC v3、Cisco MDS、interfaces MIB（ifmib）"
 
 #. Tag: para
@@ -1494,24 +1165,14 @@ msgstr "打包更改"
 #. Tag: para
 #: Clusters.xml:349
 #, no-c-format
-msgid ""
-"A lot of effort has been expended to cleanup the packages and to make them "
-"as complete, intuitive and modular as possible, allowing also external "
-"entities to reuse most of the infrastructure without the requirement to pull "
-"the whole stack in."
+msgid "A lot of effort has been expended to cleanup the packages and to make them as complete, intuitive and modular as possible, allowing also external entities to reuse most of the infrastructure without the requirement to pull the whole stack in."
 msgstr ""
 
 #. Tag: para
 #: Clusters.xml:356
 #, no-c-format
-msgid ""
-"With the new package reorganization, users will find it easier to update "
-"their cluster. The introduction of fence-agent and resource agent packages "
-"will avoid the pain for users to restart cluster nodes for simple script "
-"updates."
-msgstr ""
-"é‡æ–°æ•´ç†è½¯ä»¶åŒ…åŽï¼Œç”¨æˆ·ä¼šå‘çŽ°æ›´æ–°å…¶ç¾¤é›†å˜å¾—æ›´è½»æ¾äº†ã€‚æ …æ ä»£ç†å’Œèµ„æºä»£ç†è½¯ä»¶åŒ…"
-"的引进将使用户从简单脚本更新重启群集字节时遇到不必要的麻烦。"
+msgid "With the new package reorganization, users will find it easier to update their cluster. The introduction of fence-agent and resource agent packages will avoid the pain for users to restart cluster nodes for simple script updates."
+msgstr "é‡æ–°æ•´ç†è½¯ä»¶åŒ…åŽï¼Œç”¨æˆ·ä¼šå‘çŽ°æ›´æ–°å…¶ç¾¤é›†å˜å¾—æ›´è½»æ¾äº†ã€‚æ …æ ä»£ç†å’Œèµ„æºä»£ç†è½¯ä»¶åŒ…çš„å¼•è¿›å°†ä½¿ç”¨æˆ·ä»Žç®€å•è„šæœ¬æ›´æ–°é‡å¯ç¾¤é›†å­—èŠ‚æ—¶é‡åˆ°ä¸å¿…è¦çš„éº»çƒ¦ã€‚"
 
 #. Tag: title
 #: DatabaseServers.xml:7
@@ -1522,14 +1183,8 @@ msgstr "数据库服务器"
 #. Tag: remark
 #: DatabaseServers.xml:8
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/DatabaseServers\">https://fedoraproject.org/wiki/Docs/"
-"Beats/DatabaseServers</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/DatabaseServers\">https://fedoraproject.org/wiki/Docs/Beats/"
-"DatabaseServers</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/DatabaseServers\">https://fedoraproject.org/wiki/Docs/Beats/DatabaseServers</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/DatabaseServers\">https://fedoraproject.org/wiki/Docs/Beats/DatabaseServers</ulink>"
 
 #. Tag: para
 #: DatabaseServers.xml:10
@@ -1541,39 +1196,25 @@ msgstr "Fedora 包括 MySQL 和 PostgreSQL 两个数据库服务器。"
 #: DatabaseServers.xml:16
 #, no-c-format
 msgid "MySQL"
-msgstr ""
+msgstr "MySQL"
 
 #. Tag: para
 #: DatabaseServers.xml:18
 #, no-c-format
-msgid ""
-"<package>mysql</package> has been updated to 5.1.31. This represents a major "
-"version upgrade from Fedora 10's 5.0.x release series."
-msgstr ""
+msgid "<package>mysql</package> has been updated to 5.1.31. This represents a major version upgrade from Fedora 10's 5.0.x release series."
+msgstr "<package>mysql</package>更新至5.1.31。这是自Fedora 10下5.0.x版本以来的一次主版本更新。"
 
 #. Tag: para
 #: DatabaseServers.xml:23
 #, no-c-format
-msgid ""
-"You should test database-using applications for possible incompatibilities. "
-"Upstream's release notes can be found at <ulink type=\"http\" url=\"http://"
-"dev.mysql.com/doc/refman/5.1/en/news-5-1-x.html\"></ulink>."
-msgstr ""
+msgid "You should test database-using applications for possible incompatibilities. Upstream's release notes can be found at <ulink type=\"http\" url=\"http://dev.mysql.com/doc/refman/5.1/en/news-5-1-x.html\"></ulink>."
+msgstr "您应当测试数据库使用程序来找出可能的不兼容情况。上游发行注记可在<ulink type=\"http\" url=\"http://dev.mysql.com/doc/refman/5.1/en/news-5-1-x.html\"></ulink>找到。"
 
 #. Tag: para
 #: DatabaseServers.xml:29
 #, no-c-format
-msgid ""
-"If you are upgrading a Fedora 10 installation that includes a live 5.0.x "
-"MySQL database, don't forget to run mysql_upgrade after completing the "
-"software upgrade. There is a <ulink type=\"http\" url=\"https://bugzilla."
-"redhat.com/show_bug.cgi?id=493160\"> report</ulink> that this may fail "
-"altogether if the 5.0.x database had been updated from an even older "
-"installation without running mysql_upgrade at the time. If you think this "
-"might be the case for your database, it is prudent to run mysql_upgrade on "
-"the Fedora 10 installation before upgrading. (And, of course, you should "
-"have backups if the database content is at all critical.)"
-msgstr ""
+msgid "If you are upgrading a Fedora 10 installation that includes a live 5.0.x MySQL database, don't forget to run mysql_upgrade after completing the software upgrade. There is a <ulink type=\"http\" url=\"https://bugzilla.redhat.com/show_bug.cgi?id=493160\"> report</ulink> that this may fail altogether if the 5.0.x database had been updated from an even older installation without running mysql_upgrade at the time. If you think this might be the case for your database, it is prudent to run mysql_upgrade on the Fedora 10 installation before upgrading. (And, of course, you should have backups if the database content is at all critical.)"
+msgstr "如果您要升级装有live 5.0.x MySQL数据库的Fedora 10时，请不要忘记在软件是升级结束后运行mysql_upgrade。有<ulink type=\"http\" url=\"https://bugzilla.redhat.com/show_bug.cgi?id=493160\">报道</ulink>称如果5.0.x版是从更早的版本升级的，并且当时没有运行mysql_upgrade，那么这次更新也可能会失败。如果您的数据库属于这种情况，那么升级前在Fedora 10上运行mysql_upgrade是个慎重的做法。(当然如果数据库内容很重要的话，您也应该进行备份。)"
 
 #. Tag: term
 #: DatabaseServers.xml:47
@@ -1584,14 +1225,8 @@ msgstr "postgresql"
 #. Tag: para
 #: DatabaseServers.xml:49
 #, fuzzy, no-c-format
-msgid ""
-"Fedora 11 includes version 8.3.7 of postgreSQL. A dump/restore is not "
-"required for those running 8.3.X. However, it is recommended to REINDEX all "
-"GiST indexes after the upgrade. If your Fedora 9 or 10 installation is up to "
-"date, there will be no change."
-msgstr ""
-"Fedora 11集成了8.3.6版的postgreSQL。对8.3.Xç”¨æˆ·æ¥è¯´æ— é¡»è½¬å‚¨/恢复操作。然而还"
-"是推荐升级后REINDEX所有的GiST索引。"
+msgid "Fedora 11 includes version 8.3.7 of postgreSQL. A dump/restore is not required for those running 8.3.X. However, it is recommended to REINDEX all GiST indexes after the upgrade. If your Fedora 9 or 10 installation is up to date, there will be no change."
+msgstr "Fedora 11集成了8.3.6版的postgreSQL。对8.3.Xç”¨æˆ·æ¥è¯´æ— é¡»è½¬å‚¨/恢复操作。然而还是推荐升级后REINDEX所有的GiST索引。"
 
 #. Tag: title
 #: Desktop.xml:6
@@ -1602,14 +1237,8 @@ msgstr "Fedora 桌面"
 #. Tag: remark
 #: Desktop.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Desktop\">https://fedoraproject.org/wiki/Docs/Beats/"
-"Desktop</ulink>"
-msgstr ""
-"这个 beat 位于： <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Desktop\">https://fedoraproject.org/wiki/Docs/Beats/Desktop</"
-"ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Desktop\">https://fedoraproject.org/wiki/Docs/Beats/Desktop</ulink>"
+msgstr "这个 beat 位于： <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Desktop\">https://fedoraproject.org/wiki/Docs/Beats/Desktop</ulink>"
 
 #. Tag: title
 #: Desktop.xml:9
@@ -1619,37 +1248,21 @@ msgstr "打包更改"
 
 #. Tag: para
 #: Desktop.xml:10
-#, no-c-format
-msgid ""
-"The GDM login screen now handles fingerprint and smartcard authentication "
-"differently. Instead of processing fingerprint, smartcard and password "
-"authentication in sequence, the login screen accepts all forms of "
-"authentication at the same time."
-msgstr ""
+#, fuzzy, no-c-format
+msgid "The GDM login screen now handles fingerprint and smartcard authentication differently. Instead of processing fingerprint, smartcard and password authentication in sequence, the login screen accepts all forms of authentication at the same time."
+msgstr "GDMç™»å½•å±å¹•ä»¥ä¸åŒæ–¹å¼å¤„ç†æŒ‡çº¹è¯†åˆ«å’Œæ™ºèƒ½å¡éªŒè¯ã€‚ç™»å½•å±å¹•åŒä¸€æ—¶é—´å†…å¯æŽ¥å—ä»»ä½•å½¢å¼çš„éªŒè¯ï¼Œè€Œä¸æ˜¯ä»¥å‰é‚£æ ·æŒ‡çº¹è¯†åˆ«ï¼Œæ™ºèƒ½å¡åŠå¯†ç éªŒè¯æŒ‰åºè¿›è¡Œã€‚"
 
 #. Tag: para
 #: Desktop.xml:16
 #, fuzzy, no-c-format
-msgid ""
-"For details about those changes refer to <ulink type=\"http\" url=\"https://"
-"fedoraproject.org/wiki/Features/MultiplePAMStacksInGDM"
-"\">MultiplePAMStacksInGDM</ulink> on the wiki."
-msgstr ""
-"进一步资料请参考 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Features/KVM_PCI_Device_Assignment\">KVM PCI Device Assignment</ulink> wiki "
-"页面。"
+msgid "For details about those changes refer to <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/MultiplePAMStacksInGDM\">MultiplePAMStacksInGDM</ulink> on the wiki."
+msgstr "进一步资料请参考 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/KVM_PCI_Device_Assignment\">KVM PCI Device Assignment</ulink> wiki 页面。"
 
 #. Tag: para
 #: Desktop.xml:21
 #, no-c-format
-msgid ""
-"This change may affect upgrades for users that have previously manually "
-"modified their <filename>/etc/pam.d/system-auth</filename> files without "
-"using the Authentication configuration utility. Depending on the nature of "
-"the modifications, similar changes may need to be added to <filename>/etc/"
-"pam.d/password-auth</filename>, <filename>/etc/pam.d/fingerprint-auth</"
-"filename>, or <filename>/etc/pam.d/smartcard-auth</filename>."
-msgstr ""
+msgid "This change may affect upgrades for users that have previously manually modified their <filename>/etc/pam.d/system-auth</filename> files without using the Authentication configuration utility. Depending on the nature of the modifications, similar changes may need to be added to <filename>/etc/pam.d/password-auth</filename>, <filename>/etc/pam.d/fingerprint-auth</filename>, or <filename>/etc/pam.d/smartcard-auth</filename>."
+msgstr "未使用验证配置工具而手动修改<filename>/etc/pam.d/system-auth</filename>æ–‡ä»¶çš„ç”¨æˆ·å‡çº§æ—¶å¯èƒ½ä¼šå—æ­¤å˜æ›´å½±å“ã€‚æ ¹æ®ä¿®æ”¹çš„æƒ…å†µï¼Œéœ€è¦åœ¨<filename>/etc/pam.d/password-auth</filename>，<filename>/etc/pam.d/fingerprint-auth</filename>或<filename>/etc/pam.d/smartcard-auth</filename>æ–‡ä»¶ä¸­æ·»åŠ ç±»ä¼¼çš„ä¿®æ”¹ã€‚"
 
 #. Tag: title
 #: Desktop.xml:33
@@ -1666,30 +1279,14 @@ msgstr "Gnome-panel"
 #. Tag: para
 #: Desktop.xml:38
 #, no-c-format
-msgid ""
-"Previously, users could move the gnome-panel to from one part of the desktop "
-"to another by clicking on the gnome-panel, dragging it to another location "
-"while holding down the mouse button, and releasing the mouse button. Now, "
-"users must also hold down a key on the keyboard while moving the gnome-"
-"panel. By default, this modifier key is the Alt key, but users may change it "
-"to any other key by using the windows preference tool "
-"(<guimenu>System>Preferences>Windows</guimenu>)."
-msgstr ""
-"以前可以通过单击gnome-é¢æ¿ç„¶åŽç”¨é¼ æ ‡æ‹–æ‹½æŠŠgnome-面板从桌面的一个位置挪到另一"
-"个位置。现在则必须在移动gnome-面板时按住一个键。默认是Alt键，但用户可以使用窗"
-"口偏好设置工具(<guimenu>System>Preferences>Windows</guimenu>)将其修改为其它的"
-"键。"
+msgid "Previously, users could move the gnome-panel to from one part of the desktop to another by clicking on the gnome-panel, dragging it to another location while holding down the mouse button, and releasing the mouse button. Now, users must also hold down a key on the keyboard while moving the gnome-panel. By default, this modifier key is the Alt key, but users may change it to any other key by using the windows preference tool (<guimenu>System>Preferences>Windows</guimenu>)."
+msgstr "以前可以通过单击gnome-é¢æ¿ç„¶åŽç”¨é¼ æ ‡æ‹–æ‹½æŠŠgnome-面板从桌面的一个位置挪到另一个位置。现在则必须在移动gnome-面板时按住一个键。默认是Alt键，但用户可以使用窗口偏好设置工具(<guimenu>System>Preferences>Windows</guimenu>)将其修改为其它的键。"
 
 #. Tag: para
 #: Desktop.xml:50
 #, no-c-format
-msgid ""
-"This change in behavior greatly reduces the chances of a user accidentally "
-"moving the panel, and makes moving the gnome-panel the same as moving "
-"windows in GNOME."
-msgstr ""
-"è¿™ä¸ªæ“ä½œæ–¹å¼ä¸Šçš„å˜åŒ–æžå¤§çš„é™ä½Žäº†ç”¨æˆ·æ— æ„ç§»åŠ¨é¢æ¿çš„å¯èƒ½æ€§ï¼Œå¹¶ä¸”ä½¿å¾—ç§»åŠ¨gnome-"
-"面板的方式与移动GNOME窗口相同。"
+msgid "This change in behavior greatly reduces the chances of a user accidentally moving the panel, and makes moving the gnome-panel the same as moving windows in GNOME."
+msgstr "è¿™ä¸ªæ“ä½œæ–¹å¼ä¸Šçš„å˜åŒ–æžå¤§çš„é™ä½Žäº†ç”¨æˆ·æ— æ„ç§»åŠ¨é¢æ¿çš„å¯èƒ½æ€§ï¼Œå¹¶ä¸”ä½¿å¾—ç§»åŠ¨gnome-面板的方式与移动GNOME窗口相同。"
 
 #. Tag: term
 #: Desktop.xml:60
@@ -1700,31 +1297,19 @@ msgstr "蓝牙"
 #. Tag: para
 #: Desktop.xml:62
 #, no-c-format
-msgid ""
-"The <package>bluez-gnome</package> Bluetooth management tools was replaced "
-"by <package>gnome-bluetooth</package>. This adds easy access to switching "
-"Bluetooth on/off for laptops, and an easier to use new device setup "
-"assistant , as well as the ability to connect to input and audio devices."
-msgstr ""
-"<package>gnome-bluetooth</package>替代了<package>bluez-gnome</package>蓝牙管"
-"理工具。这个工具可以帮助笔记本电脑更容易地切换蓝牙开/关状态，而且使新设备安装"
-"æ›´åŠ å®¹æ˜“ï¼ŒåŒæ—¶å¢žå¼ºäº†è¿žæŽ¥è¾“å…¥è®¾å¤‡å’ŒéŸ³é¢‘è®¾å¤‡çš„èƒ½åŠ›ã€‚"
+msgid "The <package>bluez-gnome</package> Bluetooth management tools was replaced by <package>gnome-bluetooth</package>. This adds easy access to switching Bluetooth on/off for laptops, and an easier to use new device setup assistant , as well as the ability to connect to input and audio devices."
+msgstr "<package>gnome-bluetooth</package>替代了<package>bluez-gnome</package>蓝牙管理工具。这个工具可以帮助笔记本电脑更容易地切换蓝牙开/å…³çŠ¶æ€ï¼Œè€Œä¸”ä½¿æ–°è®¾å¤‡å®‰è£…æ›´åŠ å®¹æ˜“ï¼ŒåŒæ—¶å¢žå¼ºäº†è¿žæŽ¥è¾“å…¥è®¾å¤‡å’ŒéŸ³é¢‘è®¾å¤‡çš„èƒ½åŠ›ã€‚"
 
 #. Tag: para
 #: Desktop.xml:71
 #, no-c-format
-msgid ""
-"The ObexFTP browsing code now has full write support, and new support for "
-"the Wacom Bluetooth tablet is included."
-msgstr ""
-"ObexFTP ä»£ç æŸ¥çœ‹å¼€å§‹æ”¯æŒå®Œå…¨å†™å…¥ï¼ŒåŒæ—¶å¢žåŠ äº†å¯¹Wacom Bluetooth tablet的支持。"
+msgid "The ObexFTP browsing code now has full write support, and new support for the Wacom Bluetooth tablet is included."
+msgstr "ObexFTP ä»£ç æŸ¥çœ‹å¼€å§‹æ”¯æŒå®Œå…¨å†™å…¥ï¼ŒåŒæ—¶å¢žåŠ äº†å¯¹Wacom Bluetooth tablet的支持。"
 
 #. Tag: para
 #: Desktop.xml:76
 #, no-c-format
-msgid ""
-"Bluetooth audio support is included in gnome-bluetooth and pulseaudio as a "
-"technology preview."
+msgid "Bluetooth audio support is included in gnome-bluetooth and pulseaudio as a technology preview."
 msgstr "蓝牙音频支持做为技术预览集成到了gnome-bluetooth和pulseaudio中。"
 
 #. Tag: term
@@ -1736,21 +1321,8 @@ msgstr "禁止Root用户使用GNOME显示管理器"
 #. Tag: para
 #: Desktop.xml:88
 #, no-c-format
-msgid ""
-"Root user is disabled by default for GNOME Display Manager (GDM) from Fedora "
-"10 onwards. We strongly recommend that you avoid logging in as root user and "
-"instead use <command>su -c</command> or <command>sudo</command> for running "
-"commands requiring root access. If you wish to revert this setting however, "
-"refer to <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"Enabling_Root_User_For_GNOME_Display_Manager\"> http://fedoraproject.org/"
-"wiki/Enabling_Root_User_For_GNOME_Display_Manager </ulink>."
-msgstr ""
-"从Fedora 10开始就已默认禁止了Root用户使用GNOME显示管理器(GDM)。我们强烈建议您"
-"不要使用root用户登录，仅用<command>su -c</command>或<command>sudo</command>来"
-"运行需要root权限的命令。如果您还是想取消此设置，请参考<ulink type=\"http\" "
-"url=\"http://fedoraproject.org/wiki/"
-"Enabling_Root_User_For_GNOME_Display_Manager\"> http://fedoraproject.org/"
-"wiki/Enabling_Root_User_For_GNOME_Display_Manager </ulink>。"
+msgid "Root user is disabled by default for GNOME Display Manager (GDM) from Fedora 10 onwards. We strongly recommend that you avoid logging in as root user and instead use <command>su -c</command> or <command>sudo</command> for running commands requiring root access. If you wish to revert this setting however, refer to <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Enabling_Root_User_For_GNOME_Display_Manager\"> http://fedoraproject.org/wiki/Enabling_Root_User_For_GNOME_Display_Manager </ulink>."
+msgstr "从Fedora 10开始就已默认禁止了Root用户使用GNOME显示管理器(GDM)。我们强烈建议您不要使用root用户登录，仅用<command>su -c</command>或<command>sudo</command>来运行需要root权限的命令。如果您还是想取消此设置，请参考<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Enabling_Root_User_For_GNOME_Display_Manager\"> http://fedoraproject.org/wiki/Enabling_Root_User_For_GNOME_Display_Manager </ulink>。"
 
 #. Tag: title
 #: Desktop.xml:108
@@ -1761,9 +1333,7 @@ msgstr "<title>KDE</title>"
 #. Tag: para
 #: Desktop.xml:109
 #, no-c-format
-msgid ""
-"This release features KDE 4.2.2. Compatibility libraries from KDE 3.5.10 are "
-"provided for the remaining KDE 3 applications."
+msgid "This release features KDE 4.2.2. Compatibility libraries from KDE 3.5.10 are provided for the remaining KDE 3 applications."
 msgstr "本发行版使用KDE 4.2.2。包括了运行KDE 3的程序的KDE 3.5.10兼容库。"
 
 #. Tag: ulink
@@ -1775,36 +1345,14 @@ msgstr "http://kde.org/announcements/announce-4.2.2.php"
 #. Tag: para
 #: Desktop.xml:117
 #, no-c-format
-msgid ""
-"KDE 4.2 is the latest release series of KDE 4 and provides several new "
-"features over 4.0 and 4.1, in particular most of the features known from KDE "
-"3 and several new ones. KDE 4.2.2 is a bugfix release from the KDE 4.2 "
-"release series."
-msgstr ""
-"KDE 4.2是KDE 4的最新版本，较4.0和4.1又提供了一些新特性。KDE 4.2.2修正了KDE "
-"4.2的bug。"
+msgid "KDE 4.2 is the latest release series of KDE 4 and provides several new features over 4.0 and 4.1, in particular most of the features known from KDE 3 and several new ones. KDE 4.2.2 is a bugfix release from the KDE 4.2 release series."
+msgstr "KDE 4.2是KDE 4的最新版本，较4.0和4.1又提供了一些新特性。KDE 4.2.2修正了KDE 4.2的bug。"
 
 #. Tag: para
 #: Desktop.xml:124
 #, no-c-format
-msgid ""
-"Fedora 11 includes a snapshot of the NetworkManager plasmoid <package>kde-"
-"plasma-networkmanagement</package>, which replaces the KDE 3 "
-"<package>knetworkmanager</package> snapshot in Fedora 10. As it was not "
-"considered ready for production use, the KDE Live images still use "
-"<package>nm-applet</package> from <package>NetworkManager-gnome</package> "
-"instead, as in Fedora 8, 9 and 10. The <package>gnome-keyring-daemon</"
-"package> facility saves passwords for <package>nm-applet</package>. If you "
-"wish to try <package>kde-plasma-networkmanagement</package>, it can be "
-"installed from the repository."
-msgstr ""
-"Fedora 11 包括网络管理程序 plasmoid <package>kde-plasma-knetworkmanager</"
-"package> 快照， 它替换了 Fedora 10 中的 KDE 3 <application>NetworkManager</"
-"application> å¿«ç…§ã€‚å› ä¸ºè¿˜æ²¡æœ‰å‡†å¤‡å¥½åœ¨äº§å“ä¸­ä½¿ç”¨ï¼ŒKDE Live æ˜ åƒä½¿ç”¨ "
-"<package>NetworkManager-gnome</package> 中的 <command>nm-applet</command>（与"
-"在 Fedora 8 、9 å’Œ 10 ä¸­çš„ä¸€æ ·ï¼‰ã€‚ <package>gnome-keyring-daemon</package> å·¥"
-"具为 <package>nm-applet</package> ä¿å­˜å¯†ç ã€‚å¦‚æžœæ‚¨è¦è¯•ç”¨ <package>kde-plasma-"
-"networkmanagement</package>，可从程序库中安装它。"
+msgid "Fedora 11 includes a snapshot of the NetworkManager plasmoid <package>kde-plasma-networkmanagement</package>, which replaces the KDE 3 <package>knetworkmanager</package> snapshot in Fedora 10. As it was not considered ready for production use, the KDE Live images still use <package>nm-applet</package> from <package>NetworkManager-gnome</package> instead, as in Fedora 8, 9 and 10. The <package>gnome-keyring-daemon</package> facility saves passwords for <package>nm-applet</package>. If you wish to try <package>kde-plasma-networkmanagement</package>, it can be installed from the repository."
+msgstr "Fedora 11 包括网络管理程序 plasmoid <package>kde-plasma-knetworkmanager</package> 快照， 它替换了 Fedora 10 中的 KDE 3 <application>NetworkManager</application> å¿«ç…§ã€‚å› ä¸ºè¿˜æ²¡æœ‰å‡†å¤‡å¥½åœ¨äº§å“ä¸­ä½¿ç”¨ï¼ŒKDE Live æ˜ åƒä½¿ç”¨ <package>NetworkManager-gnome</package> 中的 <command>nm-applet</command>（与在 Fedora 8 、9 å’Œ 10 ä¸­çš„ä¸€æ ·ï¼‰ã€‚ <package>gnome-keyring-daemon</package> 工具为 <package>nm-applet</package> ä¿å­˜å¯†ç ã€‚å¦‚æžœæ‚¨è¦è¯•ç”¨ <package>kde-plasma-networkmanagement</package>，可从程序库中安装它。"
 
 #. Tag: term
 #: Desktop.xml:138
@@ -1815,19 +1363,8 @@ msgstr "软件更新（PackageKit）"
 #. Tag: para
 #: Desktop.xml:140
 #, no-c-format
-msgid ""
-"As the default updater in KDE is <package>kpackagekit</package> (since "
-"Fedora 10), the <package>gnome-packagekit</package> updater is no longer set "
-"up to run in KDE (as of Fedora 11). This avoids the situation where both "
-"update applets were trying to run at the same time. Users of Fedora 9 or 10 "
-"who were running <package>gnome-packagekit</package> under KDE should "
-"install <package>kpackagekit</package> when upgrading to Fedora 11."
-msgstr ""
-"<package>kpackagekit</package> (自Fedora 10开始)为KDE的默认更新程序，"
-"<package>gnome-packagekit</package>将不再用于KDE(Fedora 11开始)。这就避免了两"
-"个更新程序试图同时运行的情况。Fedora 9和10下在KDE中使用<package>gnome-"
-"packagekit</package>的用户在升级到Fedora 11时应该安装<package>kpackagekit</"
-"package>。"
+msgid "As the default updater in KDE is <package>kpackagekit</package> (since Fedora 10), the <package>gnome-packagekit</package> updater is no longer set up to run in KDE (as of Fedora 11). This avoids the situation where both update applets were trying to run at the same time. Users of Fedora 9 or 10 who were running <package>gnome-packagekit</package> under KDE should install <package>kpackagekit</package> when upgrading to Fedora 11."
+msgstr "<package>kpackagekit</package> (自Fedora 10开始)为KDE的默认更新程序，<package>gnome-packagekit</package>将不再用于KDE(Fedora 11开始)。这就避免了两个更新程序试图同时运行的情况。Fedora 9和10下在KDE中使用<package>gnome-packagekit</package>的用户在升级到Fedora 11时应该安装<package>kpackagekit</package>。"
 
 #. Tag: term
 #: Desktop.xml:154
@@ -1838,29 +1375,14 @@ msgstr "桌面效果"
 #. Tag: para
 #: Desktop.xml:156
 #, no-c-format
-msgid ""
-"KDE 4.2 improves support for desktop effects in KWin, the KDE window "
-"manager, in particular, they should be more reliable, and more effects are "
-"provided, including the famous Cube effect known from Compiz. However, "
-"desktop effects are still disabled by default in Fedora due to stability and "
-"reliability concerns. Desktop effects can be enabled in the Desktop applet "
-"of the System Settings application."
-msgstr ""
-"KDE 4.2增强了对KDE窗口管理器KWinä¸‹æ¡Œé¢ç‰¹æ•ˆçš„æ”¯æŒï¼Œå®ƒä»¬ä¼šæ›´å¯é ï¼Œæœ‰æ›´å¤šæ•ˆæžœï¼Œ"
-"而且也有出自Compiz的著名的Cubeæ•ˆæžœã€‚ç„¶è€Œä¸ºäº†ç¨³å®šå’Œå¯é æ€§çš„è€ƒè™‘ï¼ŒFedora中默认"
-"仍然不开启桌面特效。可在系统设置里启用它。"
+msgid "KDE 4.2 improves support for desktop effects in KWin, the KDE window manager, in particular, they should be more reliable, and more effects are provided, including the famous Cube effect known from Compiz. However, desktop effects are still disabled by default in Fedora due to stability and reliability concerns. Desktop effects can be enabled in the Desktop applet of the System Settings application."
+msgstr "KDE 4.2增强了对KDE窗口管理器KWinä¸‹æ¡Œé¢ç‰¹æ•ˆçš„æ”¯æŒï¼Œå®ƒä»¬ä¼šæ›´å¯é ï¼Œæœ‰æ›´å¤šæ•ˆæžœï¼Œè€Œä¸”ä¹Ÿæœ‰å‡ºè‡ªCompiz的著名的Cubeæ•ˆæžœã€‚ç„¶è€Œä¸ºäº†ç¨³å®šå’Œå¯é æ€§çš„è€ƒè™‘ï¼ŒFedora中默认仍然不开启桌面特效。可在系统设置里启用它。"
 
 #. Tag: para
 #: Desktop.xml:166
 #, no-c-format
-msgid ""
-"Alternatively, Compiz may also be used with KDE. It can be installed from "
-"the repository by installing the <package>compiz-kde</package> package. "
-"Please note, however, that enabling desktop effects in KWin is the preferred "
-"way to use desktop effects in KDE 4."
-msgstr ""
-"KDE中也有可能使用Compiz。可通过源安装<package>compiz-kde</package>包来安装。"
-"但是请注意KDE 4中在KWin中启用桌面特效是更好的方法。"
+msgid "Alternatively, Compiz may also be used with KDE. It can be installed from the repository by installing the <package>compiz-kde</package> package. Please note, however, that enabling desktop effects in KWin is the preferred way to use desktop effects in KDE 4."
+msgstr "KDE中也有可能使用Compiz。可通过源安装<package>compiz-kde</package>包来安装。但是请注意KDE 4中在KWin中启用桌面特效是更好的方法。"
 
 #. Tag: term
 #: Desktop.xml:177
@@ -1871,79 +1393,32 @@ msgstr "软件包和应用程序更改"
 #. Tag: para
 #: Desktop.xml:182
 #, no-c-format
-msgid ""
-"<package>kde-plasma-networkmanagement</package> replaces "
-"<package>knetworkmanager</package>. It has also been made available as an "
-"update for Fedora 10, but does not replace <package>knetworkmanager</"
-"package> there. Please note that the <application>nm-applet</application> "
-"from <package>NetworkManager-gnome</package> is still the default "
-"<application>NetworkManager</application> applet in Fedora 11."
-msgstr ""
-"<package>kde-plasma-networkmanagement</package>代替了"
-"<package>knetworkmanager</package>。同时也做为Fedora 10的更新提供，但是"
-"Fedora 10中不会替代<package>knetworkmanager</package>。请注意"
-"<package>NetworkManager-gnome</package>中的<application>nm-applet</"
-"application>仍将是Fedora 11上默认的<application>NetworkManager</application>"
-"程序。"
+msgid "<package>kde-plasma-networkmanagement</package> replaces <package>knetworkmanager</package>. It has also been made available as an update for Fedora 10, but does not replace <package>knetworkmanager</package> there. Please note that the <application>nm-applet</application> from <package>NetworkManager-gnome</package> is still the default <application>NetworkManager</application> applet in Fedora 11."
+msgstr "<package>kde-plasma-networkmanagement</package>代替了<package>knetworkmanager</package>。同时也做为Fedora 10的更新提供，但是Fedora 10中不会替代<package>knetworkmanager</package>。请注意<package>NetworkManager-gnome</package>中的<application>nm-applet</application>仍将是Fedora 11上默认的<application>NetworkManager</application>程序。"
 
 #. Tag: para
 #: Desktop.xml:196
 #, no-c-format
-msgid ""
-"A KDE frontend for <package>PolicyKit</package> is now provided in the new "
-"<package>PolicyKit-kde</package> package. It replaces <package>PolicyKit-"
-"gnome</package> on the KDE Live CD. It includes both an authentication agent "
-"and an editor for authorization settings (<command>polkit-kde-authorization</"
-"command>)."
-msgstr ""
-"新的<package>PolicyKit-kde</package>做为 <package>PolicyKit</package>的KDE前"
-"端。它替代了KDE Live CD中的<package>PolicyKit-gnome</package>。它同时提供了认"
-"证代理和授权设置编辑器(<command>polkit-kde-authorization</command>)。"
+msgid "A KDE frontend for <package>PolicyKit</package> is now provided in the new <package>PolicyKit-kde</package> package. It replaces <package>PolicyKit-gnome</package> on the KDE Live CD. It includes both an authentication agent and an editor for authorization settings (<command>polkit-kde-authorization</command>)."
+msgstr "新的<package>PolicyKit-kde</package>做为 <package>PolicyKit</package>的KDE前端。它替代了KDE Live CD中的<package>PolicyKit-gnome</package>。它同时提供了认证代理和授权设置编辑器(<command>polkit-kde-authorization</command>)。"
 
 #. Tag: para
 #: Desktop.xml:207
 #, no-c-format
-msgid ""
-"As KDE 4.2 includes a power management service, <application>PowerDevil</"
-"application>, as part of <package>kdebase-workspace</package>, the old "
-"<package>kpowersave</package> and <package>guidance-power-manager</package> "
-"packages have been dropped. Users upgrading from earlier Fedora releases "
-"should add the <application>Battery Status</application> plasmoid to their "
-"panel, which serves as a frontend for <application>PowerDevil</application>."
-msgstr ""
-"KDE 4.2提供了电源管理服务，<application>PowerDevil</application>，是"
-"<package>kdebase-workspace</package>的一部分，去除了旧的<package>kpowersave</"
-"package>和<package>guidance-power-manager</package>。从早期Fedora版本升级的用"
-"户需要将<application>Battery Status</application>æ·»åŠ åˆ°é¢æ¿ä¸Šï¼Œå®ƒåšä¸º"
-"<application>PowerDevil</application>的前端。"
+msgid "As KDE 4.2 includes a power management service, <application>PowerDevil</application>, as part of <package>kdebase-workspace</package>, the old <package>kpowersave</package> and <package>guidance-power-manager</package> packages have been dropped. Users upgrading from earlier Fedora releases should add the <application>Battery Status</application> plasmoid to their panel, which serves as a frontend for <application>PowerDevil</application>."
+msgstr "KDE 4.2提供了电源管理服务，<application>PowerDevil</application>，是<package>kdebase-workspace</package>的一部分，去除了旧的<package>kpowersave</package>å’Œ<package>guidance-power-manager</package>。从早期Fedora版本升级的用户需要将<application>Battery Status</application>æ·»åŠ åˆ°é¢æ¿ä¸Šï¼Œå®ƒåšä¸º<application>PowerDevil</application>的前端。"
 
 #. Tag: para
 #: Desktop.xml:221
 #, no-c-format
-msgid ""
-"The <package>kdeartwork</package> package has been split into subpackages to "
-"allow installing specific artwork items without the huge wallpapers and "
-"sounds. In Fedora 9 and 10 updates, these subpackages are required by the "
-"main package to ensure upgrade paths. In Fedora 11, these artificial "
-"dependencies have been removed, thus <package>kdeartwork-wallpapers</"
-"package> and <package>kdeartwork-sounds</package> can be installed or "
-"removed separately."
-msgstr ""
-"<package>kdeartwork</package>已拆分为多个从属包，从而安装特定的主题包时不需安"
-"装大量的壁纸和声音。Fedora 9和10的更新中，主题包安装时仍需要安装这些从属包以"
-"保证升级路径。Fedora 11ä¸­ï¼Œè¿™äº›äººå·¥çš„ä¾èµ–å·²è¢«åŽ»é™¤ï¼Œå› æ­¤<package>kdeartwork-"
-"wallpapers</package>和<package>kdeartwork-sounds</package>可以单独安装和卸"
-"载。"
+msgid "The <package>kdeartwork</package> package has been split into subpackages to allow installing specific artwork items without the huge wallpapers and sounds. In Fedora 9 and 10 updates, these subpackages are required by the main package to ensure upgrade paths. In Fedora 11, these artificial dependencies have been removed, thus <package>kdeartwork-wallpapers</package> and <package>kdeartwork-sounds</package> can be installed or removed separately."
+msgstr "<package>kdeartwork</package>已拆分为多个从属包，从而安装特定的主题包时不需安装大量的壁纸和声音。Fedora 9å’Œ10的更新中，主题包安装时仍需要安装这些从属包以保证升级路径。Fedora 11ä¸­ï¼Œè¿™äº›äººå·¥çš„ä¾èµ–å·²è¢«åŽ»é™¤ï¼Œå› æ­¤<package>kdeartwork-wallpapers</package>å’Œ<package>kdeartwork-sounds</package>可以单独安装和卸载。"
 
 #. Tag: para
 #: Desktop.xml:234
 #, no-c-format
-msgid ""
-"In addition, the following changes made since the Fedora 10 release, which "
-"have been backported to Fedora 10 updates, are also part of Fedora 11:"
-msgstr ""
-"另外，以下是 Fedora 10 发行版本之后的更改，已将其回迁到 Fedora 10 更新，也是 "
-"Fedora 11 的一部分："
+msgid "In addition, the following changes made since the Fedora 10 release, which have been backported to Fedora 10 updates, are also part of Fedora 11:"
+msgstr "另外，以下是 Fedora 10 发行版本之后的更改，已将其回迁到 Fedora 10 更新，也是 Fedora 11 的一部分："
 
 #. Tag: para
 #: Desktop.xml:242
@@ -1954,122 +1429,68 @@ msgstr "已将 KDE 从 4.1.2 升级到版本 4.2.2。"
 #. Tag: para
 #: Desktop.xml:247
 #, no-c-format
-msgid ""
-"<package>qt</package> and <package>PyQt4</package> have been upgraded from "
-"4.4 to 4.5."
-msgstr ""
-"已将 <package>qt</package> 和 <package>PyQt4</package> 从 4.4 升级到 4.5。"
+msgid "<package>qt</package> and <package>PyQt4</package> have been upgraded from 4.4 to 4.5."
+msgstr "已将 <package>qt</package> 和 <package>PyQt4</package> 从 4.4 升级到 4.5。"
 
 #. Tag: para
 #: Desktop.xml:253
 #, no-c-format
-msgid ""
-"The <package>phonon</package> library has been upgraded from 4.2 to 4.3."
+msgid "The <package>phonon</package> library has been upgraded from 4.2 to 4.3."
 msgstr "已将 <package>phonon</package> 程序库从 4.2 升级到 4.3。"
 
 #. Tag: para
 #: Desktop.xml:259
 #, no-c-format
-msgid ""
-"A <package>kdepim3</package> compatibility package, providing the KDE 3 "
-"version of <package>libkcal</package>, has been added to provide ICal "
-"support for taskjuggler again."
-msgstr ""
-"åŠ å…¥äº†<package>kdepim3</package>兼容包，它提供KDE 3版本的<package>libkcal</"
-"package>，再次为taskjuggler提供ICal支持。"
+msgid "A <package>kdepim3</package> compatibility package, providing the KDE 3 version of <package>libkcal</package>, has been added to provide ICal support for taskjuggler again."
+msgstr "åŠ å…¥äº†<package>kdepim3</package>兼容包，它提供KDE 3版本的<package>libkcal</package>，再次为taskjuggler提供ICal支持。"
 
 #. Tag: para
 #: Desktop.xml:267
 #, no-c-format
-msgid ""
-"A new subpackage <package>kdebase-workspace-googlegadgets</package> provides "
-"support for Google Gadgets in Plasma."
-msgstr ""
-"åŠ å…¥äº†æ–°çš„ä»Žå±žåŒ…<package>kdebase-workspace-googlegadgets</package>来支持"
-"Plasma中的Goolgle小工具。"
+msgid "A new subpackage <package>kdebase-workspace-googlegadgets</package> provides support for Google Gadgets in Plasma."
+msgstr "åŠ å…¥äº†æ–°çš„ä»Žå±žåŒ…<package>kdebase-workspace-googlegadgets</package>来支持Plasma中的Goolgle小工具。"
 
 #. Tag: para
 #: Desktop.xml:274
 #, no-c-format
-msgid ""
-"The former package <package>qgtkstyle</package> is now part of <package>qt</"
-"package>."
-msgstr ""
-"以前的<package>qgtkstyle</package>现在是<package>qt</package>的一部分。"
+msgid "The former package <package>qgtkstyle</package> is now part of <package>qt</package>."
+msgstr "以前的<package>qgtkstyle</package>现在是<package>qt</package>的一部分。"
 
 #. Tag: para
 #: Desktop.xml:280
 #, no-c-format
-msgid ""
-"The former package <package>kde-plasma-lancelot</package> is now part of "
-"<package>kdeplasma-addons</package>."
-msgstr ""
-"软件包 <package>kde-plasma-lancelot</package> 现在是 <package>kdeplasma-"
-"addons</package> 的一部分。"
+msgid "The former package <package>kde-plasma-lancelot</package> is now part of <package>kdeplasma-addons</package>."
+msgstr "软件包 <package>kde-plasma-lancelot</package> 现在是 <package>kdeplasma-addons</package> 的一部分。"
 
 #. Tag: para
 #: Desktop.xml:287
 #, no-c-format
-msgid ""
-"New <package>system-config-printer-kde</package> and <package>kdeutils-"
-"printer-applet</package> subpackages have been split out from "
-"<package>kdeadmin</package> and <package>kdeutils</package>, respectively."
-msgstr ""
-"新的<package>system-config-printer-kde</package>和<package>kdeutils-printer-"
-"applet</package>从属包已各自从<package>kdeadmin</package>和"
-"<package>kdeutils</package>分离。"
+msgid "New <package>system-config-printer-kde</package> and <package>kdeutils-printer-applet</package> subpackages have been split out from <package>kdeadmin</package> and <package>kdeutils</package>, respectively."
+msgstr "新的<package>system-config-printer-kde</package>和<package>kdeutils-printer-applet</package>从属包已各自从<package>kdeadmin</package>和<package>kdeutils</package>分离。"
 
 #. Tag: para
 #: Desktop.xml:296
 #, no-c-format
-msgid ""
-"The subpackages <package>kdeartwork-extras</package> and <package>kdeartwork-"
-"icons</package> of <package>kdeartwork</package> have been renamed to "
-"<package>kdeartwork-screensavers</package> and <package>kdeclassic-icon-"
-"theme</package>, respectively, in order to better reflect their current "
-"contents."
-msgstr ""
-"为了更好的反应包的内容，<package>kdeartwork</package>的从属包"
-"<package>kdeartwork-extras</package>和<package>kdeartwork-icons</package>分别"
-"重命名为<package>kdeartwork-screensavers</package>和<package>kdeclassic-icon-"
-"theme</package>。"
+msgid "The subpackages <package>kdeartwork-extras</package> and <package>kdeartwork-icons</package> of <package>kdeartwork</package> have been renamed to <package>kdeartwork-screensavers</package> and <package>kdeclassic-icon-theme</package>, respectively, in order to better reflect their current contents."
+msgstr "为了更好的反应包的内容，<package>kdeartwork</package>的从属包<package>kdeartwork-extras</package>和<package>kdeartwork-icons</package>分别重命名为<package>kdeartwork-screensavers</package>和<package>kdeclassic-icon-theme</package>。"
 
 #. Tag: para
 #: Desktop.xml:307
 #, no-c-format
-msgid ""
-"The Akonadi framework is now used in several kdepim applications. Some "
-"changes have been made to accommodate it:"
+msgid "The Akonadi framework is now used in several kdepim applications. Some changes have been made to accommodate it:"
 msgstr "Akonadi framework已用于一些kdepim程序中。针对它做了一些变化。"
 
 #. Tag: para
 #: Desktop.xml:313
 #, no-c-format
-msgid ""
-"The <package>akonadi</package> package now requires mysql-server so the "
-"default configuration works. The MySQL server does not have to be "
-"configured, as Akonadi starts up a per-user instance of mysqld with a "
-"default server configuration. It is also possible to set up Akonadi to use a "
-"manually-configured systemwide or remote MySQL server instance, however this "
-"is not the default."
-msgstr ""
-"<package>akonadi</package> 软件包现在需要 mysql-server 以便默认配置正常工作。"
-"不一定要配置 MySQL æœåŠ¡å™¨ï¼Œå› ä¸º Akonadi 为每个 mysqld 用户事件启动一个默认服"
-"务器配置。还可以将 Akonadi 设定为使用在系统范围内手动配置或者使用远程 MySQL "
-"服务器事件，但这个不是默认设置。"
+msgid "The <package>akonadi</package> package now requires mysql-server so the default configuration works. The MySQL server does not have to be configured, as Akonadi starts up a per-user instance of mysqld with a default server configuration. It is also possible to set up Akonadi to use a manually-configured systemwide or remote MySQL server instance, however this is not the default."
+msgstr "<package>akonadi</package> 软件包现在需要 mysql-server 以便默认配置正常工作。不一定要配置 MySQL æœåŠ¡å™¨ï¼Œå› ä¸º Akonadi 为每个 mysqld 用户事件启动一个默认服务器配置。还可以将 Akonadi 设定为使用在系统范围内手动配置或者使用远程 MySQL 服务器事件，但这个不是默认设置。"
 
 #. Tag: para
 #: Desktop.xml:326
 #, no-c-format
-msgid ""
-"A <package>kdepimlibs-akonadi</package> subpackage has been split out from "
-"kdepimlibs because some libraries from kdepimlibs are also used in non-PIM "
-"applications. The split allows installing these applications without "
-"installing Akonadi and MySQL."
-msgstr ""
-"由于某些kdepimlibs中的库也用于非PIMç¨‹åºï¼Œå› æ­¤å°†<package>kdepimlibs-akonadi</"
-"package>从kdepimlibsä¸­åˆ†ç¦»ã€‚è¿™æ ·åšä»¥åŽå®‰è£…è¿™äº›ç¨‹åºæ—¶ä¸éœ€è¦å†å®‰è£…Akonadiå’Œ"
-"MySQL。"
+msgid "A <package>kdepimlibs-akonadi</package> subpackage has been split out from kdepimlibs because some libraries from kdepimlibs are also used in non-PIM applications. The split allows installing these applications without installing Akonadi and MySQL."
+msgstr "由于某些kdepimlibs中的库也用于非PIMç¨‹åºï¼Œå› æ­¤å°†<package>kdepimlibs-akonadi</package>从kdepimlibsä¸­åˆ†ç¦»ã€‚è¿™æ ·åšä»¥åŽå®‰è£…è¿™äº›ç¨‹åºæ—¶ä¸éœ€è¦å†å®‰è£…Akonadiå’ŒMySQL。"
 
 #. Tag: para
 #: Desktop.xml:340
@@ -2086,61 +1507,32 @@ msgstr "Eclipse"
 #. Tag: remark
 #: Devel-Eclipse.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Documentation_Development_Eclipse_Beat\">https://fedoraproject.org/"
-"wiki/Documentation_Development_Eclipse_Beat</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Documentation_Development_Eclipse_Beat\">https://fedoraproject.org/wiki/"
-"Documentation_Development_Eclipse_Beat</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Development_Eclipse_Beat\">https://fedoraproject.org/wiki/Documentation_Development_Eclipse_Beat</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Development_Eclipse_Beat\">https://fedoraproject.org/wiki/Documentation_Development_Eclipse_Beat</ulink>"
 
 #. Tag: para
 #: Devel-Eclipse.xml:9
 #, no-c-format
-msgid ""
-"The <package>eclipse</package> package has been updated to 3.4.2. Along with "
-"this update, many plugins and tools have also been updated. These are "
-"largely bugfix updates and with a few exceptions, users should not see any "
-"differences."
-msgstr ""
-"<package>eclipse</package>包升级至3.4.2版本。很多插件和工具也随之更新。主要是"
-"大量的bug修正和少数例外，用户不会发现任何差异。"
+msgid "The <package>eclipse</package> package has been updated to 3.4.2. Along with this update, many plugins and tools have also been updated. These are largely bugfix updates and with a few exceptions, users should not see any differences."
+msgstr "<package>eclipse</package>包升级至3.4.2版本。很多插件和工具也随之更新。主要是大量的bug修正和少数例外，用户不会发现任何差异。"
 
 #. Tag: para
 #: Devel-Eclipse.xml:15
 #, no-c-format
-msgid ""
-"Users should visit the Eclipse web site at <ulink type=\"http\" url=\"http://"
-"www.eclipse.org/\">http://www.eclipse.org/</ulink> for the latest news on "
-"Eclipse."
-msgstr ""
-"用户可访问位于  <ulink type=\"http\" url=\"http://www.eclipse.org/\">http://"
-"www.eclipse.org/</ulink> 的 Eclipse 网站以获得 Eclipse 的最新消息。"
+msgid "Users should visit the Eclipse web site at <ulink type=\"http\" url=\"http://www.eclipse.org/\">http://www.eclipse.org/</ulink> for the latest news on Eclipse."
+msgstr "用户可访问位于  <ulink type=\"http\" url=\"http://www.eclipse.org/\">http://www.eclipse.org/</ulink> 的 Eclipse 网站以获得 Eclipse 的最新消息。"
 
 #. Tag: para
 #: Devel-Eclipse.xml:20
 #, no-c-format
-msgid ""
-"Version 1.2.1 of <package>eclipse-phpeclipse</package> corrects a problem "
-"with word selection. Refer to <ulink type=\"http\" url=\"http://phpeclipse."
-"net/\">http://phpeclipse.net/</ulink>."
-msgstr ""
-"2.2.1版本的<package>eclipse-phpeclipse</package>修正了选词时出现的问题。参考"
-"<ulink type=\"http\" url=\"http://phpeclipse.net/\">http://phpeclipse.net/</"
-"ulink>。"
+msgid "Version 1.2.1 of <package>eclipse-phpeclipse</package> corrects a problem with word selection. Refer to <ulink type=\"http\" url=\"http://phpeclipse.net/\">http://phpeclipse.net/</ulink>."
+msgstr "2.2.1版本的<package>eclipse-phpeclipse</package>修正了选词时出现的问题。参考<ulink type=\"http\" url=\"http://phpeclipse.net/\">http://phpeclipse.net/</ulink>。"
 
 #. Tag: para
 #: Devel-Eclipse.xml:25
 #, fuzzy, no-c-format
-msgid ""
-"The <package>pydev-mylyn</package> has been updated to 1.4.4. See <ulink "
-"type=\"http\" url=\"http://pydev.sourceforge.net\">http://pydev.sourceforge."
-"net</ulink> for details."
-msgstr ""
-"<package>pydev-mylen</package>升级到1.4.4版本。参考<ulink type=\"http\" url="
-"\"http://pydev.sourceforge.net\">http://pydev.sourceforge.net</ulink>了解详细"
-"信息。"
+msgid "The <package>pydev-mylyn</package> has been updated to 1.4.4. See <ulink type=\"http\" url=\"http://pydev.sourceforge.net\">http://pydev.sourceforge.net</ulink> for details."
+msgstr "<package>pydev-mylen</package>升级到1.4.4版本。参考<ulink type=\"http\" url=\"http://pydev.sourceforge.net\">http://pydev.sourceforge.net</ulink>了解详细信息。"
 
 #. Tag: title
 #: Devel-Embedded.xml:6
@@ -2151,47 +1543,20 @@ msgstr "嵌入式开发"
 #. Tag: remark
 #: Devel-Embedded.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Documentation_Embedded_Development_Beat\">https://fedoraproject.org/"
-"wiki/Documentation_Embedded_Development_Beat</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Documentation_Embedded_Development_Beat\">https://fedoraproject.org/wiki/"
-"Documentation_Embedded_Development_Beat</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Embedded_Development_Beat\">https://fedoraproject.org/wiki/Documentation_Embedded_Development_Beat</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Embedded_Development_Beat\">https://fedoraproject.org/wiki/Documentation_Embedded_Development_Beat</ulink>"
 
 #. Tag: para
 #: Devel-Embedded.xml:9
 #, no-c-format
-msgid ""
-"Fedora 11 includes a range of packages to support development of embedded "
-"applications on various targets. There is broad support for the AVR and "
-"related parts as well as for the Microchip PIC. In addition, there are "
-"packages to support development on older, less popular parts such as the "
-"Z80, 8051, and others. For a more complete description refer to <ulink type="
-"\"http\" url=\"https://fedoraproject.org/wiki/"
-"Packages_For_Embedded_Development\">Packages for embedded development on the "
-"wiki</ulink> ."
-msgstr ""
-"Fedora 11为在众多平台开发嵌入式程序提供了一系列的包。对AVR和相关部件以及"
-"Microchip PIC提供了广泛的支持。此外，还提供了在Z80，8051等较旧的、不常用的部"
-"件上进行开发的包。参考<ulink type=\"http\" url=\"https://fedoraproject.org/"
-"wiki/Packages_For_Embedded_Development\">Packages for embedded development "
-"on the wiki</ulink>了解更多的介绍。"
+msgid "Fedora 11 includes a range of packages to support development of embedded applications on various targets. There is broad support for the AVR and related parts as well as for the Microchip PIC. In addition, there are packages to support development on older, less popular parts such as the Z80, 8051, and others. For a more complete description refer to <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Packages_For_Embedded_Development\">Packages for embedded development on the wiki</ulink> ."
+msgstr "Fedora 11为在众多平台开发嵌入式程序提供了一系列的包。对AVR和相关部件以及Microchip PIC提供了广泛的支持。此外，还提供了在Z80，8051等较旧的、不常用的部件上进行开发的包。参考<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Packages_For_Embedded_Development\">Packages for embedded development on the wiki</ulink>了解更多的介绍。"
 
 #. Tag: para
 #: Devel-Embedded.xml:19
 #, no-c-format
-msgid ""
-"Fedora 11 includes version 5.1 of <package>dfu-programmer</package>, a "
-"command-line programmer for Atmel (8051 &amp; AVR) chips with a USB "
-"bootloader supporting ISP. A command line option was added to support the "
-"AVR32 trampoline. All known Atmel USB AVR/8051/AVR32 devices are now "
-"supported."
-msgstr ""
-"Fedora 11 提供了5.1版本的<package>dfu-programmer</package>，一个针对带有USB引"
-"导器，支持ISPçš„Atmel (8051 &amp; AVR)èŠ¯ç‰‡çš„å‘½ä»¤è¡Œç¼–è¾‘å™¨ã€‚å‘½ä»¤è¡Œé€‰é¡¹å¢žåŠ å¯¹"
-"AVR32 trampoline的支持。支持所有已知的Atmel USB AVR/8051/AVR32设备。"
+msgid "Fedora 11 includes version 5.1 of <package>dfu-programmer</package>, a command-line programmer for Atmel (8051 &amp; AVR) chips with a USB bootloader supporting ISP. A command line option was added to support the AVR32 trampoline. All known Atmel USB AVR/8051/AVR32 devices are now supported."
+msgstr "Fedora 11 提供了5.1版本的<package>dfu-programmer</package>，一个针对带有USB引导器，支持ISPçš„Atmel (8051 &amp; AVR)èŠ¯ç‰‡çš„å‘½ä»¤è¡Œç¼–è¾‘å™¨ã€‚å‘½ä»¤è¡Œé€‰é¡¹å¢žåŠ å¯¹AVR32 trampoline的支持。支持所有已知的Atmel USB AVR/8051/AVR32设备。"
 
 #. Tag: title
 #: Devel-GCC.xml:6
@@ -2202,14 +1567,8 @@ msgstr "GCC 编译器集合"
 #. Tag: remark
 #: Devel-GCC.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Devel/Tools/GCC\">https://fedoraproject.org/wiki/Docs/"
-"Beats/Devel/Tools/GCC</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Devel/Tools/GCC\">https://fedoraproject.org/wiki/Docs/Beats/Devel/"
-"Tools/GCC</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Devel/Tools/GCC\">https://fedoraproject.org/wiki/Docs/Beats/Devel/Tools/GCC</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Devel/Tools/GCC\">https://fedoraproject.org/wiki/Docs/Beats/Devel/Tools/GCC</ulink>"
 
 #. Tag: para
 #: Devel-GCC.xml:8
@@ -2226,59 +1585,25 @@ msgstr "Haskell"
 #. Tag: remark
 #: Devel-Haskell.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Documentation_Development_Haskell_Beat\">https://fedoraproject.org/"
-"wiki/Documentation_Development_Haskell_Beat</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Documentation_Development_Haskell_Beat\">https://fedoraproject.org/wiki/"
-"Documentation_Development_Haskell_Beat</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Development_Haskell_Beat\">https://fedoraproject.org/wiki/Documentation_Development_Haskell_Beat</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Development_Haskell_Beat\">https://fedoraproject.org/wiki/Documentation_Development_Haskell_Beat</ulink>"
 
 #. Tag: para
 #: Devel-Haskell.xml:9
 #, no-c-format
-msgid ""
-"The <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/SIGs/Haskell"
-"\">Fedora Haskell SIG</ulink> has been busy updating <ulink type=\"http\" "
-"url=\"https://admin.fedoraproject.org/pkgdb/users/packages/haskell-sig"
-"\">Haskell packages</ulink> and our <ulink type=\"http\" url=\"https://"
-"fedoraproject.org/wiki/PackagingDrafts/Haskell\">Packaging Guidelines</"
-"ulink>. The new guidelines and <ulink type=\"http\" url=\"http://"
-"fedorahosted.org/cabal2spec\">cabal2spec</ulink> now make it very easy to "
-"package Haskell Cabal packages for Fedora."
-msgstr ""
-"已将 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/SIGs/Haskell"
-"\">Fedora Haskell SIG</ulink> 紧急更新至 <ulink type=\"http\" url=\"https://"
-"admin.fedoraproject.org/pkgdb/users/packages/haskell-sig\">Haskell packages</"
-"ulink> 和我们的 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"PackagingDrafts/Haskell\">Packaging Guidelines</ulink>。现在新指南和 <ulink "
-"type=\"http\" url=\"http://fedorahosted.org/cabal2spec\">cabal2spec</ulink> "
-"可轻松为 Fedora 打包 Haskell cabal 软件包。"
+msgid "The <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/SIGs/Haskell\">Fedora Haskell SIG</ulink> has been busy updating <ulink type=\"http\" url=\"https://admin.fedoraproject.org/pkgdb/users/packages/haskell-sig\">Haskell packages</ulink> and our <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/PackagingDrafts/Haskell\">Packaging Guidelines</ulink>. The new guidelines and <ulink type=\"http\" url=\"http://fedorahosted.org/cabal2spec\">cabal2spec</ulink> now make it very easy to package Haskell Cabal packages for Fedora."
+msgstr "已将 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/SIGs/Haskell\">Fedora Haskell SIG</ulink> 紧急更新至 <ulink type=\"http\" url=\"https://admin.fedoraproject.org/pkgdb/users/packages/haskell-sig\">Haskell packages</ulink> 和我们的 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/PackagingDrafts/Haskell\">Packaging Guidelines</ulink>。现在新指南和 <ulink type=\"http\" url=\"http://fedorahosted.org/cabal2spec\">cabal2spec</ulink> 可轻松为 Fedora 打包 Haskell cabal 软件包。"
 
 #. Tag: para
 #: Devel-Haskell.xml:20
 #, fuzzy, no-c-format
-msgid ""
-"For Fedora 11 the various packages have been updated to new versions "
-"including <package>ghc-6.10.1</package>, <package>darcs-2.2.1</package>, and "
-"<package>ghc-gtk2hs-0.10.0</package>. Newly added packages include "
-"<package>cabal-install</package>, <package>cpphs</package>, <package>ghc-"
-"HTTP</package>, <package>ghc-paths</package>, <package>ghc-zlib</package>. "
-"<package>cabal-install</package> makes it very easy to install source "
-"haskell packages straight from <filename>hackage.haskell.org</filename> into "
-"a user's own <filename>package.conf</filename>."
-msgstr ""
-"Fedora 11中大量的包都更新了版本，包括<package>ghc-6.10.1</package>，"
-"<package>darcs-2.2.0</package>和<package>ghc-gtk2hs-0.10.0</package>。新增包"
-"有：<package>cabal-install</package>，<package>cpphs</package>，<package>ghc-"
-"HTTP</package>，<package>ghc-paths</package>，<package>ghc-zlib</package>。"
+msgid "For Fedora 11 the various packages have been updated to new versions including <package>ghc-6.10.1</package>, <package>darcs-2.2.1</package>, and <package>ghc-gtk2hs-0.10.0</package>. Newly added packages include <package>cabal-install</package>, <package>cpphs</package>, <package>ghc-HTTP</package>, <package>ghc-paths</package>, <package>ghc-zlib</package>. <package>cabal-install</package> makes it very easy to install source haskell packages straight from <filename>hackage.haskell.org</filename> into a user's own <filename>package.conf</filename>."
+msgstr "Fedora 11中大量的包都更新了版本，包括<package>ghc-6.10.1</package>，<package>darcs-2.2.0</package>和<package>ghc-gtk2hs-0.10.0</package>。新增包有：<package>cabal-install</package>，<package>cpphs</package>，<package>ghc-HTTP</package>，<package>ghc-paths</package>，<package>ghc-zlib</package>。"
 
 #. Tag: para
 #: Devel-Haskell.xml:32
 #, no-c-format
-msgid ""
-"There is also a new #fedora-haskell IRC channel on Freenode for discussion."
+msgid "There is also a new #fedora-haskell IRC channel on Freenode for discussion."
 msgstr "同时在Freenodeä¸Šå¢žåŠ äº†æ–°çš„#fedora-haskell IRC 频道。"
 
 #. Tag: title
@@ -2290,13 +1615,8 @@ msgstr "Java"
 #. Tag: remark
 #: Devel-Java.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Java\">https://fedoraproject.org/wiki/Docs/Beats/Java</"
-"ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Java\">https://fedoraproject.org/wiki/Docs/Beats/Java</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Java\">https://fedoraproject.org/wiki/Docs/Beats/Java</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Java\">https://fedoraproject.org/wiki/Docs/Beats/Java</ulink>"
 
 #. Tag: title
 #: Devel-Java.xml:10
@@ -2307,73 +1627,26 @@ msgstr "netbeans"
 #. Tag: para
 #: Devel-Java.xml:11
 #, no-c-format
-msgid ""
-"<package>netbeans</package> has been updated to version 6.5. "
-"<package>netbeans</package> 6.5 is a significant update of "
-"<package>netbeans</package> 6.1 and includes the following changes: "
-"<itemizedlist> <listitem> <para> PHP support with code completion, Xdebug "
-"and web service features. </para> </listitem> <listitem> <para> JavaFX 1.0 "
-"supports animation, graphics and media codecs for rich content application "
-"development. </para> </listitem> <listitem> <para> New Support for Groovy "
-"and Grails. </para> </listitem> <listitem> <para> Improved JavaScript, AJAX "
-"and Ruby support. </para> </listitem> <listitem> <para> Automatic Compile "
-"and Deploy on Save for Java and Java EE applications. </para> </listitem> "
-"<listitem> <para> Improved database support: SQL history, SQL completion, "
-"and results viewing and editing improvements. </para> </listitem> <listitem> "
-"<para> Improved Java ME support for Data Binding, SVG and Custom Component "
-"creation. </para> </listitem> <listitem> <para> GUI Builder: Support for "
-"Nimbus and simple class names. </para> </listitem> <listitem> <para> JUnit: "
-"single test method support. </para> </listitem> <listitem> <para> Debugger: "
-"Redesign of Step into feature. </para> </listitem> </itemizedlist> For "
-"information about the main development features in NetBeans IDE, see:"
-msgstr ""
-"已将 <package>netbeans</package> 更新至版本 6.5。<package>netbeans</package> "
-"6.5 是 <package>netbeans</package> 6.1 的重要更新，并包括以下更改："
-"<itemizedlist> <listitem> <para>å¸¦ç¼–ç å®Œæˆã€Xdebug 和网页服务特性的 PHP 支"
-"持。</para> </listitem> <listitem> <para>用于内容程序开发的 JavaFX 1.0 支持动"
-"ç”»ã€å›¾å½¢å’Œä»‹è´¨ç¼–ç è¯‘ç å™¨ã€‚</para> </listitem> <listitem> <para>对 Groovy å’Œ "
-"Grails 的新支持。</para> </listitem> <listitem> <para>自动编译和安全部署 "
-"Java 和 Java EE 程序。</para> </listitem> <listitem> <para>改进的数据库支持："
-"SQL 历史记录、SQL 完成以及查看和编辑改进结果。</para> </listitem> <listitem> "
-"<para>用于数据绑定、SVG 和生成定制组件的改进 Java ME 支持。</para> </"
-"listitem> <listitem> <para> GUI Builder：支持 Nimbus 和简单分类名称。</para> "
-"</listitem> <listitem> <para> JUnit：单一测试方法支持。</para> </listitem> "
-"<listitem> <para> Debugger：在特性中重新设计步骤。</para> </listitem> </"
-"itemizedlist> 有关 NetBeans IDE 中主要开发特性的详情请查看："
+msgid "<package>netbeans</package> has been updated to version 6.5. <package>netbeans</package> 6.5 is a significant update of <package>netbeans</package> 6.1 and includes the following changes: <itemizedlist> <listitem> <para> PHP support with code completion, Xdebug and web service features. </para> </listitem> <listitem> <para> JavaFX 1.0 supports animation, graphics and media codecs for rich content application development. </para> </listitem> <listitem> <para> New Support for Groovy and Grails. </para> </listitem> <listitem> <para> Improved JavaScript, AJAX and Ruby support. </para> </listitem> <listitem> <para> Automatic Compile and Deploy on Save for Java and Java EE applications. </para> </listitem> <listitem> <para> Improved database support: SQL history, SQL completion, and results viewing and editing improvements. </para> </listitem> <listitem> <para> Improved Java ME support for Data Binding, SVG and Custom Component creation. </para> </listitem> <listitem> <para
 > GUI Builder: Support for Nimbus and simple class names. </para> </listitem> <listitem> <para> JUnit: single test method support. </para> </listitem> <listitem> <para> Debugger: Redesign of Step into feature. </para> </listitem> </itemizedlist> For information about the main development features in NetBeans IDE, see:"
+msgstr "已将 <package>netbeans</package> 更新至版本 6.5。<package>netbeans</package> 6.5 是 <package>netbeans</package> 6.1 的重要更新，并包括以下更改：<itemizedlist> <listitem> <para>å¸¦ç¼–ç å®Œæˆã€Xdebug 和网页服务特性的 PHP 支持。</para> </listitem> <listitem> <para>用于内容程序开发的 JavaFX 1.0 æ”¯æŒåŠ¨ç”»ã€å›¾å½¢å’Œä»‹è´¨ç¼–ç è¯‘ç å™¨ã€‚</para> </listitem> <listitem> <para>对 Groovy å’Œ Grails 的新支持。</para> </listitem> <listitem> <para>自动编译和安全部署 Java å’Œ Java EE 程序。</para> </listitem> <listitem> <para>改进的数据库支持：SQL 历史记录、SQL 完成以及查看和编辑改进结果。</para> </listitem> <listitem> <para>用于数据绑定、SVG 和生成定制组件的改进 Java ME 支持。</para> </listitem> <listitem> <para> GUI Builder：支持 Nimbus 和简单分类名称。</para> </listitem> <listitem> <para> JUnit：单一测试方法支持。</para> </listitem> <listite
 m> <para> Debugger：在特性中重新设计步骤。</para> </listitem> </itemizedlist> 有关 NetBeans IDE 中主要开发特性的详情请查看："
 
 #. Tag: para
 #: Devel-Java.xml:78
 #, no-c-format
-msgid ""
-"NetBeans IDE 6.5 Release Information <ulink type=\"http\" url=\"http://www."
-"netbeans.org/community/releases/65/index.html\">http://www.netbeans.org/"
-"community/releases/65/index.html</ulink>"
-msgstr ""
-"NetBeans IDE 6.5版发布信息 <ulink type=\"http\" url=\"http://www.netbeans."
-"org/community/releases/65/index.html\">http://www.netbeans.org/community/"
-"releases/65/index.html</ulink>。"
+msgid "NetBeans IDE 6.5 Release Information <ulink type=\"http\" url=\"http://www.netbeans.org/community/releases/65/index.html\">http://www.netbeans.org/community/releases/65/index.html</ulink>"
+msgstr "NetBeans IDE 6.5版发布信息 <ulink type=\"http\" url=\"http://www.netbeans.org/community/releases/65/index.html\">http://www.netbeans.org/community/releases/65/index.html</ulink>。"
 
 #. Tag: para
 #: Devel-Java.xml:84
 #, no-c-format
-msgid ""
-"New and Note Worthy NB65 <ulink type=\"http\" url=\"http://wiki.netbeans.org/"
-"NewAndNoteWorthyNB65\">http://wiki.netbeans.org/NewAndNoteWorthyNB65</ulink>"
-msgstr ""
-"New and Note Worthy NB65 <ulink type=\"http\" url=\"http://wiki.netbeans.org/"
-"NewAndNoteWorthyNB65\">http://wiki.netbeans.org/NewAndNoteWorthyNB65</ulink>"
+msgid "New and Note Worthy NB65 <ulink type=\"http\" url=\"http://wiki.netbeans.org/NewAndNoteWorthyNB65\">http://wiki.netbeans.org/NewAndNoteWorthyNB65</ulink>"
+msgstr "New and Note Worthy NB65 <ulink type=\"http\" url=\"http://wiki.netbeans.org/NewAndNoteWorthyNB65\">http://wiki.netbeans.org/NewAndNoteWorthyNB65</ulink>"
 
 #. Tag: para
 #: Devel-Java.xml:90
 #, no-c-format
-msgid ""
-"NetBeans IDE 6.5 Release Notes <ulink type=\"http\" url=\"http://www."
-"netbeans.org/community/releases/65/relnotes.html\">http://www.netbeans.org/"
-"community/releases/65/relnotes.html</ulink>"
-msgstr ""
-"NetBeans IDE 6.5发行注记<ulink type=\"http\" url=\"http://www.netbeans.org/"
-"community/releases/65/relnotes.html\">http://www.netbeans.org/community/"
-"releases/65/relnotes.html</ulink>"
+msgid "NetBeans IDE 6.5 Release Notes <ulink type=\"http\" url=\"http://www.netbeans.org/community/releases/65/relnotes.html\">http://www.netbeans.org/community/releases/65/relnotes.html</ulink>"
+msgstr "NetBeans IDE 6.5发行注记<ulink type=\"http\" url=\"http://www.netbeans.org/community/releases/65/relnotes.html\">http://www.netbeans.org/community/releases/65/relnotes.html</ulink>"
 
 #. Tag: title
 #: Development.xml:6
@@ -2384,13 +1657,8 @@ msgstr "开发"
 #. Tag: remark
 #: Development.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Devel\">https://fedoraproject.org/wiki/Docs/Beats/Devel</"
-"ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Devel\">https://fedoraproject.org/wiki/Docs/Beats/Devel</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Devel\">https://fedoraproject.org/wiki/Docs/Beats/Devel</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Devel\">https://fedoraproject.org/wiki/Docs/Beats/Devel</ulink>"
 
 #. Tag: para
 #: Development.xml:10
@@ -2407,36 +1675,18 @@ msgstr "运行时"
 #. Tag: remark
 #: Devel-Runtime.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Documentation_Development_Runtime_Beat\">https://fedoraproject.org/"
-"wiki/Documentation_Development_Runtime_Beat</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Documentation_Development_Runtime_Beat\">https://fedoraproject.org/wiki/"
-"Documentation_Development_Runtime_Beat</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Development_Runtime_Beat\">https://fedoraproject.org/wiki/Documentation_Development_Runtime_Beat</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Development_Runtime_Beat\">https://fedoraproject.org/wiki/Documentation_Development_Runtime_Beat</ulink>"
 
 #. Tag: para
 #: Devel-Runtime.xml:12
 #, no-c-format
 msgid ""
-"Fedora provides legacy system libraries for compatibility with older "
-"software. This software is part of the <code>Legacy Software Development</"
-"code> group, which is not installed by default. Users who require this "
-"functionality may select this group either during installation or after the "
-"installation process is complete. To install the package group on a Fedora "
-"system, use <guimenu>Applications > Add/Remove Software</guimenu> or enter "
-"the following command in a terminal window: <screen>\n"
+"Fedora provides legacy system libraries for compatibility with older software. This software is part of the <code>Legacy Software Development</code> group, which is not installed by default. Users who require this functionality may select this group either during installation or after the installation process is complete. To install the package group on a Fedora system, use <guimenu>Applications > Add/Remove Software</guimenu> or enter the following command in a terminal window: <screen>\n"
 "            su -c 'yum groupinstall \"Legacy Software Development\"'\n"
-"          </screen> Enter the password for the <code>root</code> account "
-"when prompted."
-msgstr ""
-"Fedora 提供以前的系统程序库以便与老软件兼容。这个软件是 "
-"<menuchoice><guimenuitem>「遗留软件开发（Legacy Software Development）」</"
-"guimenuitem></menuchoice>组群的一部分，默认没有安装。需要这个功能的用户可以在"
-"安装过程中或者安装完成后选择这个组群。要在 Fedora 系统中安装这个软件包组，请"
-"使用<guimenu>「应用程序」</guimenu><guimenuitem>ã€Œæ·»åŠ /åˆ é™¤è½¯ä»¶ã€</"
-"guimenuitem> 或者在终端窗口输入以下命令：<screen>\n"
+"          </screen> Enter the password for the <code>root</code> account when prompted."
+msgstr ""
+"Fedora 提供以前的系统程序库以便与老软件兼容。这个软件是 <menuchoice><guimenuitem>「遗留软件开发（Legacy Software Development）」</guimenuitem></menuchoice>组群的一部分，默认没有安装。需要这个功能的用户可以在安装过程中或者安装完成后选择这个组群。要在 Fedora 系统中安装这个软件包组，请使用<guimenu>「应用程序」</guimenu><guimenuitem>ã€Œæ·»åŠ /åˆ é™¤è½¯ä»¶ã€</guimenuitem> 或者在终端窗口输入以下命令：<screen>\n"
 "            su -c 'yum groupinstall \"Legacy Software Development\"'\n"
 "          </screen> 出现提示时请为 <code>root</code> å¸æˆ·è¾“å…¥å¯†ç ã€‚"
 
@@ -2449,11 +1699,8 @@ msgstr "bash"
 #. Tag: para
 #: Devel-Runtime.xml:31
 #, no-c-format
-msgid ""
-"Fedora 11 includes <package>bash</package> 4.0. This is a significant "
-"upgrade with new features."
-msgstr ""
-"Fedora 11提供了4.0版的<package>bash</package>ã€‚è¿™æ¬¡é‡è¦æ›´æ–°å¢žåŠ äº†è®¸å¤šæ–°ç‰¹æ€§ã€‚"
+msgid "Fedora 11 includes <package>bash</package> 4.0. This is a significant upgrade with new features."
+msgstr "Fedora 11提供了4.0版的<package>bash</package>ã€‚è¿™æ¬¡é‡è¦æ›´æ–°å¢žåŠ äº†è®¸å¤šæ–°ç‰¹æ€§ã€‚"
 
 #. Tag: term
 #: Devel-Runtime.xml:39
@@ -2464,12 +1711,8 @@ msgstr "<term>gcl</term>"
 #. Tag: para
 #: Devel-Runtime.xml:41
 #, no-c-format
-msgid ""
-"Fedora 11 includes <package>gcc 4.4</package>, and with it, <package>libgcc</"
-"package> 4.4. This may require recompiling your programs."
-msgstr ""
-"Fedora 11提供了<package>gcc 4.4</package>和<package>libgcc</package> 4.4。这"
-"可能需要重新编译您的程序。"
+msgid "Fedora 11 includes <package>gcc 4.4</package>, and with it, <package>libgcc</package> 4.4. This may require recompiling your programs."
+msgstr "Fedora 11提供了<package>gcc 4.4</package>和<package>libgcc</package> 4.4。这可能需要重新编译您的程序。"
 
 #. Tag: term
 #: Devel-Runtime.xml:50
@@ -2480,13 +1723,8 @@ msgstr "DBus ç­–ç•¥"
 #. Tag: para
 #: Devel-Runtime.xml:52
 #, fuzzy, no-c-format
-msgid ""
-"Previous releases of Fedora shipped with a security policy for the D-Bus "
-"system bus that was unintentionally permissive (see CVE-2008-4311). In "
-"Fedora 11, the policy has been changed to deny method calls by default."
-msgstr ""
-"之前版本的Fedora提供了DBus system busçš„å®‰å…¨ç­–ç•¥ï¼Œä½†æ˜¯æ˜¯æ— æ„çš„permissive形式"
-"的。在Fedora 11中，策略已变为默认拒绝method calls。"
+msgid "Previous releases of Fedora shipped with a security policy for the D-Bus system bus that was unintentionally permissive (see CVE-2008-4311). In Fedora 11, the policy has been changed to deny method calls by default."
+msgstr "之前版本的Fedora提供了DBus system busçš„å®‰å…¨ç­–ç•¥ï¼Œä½†æ˜¯æ˜¯æ— æ„çš„permissive形式的。在Fedora 11中，策略已变为默认拒绝method calls。"
 
 #. Tag: title
 #: Devel-Tools.xml:6
@@ -2497,14 +1735,8 @@ msgstr "工具"
 #. Tag: remark
 #: Devel-Tools.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Devel/Tools\">https://fedoraproject.org/wiki/Docs/Beats/"
-"Devel/Tools</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Devel/Tools\">https://fedoraproject.org/wiki/Docs/Beats/Devel/"
-"Tools</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Devel/Tools\">https://fedoraproject.org/wiki/Docs/Beats/Devel/Tools</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Devel/Tools\">https://fedoraproject.org/wiki/Docs/Beats/Devel/Tools</ulink>"
 
 #. Tag: para
 #: Devel-Tools.xml:10
@@ -2527,17 +1759,8 @@ msgstr "<term>ace</term>"
 #. Tag: para
 #: Devel-Tools.xml:20
 #, no-c-format
-msgid ""
-"The <package>ace</package> suite of appliance tools has been upgraded to "
-"version 0.0.6, including <package>ace</package>, <package>ace-apache</"
-"package>, <package>ace-banners</package>, <package>ace-basic-site</package>, "
-"<package>ace-mysql</package>, <package>ace-php</package>, <package>ace-"
-"postgres</package>, and <package> ace-ssh</package>."
-msgstr ""
-"<package>ace</package>应用工具组件更新至0.0.6，包括<package>ace</package>，"
-"<package>ace-apache</package>，<package>ace-banners</package>，<package>ace-"
-"basic-site</package>，<package>ace-mysql</package>，<package>ace-php</"
-"package>，<package>ace-postgres</package>和<package> ace-ssh</package>。"
+msgid "The <package>ace</package> suite of appliance tools has been upgraded to version 0.0.6, including <package>ace</package>, <package>ace-apache</package>, <package>ace-banners</package>, <package>ace-basic-site</package>, <package>ace-mysql</package>, <package>ace-php</package>, <package>ace-postgres</package>, and <package> ace-ssh</package>."
+msgstr "<package>ace</package>应用工具组件更新至0.0.6，包括<package>ace</package>，<package>ace-apache</package>，<package>ace-banners</package>，<package>ace-basic-site</package>，<package>ace-mysql</package>，<package>ace-php</package>，<package>ace-postgres</package>和<package> ace-ssh</package>。"
 
 #. Tag: title
 #: Devel-Tools.xml:35
@@ -2554,13 +1777,8 @@ msgstr "clisp"
 #. Tag: para
 #: Devel-Tools.xml:40
 #, no-c-format
-msgid ""
-"<package>clisp</package> (Common Lisp) has been updated to 2.47. There are a "
-"number of changes, please review the project's site (<ulink type=\"http\" "
-"url=\"http://clisp.cons.org\"></ulink>)."
-msgstr ""
-"<package>clisp</package> (Common Lisp)更新至2.47。有许多变化，请见该项目页面"
-"(<ulink type=\"http\" url=\"http://clisp.cons.org\"></ulink>)。"
+msgid "<package>clisp</package> (Common Lisp) has been updated to 2.47. There are a number of changes, please review the project's site (<ulink type=\"http\" url=\"http://clisp.cons.org\"></ulink>)."
+msgstr "<package>clisp</package> (Common Lisp)更新至2.47。有许多变化，请见该项目页面(<ulink type=\"http\" url=\"http://clisp.cons.org\"></ulink>)。"
 
 #. Tag: term
 #: Devel-Tools.xml:48
@@ -2571,31 +1789,20 @@ msgstr "<term>pl</term>"
 #. Tag: para
 #: Devel-Tools.xml:50
 #, fuzzy, no-c-format
-msgid ""
-"The GCC compiler suite has been updated to 4.4.0 including <package>gcc</"
-"package>, <package>gcc-c++</package>, <package>gcc-gfortran</package>, "
-"<package>gcc-gnat</package>, and <package>gcc-objc</package>."
-msgstr ""
-"已将 gcc 编译程序套件更新至 4.4.0，其中包括 <package>gcc</package>、"
-"<package>gcc-c++</package>、<package>gcc-gfortran</package>、<package>gcc-"
-"gnat</package>, 和 <package>gcc-objc</package>。"
+msgid "The GCC compiler suite has been updated to 4.4.0 including <package>gcc</package>, <package>gcc-c++</package>, <package>gcc-gfortran</package>, <package>gcc-gnat</package>, and <package>gcc-objc</package>."
+msgstr "已将 gcc 编译程序套件更新至 4.4.0，其中包括 <package>gcc</package>、<package>gcc-c++</package>、<package>gcc-gfortran</package>、<package>gcc-gnat</package>, 和 <package>gcc-objc</package>。"
 
 #. Tag: title
 #: Devel-Tools.xml:57
 #, no-c-format
 msgid "Syntax Changes"
-msgstr ""
+msgstr "语法变更"
 
 #. Tag: para
 #: Devel-Tools.xml:58
 #, fuzzy, no-c-format
-msgid ""
-"Some of the changes involve syntax changes that have the potential to break "
-"existing code. Please review the NEWS files at <ulink type=\"http\" url="
-"\"http://gcc.gnu.org\"></ulink> carefully before upgrading."
-msgstr ""
-"请在升级前仔细阅读NEWS文件<ulink type=\"http\" url=\"http://gcc.gnu.org\"></"
-"ulink>。"
+msgid "Some of the changes involve syntax changes that have the potential to break existing code. Please review the NEWS files at <ulink type=\"http\" url=\"http://gcc.gnu.org\"></ulink> carefully before upgrading."
+msgstr "请在升级前仔细阅读NEWS文件<ulink type=\"http\" url=\"http://gcc.gnu.org\"></ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:69
@@ -2606,13 +1813,8 @@ msgstr "<term>gcl</term>"
 #. Tag: para
 #: Devel-Tools.xml:71
 #, no-c-format
-msgid ""
-"GNU Common Lisp is updated to 2.68pre. This long awaited release fixes a "
-"great many bugs. Project site: <ulink type=\"http\" url=\"http://www.gnu.org/"
-"software/gcl\"></ulink>."
-msgstr ""
-"GNU Common Lisp更新至2.68pre。这次期待已久的更新修正了大量的bug。项目主页："
-"<ulink type=\"http\" url=\"http://www.gnu.org/software/gcl\"></ulink>。"
+msgid "GNU Common Lisp is updated to 2.68pre. This long awaited release fixes a great many bugs. Project site: <ulink type=\"http\" url=\"http://www.gnu.org/software/gcl\"></ulink>."
+msgstr "GNU Common Lisp更新至2.68pre。这次期待已久的更新修正了大量的bug。项目主页：<ulink type=\"http\" url=\"http://www.gnu.org/software/gcl\"></ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:78
@@ -2635,23 +1837,14 @@ msgstr "Fedora 11提供了0.7.0版的<package>gforth</package>。"
 #. Tag: para
 #: Devel-Tools.xml:89
 #, no-c-format
-msgid ""
-"There are a large number of changes to <package>gforth</package> in this "
-"release. A developer is strongly encouraged to view the project site before "
-"proceeding."
-msgstr ""
-"此发行版中对<package>gforth</package>做了大量修改。强烈建议开发者在继续前浏览"
-"该项目的页面。"
+msgid "There are a large number of changes to <package>gforth</package> in this release. A developer is strongly encouraged to view the project site before proceeding."
+msgstr "此发行版中对<package>gforth</package>做了大量修改。强烈建议开发者在继续前浏览该项目的页面。"
 
 #. Tag: para
 #: Devel-Tools.xml:96
 #, no-c-format
-msgid ""
-"Project site: <ulink type=\"http\" url=\"http://www.jwdt.com/~paysan/gforth."
-"html\">http://www.jwdt.com/~paysan/gforth.html</ulink>."
-msgstr ""
-"项目位置：<ulink type=\"http\" url=\"http://www.jwdt.com/~paysan/gforth.html"
-"\">http://www.jwdt.com/~paysan/gforth.html</ulink>。"
+msgid "Project site: <ulink type=\"http\" url=\"http://www.jwdt.com/~paysan/gforth.html\">http://www.jwdt.com/~paysan/gforth.html</ulink>."
+msgstr "项目位置：<ulink type=\"http\" url=\"http://www.jwdt.com/~paysan/gforth.html\">http://www.jwdt.com/~paysan/gforth.html</ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:104
@@ -2662,13 +1855,8 @@ msgstr "gprolog"
 #. Tag: para
 #: Devel-Tools.xml:106
 #, no-c-format
-msgid ""
-"GNU Prolog has been updated to version 1.3.1. The changes since 1.3.0 are "
-"largely of a bug fix nature. The programmer may wish to review the NEWS file "
-"at <ulink type=\"http\" url=\"http://www.gprolog.org/NEWS\"></ulink>."
-msgstr ""
-"GNU Prolog更新至1.3.1。1.3.0以来修正了大量的bug。程序员应当看看<ulink type="
-"\"http\" url=\"http://www.gprolog.org/NEWS\"></ulink>的NEWS文件。"
+msgid "GNU Prolog has been updated to version 1.3.1. The changes since 1.3.0 are largely of a bug fix nature. The programmer may wish to review the NEWS file at <ulink type=\"http\" url=\"http://www.gprolog.org/NEWS\"></ulink>."
+msgstr "GNU Prolog更新至1.3.1。1.3.0以来修正了大量的bug。程序员应当看看<ulink type=\"http\" url=\"http://www.gprolog.org/NEWS\"></ulink>的NEWS文件。"
 
 #. Tag: term
 #: Devel-Tools.xml:116
@@ -2679,16 +1867,8 @@ msgstr "iasl"
 #. Tag: para
 #: Devel-Tools.xml:118
 #, no-c-format
-msgid ""
-"The Intel Advanced Configuration and Power Interface compiler has been "
-"upgraded to version 20090123. This is the first update since 2006 and a "
-"number of functions have changed names. The developer should review <ulink "
-"type=\"http\" url=\"http://www.acpica.org/download/changes.txt\"></ulink> "
-"before proceeding."
-msgstr ""
-"Intel高级配置及电源界面编译器更新至20090123。这是2006以来的第一次更新，修改了"
-"大量的函数名。开发者继续之前应看看<ulink type=\"http\" url=\"http://www."
-"acpica.org/download/changes.txt\"></ulink>。"
+msgid "The Intel Advanced Configuration and Power Interface compiler has been upgraded to version 20090123. This is the first update since 2006 and a number of functions have changed names. The developer should review <ulink type=\"http\" url=\"http://www.acpica.org/download/changes.txt\"></ulink> before proceeding."
+msgstr "Intel高级配置及电源界面编译器更新至20090123。这是2006以来的第一次更新，修改了大量的函数名。开发者继续之前应看看<ulink type=\"http\" url=\"http://www.acpica.org/download/changes.txt\"></ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:131
@@ -2699,13 +1879,8 @@ msgstr "mingw32-gcc"
 #. Tag: para
 #: Devel-Tools.xml:133
 #, no-c-format
-msgid ""
-"Fedora 11 now includes the MinGW compiler. This is a major new feature "
-"allowing developers to build application for Microsoft Windows and Linux "
-"from the same source code."
-msgstr ""
-"Fedora 11提供了MinGWç¼–è¯‘å™¨ã€‚å®ƒçš„æ–°ç‰¹æ€§æ˜¯å…è®¸å¼€å‘è€…ä»¥ç›¸åŒçš„æºä»£ç ä¸ºMicrosoft "
-"Windows和Linux构建程序。"
+msgid "Fedora 11 now includes the MinGW compiler. This is a major new feature allowing developers to build application for Microsoft Windows and Linux from the same source code."
+msgstr "Fedora 11提供了MinGWç¼–è¯‘å™¨ã€‚å®ƒçš„æ–°ç‰¹æ€§æ˜¯å…è®¸å¼€å‘è€…ä»¥ç›¸åŒçš„æºä»£ç ä¸ºMicrosoft Windowså’ŒLinux构建程序。"
 
 #. Tag: term
 #: Devel-Tools.xml:142
@@ -2716,16 +1891,8 @@ msgstr "nasm"
 #. Tag: para
 #: Devel-Tools.xml:144
 #, no-c-format
-msgid ""
-"The <package>nasm</package> package has been upgraded from 2.03.01 to "
-"2.05.01. This change involves a large number of bug fixes as well as the "
-"addition of a number of new directives. Refer to the project's change list "
-"at <ulink type=\"http\" url=\"http://www.nasm.us/doc/nasmdocc.html\"></"
-"ulink> for complete details."
-msgstr ""
-"<package>nasm</package>包从2.03.01更新至2.05.01。这次更新不仅修正了大量bug，"
-"ä¹Ÿå¢žåŠ äº†è®¸å¤šæ–°ä¸œè¥¿ã€‚å¯å‚è€ƒè¯¥é¡¹ç›®çš„å˜æ›´åˆ—è¡¨<ulink type=\"http\" url=\"http://"
-"www.nasm.us/doc/nasmdocc.html\"></ulink>来了解完整信息。"
+msgid "The <package>nasm</package> package has been upgraded from 2.03.01 to 2.05.01. This change involves a large number of bug fixes as well as the addition of a number of new directives. Refer to the project's change list at <ulink type=\"http\" url=\"http://www.nasm.us/doc/nasmdocc.html\"></ulink> for complete details."
+msgstr "<package>nasm</package>包从2.03.01更新至2.05.01。这次更新不仅修正了大量bugï¼Œä¹Ÿå¢žåŠ äº†è®¸å¤šæ–°ä¸œè¥¿ã€‚å¯å‚è€ƒè¯¥é¡¹ç›®çš„å˜æ›´åˆ—è¡¨<ulink type=\"http\" url=\"http://www.nasm.us/doc/nasmdocc.html\"></ulink>来了解完整信息。"
 
 #. Tag: term
 #: Devel-Tools.xml:156
@@ -2736,26 +1903,8 @@ msgstr "ocaml"
 #. Tag: para
 #: Devel-Tools.xml:158
 #, no-c-format
-msgid ""
-"Some of the highlights in release 3.11 are: <itemizedlist> "
-"<listitem><para>The Dynlink library is now available in native code on some "
-"platforms.</para></listitem> <listitem><para><command>ocamldebug</command> "
-"is now supported under Windows (MSVC and Mingw ports) but without the replay "
-"feature. (Contributed by Dmitry Bely and Sylvain Le Gall at OCamlCore with "
-"support from Lexifi.)</para></listitem> <listitem><para>New port: MacOS X, "
-"AMD/Intel, 64 bits. </para></listitem> </itemizedlist> For more information, "
-"please consult the comprehensive list of changes at <ulink type=\"http\" url="
-"\"http://caml.inria.fr/pub/distrib/ocaml-3.11/notes/Changes\">http://caml."
-"inria.fr/pub/distrib/ocaml-3.11/notes/Changes</ulink>."
-msgstr ""
-"发行本 3.11 的亮点有：<itemizedlist><listitem><para>在有些平台的原生程序可使"
-"用 Dynlink 程序库。</para></listitem> <listitem><para>目前在 Windows（MSVC "
-"和 Mingw 端口）中支持 <command>ocamldebug</command>，但没有重放特性。（由 "
-"Dmitry Bely 和 Sylvain Le Gall 在 OCamCore 对 Lexifi 的支持中提供。）</"
-"para></listitem> <listitem><para>新端口：MacOS X、AMD/Intel、64 位。</para></"
-"listitem> </itemizedlist> 有关详情请查看更改的完整列表，网址为：<ulink type="
-"\"http\" url=\"http://caml.inria.fr/pub/distrib/ocaml-3.11/notes/Changes"
-"\">http://caml.inria.fr/pub/distrib/ocaml-3.11/notes/Changes</ulink>。"
+msgid "Some of the highlights in release 3.11 are: <itemizedlist> <listitem><para>The Dynlink library is now available in native code on some platforms.</para></listitem> <listitem><para><command>ocamldebug</command> is now supported under Windows (MSVC and Mingw ports) but without the replay feature. (Contributed by Dmitry Bely and Sylvain Le Gall at OCamlCore with support from Lexifi.)</para></listitem> <listitem><para>New port: MacOS X, AMD/Intel, 64 bits. </para></listitem> </itemizedlist> For more information, please consult the comprehensive list of changes at <ulink type=\"http\" url=\"http://caml.inria.fr/pub/distrib/ocaml-3.11/notes/Changes\">http://caml.inria.fr/pub/distrib/ocaml-3.11/notes/Changes</ulink>."
+msgstr "发行本 3.11 的亮点有：<itemizedlist><listitem><para>在有些平台的原生程序可使用 Dynlink 程序库。</para></listitem> <listitem><para>目前在 Windows（MSVC 和 Mingw 端口）中支持 <command>ocamldebug</command>，但没有重放特性。（由 Dmitry Bely 和 Sylvain Le Gall 在 OCamCore 对 Lexifi 的支持中提供。）</para></listitem> <listitem><para>新端口：MacOS X、AMD/Intel、64 位。</para></listitem> </itemizedlist> 有关详情请查看更改的完整列表，网址为：<ulink type=\"http\" url=\"http://caml.inria.fr/pub/distrib/ocaml-3.11/notes/Changes\">http://caml.inria.fr/pub/distrib/ocaml-3.11/notes/Changes</ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:179
@@ -2766,18 +1915,8 @@ msgstr "<term>pl</term>"
 #. Tag: para
 #: Devel-Tools.xml:181
 #, no-c-format
-msgid ""
-"The Edinburgh compatible Prolog compiler has been updated to 5.7.6. In "
-"addition to a number of bugfixes, enhancements include faster labeling for "
-"complex optimization expressions, improvements in handling additional "
-"dialects, smarter loading of libraries and extensions to YAP compatibility. "
-"Project site: <ulink type=\"http\" url=\"http://www.swi-prolog.org\"></"
-"ulink>."
-msgstr ""
-"已将与 Edinburgh 兼容的 Prolog 编译程序更新至 5.7.6。除修正了很多 bug 之外，"
-"å…¶å®ƒè¿˜åŒ…æ‹¬å¯¹å¤æ‚ä¼˜åŒ–è¡¨è¾¾å¼å¿«é€Ÿæ ‡è®°ã€å¤„ç†é¢å¤–ä¸“ä¸šç”¨è¯­ã€ä¸º YAP 兼容性智能载入程"
-"åºåº“å¯æ‰©å±•çš„åŠ å¼ºã€‚é¡¹ç›®ç½‘ç«™ï¼š<ulink type=\"http\" url=\"http://www.swi-prolog."
-"org\"></ulink>。"
+msgid "The Edinburgh compatible Prolog compiler has been updated to 5.7.6. In addition to a number of bugfixes, enhancements include faster labeling for complex optimization expressions, improvements in handling additional dialects, smarter loading of libraries and extensions to YAP compatibility. Project site: <ulink type=\"http\" url=\"http://www.swi-prolog.org\"></ulink>."
+msgstr "已将与 Edinburgh 兼容的 Prolog 编译程序更新至 5.7.6。除修正了很多 bug ä¹‹å¤–ï¼Œå…¶å®ƒè¿˜åŒ…æ‹¬å¯¹å¤æ‚ä¼˜åŒ–è¡¨è¾¾å¼å¿«é€Ÿæ ‡è®°ã€å¤„ç†é¢å¤–ä¸“ä¸šç”¨è¯­ã€ä¸º YAP å…¼å®¹æ€§æ™ºèƒ½è½½å…¥ç¨‹åºåº“å¯æ‰©å±•çš„åŠ å¼ºã€‚é¡¹ç›®ç½‘ç«™ï¼š<ulink type=\"http\" url=\"http://www.swi-prolog.org\"></ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:194
@@ -2788,15 +1927,8 @@ msgstr "sbcl"
 #. Tag: para
 #: Devel-Tools.xml:196
 #, no-c-format
-msgid ""
-"Version 1.0.25 of Steel Bank Common Lisp includes a large number of "
-"enhancements and fixes over the previous 1.0.21 version. Refer to <ulink "
-"type=\"http\" url=\"http://sbcl.sourceforge.net/news.html\"></ulink> for a "
-"complete list."
-msgstr ""
-"SBCL（Steel Bank Common Lisp）版本 1.0.25 包括对前一个版本 1.0.21 çš„å¤§é‡åŠ å¼º"
-"和修复。完整列表请参考 <ulink type=\"http\" url=\"http://sbcl.sourceforge."
-"net/news.html\"></ulink>。"
+msgid "Version 1.0.25 of Steel Bank Common Lisp includes a large number of enhancements and fixes over the previous 1.0.21 version. Refer to <ulink type=\"http\" url=\"http://sbcl.sourceforge.net/news.html\"></ulink> for a complete list."
+msgstr "SBCL（Steel Bank Common Lisp）版本 1.0.25 包括对前一个版本 1.0.21 çš„å¤§é‡åŠ å¼ºå’Œä¿®å¤ã€‚å®Œæ•´åˆ—è¡¨è¯·å‚è€ƒ <ulink type=\"http\" url=\"http://sbcl.sourceforge.net/news.html\"></ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:207
@@ -2807,8 +1939,7 @@ msgstr "ucblogo"
 #. Tag: para
 #: Devel-Tools.xml:209
 #, no-c-format
-msgid ""
-"Version 6.0 of <package>ucblogo</package> fixes a problem with the PowerPC."
+msgid "Version 6.0 of <package>ucblogo</package> fixes a problem with the PowerPC."
 msgstr "<package>ucblogo</package> 版本 6.0 修复了 PowerPC 的一个问题。"
 
 #. Tag: term
@@ -2832,30 +1963,19 @@ msgstr "为 64 位 Mach-0 æ·»åŠ  PCI 支持。"
 #. Tag: para
 #: Devel-Tools.xml:226
 #, no-c-format
-msgid ""
-"Add <option>--prefix</option> and <option>--suffix</option> options for "
-"naming globals."
-msgstr ""
-"ä¸ºå…¨å±€å‘½åæ·»åŠ äº† <option>--prefix</option> å’Œ <option>--suffix</option> 选"
-"项。"
+msgid "Add <option>--prefix</option> and <option>--suffix</option> options for naming globals."
+msgstr "ä¸ºå…¨å±€å‘½åæ·»åŠ äº† <option>--prefix</option> å’Œ <option>--suffix</option> 选项。"
 
 #. Tag: para
 #: Devel-Tools.xml:230
 #, no-c-format
-msgid ""
-"Make <command>rel foo wrt ..gotpc</command> generate "
-"<computeroutput>GOTPCREL</computeroutput> in elf64 (alias for <command>rel "
-"foo wrt ..gotpcrel</command>)."
-msgstr ""
-"使 <command>rel foo wrt ..gotpc</command> 命令在 elf64 中生成 "
-"<computeroutput>GOTPCREL</computeroutput>（<command>rel foo wrt ..gotpcrel</"
-"command> 的别名）。"
+msgid "Make <command>rel foo wrt ..gotpc</command> generate <computeroutput>GOTPCREL</computeroutput> in elf64 (alias for <command>rel foo wrt ..gotpcrel</command>)."
+msgstr "使 <command>rel foo wrt ..gotpc</command> 命令在 elf64 中生成 <computeroutput>GOTPCREL</computeroutput>（<command>rel foo wrt ..gotpcrel</command> 的别名）。"
 
 #. Tag: para
 #: Devel-Tools.xml:236
 #, no-c-format
-msgid ""
-"Add support for newly specified AVX/AES instructions not in original spec."
+msgid "Add support for newly specified AVX/AES instructions not in original spec."
 msgstr "æ·»åŠ å¯¹æ–°æŒ‡å®šçš„ AVX/AES 指令的支持。"
 
 #. Tag: para
@@ -2885,8 +2005,7 @@ msgstr "ä¿®å¤å¤„ç†æ— æ®µè½æ ‡å¿—çš„ GAS 语法。"
 #. Tag: para
 #: Devel-Tools.xml:251
 #, no-c-format
-msgid ""
-"Name the absolute symbol in <filename>coff/win32/win64</filename> output."
+msgid "Name the absolute symbol in <filename>coff/win32/win64</filename> output."
 msgstr "在 <filename>coff/win32/win64</filename> 输出中命名绝对符号。"
 
 #. Tag: para
@@ -2922,64 +2041,50 @@ msgstr "<term>gcl</term>"
 #. Tag: para
 #: Devel-Tools.xml:279
 #, no-c-format
-msgid ""
-"The version of <package>gdb</package> included in Fedora 11 contains patches "
-"and modifications not in the upstream GDB. Notable changes from upstream "
-"include:"
-msgstr ""
+msgid "The version of <package>gdb</package> included in Fedora 11 contains patches and modifications not in the upstream GDB. Notable changes from upstream include:"
+msgstr "Fedora 11的<package>gdb</package>包含了上游GDB没有的补丁和修正。上游版本的显著变化包括："
 
 #. Tag: para
 #: Devel-Tools.xml:284
 #, no-c-format
 msgid "GDB can debug programs compiled with <command>-fpie</command>."
-msgstr ""
+msgstr "GDB可调试使用<command>-fpie</command>编译的程序。"
 
 #. Tag: para
 #: Devel-Tools.xml:287
 #, no-c-format
-msgid ""
-"GDB can be scripted using Python. This is used to support the new type-"
-"specific pretty-printing feature."
-msgstr ""
+msgid "GDB can be scripted using Python. This is used to support the new type-specific pretty-printing feature."
+msgstr "GDB可用Python脚本化。这用来支持新制定类型的完美打印特性。"
 
 #. Tag: para
 #: Devel-Tools.xml:291
 #, no-c-format
-msgid ""
-"GDB lazily reads debug info, resulting in faster startup when the debugee "
-"uses many shared libraries."
-msgstr ""
+msgid "GDB lazily reads debug info, resulting in faster startup when the debugee uses many shared libraries."
+msgstr "GDB不读取调试信息，这使得使用大量共享库调试时能够快速启动。"
 
 #. Tag: para
 #: Devel-Tools.xml:295
 #, no-c-format
-msgid ""
-"A new \"catch syscall\" command has been added. This will cause GDB to stop "
-"your program when a syscall is entered or exited."
-msgstr ""
+msgid "A new \"catch syscall\" command has been added. This will cause GDB to stop your program when a syscall is entered or exited."
+msgstr "æ·»åŠ äº†æ–°å‘½ä»¤\"catch syscall\"。这会让GDB在有syscall输入或退出时停止您的程序。"
 
 #. Tag: para
 #: Devel-Tools.xml:299
-#, no-c-format
-msgid ""
-"C++ debugging support has been improved. The expression parser handles more "
-"cases correctly, and GDB can now properly handle exceptions thrown during an "
-"inferior function call."
-msgstr ""
+#, fuzzy, no-c-format
+msgid "C++ debugging support has been improved. The expression parser handles more cases correctly, and GDB can now properly handle exceptions thrown during an inferior function call."
+msgstr "增强了C++调试支持。"
 
 #. Tag: title
 #: Devel-Tools.xml:308
 #, no-c-format
 msgid "The Python API is unstable"
-msgstr ""
+msgstr "Python API还不稳定"
 
 #. Tag: para
 #: Devel-Tools.xml:309
 #, no-c-format
-msgid ""
-"The Python API to GDB is still under development. We cannot currently "
-"guarantee that future revisions to the API will remain compatible"
-msgstr ""
+msgid "The Python API to GDB is still under development. We cannot currently guarantee that future revisions to the API will remain compatible"
+msgstr "GDBçš„Python APIä»åœ¨å¼€å‘ä¸­ã€‚ç›®å‰æˆ‘ä»¬æ— æ³•ä¿è¯å°†æ¥å¯¹API的修订能够保留兼容性。"
 
 #. Tag: term
 #: Devel-Tools.xml:321
@@ -2990,11 +2095,8 @@ msgstr "memtest86+"
 #. Tag: para
 #: Devel-Tools.xml:323
 #, no-c-format
-msgid ""
-"Stand-alone memory tester for x86 and x86-64 computers updated to 2.10. "
-"Enhancements in v2.10 :"
-msgstr ""
-"x86 和 x86-64 计算机的独立内存测试程序更新至 2.10。版本 2.10 中的改进："
+msgid "Stand-alone memory tester for x86 and x86-64 computers updated to 2.10. Enhancements in v2.10 :"
+msgstr "x86 和 x86-64 计算机的独立内存测试程序更新至 2.10。版本 2.10 中的改进："
 
 #. Tag: para
 #: Devel-Tools.xml:327
@@ -3089,12 +2191,8 @@ msgstr "nemiver"
 #. Tag: para
 #: Devel-Tools.xml:364
 #, no-c-format
-msgid ""
-"In addition to some bug fixes, 0.6.4 of <package>nemiver</package> now "
-"allows setting breakpoints even when it cannot get the current source editor."
-msgstr ""
-"除一些 bug 修复外，<package>nemiver</package> çš„ 0.6.4 çŽ°åœ¨å…è®¸åœ¨å³ä½¿æ— æ³•èŽ·å¾—"
-"当前源编辑程序的情况下设定断点。"
+msgid "In addition to some bug fixes, 0.6.4 of <package>nemiver</package> now allows setting breakpoints even when it cannot get the current source editor."
+msgstr "除一些 bug 修复外，<package>nemiver</package> çš„ 0.6.4 çŽ°åœ¨å…è®¸åœ¨å³ä½¿æ— æ³•èŽ·å¾—å½“å‰æºç¼–è¾‘ç¨‹åºçš„æƒ…å†µä¸‹è®¾å®šæ–­ç‚¹ã€‚"
 
 #. Tag: term
 #: Devel-Tools.xml:373
@@ -3105,14 +2203,8 @@ msgstr "pylint"
 #. Tag: para
 #: Devel-Tools.xml:375
 #, no-c-format
-msgid ""
-"The <package>pylint</package> 0.16.0 package includes a number of bug fixes "
-"and minor enhancements. Refer to the project site at <ulink type=\"http\" "
-"url=\"http://www.logilab.org/projects/pylint\"></ulink> for complete details."
-msgstr ""
-"<package>pylint</package> 0.16.0 软件包包含很多 bug 修复和微小改进。详情请参"
-"考项目网站：<ulink type=\"http\" url=\"http://www.logilab.org/projects/pylint"
-"\"></ulink>。"
+msgid "The <package>pylint</package> 0.16.0 package includes a number of bug fixes and minor enhancements. Refer to the project site at <ulink type=\"http\" url=\"http://www.logilab.org/projects/pylint\"></ulink> for complete details."
+msgstr "<package>pylint</package> 0.16.0 软件包包含很多 bug 修复和微小改进。详情请参考项目网站：<ulink type=\"http\" url=\"http://www.logilab.org/projects/pylint\"></ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:387
@@ -3123,14 +2215,8 @@ msgstr "valgrind"
 #. Tag: para
 #: Devel-Tools.xml:389
 #, no-c-format
-msgid ""
-"3.4.0 is a feature release with many significant improvements and the usual "
-"collection of bug fixes. This release supports X86/Linux, AMD64/Linux, PPC32/"
-"Linux, and PPC64/Linux. Support for recent distributions (using GCC 4.4, "
-"glibc 2.8 and 2.9) has been added. Refer to the complete valgrind release "
-"notes at <ulink type=\"http\" url=\"http://www.valgrind.org/docs/manual/dist."
-"news.html\"></ulink>."
-msgstr ""
+msgid "3.4.0 is a feature release with many significant improvements and the usual collection of bug fixes. This release supports X86/Linux, AMD64/Linux, PPC32/Linux, and PPC64/Linux. Support for recent distributions (using GCC 4.4, glibc 2.8 and 2.9) has been added. Refer to the complete valgrind release notes at <ulink type=\"http\" url=\"http://www.valgrind.org/docs/manual/dist.news.html\"></ulink>."
+msgstr "3.4.0版本集合了众多重要改善和bug修正。此版本支持 X86/Linux，AMD64/Linux，PPC32/Linuxå’ŒPPC64/Linuxã€‚å¢žåŠ äº†å¯¹æœ€æ–°å‘è¡Œç‰ˆ(使用GCC 4.4，glibc 2.8å’Œ2.9)的支持。完整的valgrind发行注记请见<ulink type=\"http\" url=\"http://www.valgrind.org/docs/manual/dist.news.html\"></ulink>。"
 
 #. Tag: title
 #: Devel-Tools.xml:403
@@ -3147,18 +2233,8 @@ msgstr "colordiff"
 #. Tag: para
 #: Devel-Tools.xml:409
 #, fuzzy, no-c-format
-msgid ""
-"The <package>colordiff</package> package has been updated to 1.08a. Changes "
-"(from the project website) include: Support for numeric colors added, for "
-"256-color terminals (thanks to Gautam Iyer). Diff-types can now be specified "
-"explicitly, for use when diff-type detection doesn't work or isn't possible. "
-"Return diff's exit code, patch from Tim Connors. Allow extraneous diff text "
-"to be colored separately."
-msgstr ""
-"已将 <package>colordiff</package> 软件包更新至 1.08a。改动包括（项目网站中的"
-"内容）：支持为 256 è‰²ç»ˆç«¯æ·»åŠ æ•°å­—è‰²å½©ï¼ˆæ„Ÿè°¢ Gautam Iyer）。现在可明确指定 "
-"Diff-type，当 diff-type 探测不工作或不可能时使用。返回 diff çš„é€€å‡ºç¼–ç ï¼ŒTim "
-"Connors ç¼–å†™çš„è¡¥ä¸ã€‚å…è®¸åˆ†åˆ«ä¸ºé™„åŠ  diff æ–‡æœ¬æ·»åŠ é¢œè‰²ã€‚"
+msgid "The <package>colordiff</package> package has been updated to 1.08a. Changes (from the project website) include: Support for numeric colors added, for 256-color terminals (thanks to Gautam Iyer). Diff-types can now be specified explicitly, for use when diff-type detection doesn't work or isn't possible. Return diff's exit code, patch from Tim Connors. Allow extraneous diff text to be colored separately."
+msgstr "已将 <package>colordiff</package> 软件包更新至 1.08a。改动包括（项目网站中的内容）：支持为 256 è‰²ç»ˆç«¯æ·»åŠ æ•°å­—è‰²å½©ï¼ˆæ„Ÿè°¢ Gautam Iyer）。现在可明确指定 Diff-type，当 diff-type 探测不工作或不可能时使用。返回 diff çš„é€€å‡ºç¼–ç ï¼ŒTim Connors ç¼–å†™çš„è¡¥ä¸ã€‚å…è®¸åˆ†åˆ«ä¸ºé™„åŠ  diff æ–‡æœ¬æ·»åŠ é¢œè‰²ã€‚"
 
 #. Tag: term
 #: Devel-Tools.xml:423
@@ -3169,17 +2245,8 @@ msgstr "doxygen"
 #. Tag: para
 #: Devel-Tools.xml:425
 #, no-c-format
-msgid ""
-"The new <package>doxygen</package> 1.5.8 includes a completely rewritten "
-"<command>doxywizard</command>, enhanced extension mapping, support for "
-"Vietnamese and better support for Turkish. In addition there are numerous "
-"bug fixes as outlined in <ulink type=\"http\" url=\"http://www.stack.nl/"
-"~dimitri/doxygen/changelog.html\"></ulink>."
-msgstr ""
-"新 <package>doxygen</package> 1.5.8 包括完全重写的 <command>doxywizard</"
-"command>ã€åŠ å¼ºçš„æ‰©å±•æ˜ å°„ã€å¯¹è¶Šå—è¯­çš„æ”¯æŒä»¥åŠå¯¹åœŸè€³å…¶è¯­çš„æ›´å¥½æ”¯æŒã€‚é™¤æ­¤ä¹‹å¤–è¿˜"
-"有很多 bug 修复，详情位于：<ulink type=\"http\" url=\"http://www.stack.nl/"
-"~dimitri/doxygen/changelog.html\"></ulink>。"
+msgid "The new <package>doxygen</package> 1.5.8 includes a completely rewritten <command>doxywizard</command>, enhanced extension mapping, support for Vietnamese and better support for Turkish. In addition there are numerous bug fixes as outlined in <ulink type=\"http\" url=\"http://www.stack.nl/~dimitri/doxygen/changelog.html\"></ulink>."
+msgstr "æ–° <package>doxygen</package> 1.5.8 包括完全重写的 <command>doxywizard</command>ã€åŠ å¼ºçš„æ‰©å±•æ˜ å°„ã€å¯¹è¶Šå—è¯­çš„æ”¯æŒä»¥åŠå¯¹åœŸè€³å…¶è¯­çš„æ›´å¥½æ”¯æŒã€‚é™¤æ­¤ä¹‹å¤–è¿˜æœ‰å¾ˆå¤š bug 修复，详情位于：<ulink type=\"http\" url=\"http://www.stack.nl/~dimitri/doxygen/changelog.html\"></ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:437
@@ -3190,12 +2257,8 @@ msgstr "highlight"
 #. Tag: para
 #: Devel-Tools.xml:439
 #, no-c-format
-msgid ""
-"Version 2.7 of <package>highlight</package> includes (from <ulink type=\"http"
-"\" url=\"http://www.andre-simon.de/\"></ulink>):"
-msgstr ""
-"<package>highlight</package> 版本 2.7 包括（在 <ulink type=\"http\" url="
-"\"http://www.andre-simon.de/\"></ulink>）："
+msgid "Version 2.7 of <package>highlight</package> includes (from <ulink type=\"http\" url=\"http://www.andre-simon.de/\"></ulink>):"
+msgstr "<package>highlight</package> 版本 2.7 包括（在 <ulink type=\"http\" url=\"http://www.andre-simon.de/\"></ulink>）："
 
 #. Tag: para
 #: Devel-Tools.xml:445
@@ -3224,15 +2287,8 @@ msgstr "texinfo"
 #. Tag: para
 #: Devel-Tools.xml:466
 #, no-c-format
-msgid ""
-"Version 4.13 of <package>texinfo</package> includes a reference card, better "
-"support for HTML, and support for multibyte character sets. For full "
-"details, see the project site: <ulink type=\"http\" url=\"http://www.gnu.org/"
-"software/texinfo/\"></ulink>."
-msgstr ""
-"<package>texinfo</package> 的版本 4.13 包括一个参考卡，对 HTML 有更好的支持，"
-"并支持多字节字符设置。有关详情请查看项目网站：<ulink type=\"http\" url="
-"\"http://www.gnu.org/software/texinfo/\"></ulink>。"
+msgid "Version 4.13 of <package>texinfo</package> includes a reference card, better support for HTML, and support for multibyte character sets. For full details, see the project site: <ulink type=\"http\" url=\"http://www.gnu.org/software/texinfo/\"></ulink>."
+msgstr "<package>texinfo</package> 的版本 4.13 包括一个参考卡，对 HTML 有更好的支持，并支持多字节字符设置。有关详情请查看项目网站：<ulink type=\"http\" url=\"http://www.gnu.org/software/texinfo/\"></ulink>。"
 
 #. Tag: title
 #: Devel-Tools.xml:480
@@ -3249,15 +2305,8 @@ msgstr "emacs"
 #. Tag: para
 #: Devel-Tools.xml:487
 #, no-c-format
-msgid ""
-"Release 22.3 of <package>emacs</package> is primarily concerned with "
-"cleaning out old/obsolete features. Refer to the NEWS file (<ulink type="
-"\"http\" url=\"http://www.gnu.org/software/emacs/NEWS.22.3\"></ulink>) for "
-"full details."
-msgstr ""
-"<package>emacs</package> 的发行本 22.3 主要考虑清除旧的/过时的特性。完整内容"
-"请参考 NEWS 文件，网址：<ulink type=\"http\" url=\"http://www.gnu.org/"
-"software/emacs/NEWS.22.3\"></ulink>"
+msgid "Release 22.3 of <package>emacs</package> is primarily concerned with cleaning out old/obsolete features. Refer to the NEWS file (<ulink type=\"http\" url=\"http://www.gnu.org/software/emacs/NEWS.22.3\"></ulink>) for full details."
+msgstr "<package>emacs</package> 的发行本 22.3 主要考虑清除旧的/过时的特性。完整内容请参考 NEWS 文件，网址：<ulink type=\"http\" url=\"http://www.gnu.org/software/emacs/NEWS.22.3\"></ulink>"
 
 #. Tag: term
 #: Devel-Tools.xml:498
@@ -3268,14 +2317,8 @@ msgstr "eric"
 #. Tag: para
 #: Devel-Tools.xml:500
 #, no-c-format
-msgid ""
-"Fedora 11 includes version 4.3.0 of the <package>eric</package> Python IDE. "
-"Refer to <ulink type=\"http\" url=\"http://eric-ide.python-projects.org/eric-"
-"news.html\"></ulink> for full details."
-msgstr ""
-"Fedora 11 中包括 <package>eric</package> Python IDE 版本 4.3.0。详情请参考 "
-"<ulink type=\"http\" url=\"http://eric-ide.python-projects.org/eric-news.html"
-"\"></ulink>。"
+msgid "Fedora 11 includes version 4.3.0 of the <package>eric</package> Python IDE. Refer to <ulink type=\"http\" url=\"http://eric-ide.python-projects.org/eric-news.html\"></ulink> for full details."
+msgstr "Fedora 11 中包括 <package>eric</package> Python IDE 版本 4.3.0。详情请参考 <ulink type=\"http\" url=\"http://eric-ide.python-projects.org/eric-news.html\"></ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:510
@@ -3286,15 +2329,8 @@ msgstr "ipython"
 #. Tag: para
 #: Devel-Tools.xml:512
 #, no-c-format
-msgid ""
-"The <package>ipython</package> 0.9.1 version is included, an update from "
-"0.8.4. This is a major release. Refer to <ulink type=\"http\" url=\"http://"
-"ipython.scipy.org/announcements/ann-ipython-0.9.txt\"></ulink> for the full "
-"story."
-msgstr ""
-"包括 <package>ipython</package> 0.9.1 版本，从 0.8.4 更新而来。这是一个主要发"
-"行本。详情请参考 <ulink type=\"http\" url=\"http://ipython.scipy.org/"
-"announcements/ann-ipython-0.9.txt\"></ulink>。"
+msgid "The <package>ipython</package> 0.9.1 version is included, an update from 0.8.4. This is a major release. Refer to <ulink type=\"http\" url=\"http://ipython.scipy.org/announcements/ann-ipython-0.9.txt\"></ulink> for the full story."
+msgstr "包括 <package>ipython</package> 0.9.1 版本，从 0.8.4 更新而来。这是一个主要发行本。详情请参考 <ulink type=\"http\" url=\"http://ipython.scipy.org/announcements/ann-ipython-0.9.txt\"></ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:522
@@ -3305,14 +2341,8 @@ msgstr "monodevelop"
 #. Tag: para
 #: Devel-Tools.xml:524
 #, no-c-format
-msgid ""
-"The updated <package>monodevelop</package> 1.9.2 includes a large number of "
-"new features. You can review these features at <ulink type=\"http\" url="
-"\"http://monodevelop.com/Release_notes_for_MonoDevelop_2.0_Beta_1\"></ulink>."
-msgstr ""
-"更新的 <package>monodevelop</package> 1.9.2 包括大量新特性。您可以在 <ulink "
-"type=\"http\" url=\"http://monodevelop.com/"
-"Release_notes_for_MonoDevelop_2.0_Beta_1\"></ulink> 查看这些特性。"
+msgid "The updated <package>monodevelop</package> 1.9.2 includes a large number of new features. You can review these features at <ulink type=\"http\" url=\"http://monodevelop.com/Release_notes_for_MonoDevelop_2.0_Beta_1\"></ulink>."
+msgstr "更新的 <package>monodevelop</package> 1.9.2 包括大量新特性。您可以在 <ulink type=\"http\" url=\"http://monodevelop.com/Release_notes_for_MonoDevelop_2.0_Beta_1\"></ulink> 查看这些特性。"
 
 #. Tag: term
 #: Devel-Tools.xml:534
@@ -3341,13 +2371,7 @@ msgstr "mantis"
 #. Tag: para
 #: Devel-Tools.xml:553
 #, fuzzy, no-c-format
-msgid ""
-"The <package>mantis</package> package has been upgraded to 1.1.6. \"This "
-"release fixes once and for all the caching troubles from previous stable "
-"releases, some access permissions bugs, and a few various other issues. This "
-"release also improves the existing source control integration by allowing "
-"remote checkins.\" For a complete list of all other changes refer to <ulink "
-"type=\"http\" url=\"http://www.mantisbt.org/\"></ulink>."
+msgid "The <package>mantis</package> package has been upgraded to 1.1.6. \"This release fixes once and for all the caching troubles from previous stable releases, some access permissions bugs, and a few various other issues. This release also improves the existing source control integration by allowing remote checkins.\" For a complete list of all other changes refer to <ulink type=\"http\" url=\"http://www.mantisbt.org/\"></ulink>."
 msgstr "已将 <package>mantis</package> 软件包更新至 1.1.6。"
 
 #. Tag: term
@@ -3359,13 +2383,8 @@ msgstr "trac"
 #. Tag: para
 #: Devel-Tools.xml:569
 #, no-c-format
-msgid ""
-"0.11.3 of <package>trac</package> contains a number of new features, "
-"including a new template engine for generating content, new configurable "
-"workflow, and finer grained control of permissions."
-msgstr ""
-"<package>trac</package> 的 0.11.3 版本包括很多新特性，其中包括生成内容的新模"
-"板引擎、新的可配置流程以及对权限的细致控制。"
+msgid "0.11.3 of <package>trac</package> contains a number of new features, including a new template engine for generating content, new configurable workflow, and finer grained control of permissions."
+msgstr "<package>trac</package> 的 0.11.3 版本包括很多新特性，其中包括生成内容的新模板引擎、新的可配置流程以及对权限的细致控制。"
 
 #. Tag: term
 #: Devel-Tools.xml:579
@@ -3376,14 +2395,8 @@ msgstr "trac-mercurial-plugin"
 #. Tag: para
 #: Devel-Tools.xml:581
 #, fuzzy, no-c-format
-msgid ""
-"The <package>trac-mercurial-plugin</package> 0.11.0.7 package works with the "
-"<package>trac</package> 0.11 release, and provides added features including "
-"quickjump to a tag or branch, blame support, and custom property renderers."
-msgstr ""
-"<package>trac-mercurial-plugin</package> 0.11.0.7 软件包与 <package>trac</"
-"package> 0.11 å‘è¡Œæœ¬ä¸€åŒå·¥ä½œï¼Œå¹¶æä¾›æ·»åŠ çš„ç‰¹æ€§ï¼Œå…¶ä¸­åŒ…æ‹¬ tag 或者 branch çš„ "
-"quickjump、blame 支持以及定制特性 renderer。"
+msgid "The <package>trac-mercurial-plugin</package> 0.11.0.7 package works with the <package>trac</package> 0.11 release, and provides added features including quickjump to a tag or branch, blame support, and custom property renderers."
+msgstr "<package>trac-mercurial-plugin</package> 0.11.0.7 软件包与 <package>trac</package> 0.11 å‘è¡Œæœ¬ä¸€åŒå·¥ä½œï¼Œå¹¶æä¾›æ·»åŠ çš„ç‰¹æ€§ï¼Œå…¶ä¸­åŒ…æ‹¬ tag 或者 branch çš„ quickjump、blame 支持以及定制特性 renderer。"
 
 #. Tag: title
 #: Devel-Tools.xml:595
@@ -3400,9 +2413,7 @@ msgstr "bison"
 #. Tag: para
 #: Devel-Tools.xml:602
 #, no-c-format
-msgid ""
-"Fedora 11 includes version 2.4.1 of <package>bison</package>. This is a "
-"minor upgrade."
+msgid "Fedora 11 includes version 2.4.1 of <package>bison</package>. This is a minor upgrade."
 msgstr "Fedora 11 包括 <package>bison</package> 版本 2.4.1。这是一个次要升级。"
 
 #. Tag: title
@@ -3420,30 +2431,8 @@ msgstr "automake"
 #. Tag: para
 #: Devel-Tools.xml:620
 #, fuzzy, no-c-format
-msgid ""
-"Improvements in <package>automake</package> 1.10.2 include: <itemizedlist> "
-"<listitem> <para> Changes to libtool support: <itemizedlist> <listitem> "
-"<para> The <command>distcheck</command> command works with libtool 2.x even "
-"when <envar>LT_OUTPUT</envar> is used, as <option>config.lt</option> is "
-"removed correctly now. </para> </listitem> </itemizedlist> </para> </"
-"listitem> <listitem> <para> Miscellaneous changes: <itemizedlist> <listitem> "
-"<para> The manual is now distributed under the terms of the GNU FDL 1.3. </"
-"para> </listitem> <listitem> <para> When the <command>automake --add-"
-"missing</command> command causes the COPYING file to be installed, it will "
-"also warn that the license file should be added to source control. </para> </"
-"listitem> </itemizedlist> </para> </listitem> </itemizedlist> In addition a "
-"few bugs were fixed."
-msgstr ""
-"<package>automake</package> 1.10.2 中的改进包括：<itemizedlist><listitem> "
-"<para>对 Libtool 支持的更改：<itemizedlist> <listitem><para> "
-"<command>distcheck</command> 命令与 Libtool 2.x 一同工作，即使在使用 "
-"<envar>LT_OUTPUT</envar> æ—¶ä¹Ÿæ˜¯è¿™æ ·ï¼Œå› ä¸ºçŽ°åœ¨å¯æ­£ç¡®åˆ é™¤ <option>config.lt</"
-"option>。</para> </listitem> </itemizedlist> </para> </listitem> <listitem> "
-"<para>其它改动：<itemizedlist> <listitem> <para>手册现在按照 GNU FDL 1.3 条款"
-"发布。</para> </listitem> <listitem> <para>当 <command>automake --add-"
-"missing</command> 命令导致安装 COPYING æ–‡ä»¶æ—¶ï¼Œå®ƒè¿˜å°†è­¦å‘Šåº”è¯¥åœ¨æºæŽ§åˆ¶ä¸­æ·»åŠ è®¸"
-"可证文件。</para> </listitem> </itemizedlist> </para> </listitem> </"
-"itemizedlist>å¦å¤–è¿˜ä¿®å¤äº†å‡ ä¸ª bug。"
+msgid "Improvements in <package>automake</package> 1.10.2 include: <itemizedlist> <listitem> <para> Changes to libtool support: <itemizedlist> <listitem> <para> The <command>distcheck</command> command works with libtool 2.x even when <envar>LT_OUTPUT</envar> is used, as <option>config.lt</option> is removed correctly now. </para> </listitem> </itemizedlist> </para> </listitem> <listitem> <para> Miscellaneous changes: <itemizedlist> <listitem> <para> The manual is now distributed under the terms of the GNU FDL 1.3. </para> </listitem> <listitem> <para> When the <command>automake --add-missing</command> command causes the COPYING file to be installed, it will also warn that the license file should be added to source control. </para> </listitem> </itemizedlist> </para> </listitem> </itemizedlist> In addition a few bugs were fixed."
+msgstr "<package>automake</package> 1.10.2 中的改进包括：<itemizedlist><listitem> <para>对 Libtool 支持的更改：<itemizedlist> <listitem><para> <command>distcheck</command> 命令与 Libtool 2.x 一同工作，即使在使用 <envar>LT_OUTPUT</envar> æ—¶ä¹Ÿæ˜¯è¿™æ ·ï¼Œå› ä¸ºçŽ°åœ¨å¯æ­£ç¡®åˆ é™¤ <option>config.lt</option>。</para> </listitem> </itemizedlist> </para> </listitem> <listitem> <para>其它改动：<itemizedlist> <listitem> <para>手册现在按照 GNU FDL 1.3 条款发布。</para> </listitem> <listitem> <para>当 <command>automake --add-missing</command> 命令导致安装 COPYING æ–‡ä»¶æ—¶ï¼Œå®ƒè¿˜å°†è­¦å‘Šåº”è¯¥åœ¨æºæŽ§åˆ¶ä¸­æ·»åŠ è®¸å¯è¯æ–‡ä»¶ã€‚</para> </listitem> </itemizedlist> </para> </listitem> </itemizedlist>å¦å¤–è¿˜ä¿®å¤äº†å‡ ä¸ª bug。"
 
 #. Tag: term
 #: Devel-Tools.xml:667
@@ -3454,14 +2443,8 @@ msgstr "cmake"
 #. Tag: para
 #: Devel-Tools.xml:669
 #, no-c-format
-msgid ""
-"The <package>cmake</package> has been upgraded to version 2.6.3. This update "
-"includes many bug fixes. For a complete list visit <ulink type=\"http\" url="
-"\"http://www.cmake.org/files/v2.6/CMakeChangeLog-2.6.3\"></ulink>."
-msgstr ""
-"已将 <package>cmake</package> 更新至版本 2.6.3。这个更新包括一些 bug 修复。完"
-"整列表请访问 <ulink type=\"http\" url=\"http://www.cmake.org/files/v2.6/"
-"CMakeChangeLog-2.6.3\"></ulink>。"
+msgid "The <package>cmake</package> has been upgraded to version 2.6.3. This update includes many bug fixes. For a complete list visit <ulink type=\"http\" url=\"http://www.cmake.org/files/v2.6/CMakeChangeLog-2.6.3\"></ulink>."
+msgstr "已将 <package>cmake</package> 更新至版本 2.6.3。这个更新包括一些 bug 修复。完整列表请访问 <ulink type=\"http\" url=\"http://www.cmake.org/files/v2.6/CMakeChangeLog-2.6.3\"></ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:678
@@ -3472,12 +2455,8 @@ msgstr "cpanspec"
 #. Tag: para
 #: Devel-Tools.xml:680
 #, no-c-format
-msgid ""
-"Fedora 11 includes version 1.78 of <package>cpanspec</package>. In addition "
-"to a number of bug fixes, there are some additional command line options."
-msgstr ""
-"Fedora 11 包括 <package>cpanspec</package> 版本 1.78。处一些 bug 修复外，还有"
-"ä¸€äº›é™„åŠ çš„å‘½ä»¤è¡Œé€‰é¡¹ã€‚"
+msgid "Fedora 11 includes version 1.78 of <package>cpanspec</package>. In addition to a number of bug fixes, there are some additional command line options."
+msgstr "Fedora 11 包括 <package>cpanspec</package> 版本 1.78。处一些 bug ä¿®å¤å¤–ï¼Œè¿˜æœ‰ä¸€äº›é™„åŠ çš„å‘½ä»¤è¡Œé€‰é¡¹ã€‚"
 
 #. Tag: term
 #: Devel-Tools.xml:689
@@ -3519,13 +2498,13 @@ msgstr "启动时命令行自动比较所有选项。"
 #: Devel-Tools.xml:715
 #, no-c-format
 msgid "Command-line can launch several comparisons."
-msgstr ""
+msgstr "命令行可进行一些比较。"
 
 #. Tag: para
 #: Devel-Tools.xml:720
-#, no-c-format
+#, fuzzy, no-c-format
 msgid "Several UI tweaks (better focus behavior, better defaults.)"
-msgstr ""
+msgstr "调整了一些UI(更好的焦点行为，better defaults。)"
 
 #. Tag: term
 #: Devel-Tools.xml:732
@@ -3554,17 +2533,8 @@ msgstr "<term>bzr</term>"
 #. Tag: para
 #: Devel-Tools.xml:752
 #, fuzzy, no-c-format
-msgid ""
-"The <package>bzr</package> package has been upgraded to 1.12 which includes "
-"a large number of new features and bug fixes over the 1.7 version in Fedora "
-"10. The <command>bzr</command> user is encouraged to visit the project's web "
-"page at <ulink type=\"http\" url=\"http://www.bazaar-vcs.org/\"></ulink> to "
-"review these improvements."
-msgstr ""
-"已将 <package>bzr</package> 软件包升级至 1.12，其中包括大量新特性和对 Fedora "
-"10 中版本 1.7 的 bug 修复。鼓励 <command>bzr</command> 用户访问位于 <ulink "
-"type=\"http\" url=\"http://www.bazaar-vcs.org/\"></ulink> 的项目网页来查看这"
-"些改进。"
+msgid "The <package>bzr</package> package has been upgraded to 1.12 which includes a large number of new features and bug fixes over the 1.7 version in Fedora 10. The <command>bzr</command> user is encouraged to visit the project's web page at <ulink type=\"http\" url=\"http://www.bazaar-vcs.org/\"></ulink> to review these improvements."
+msgstr "已将 <package>bzr</package> 软件包升级至 1.12，其中包括大量新特性和对 Fedora 10 中版本 1.7 的 bug 修复。鼓励 <command>bzr</command> 用户访问位于 <ulink type=\"http\" url=\"http://www.bazaar-vcs.org/\"></ulink> 的项目网页来查看这些改进。"
 
 #. Tag: term
 #: Devel-Tools.xml:765
@@ -3575,15 +2545,8 @@ msgstr "cvs2svn"
 #. Tag: para
 #: Devel-Tools.xml:767
 #, no-c-format
-msgid ""
-"The <package>cvs2svn</package> package has been updated to 2.2.0. In "
-"addition to bugfixes, there are a large number of new features. Visit <ulink "
-"type=\"http\" url=\"http://cvs2svn.tigris.org/source/browse/cvs2svn/"
-"tags/2.2.0/CHANGES\"></ulink> for the details."
-msgstr ""
-"已将 <package>cvs2svn</package> 软件包更新至 2.2.0。除 bug 修复外，还有大量新"
-"特性。详情请访问 <ulink type=\"http\" url=\"http://cvs2svn.tigris.org/source/"
-"browse/cvs2svn/tags/2.2.0/CHANGES\"></ulink> 。"
+msgid "The <package>cvs2svn</package> package has been updated to 2.2.0. In addition to bugfixes, there are a large number of new features. Visit <ulink type=\"http\" url=\"http://cvs2svn.tigris.org/source/browse/cvs2svn/tags/2.2.0/CHANGES\"></ulink> for the details."
+msgstr "已将 <package>cvs2svn</package> 软件包更新至 2.2.0。除 bug 修复外，还有大量新特性。详情请访问 <ulink type=\"http\" url=\"http://cvs2svn.tigris.org/source/browse/cvs2svn/tags/2.2.0/CHANGES\"></ulink> 。"
 
 #. Tag: term
 #: Devel-Tools.xml:778
@@ -3594,14 +2557,8 @@ msgstr "darcs"
 #. Tag: para
 #: Devel-Tools.xml:780
 #, no-c-format
-msgid ""
-"Version 2.2.0 of <package>darcs</package> includes a number of new features "
-"in addition to a number of bugfixes. Refer to the changelog at <ulink type="
-"\"http\" url=\"http://allmydata.org/trac/darcs-2/browser/NEWS\"></ulink>."
-msgstr ""
-"<package>darcs</package> 的版本 2.2.0 包括大量 bug 修复外的大量新特性。请参考"
-"位于 <ulink type=\"http\" url=\"http://allmydata.org/trac/darcs-2/browser/"
-"NEWS\"></ulink> 的更改日志。"
+msgid "Version 2.2.0 of <package>darcs</package> includes a number of new features in addition to a number of bugfixes. Refer to the changelog at <ulink type=\"http\" url=\"http://allmydata.org/trac/darcs-2/browser/NEWS\"></ulink>."
+msgstr "<package>darcs</package> 的版本 2.2.0 包括大量 bug 修复外的大量新特性。请参考位于 <ulink type=\"http\" url=\"http://allmydata.org/trac/darcs-2/browser/NEWS\"></ulink> 的更改日志。"
 
 #. Tag: term
 #: Devel-Tools.xml:790
@@ -3654,20 +2611,8 @@ msgstr "<term>git</term>"
 #. Tag: para
 #: Devel-Tools.xml:829
 #, no-c-format
-msgid ""
-"The <package>git</package> package has been updated to 1.6.2. In addition to "
-"other changes, the Fedora packages now follow upstream defaults and install "
-"the majority of <command>git-*</command> commands outside the default "
-"<envar>PATH</envar>. If you have scripts that call <command>git-*</command> "
-"binaries, you are encouraged to change them to use the <command>git foo</"
-"command> style. If this is not feasible, you can adjust your <envar>PATH</"
-"envar>. Git provides a convenient method to do this:"
-msgstr ""
-"已将 <package>git</package> 软件包更新至 1.6.2。除其它更改外，Fedora 软件包现"
-"在遵循上游默认并安装默认 <envar>PATH</envar> 之外的大多数 <command>git-*</"
-"command> 命令。如果您有调用 <command>git-*</command> 二进制程序的脚本，则鼓励"
-"您将其改为使用 <command>git foo</command> 类型。如果这不可行，您可以调节您的 "
-"<envar>PATH</envar>。Git 可提供一个方便的方法做到这一点："
+msgid "The <package>git</package> package has been updated to 1.6.2. In addition to other changes, the Fedora packages now follow upstream defaults and install the majority of <command>git-*</command> commands outside the default <envar>PATH</envar>. If you have scripts that call <command>git-*</command> binaries, you are encouraged to change them to use the <command>git foo</command> style. If this is not feasible, you can adjust your <envar>PATH</envar>. Git provides a convenient method to do this:"
+msgstr "已将 <package>git</package> 软件包更新至 1.6.2。除其它更改外，Fedora 软件包现在遵循上游默认并安装默认 <envar>PATH</envar> 之外的大多数 <command>git-*</command> 命令。如果您有调用 <command>git-*</command> 二进制程序的脚本，则鼓励您将其改为使用 <command>git foo</command> 类型。如果这不可行，您可以调节您的 <envar>PATH</envar>。Git 可提供一个方便的方法做到这一点："
 
 #. Tag: screen
 #: Devel-Tools.xml:840
@@ -3678,9 +2623,7 @@ msgstr "PATH=$(git --exec-path):$PATH"
 #. Tag: para
 #: Devel-Tools.xml:841
 #, no-c-format
-msgid ""
-"It is worth noting that <package>git</package> hooks are run with <command>"
-"$(git --exec-path)</command> in their <envar>PATH</envar>."
+msgid "It is worth noting that <package>git</package> hooks are run with <command>$(git --exec-path)</command> in their <envar>PATH</envar>."
 msgstr ""
 
 #. Tag: term
@@ -3692,15 +2635,8 @@ msgstr "mercurial"
 #. Tag: para
 #: Devel-Tools.xml:851
 #, no-c-format
-msgid ""
-"Version 1.1.2 is included in Fedora 11 with a large number of new features. "
-"Refer to the release notes for <package>mercurial</package> at <ulink type="
-"\"http\" url=\"http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew\"></"
-"ulink>."
-msgstr ""
-"Fedora 11 中包括版本 1.1.2，并含有大量新特性。请参考位于 <ulink type=\"http"
-"\" url=\"http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew\"></ulink> "
-"的 <package>mercurial</package> 发行注记。"
+msgid "Version 1.1.2 is included in Fedora 11 with a large number of new features. Refer to the release notes for <package>mercurial</package> at <ulink type=\"http\" url=\"http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew\"></ulink>."
+msgstr "Fedora 11 中包括版本 1.1.2，并含有大量新特性。请参考位于 <ulink type=\"http\" url=\"http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew\"></ulink> 的 <package>mercurial</package> 发行注记。"
 
 #. Tag: term
 #: Devel-Tools.xml:861
@@ -3711,93 +2647,50 @@ msgstr "monotone"
 #. Tag: para
 #: Devel-Tools.xml:863
 #, fuzzy, no-c-format
-msgid ""
-"In addition to a number of bugfixes, the new <package>monotone</package> "
-"0.42 includes the following changes: <itemizedlist> <listitem> <para> The "
-"output of <command>automate show_conflicts</command> has been changed; a "
-"default resolution for file content conflicts and user resolutions for other "
-"conflict types has been added. <command>directory_loop_created</command> "
-"changed to <command>directory_loop</command>. </para> </listitem> <listitem> "
-"<para> The French, Brazilian-Portuguese, and Japanese translations were "
-"outdated and thus have been removed from the distribution. In case you care "
-"about them and want them back, drop us a note at <ulink type=\"mailto\" url="
-"\"mailto:monotone-devel at nongnu.org\"></ulink>. </para> </listitem> </"
-"itemizedlist> ... and the following new features:"
-msgstr ""
-"除了修复大量bug外，0.42版本的<package>monotone</package>做了以下变更：修改了"
-"<itemizedlist> <listitem> <para> The output of <command>automate "
-"show_conflicts</command>ï¼›"
+msgid "In addition to a number of bugfixes, the new <package>monotone</package> 0.42 includes the following changes: <itemizedlist> <listitem> <para> The output of <command>automate show_conflicts</command> has been changed; a default resolution for file content conflicts and user resolutions for other conflict types has been added. <command>directory_loop_created</command> changed to <command>directory_loop</command>. </para> </listitem> <listitem> <para> The French, Brazilian-Portuguese, and Japanese translations were outdated and thus have been removed from the distribution. In case you care about them and want them back, drop us a note at <ulink type=\"mailto\" url=\"mailto:monotone-devel at nongnu.org\"></ulink>. </para> </listitem> </itemizedlist> ... and the following new features:"
+msgstr "除了修复大量bug外，0.42版本的<package>monotone</package>做了以下变更：修改了<itemizedlist> <listitem> <para> The output of <command>automate show_conflicts</command>；"
 
 #. Tag: para
 #: Devel-Tools.xml:892
 #, no-c-format
-msgid ""
-"New <command>mtn ls duplicates</command> command which lets you list "
-"duplicated files in a given revision or the workspace."
-msgstr ""
-"新 <command>mtn ls duplicates</command> 命令可让您列出给出修订或者工作站中的"
-"重复文件。"
+msgid "New <command>mtn ls duplicates</command> command which lets you list duplicated files in a given revision or the workspace."
+msgstr "新 <command>mtn ls duplicates</command> 命令可让您列出给出修订或者工作站中的重复文件。"
 
 #. Tag: para
 #: Devel-Tools.xml:899
 #, no-c-format
-msgid ""
-"New option <command>--no-workspace</command>, to make <package>monotone</"
-"package> ignore any workspace it might have been run in."
-msgstr ""
-"新选项 <command>--no-workspace</command> 让 <package>monotone</package> 忽略"
-"所有它在其中运行过的工作站。"
+msgid "New option <command>--no-workspace</command>, to make <package>monotone</package> ignore any workspace it might have been run in."
+msgstr "新选项 <command>--no-workspace</command> 让 <package>monotone</package> 忽略所有它在其中运行过的工作站。"
 
 #. Tag: para
 #: Devel-Tools.xml:906
 #, no-c-format
-msgid ""
-"New command group <command>mtn conflicts *</command> provides asynchronous "
-"conflict resolutions for merge and propagate."
-msgstr ""
-"新命令组群 <command>mtn conflicts *</command> 为合并和扩散提供不同步冲突解决"
-"方案。"
+msgid "New command group <command>mtn conflicts *</command> provides asynchronous conflict resolutions for merge and propagate."
+msgstr "新命令组群 <command>mtn conflicts *</command> 为合并和扩散提供不同步冲突解决方案。"
 
 #. Tag: para
 #: Devel-Tools.xml:913
 #, no-c-format
-msgid ""
-"New <command>automate file_merge</command> command which runs the internal "
-"line merger on two files from two revisions and outputs the result."
+msgid "New <command>automate file_merge</command> command which runs the internal line merger on two files from two revisions and outputs the result."
 msgstr ""
 
 #. Tag: para
 #: Devel-Tools.xml:920
 #, no-c-format
-msgid ""
-"New <command>automate lua</command> command to call <package>lua</package> "
-"functions over <command>automate</command>, similar to <package>monotone</"
-"package> hooks. This is particularly useful to get user defaults, like "
-"ignorable files, branch keys and passwords, which are managed through one or "
-"more <filename>monotonerc</filename> files."
+msgid "New <command>automate lua</command> command to call <package>lua</package> functions over <command>automate</command>, similar to <package>monotone</package> hooks. This is particularly useful to get user defaults, like ignorable files, branch keys and passwords, which are managed through one or more <filename>monotonerc</filename> files."
 msgstr ""
 
 #. Tag: para
 #: Devel-Tools.xml:932
 #, no-c-format
-msgid ""
-"New <command>automate read_packets</command> command that reads data packets "
-"like public keys similar to <command>mtn read</command>."
+msgid "New <command>automate read_packets</command> command that reads data packets like public keys similar to <command>mtn read</command>."
 msgstr ""
 
 #. Tag: para
 #: Devel-Tools.xml:939
 #, no-c-format
-msgid ""
-"The <command>merge</command> and <command>propagate</command> commands "
-"accept user commit messages; the <command>merge rev rev</command> or "
-"<command>propagate branch branch</command> message will be prefixed to the "
-"user message. <command>--no-prefix</command> removes the prefix."
-msgstr ""
-"<command>merge</command> 和 <command>propagate</command> 命令接受用户提交短"
-"信；会将 <command>merge rev rev</command> 或者 <command>propagate branch "
-"branch</command> ä¿¡æ¯é™„åŠ åˆ°ç”¨æˆ·ä¿¡æ¯å‰é¢ã€‚<command>--no-prefix</command> åˆ é™¤"
-"这个前缀。"
+msgid "The <command>merge</command> and <command>propagate</command> commands accept user commit messages; the <command>merge rev rev</command> or <command>propagate branch branch</command> message will be prefixed to the user message. <command>--no-prefix</command> removes the prefix."
+msgstr "<command>merge</command> å’Œ <command>propagate</command> 命令接受用户提交短信；会将 <command>merge rev rev</command> 或者 <command>propagate branch branch</command> ä¿¡æ¯é™„åŠ åˆ°ç”¨æˆ·ä¿¡æ¯å‰é¢ã€‚<command>--no-prefix</command> åˆ é™¤è¿™ä¸ªå‰ç¼€ã€‚"
 
 #. Tag: term
 #: Devel-Tools.xml:955
@@ -3820,8 +2713,7 @@ msgstr ""
 #. Tag: para
 #: Devel-Tools.xml:966
 #, no-c-format
-msgid ""
-"Make Cyrus authentication implementation always prefer EXTERNAL to ANONYMOUS."
+msgid "Make Cyrus authentication implementation always prefer EXTERNAL to ANONYMOUS."
 msgstr ""
 
 #. Tag: para
@@ -3929,11 +2821,8 @@ msgstr "svn2cl"
 #. Tag: para
 #: Devel-Tools.xml:1070
 #, no-c-format
-msgid ""
-"The <package>svn2cl</package> package has been updated to 0.11. Changes "
-"since release 0.10:"
-msgstr ""
-"已将 <package>svn2cl</package> 软件包更新至 0.11。从发行本 0.10 更新而来。"
+msgid "The <package>svn2cl</package> package has been updated to 0.11. Changes since release 0.10:"
+msgstr "已将 <package>svn2cl</package> 软件包更新至 0.11。从发行本 0.10 更新而来。"
 
 #. Tag: para
 #: Devel-Tools.xml:1075
@@ -3962,37 +2851,25 @@ msgstr "版本 8.2 中的改变："
 #. Tag: para
 #: Devel-Tools.xml:1096
 #, no-c-format
-msgid ""
-"The Branch Browser can now draw merge arrows for merges tracked by "
-"Subversion 1.5's mergeinfo property and CVSNT's mergepoint feature. The work-"
-"around of using tags is no longer necessary, if your Subversion or CVSNT "
-"server and client support their own merge tracking."
+msgid "The Branch Browser can now draw merge arrows for merges tracked by Subversion 1.5's mergeinfo property and CVSNT's mergepoint feature. The work-around of using tags is no longer necessary, if your Subversion or CVSNT server and client support their own merge tracking."
 msgstr ""
 
 #. Tag: para
 #: Devel-Tools.xml:1106
 #, no-c-format
-msgid ""
-"The Branch Browser has a new search ability, so you can highlight a revision "
-"on the diagram by its version, date, tag, or author."
+msgid "The Branch Browser has a new search ability, so you can highlight a revision on the diagram by its version, date, tag, or author."
 msgstr ""
 
 #. Tag: para
 #: Devel-Tools.xml:1113
 #, no-c-format
-msgid ""
-"The Log button in the Branch Browser always produces a full log of revisions "
-"on the selected branch instead of inappropriately following the Directory "
-"Browser's \"Log Detail\" setting."
+msgid "The Log button in the Branch Browser always produces a full log of revisions on the selected branch instead of inappropriately following the Directory Browser's \"Log Detail\" setting."
 msgstr ""
 
 #. Tag: para
 #: Devel-Tools.xml:1121
 #, no-c-format
-msgid ""
-"If your SVN repository has a structure that's functionally similar to trunk, "
-"branches, and tags but with different names, you can tell TkCVS about it by "
-"setting variables in <filename>tkcvs_def.tcl</filename>:"
+msgid "If your SVN repository has a structure that's functionally similar to trunk, branches, and tags but with different names, you can tell TkCVS about it by setting variables in <filename>tkcvs_def.tcl</filename>:"
 msgstr ""
 
 #. Tag: para
@@ -4028,10 +2905,7 @@ msgstr "amqp"
 #. Tag: para
 #: Devel-Tools.xml:1149
 #, no-c-format
-msgid ""
-"The AMQP specification has been updated to 1.0.738618 reflecting recent work "
-"on the specification. Project site: <ulink type=\"http\" url=\"http://www."
-"amqp.org\"></ulink>."
+msgid "The AMQP specification has been updated to 1.0.738618 reflecting recent work on the specification. Project site: <ulink type=\"http\" url=\"http://www.amqp.org\"></ulink>."
 msgstr ""
 
 #. Tag: term
@@ -4043,14 +2917,8 @@ msgstr "binutils"
 #. Tag: para
 #: Devel-Tools.xml:1161
 #, no-c-format
-msgid ""
-"The <package>binutils</package> package has been updated to 2.19.51.0.2. "
-"This is a minor update, refer to <ulink type=\"http\" url=\"http://sources."
-"redhat.com/binutils\"></ulink>."
-msgstr ""
-"已将 <package>binutils</package> 软件包更新至 2.19.51.0.2。这是一个次要更新，"
-"请参考 <ulink type=\"http\" url=\"http://sources.redhat.com/binutils\"></"
-"ulink>。"
+msgid "The <package>binutils</package> package has been updated to 2.19.51.0.2. This is a minor update, refer to <ulink type=\"http\" url=\"http://sources.redhat.com/binutils\"></ulink>."
+msgstr "已将 <package>binutils</package> 软件包更新至 2.19.51.0.2。这是一个次要更新，请参考 <ulink type=\"http\" url=\"http://sources.redhat.com/binutils\"></ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:1171
@@ -4061,19 +2929,13 @@ msgstr "coccinelle (spatch)"
 #. Tag: para
 #: Devel-Tools.xml:1173
 #, no-c-format
-msgid ""
-"The <package>coccinelle</package> package enables semantic patches to be "
-"written for C code, particularly Linux kernel patches."
+msgid "The <package>coccinelle</package> package enables semantic patches to be written for C code, particularly Linux kernel patches."
 msgstr ""
 
 #. Tag: para
 #: Devel-Tools.xml:1177
 #, no-c-format
-msgid ""
-"Refer to the LWN article about semantic patching (<ulink type=\"http\" url="
-"\"http://lwn.net/Articles/315686/\">http://lwn.net/Articles/315686/</ulink>) "
-"and the Coccinelle home page (<ulink type=\"http\" url=\"http://www.emn.fr/x-"
-"info/coccoinelle\"></ulink>)."
+msgid "Refer to the LWN article about semantic patching (<ulink type=\"http\" url=\"http://lwn.net/Articles/315686/\">http://lwn.net/Articles/315686/</ulink>) and the Coccinelle home page (<ulink type=\"http\" url=\"http://www.emn.fr/x-info/coccoinelle\"></ulink>)."
 msgstr ""
 
 #. Tag: term
@@ -4085,18 +2947,7 @@ msgstr "cproto"
 #. Tag: para
 #: Devel-Tools.xml:1191
 #, no-c-format
-msgid ""
-"In addition to a few bugfixes, the following changes have been made: "
-"<itemizedlist> <listitem> <para> Modified <command>cpp</command> command to "
-"redirect stderr to <filename>/dev/null</filename> if <command>-q</command> "
-"option is given, for consistency with the non-cpp mode </para> </listitem> "
-"<listitem> <para> Added <command>configure --disable-leaks</command> option. "
-"</para> </listitem> <listitem> <para> Use configure macro "
-"<command>CF_XOPEN_SOURCE</command> macro to make <methodname>mkstemp()</"
-"methodname> prototyped on Linux. </para> </listitem> <listitem> <para> "
-"Removed <methodname>isascii()</methodname> usage. </para> </listitem> </"
-"itemizedlist> <ulink type=\"http\" url=\"http://freshmeat.net/projects/"
-"cproto/\"></ulink>"
+msgid "In addition to a few bugfixes, the following changes have been made: <itemizedlist> <listitem> <para> Modified <command>cpp</command> command to redirect stderr to <filename>/dev/null</filename> if <command>-q</command> option is given, for consistency with the non-cpp mode </para> </listitem> <listitem> <para> Added <command>configure --disable-leaks</command> option. </para> </listitem> <listitem> <para> Use configure macro <command>CF_XOPEN_SOURCE</command> macro to make <methodname>mkstemp()</methodname> prototyped on Linux. </para> </listitem> <listitem> <para> Removed <methodname>isascii()</methodname> usage. </para> </listitem> </itemizedlist> <ulink type=\"http\" url=\"http://freshmeat.net/projects/cproto/\"></ulink>"
 msgstr ""
 
 #. Tag: term
@@ -4108,16 +2959,8 @@ msgstr "elfutils"
 #. Tag: para
 #: Devel-Tools.xml:1230
 #, no-c-format
-msgid ""
-"The <package>elfutils</package> package has been updated to 0.140 (from "
-"0.137). In addition to a number of bug fixes, it adds Intel SSE4 "
-"disassembler support and automatic decompression of ELF files. For the full "
-"story, refer to the NEWS file at <ulink type=\"http\" url=\"http://"
-"fedorahosted.org/elfutils/browser/NEWS\"></ulink>."
-msgstr ""
-"<package>elfutils</package>包更新至0.140(从0.137)。除了修正一些bugå¤–ï¼Œæ·»åŠ äº†"
-"Intel SSE4拆分支持并可自动解压ELF文件。在<ulink type=\"http\" url=\"http://"
-"fedorahosted.org/elfutils/browser/NEWS\"></ulink>参考NEWS文件来了解完整信息。"
+msgid "The <package>elfutils</package> package has been updated to 0.140 (from 0.137). In addition to a number of bug fixes, it adds Intel SSE4 disassembler support and automatic decompression of ELF files. For the full story, refer to the NEWS file at <ulink type=\"http\" url=\"http://fedorahosted.org/elfutils/browser/NEWS\"></ulink>."
+msgstr "<package>elfutils</package>包更新至0.140(从0.137)。除了修正一些bugå¤–ï¼Œæ·»åŠ äº†Intel SSE4拆分支持并可自动解压ELF文件。在<ulink type=\"http\" url=\"http://fedorahosted.org/elfutils/browser/NEWS\"></ulink>参考NEWS文件来了解完整信息。"
 
 #. Tag: term
 #: Devel-Tools.xml:1243
@@ -4128,17 +2971,8 @@ msgstr "libtool"
 #. Tag: para
 #: Devel-Tools.xml:1245
 #, no-c-format
-msgid ""
-"Fedora 11 includes <package>libtool</package> 2.2.6, which is a complete "
-"rewrite of the version 1.5 in Fedora 10. The upstream project has released a "
-"number of interim versions that were not reflected in Fedora. For a complete "
-"history, refer to <ulink type=\"http\" url=\"http://www.gnu.org/software/"
-"libtool/news.html\"></ulink>."
-msgstr ""
-"Fedora 11åŠ å…¥äº†2.2.6版本的<package>libtool</package>，此版本是对Fedora 10中"
-"1.5版本的完全重写。上游项目已经发布了很多临时版本，但没有体现在Fedora中。要了"
-"解完整信息，请参考<ulink type=\"http\" url=\"http://www.gnu.org/software/"
-"libtool/news.html\"></ulink>。"
+msgid "Fedora 11 includes <package>libtool</package> 2.2.6, which is a complete rewrite of the version 1.5 in Fedora 10. The upstream project has released a number of interim versions that were not reflected in Fedora. For a complete history, refer to <ulink type=\"http\" url=\"http://www.gnu.org/software/libtool/news.html\"></ulink>."
+msgstr "Fedora 11åŠ å…¥äº†2.2.6版本的<package>libtool</package>，此版本是对Fedora 10中1.5版本的完全重写。上游项目已经发布了很多临时版本，但没有体现在Fedora中。要了解完整信息，请参考<ulink type=\"http\" url=\"http://www.gnu.org/software/libtool/news.html\"></ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:1258
@@ -4149,13 +2983,8 @@ msgstr "livecd-tools"
 #. Tag: para
 #: Devel-Tools.xml:1260
 #, fuzzy, no-c-format
-msgid ""
-"The <package>livecd-tools</package> version 021 includes a number of bug "
-"fixes and corrects some oversights, including support for ext4 file systems "
-"and creating large ISOs using UDF."
-msgstr ""
-"<package>livecd-tools</package> 版本 021 包括很多 bug 修复并修正了一些疏漏，"
-"其中包括对 ext4 文件系统和使用 UDF 生成大 ISO 的支持。"
+msgid "The <package>livecd-tools</package> version 021 includes a number of bug fixes and corrects some oversights, including support for ext4 file systems and creating large ISOs using UDF."
+msgstr "<package>livecd-tools</package> 版本 021 包括很多 bug 修复并修正了一些疏漏，其中包括对 ext4 文件系统和使用 UDF 生成大 ISO 的支持。"
 
 #. Tag: term
 #: Devel-Tools.xml:1271
@@ -4166,9 +2995,7 @@ msgstr "mcrypt"
 #. Tag: para
 #: Devel-Tools.xml:1273
 #, no-c-format
-msgid ""
-"Version 2.6.8 of <package>mcrypt</package> is largely a source code cleanup "
-"and should not affect functionality. Refer to the NEWS file for details."
+msgid "Version 2.6.8 of <package>mcrypt</package> is largely a source code cleanup and should not affect functionality. Refer to the NEWS file for details."
 msgstr ""
 
 #. Tag: term
@@ -4180,13 +3007,8 @@ msgstr "scons"
 #. Tag: para
 #: Devel-Tools.xml:1285
 #, no-c-format
-msgid ""
-"<package>scons</package> 1.2.0 is a minor upgrade to 1.0.0. Refer to <ulink "
-"type=\"http\" url=\"http://www.scons.org/CHANGES.txt\"></ulink> for a "
-"detailed list of changes."
-msgstr ""
-"<package>scons</package> 1.2.0 是 1.0.0 的次要升级。详细改动列表请参考 "
-"<ulink type=\"http\" url=\"http://www.scons.org/CHANGES.txt\"></ulink>。"
+msgid "<package>scons</package> 1.2.0 is a minor upgrade to 1.0.0. Refer to <ulink type=\"http\" url=\"http://www.scons.org/CHANGES.txt\"></ulink> for a detailed list of changes."
+msgstr "<package>scons</package> 1.2.0 是 1.0.0 的次要升级。详细改动列表请参考 <ulink type=\"http\" url=\"http://www.scons.org/CHANGES.txt\"></ulink>。"
 
 #. Tag: term
 #: Devel-Tools.xml:1295
@@ -4203,13 +3025,8 @@ msgstr "版本 1.46 中包含以下改变："
 #. Tag: para
 #: Devel-Tools.xml:1301
 #, no-c-format
-msgid ""
-"There is a new option for the <command>--x-e-length</command> filters, they "
-"can now accept a width, and this is divided into the byte length, so that "
-"you can insert the length in units of words (2) or longs (4)."
-msgstr ""
-"<command>--x-e-length</command> 过滤器有一个新选项，它们现在可以接受一个宽"
-"度，可将其分成字节长度，以便您可以字（2）或者长（4）为单位插入长度。"
+msgid "There is a new option for the <command>--x-e-length</command> filters, they can now accept a width, and this is divided into the byte length, so that you can insert the length in units of words (2) or longs (4)."
+msgstr "<command>--x-e-length</command> 过滤器有一个新选项，它们现在可以接受一个宽度，可将其分成字节长度，以便您可以字（2）或者长（4）为单位插入长度。"
 
 #. Tag: para
 #: Devel-Tools.xml:1310
@@ -4220,14 +3037,8 @@ msgstr "文档中有一些小修正。"
 #. Tag: para
 #: Devel-Tools.xml:1316
 #, no-c-format
-msgid ""
-"The <option>-minimum</option> and <option>-maximum</option> options have "
-"been renamed <option>-minimum-address</option> and <option>-maximum-address</"
-"option>, to avoid a command line grammar syntax problem."
-msgstr ""
-"已将 <option>-minimum</option> 和 <option>-maximum</option> 选项重新命名为 "
-"<option>-minimum-address</option> 和 <option>-maximum-address</option> 以避免"
-"命令行语法句法问题。"
+msgid "The <option>-minimum</option> and <option>-maximum</option> options have been renamed <option>-minimum-address</option> and <option>-maximum-address</option>, to avoid a command line grammar syntax problem."
+msgstr "已将 <option>-minimum</option> 和 <option>-maximum</option> 选项重新命名为 <option>-minimum-address</option> 和 <option>-maximum-address</option> 以避免命令行语法句法问题。"
 
 #. Tag: term
 #: Devel-Tools.xml:1331
@@ -4238,16 +3049,7 @@ msgstr "swig"
 #. Tag: para
 #: Devel-Tools.xml:1333
 #, no-c-format
-msgid ""
-"The <package>swig</package> package connects C/C++/Objective C to some high-"
-"level programming languages. Fedora 11 includes version 1.3.38 with a number "
-"of changes: <itemizedlist> <listitem> <para> Enhancement to directors to "
-"wrap all protected members. </para> </listitem> <listitem> <para> "
-"Optimization feature for objects returned by value. </para> </listitem> "
-"<listitem> <para> A few bugs fixes in the PHP, Java, Ruby, R, C#, Python, "
-"Lua, and Perl modules. </para> </listitem> <listitem> <para> Other minor "
-"generic bug fixes. </para> </listitem> </itemizedlist> Project site: <ulink "
-"type=\"http\" url=\"http://swig.sourceforge.net/\"></ulink>"
+msgid "The <package>swig</package> package connects C/C++/Objective C to some high-level programming languages. Fedora 11 includes version 1.3.38 with a number of changes: <itemizedlist> <listitem> <para> Enhancement to directors to wrap all protected members. </para> </listitem> <listitem> <para> Optimization feature for objects returned by value. </para> </listitem> <listitem> <para> A few bugs fixes in the PHP, Java, Ruby, R, C#, Python, Lua, and Perl modules. </para> </listitem> <listitem> <para> Other minor generic bug fixes. </para> </listitem> </itemizedlist> Project site: <ulink type=\"http\" url=\"http://swig.sourceforge.net/\"></ulink>"
 msgstr ""
 
 #. Tag: term
@@ -4259,73 +3061,43 @@ msgstr "translate-toolkit"
 #. Tag: para
 #: Devel-Tools.xml:1373
 #, no-c-format
-msgid ""
-"The <package>translate-toolkit</package> has been updated to 1.3.0. There "
-"are a large number of changes that affect specific languages. Refer to the "
-"ChangeLog file for full details."
-msgstr ""
-"已将 <package>translate-toolkit</package> 更新至 1.3.0。有大量影响具体语言的"
-"改动。详情请参考 ChangeLog 文件。"
+msgid "The <package>translate-toolkit</package> has been updated to 1.3.0. There are a large number of changes that affect specific languages. Refer to the ChangeLog file for full details."
+msgstr "已将 <package>translate-toolkit</package> 更新至 1.3.0。有大量影响具体语言的改动。详情请参考 ChangeLog 文件。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:9
 #, fuzzy, no-c-format
-msgid ""
-"Fedora Electronic Lab is Fedora's high-end hardware design and simulation "
-"platform. This platform provides different hardware design flows based on "
-"the semiconductor industry's current trend. FEL maps in three methodologies "
-"{design, simulation, and verification} with open source EDA software."
-msgstr ""
-"Fedora电子实验室是Fedora的高端硬件设计与模拟平台。这个平台以当前半导体工业趋"
-"势为基础提供了不同的硬件设计。三种方法的FEL图{设计，模拟和验证}以及开源EDA软"
-"件。"
+msgid "Fedora Electronic Lab is Fedora's high-end hardware design and simulation platform. This platform provides different hardware design flows based on the semiconductor industry's current trend. FEL maps in three methodologies {design, simulation, and verification} with open source EDA software."
+msgstr "Fedora电子实验室是Fedora的高端硬件设计与模拟平台。这个平台以当前半导体工业趋势为基础提供了不同的硬件设计。三种方法的FEL图{设计，模拟和验证}以及开源EDA软件。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:17
 #, no-c-format
-msgid ""
-"FEL's website : <ulink type=\"http\" url=\"http://chitlesh.fedorapeople.org/"
-"FEL/\">http://chitlesh.fedorapeople.org/FEL/</ulink>."
-msgstr ""
-"FEL 网站：<ulink type=\"http\" url=\"http://chitlesh.fedorapeople.org/FEL/"
-"\">http://chitlesh.fedorapeople.org/FEL/</ulink>。"
+msgid "FEL's website : <ulink type=\"http\" url=\"http://chitlesh.fedorapeople.org/FEL/\">http://chitlesh.fedorapeople.org/FEL/</ulink>."
+msgstr "FEL 网站：<ulink type=\"http\" url=\"http://chitlesh.fedorapeople.org/FEL/\">http://chitlesh.fedorapeople.org/FEL/</ulink>。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:22
 #, no-c-format
-msgid ""
-"The latest methodology included on FEL platform is the means for "
-"verifications and debugging for digital based designs."
+msgid "The latest methodology included on FEL platform is the means for verifications and debugging for digital based designs."
 msgstr ""
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:27
 #, no-c-format
-msgid ""
-"The Perl modules included for F11 bring a new methodology under the Fedora "
-"umbrella. This methodology is verification together with possibilities for "
-"co-simulation based design and simulation. Fedora remains the sole Linux "
-"distribution distributing FEL methodologies for hardware design, simulation, "
-"and verification."
+msgid "The Perl modules included for F11 bring a new methodology under the Fedora umbrella. This methodology is verification together with possibilities for co-simulation based design and simulation. Fedora remains the sole Linux distribution distributing FEL methodologies for hardware design, simulation, and verification."
 msgstr ""
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:36
 #, no-c-format
-msgid ""
-"Updates of the existing RPM packages have improved design experience in "
-"terms of development time and debugging. While FEL understands Moore's Law "
-"is important for its userbase, these improvements allow users to design a "
-"more efficient and successful design with open source software."
+msgid "Updates of the existing RPM packages have improved design experience in terms of development time and debugging. While FEL understands Moore's Law is important for its userbase, these improvements allow users to design a more efficient and successful design with open source software."
 msgstr ""
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:44
 #, no-c-format
-msgid ""
-"These enhancements brought to the Fedora umbrella increase chances that "
-"Fedora users can complete their high-end hardware design even if scaled to "
-"90nm and wrap up their project with final tapeout."
+msgid "These enhancements brought to the Fedora umbrella increase chances that Fedora users can complete their high-end hardware design even if scaled to 90nm and wrap up their project with final tapeout."
 msgstr ""
 
 #. Tag: para
@@ -4349,27 +3121,19 @@ msgstr "开源硬件社区"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:66
 #, no-c-format
-msgid ""
-"After 3 consecutive and successive releases, FEL/Fedora is regarded as the "
-"leader in this field by both communities due to its 3-years of experience "
-"and quality EDA solutions."
+msgid "After 3 consecutive and successive releases, FEL/Fedora is regarded as the leader in this field by both communities due to its 3-years of experience and quality EDA solutions."
 msgstr ""
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:72
 #, no-c-format
-msgid ""
-"Below entails the highlights of the major development items to put the "
-"quality barrier higher than the previous releases:"
+msgid "Below entails the highlights of the major development items to put the quality barrier higher than the previous releases:"
 msgstr ""
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:77
 #, no-c-format
-msgid ""
-"Perl modules to extend <package>vhdl</package> and <package>verilog</"
-"package> support. These Perl modules together with rawhide's "
-"<package>gtkwave</package> improves chip testing support."
+msgid "Perl modules to extend <package>vhdl</package> and <package>verilog</package> support. These Perl modules together with rawhide's <package>gtkwave</package> improves chip testing support."
 msgstr ""
 
 #. Tag: para
@@ -4393,11 +3157,8 @@ msgstr ""
 #. Tag: para
 #: ElectronicDesignAssistants.xml:100
 #, no-c-format
-msgid ""
-"Improved PLI support on both <package>iverilog</package> and <package>ghdl</"
-"package>"
-msgstr ""
-"在 <package>iverilog</package> 和 <package>ghdl</package> 中的改进的 PLI 支持"
+msgid "Improved PLI support on both <package>iverilog</package> and <package>ghdl</package>"
+msgstr "在 <package>iverilog</package> 和 <package>ghdl</package> 中的改进的 PLI 支持"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:106
@@ -4420,13 +3181,8 @@ msgstr "为 DSP 设计流程引进升级工具"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:124
 #, no-c-format
-msgid ""
-"Users are using the standard Fedora Live media or the \"Electronic Lab\" "
-"<command>yum</command> group to deploy this high-end hardware design, "
-"simulation, and verification platform. To install run the following command:"
-msgstr ""
-"ç”¨æˆ·çŽ°åœ¨æ­£åœ¨ä½¿ç”¨æ ‡å‡† Fedora Live 介质或者“电子实验室”<command>yum</command> "
-"组群部署这个高端硬件设计、模拟以及确认平台。要安装请运行以下命令："
+msgid "Users are using the standard Fedora Live media or the \"Electronic Lab\" <command>yum</command> group to deploy this high-end hardware design, simulation, and verification platform. To install run the following command:"
+msgstr "ç”¨æˆ·çŽ°åœ¨æ­£åœ¨ä½¿ç”¨æ ‡å‡† Fedora Live 介质或者“电子实验室”<command>yum</command> 组群部署这个高端硬件设计、模拟以及确认平台。要安装请运行以下命令："
 
 #. Tag: screen
 #: ElectronicDesignAssistants.xml:130
@@ -4443,24 +3199,14 @@ msgstr "游戏和娱乐"
 #. Tag: remark
 #: Entertainment.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Entertainment\">https://fedoraproject.org/wiki/Docs/"
-"Beats/Entertainment</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Entertainment\">https://fedoraproject.org/wiki/Docs/Beats/"
-"Entertainment</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Entertainment\">https://fedoraproject.org/wiki/Docs/Beats/Entertainment</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Entertainment\">https://fedoraproject.org/wiki/Docs/Beats/Entertainment</ulink>"
 
 #. Tag: para
 #: Entertainment.xml:8
 #, no-c-format
-msgid ""
-"<ulink type=\"http\" url=\"http://www.wesnoth.org/\">Battle for Wesnoth</"
-"ulink> (<package>wesnoth</package>) has been updated to the new 1.6 release."
-msgstr ""
-"已将 <ulink type=\"http\" url=\"http://www.wesnoth.org/\">Battle for "
-"Wesnoth</ulink>（<package>wesnoth</package>）更新至新的 1.6 发行本。"
+msgid "<ulink type=\"http\" url=\"http://www.wesnoth.org/\">Battle for Wesnoth</ulink> (<package>wesnoth</package>) has been updated to the new 1.6 release."
+msgstr "已将 <ulink type=\"http\" url=\"http://www.wesnoth.org/\">Battle for Wesnoth</ulink>（<package>wesnoth</package>）更新至新的 1.6 发行本。"
 
 #. Tag: title
 #: Feedback.xml:6
@@ -4471,13 +3217,8 @@ msgstr "反馈"
 #. Tag: para
 #: Feedback.xml:7
 #, no-c-format
-msgid ""
-"Thank you for taking the time to provide your comments, suggestions, and bug "
-"reports to the Fedora community; this helps improve the state of Fedora, "
-"Linux, and free software worldwide."
-msgstr ""
-"感谢您花时间向 Fedora ç¤¾åŒºæå‡ºè¯„è®ºã€å»ºè®®å’Œé”™è¯¯æŠ¥å‘Šã€‚è¿™æ ·å¯ä»¥å¸®åŠ©æˆ‘ä»¬æé«˜ "
-"Fedora、Linux 以及全球自由软件的状况。"
+msgid "Thank you for taking the time to provide your comments, suggestions, and bug reports to the Fedora community; this helps improve the state of Fedora, Linux, and free software worldwide."
+msgstr "感谢您花时间向 Fedora ç¤¾åŒºæå‡ºè¯„è®ºã€å»ºè®®å’Œé”™è¯¯æŠ¥å‘Šã€‚è¿™æ ·å¯ä»¥å¸®åŠ©æˆ‘ä»¬æé«˜ Fedora、Linux 以及全球自由软件的状况。"
 
 #. Tag: title
 #: Feedback.xml:13
@@ -4488,21 +3229,8 @@ msgstr "提供 Fedora 软件反馈"
 #. Tag: para
 #: Feedback.xml:14
 #, no-c-format
-msgid ""
-"To provide feedback on Fedora software or other system elements, please "
-"refer to <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"Bugs_and_feature_requests\">http://fedoraproject.org/wiki/"
-"Bugs_and_feature_requests</ulink>. A list of commonly reported bugs and "
-"known issues for this release is available from <ulink type=\"http\" url="
-"\"http://fedoraproject.org/wiki/Common_F11_bugs\">http://fedoraproject.org/"
-"wiki/Common_F11_bugs</ulink>."
-msgstr ""
-"要提交关于 Fedora è½¯ä»¶æˆ–å…¶ä»–ç³»ç»Ÿå…ƒç´ çš„åé¦ˆï¼Œè¯·å‚è€ƒ <ulink type=\"http\" url="
-"\"http://fedoraproject.org/wiki/Bugs_and_feature_requests\">http://"
-"fedoraproject.org/wiki/Bugs_and_feature_requests</ulink>。一般报告的 bug 列表"
-"以及这个发行本的已知问题请参考 <ulink type=\"http\" url=\"http://"
-"fedoraproject.org/wiki/Common_F11_bugs\">http://fedoraproject.org/wiki/"
-"Common_F11_bugs</ulink>。"
+msgid "To provide feedback on Fedora software or other system elements, please refer to <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Bugs_and_feature_requests\">http://fedoraproject.org/wiki/Bugs_and_feature_requests</ulink>. A list of commonly reported bugs and known issues for this release is available from <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Common_F11_bugs\">http://fedoraproject.org/wiki/Common_F11_bugs</ulink>."
+msgstr "要提交关于 Fedora è½¯ä»¶æˆ–å…¶ä»–ç³»ç»Ÿå…ƒç´ çš„åé¦ˆï¼Œè¯·å‚è€ƒ <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Bugs_and_feature_requests\">http://fedoraproject.org/wiki/Bugs_and_feature_requests</ulink>。一般报告的 bug 列表以及这个发行本的已知问题请参考 <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Common_F11_bugs\">http://fedoraproject.org/wiki/Common_F11_bugs</ulink>。"
 
 #. Tag: title
 #: Feedback.xml:24
@@ -4513,48 +3241,26 @@ msgstr "提供发行注记反馈"
 #. Tag: para
 #: Feedback.xml:25
 #, no-c-format
-msgid ""
-"If you feel these release notes could be improved in any way, you can "
-"provide your feedback directly to the beat writers. There are several ways "
-"to provide feedback, in order of preference:"
-msgstr ""
-"如果您认为可以以某种方式改进发行注记，可以直接向作者提交反馈。这里列出了多条"
-"反馈的途径，按首选排序："
+msgid "If you feel these release notes could be improved in any way, you can provide your feedback directly to the beat writers. There are several ways to provide feedback, in order of preference:"
+msgstr "如果您认为可以以某种方式改进发行注记，可以直接向作者提交反馈。这里列出了多条反馈的途径，按首选排序："
 
 #. Tag: para
 #: Feedback.xml:31
 #, no-c-format
-msgid ""
-"If you have a Fedora account, edit content directly at <ulink type=\"http\" "
-"url=\"http://fedoraproject.org/wiki/Documentation_Beats\">http://"
-"fedoraproject.org/wiki/Documentation_Beats</ulink>."
-msgstr ""
-"如果您有 Fedora 帐户，请直接在 <ulink type=\"http\" url=\"http://"
-"fedoraproject.org/wiki/Documentation_Beats\">http://fedoraproject.org/wiki/"
-"Documentation_Beats</ulink> 编辑内容。"
+msgid "If you have a Fedora account, edit content directly at <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Documentation_Beats\">http://fedoraproject.org/wiki/Documentation_Beats</ulink>."
+msgstr "如果您有 Fedora 帐户，请直接在 <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Documentation_Beats\">http://fedoraproject.org/wiki/Documentation_Beats</ulink> 编辑内容。"
 
 #. Tag: para
 #: Feedback.xml:37
 #, fuzzy, no-c-format
-msgid ""
-"Fill out a bug request using this template: <ulink type=\"http\" url="
-"\"http://tinyurl.com/nej3u\">http://tinyurl.com/nej3u</ulink> - <emphasis "
-"role=\"bold\">This link is ONLY for feedback on the release notes themselves."
-"</emphasis> Refer to the admonition above for details."
-msgstr ""
-"请使用这个模板填写 bug 报告：<ulink url=\"http://tinyurl.com/nej3u\"/> - "
-"<emphasis>这个链接只用于发行注记的反馈。</emphasis>详情请参考 <xref linkend="
-"\"sn-Providing_feedback_on_Fedora_software\"/>。"
+msgid "Fill out a bug request using this template: <ulink type=\"http\" url=\"http://tinyurl.com/nej3u\">http://tinyurl.com/nej3u</ulink> - <emphasis role=\"bold\">This link is ONLY for feedback on the release notes themselves.</emphasis> Refer to the admonition above for details."
+msgstr "请使用这个模板填写 bug 报告：<ulink url=\"http://tinyurl.com/nej3u\"/> - <emphasis>这个链接只用于发行注记的反馈。</emphasis>详情请参考 <xref linkend=\"sn-Providing_feedback_on_Fedora_software\"/>。"
 
 #. Tag: para
 #: Feedback.xml:45
 #, no-c-format
-msgid ""
-"Email <ulink type=\"http\" url=\"relnotes at fedoraproject.org"
-"\">relnotes at fedoraproject.org</ulink>."
-msgstr ""
-"电子邮件 <ulink type=\"http\" url=\"relnotes at fedoraproject.org"
-"\">relnotes at fedoraproject.org</ulink>。"
+msgid "Email <ulink type=\"http\" url=\"relnotes at fedoraproject.org\">relnotes at fedoraproject.org</ulink>."
+msgstr "电子邮件 <ulink type=\"http\" url=\"relnotes at fedoraproject.org\">relnotes at fedoraproject.org</ulink>。"
 
 #. Tag: title
 #: FileServers.xml:6
@@ -4565,14 +3271,8 @@ msgstr "文件服务器"
 #. Tag: remark
 #: FileServers.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Documentation_File_Servers_Beat\">https://fedoraproject.org/wiki/"
-"Documentation_File_Servers_Beat</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Documentation_File_Servers_Beat\">https://fedoraproject.org/wiki/"
-"Documentation_File_Servers_Beat</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_File_Servers_Beat\">https://fedoraproject.org/wiki/Documentation_File_Servers_Beat</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_File_Servers_Beat\">https://fedoraproject.org/wiki/Documentation_File_Servers_Beat</ulink>"
 
 #. Tag: term
 #: FileServers.xml:12
@@ -4583,29 +3283,14 @@ msgstr "vsftpd"
 #. Tag: para
 #: FileServers.xml:14
 #, no-c-format
-msgid ""
-"<package>vsftpd</package> 2.1.0 is included in Fedora 11. This update "
-"includes enhanced SSL support and a number of fixes. A detailed change log "
-"may be found at <ulink type=\"ftp\" url=\"ftp://vsftpd.beasts.org/users/"
-"cevans/untar/vsftpd-2.1.0/Changelog\">ftp://vsftpd.beasts.org/users/cevans/"
-"untar/vsftpd-2.1.0/Changelog</ulink>."
-msgstr ""
-"Fedora 11使用了<package>vsftpd</package> 2.1.0ã€‚æ­¤æ›´æ–°æ·»åŠ äº†å¢žå¼ºSSL支持并做了"
-"很多修正。详细的变更日志可见<ulink type=\"ftp\" url=\"ftp://vsftpd.beasts."
-"org/users/cevans/untar/vsftpd-2.1.0/Changelog\">ftp://vsftpd.beasts.org/"
-"users/cevans/untar/vsftpd-2.1.0/Changelog</ulink>。"
+msgid "<package>vsftpd</package> 2.1.0 is included in Fedora 11. This update includes enhanced SSL support and a number of fixes. A detailed change log may be found at <ulink type=\"ftp\" url=\"ftp://vsftpd.beasts.org/users/cevans/untar/vsftpd-2.1.0/Changelog\">ftp://vsftpd.beasts.org/users/cevans/untar/vsftpd-2.1.0/Changelog</ulink>."
+msgstr "Fedora 11使用了<package>vsftpd</package> 2.1.0ã€‚æ­¤æ›´æ–°æ·»åŠ äº†å¢žå¼ºSSL支持并做了很多修正。详细的变更日志可见<ulink type=\"ftp\" url=\"ftp://vsftpd.beasts.org/users/cevans/untar/vsftpd-2.1.0/Changelog\">ftp://vsftpd.beasts.org/users/cevans/untar/vsftpd-2.1.0/Changelog</ulink>。"
 
 #. Tag: remark
 #: FileSystems.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/FileSystems\">https://fedoraproject.org/wiki/Docs/Beats/"
-"FileSystems</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/FileSystems\">https://fedoraproject.org/wiki/Docs/Beats/"
-"FileSystems</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/FileSystems\">https://fedoraproject.org/wiki/Docs/Beats/FileSystems</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/FileSystems\">https://fedoraproject.org/wiki/Docs/Beats/FileSystems</ulink>"
 
 #. Tag: title
 #: FileSystems.xml:9
@@ -4616,9 +3301,7 @@ msgstr "Ext4 - 默认文件系统"
 #. Tag: para
 #: FileSystems.xml:10
 #, no-c-format
-msgid ""
-"Fedora 11 utilizes ext4 as the default file system. ext4 brings significant "
-"new features and performance enhancements including:"
+msgid "Fedora 11 utilizes ext4 as the default file system. ext4 brings significant new features and performance enhancements including:"
 msgstr ""
 
 #. Tag: para
@@ -4654,24 +3337,19 @@ msgstr "性能"
 #. Tag: para
 #: FileSystems.xml:41
 #, no-c-format
-msgid ""
-"Extents increase performance in certain situations, especially large files"
+msgid "Extents increase performance in certain situations, especially large files"
 msgstr ""
 
 #. Tag: para
 #: FileSystems.xml:47
 #, no-c-format
-msgid ""
-"Multiblock allocation is a new file block allocation method with faster "
-"write speed"
+msgid "Multiblock allocation is a new file block allocation method with faster write speed"
 msgstr ""
 
 #. Tag: para
 #: FileSystems.xml:53
 #, no-c-format
-msgid ""
-"These combine with delayed allocation of blocks for better performance and "
-"fragmentation"
+msgid "These combine with delayed allocation of blocks for better performance and fragmentation"
 msgstr ""
 
 #. Tag: title
@@ -4683,10 +3361,7 @@ msgstr "缓冲的数据丢失缓和"
 #. Tag: para
 #: FileSystems.xml:65
 #, no-c-format
-msgid ""
-"The recent news about buffered data loss experienced during a system crash "
-"with ext4 has resulted in upstream, and thus F11, flushing file data on a "
-"truncate or rename to mitigate this issue."
+msgid "The recent news about buffered data loss experienced during a system crash with ext4 has resulted in upstream, and thus F11, flushing file data on a truncate or rename to mitigate this issue."
 msgstr ""
 
 #. Tag: title
@@ -4698,20 +3373,12 @@ msgstr "从 ext3 迁移到 ext4"
 #. Tag: para
 #: FileSystems.xml:74
 #, no-c-format
-msgid ""
-"It is generally recommended that users wishing to make use of ext4 start "
-"with a freshly formatted partition. However you may install with the "
-"<command>ext4migrate</command> boot option if you wish to convert your "
-"legacy ext3 partitions to ext4. Users are cautioned that they will not "
-"realize many of the benefits ext4 since the data currently residing on the "
-"partition will not make use of extents. New data will make use of extents. "
-"Please note that as suggested by the requirement to pass a boot option that "
-"migration to ext4 has not been heavily tested and users are urged to backup "
-"filesystems before attempting migration"
+msgid "It is generally recommended that users wishing to make use of ext4 start with a freshly formatted partition. However you may install with the <command>ext4migrate</command> boot option if you wish to convert your legacy ext3 partitions to ext4. Users are cautioned that they will not realize many of the benefits ext4 since the data currently residing on the partition will not make use of extents. New data will make use of extents. Please note that as suggested by the requirement to pass a boot option that migration to ext4 has not been heavily tested and users are urged to backup filesystems before attempting migration"
 msgstr ""
 
 #. Tag: title
-#: FileSystems.xml:89 FileSystems.xml:110
+#: FileSystems.xml:89
+#: FileSystems.xml:110
 #, no-c-format
 msgid "No grub support"
 msgstr "æ—  grub 支持"
@@ -4719,12 +3386,8 @@ msgstr "æ—  grub 支持"
 #. Tag: para
 #: FileSystems.xml:90
 #, no-c-format
-msgid ""
-"Currently <application>grub</application> doesn't support booting from an "
-"ext4 partition so make sure to utilize ext2/3 for /boot"
-msgstr ""
-"目前 <application>grub</application> 不支持从 ext 4 åˆ†åŒºå¼•å¯¼ï¼Œå› æ­¤è¯·ç¡®å®š /"
-"boot 使用 ext2/3。"
+msgid "Currently <application>grub</application> doesn't support booting from an ext4 partition so make sure to utilize ext2/3 for /boot"
+msgstr "目前 <application>grub</application> 不支持从 ext 4 åˆ†åŒºå¼•å¯¼ï¼Œå› æ­¤è¯·ç¡®å®š /boot 使用 ext2/3。"
 
 #. Tag: title
 #: FileSystems.xml:98
@@ -4735,24 +3398,14 @@ msgstr "btrfs - 下一代 Linux 文件系统"
 #. Tag: para
 #: FileSystems.xml:99
 #, no-c-format
-msgid ""
-"Fedora 11 makes btrfs, the next-generation Linux filesystem available as a "
-"technology preview. To enable btrfs pass <command>icantbelieveitsnotbtr</"
-"command> as a boot option. Users are warned that btrfs is still experimental "
-"and under heavy development. The on-disk format may yet change and much "
-"functionality is still missing such as a fully operative fsck or even proper "
-"out-of-space handling."
+msgid "Fedora 11 makes btrfs, the next-generation Linux filesystem available as a technology preview. To enable btrfs pass <command>icantbelieveitsnotbtr</command> as a boot option. Users are warned that btrfs is still experimental and under heavy development. The on-disk format may yet change and much functionality is still missing such as a fully operative fsck or even proper out-of-space handling."
 msgstr ""
 
 #. Tag: para
 #: FileSystems.xml:111
 #, no-c-format
-msgid ""
-"Currently <application>grub</application> doesn't support booting from a "
-"btrfs partition so make sure to utilize ext2/3 for /boot"
-msgstr ""
-"目前 <application>grub</application> 不支持从 ext 4 åˆ†åŒºå¼•å¯¼ï¼Œå› æ­¤è¯·ç¡®å®š /"
-"boot 使用 ext2/3。"
+msgid "Currently <application>grub</application> doesn't support booting from a btrfs partition so make sure to utilize ext2/3 for /boot"
+msgstr "目前 <application>grub</application> 不支持从 ext 4 åˆ†åŒºå¼•å¯¼ï¼Œå› æ­¤è¯·ç¡®å®š /boot 使用 ext2/3。"
 
 #. Tag: title
 #: HardwareOverview.xml:6
@@ -4763,14 +3416,8 @@ msgstr "硬件需求"
 #. Tag: remark
 #: HardwareOverview.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/HardwareOverview\">https://fedoraproject.org/wiki/Docs/"
-"Beats/HardwareOverview</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/HardwareOverview\">https://fedoraproject.org/wiki/Docs/Beats/"
-"HardwareOverview</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/HardwareOverview\">https://fedoraproject.org/wiki/Docs/Beats/HardwareOverview</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/HardwareOverview\">https://fedoraproject.org/wiki/Docs/Beats/HardwareOverview</ulink>"
 
 #. Tag: title
 #: HardwareOverview.xml:9
@@ -4787,16 +3434,8 @@ msgstr "最小 CPU：PowerPC G3 / POWER3"
 #. Tag: para
 #: HardwareOverview.xml:17
 #, fuzzy, no-c-format
-msgid ""
-"Fedora 11 supports the New World generation of Apple Power Macintosh, "
-"shipped from circa 1999 onward. Although Old World machines should work, "
-"they require a special bootloader which is not included in the Fedora "
-"distribution. Fedora has also been installed and tested on POWER5 and POWER6 "
-"machines."
-msgstr ""
-"Fedora 10 支持 Apple 在 1999 左右及其后发布的“新生代”Power Macintosh。虽然原"
-"则上讲，“旧生代”主机也可正常工作，但其所需特殊的引导装载程序没有包括在这个 "
-"Fedora 发行本中。Fedora 还在 POWER5 和 POWER6 中进行了安装测试。"
+msgid "Fedora 11 supports the New World generation of Apple Power Macintosh, shipped from circa 1999 onward. Although Old World machines should work, they require a special bootloader which is not included in the Fedora distribution. Fedora has also been installed and tested on POWER5 and POWER6 machines."
+msgstr "Fedora 10 支持 Apple 在 1999 左右及其后发布的“新生代”Power Macintosh。虽然原则上讲，“旧生代”主机也可正常工作，但其所需特殊的引导装载程序没有包括在这个 Fedora 发行本中。Fedora 还在 POWER5 和 POWER6 中进行了安装测试。"
 
 #. Tag: para
 #: HardwareOverview.xml:27
@@ -4807,26 +3446,19 @@ msgstr "Fedora 11 支持 pSeries 和 Cell 宽带引擎机。"
 #. Tag: para
 #: HardwareOverview.xml:32
 #, no-c-format
-msgid ""
-"Fedora 11 also supports the Sony PlayStation 3 and Genesi Pegasos II and "
-"Efika."
-msgstr ""
-"Fedora 11 还支持 Sony 的 PlayStation 3 和 Genesi Pegasos II 以及 Efika。"
+msgid "Fedora 11 also supports the Sony PlayStation 3 and Genesi Pegasos II and Efika."
+msgstr "Fedora 11 还支持 Sony 的 PlayStation 3 和 Genesi Pegasos II 以及 Efika。"
 
 #. Tag: para
 #: HardwareOverview.xml:38
 #, no-c-format
-msgid ""
-"Fedora 11 includes new hardware support for the P.A. Semiconductor 'Electra' "
-"machines."
+msgid "Fedora 11 includes new hardware support for the P.A. Semiconductor 'Electra' machines."
 msgstr "Fedora 11 包含了对 P.A. 半导体“Electra” 机器的新硬件支持。"
 
 #. Tag: para
 #: HardwareOverview.xml:44
 #, no-c-format
-msgid ""
-"Fedora 11 also includes support for Terrasoft Solutions powerstation "
-"workstations."
+msgid "Fedora 11 also includes support for Terrasoft Solutions powerstation workstations."
 msgstr "Fedora 11 还包括对 Terrasoft 解决方案电源工作站的支持。"
 
 #. Tag: para
@@ -4850,15 +3482,8 @@ msgstr "x86 构架的处理器和内存要求"
 #. Tag: para
 #: HardwareOverview.xml:63
 #, fuzzy, no-c-format
-msgid ""
-"The following CPU specifications are stated in terms of Intel processors. "
-"Other processors, such as those from AMD, Cyrix, and VIA that are compatible "
-"with and equivalent to the following Intel processors, may also be used with "
-"Fedora. Fedora 11 requires an Intel Pentium or better processor, and is "
-"optimized for Pentium 4 and later processors."
-msgstr ""
-"下列 CPU 特性采用 Intel 处理器型号来描述。Fedora 也可以运行于其他处理器厂商 "
-"(包括 AMD, Cyrix 和 VIA ) 的兼容产品上。"
+msgid "The following CPU specifications are stated in terms of Intel processors. Other processors, such as those from AMD, Cyrix, and VIA that are compatible with and equivalent to the following Intel processors, may also be used with Fedora. Fedora 11 requires an Intel Pentium or better processor, and is optimized for Pentium 4 and later processors."
+msgstr "下列 CPU 特性采用 Intel 处理器型号来描述。Fedora 也可以运行于其他处理器厂商 (包括 AMD, Cyrix 和 VIA ) 的兼容产品上。"
 
 #. Tag: para
 #: HardwareOverview.xml:72
@@ -4923,40 +3548,20 @@ msgstr "所有构架的硬盘空间要求"
 #. Tag: para
 #: HardwareOverview.xml:125
 #, fuzzy, no-c-format
-msgid ""
-"The complete packages can occupy over 9 GB of disk space. Final size is "
-"entirely determined by the installing spin and the packages selected during "
-"installation. Additional disk space is required during installation to "
-"support the installation environment. This additional disk space corresponds "
-"to the size of /Fedora/base/stage2.img (on Installation Disc 1) plus the "
-"size of the files in /var/lib/rpm on the installed system."
-msgstr ""
-"å®‰è£…å…¨éƒ¨è½¯ä»¶åŒ…ä¼šå ç”¨ 9 GB 以上的磁盘空间。实际需要的空间取决于具体的发布集"
-"（Spinï¼‰ä»¥åŠå®‰è£…è¿‡ç¨‹ä¸­é€‰æ‹©çš„è½¯ä»¶åŒ…ã€‚å®‰è£…è¿‡ç¨‹ä¸­ï¼Œå®‰è£…ç¨‹åºè¿˜éœ€è¦é™„åŠ çš„ç£ç›˜ç©ºé—´"
-"æ”¯æŒå®‰è£…çŽ¯å¢ƒã€‚é™„åŠ ç£ç›˜ç©ºé—´çš„å¤§å°ç›¸å½“äºŽä½äºŽç¬¬ä¸€å¼ å®‰è£…ç›˜ä¸­çš„ <filename>/Fedora/"
-"base/stage2.img</filename> 的大小及 <filename>/var/lib/rpm</filename> 的大小"
-"的和"
+msgid "The complete packages can occupy over 9 GB of disk space. Final size is entirely determined by the installing spin and the packages selected during installation. Additional disk space is required during installation to support the installation environment. This additional disk space corresponds to the size of /Fedora/base/stage2.img (on Installation Disc 1) plus the size of the files in /var/lib/rpm on the installed system."
+msgstr "å®‰è£…å…¨éƒ¨è½¯ä»¶åŒ…ä¼šå ç”¨ 9 GB 以上的磁盘空间。实际需要的空间取决于具体的发布集（Spinï¼‰ä»¥åŠå®‰è£…è¿‡ç¨‹ä¸­é€‰æ‹©çš„è½¯ä»¶åŒ…ã€‚å®‰è£…è¿‡ç¨‹ä¸­ï¼Œå®‰è£…ç¨‹åºè¿˜éœ€è¦é™„åŠ çš„ç£ç›˜ç©ºé—´æ”¯æŒå®‰è£…çŽ¯å¢ƒã€‚é™„åŠ ç£ç›˜ç©ºé—´çš„å¤§å°ç›¸å½“äºŽä½äºŽç¬¬ä¸€å¼ å®‰è£…ç›˜ä¸­çš„ <filename>/Fedora/base/stage2.img</filename> 的大小及 <filename>/var/lib/rpm</filename> 的大小的和"
 
 #. Tag: para
 #: HardwareOverview.xml:134
 #, no-c-format
-msgid ""
-"In practical terms, additional space requirements may range from as little "
-"as 90 MiB for a minimal installation to as much as an additional 175 MiB for "
-"a larger installation."
-msgstr ""
-"在实际操作中，最小安装需要 90MiB é™„åŠ çš„ç©ºé—´ï¼Œè€Œå®Œå…¨å®‰è£…éœ€è¦ 175MiB é™„åŠ çš„ç©º"
-"间。"
+msgid "In practical terms, additional space requirements may range from as little as 90 MiB for a minimal installation to as much as an additional 175 MiB for a larger installation."
+msgstr "在实际操作中，最小安装需要 90MiB é™„åŠ çš„ç©ºé—´ï¼Œè€Œå®Œå…¨å®‰è£…éœ€è¦ 175MiB é™„åŠ çš„ç©ºé—´ã€‚"
 
 #. Tag: para
 #: HardwareOverview.xml:139
 #, no-c-format
-msgid ""
-"Additional space is also required for any user data, and at least 5% free "
-"space should be maintained for proper system operation."
-msgstr ""
-"除此之外，还需要额外的存储空间存放用户数据。还应保留至少 5% 空闲空间为系统正"
-"常运作所用。"
+msgid "Additional space is also required for any user data, and at least 5% free space should be maintained for proper system operation."
+msgstr "除此之外，还需要额外的存储空间存放用户数据。还应保留至少 5% 空闲空间为系统正常运作所用。"
 
 #. Tag: title
 #: I18n.xml:6
@@ -4967,13 +3572,8 @@ msgstr "国际语言支持"
 #. Tag: remark
 #: I18n.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/I18n\">https://fedoraproject.org/wiki/Docs/Beats/I18n</"
-"ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/I18n\">https://fedoraproject.org/wiki/Docs/Beats/I18n</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/I18n\">https://fedoraproject.org/wiki/Docs/Beats/I18n</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/I18n\">https://fedoraproject.org/wiki/Docs/Beats/I18n</ulink>"
 
 #. Tag: para
 #: I18n.xml:9
@@ -4984,26 +3584,14 @@ msgstr "这一节包含 Fedora 中多语种支持相关的信息。"
 #. Tag: para
 #: I18n.xml:14
 #, no-c-format
-msgid ""
-"Localization (translation) of Fedora is coordinated by the Fedora "
-"Localization Project -- <ulink type=\"http\" url=\"http://fedoraproject.org/"
-"wiki/L10N\">http://fedoraproject.org/wiki/L10N</ulink>"
-msgstr ""
-"Fedora 本地化（翻译）是由 Fedora 本地化项目协调的 －－ <ulink type=\"http\" "
-"url=\"http://fedoraproject.org/wiki/L10N\">http://fedoraproject.org/wiki/"
-"L10N</ulink>"
+msgid "Localization (translation) of Fedora is coordinated by the Fedora Localization Project -- <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/L10N\">http://fedoraproject.org/wiki/L10N</ulink>"
+msgstr "Fedora 本地化（翻译）是由 Fedora 本地化项目协调的 －－ <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/L10N\">http://fedoraproject.org/wiki/L10N</ulink>"
 
 #. Tag: para
 #: I18n.xml:21
 #, no-c-format
-msgid ""
-"Internationalization of Fedora is maintained by the Fedora "
-"Internationalization Project -- <ulink type=\"http\" url=\"http://"
-"fedoraproject.org/wiki/I18N\">http://fedoraproject.org/wiki/I18N</ulink>"
-msgstr ""
-"Fedora 的国际化是由 Fedora I18n 项目维护的 -- <ulink type=\"http\" url="
-"\"http://fedoraproject.org/wiki/I18N\">http://fedoraproject.org/wiki/I18N</"
-"ulink>"
+msgid "Internationalization of Fedora is maintained by the Fedora Internationalization Project -- <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/I18N\">http://fedoraproject.org/wiki/I18N</ulink>"
+msgstr "Fedora 的国际化是由 Fedora I18n 项目维护的 -- <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/I18N\">http://fedoraproject.org/wiki/I18N</ulink>"
 
 #. Tag: title
 #: I18n.xml:30
@@ -5014,13 +3602,8 @@ msgstr "语言覆盖"
 #. Tag: para
 #: I18n.xml:31
 #, no-c-format
-msgid ""
-"Fedora features a variety of software that is translated in many languages. "
-"For a list of languages refer to the translation statistics for the Anaconda "
-"module, which is one of the core software applications in Fedora."
-msgstr ""
-"Fedora 中有各种翻译成多种语言的软件。语言列表请参考 <application>Anaconda</"
-"application> 模块翻译统计，它是 Fedora çš„æ ¸å¿ƒè½¯ä»¶åº”ç”¨ç¨‹åºä¹‹ä¸€ã€‚"
+msgid "Fedora features a variety of software that is translated in many languages. For a list of languages refer to the translation statistics for the Anaconda module, which is one of the core software applications in Fedora."
+msgstr "Fedora 中有各种翻译成多种语言的软件。语言列表请参考 <application>Anaconda</application> 模块翻译统计，它是 Fedora çš„æ ¸å¿ƒè½¯ä»¶åº”ç”¨ç¨‹åºä¹‹ä¸€ã€‚"
 
 #. Tag: ulink
 #: I18n.xml:40
@@ -5044,18 +3627,13 @@ msgstr "语言支持安装"
 #: I18n.xml:53
 #, fuzzy, no-c-format
 msgid ""
-"To install language packs and additional language support from the Languages "
-"group, run this command: <screen>\n"
+"To install language packs and additional language support from the Languages group, run this command: <screen>\n"
 "          su -c 'yum groupinstall &lt;language&gt;-support'\n"
-"        </screen> In the command above, &lt;language&gt; is one of assamese, "
-"bengali, chinese, gujarati, hindi, japanese, kannada, korean, malayalam, "
-"marathi, oriya, punjabi, sinhala, tamil, telegu, thai, and so on."
+"        </screen> In the command above, &lt;language&gt; is one of assamese, bengali, chinese, gujarati, hindi, japanese, kannada, korean, malayalam, marathi, oriya, punjabi, sinhala, tamil, telegu, thai, and so on."
 msgstr ""
 "要从语言组群中安装语言包以及额外语言支持，请运行这个命令：<screen>\n"
 "          su -c 'yum groupinstall &lt;language&gt;-support'\n"
-"        </screen> 在上面的命令中，&lt;language&gt; 是 assamese、bengali、"
-"chinese、gujarati、hindi、japanese、kannada、korean、malayalam、marathi、"
-"oriya、punjabi、sinhala、tamil、telegu、thai 等等语言之一。"
+"        </screen> 在上面的命令中，&lt;language&gt; 是 assamese、bengali、chinese、gujarati、hindi、japanese、kannada、korean、malayalam、marathi、oriya、punjabi、sinhala、tamil、telegu、thai 等等语言之一。"
 
 #. Tag: title
 #: I18n.xml:64
@@ -5066,31 +3644,14 @@ msgstr "在线翻译"
 #. Tag: para
 #: I18n.xml:65
 #, no-c-format
-msgid ""
-"Fedora uses the <ulink type=\"http\" url=\"http://transifex.org/"
-"\">Transifex</ulink> online tool to facilitate contributing translations of "
-"Fedora-hosted and other upstream projects by numerous translators."
-msgstr ""
-"Fedora 采用 <ulink type=\"http\" url=\"http://transifex.org/\">Transifex</"
-"ulink> 在线工具帮助众多翻译人员在 Fedora 托管的以及其它上游项目中贡献其翻译成"
-"果。"
+msgid "Fedora uses the <ulink type=\"http\" url=\"http://transifex.org/\">Transifex</ulink> online tool to facilitate contributing translations of Fedora-hosted and other upstream projects by numerous translators."
+msgstr "Fedora 采用 <ulink type=\"http\" url=\"http://transifex.org/\">Transifex</ulink> 在线工具帮助众多翻译人员在 Fedora 托管的以及其它上游项目中贡献其翻译成果。"
 
 #. Tag: para
 #: I18n.xml:71
 #, fuzzy, no-c-format
-msgid ""
-"Using the <ulink type=\"http\" url=\"http://translate.fedoraproject.org/"
-"\">online web tool</ulink>, translators can contribute directly to any "
-"registered upstream project through one translator-oriented web interface. "
-"Developers of projects with no existing translation community can easily "
-"reach out to Fedora's established community for translations. In turn, "
-"translators can reach out to numerous projects related to Fedora to easily "
-"contribute translations."
-msgstr ""
-"通过合并新的网页工具（<ulink url=\"http://translate.fedoraproject.org/\"/"
-">）、成长的社区以及更好的流程，译者可通过面向译者的网络界面直接向上游项目投"
-"稿。没有现成翻译团队的项目开发者可轻松地从已经建立的 Fedora 社区中得到翻译支"
-"持。反之，译者也可以看到众多与 Fedora 相关的项目并方便他们提交翻译。"
+msgid "Using the <ulink type=\"http\" url=\"http://translate.fedoraproject.org/\">online web tool</ulink>, translators can contribute directly to any registered upstream project through one translator-oriented web interface. Developers of projects with no existing translation community can easily reach out to Fedora's established community for translations. In turn, translators can reach out to numerous projects related to Fedora to easily contribute translations."
+msgstr "通过合并新的网页工具（<ulink url=\"http://translate.fedoraproject.org/\"/>）、成长的社区以及更好的流程，译者可通过面向译者的网络界面直接向上游项目投稿。没有现成翻译团队的项目开发者可轻松地从已经建立的 Fedora 社区中得到翻译支持。反之，译者也可以看到众多与 Fedora 相关的项目并方便他们提交翻译。"
 
 #. Tag: ulink
 #: I18n.xml:83
@@ -5107,9 +3668,7 @@ msgstr "字体"
 #. Tag: para
 #: I18n.xml:89
 #, no-c-format
-msgid ""
-"Fonts for most languages are installed by default on the desktop to give "
-"good default language coverage."
+msgid "Fonts for most languages are installed by default on the desktop to give good default language coverage."
 msgstr "默认在桌面中安装大多数语言的字体，这保证了较好的默认语言覆盖。"
 
 #. Tag: title
@@ -5122,24 +3681,10 @@ msgstr "默认汉族统一语言"
 #: I18n.xml:95
 #, fuzzy, no-c-format
 msgid ""
-"When GTK-based applications are not running in a Chinese, Japanese, or "
-"Korean (CJK) locale, Chinese characters (that is, Chinese Hanzi, Japanese "
-"Kanji, or Korean Hanja) may render with a mixture of Chinese, Japanese, and "
-"Korean fonts depending on the text. This happens when Pango does not have "
-"sufficient context to know which language is being used, due to the Han "
-"unification in Unicode. The current default font configuration seems to "
-"prefer Chinese fonts. If you normally want to use Japanese or Korean say, "
-"you can tell Pango to use it by default by setting the <code>PANGO_LANGUAGE</"
-"code> environment variable. For example... <screen>\n"
+"When GTK-based applications are not running in a Chinese, Japanese, or Korean (CJK) locale, Chinese characters (that is, Chinese Hanzi, Japanese Kanji, or Korean Hanja) may render with a mixture of Chinese, Japanese, and Korean fonts depending on the text. This happens when Pango does not have sufficient context to know which language is being used, due to the Han unification in Unicode. The current default font configuration seems to prefer Chinese fonts. If you normally want to use Japanese or Korean say, you can tell Pango to use it by default by setting the <code>PANGO_LANGUAGE</code> environment variable. For example... <screen>\n"
 "          export PANGO_LANGUAGE=ja\n"
-"        </screen> ...tells Pango rendering to assume Japanese text when it "
-"has no other indications."
-msgstr ""
-"当不在基于 GTK 的应用程序中使用亚洲位置时，中文字符（包括中文汉字、日本汉字或"
-"者韩语汉字）可能会与中文、日文和韩文字体混合，这要视文本而言。当 Pango 没有足"
-"够的上下文来确定所使用的语言时会出现这种情况。目前默认字体更倾向中文字体。如"
-"果您通常要使用的是日文或者韩文，您可以通过设置 <envar>PANGO_LANGUAGE</envar> "
-"环境变量让 Pango 默认使用它。例如："
+"        </screen> ...tells Pango rendering to assume Japanese text when it has no other indications."
+msgstr "当不在基于 GTK 的应用程序中使用亚洲位置时，中文字符（包括中文汉字、日本汉字或者韩语汉字）可能会与中文、日文和韩文字体混合，这要视文本而言。当 Pango 没有足够的上下文来确定所使用的语言时会出现这种情况。目前默认字体更倾向中文字体。如果您通常要使用的是日文或者韩文，您可以通过设置 <envar>PANGO_LANGUAGE</envar> 环境变量让 Pango 默认使用它。例如："
 
 #. Tag: title
 #: I18n.xml:113
@@ -5150,12 +3695,8 @@ msgstr "日语"
 #. Tag: para
 #: I18n.xml:114
 #, no-c-format
-msgid ""
-"The <package>fonts-japanese</package> package has been renamed to "
-"<package>japanese-bitmap-fonts</package>."
-msgstr ""
-"已经将 <package>fonts-japanese</package> 软件包重新命名为 <package>japanese-"
-"bitmap-fonts</package>。"
+msgid "The <package>fonts-japanese</package> package has been renamed to <package>japanese-bitmap-fonts</package>."
+msgstr "已经将 <package>fonts-japanese</package> 软件包重新命名为 <package>japanese-bitmap-fonts</package>。"
 
 #. Tag: title
 #: I18n.xml:120
@@ -5166,12 +3707,8 @@ msgstr "高棉语"
 #. Tag: para
 #: I18n.xml:121
 #, no-c-format
-msgid ""
-"Khmer OS Fonts <package>khmeros-fonts</package> have been added to Fedora "
-"for Khmer coverage in this release."
-msgstr ""
-"已经将高棉语操作系统字体 <package>khmeros-fonts</package> æ·»åŠ åˆ° Fedora 中以"
-"便在这个发行本中覆盖高棉语。"
+msgid "Khmer OS Fonts <package>khmeros-fonts</package> have been added to Fedora for Khmer coverage in this release."
+msgstr "已经将高棉语操作系统字体 <package>khmeros-fonts</package> æ·»åŠ åˆ° Fedora 中以便在这个发行本中覆盖高棉语。"
 
 #. Tag: title
 #: I18n.xml:127
@@ -5182,13 +3719,8 @@ msgstr "韩语"
 #. Tag: para
 #: I18n.xml:128
 #, fuzzy, no-c-format
-msgid ""
-"The <package>un-core-fonts</package> packages replaces <package>baekmuk-ttf-"
-"fonts</package> as the new Hangul default fonts.<package>un-extra-fonts</"
-"package> packages have been added."
-msgstr ""
-"使用 <package>un-core-fonts</package> 软件包替换 <package>baekmuk-ttf-fonts</"
-"package> 作为新的韩文默认字体。"
+msgid "The <package>un-core-fonts</package> packages replaces <package>baekmuk-ttf-fonts</package> as the new Hangul default fonts.<package>un-extra-fonts</package> packages have been added."
+msgstr "使用 <package>un-core-fonts</package> 软件包替换 <package>baekmuk-ttf-fonts</package> 作为新的韩文默认字体。"
 
 #. Tag: title
 #: I18n.xml:136
@@ -5199,31 +3731,13 @@ msgstr "完整变更列表"
 #. Tag: para
 #: I18n.xml:137
 #, fuzzy, no-c-format
-msgid ""
-"All fonts changes are listed on their dedicated page: <ulink type=\"http\" "
-"url=\"http://fedoraproject.org/wiki/Fonts_inclusion_history#F10\">http://"
-"fedoraproject.org/wiki/Fonts_inclusion_history#F11</ulink>"
-msgstr ""
-"将所有字体更改列在其专用页面中：<ulink type=\"http\" url=\"http://"
-"fedoraproject.org/wiki/Fonts_inclusion_history#F10\">http://fedoraproject."
-"org/wiki/Fonts_inclusion_history#F10</ulink>"
+msgid "All fonts changes are listed on their dedicated page: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Fonts_inclusion_history#F10\">http://fedoraproject.org/wiki/Fonts_inclusion_history#F11</ulink>"
+msgstr "将所有字体更改列在其专用页面中：<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Fonts_inclusion_history#F10\">http://fedoraproject.org/wiki/Fonts_inclusion_history#F10</ulink>"
 
 #. Tag: para
 #: I18n.xml:143
 #, fuzzy, no-c-format
-msgid ""
-"Fonts in Fedora: The <ulink type=\"http\" url=\"https://fedoraproject.org/"
-"wiki/Category:Fonts_SIG\">Fonts SIG</ulink> takes loving care of <ulink type="
-"\"http\" url=\"https://fedoraproject.org/wiki/Category:Fonts\">Fedora fonts</"
-"ulink>. Please <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Joining_the_Fonts_SIG\">join</ulink> this special interest group if you are "
-"interested in <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Fonts_and_text-related_creative_tasks\">creating</ulink>, <ulink type=\"http"
-"\" url=\"https://fedoraproject.org/wiki/Fonts_and_text_quality_assurance"
-"\">improving</ulink>, <ulink type=\"http\" url=\"https://fedoraproject.org/"
-"wiki/Category:Fonts_packaging\">packaging</ulink>, or just <ulink type=\"http"
-"\" url=\"https://fedoraproject.org/wiki/Category:Font_wishlist\">suggesting</"
-"ulink> a font. Any help will be appreciated."
+msgid "Fonts in Fedora: The <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Category:Fonts_SIG\">Fonts SIG</ulink> takes loving care of <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Category:Fonts\">Fedora fonts</ulink>. Please <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Joining_the_Fonts_SIG\">join</ulink> this special interest group if you are interested in <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Fonts_and_text-related_creative_tasks\">creating</ulink>, <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Fonts_and_text_quality_assurance\">improving</ulink>, <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Category:Fonts_packaging\">packaging</ulink>, or just <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Category:Font_wishlist\">suggesting</ulink> a font. Any help will be appreciated."
 msgstr "Fedora 中的字体："
 
 #. Tag: title
@@ -5235,16 +3749,8 @@ msgstr "输入法"
 #. Tag: para
 #: I18n.xml:166
 #, fuzzy, no-c-format
-msgid ""
-"The <command>yum</command> group called input-methods (Input Methods) is "
-"installed by default providing standard input methods for many languages. "
-"This allows turning on the default input method system and immediately "
-"having the standard input methods for most languages available."
-msgstr ""
-"对很多语言来说，默认安装名为 <package>input-methods</package> 和 "
-"<firstterm>Input Methods</firstterm> 新 <command>yum</command> 组群。这允许打"
-"å¼€é»˜è®¤è¾“å…¥æ³•ç³»ç»Ÿå¹¶ç«‹åˆ»æ‹¥æœ‰å¤§å¤šæ•°è¯­è¨€çš„æ ‡å‡†è¾“å…¥æ³•ã€‚å®ƒè¿˜æœ‰ä¸Ž Fedora Live 同步的"
-"一般安装。"
+msgid "The <command>yum</command> group called input-methods (Input Methods) is installed by default providing standard input methods for many languages. This allows turning on the default input method system and immediately having the standard input methods for most languages available."
+msgstr "对很多语言来说，默认安装名为 <package>input-methods</package> å’Œ <firstterm>Input Methods</firstterm> æ–° <command>yum</command> ç»„ç¾¤ã€‚è¿™å…è®¸æ‰“å¼€é»˜è®¤è¾“å…¥æ³•ç³»ç»Ÿå¹¶ç«‹åˆ»æ‹¥æœ‰å¤§å¤šæ•°è¯­è¨€çš„æ ‡å‡†è¾“å…¥æ³•ã€‚å®ƒè¿˜æœ‰ä¸Ž Fedora Live 同步的一般安装。"
 
 #. Tag: title
 #: I18n.xml:174
@@ -5255,67 +3761,25 @@ msgstr "iBus"
 #. Tag: para
 #: I18n.xml:175
 #, fuzzy, no-c-format
-msgid ""
-"Fedora 11 includes iBus, a new input method system that has been developed "
-"to overcome some of the architectural limitations of SCIM. <ulink type=\"http"
-"\" url=\"http://code.google.com/p/ibus\">http://code.google.com/p/ibus</"
-"ulink>"
-msgstr ""
-"Fedora 10 包括 <command>ibus</command>，它是一个新输入法系统，克服了 "
-"<command>scim</command> 的一些局限。它可能会在 Fedora 11 中成为默认输入法。"
+msgid "Fedora 11 includes iBus, a new input method system that has been developed to overcome some of the architectural limitations of SCIM. <ulink type=\"http\" url=\"http://code.google.com/p/ibus\">http://code.google.com/p/ibus</ulink>"
+msgstr "Fedora 10 包括 <command>ibus</command>，它是一个新输入法系统，克服了 <command>scim</command> 的一些局限。它可能会在 Fedora 11 中成为默认输入法。"
 
 #. Tag: para
 #: I18n.xml:181
 #, fuzzy, no-c-format
-msgid ""
-"It provides a number of input method engines and immodules: <itemizedlist> "
-"<listitem> <para> ibus-anthy (Japanese) </para> </listitem> <listitem> "
-"<para> ibus-chewing (Traditional Chinese) </para> </listitem> <listitem> "
-"<para> ibus-gtk (GTK+ immodule) </para> </listitem> <listitem> <para> ibus-"
-"hangul (Korean) </para> </listitem> <listitem> <para> ibus-m17n (Indic and "
-"many other languages) </para> </listitem> <listitem> <para> ibus-pinyin "
-"(Simplified Chinese) </para> </listitem> <listitem> <para> ibus-qt (Qt "
-"immodule) </para> </listitem> <listitem> <para> ibus-rawcode (Unicode code) "
-"</para> </listitem> <listitem> <para> ibus-sayura (Sinhala) </para> </"
-"listitem> <listitem> <para> ibus-table (Chinese, etc.) </para> </listitem> </"
-"itemizedlist> The first time iBus is run it may be to choose which input "
-"method engines are needed in the Preferences if there is not a default Input "
-"Method available for your native desktop language."
-msgstr ""
-"提供了很多输入法引擎及输入模块：<itemizedlist> <listitem> <para> ibus-anthy "
-"(Japanese) </para> </listitem> <listitem> <para> ibus-chewing (繁体中文) </"
-"para> </listitem> <listitem> <para> ibus-gtk (GTK+ immodule) </para> </"
-"listitem> <listitem> <para> ibus-hangul (韩语) </para> </listitem> "
-"<listitem> <para> ibus-m17n (印度语及其它语言) </para> </listitem> "
-"<listitem> <para> ibus-pinyin (简体中文) </para> </listitem> <listitem> "
-"<para> ibus-qt (Qt immodule) </para> </listitem> <listitem> <para> ibus-"
-"table (中文等) </para> </listitem> </itemizedlist> The first time ibus is "
-"run it is necessary to choose which input method engines are needed in the "
-"Preferences。"
+msgid "It provides a number of input method engines and immodules: <itemizedlist> <listitem> <para> ibus-anthy (Japanese) </para> </listitem> <listitem> <para> ibus-chewing (Traditional Chinese) </para> </listitem> <listitem> <para> ibus-gtk (GTK+ immodule) </para> </listitem> <listitem> <para> ibus-hangul (Korean) </para> </listitem> <listitem> <para> ibus-m17n (Indic and many other languages) </para> </listitem> <listitem> <para> ibus-pinyin (Simplified Chinese) </para> </listitem> <listitem> <para> ibus-qt (Qt immodule) </para> </listitem> <listitem> <para> ibus-rawcode (Unicode code) </para> </listitem> <listitem> <para> ibus-sayura (Sinhala) </para> </listitem> <listitem> <para> ibus-table (Chinese, etc.) </para> </listitem> </itemizedlist> The first time iBus is run it may be to choose which input method engines are needed in the Preferences if there is not a default Input Method available for your native desktop language."
+msgstr "提供了很多输入法引擎及输入模块：<itemizedlist> <listitem> <para> ibus-anthy (Japanese) </para> </listitem> <listitem> <para> ibus-chewing (繁体中文) </para> </listitem> <listitem> <para> ibus-gtk (GTK+ immodule) </para> </listitem> <listitem> <para> ibus-hangul (韩语) </para> </listitem> <listitem> <para> ibus-m17n (印度语及其它语言) </para> </listitem> <listitem> <para> ibus-pinyin (简体中文) </para> </listitem> <listitem> <para> ibus-qt (Qt immodule) </para> </listitem> <listitem> <para> ibus-table (中文等) </para> </listitem> </itemizedlist> The first time ibus is run it is necessary to choose which input method engines are needed in the Preferences。"
 
 #. Tag: para
 #: I18n.xml:240
 #, fuzzy, no-c-format
-msgid ""
-"We encourage people upgrading from earlier releases to install iBus, turn it "
-"on with im-chooser, and test it for their language, and report any problems "
-"in Bugzilla."
-msgstr ""
-"我们鼓励大家安装 <command>ibus</command>，测试其语言并报告遇到的所有问题。"
+msgid "We encourage people upgrading from earlier releases to install iBus, turn it on with im-chooser, and test it for their language, and report any problems in Bugzilla."
+msgstr "我们鼓励大家安装 <command>ibus</command>，测试其语言并报告遇到的所有问题。"
 
 #. Tag: para
 #: I18n.xml:245
 #, no-c-format
-msgid ""
-"The following hotkeys are available by default: <table id=\"Hotkeys\" frame="
-"\"all\"><title>Hotkeys</title> <tgroup cols=\"2\"> <thead> <row> "
-"<entry>Language</entry> <entry>Hotkey</entry> </row> </thead> <tbody> <row> "
-"<entry>general</entry> <entry>Control + Space</entry> </row> <row> "
-"<entry>Japanese</entry> <entry>Zenkaku_Hankaku; Alt+`; Alt+Zenkaku_Hankaku</"
-"entry> </row> <row> <entry>Korean</entry> <entry>Hangul; Alt+Alt_R+Release</"
-"entry> </row> </tbody> </tgroup> </table> These are all defined by default "
-"for convenience: individual users may prefer to remove some of them and also "
-"add their own ibus hotkeys in ibus-setup."
+msgid "The following hotkeys are available by default: <table id=\"Hotkeys\" frame=\"all\"><title>Hotkeys</title> <tgroup cols=\"2\"> <thead> <row> <entry>Language</entry> <entry>Hotkey</entry> </row> </thead> <tbody> <row> <entry>general</entry> <entry>Control + Space</entry> </row> <row> <entry>Japanese</entry> <entry>Zenkaku_Hankaku; Alt+`; Alt+Zenkaku_Hankaku</entry> </row> <row> <entry>Korean</entry> <entry>Hangul; Alt+Alt_R+Release</entry> </row> </tbody> </tgroup> </table> These are all defined by default for convenience: individual users may prefer to remove some of them and also add their own ibus hotkeys in ibus-setup."
 msgstr ""
 
 #. Tag: title
@@ -5327,23 +3791,13 @@ msgstr "im-chooser 和 imsettings"
 #. Tag: para
 #: I18n.xml:278
 #, fuzzy, no-c-format
-msgid ""
-"Input methods only start by default on desktops running in an Asian locale "
-"(specifically for the following locale: as, bn, gu, hi, ja, kn, ko, ml, mr, "
-"ne, or, pa, si, ta, te, th, ur, vi, zh). Use im-chooser via System > "
-"Preferences > Personal > Input Method to enable or disable input method "
-"usage on your desktop at any time with imsettings."
-msgstr ""
-"输入法仅在使用亚洲语言(为以下语言： as, bn, gu, hi, ja, kn, ko, ml, mr, ne, "
-"or, pa, si, ta, te, th, ur, vi, zh)的桌面上默认运行。在 系统 > 偏好设置 > 个"
-"人 > 输入法中用输入法切换器在任何时候启用或禁用输入法。"
+msgid "Input methods only start by default on desktops running in an Asian locale (specifically for the following locale: as, bn, gu, hi, ja, kn, ko, ml, mr, ne, or, pa, si, ta, te, th, ur, vi, zh). Use im-chooser via System > Preferences > Personal > Input Method to enable or disable input method usage on your desktop at any time with imsettings."
+msgstr "输入法仅在使用亚洲语言(为以下语言： as, bn, gu, hi, ja, kn, ko, ml, mr, ne, or, pa, si, ta, te, th, ur, vi, zh)的桌面上默认运行。在 系统 > 偏好设置 > 个人 > 输入法中用输入法切换器在任何时候启用或禁用输入法。"
 
 #. Tag: para
 #: I18n.xml:286
 #, no-c-format
-msgid ""
-"Under imsettings framework the GTK_IM_MODULE environment variable is no "
-"longer needed by default."
+msgid "Under imsettings framework the GTK_IM_MODULE environment variable is no longer needed by default."
 msgstr "æ ¹æ®è¾“å…¥æ³•è®¾ç½®æ¡†æž¶ï¼Œé»˜è®¤å°†ä¸å†éœ€è¦GTK_IM_MODULE环境变量。"
 
 #. Tag: title
@@ -5355,14 +3809,8 @@ msgstr "印度语屏显键盘"
 #. Tag: para
 #: I18n.xml:293
 #, fuzzy, no-c-format
-msgid ""
-"iok is an onscreen virtual keyboard for Indian languages, which allows input "
-"using Inscript keymap layouts and other 1:1 key mappings. For more "
-"information refer to the homepage: <ulink type=\"http\" url=\"https://"
-"fedorahosted.org/iok\">https://fedorahosted.org/iok</ulink>"
-msgstr ""
-"Fedora 10 包括 <command>iok</command>，它是一个印度语屏幕虚拟键盘，允许使用 "
-"Inscript 键盘布局和其它 1:1 键匹配。有关详情请参考主页："
+msgid "iok is an onscreen virtual keyboard for Indian languages, which allows input using Inscript keymap layouts and other 1:1 key mappings. For more information refer to the homepage: <ulink type=\"http\" url=\"https://fedorahosted.org/iok\">https://fedorahosted.org/iok</ulink>"
+msgstr "Fedora 10 包括 <command>iok</command>，它是一个印度语屏幕虚拟键盘，允许使用 Inscript 键盘布局和其它 1:1 键匹配。有关详情请参考主页："
 
 #. Tag: title
 #: I18n.xml:303
@@ -5373,10 +3821,7 @@ msgstr ""
 #. Tag: para
 #: I18n.xml:304
 #, no-c-format
-msgid ""
-"XIM immodule isn't installed by default anymore. if you want to use XIM on "
-"GTK+ applications, you need to install the <package>gtk2-immodules</package> "
-"package."
+msgid "XIM immodule isn't installed by default anymore. if you want to use XIM on GTK+ applications, you need to install the <package>gtk2-immodules</package> package."
 msgstr ""
 
 #. Tag: title
@@ -5388,14 +3833,8 @@ msgstr "印度语系印刷支持"
 #. Tag: para
 #: I18n.xml:312
 #, fuzzy, no-c-format
-msgid ""
-"Fedora 11 includes sorting support for Indic languages. This support fixes "
-"listing and order of menus in these languages, representing them in sorted "
-"order and making it easy to find desired elements. These languages are "
-"covered by this support:"
-msgstr ""
-"Fedora 11 包括对印度语系语言的分类支持。这个支持修正了这些语言的列表和菜单顺"
-"åºï¼Œä½¿ç”¨åˆ†ç±»é¡ºåºï¼Œä¾¿äºŽæŸ¥æ‰¾æ‰€éœ€å…ƒç´ ã€‚"
+msgid "Fedora 11 includes sorting support for Indic languages. This support fixes listing and order of menus in these languages, representing them in sorted order and making it easy to find desired elements. These languages are covered by this support:"
+msgstr "Fedora 11 åŒ…æ‹¬å¯¹å°åº¦è¯­ç³»è¯­è¨€çš„åˆ†ç±»æ”¯æŒã€‚è¿™ä¸ªæ”¯æŒä¿®æ­£äº†è¿™äº›è¯­è¨€çš„åˆ—è¡¨å’Œèœå•é¡ºåºï¼Œä½¿ç”¨åˆ†ç±»é¡ºåºï¼Œä¾¿äºŽæŸ¥æ‰¾æ‰€éœ€å…ƒç´ ã€‚"
 
 #. Tag: para
 #: I18n.xml:319
@@ -5484,42 +3923,20 @@ msgstr "安装备注"
 #. Tag: remark
 #: Installer.xml:8
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Installer\"> https://fedoraproject.org/wiki/Docs/Beats/"
-"Installer</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Installer\"> https://fedoraproject.org/wiki/Docs/Beats/Installer</"
-"ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Installer\"> https://fedoraproject.org/wiki/Docs/Beats/Installer</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Installer\"> https://fedoraproject.org/wiki/Docs/Beats/Installer</ulink>"
 
 #. Tag: para
 #: Installer.xml:14
 #, fuzzy, no-c-format
-msgid ""
-"To learn how to install Fedora, refer to <ulink type=\"http\" url=\"http://"
-"docs.fedoraproject.org/install-guide/\"> http://docs.fedoraproject.org/"
-"install-guide/</ulink>. If you encounter a problem or have a question during "
-"installation that is not covered in these release notes, refer to <ulink "
-"type=\"http\" url=\"http://www.fedoraproject.org/wiki/FAQ\"> http://www."
-"fedoraproject.org/wiki/FAQ</ulink> and <ulink type=\"http\" url=\"http://www."
-"fedoraproject.org/wiki/Bugs/Common\"> http://www.fedoraproject.org/wiki/Bugs/"
-"Common</ulink>."
-msgstr ""
-"如果您在安装时遇到了这个发行注记中没有包含的问题，请参考 <ulink url=\"http://"
-"www.fedoraproject.org/wiki/FAQ\"/> 和 <ulink url=\"http://www.fedoraproject."
-"org/wiki/Bugs/Common\"/>。"
+msgid "To learn how to install Fedora, refer to <ulink type=\"http\" url=\"http://docs.fedoraproject.org/install-guide/\"> http://docs.fedoraproject.org/install-guide/</ulink>. If you encounter a problem or have a question during installation that is not covered in these release notes, refer to <ulink type=\"http\" url=\"http://www.fedoraproject.org/wiki/FAQ\"> http://www.fedoraproject.org/wiki/FAQ</ulink> and <ulink type=\"http\" url=\"http://www.fedoraproject.org/wiki/Bugs/Common\"> http://www.fedoraproject.org/wiki/Bugs/Common</ulink>."
+msgstr "如果您在安装时遇到了这个发行注记中没有包含的问题，请参考 <ulink url=\"http://www.fedoraproject.org/wiki/FAQ\"/> 和 <ulink url=\"http://www.fedoraproject.org/wiki/Bugs/Common\"/>。"
 
 #. Tag: para
 #: Installer.xml:24
 #, no-c-format
-msgid ""
-"<application>Anaconda</application> is the name of the Fedora installer. "
-"This section outlines issues related to <application>anaconda</application> "
-"and installing Fedora 11."
-msgstr ""
-"<application>Anaconda</application> 是 Fedora 安装程序的名称。这部分概括了与 "
-"<application>Anaconda</application> 和安装 Fedora 11 相关的问题。"
+msgid "<application>Anaconda</application> is the name of the Fedora installer. This section outlines issues related to <application>anaconda</application> and installing Fedora 11."
+msgstr "<application>Anaconda</application> 是 Fedora 安装程序的名称。这部分概括了与 <application>Anaconda</application> 和安装 Fedora 11 相关的问题。"
 
 #. Tag: title
 #: Installer.xml:30
@@ -5530,36 +3947,14 @@ msgstr "以文本模式安装"
 #. Tag: para
 #: Installer.xml:33
 #, no-c-format
-msgid ""
-"We recommend that you use the graphical installer to install Fedora on your "
-"computer wherever possible. If you are installing Fedora on a system that "
-"lacks a graphical display, consider performing the installation over a VNC "
-"connection (see \"Chapter 12. Installing Through VNC\" in the "
-"<citetitle>Fedora 11 Installation Guide</citetitle>). If your system has a "
-"graphical display, but graphical installation fails, try booting with the "
-"<option>xdriver=vesa</option> option (see \"Chapter 9. Boot Options\" in the "
-"<citetitle>Fedora 11 Installation Guide</citetitle>) or with the "
-"<guilabel>Install system with basic video driver</guilabel> option when "
-"booting from the Fedora 11 Distro DVD."
-msgstr ""
-"我们建议您使用图形化安装模式来安装Fedora。如果您要在没有显示的系统上安装"
-"Fedora，请考虑通过VNC连接来进行(见<citetitle>Fedora 11安装向导</citetitle>的"
-"\"第12ç«  通过VNC安装\")。如果您的计算机有图形显示设备，但是图形化安装失败，请"
-"å°è¯•å¯åŠ¨æ—¶åŠ ä¸Š<option>xdriver=vesa</option>选项(见<citetitle>Fedora 11安装向"
-"导</citetitle>çš„\"第9ç« . 启动选项\")或者从Fedora 11发行版DVD启动时使用"
-"<guilabel>Install system with basic video driver</guilabel>选项。"
+msgid "We recommend that you use the graphical installer to install Fedora on your computer wherever possible. If you are installing Fedora on a system that lacks a graphical display, consider performing the installation over a VNC connection (see \"Chapter 12. Installing Through VNC\" in the <citetitle>Fedora 11 Installation Guide</citetitle>). If your system has a graphical display, but graphical installation fails, try booting with the <option>xdriver=vesa</option> option (see \"Chapter 9. Boot Options\" in the <citetitle>Fedora 11 Installation Guide</citetitle>) or with the <guilabel>Install system with basic video driver</guilabel> option when booting from the Fedora 11 Distro DVD."
+msgstr "我们建议您使用图形化安装模式来安装Fedora。如果您要在没有显示的系统上安装Fedora，请考虑通过VNC连接来进行(见<citetitle>Fedora 11安装向导</citetitle>çš„\"第12ç«  通过VNC安装\")ã€‚å¦‚æžœæ‚¨çš„è®¡ç®—æœºæœ‰å›¾å½¢æ˜¾ç¤ºè®¾å¤‡ï¼Œä½†æ˜¯å›¾å½¢åŒ–å®‰è£…å¤±è´¥ï¼Œè¯·å°è¯•å¯åŠ¨æ—¶åŠ ä¸Š<option>xdriver=vesa</option>选项(见<citetitle>Fedora 11安装向导</citetitle>çš„\"第9ç« . 启动选项\")或者从Fedora 11发行版DVD启动时使用<guilabel>Install system with basic video driver</guilabel>选项。"
 
 #. Tag: para
 #: Installer.xml:45
 #, no-c-format
-msgid ""
-"The text-mode installation option in Fedora 11 is significantly more "
-"streamlined than it was in earlier versions. Text-mode installation now "
-"omits the more complicated steps that were previously part of the process, "
-"and provides you with an uncluttered and straightforward experience."
-msgstr ""
-"Fedora 11的字符安装模式与以前版本相比做了很大的精简。字符安装模式省略了以前版"
-"本安装过程中复杂的步骤并给您整洁和简单的安装体验。"
+msgid "The text-mode installation option in Fedora 11 is significantly more streamlined than it was in earlier versions. Text-mode installation now omits the more complicated steps that were previously part of the process, and provides you with an uncluttered and straightforward experience."
+msgstr "Fedora 11的字符安装模式与以前版本相比做了很大的精简。字符安装模式省略了以前版本安装过程中复杂的步骤并给您整洁和简单的安装体验。"
 
 #. Tag: para
 #: Installer.xml:51
@@ -5576,14 +3971,8 @@ msgstr "软件包选择"
 #. Tag: para
 #: Installer.xml:56
 #, no-c-format
-msgid ""
-"<application>Anaconda</application> now automatically selects packages only "
-"from the base and core groups. These packages are sufficient to ensure that "
-"the system is operational at the end of the installation process, ready to "
-"install updates and new packages."
-msgstr ""
-"<application>Anaconda</application>只从base和core组中自动选择包。这些包足以保"
-"证安装结束后系统可以操作，并准备安装更新和新包。"
+msgid "<application>Anaconda</application> now automatically selects packages only from the base and core groups. These packages are sufficient to ensure that the system is operational at the end of the installation process, ready to install updates and new packages."
+msgstr "<application>Anaconda</application>只从base和core组中自动选择包。这些包足以保证安装结束后系统可以操作，并准备安装更新和新包。"
 
 #. Tag: term
 #: Installer.xml:65
@@ -5594,27 +3983,8 @@ msgstr "高级分区"
 #. Tag: para
 #: Installer.xml:67
 #, no-c-format
-msgid ""
-"<application>Anaconda</application> still presents you with the initial "
-"screen from previous versions that allows you to specify where "
-"<application>anaconda</application> should install Fedora on your system. "
-"You can choose to use a whole drive, to remove existing Linux partitions, or "
-"to use the free space on the drive. However, <application>anaconda</"
-"application> now automatically sets the layout of the partitions and does "
-"not ask you to add or delete partitions or file systems from this basic "
-"layout. If you require a customized layout at installation time, you should "
-"perform a graphical installation over a VNC connection or a kickstart "
-"installation. More advanced options yet, such as logical volume management "
-"(LVM), encrypted filesystems, and resizable filesystems are still only "
-"available only in graphical mode and kickstart."
-msgstr ""
-"<application>Anaconda</application>仍会显示初始化屏幕以允许您指定"
-"<application>anaconda</application>将Fedora安装在您计算机的什么地方。您可以选"
-"æ‹©ä½¿ç”¨æ•´ä¸ªé©±åŠ¨å™¨ï¼Œåˆ é™¤å·²æœ‰Linux分区或使用驱动器空闲空间。然而"
-"<application>anaconda</application>现在将自动设置分区方案并且不会让您在此基本"
-"æ–¹æ¡ˆä¸Šæ·»åŠ æˆ–åˆ é™¤åˆ†åŒºæˆ–æ–‡ä»¶ç³»ç»Ÿã€‚å¦‚æžœæ‚¨éœ€è¦å®‰è£…æ—¶ä½¿ç”¨è‡ªå®šä¹‰æ–¹æ¡ˆï¼Œæ‚¨åº”è¯¥é€šè¿‡VNC"
-"连接运行图形化安装或者使用Kickstart安装。像逻辑卷管理(LVM)ï¼Œæ–‡ä»¶ç³»ç»ŸåŠ å¯†å’Œå¯"
-"调文件系统等高级选项只会在图形化安装和kickstart中出现。"
+msgid "<application>Anaconda</application> still presents you with the initial screen from previous versions that allows you to specify where <application>anaconda</application> should install Fedora on your system. You can choose to use a whole drive, to remove existing Linux partitions, or to use the free space on the drive. However, <application>anaconda</application> now automatically sets the layout of the partitions and does not ask you to add or delete partitions or file systems from this basic layout. If you require a customized layout at installation time, you should perform a graphical installation over a VNC connection or a kickstart installation. More advanced options yet, such as logical volume management (LVM), encrypted filesystems, and resizable filesystems are still only available only in graphical mode and kickstart."
+msgstr "<application>Anaconda</application>仍会显示初始化屏幕以允许您指定<application>anaconda</application>å°†Fedoraå®‰è£…åœ¨æ‚¨è®¡ç®—æœºçš„ä»€ä¹ˆåœ°æ–¹ã€‚æ‚¨å¯ä»¥é€‰æ‹©ä½¿ç”¨æ•´ä¸ªé©±åŠ¨å™¨ï¼Œåˆ é™¤å·²æœ‰Linux分区或使用驱动器空闲空间。然而<application>anaconda</application>çŽ°åœ¨å°†è‡ªåŠ¨è®¾ç½®åˆ†åŒºæ–¹æ¡ˆå¹¶ä¸”ä¸ä¼šè®©æ‚¨åœ¨æ­¤åŸºæœ¬æ–¹æ¡ˆä¸Šæ·»åŠ æˆ–åˆ é™¤åˆ†åŒºæˆ–æ–‡ä»¶ç³»ç»Ÿã€‚å¦‚æžœæ‚¨éœ€è¦å®‰è£…æ—¶ä½¿ç”¨è‡ªå®šä¹‰æ–¹æ¡ˆï¼Œæ‚¨åº”è¯¥é€šè¿‡VNC连接运行图形化安装或者使用Kickstart安装。像逻辑卷管理(LVM)ï¼Œæ–‡ä»¶ç³»ç»ŸåŠ å¯†å’Œå¯è°ƒæ–‡ä»¶ç³»ç»Ÿç­‰é«˜çº§é€‰é¡¹åªä¼šåœ¨å›¾å½¢åŒ–å®‰è£…å’Œkickstart中出现。"
 
 #. Tag: term
 #: Installer.xml:87
@@ -5625,9 +3995,7 @@ msgstr "引导装载程序配置"
 #. Tag: para
 #: Installer.xml:89
 #, no-c-format
-msgid ""
-"<application>Anaconda</application> now performs bootloader configuration "
-"automatically."
+msgid "<application>Anaconda</application> now performs bootloader configuration automatically."
 msgstr "<application>Anaconda</application> 现在可自动执行引导装载程序配置。"
 
 #. Tag: title
@@ -5639,20 +4007,8 @@ msgstr "在文本模式中的 Kickstart 安装"
 #. Tag: para
 #: Installer.xml:97
 #, no-c-format
-msgid ""
-"Text-mode installations using kickstart are carried out in the same way that "
-"they were in previous versions. However, because package selection, advanced "
-"partitioning, and bootloader configuration are now automated in text mode, "
-"<application>anaconda</application> cannot prompt you for information that "
-"it requires during these steps. You must therefore ensure that the kickstart "
-"file includes the packaging, partitioning, and bootloader configurations. If "
-"any of this information is missing, <application>anaconda</application> will "
-"exit with an error message."
-msgstr ""
-"使用kickstartå­—ç¬¦æ¨¡å¼å®‰è£…è·Ÿä»¥å‰ç‰ˆæœ¬ä¸€æ ·ã€‚ç„¶è€Œç”±äºŽå­—ç¬¦æ¨¡å¼ä¸­åŒ…é€‰æ‹©ï¼Œé«˜çº§åˆ†åŒºä»¥"
-"åŠå¼•å¯¼å™¨è®¾ç½®å‡è‡ªåŠ¨é…ç½®ï¼Œå› æ­¤<application>anaconda</application>不能为您显示这"
-"äº›æ­¥éª¤æ‰€éœ€çš„ä¿¡æ¯ã€‚å› æ­¤æ‚¨å¿…é¡»ç¡®ä¿kickstart文件包括了包，分区及引导器配置。如果"
-"这些信息缺失，<application>anaconda</application>将显示错误信息并退出。"
+msgid "Text-mode installations using kickstart are carried out in the same way that they were in previous versions. However, because package selection, advanced partitioning, and bootloader configuration are now automated in text mode, <application>anaconda</application> cannot prompt you for information that it requires during these steps. You must therefore ensure that the kickstart file includes the packaging, partitioning, and bootloader configurations. If any of this information is missing, <application>anaconda</application> will exit with an error message."
+msgstr "使用kickstartå­—ç¬¦æ¨¡å¼å®‰è£…è·Ÿä»¥å‰ç‰ˆæœ¬ä¸€æ ·ã€‚ç„¶è€Œç”±äºŽå­—ç¬¦æ¨¡å¼ä¸­åŒ…é€‰æ‹©ï¼Œé«˜çº§åˆ†åŒºä»¥åŠå¼•å¯¼å™¨è®¾ç½®å‡è‡ªåŠ¨é…ç½®ï¼Œå› æ­¤<application>anaconda</application>ä¸èƒ½ä¸ºæ‚¨æ˜¾ç¤ºè¿™äº›æ­¥éª¤æ‰€éœ€çš„ä¿¡æ¯ã€‚å› æ­¤æ‚¨å¿…é¡»ç¡®ä¿kickstart文件包括了包，分区及引导器配置。如果这些信息缺失，<application>anaconda</application>将显示错误信息并退出。"
 
 #. Tag: title
 #: Installer.xml:111
@@ -5663,32 +4019,14 @@ msgstr "升级备注"
 #. Tag: para
 #: Installer.xml:112
 #, fuzzy, no-c-format
-msgid ""
-"Upgrading from Fedora 9 directly to Fedora 11 using <command>yum</command> "
-"is not possible, you must upgrade to Fedora 10 first, then upgrade to Fedora "
-"11. See <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"YumUpgradeFaq\"> http://fedoraproject.org/wiki/YumUpgradeFaq</ulink> for "
-"more information. You can also use <application>preupgrade</application> to "
-"upgrade directly to Fedora 11 using <application>anaconda</application>, "
-"minimizing the system downtime by downloading the packages in advance."
-msgstr ""
-"用<command>yum</command>从Fedora 9直接升级到Fedora 11是不可能的，您必须先升级"
-"到Fedora 10，然后再升级到Fedora 11。参考<ulink type=\"http\" url=\"http://"
-"fedoraproject.org/wiki/YumUpgradeFaq\"> http://fedoraproject.org/wiki/"
-"YumUpgradeFaq</ulink>了解更多信息。您也可以用<application>preupgrade</"
-"application>直接升级到Fedora 11使用<application>anaconda</application>，这可"
-"以高级模式下载包来最小化系统下载时间。"
+msgid "Upgrading from Fedora 9 directly to Fedora 11 using <command>yum</command> is not possible, you must upgrade to Fedora 10 first, then upgrade to Fedora 11. See <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/YumUpgradeFaq\"> http://fedoraproject.org/wiki/YumUpgradeFaq</ulink> for more information. You can also use <application>preupgrade</application> to upgrade directly to Fedora 11 using <application>anaconda</application>, minimizing the system downtime by downloading the packages in advance."
+msgstr "用<command>yum</command>从Fedora 9直接升级到Fedora 11是不可能的，您必须先升级到Fedora 10，然后再升级到Fedora 11。参考<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/YumUpgradeFaq\"> http://fedoraproject.org/wiki/YumUpgradeFaq</ulink>了解更多信息。您也可以用<application>preupgrade</application>直接升级到Fedora 11使用<application>anaconda</application>，这可以高级模式下载包来最小化系统下载时间。"
 
 #. Tag: para
 #: Installer.xml:123
 #, no-c-format
-msgid ""
-"Some modified configuration files will be replaced by their original "
-"versions during the upgrade. Your modified versions of these configuration "
-"files will be saved as <filename>*.rpmsave</filename> files in that case."
-msgstr ""
-"升级过程中一些修改的配置文件将被它们的原始版本所代替。您修改的配置文件会保存"
-"为<filename>*.rpmsave</filename>。"
+msgid "Some modified configuration files will be replaced by their original versions during the upgrade. Your modified versions of these configuration files will be saved as <filename>*.rpmsave</filename> files in that case."
+msgstr "升级过程中一些修改的配置文件将被它们的原始版本所代替。您修改的配置文件会保存为<filename>*.rpmsave</filename>。"
 
 #. Tag: title
 #: Installer.xml:129
@@ -5699,18 +4037,8 @@ msgstr "引导菜单"
 #. Tag: para
 #: Installer.xml:130
 #, no-c-format
-msgid ""
-"The boot menu for the Fedora Distro DVD includes a new option: "
-"<guilabel>Install system with basic video driver</guilabel>. This option "
-"boots the system with the generic vesa driver (using the "
-"<option>xdriver=vesa</option> boot option) and allows you to use Fedora's "
-"graphical installation mode even when <application>anaconda</application> "
-"cannot load the correct driver for your video card."
-msgstr ""
-"Fedora 发行版 DVD新增了一个启动菜单：<guilabel>Install system with basic "
-"video driver</guilabel>。此选项使用通用vesa驱动启动系统(使用"
-"<option>xdriver=vesa</option>启动选项)并能够在<application>anaconda</"
-"application>æ— æ³•åŠ è½½æ­£ç¡®çš„æ˜¾å¡é©±åŠ¨æ—¶ä»å¯ä»¥ä½¿ç”¨Fedora的图形化安装模式。"
+msgid "The boot menu for the Fedora Distro DVD includes a new option: <guilabel>Install system with basic video driver</guilabel>. This option boots the system with the generic vesa driver (using the <option>xdriver=vesa</option> boot option) and allows you to use Fedora's graphical installation mode even when <application>anaconda</application> cannot load the correct driver for your video card."
+msgstr "Fedora 发行版 DVD新增了一个启动菜单：<guilabel>Install system with basic video driver</guilabel>。此选项使用通用vesa驱动启动系统(使用<option>xdriver=vesa</option>启动选项)并能够在<application>anaconda</application>æ— æ³•åŠ è½½æ­£ç¡®çš„æ˜¾å¡é©±åŠ¨æ—¶ä»å¯ä»¥ä½¿ç”¨Fedora的图形化安装模式。"
 
 #. Tag: title
 #: Installer.xml:140
@@ -5721,36 +4049,19 @@ msgstr "æ›´æ–°çš„ <filename>boot.iso</filename>"
 #. Tag: para
 #: Installer.xml:141
 #, no-c-format
-msgid ""
-"The Fedora installation CDs and DVD provide you with an image file, "
-"<filename>boot.iso</filename>, that you can burn to a CD and use to boot a "
-"system and start the installation process. Typically, you would do this "
-"prior to installing Fedora from a local hard drive or from a location on a "
-"network. You can now use the CD produced from the <filename>boot.iso</"
-"filename> image to start installation on a system that uses Unified "
-"Extensible Firmware Interface (UEFI). CDs produced from older versions of "
-"<filename>boot.iso</filename> only worked with systems that used Basic Input "
-"Output System (BIOS)."
+msgid "The Fedora installation CDs and DVD provide you with an image file, <filename>boot.iso</filename>, that you can burn to a CD and use to boot a system and start the installation process. Typically, you would do this prior to installing Fedora from a local hard drive or from a location on a network. You can now use the CD produced from the <filename>boot.iso</filename> image to start installation on a system that uses Unified Extensible Firmware Interface (UEFI). CDs produced from older versions of <filename>boot.iso</filename> only worked with systems that used Basic Input Output System (BIOS)."
 msgstr ""
 
 #. Tag: remark
 #: Kernel.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Documentation_Kernel_Beat\">https://fedoraproject.org/wiki/"
-"Documentation_Kernel_Beat</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Documentation_Kernel_Beat\">https://fedoraproject.org/wiki/"
-"Documentation_Kernel_Beat</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Kernel_Beat\">https://fedoraproject.org/wiki/Documentation_Kernel_Beat</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Kernel_Beat\">https://fedoraproject.org/wiki/Documentation_Kernel_Beat</ulink>"
 
 #. Tag: para
 #: Kernel.xml:9
 #, no-c-format
-msgid ""
-"This section covers changes and important information regarding the 2.6.29 "
-"based kernel in Fedora 11."
+msgid "This section covers changes and important information regarding the 2.6.29 based kernel in Fedora 11."
 msgstr "这部分包括 Fedora 11 中基于 2.6.29 å†…æ ¸çš„æ”¹åŠ¨å’Œé‡è¦ä¿¡æ¯ã€‚"
 
 #. Tag: title
@@ -5762,52 +4073,25 @@ msgstr ""
 #. Tag: para
 #: Kernel.xml:14
 #, fuzzy, no-c-format
-msgid ""
-"The <ulink url=\"http://lwn.net/Articles/244829/\">relatime</ulink> option "
-"is now enabled by default in Fedora 11. It improves file system performance "
-"and reduces power consumption."
-msgstr ""
-"在 Fedora 11 中现在默认启用 <ulink url=\"http://lwn.net/Articles/244829/"
-"\">relatime</ulink> 选项。它改善了文件系统性能并降低了电源消耗。"
+msgid "The <ulink url=\"http://lwn.net/Articles/244829/\">relatime</ulink> option is now enabled by default in Fedora 11. It improves file system performance and reduces power consumption."
+msgstr "在 Fedora 11 中现在默认启用 <ulink url=\"http://lwn.net/Articles/244829/\">relatime</ulink> 选项。它改善了文件系统性能并降低了电源消耗。"
 
 #. Tag: para
 #: Kernel.xml:19
 #, no-c-format
-msgid ""
-"The POSIX standard requires operating systems to keep track of the last time "
-"each file was accessed by an application or the user, and to store this "
-"timestamp as part of the file system data. This timestamp, called "
-"<firstterm>atime</firstterm>, is used in finding out which files are never "
-"used (to clean up the <filename>/tmp</filename> directory for example) or if "
-"a file has been looked at after it was last changed."
+msgid "The POSIX standard requires operating systems to keep track of the last time each file was accessed by an application or the user, and to store this timestamp as part of the file system data. This timestamp, called <firstterm>atime</firstterm>, is used in finding out which files are never used (to clean up the <filename>/tmp</filename> directory for example) or if a file has been looked at after it was last changed."
 msgstr ""
 
 #. Tag: para
 #: Kernel.xml:27
 #, no-c-format
-msgid ""
-"A significant downside to atime is that every time a file is accessed, the "
-"kernel has to write a new timestamp to the disk, at least after a few "
-"seconds of activity. These disk writes keep the disk and the link to the "
-"disk busy, which costs both performance and power."
+msgid "A significant downside to atime is that every time a file is accessed, the kernel has to write a new timestamp to the disk, at least after a few seconds of activity. These disk writes keep the disk and the link to the disk busy, which costs both performance and power."
 msgstr ""
 
 #. Tag: para
 #: Kernel.xml:33
 #, no-c-format
-msgid ""
-"Because some programs use atime, disabling by default is not practical. The "
-"Linux kernel has a feature called <firstterm>relatime</firstterm>, which is "
-"an effective compromise between having some of the information that atime "
-"provides, without having the disk time updated as regularly. It works by "
-"updating the atime field on disk only if the file hasn't been accessed since "
-"the last time it was accessed (to provide the new email detection "
-"capability) or when the last access was more than 1 day ago (to help "
-"programs and users clean up unused files in the <filename>/tmp</filename> "
-"directory). An improved version of relatime has been <ulink url=\"https://"
-"www.redhat.com/archives/fedora-devel-list/2009-March/msg01612.html\">merged "
-"upstream</ulink> by Fedora developers in the 2.6.30 kernel and backported to "
-"the Fedora 11 kernel."
+msgid "Because some programs use atime, disabling by default is not practical. The Linux kernel has a feature called <firstterm>relatime</firstterm>, which is an effective compromise between having some of the information that atime provides, without having the disk time updated as regularly. It works by updating the atime field on disk only if the file hasn't been accessed since the last time it was accessed (to provide the new email detection capability) or when the last access was more than 1 day ago (to help programs and users clean up unused files in the <filename>/tmp</filename> directory). An improved version of relatime has been <ulink url=\"https://www.redhat.com/archives/fedora-devel-list/2009-March/msg01612.html\">merged upstream</ulink> by Fedora developers in the 2.6.30 kernel and backported to the Fedora 11 kernel."
 msgstr ""
 
 #. Tag: title
@@ -5819,15 +4103,8 @@ msgstr "版本"
 #. Tag: para
 #: Kernel.xml:51
 #, no-c-format
-msgid ""
-"Fedora may include additional patches to the kernel for improvements, bug "
-"fixes, or additional features. For this reason, the Fedora kernel may not be "
-"line-for-line equivalent to the so-called <firstterm>vanilla kernel</"
-"firstterm> from the kernel.org web site:"
-msgstr ""
-"Fedora å¯èƒ½åœ¨å†…æ ¸ä¸­åŒ…å«äº†é™„åŠ çš„è¡¥ä¸æ¥è¿›è¡Œæ”¹è¿›ã€ä¿®æ­£æˆ–æ·»åŠ é™„åŠ ç‰¹æ€§ã€‚å› æ­¤ï¼Œ"
-"Fedora å†…æ ¸å¯èƒ½å’Œæ¥è‡ª kernel.org 网站被称为 <firstterm>vanilla kernel</"
-"firstterm> çš„å†…æ ¸ä¸æ˜¯å®Œå…¨ç›¸åŒã€‚"
+msgid "Fedora may include additional patches to the kernel for improvements, bug fixes, or additional features. For this reason, the Fedora kernel may not be line-for-line equivalent to the so-called <firstterm>vanilla kernel</firstterm> from the kernel.org web site:"
+msgstr "Fedora å¯èƒ½åœ¨å†…æ ¸ä¸­åŒ…å«äº†é™„åŠ çš„è¡¥ä¸æ¥è¿›è¡Œæ”¹è¿›ã€ä¿®æ­£æˆ–æ·»åŠ é™„åŠ ç‰¹æ€§ã€‚å› æ­¤ï¼ŒFedora å†…æ ¸å¯èƒ½å’Œæ¥è‡ª kernel.org 网站被称为 <firstterm>vanilla kernel</firstterm> çš„å†…æ ¸ä¸æ˜¯å®Œå…¨ç›¸åŒã€‚"
 
 #. Tag: ulink
 #: Kernel.xml:57
@@ -5838,9 +4115,7 @@ msgstr "http://www.kernel.org"
 #. Tag: para
 #: Kernel.xml:59
 #, no-c-format
-msgid ""
-"To obtain a list of these patches, download the source RPM package and run "
-"the following command against it:"
+msgid "To obtain a list of these patches, download the source RPM package and run the following command against it:"
 msgstr "要获得这些补丁的列表，下载源 RPM 软件包，运行下列命令: "
 
 #. Tag: screen
@@ -5870,26 +4145,14 @@ msgstr "<command>rpm -q --changelog kernel-&lt;version&gt;</command>"
 #. Tag: para
 #: Kernel.xml:72
 #, fuzzy, no-c-format
-msgid ""
-"If you need a user friendly version of the changelog, refer to <ulink url="
-"\"http://wiki.kernelnewbies.org/LinuxChanges\"></ulink>. A short and full "
-"diff of the kernel is available from <ulink url=\"http://kernel.org/git\"></"
-"ulink>. The Fedora version kernel is based on the Linus tree."
-msgstr ""
-"如果您希望看到更友好的修订日志，请访问 <ulink url=\"http://wiki."
-"kernelnewbies.org/LinuxChanges\">http://wiki.kernelnewbies.org/LinuxChanges</"
-"ulink> 。<ulink url=\"http://kernel.org/git\">http://kernel.org/git</ulink>提"
-"ä¾›äº†å†…æ ¸ä¸åŒä¹‹å¤„çš„æ‘˜è¦å’Œå®Œå…¨ä¸¤ç§ç‰ˆæœ¬ã€‚Fedora 基于 Linus çš„å†…æ ¸æ ‘ã€‚"
+msgid "If you need a user friendly version of the changelog, refer to <ulink url=\"http://wiki.kernelnewbies.org/LinuxChanges\"></ulink>. A short and full diff of the kernel is available from <ulink url=\"http://kernel.org/git\"></ulink>. The Fedora version kernel is based on the Linus tree."
+msgstr "如果您希望看到更友好的修订日志，请访问 <ulink url=\"http://wiki.kernelnewbies.org/LinuxChanges\">http://wiki.kernelnewbies.org/LinuxChanges</ulink> 。<ulink url=\"http://kernel.org/git\">http://kernel.org/git</ulink>æä¾›äº†å†…æ ¸ä¸åŒä¹‹å¤„çš„æ‘˜è¦å’Œå®Œå…¨ä¸¤ç§ç‰ˆæœ¬ã€‚Fedora 基于 Linus çš„å†…æ ¸æ ‘ã€‚"
 
 #. Tag: para
 #: Kernel.xml:77
 #, fuzzy, no-c-format
-msgid ""
-"Customizations made for the Fedora version are available from <ulink url="
-"\"http://cvs.fedoraproject.org\"></ulink>."
-msgstr ""
-"Fedora 版本做出的定制可以在 <ulink url=\"http://cvs.fedoraproject.org"
-"\">http://cvs.fedoraproject.org</ulink> 找到。"
+msgid "Customizations made for the Fedora version are available from <ulink url=\"http://cvs.fedoraproject.org\"></ulink>."
+msgstr "Fedora 版本做出的定制可以在 <ulink url=\"http://cvs.fedoraproject.org\">http://cvs.fedoraproject.org</ulink> 找到。"
 
 #. Tag: title
 #: Kernel.xml:143
@@ -5900,14 +4163,8 @@ msgstr "å†…æ ¸å¼€å‘å‡†å¤‡"
 #. Tag: para
 #: Kernel.xml:145
 #, fuzzy, no-c-format
-msgid ""
-"Fedora 11 does not include the <package>kernel-source</package> package "
-"provided by older versions since only the <package>kernel-devel</package> "
-"package is required now to build external modules."
-msgstr ""
-"Fedora 10 不包含老版本提供的 <package>kernel-source</package> è½¯ä»¶åŒ…ï¼Œå› ä¸ºæž„"
-"建外部模块只需要 <package>kernel-devel</package> 软件包。配置的资源可用，如 "
-"<xref linkend=\"sn-Kernel_flavors\"/> 所述。"
+msgid "Fedora 11 does not include the <package>kernel-source</package> package provided by older versions since only the <package>kernel-devel</package> package is required now to build external modules."
+msgstr "Fedora 10 不包含老版本提供的 <package>kernel-source</package> è½¯ä»¶åŒ…ï¼Œå› ä¸ºæž„å»ºå¤–éƒ¨æ¨¡å—åªéœ€è¦ <package>kernel-devel</package> 软件包。配置的资源可用，如 <xref linkend=\"sn-Kernel_flavors\"/> 所述。"
 
 #. Tag: title
 #: Kernel.xml:151
@@ -5918,13 +4175,8 @@ msgstr "å®šåˆ¶å†…æ ¸æž„å»ºä¸­"
 #. Tag: para
 #: Kernel.xml:152
 #, no-c-format
-msgid ""
-"For information on kernel development and working with custom kernels, refer "
-"to <ulink url=\"http://fedoraproject.org/wiki/Building_a_custom_kernel\"></"
-"ulink>."
-msgstr ""
-"æœ‰å…³å†…æ ¸å¼€å‘ä»¥åŠå®šåˆ¶å†…æ ¸è¯·å‚è€ƒ <ulink url=\"http://fedoraproject.org/wiki/"
-"Building_a_custom_kernel\"></ulink>。"
+msgid "For information on kernel development and working with custom kernels, refer to <ulink url=\"http://fedoraproject.org/wiki/Building_a_custom_kernel\"></ulink>."
+msgstr "æœ‰å…³å†…æ ¸å¼€å‘ä»¥åŠå®šåˆ¶å†…æ ¸è¯·å‚è€ƒ <ulink url=\"http://fedoraproject.org/wiki/Building_a_custom_kernel\"></ulink>。"
 
 #. Tag: title
 #: Kernel.xml:157
@@ -5935,19 +4187,12 @@ msgstr "报告 Bug"
 #. Tag: para
 #: Kernel.xml:159
 #, fuzzy, no-c-format
-msgid ""
-"Refer to <ulink url=\"http://kernel.org/pub/linux/docs/lkml/reporting-bugs."
-"html\"></ulink> for information on reporting bugs in the Linux kernel. You "
-"may also use <ulink url=\"http://bugzilla.redhat.com\"></ulink> for "
-"reporting bugs that are specific to Fedora."
-msgstr ""
-"请参考 <ulink url=\"http://kernel.org/pub/linux/docs/lkml/reporting-bugs.html"
-"\">http://kernel.org/pub/linux/docs/lkml/reporting-bugs.html</ulink> 中，报"
-"å‘Š Linux å†…æ ¸é”™è¯¯æ—¶çš„æ³¨æ„äº‹é¡¹ã€‚æ‚¨ä¹Ÿå¯ä»¥è®¿é—® <ulink url=\"http://bugzilla."
-"redhat.com\">http://bugzilla.redhat.com</ulink> 来报告针对 Fedora 的错误。"
+msgid "Refer to <ulink url=\"http://kernel.org/pub/linux/docs/lkml/reporting-bugs.html\"></ulink> for information on reporting bugs in the Linux kernel. You may also use <ulink url=\"http://bugzilla.redhat.com\"></ulink> for reporting bugs that are specific to Fedora."
+msgstr "请参考 <ulink url=\"http://kernel.org/pub/linux/docs/lkml/reporting-bugs.html\">http://kernel.org/pub/linux/docs/lkml/reporting-bugs.html</ulink> 中，报告 Linux å†…æ ¸é”™è¯¯æ—¶çš„æ³¨æ„äº‹é¡¹ã€‚æ‚¨ä¹Ÿå¯ä»¥è®¿é—® <ulink url=\"http://bugzilla.redhat.com\">http://bugzilla.redhat.com</ulink> 来报告针对 Fedora 的错误。"
 
 #. Tag: title
-#: Legal.xml:6 Legal.xml:56
+#: Legal.xml:6
+#: Legal.xml:56
 #, no-c-format
 msgid "Legal Information"
 msgstr "法律信息"
@@ -5967,14 +4212,7 @@ msgstr "许可证"
 #. Tag: para
 #: Legal.xml:12
 #, no-c-format
-msgid ""
-"The Fedora License Agreement is included with each release. A reference "
-"version is available on the Fedora Project website: <ulink type=\"http\" url="
-"\"http://fedoraproject.org/wiki/Legal/Licenses/LicenseAgreement\">http://"
-"fedoraproject.org/wiki/Legal/Licenses/LicenseAgreement</ulink> This document "
-"is licensed under the terms of the Open Publication License v1.0 without "
-"options: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Legal/"
-"Licenses/OPL\">http://fedoraproject.org/wiki/Legal/Licenses/OPL</ulink>"
+msgid "The Fedora License Agreement is included with each release. A reference version is available on the Fedora Project website: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Legal/Licenses/LicenseAgreement\">http://fedoraproject.org/wiki/Legal/Licenses/LicenseAgreement</ulink> This document is licensed under the terms of the Open Publication License v1.0 without options: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Legal/Licenses/OPL\">http://fedoraproject.org/wiki/Legal/Licenses/OPL</ulink>"
 msgstr ""
 
 #. Tag: title
@@ -5986,12 +4224,7 @@ msgstr "å•†æ ‡"
 #. Tag: para
 #: Legal.xml:24
 #, no-c-format
-msgid ""
-"'Fedora' and the Fedora logo are trademarks of Red Hat, Inc. and are subject "
-"to the terms of the Fedora Trademark Guidelines: <ulink type=\"http\" url="
-"\"http://fedoraproject.org/wiki/Legal/TrademarkGuidelines\">http://"
-"fedoraproject.org/wiki/Legal/TrademarkGuidelines</ulink> All other "
-"trademarks are the property of their respective owners."
+msgid "'Fedora' and the Fedora logo are trademarks of Red Hat, Inc. and are subject to the terms of the Fedora Trademark Guidelines: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Legal/TrademarkGuidelines\">http://fedoraproject.org/wiki/Legal/TrademarkGuidelines</ulink> All other trademarks are the property of their respective owners."
 msgstr ""
 
 #. Tag: title
@@ -6003,18 +4236,8 @@ msgstr "外部参考"
 #. Tag: para
 #: Legal.xml:35
 #, no-c-format
-msgid ""
-"This document may link to other resources that are not under the control of "
-"and are not maintained by the Fedora Project. Red Hat, Inc. is not "
-"responsible for the content of those resources. We provide these links only "
-"as a convenience, and the inclusion of any link to such a resource does not "
-"imply endorsement by the Fedora Project or Red Hat of that resource. We "
-"reserve the right to terminate any link or linking program at any time."
-msgstr ""
-"这个文档会链接到不是由 Fedora 项目控制和维护的其它资源。红帽公司不对那些资源"
-"的内容负责。我们只是为了方便才提供这些链接，将任何到这些资源的链接包含在内不"
-"æ˜¯æ ¹æ® Fedora 项目或者红帽资源的背书。我们保留终止任何链接或者在任何时间终止"
-"链接程序的权利。"
+msgid "This document may link to other resources that are not under the control of and are not maintained by the Fedora Project. Red Hat, Inc. is not responsible for the content of those resources. We provide these links only as a convenience, and the inclusion of any link to such a resource does not imply endorsement by the Fedora Project or Red Hat of that resource. We reserve the right to terminate any link or linking program at any time."
+msgstr "这个文档会链接到不是由 Fedora é¡¹ç›®æŽ§åˆ¶å’Œç»´æŠ¤çš„å…¶å®ƒèµ„æºã€‚çº¢å¸½å…¬å¸ä¸å¯¹é‚£äº›èµ„æºçš„å†…å®¹è´Ÿè´£ã€‚æˆ‘ä»¬åªæ˜¯ä¸ºäº†æ–¹ä¾¿æ‰æä¾›è¿™äº›é“¾æŽ¥ï¼Œå°†ä»»ä½•åˆ°è¿™äº›èµ„æºçš„é“¾æŽ¥åŒ…å«åœ¨å†…ä¸æ˜¯æ ¹æ® Fedora 项目或者红帽资源的背书。我们保留终止任何链接或者在任何时间终止链接程序的权利。"
 
 #. Tag: title
 #: Legal.xml:47
@@ -6025,27 +4248,14 @@ msgstr "导出"
 #. Tag: para
 #: Legal.xml:48
 #, fuzzy, no-c-format
-msgid ""
-"Certain export restrictions may apply to Fedora Project releases. Refer to "
-"<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Legal/Export"
-"\">http://fedoraproject.org/wiki/Legal/Export</ulink> for more details."
-msgstr ""
-"特定的导出限制可以应用到 Fedora 项目发行本。有关详情请参考 <ulink url="
-"\"http://fedoraproject.org/wiki/Legal/Export\">http://fedoraproject.org/wiki/"
-"Legal/Export</ulink>。"
+msgid "Certain export restrictions may apply to Fedora Project releases. Refer to <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Legal/Export\">http://fedoraproject.org/wiki/Legal/Export</ulink> for more details."
+msgstr "特定的导出限制可以应用到 Fedora 项目发行本。有关详情请参考 <ulink url=\"http://fedoraproject.org/wiki/Legal/Export\">http://fedoraproject.org/wiki/Legal/Export</ulink>。"
 
 #. Tag: para
 #: Legal.xml:57
 #, fuzzy, no-c-format
-msgid ""
-"The following legal information concerns some software in Fedora. Portions "
-"Copyright (c) 2002-2007 Charlie Poole or Copyright (c) 2002-2004 James W. "
-"Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright (c) 2000-2002 "
-"Philip A. Craig"
-msgstr ""
-"部分版权所有 Copyright &copy; 2002-2007 Charlie Poole，或者版权所有 "
-"Copyright &copy; 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. "
-"Vorontsov，或者版权所有 Copyright &copy; 2000-2002 Philip A. Craig"
+msgid "The following legal information concerns some software in Fedora. Portions Copyright (c) 2002-2007 Charlie Poole or Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright (c) 2000-2002 Philip A. Craig"
+msgstr "部分版权所有 Copyright &copy; 2002-2007 Charlie Poole，或者版权所有 Copyright &copy; 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov，或者版权所有 Copyright &copy; 2000-2002 Philip A. Craig"
 
 #. Tag: title
 #: Legal.xml:65
@@ -6056,11 +4266,7 @@ msgstr "更多详情"
 #. Tag: para
 #: Legal.xml:66
 #, fuzzy, no-c-format
-msgid ""
-"Additional legal information surrounding this document and Fedora Project "
-"releases is available on the Fedora Project website: <ulink type=\"http\" "
-"url=\"http://fedoraproject.org/wiki/Legal \">http://fedoraproject.org/wiki/"
-"Legal </ulink>"
+msgid "Additional legal information surrounding this document and Fedora Project releases is available on the Fedora Project website: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Legal \">http://fedoraproject.org/wiki/Legal </ulink>"
 msgstr "è¿™ä¸ªæ–‡æ¡£ä¸­é™„åŠ æ³•å¾‹ä¿¡æ¯å’Œ Fedora 项目发行本请参考 Fedora 项目网页："
 
 #. Tag: title
@@ -6072,39 +4278,25 @@ msgstr "Fedora Live æ˜ åƒ"
 #. Tag: remark
 #: Live.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Live\">https://fedoraproject.org/wiki/Docs/Beats/Live</"
-"ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Live\">https://fedoraproject.org/wiki/Docs/Beats/Live</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Live\">https://fedoraproject.org/wiki/Docs/Beats/Live</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Live\">https://fedoraproject.org/wiki/Docs/Beats/Live</ulink>"
 
 #. Tag: para
 #: Live.xml:9
 #, no-c-format
-msgid ""
-"The <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Games_Spin"
-"\">Games Spin</ulink> provides a Live DVD with a sampling of the best games "
-"available in Fedora."
+msgid "The <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Games_Spin\">Games Spin</ulink> provides a Live DVD with a sampling of the best games available in Fedora."
 msgstr ""
 
 #. Tag: para
 #: Live.xml:15
 #, no-c-format
-msgid ""
-"For electronic designers, the <ulink type=\"http\" url=\"http://chitlesh."
-"fedorapeople.org/FEL/\">Fedora Electronic Lab</ulink> spin provides a "
-"complete toolchain for IC designers."
+msgid "For electronic designers, the <ulink type=\"http\" url=\"http://chitlesh.fedorapeople.org/FEL/\">Fedora Electronic Lab</ulink> spin provides a complete toolchain for IC designers."
 msgstr ""
 
 #. Tag: para
 #: Live.xml:21
 #, no-c-format
-msgid ""
-"The Fedora Spins SIG (<ulink type=\"http\" url=\"http://fedoraproject.org/"
-"wiki/SIGs/Spins\">http://fedoraproject.org/wiki/SIGs/Spins</ulink>) is "
-"continuously developing specialized Live images for specific purposes."
+msgid "The Fedora Spins SIG (<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/SIGs/Spins\">http://fedoraproject.org/wiki/SIGs/Spins</ulink>) is continuously developing specialized Live images for specific purposes."
 msgstr ""
 
 #. Tag: title
@@ -6116,14 +4308,8 @@ msgstr "邮件服务器"
 #. Tag: remark
 #: MailServers.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/MailServers\">https://fedoraproject.org/wiki/Docs/Beats/"
-"MailServers</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/MailServers\">https://fedoraproject.org/wiki/Docs/Beats/"
-"MailServers</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/MailServers\">https://fedoraproject.org/wiki/Docs/Beats/MailServers</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/MailServers\">https://fedoraproject.org/wiki/Docs/Beats/MailServers</ulink>"
 
 #. Tag: term
 #: MailServers.xml:11
@@ -6134,25 +4320,14 @@ msgstr "dovecot"
 #. Tag: para
 #: MailServers.xml:13
 #, no-c-format
-msgid ""
-"Fedora 11 includes version 1.1.11 of the <package>dovecot</package> mail "
-"server. This is a bugfix release. For a complete list of changes, refer to "
-"<ulink type=\"http\" url=\"http://www.dovecot.org/list/dovecot-news/2009-"
-"February/000099.html\">http://www.dovecot.org/list/dovecot-news/2009-"
-"February/000099.html</ulink>."
+msgid "Fedora 11 includes version 1.1.11 of the <package>dovecot</package> mail server. This is a bugfix release. For a complete list of changes, refer to <ulink type=\"http\" url=\"http://www.dovecot.org/list/dovecot-news/2009-February/000099.html\">http://www.dovecot.org/list/dovecot-news/2009-February/000099.html</ulink>."
 msgstr ""
 
 #. Tag: remark
 #: Multimedia.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Multimedia\">https://fedoraproject.org/wiki/Docs/Beats/"
-"Multimedia</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Multimedia\">https://fedoraproject.org/wiki/Docs/Beats/"
-"Multimedia</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Multimedia\">https://fedoraproject.org/wiki/Docs/Beats/Multimedia</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Multimedia\">https://fedoraproject.org/wiki/Docs/Beats/Multimedia</ulink>"
 
 #. Tag: term
 #: Multimedia.xml:11
@@ -6163,11 +4338,7 @@ msgstr "Freedom"
 #. Tag: para
 #: Multimedia.xml:13
 #, no-c-format
-msgid ""
-"Fedora 11 ships with support for Ogg Vorbis, Theora, FLAC, and Speex, giving "
-"you the freedom to watch or listen to your media in a free format. Not only "
-"are they all open source but no codec that ships with Fedora contains any "
-"harmful patents or licensing fees."
+msgid "Fedora 11 ships with support for Ogg Vorbis, Theora, FLAC, and Speex, giving you the freedom to watch or listen to your media in a free format. Not only are they all open source but no codec that ships with Fedora contains any harmful patents or licensing fees."
 msgstr ""
 
 #. Tag: term
@@ -6179,21 +4350,13 @@ msgstr "MP3 和 Flash"
 #. Tag: para
 #: Multimedia.xml:26
 #, no-c-format
-msgid ""
-"Because of patent issues Fedora can not ship with an MP3 decoder, however if "
-"you are unable to convert to a patent free codec, such as Ogg Vorbis, "
-"Fluendo offers an MP3 decoder that follows all legal requirements set by the "
-"patent holder. Visit Fluendo's website (<ulink type=\"http\" url=\"http://"
-"www.fluendo.com/\">http://www.fluendo.com/</ulink>) for more information."
+msgid "Because of patent issues Fedora can not ship with an MP3 decoder, however if you are unable to convert to a patent free codec, such as Ogg Vorbis, Fluendo offers an MP3 decoder that follows all legal requirements set by the patent holder. Visit Fluendo's website (<ulink type=\"http\" url=\"http://www.fluendo.com/\">http://www.fluendo.com/</ulink>) for more information."
 msgstr ""
 
 #. Tag: para
 #: Multimedia.xml:35
 #, no-c-format
-msgid ""
-"Abode's Flash player is proprietary software and Fedora recommends "
-"installing either <package>swfdec</package> or <package>gnash</package> from "
-"the repositories."
+msgid "Abode's Flash player is proprietary software and Fedora recommends installing either <package>swfdec</package> or <package>gnash</package> from the repositories."
 msgstr ""
 
 #. Tag: term
@@ -6205,28 +4368,13 @@ msgstr "卷控制"
 #. Tag: para
 #: Multimedia.xml:46
 #, no-c-format
-msgid ""
-"An updated volume control manager application provides you with more control "
-"over your audio preferences. Better integrated with PulseAudio, you can now "
-"control individual application inputs and outputs along with the sources and "
-"destinations for the audio."
+msgid "An updated volume control manager application provides you with more control over your audio preferences. Better integrated with PulseAudio, you can now control individual application inputs and outputs along with the sources and destinations for the audio."
 msgstr ""
 
 #. Tag: para
 #: Multimedia.xml:53
 #, no-c-format
-msgid ""
-"With the removal of the <package>gstreamer</package> based volume applet, "
-"you may be left without an obvious way to adjust ALSA sound levels after an "
-"upgrade. If they are set too low, raising the PulseAudio sound levels may "
-"not work acceptably. To solve this issue, install <package>alsa-utils</"
-"package> and run <command>alsamixer -c0</command> from a shell prompt. To "
-"access the recording channels rather than the playback channels (for "
-"instance, to select which input you wish to record from) run "
-"<command>alsamixer -c0 -Vcapture</command>. The <package>alsamixer</package> "
-"program has a <package>curses</package> text-based user interface to adjust "
-"sound levels for ALSA devices. Once <package>alsamixer</package> is running, "
-"get help by typing a question mark."
+msgid "With the removal of the <package>gstreamer</package> based volume applet, you may be left without an obvious way to adjust ALSA sound levels after an upgrade. If they are set too low, raising the PulseAudio sound levels may not work acceptably. To solve this issue, install <package>alsa-utils</package> and run <command>alsamixer -c0</command> from a shell prompt. To access the recording channels rather than the playback channels (for instance, to select which input you wish to record from) run <command>alsamixer -c0 -Vcapture</command>. The <package>alsamixer</package> program has a <package>curses</package> text-based user interface to adjust sound levels for ALSA devices. Once <package>alsamixer</package> is running, get help by typing a question mark."
 msgstr ""
 
 #. Tag: title
@@ -6238,27 +4386,14 @@ msgstr ""
 #. Tag: para
 #: Multimedia.xml:72
 #, no-c-format
-msgid ""
-"If you encounter the volume problem, please file a bug to help us fix your "
-"sound card drivers or PulseAudio. Once the appropriate code is fixed, the "
-"simple volume control application will properly adjust your volume in the "
-"future. Visit the blocker bug at <ulink type=\"http\" url=\"https://bugzilla."
-"redhat.com/show_bug.cgi?id=497966#c1\"></ulink> and read the instructions, "
-"then file a new bug using the pre-filled template at <ulink type=\"http\" "
-"url=\"http://tinyurl.com/c9syun\"></ulink>. Remember to add details as "
-"requested in the blocker bug."
+msgid "If you encounter the volume problem, please file a bug to help us fix your sound card drivers or PulseAudio. Once the appropriate code is fixed, the simple volume control application will properly adjust your volume in the future. Visit the blocker bug at <ulink type=\"http\" url=\"https://bugzilla.redhat.com/show_bug.cgi?id=497966#c1\"></ulink> and read the instructions, then file a new bug using the pre-filled template at <ulink type=\"http\" url=\"http://tinyurl.com/c9syun\"></ulink>. Remember to add details as requested in the blocker bug."
 msgstr ""
 
 #. Tag: para
 #: Multimedia.xml:88
 #, no-c-format
-msgid ""
-"For more information refer to <ulink type=\"http\" url=\"http://"
-"fedoraproject.org/wiki/Multimedia\"> http://fedoraproject.org/wiki/"
-"Multimedia</ulink>."
-msgstr ""
-"有关详情请参考 <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"Multimedia\"> http://fedoraproject.org/wiki/Multimedia</ulink>。"
+msgid "For more information refer to <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Multimedia\"> http://fedoraproject.org/wiki/Multimedia</ulink>."
+msgstr "有关详情请参考 <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Multimedia\"> http://fedoraproject.org/wiki/Multimedia</ulink>。"
 
 #. Tag: title
 #: Networking.xml:6
@@ -6269,14 +4404,8 @@ msgstr "联网"
 #. Tag: remark
 #: Networking.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Networking\">https://fedoraproject.org/wiki/Docs/Beats/"
-"Networking</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Networking\">https://fedoraproject.org/wiki/Docs/Beats/"
-"Networking</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Networking\">https://fedoraproject.org/wiki/Docs/Beats/Networking</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Networking\">https://fedoraproject.org/wiki/Docs/Beats/Networking</ulink>"
 
 #. Tag: term
 #: Networking.xml:11
@@ -6287,27 +4416,13 @@ msgstr ""
 #. Tag: para
 #: Networking.xml:13
 #, no-c-format
-msgid ""
-"The <package>bind</package> and <package>unbound</package> (recursive DNS "
-"servers) now enable DNSSEC validation in their default configuration. DNSSEC "
-"Lookaside Verification (DLV) is also enabled with the <systemitem class="
-"\"fqdomainname\">dlv.sc.org</systemitem> DLV Registry. This behavior can be "
-"modified in <filename>/etc/sysconfig/dnssec</filename> by changing the "
-"DNSSEC and DLV settings."
+msgid "The <package>bind</package> and <package>unbound</package> (recursive DNS servers) now enable DNSSEC validation in their default configuration. DNSSEC Lookaside Verification (DLV) is also enabled with the <systemitem class=\"fqdomainname\">dlv.sc.org</systemitem> DLV Registry. This behavior can be modified in <filename>/etc/sysconfig/dnssec</filename> by changing the DNSSEC and DLV settings."
 msgstr ""
 
 #. Tag: para
 #: Networking.xml:23
 #, no-c-format
-msgid ""
-"With DNSSEC enabled, when a domain supplies DNSSEC data (such as .gov, .se, "
-"the ENUM zone and other TLD's) then that data will be cryptographically "
-"validated on the recursive DNS server. If validation fails due to attempts "
-"at cache poisoning, for example via a Kaminsky Attack, then the end user "
-"will not be given this forged/spoofed data. DNSSEC deployment is gaining "
-"speed rapidly, and is a crucial and logical step to make the Internet more "
-"secure for end users. DLV is used to add DNSSEC signed domains into TLD's "
-"that themselves are not yet signed, such as .com and .org."
+msgid "With DNSSEC enabled, when a domain supplies DNSSEC data (such as .gov, .se, the ENUM zone and other TLD's) then that data will be cryptographically validated on the recursive DNS server. If validation fails due to attempts at cache poisoning, for example via a Kaminsky Attack, then the end user will not be given this forged/spoofed data. DNSSEC deployment is gaining speed rapidly, and is a crucial and logical step to make the Internet more secure for end users. DLV is used to add DNSSEC signed domains into TLD's that themselves are not yet signed, such as .com and .org."
 msgstr ""
 
 #. Tag: term
@@ -6319,13 +4434,7 @@ msgstr "TigerVNC"
 #. Tag: para
 #: Networking.xml:41
 #, no-c-format
-msgid ""
-"TigerVNC is used as default VNC project. Package names were changed to "
-"<package>tigervnc</package>, <package>tigervnc-server</package> and "
-"<package>tigervnc-server-module</package>. Binary names are the same as in "
-"previous versions. The <code>libvnc.so</code> module has been moved to the "
-"<code>tigervnc-server-module</code> subpackage. Otherwise there should be no "
-"difference."
+msgid "TigerVNC is used as default VNC project. Package names were changed to <package>tigervnc</package>, <package>tigervnc-server</package> and <package>tigervnc-server-module</package>. Binary names are the same as in previous versions. The <code>libvnc.so</code> module has been moved to the <code>tigervnc-server-module</code> subpackage. Otherwise there should be no difference."
 msgstr ""
 
 #. Tag: title
@@ -6337,37 +4446,18 @@ msgstr "Fedora 11 概述"
 #. Tag: remark
 #: OverView.xml:8
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/OverView\">https://fedoraproject.org/wiki/Docs/Beats/"
-"OverView</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/OverView\">https://fedoraproject.org/wiki/Docs/Beats/OverView</"
-"ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/OverView\">https://fedoraproject.org/wiki/Docs/Beats/OverView</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/OverView\">https://fedoraproject.org/wiki/Docs/Beats/OverView</ulink>"
 
 #. Tag: para
 #: OverView.xml:10
 #, fuzzy, no-c-format
-msgid ""
-"As always, Fedora continues to develop (<ulink type=\"http\" url=\"http://"
-"www.fedoraproject.org/wiki/Red_Hat_contributions\">http://www.fedoraproject."
-"org/wiki/Red_Hat_contributions</ulink>) and integrate the latest free and "
-"open source software (<ulink type=\"http\" url=\"http://www.fedoraproject."
-"org/wiki/Features\">http://www.fedoraproject.org/wiki/Features</ulink>). The "
-"following sections provide a brief overview of major changes from the last "
-"release of Fedora. For more details about other features that are included "
-"in Fedora 11, refer to their individual wiki pages that detail feature goals "
-"and progress:"
-msgstr ""
-"å’Œä»¥å¾€ä¸€æ ·ï¼ŒFedora 继续开发（<ulink url=\"http://www.fedoraproject.org/wiki/"
-"RedHatContributions\"/>）和整合最新自由和开源软件（<ulink url=\"http://www."
-"fedoraproject.org/wiki/Features\"/>）。下面的部分提供与上一个发行的 Fedora 的"
-"主要改动的总述。有关 Fedora 10 ä¸­çš„å…¶å®ƒç‰¹æ€§ï¼Œè¯·å‚è€ƒå…¶å„è‡ªè¯¦è¿°ç‰¹æ€§ç›®æ ‡å’Œè¿›ç¨‹"
-"的 wiki 页面："
+msgid "As always, Fedora continues to develop (<ulink type=\"http\" url=\"http://www.fedoraproject.org/wiki/Red_Hat_contributions\">http://www.fedoraproject.org/wiki/Red_Hat_contributions</ulink>) and integrate the latest free and open source software (<ulink type=\"http\" url=\"http://www.fedoraproject.org/wiki/Features\">http://www.fedoraproject.org/wiki/Features</ulink>). The following sections provide a brief overview of major changes from the last release of Fedora. For more details about other features that are included in Fedora 11, refer to their individual wiki pages that detail feature goals and progress:"
+msgstr "å’Œä»¥å¾€ä¸€æ ·ï¼ŒFedora 继续开发（<ulink url=\"http://www.fedoraproject.org/wiki/RedHatContributions\"/>）和整合最新自由和开源软件（<ulink url=\"http://www.fedoraproject.org/wiki/Features\"/>）。下面的部分提供与上一个发行的 Fedora 的主要改动的总述。有关 Fedora 10 ä¸­çš„å…¶å®ƒç‰¹æ€§ï¼Œè¯·å‚è€ƒå…¶å„è‡ªè¯¦è¿°ç‰¹æ€§ç›®æ ‡å’Œè¿›ç¨‹çš„ wiki 页面："
 
 #. Tag: ulink
-#: OverView.xml:22 OverView.xml:161
+#: OverView.xml:22
+#: OverView.xml:161
 #, no-c-format
 msgid "http://www.fedoraproject.org/wiki/Releases/11/FeatureList"
 msgstr "http://www.fedoraproject.org/wiki/Releases/11/FeatureList"
@@ -6375,9 +4465,7 @@ msgstr "http://www.fedoraproject.org/wiki/Releases/11/FeatureList"
 #. Tag: para
 #: OverView.xml:25
 #, no-c-format
-msgid ""
-"Throughout the release cycle, there are interviews with the developers "
-"behind key features giving out the inside story:"
+msgid "Throughout the release cycle, there are interviews with the developers behind key features giving out the inside story:"
 msgstr "在整个发行周期中，我们会与主要特性的幕后开发者洽谈并公布一些内部消息："
 
 #. Tag: ulink
@@ -6395,72 +4483,31 @@ msgstr "以下是 Fedora 11 的主要特性："
 #. Tag: para
 #: OverView.xml:39
 #, no-c-format
-msgid ""
-"Automatic font and mime-type installation - PackageKit was introduced in "
-"Fedora 9 as a cross-distro software management application for users. The "
-"capabilities it offers thanks to integration with the desktop became more "
-"visible in Fedora 10, where it provided automatic codec installation. Now in "
-"Fedora 11, PackageKit extends this functionality with the ability to "
-"automatically install fonts where needed for viewing and editing documents. "
-"It also includes the capability to install handlers for specific content "
-"types as needed. Some work is still being completed to provide automatic "
-"installation of applications."
+msgid "Automatic font and mime-type installation - PackageKit was introduced in Fedora 9 as a cross-distro software management application for users. The capabilities it offers thanks to integration with the desktop became more visible in Fedora 10, where it provided automatic codec installation. Now in Fedora 11, PackageKit extends this functionality with the ability to automatically install fonts where needed for viewing and editing documents. It also includes the capability to install handlers for specific content types as needed. Some work is still being completed to provide automatic installation of applications."
 msgstr ""
 
 #. Tag: para
 #: OverView.xml:54
 #, no-c-format
-msgid ""
-"Volume Control - Currently, people using Fedora have to go through many "
-"levels of mixers in different applications to properly set up sound sources. "
-"These are all exposed in the volume control on the desktop, making for a "
-"very confusing user experience. PulseAudio allows us to unify the volume "
-"controls in one interface that makes setting up sound easier and more pain-"
-"free."
+msgid "Volume Control - Currently, people using Fedora have to go through many levels of mixers in different applications to properly set up sound sources. These are all exposed in the volume control on the desktop, making for a very confusing user experience. PulseAudio allows us to unify the volume controls in one interface that makes setting up sound easier and more pain-free."
 msgstr ""
 
 #. Tag: para
 #: OverView.xml:65
 #, no-c-format
-msgid ""
-"Intel, ATI and Nvidia kernel modsetting - Fedora 10 provided the first steps "
-"by a major distribution into using the kernel modesetting (KMS) feature to "
-"speed up graphical boot. We indicated at the time that we would be adding "
-"greater support for additional video cards as time went on. KMS originally "
-"was featured only on some ATI cards. In Fedora 11, this work is extended to "
-"include many more video cards, including Intel and Nvidia, and additional "
-"ATI as well. Although not fully complete, we have increased enormously the "
-"video card coverage of the KMS feature, with more to come."
+msgid "Intel, ATI and Nvidia kernel modsetting - Fedora 10 provided the first steps by a major distribution into using the kernel modesetting (KMS) feature to speed up graphical boot. We indicated at the time that we would be adding greater support for additional video cards as time went on. KMS originally was featured only on some ATI cards. In Fedora 11, this work is extended to include many more video cards, including Intel and Nvidia, and additional ATI as well. Although not fully complete, we have increased enormously the video card coverage of the KMS feature, with more to come."
 msgstr ""
 
 #. Tag: para
 #: OverView.xml:79
 #, no-c-format
-msgid ""
-"Fingerprint - Extensive work has been done to make fingerprint readers easy "
-"to use as an authentication mechanism. Currently, using fingerprint readers "
-"is a bit of a pain, and installing/using fprint and its pam module take more "
-"time than should ever be necessary. The goal of this feature is to make it "
-"painless by providing all the required pieces in Fedora, together with "
-"nicely integrated configuration. To enable this functionality the user will "
-"register their fingerprints on the system as part of user account creation. "
-"After doing so, they will easily be able to log in and authenticate "
-"seamlessly using a simple finger swipe. This greatly simplifies one element "
-"of identity management and is a great step in the evolution of the linux "
-"desktop."
+msgid "Fingerprint - Extensive work has been done to make fingerprint readers easy to use as an authentication mechanism. Currently, using fingerprint readers is a bit of a pain, and installing/using fprint and its pam module take more time than should ever be necessary. The goal of this feature is to make it painless by providing all the required pieces in Fedora, together with nicely integrated configuration. To enable this functionality the user will register their fingerprints on the system as part of user account creation. After doing so, they will easily be able to log in and authenticate seamlessly using a simple finger swipe. This greatly simplifies one element of identity management and is a great step in the evolution of the linux desktop."
 msgstr ""
 
 #. Tag: para
 #: OverView.xml:96
 #, no-c-format
-msgid ""
-"IBus input method system - ibus has been rewritten in C and is the new "
-"default input method for Asian languages. It allows input methods to be "
-"added and removed dynamically during a desktop session. It supports Chinese "
-"(pinyin, libchewing, tables), Indic (m17n), Japanese (anthy), Korean "
-"(libhangul), and more. There are still some features missing compared to "
-"scim so testing is strongly encouraged and reports of problems and "
-"suggestions for improvements welcome."
+msgid "IBus input method system - ibus has been rewritten in C and is the new default input method for Asian languages. It allows input methods to be added and removed dynamically during a desktop session. It supports Chinese (pinyin, libchewing, tables), Indic (m17n), Japanese (anthy), Korean (libhangul), and more. There are still some features missing compared to scim so testing is strongly encouraged and reports of problems and suggestions for improvements welcome."
 msgstr ""
 
 #. Tag: para
@@ -6472,41 +4519,19 @@ msgstr "这个发行本中包括的其它特性："
 #. Tag: para
 #: OverView.xml:114
 #, no-c-format
-msgid ""
-"Ext4 filesystem - The ext3 file system has remained the mature standard in "
-"Linux for a long time. The ext4 file system is a major update that has an "
-"improved design, even better performance and reliability, support for much "
-"larger storage, and very fast file system checks and file deletions. It is "
-"now the default filesystem for new installations."
+msgid "Ext4 filesystem - The ext3 file system has remained the mature standard in Linux for a long time. The ext4 file system is a major update that has an improved design, even better performance and reliability, support for much larger storage, and very fast file system checks and file deletions. It is now the default filesystem for new installations."
 msgstr ""
 
 #. Tag: para
 #: OverView.xml:124
 #, no-c-format
-msgid ""
-"Virt Improved Console - In Fedora 10 and earlier the virtual guest console "
-"is limited to a screen resolution of 800x600. In Fedora 11 the goal is to "
-"have the screen default to at least 1024x768 resolution out of the box. New "
-"installations of F11 provide the ability to use other interface devices in "
-"the virtual guest, such as a USB tablet, which the guest will automatically "
-"detect and configure. Among the results is a mouse pointer that tracks the "
-"local client pointer one-for-one, and providing expanded capabilities."
+msgid "Virt Improved Console - In Fedora 10 and earlier the virtual guest console is limited to a screen resolution of 800x600. In Fedora 11 the goal is to have the screen default to at least 1024x768 resolution out of the box. New installations of F11 provide the ability to use other interface devices in the virtual guest, such as a USB tablet, which the guest will automatically detect and configure. Among the results is a mouse pointer that tracks the local client pointer one-for-one, and providing expanded capabilities."
 msgstr ""
 
 #. Tag: para
 #: OverView.xml:137
 #, no-c-format
-msgid ""
-"MinGW (Windows cross compiler) - Fedora 11 provides MinGW, a development "
-"environment for Fedora users who wish to cross-compile their programs to run "
-"on Windows without having to use Windows. In the past developers have had to "
-"port and compile all of the libraries and tools they have needed, and this "
-"huge effort has happened independently many times over. MinGW eliminates "
-"duplication of work for application developers by providing a range of "
-"libraries and development tools already ported to the cross-compiler "
-"environment. Developers don't have to recompile the application stack "
-"themselves, but can concentrate just on the changes needed to their own "
-"application."
+msgid "MinGW (Windows cross compiler) - Fedora 11 provides MinGW, a development environment for Fedora users who wish to cross-compile their programs to run on Windows without having to use Windows. In the past developers have had to port and compile all of the libraries and tools they have needed, and this huge effort has happened independently many times over. MinGW eliminates duplication of work for application developers by providing a range of libraries and development tools already ported to the cross-compiler environment. Developers don't have to recompile the application stack themselves, but can concentrate just on the changes needed to their own application."
 msgstr ""
 
 #. Tag: para
@@ -6524,23 +4549,13 @@ msgstr "正在打印"
 #. Tag: remark
 #: Printing.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Printing\">https://fedoraproject.org/wiki/Docs/Beats/"
-"Printing</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Printing\">https://fedoraproject.org/wiki/Docs/Beats/Printing</"
-"ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Printing\">https://fedoraproject.org/wiki/Docs/Beats/Printing</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Printing\">https://fedoraproject.org/wiki/Docs/Beats/Printing</ulink>"
 
 #. Tag: para
 #: Printing.xml:8
 #, no-c-format
-msgid ""
-"In this release, system-config-printer uses <application>PolicyKit</"
-"application> to control access to restricted CUPS functionality. The "
-"following functions are controlled via <application>PolicyKit</application> "
-"policies currently:"
+msgid "In this release, system-config-printer uses <application>PolicyKit</application> to control access to restricted CUPS functionality. The following functions are controlled via <application>PolicyKit</application> policies currently:"
 msgstr ""
 
 #. Tag: para
@@ -6594,31 +4609,13 @@ msgstr "restart/cancel/edit 一个任务"
 #. Tag: para
 #: Multimedia.xml:53
 #, no-c-format
-msgid ""
-"With the removal of <package>gstreamer</package> based volume applet, you "
-"may be left without an obvious way to adjust ALSA sound levels after an "
-"upgrade. If they are set too low, raising the PulseAudio sound levels may "
-"not work acceptably. The way to deal with this is to install <package>alsa-"
-"utils</package> and run <command>alsamixer -c0</command> from a shell "
-"prompt. To access the recording channels rather than the playback channels "
-"(for instance, to select which input you wish to record from) run "
-"<command>alsamixer -c0 -Vcapture</command>. The <package>alsamixer</package> "
-"program has a <package>curses</package> text-based user interface to adjust "
-"sound levels for ALSA devices. Once <package>alsamixer</package> is running, "
-"get help by typing a question mark."
+msgid "With the removal of <package>gstreamer</package> based volume applet, you may be left without an obvious way to adjust ALSA sound levels after an upgrade. If they are set too low, raising the PulseAudio sound levels may not work acceptably. The way to deal with this is to install <package>alsa-utils</package> and run <command>alsamixer -c0</command> from a shell prompt. To access the recording channels rather than the playback channels (for instance, to select which input you wish to record from) run <command>alsamixer -c0 -Vcapture</command>. The <package>alsamixer</package> program has a <package>curses</package> text-based user interface to adjust sound levels for ALSA devices. Once <package>alsamixer</package> is running, get help by typing a question mark."
 msgstr ""
 
 #. Tag: para
 #: Multimedia.xml:72
 #, no-c-format
-msgid ""
-"Advanced or intrepid users should file a bug to report this problem. In many "
-"cases, the ALSA drivers need to be updated and proper technical details are "
-"required. Visit the blocker bug at <ulink type=\"http\" url=\"https://"
-"bugzilla.redhat.com/show_bug.cgi?id=497966#c1\"></ulink> and read the "
-"instructions, then file a new bug using the pre-filled template at <ulink "
-"type=\"http\" url=\"http://tinyurl.com/c9syun\"></ulink>. Remember to add "
-"details as requested in the blocker bug."
+msgid "Advanced or intrepid users should file a bug to report this problem. In many cases, the ALSA drivers need to be updated and proper technical details are required. Visit the blocker bug at <ulink type=\"http\" url=\"https://bugzilla.redhat.com/show_bug.cgi?id=497966#c1\"></ulink> and read the instructions, then file a new bug using the pre-filled template at <ulink type=\"http\" url=\"http://tinyurl.com/c9syun\"></ulink>. Remember to add details as requested in the blocker bug."
 msgstr ""
 
 #. Tag: title
@@ -6658,14 +4655,12 @@ msgid "Revision History"
 msgstr "修订记录"
 
 #. Tag: author
-#: Revision_History.xml:13 Revision_History.xml:28 Revision_History.xml:46
+#: Revision_History.xml:13
+#: Revision_History.xml:28
+#: Revision_History.xml:46
 #, no-c-format
-msgid ""
-"<firstname>John</firstname> <surname>McDonough</surname> "
-"<email>jjmcd at fedoraproject.org</email>"
-msgstr ""
-"<firstname>John</firstname> <surname>McDonough</surname> "
-"<email>jjmcd at fedoraproject.org</email>"
+msgid "<firstname>John</firstname> <surname>McDonough</surname> <email>jjmcd at fedoraproject.org</email>"
+msgstr "<firstname>John</firstname> <surname>McDonough</surname> <email>jjmcd at fedoraproject.org</email>"
 
 #. Tag: member
 #: Revision_History.xml:20
@@ -6700,12 +4695,8 @@ msgstr ""
 #. Tag: author
 #: Revision_History.xml:61
 #, no-c-format
-msgid ""
-"<firstname>Ryan </firstname> <surname>Lerch</surname> "
-"<email>ryanlerch at fedoraproject.org</email>"
-msgstr ""
-"<firstname>Ryan </firstname> <surname>Lerch</surname> "
-"<email>ryanlerch at fedoraproject.org</email>"
+msgid "<firstname>Ryan </firstname> <surname>Lerch</surname> <email>ryanlerch at fedoraproject.org</email>"
+msgstr "<firstname>Ryan </firstname> <surname>Lerch</surname> <email>ryanlerch at fedoraproject.org</email>"
 
 #. Tag: member
 #: Revision_History.xml:68
@@ -6722,23 +4713,14 @@ msgstr "Samba（Windows 兼容性）"
 #. Tag: remark
 #: Samba.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Samba\">https://fedoraproject.org/wiki/Docs/Beats/Samba</"
-"ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Samba\">https://fedoraproject.org/wiki/Docs/Beats/Samba</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Samba\">https://fedoraproject.org/wiki/Docs/Beats/Samba</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Samba\">https://fedoraproject.org/wiki/Docs/Beats/Samba</ulink>"
 
 #. Tag: para
 #: Samba.xml:8
 #, no-c-format
-msgid ""
-"This section contains information related to Samba, the suite of software "
-"Fedora uses to interact with Microsoft Windows systems."
-msgstr ""
-"这一节包含与 Samba 相关的信息，Samba 是 Fedora 用来与 Microsoft Windows 系统"
-"互动的软件套件。"
+msgid "This section contains information related to Samba, the suite of software Fedora uses to interact with Microsoft Windows systems."
+msgstr "这一节包含与 Samba 相关的信息，Samba 是 Fedora 用来与 Microsoft Windows 系统互动的软件套件。"
 
 #. Tag: term
 #: Samba.xml:15
@@ -6749,9 +4731,7 @@ msgstr "samba"
 #. Tag: para
 #: Samba.xml:17
 #, no-c-format
-msgid ""
-"<package>samba</package> 3.3.1 is the latest bugfix release for Samba. Major "
-"enhancements in Samba 3.3.1 include:"
+msgid "<package>samba</package> 3.3.1 is the latest bugfix release for Samba. Major enhancements in Samba 3.3.1 include:"
 msgstr ""
 
 #. Tag: para
@@ -6787,8 +4767,7 @@ msgstr "system-config-samba"
 #. Tag: para
 #: Samba.xml:48
 #, no-c-format
-msgid ""
-"<package>system-config-samba</package> has been updated to version 1.2.71."
+msgid "<package>system-config-samba</package> has been updated to version 1.2.71."
 msgstr "已将 <package>system-config-samba</package> 更新至版本 1.2.71。"
 
 #. Tag: title
@@ -6800,21 +4779,13 @@ msgstr "科学和数学方面的更新"
 #. Tag: remark
 #: ScientificTechnical.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Documentation_Scientific_and_Technical_Beat\"> https://"
-"fedoraproject.org/wiki/Documentation_Scientific_and_Technical_Beat </ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Documentation_Scientific_and_Technical_Beat\"> https://fedoraproject.org/"
-"wiki/Documentation_Scientific_and_Technical_Beat </ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Scientific_and_Technical_Beat\"> https://fedoraproject.org/wiki/Documentation_Scientific_and_Technical_Beat </ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Scientific_and_Technical_Beat\"> https://fedoraproject.org/wiki/Documentation_Scientific_and_Technical_Beat </ulink>"
 
 #. Tag: para
 #: ScientificTechnical.xml:12
 #, no-c-format
-msgid ""
-"Fedora 11 includes a range of packages for science and mathematics. The "
-"following packages have been updated for Fedora 11."
+msgid "Fedora 11 includes a range of packages for science and mathematics. The following packages have been updated for Fedora 11."
 msgstr "Fedora 11包括了一系列的科学和数学程序包。以下程序包已随Fedora 11更新。"
 
 #. Tag: title
@@ -6832,9 +4803,7 @@ msgstr "freefem++"
 #. Tag: para
 #: ScientificTechnical.xml:22
 #, no-c-format
-msgid ""
-"<package>freefem++</package> is a finite element analysis package which has "
-"been updated to 3.0."
+msgid "<package>freefem++</package> is a finite element analysis package which has been updated to 3.0."
 msgstr "<package>freefem++</package>是一款有限元分析软件，已更新至3.0。"
 
 #. Tag: para
@@ -6846,32 +4815,20 @@ msgstr ""
 #. Tag: para
 #: ScientificTechnical.xml:31
 #, no-c-format
-msgid ""
-"complete change of the graphical interface (<package>freefem++</package> "
-"replaced <package>freefem++-nw</package>)"
-msgstr ""
-"图形界面的完全变更 (<package>freefem++</package>取代了<package>freefem++-nw</"
-"package>)"
+msgid "complete change of the graphical interface (<package>freefem++</package> replaced <package>freefem++-nw</package>)"
+msgstr "图形界面的完全变更 (<package>freefem++</package>取代了<package>freefem++-nw</package>)"
 
 #. Tag: para
 #: ScientificTechnical.xml:38
 #, no-c-format
-msgid ""
-"added <command>medit</command> (visualization software by P. Frey) inside "
-"<package>freefem++</package> under the name <command>ffmedit</command>"
+msgid "added <command>medit</command> (visualization software by P. Frey) inside <package>freefem++</package> under the name <command>ffmedit</command>"
 msgstr ""
 
 #. Tag: para
 #: ScientificTechnical.xml:45
 #, no-c-format
-msgid ""
-"the IDE version is gone until Antoine Le Hyaric writes a good one. Refer to: "
-"<ulink type=\"http\" url=\"http://www.ann.jussieu.fr/~lehyaric/ffcs\"> "
-"http://www.ann.jussieu.fr/~lehyaric/ffcs</ulink>"
-msgstr ""
-"在Antoine Le Hyaric写出更好的版本前，IDE版本会被剔除。参考<ulink type=\"http"
-"\" url=\"http://www.ann.jussieu.fr/~lehyaric/ffcs\"> http://www.ann.jussieu."
-"fr/~lehyaric/ffcs</ulink>"
+msgid "the IDE version is gone until Antoine Le Hyaric writes a good one. Refer to: <ulink type=\"http\" url=\"http://www.ann.jussieu.fr/~lehyaric/ffcs\"> http://www.ann.jussieu.fr/~lehyaric/ffcs</ulink>"
+msgstr "在Antoine Le Hyaric写出更好的版本前，IDE版本会被剔除。参考<ulink type=\"http\" url=\"http://www.ann.jussieu.fr/~lehyaric/ffcs\"> http://www.ann.jussieu.fr/~lehyaric/ffcs</ulink>"
 
 #. Tag: para
 #: ScientificTechnical.xml:53
@@ -6888,13 +4845,8 @@ msgstr ""
 #. Tag: para
 #: ScientificTechnical.xml:64
 #, no-c-format
-msgid ""
-"Full upstream changelog is here: <ulink type=\"http\" url=\"http://www."
-"freefem.org/ff++/ftp/INNOVATION\"> http://www.freefem.org/ff++/ftp/"
-"INNOVATION</ulink>"
-msgstr ""
-"完整的上游更新日志在此：<ulink type=\"http\" url=\"http://www.freefem.org/ff+"
-"+/ftp/INNOVATION\"> http://www.freefem.org/ff++/ftp/INNOVATION</ulink>"
+msgid "Full upstream changelog is here: <ulink type=\"http\" url=\"http://www.freefem.org/ff++/ftp/INNOVATION\"> http://www.freefem.org/ff++/ftp/INNOVATION</ulink>"
+msgstr "完整的上游更新日志在此：<ulink type=\"http\" url=\"http://www.freefem.org/ff++/ftp/INNOVATION\"> http://www.freefem.org/ff++/ftp/INNOVATION</ulink>"
 
 #. Tag: title
 #: ScientificTechnical.xml:72
@@ -6911,11 +4863,8 @@ msgstr "gabedit"
 #. Tag: para
 #: ScientificTechnical.xml:76
 #, no-c-format
-msgid ""
-"<package>gabedit</package> is a GUI for a number of computational chemistry "
-"packages. Highlights of version 2.1.17 include:"
-msgstr ""
-"<package>gabedit</package>是多种计算性化学程序包的GUI。2.1.17版本的亮点包括："
+msgid "<package>gabedit</package> is a GUI for a number of computational chemistry packages. Highlights of version 2.1.17 include:"
+msgstr "<package>gabedit</package>是多种计算性化学程序包的GUI。2.1.17版本的亮点包括："
 
 #. Tag: para
 #: ScientificTechnical.xml:81
@@ -6932,19 +4881,14 @@ msgstr ""
 #. Tag: para
 #: ScientificTechnical.xml:83
 #, no-c-format
-msgid ""
-"support for reading connectivities from gabedit, hin, pdb, mol2 and mol files"
+msgid "support for reading connectivities from gabedit, hin, pdb, mol2 and mol files"
 msgstr ""
 
 #. Tag: para
 #: ScientificTechnical.xml:85
 #, no-c-format
-msgid ""
-"molecular dynamics conformational searches using MM potential (Amber 99) and "
-"Semi-Empirical method (from Open Mopac or PCGamess)"
-msgstr ""
-"分子动态构象搜索使用 MM potential (Amber 99)和Semi-Empirical方式(来自Open "
-"Mopac或PCGamess)"
+msgid "molecular dynamics conformational searches using MM potential (Amber 99) and Semi-Empirical method (from Open Mopac or PCGamess)"
+msgstr "分子动态构象搜索使用 MM potential (Amber 99)和Semi-Empirical方式(来自Open Mopac或PCGamess)"
 
 #. Tag: para
 #: ScientificTechnical.xml:88
@@ -6961,15 +4905,8 @@ msgstr "å‡ ä½•ç»˜åˆ¶å›¾å½¢å¯å¯¼å‡ºä¸ºEPS，PS，PDFå’ŒSVGæ ¼å¼ "
 #. Tag: para
 #: ScientificTechnical.xml:93
 #, no-c-format
-msgid ""
-"For complete details see the upstream changelog at: <ulink type=\"http\" url="
-"\"http://sites.google.com/site/allouchear/Home/gabedit/download/changelog"
-"\">http://sites.google.com/site/allouchear/Home/gabedit/download/changelog</"
-"ulink>"
-msgstr ""
-"参考上游更新日志 <ulink type=\"http\" url=\"http://sites.google.com/site/"
-"allouchear/Home/gabedit/download/changelog\">http://sites.google.com/site/"
-"allouchear/Home/gabedit/download/changelog</ulink>来了解详细信息。"
+msgid "For complete details see the upstream changelog at: <ulink type=\"http\" url=\"http://sites.google.com/site/allouchear/Home/gabedit/download/changelog\">http://sites.google.com/site/allouchear/Home/gabedit/download/changelog</ulink>"
+msgstr "参考上游更新日志 <ulink type=\"http\" url=\"http://sites.google.com/site/allouchear/Home/gabedit/download/changelog\">http://sites.google.com/site/allouchear/Home/gabedit/download/changelog</ulink>来了解详细信息。"
 
 #. Tag: title
 #: Security.xml:6
@@ -6980,14 +4917,8 @@ msgstr "安全性"
 #. Tag: remark
 #: Security.xml:7
 #, fuzzy, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Security\">https://fedoraproject.org/wiki/Docs/Beats/"
-"Security</ulink>"
-msgstr ""
-"特定的导出限制可以应用到 Fedora 项目发行本。有关详情请参考 <ulink url="
-"\"http://fedoraproject.org/wiki/Legal/Export\">http://fedoraproject.org/wiki/"
-"Legal/Export</ulink>。"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Security\">https://fedoraproject.org/wiki/Docs/Beats/Security</ulink>"
+msgstr "特定的导出限制可以应用到 Fedora 项目发行本。有关详情请参考 <ulink url=\"http://fedoraproject.org/wiki/Legal/Export\">http://fedoraproject.org/wiki/Legal/Export</ulink>。"
 
 #. Tag: para
 #: Security.xml:8
@@ -7004,15 +4935,8 @@ msgstr "指纹读取器"
 #. Tag: para
 #: Security.xml:14
 #, no-c-format
-msgid ""
-"Fingerprint readers are now better integrated with Fedora 11. GNOME users "
-"can easily setup fingerprint authentication using <package>gnome-about-me</"
-"package>, and will allow the ability to login from both <package>gdm</"
-"package> and <package>gnome-screensaver</package>."
-msgstr ""
-"指纹识别已更好地集成在Fedora 11中。GNOME用户可以通过<package>gnome-about-me</"
-"package>轻松设置指纹验证，并能够在<package>gdm</package>和<package>gnome-"
-"screensaver</package>登录时使用。"
+msgid "Fingerprint readers are now better integrated with Fedora 11. GNOME users can easily setup fingerprint authentication using <package>gnome-about-me</package>, and will allow the ability to login from both <package>gdm</package> and <package>gnome-screensaver</package>."
+msgstr "指纹识别已更好地集成在Fedora 11中。GNOME用户可以通过<package>gnome-about-me</package>轻松设置指纹验证，并能够在<package>gdm</package>和<package>gnome-screensaver</package>登录时使用。"
 
 #. Tag: title
 #: Security.xml:24
@@ -7023,24 +4947,13 @@ msgstr "系统安全性服务守护进程"
 #. Tag: para
 #: Security.xml:25
 #, no-c-format
-msgid ""
-"The SSSD is intended to provide several key feature enhancements to Fedora. "
-"The first being the addition of offline caching for network credentials. "
-"Authentication through the SSSD will potentially allow LDAP, NIS, and "
-"FreeIPA services to provide an offline mode, to ease the use of centrally "
-"managing laptop users."
+msgid "The SSSD is intended to provide several key feature enhancements to Fedora. The first being the addition of offline caching for network credentials. Authentication through the SSSD will potentially allow LDAP, NIS, and FreeIPA services to provide an offline mode, to ease the use of centrally managing laptop users."
 msgstr ""
 
 #. Tag: para
 #: Security.xml:33
 #, no-c-format
-msgid ""
-"The LDAP features will also add support for connection pooling. All "
-"communication to the ldap server will happen over a single persistent "
-"connection, reducing the overhead of opening a new socket for each request. "
-"The SSSD will also add support for multiple LDAP/NIS domains. It will be "
-"possible to connect to two or more LDAP/NIS servers acting as separate user "
-"namespaces."
+msgid "The LDAP features will also add support for connection pooling. All communication to the ldap server will happen over a single persistent connection, reducing the overhead of opening a new socket for each request. The SSSD will also add support for multiple LDAP/NIS domains. It will be possible to connect to two or more LDAP/NIS servers acting as separate user namespaces."
 msgstr ""
 
 #. Tag: title
@@ -7052,15 +4965,7 @@ msgstr "SHA-2 支持"
 #. Tag: para
 #: Security.xml:45
 #, no-c-format
-msgid ""
-"Fedora now uses the SHA-256 digest algorithm for data verification and "
-"authentication in more places than before, migrating from the weaker SHA-1 "
-"and MD5 algorithms. Where possible, the migration was transparent; in other "
-"places the default configuration was changed or manual configuration is "
-"necessary to use the stronger algorithms. Refer to <ulink type=\"http\" url="
-"\"http://fedoraproject.org/wiki/Hash_algorithm_migration_status#Configuration"
-"\">Hash_algorithm_migration_status</ulink> on the wiki for application-"
-"specific instructions."
+msgid "Fedora now uses the SHA-256 digest algorithm for data verification and authentication in more places than before, migrating from the weaker SHA-1 and MD5 algorithms. Where possible, the migration was transparent; in other places the default configuration was changed or manual configuration is necessary to use the stronger algorithms. Refer to <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Hash_algorithm_migration_status#Configuration\">Hash_algorithm_migration_status</ulink> on the wiki for application-specific instructions."
 msgstr ""
 
 #. Tag: title
@@ -7072,21 +4977,13 @@ msgstr "服务器工具"
 #. Tag: remark
 #: ServerTools.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/ServerTools\">https://fedoraproject.org/wiki/Docs/Beats/"
-"ServerTools</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/ServerTools\">https://fedoraproject.org/wiki/Docs/Beats/"
-"ServerTools</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/ServerTools\">https://fedoraproject.org/wiki/Docs/Beats/ServerTools</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/ServerTools\">https://fedoraproject.org/wiki/Docs/Beats/ServerTools</ulink>"
 
 #. Tag: para
 #: ServerTools.xml:8
 #, no-c-format
-msgid ""
-"This section highlights changes and additions to the various GUI server and "
-"system configuration tools in Fedora 10."
+msgid "This section highlights changes and additions to the various GUI server and system configuration tools in Fedora 10."
 msgstr "这部分突出了 Fedora 10 中对各种 GUI æœåŠ¡å™¨å’Œç³»ç»Ÿé…ç½®å·¥å…·çš„æ›´æ”¹å’Œæ·»åŠ ã€‚"
 
 #. Tag: title
@@ -7098,14 +4995,8 @@ msgstr "系统守护进程"
 #. Tag: remark
 #: SystemDaemons.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/SystemDaemons\">https://fedoraproject.org/wiki/Docs/"
-"Beats/SystemDaemons</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/SystemDaemons\">https://fedoraproject.org/wiki/Docs/Beats/"
-"SystemDaemons</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/SystemDaemons\">https://fedoraproject.org/wiki/Docs/Beats/SystemDaemons</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/SystemDaemons\">https://fedoraproject.org/wiki/Docs/Beats/SystemDaemons</ulink>"
 
 #. Tag: term
 #: SystemDaemons.xml:12
@@ -7116,27 +5007,12 @@ msgstr "电源管理"
 #. Tag: para
 #: SystemDaemons.xml:14
 #, no-c-format
-msgid ""
-"In order to allow users to monitor the behavior of their systems and to "
-"improve power consumption in general, several improvements were done for "
-"Fedora 11: <itemizedlist> <listitem> <para> Provide two new systemtap "
-"scripts to monitor disk and network activity of running applications </para> "
-"</listitem> <listitem> <para> Add a workload framework package called BLTK "
-"to offer reproducible tests </para> </listitem> <listitem> <para> Improved "
-"applications to reduce unnecessary disk and/or network activity </para> </"
-"listitem> <listitem> <para> Enabled several new features to save power: "
-"<itemizedlist> <listitem> <para> relatime option for root <systemitem class="
-"\"filesystem\">file system</systemitem> </para> </listitem> <listitem> "
-"<para> Automated start/stop of services related to hardware </para> </"
-"listitem> <listitem> <para> Enable USB autosuspend for known working devices "
-"</para> </listitem> <listitem> <para> Add optional tuned service to "
-"dynamically adapt system settings to the current use </para> </listitem> </"
-"itemizedlist> </para> </listitem> </itemizedlist> Users of Fedora 11 should "
-"therefore see a reduction in power usage of their system."
+msgid "In order to allow users to monitor the behavior of their systems and to improve power consumption in general, several improvements were done for Fedora 11: <itemizedlist> <listitem> <para> Provide two new systemtap scripts to monitor disk and network activity of running applications </para> </listitem> <listitem> <para> Add a workload framework package called BLTK to offer reproducible tests </para> </listitem> <listitem> <para> Improved applications to reduce unnecessary disk and/or network activity </para> </listitem> <listitem> <para> Enabled several new features to save power: <itemizedlist> <listitem> <para> relatime option for root <systemitem class=\"filesystem\">file system</systemitem> </para> </listitem> <listitem> <para> Automated start/stop of services related to hardware </para> </listitem> <listitem> <para> Enable USB autosuspend for known working devices </para> </listitem> <listitem> <para> Add optional tuned service to dynamically adapt system setting
 s to the current use </para> </listitem> </itemizedlist> </para> </listitem> </itemizedlist> Users of Fedora 11 should therefore see a reduction in power usage of their system."
 msgstr ""
 
 #. Tag: term
-#: SystemDaemons.xml:74 SystemDaemons.xml:128
+#: SystemDaemons.xml:74
+#: SystemDaemons.xml:128
 #, no-c-format
 msgid "pm-utils"
 msgstr "pm-utils"
@@ -7144,9 +5020,7 @@ msgstr "pm-utils"
 #. Tag: para
 #: SystemDaemons.xml:76
 #, no-c-format
-msgid ""
-"The pm-utils power management utilities have been updated to 1.2.4. Some "
-"improvements have been made in logging and configuration."
+msgid "The pm-utils power management utilities have been updated to 1.2.4. Some improvements have been made in logging and configuration."
 msgstr ""
 
 #. Tag: term
@@ -7158,23 +5032,13 @@ msgstr "mdadm"
 #. Tag: para
 #: SystemDaemons.xml:87
 #, no-c-format
-msgid ""
-"<package>mdadm</package> has been updated to 3.0. The significant change "
-"which justifies the new major version number is that <package>mdadm</"
-"package> can now handle metadata updates entirely in userspace. This allows "
-"<package>mdadm</package> to support metadata formats that the kernel knows "
-"nothing about."
+msgid "<package>mdadm</package> has been updated to 3.0. The significant change which justifies the new major version number is that <package>mdadm</package> can now handle metadata updates entirely in userspace. This allows <package>mdadm</package> to support metadata formats that the kernel knows nothing about."
 msgstr ""
 
 #. Tag: para
 #: SystemDaemons.xml:95
 #, no-c-format
-msgid ""
-"Currently two such metadata formats are supported: <itemizedlist> <listitem> "
-"<para> DDF - The SNIA standard format. </para> </listitem> <listitem> <para> "
-"Intel Matrix - The metadata used by recent Intel ICH controllers. </para> </"
-"listitem> </itemizedlist> Also the approach to device names has changed "
-"significantly."
+msgid "Currently two such metadata formats are supported: <itemizedlist> <listitem> <para> DDF - The SNIA standard format. </para> </listitem> <listitem> <para> Intel Matrix - The metadata used by recent Intel ICH controllers. </para> </listitem> </itemizedlist> Also the approach to device names has changed significantly."
 msgstr ""
 
 #. Tag: term
@@ -7186,42 +5050,26 @@ msgstr "ntfs-3g"
 #. Tag: para
 #: SystemDaemons.xml:117
 #, no-c-format
-msgid ""
-"<package>ntfs-3g</package> has been updated to 2009.2.1 (from 1.5012). There "
-"are many changes in this new driver; see the upstream's release history at "
-"<ulink type=\"http\" url=\"http://www.ntfs-3g.org/releases.html\">http://www."
-"ntfs-3g.org/releases.html</ulink> for complete details."
+msgid "<package>ntfs-3g</package> has been updated to 2009.2.1 (from 1.5012). There are many changes in this new driver; see the upstream's release history at <ulink type=\"http\" url=\"http://www.ntfs-3g.org/releases.html\">http://www.ntfs-3g.org/releases.html</ulink> for complete details."
 msgstr ""
 
 #. Tag: para
 #: SystemDaemons.xml:130
 #, no-c-format
-msgid ""
-"The <package>pm-utils</package> power management utilities have been updated "
-"to 1.2.4. Some improvements have been made in logging and configuration."
+msgid "The <package>pm-utils</package> power management utilities have been updated to 1.2.4. Some improvements have been made in logging and configuration."
 msgstr ""
 
 #. Tag: remark
 #: Virtualization.xml:8
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Virtualization\">https://fedoraproject.org/wiki/Docs/"
-"Beats/Virtualization</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Virtualization\">https://fedoraproject.org/wiki/Docs/Beats/"
-"Virtualization</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Virtualization\">https://fedoraproject.org/wiki/Docs/Beats/Virtualization</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Virtualization\">https://fedoraproject.org/wiki/Docs/Beats/Virtualization</ulink>"
 
 #. Tag: para
 #: Virtualization.xml:10
 #, fuzzy, no-c-format
-msgid ""
-"Virtualization in Fedora 11 includes major changes, and new features, that "
-"continue to support KVM, Xen, and many other virtual machine platforms."
-msgstr ""
-"Fedora 10 中的虚拟化包含重大修改和新特性，依然继续支持 KVM、XEN 以及其它虚拟"
-"机平台。"
+msgid "Virtualization in Fedora 11 includes major changes, and new features, that continue to support KVM, Xen, and many other virtual machine platforms."
+msgstr "Fedora 10 中的虚拟化包含重大修改和新特性，依然继续支持 KVM、XEN 以及其它虚拟机平台。"
 
 #. Tag: title
 #: Virtualization.xml:17
@@ -7232,31 +5080,14 @@ msgstr ""
 #. Tag: para
 #: Virtualization.xml:19
 #, no-c-format
-msgid ""
-"Fedora 11 introduces the ability to use the SASL protocol for authenticating "
-"VNC connection to KVM and QEMU virtual machines. SASL is a pluggable system, "
-"allowing many different authentication mechanisms to be configured without "
-"changing the application code. The use of SASL, in combination with existing "
-"TLS encryption support, will allow clients like <application>vinagre</"
-"application>, <application>virt-viewer</application> and <application>virt-"
-"manager</application> to securely connect to remote virtual machine consoles "
-"hosted on Fedora servers. In environments where Kerberos is deployed, this "
-"further allows for secure single sign on to the VNC server. This new "
-"authentication capability obsoletes the traditional VNC password scheme "
-"which is not sufficiently secure."
+msgid "Fedora 11 introduces the ability to use the SASL protocol for authenticating VNC connection to KVM and QEMU virtual machines. SASL is a pluggable system, allowing many different authentication mechanisms to be configured without changing the application code. The use of SASL, in combination with existing TLS encryption support, will allow clients like <application>vinagre</application>, <application>virt-viewer</application> and <application>virt-manager</application> to securely connect to remote virtual machine consoles hosted on Fedora servers. In environments where Kerberos is deployed, this further allows for secure single sign on to the VNC server. This new authentication capability obsoletes the traditional VNC password scheme which is not sufficiently secure."
 msgstr ""
 
 #. Tag: para
 #: Virtualization.xml:36
 #, fuzzy, no-c-format
-msgid ""
-"For further details refer to the <ulink type=\"http\" url=\"https://"
-"fedoraproject.org/wiki/Features/VirtVNCAuth\">Virtualization VNC "
-"Authentication</ulink> wiki page."
-msgstr ""
-"参考<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/"
-"SVirt_Mandatory_Access_Control\">SVirt强制访问控制</ulink>的wiki页面了解更多"
-"信息。"
+msgid "For further details refer to the <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/VirtVNCAuth\">Virtualization VNC Authentication</ulink> wiki page."
+msgstr "参考<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/SVirt_Mandatory_Access_Control\">SVirt强制访问控制</ulink>的wiki页面了解更多信息。"
 
 #. Tag: title
 #: Virtualization.xml:44
@@ -7267,35 +5098,20 @@ msgstr "为虚拟机改进的图形控制台"
 #. Tag: para
 #: Virtualization.xml:46
 #, no-c-format
-msgid ""
-"Previous Fedora virtual guest consoles were limited to a screen resolution "
-"of 800x600, and the PS2 mouse pointer operated in relative coordinate mode. "
-"This prevented the guest pointer from tracking the local client pointer one "
-"for one."
+msgid "Previous Fedora virtual guest consoles were limited to a screen resolution of 800x600, and the PS2 mouse pointer operated in relative coordinate mode. This prevented the guest pointer from tracking the local client pointer one for one."
 msgstr ""
 
 #. Tag: para
 #: Virtualization.xml:53
-#, no-c-format
-msgid ""
-"Fedora 11 provides more accurate mouse pointer positioning and higher screen "
-"resolutions for virtual machine consoles. Fedora 11 guests default to a "
-"screen resolution of at least 1024x768, and are provided with a USB tablet "
-"in absolute coordinate mode. This results in a mouse pointer which tracks "
-"the local client pointer one for one."
-msgstr ""
+#, fuzzy, no-c-format
+msgid "Fedora 11 provides more accurate mouse pointer positioning and higher screen resolutions for virtual machine consoles. Fedora 11 guests default to a screen resolution of at least 1024x768, and are provided with a USB tablet in absolute coordinate mode. This results in a mouse pointer which tracks the local client pointer one for one."
+msgstr "Fedora 11ä¸ºè™šæ‹Ÿæœºç»ˆç«¯æä¾›äº†æ›´ç²¾ç¡®çš„é¼ æ ‡å®šä½å’Œæ›´é«˜çš„å±å¹•åˆ†è¾¨çŽ‡ã€‚Fedora 11客户机默认分辨率至少为1024x768，并提供了USBå¹³æ¿ç»å¯¹åæ ‡æ¨¡å¼ã€‚This results in a mouse pointer which tracks the local client pointer one for one"
 
 #. Tag: para
 #: Virtualization.xml:62
 #, fuzzy, no-c-format
-msgid ""
-"For further details refer to the <ulink type=\"http\" url=\"https://"
-"fedoraproject.org/wiki/Features/VirtImprovedConsole\">Improved Graphical "
-"Console for Virtual Guests</ulink> wiki page."
-msgstr ""
-"进一步资料请参考 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Features/VirtImprovedConsole\">Improved Graphical Console for Virtual "
-"Guests</ulink> wiki 页面"
+msgid "For further details refer to the <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/VirtImprovedConsole\">Improved Graphical Console for Virtual Guests</ulink> wiki page."
+msgstr "进一步资料请参考 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/VirtImprovedConsole\">Improved Graphical Console for Virtual Guests</ulink> wiki 页面"
 
 #. Tag: title
 #: Virtualization.xml:70
@@ -7306,80 +5122,50 @@ msgstr "KVM PCI 设备分配"
 #. Tag: para
 #: Virtualization.xml:72
 #, no-c-format
-msgid ""
-"Fedora 11 expands its virtualization capabilities to include KVM PCI device "
-"assignment support. KVM users can now give virtual machines exclusive access "
-"to physical PCI devices using Fedora's virtualization tools, including the "
-"Virtual Machine Manager application."
+msgid "Fedora 11 expands its virtualization capabilities to include KVM PCI device assignment support. KVM users can now give virtual machines exclusive access to physical PCI devices using Fedora's virtualization tools, including the Virtual Machine Manager application."
 msgstr ""
 
 #. Tag: para
 #: Virtualization.xml:81
 #, no-c-format
-msgid ""
-"Hardware requirements: Intel VT-d or AMD IOMMU hardware platform support is "
-"required in order for this feature to be available."
-msgstr ""
+msgid "Hardware requirements: Intel VT-d or AMD IOMMU hardware platform support is required in order for this feature to be available."
+msgstr "硬件需求：此特性需要Intel VT-d或AMD IOMMU平台支持。"
 
 #. Tag: para
 #: Virtualization.xml:87
 #, no-c-format
-msgid ""
-"For further details refer to the <ulink type=\"http\" url=\"https://"
-"fedoraproject.org/wiki/Features/KVM_PCI_Device_Assignment\">KVM PCI Device "
-"Assignment</ulink> wiki page."
-msgstr ""
-"进一步资料请参考 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Features/KVM_PCI_Device_Assignment\">KVM PCI Device Assignment</ulink> wiki "
-"页面。"
+msgid "For further details refer to the <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/KVM_PCI_Device_Assignment\">KVM PCI Device Assignment</ulink> wiki page."
+msgstr "进一步资料请参考 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/KVM_PCI_Device_Assignment\">KVM PCI Device Assignment</ulink> wiki 页面。"
 
 #. Tag: title
 #: Virtualization.xml:95
 #, no-c-format
 msgid "KVM and QEMU merge"
-msgstr ""
+msgstr "KVM和QEMU合并"
 
 #. Tag: para
 #: Virtualization.xml:97
 #, no-c-format
-msgid ""
-"QEMU provides a processor and system emulator which enables users to launch "
-"guest virtual machines of the same architecture as the host machine or of a "
-"dramatically different architecture. KVM provides kernel level support for "
-"running guests of the same architecture as the host."
+msgid "QEMU provides a processor and system emulator which enables users to launch guest virtual machines of the same architecture as the host machine or of a dramatically different architecture. KVM provides kernel level support for running guests of the same architecture as the host."
 msgstr ""
 
 #. Tag: para
 #: Virtualization.xml:105
 #, no-c-format
-msgid ""
-"QEMU takes advantage of KVM to run guests directly on the hardware without "
-"any translation needed by the host, allowing much higher levels of "
-"performance."
+msgid "QEMU takes advantage of KVM to run guests directly on the hardware without any translation needed by the host, allowing much higher levels of performance."
 msgstr ""
 
 #. Tag: para
 #: Virtualization.xml:111
 #, no-c-format
-msgid ""
-"Fedora 11 includes a merge of the <package>qemu</package> and <package>kvm</"
-"package> RPMs. The <package>kvm</package> package is now obsoleted by "
-"<code>qemu-system-x86</code> subpackage of <package>qemu</package>. The "
-"merging of the two code bases continues upstream, but the Fedora package "
-"maintainers have chosen to merge the packages now in order reduce the "
-"maintenance burden and provide better support."
+msgid "Fedora 11 includes a merge of the <package>qemu</package> and <package>kvm</package> RPMs. The <package>kvm</package> package is now obsoleted by <code>qemu-system-x86</code> subpackage of <package>qemu</package>. The merging of the two code bases continues upstream, but the Fedora package maintainers have chosen to merge the packages now in order reduce the maintenance burden and provide better support."
 msgstr ""
 
 #. Tag: para
 #: Virtualization.xml:121
 #, fuzzy, no-c-format
-msgid ""
-"For further details refer to the <ulink type=\"http\" url=\"https://"
-"fedoraproject.org/wiki/Features/KVM_and_QEMU_merge\">KVM and QEMU merge</"
-"ulink> wiki page."
-msgstr ""
-"进一步资料请参考 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Features/KVM_and_QEMU_merge\">KVM and QEMU merge</ulink> wiki 页面"
+msgid "For further details refer to the <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/KVM_and_QEMU_merge\">KVM and QEMU merge</ulink> wiki page."
+msgstr "进一步资料请参考 <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/KVM_and_QEMU_merge\">KVM and QEMU merge</ulink> wiki 页面"
 
 #. Tag: title
 #: Virtualization.xml:129
@@ -7390,24 +5176,14 @@ msgstr "SVirt强制访问控制"
 #. Tag: para
 #: Virtualization.xml:131
 #, no-c-format
-msgid ""
-"Fedora 11 integrates SELinux's Mandatory Access Control with virtualization. "
-"Virtual machines can now be much more effectively isolated from the host and "
-"one another, giving the increased assurance that security flaws cannot be "
-"exploited by malicious guests."
+msgid "Fedora 11 integrates SELinux's Mandatory Access Control with virtualization. Virtual machines can now be much more effectively isolated from the host and one another, giving the increased assurance that security flaws cannot be exploited by malicious guests."
 msgstr ""
 
 #. Tag: para
 #: Virtualization.xml:139
 #, fuzzy, no-c-format
-msgid ""
-"For further details refer to the <ulink type=\"http\" url=\"https://"
-"fedoraproject.org/wiki/Features/SVirt_Mandatory_Access_Control\">sVirt "
-"Mandatory Access Control</ulink> wiki page."
-msgstr ""
-"参考<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/"
-"SVirt_Mandatory_Access_Control\">SVirt强制访问控制</ulink>的wiki页面了解更多"
-"信息。"
+msgid "For further details refer to the <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/SVirt_Mandatory_Access_Control\">sVirt Mandatory Access Control</ulink> wiki page."
+msgstr "参考<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Features/SVirt_Mandatory_Access_Control\">SVirt强制访问控制</ulink>的wiki页面了解更多信息。"
 
 #. Tag: title
 #: Virtualization.xml:147
@@ -7436,21 +5212,13 @@ msgstr "QEMU是一个通用开源仿真器和模拟器。"
 #. Tag: para
 #: Virtualization.xml:161
 #, no-c-format
-msgid ""
-"When used as a machine emulator, QEMU can run OSes and programs made for one "
-"machine (e.g. an ARM board) on a different machine (e.g. your own PC). By "
-"using dynamic translation, it achieves very good performance."
+msgid "When used as a machine emulator, QEMU can run OSes and programs made for one machine (e.g. an ARM board) on a different machine (e.g. your own PC). By using dynamic translation, it achieves very good performance."
 msgstr ""
 
 #. Tag: para
 #: Virtualization.xml:168
 #, no-c-format
-msgid ""
-"When used as a virtualizer, QEMU achieves near native performance by "
-"executing the guest code directly on the host CPU. A host driver called the "
-"QEMU accelerator (also known as KQEMU) is needed in this case. The "
-"virtualizer mode requires that both the host and guest machine use x86 "
-"compatible processors."
+msgid "When used as a virtualizer, QEMU achieves near native performance by executing the guest code directly on the host CPU. A host driver called the QEMU accelerator (also known as KQEMU) is needed in this case. The virtualizer mode requires that both the host and guest machine use x86 compatible processors."
 msgstr ""
 
 #. Tag: para
@@ -7570,12 +5338,8 @@ msgstr "很多、很多 bug 修复和新特性"
 #. Tag: para
 #: Virtualization.xml:275
 #, no-c-format
-msgid ""
-"For further details refer to: <ulink type=\"http\" url=\"http://www.nongnu."
-"org/qemu/about.html\">http://www.nongnu.org/qemu/about.html</ulink>"
-msgstr ""
-"进一步资料请参考：<ulink type=\"http\" url=\"http://www.nongnu.org/qemu/"
-"about.html\">http://www.nongnu.org/qemu/about.html</ulink>"
+msgid "For further details refer to: <ulink type=\"http\" url=\"http://www.nongnu.org/qemu/about.html\">http://www.nongnu.org/qemu/about.html</ulink>"
+msgstr "进一步资料请参考：<ulink type=\"http\" url=\"http://www.nongnu.org/qemu/about.html\">http://www.nongnu.org/qemu/about.html</ulink>"
 
 #. Tag: title
 #: Virtualization.xml:282
@@ -7586,27 +5350,19 @@ msgstr "KVM 更新至 84"
 #. Tag: para
 #: Virtualization.xml:284
 #, fuzzy, no-c-format
-msgid ""
-"KVM (for Kernel-based Virtual Machine) is a full virtualization solution for "
-"Linux on x86 hardware."
+msgid "KVM (for Kernel-based Virtual Machine) is a full virtualization solution for Linux on x86 hardware."
 msgstr "KVM (é’ˆå¯¹å†…æ ¸ä¸ºåŸºç¡€çš„è™šæ‹Ÿæœº)是一个在x86硬件下Linux的完全虚拟化方案。"
 
 #. Tag: para
 #: Virtualization.xml:289
 #, no-c-format
-msgid ""
-"Using KVM, one can run multiple virtual machines running unmodified Linux or "
-"Windows images. Each virtual machine has private virtualized hardware: a "
-"network card, disk, graphics adapter, etc."
+msgid "Using KVM, one can run multiple virtual machines running unmodified Linux or Windows images. Each virtual machine has private virtualized hardware: a network card, disk, graphics adapter, etc."
 msgstr ""
 
 #. Tag: para
 #: Virtualization.xml:296
 #, no-c-format
-msgid ""
-"New features and improvements since 74 - For further details refer to: "
-"<ulink type=\"http\" url=\"http://www.linux-kvm.org/page/ChangeLog\">http://"
-"www.linux-kvm.org/page/ChangeLog</ulink>"
+msgid "New features and improvements since 74 - For further details refer to: <ulink type=\"http\" url=\"http://www.linux-kvm.org/page/ChangeLog\">http://www.linux-kvm.org/page/ChangeLog</ulink>"
 msgstr ""
 
 #. Tag: title
@@ -7618,16 +5374,8 @@ msgstr "libvirt 更新至 0.6.1"
 #. Tag: para
 #: Virtualization.xml:306
 #, fuzzy, no-c-format
-msgid ""
-"The <package>libvirt</package> package provides an API and tools to interact "
-"with the virtualization capabilities of recent versions of Linux (and other "
-"OSes). The <application>libvirt</application> software is designed to be a "
-"common denominator among all virtualization technologies with support for "
-"the following:"
-msgstr ""
-"<package>libvirt</package> 软件包提供 API 以及与近期版本 Linux（和其它操作系"
-"统）虚拟化功能互动的工具。<systemitem class=\"library\">libvirt</systemitem> "
-"软件是设计作为所有虚拟化技术的共同特性，并提供以下支持："
+msgid "The <package>libvirt</package> package provides an API and tools to interact with the virtualization capabilities of recent versions of Linux (and other OSes). The <application>libvirt</application> software is designed to be a common denominator among all virtualization technologies with support for the following:"
+msgstr "<package>libvirt</package> 软件包提供 API 以及与近期版本 Linux（和其它操作系统）虚拟化功能互动的工具。<systemitem class=\"library\">libvirt</systemitem> 软件是设计作为所有虚拟化技术的共同特性，并提供以下支持："
 
 #. Tag: para
 #: Virtualization.xml:317
@@ -7854,10 +5602,7 @@ msgstr ""
 #. Tag: para
 #: Virtualization.xml:505
 #, no-c-format
-msgid ""
-"There were also dozens of cleanups, documentation enhancements, portability "
-"and bug fixes. For further details refer to: <ulink type=\"http\" url="
-"\"http://www.libvirt.org/news.html\">http://www.libvirt.org/news.html</ulink>"
+msgid "There were also dozens of cleanups, documentation enhancements, portability and bug fixes. For further details refer to: <ulink type=\"http\" url=\"http://www.libvirt.org/news.html\">http://www.libvirt.org/news.html</ulink>"
 msgstr ""
 
 #. Tag: title
@@ -7869,13 +5614,8 @@ msgstr "virt-manager 更新至 0.7.0"
 #. Tag: para
 #: Virtualization.xml:515
 #, fuzzy, no-c-format
-msgid ""
-"The <package>virt-manager</package> package provides a GUI implementation of "
-"<application>virtinst</application> and <application>libvirt</application> "
-"functionality."
-msgstr ""
-"<package>virt-manager</package> 软件包提供 <command>virtinst</command> 的 "
-"GUI 实施和 <systemitem class=\"library\">libvirt</systemitem> 功能。"
+msgid "The <package>virt-manager</package> package provides a GUI implementation of <application>virtinst</application> and <application>libvirt</application> functionality."
+msgstr "<package>virt-manager</package> 软件包提供 <command>virtinst</command> 的 GUI 实施和 <systemitem class=\"library\">libvirt</systemitem> 功能。"
 
 #. Tag: title
 #: Virtualization.xml:521
@@ -7898,9 +5638,7 @@ msgstr "åˆ é™¤è™šæ‹Ÿæœºæ—¶åˆ é™¤å­˜å‚¨çš„é€‰é¡¹ã€‚"
 #. Tag: para
 #: Virtualization.xml:536
 #, no-c-format
-msgid ""
-"File browser for libvirt storage pools and volumes, for use when attaching "
-"storage to a new or existing guest"
+msgid "File browser for libvirt storage pools and volumes, for use when attaching storage to a new or existing guest"
 msgstr ""
 
 #. Tag: para
@@ -7936,9 +5674,7 @@ msgstr ""
 #. Tag: para
 #: Virtualization.xml:568
 #, fuzzy, no-c-format
-msgid ""
-"Allow specifying a device model when adding a network device to an existing "
-"VM"
+msgid "Allow specifying a device model when adding a network device to an existing VM"
 msgstr "æ·»åŠ æ˜¾ç¤ºè®¾å¤‡æ—¶å…è®¸æŒ‡å®š keymap。"
 
 #. Tag: para
@@ -7962,12 +5698,8 @@ msgstr "Bug 修复以及很多小改进。"
 #. Tag: para
 #: Virtualization.xml:592
 #, no-c-format
-msgid ""
-"For further details refer to: <ulink type=\"http\" url=\"http://virt-manager."
-"et.redhat.com/\">http://virt-manager.et.redhat.com/</ulink>"
-msgstr ""
-"进一步资料请参考：<ulink type=\"http\" url=\"http://virt-manager.et.redhat."
-"com/\">http://virt-manager.et.redhat.com/</ulink>"
+msgid "For further details refer to: <ulink type=\"http\" url=\"http://virt-manager.et.redhat.com/\">http://virt-manager.et.redhat.com/</ulink>"
+msgstr "进一步资料请参考：<ulink type=\"http\" url=\"http://virt-manager.et.redhat.com/\">http://virt-manager.et.redhat.com/</ulink>"
 
 #. Tag: title
 #: Virtualization.xml:599
@@ -7978,12 +5710,8 @@ msgstr "virtinst 更新至 0.400.3"
 #. Tag: para
 #: Virtualization.xml:601
 #, no-c-format
-msgid ""
-"The <package>python-virtinst</package> package contains tools for installing "
-"and manipulating multiple VM guest image formats."
-msgstr ""
-"<package>python-virtinst</package> 软件包包含安装以及操作多 VM å®¢æˆ·ç«¯æ˜ åƒæ ¼å¼"
-"的工具。"
+msgid "The <package>python-virtinst</package> package contains tools for installing and manipulating multiple VM guest image formats."
+msgstr "<package>python-virtinst</package> 软件包包含安装以及操作多 VM å®¢æˆ·ç«¯æ˜ åƒæ ¼å¼çš„å·¥å…·ã€‚"
 
 #. Tag: title
 #: Virtualization.xml:607
@@ -7994,60 +5722,38 @@ msgstr "0.400.0 之后的新特性及改进："
 #. Tag: para
 #: Virtualization.xml:611
 #, fuzzy, no-c-format
-msgid ""
-"New <command>virt-clone</command> option <option>--original-xml</option>, "
-"allows cloning a guest from an XML file, rather than require an existing, "
-"defined guest"
-msgstr ""
-"新的<command>virt-clone</command> option <option>--original-xml</option>允许"
-"从XML文件克隆虚拟机，而不需要已有的定义过的虚拟机。"
+msgid "New <command>virt-clone</command> option <option>--original-xml</option>, allows cloning a guest from an XML file, rather than require an existing, defined guest"
+msgstr "新的<command>virt-clone</command> option <option>--original-xml</option>允许从XML文件克隆虚拟机，而不需要已有的定义过的虚拟机。"
 
 #. Tag: para
 #: Virtualization.xml:619
 #, fuzzy, no-c-format
-msgid ""
-"New <command>virt-install</command> option <option>--import</option>, allows "
-"creating a guest from an existing disk image, bypassing any OS install phase"
-msgstr ""
-"新<command>virt-install</command> option <option>--import</option>，允许从已"
-"有的磁盘镜像创建虚拟机，而不需经过任何OS安装过程。"
+msgid "New <command>virt-install</command> option <option>--import</option>, allows creating a guest from an existing disk image, bypassing any OS install phase"
+msgstr "新<command>virt-install</command> option <option>--import</option>，允许从已有的磁盘镜像创建虚拟机，而不需经过任何OS安装过程。"
 
 #. Tag: para
 #: Virtualization.xml:627
 #, fuzzy, no-c-format
-msgid ""
-"New <command>virt-install</command> option <option>--host-device</option>, "
-"for connecting a physical host device to the guest"
-msgstr ""
-"新<command>virt-install</command> option <option>--host-device</option>，可让"
-"主机的物理设备连接到虚拟机上"
+msgid "New <command>virt-install</command> option <option>--host-device</option>, for connecting a physical host device to the guest"
+msgstr "新<command>virt-install</command> option <option>--host-device</option>，可让主机的物理设备连接到虚拟机上"
 
 #. Tag: para
 #: Virtualization.xml:634
 #, no-c-format
-msgid ""
-"Allow specifying <option>cache</option> value via <command>virt-install</"
-"command> <option>--disk</option> options"
-msgstr ""
-"允许通过<command>virt-install</command> <option>--disk</option>选项指定"
-"<option>cache</option>值"
+msgid "Allow specifying <option>cache</option> value via <command>virt-install</command> <option>--disk</option> options"
+msgstr "允许通过<command>virt-install</command> <option>--disk</option>选项指定<option>cache</option>值"
 
 #. Tag: para
 #: Virtualization.xml:641
 #, no-c-format
-msgid ""
-"New <command>virt-install</command> option <option>--nonetworks</option>"
+msgid "New <command>virt-install</command> option <option>--nonetworks</option>"
 msgstr "新 <command>virt-install</command> 选项 <option>--nonetworks</option>"
 
 #. Tag: para
 #: Virtualization.xml:647
 #, no-c-format
-msgid ""
-"Add virt-image to vmx format support to <command>virt-convert</command>, "
-"replacing virt-pack"
-msgstr ""
-"在 vmx æ ¼å¼ä¸­æ·»åŠ  virt-image 以便支持 <command>virt-convert</command>，替换 "
-"virt-pack"
+msgid "Add virt-image to vmx format support to <command>virt-convert</command>, replacing virt-pack"
+msgstr "在 vmx æ ¼å¼ä¸­æ·»åŠ  virt-image 以便支持 <command>virt-convert</command>，替换 virt-pack"
 
 #. Tag: para
 #: Virtualization.xml:653
@@ -8058,12 +5764,8 @@ msgstr "å¢žåŠ äº†<command>virt-image</command>的磁盘checksum支持"
 #. Tag: para
 #: Virtualization.xml:659
 #, fuzzy, no-c-format
-msgid ""
-"Enhanced URL install support: Debian Xen paravirt, Ubuntu kernel and "
-"<filename>boot.iso</filename>, Mandriva kernel, and Solaris Xen paravirt"
-msgstr ""
-"增强的URL安装支持：Debian Xen paravirt, Ubuntuå†…æ ¸ä»¥åŠ<filename>boot.iso</"
-"filename>, Mandrivaå†…æ ¸å’ŒSolaris Xen Paravirt"
+msgid "Enhanced URL install support: Debian Xen paravirt, Ubuntu kernel and <filename>boot.iso</filename>, Mandriva kernel, and Solaris Xen paravirt"
+msgstr "增强的URL安装支持：Debian Xen paravirt, Ubuntuå†…æ ¸ä»¥åŠ<filename>boot.iso</filename>, Mandrivaå†…æ ¸å’ŒSolaris Xen Paravirt"
 
 #. Tag: para
 #: Virtualization.xml:666
@@ -8080,12 +5782,8 @@ msgstr "大量的bug修正，清理及改进"
 #. Tag: para
 #: Virtualization.xml:678
 #, no-c-format
-msgid ""
-"For further details refer to: <ulink type=\"http\" url=\"http://virt-manager."
-"org/\">http://virt-manager.org/</ulink>"
-msgstr ""
-"进一步资料请参考：<ulink type=\"http\" url=\"http://virt-manager.org/"
-"\">http://virt-manager.org/</ulink>"
+msgid "For further details refer to: <ulink type=\"http\" url=\"http://virt-manager.org/\">http://virt-manager.org/</ulink>"
+msgstr "进一步资料请参考：<ulink type=\"http\" url=\"http://virt-manager.org/\">http://virt-manager.org/</ulink>"
 
 #. Tag: title
 #: Virtualization.xml:685
@@ -8096,13 +5794,8 @@ msgstr "Xen 更新至 3.3.1"
 #. Tag: para
 #: Virtualization.xml:687
 #, fuzzy, no-c-format
-msgid ""
-"Fedora 11 supports booting as a domU guest, but will not function as a dom0 "
-"host until such support is provided in the upstream kernel. Support for a "
-"pv_ops dom0 is targeted for Xen 3.4."
-msgstr ""
-"Fedora 10 支持作为客户端 domU 启动，但还不能作为 dom0 ä½¿ç”¨ï¼Œç›´åˆ°ä¸Šæ¸¸å†…æ ¸å¯æ"
-"供这种支持。支持 <option>pv_ops</option> dom0 是 Xen 3.4 çš„ç›®æ ‡ã€‚"
+msgid "Fedora 11 supports booting as a domU guest, but will not function as a dom0 host until such support is provided in the upstream kernel. Support for a pv_ops dom0 is targeted for Xen 3.4."
+msgstr "Fedora 10 支持作为客户端 domU 启动，但还不能作为 dom0 ä½¿ç”¨ï¼Œç›´åˆ°ä¸Šæ¸¸å†…æ ¸å¯æä¾›è¿™ç§æ”¯æŒã€‚æ”¯æŒ <option>pv_ops</option> dom0 是 Xen 3.4 çš„ç›®æ ‡ã€‚"
 
 #. Tag: title
 #: Virtualization.xml:694
@@ -8125,24 +5818,14 @@ msgstr "更多信息，请参考："
 #. Tag: para
 #: Virtualization.xml:703
 #, no-c-format
-msgid ""
-"<ulink type=\"http\" url=\"http://www.xen.org/download/roadmap.html\">http://"
-"www.xen.org/download/roadmap.html</ulink> -- Xen roadmap"
-msgstr ""
-"<ulink type=\"http\" url=\"http://www.xen.org/download/roadmap.html\">http://"
-"www.xen.org/download/roadmap.html</ulink> -- Xen 导航"
+msgid "<ulink type=\"http\" url=\"http://www.xen.org/download/roadmap.html\">http://www.xen.org/download/roadmap.html</ulink> -- Xen roadmap"
+msgstr "<ulink type=\"http\" url=\"http://www.xen.org/download/roadmap.html\">http://www.xen.org/download/roadmap.html</ulink> -- Xen 导航"
 
 #. Tag: para
 #: Virtualization.xml:709
 #, no-c-format
-msgid ""
-"<ulink type=\"http\" url=\"http://xenbits.xen.org/paravirt_ops/patches.hg/"
-"\">http://xenbits.xen.org/paravirt_ops/patches.hg/</ulink> -- paravirt_ops "
-"patch queue"
-msgstr ""
-"<ulink type=\"http\" url=\"http://xenbits.xen.org/paravirt_ops/patches.hg/"
-"\">http://xenbits.xen.org/paravirt_ops/patches.hg/</ulink> -- paravirt_ops è¡¥"
-"丁查询"
+msgid "<ulink type=\"http\" url=\"http://xenbits.xen.org/paravirt_ops/patches.hg/\">http://xenbits.xen.org/paravirt_ops/patches.hg/</ulink> -- paravirt_ops patch queue"
+msgstr "<ulink type=\"http\" url=\"http://xenbits.xen.org/paravirt_ops/patches.hg/\">http://xenbits.xen.org/paravirt_ops/patches.hg/</ulink> -- paravirt_ops 补丁查询"
 
 #. Tag: title
 #: Virtualization.xml:720
@@ -8153,14 +5836,8 @@ msgstr "Xen å†…æ ¸æ”¯æŒ"
 #. Tag: para
 #: Virtualization.xml:722
 #, fuzzy, no-c-format
-msgid ""
-"The <application>kernel</application> package in Fedora 11 supports booting "
-"as a guest domU, but will not function as a dom0 until such support is "
-"provided upstream. Work is ongoing and hopes are high that support will be "
-"included in <application>kernel</application> 2.6.30 and Fedora 12."
-msgstr ""
-"Fedora 10 支持作为客户端 domU 启动，但还不能作为 dom0 ä½¿ç”¨ï¼Œç›´åˆ°ä¸Šæ¸¸å†…æ ¸å¯æ"
-"供这种支持。支持 <option>pv_ops</option> dom0 是 Xen 3.4 çš„ç›®æ ‡ã€‚"
+msgid "The <application>kernel</application> package in Fedora 11 supports booting as a guest domU, but will not function as a dom0 until such support is provided upstream. Work is ongoing and hopes are high that support will be included in <application>kernel</application> 2.6.30 and Fedora 12."
+msgstr "Fedora 10 支持作为客户端 domU 启动，但还不能作为 dom0 ä½¿ç”¨ï¼Œç›´åˆ°ä¸Šæ¸¸å†…æ ¸å¯æä¾›è¿™ç§æ”¯æŒã€‚æ”¯æŒ <option>pv_ops</option> dom0 是 Xen 3.4 çš„ç›®æ ‡ã€‚"
 
 #. Tag: para
 #: Virtualization.xml:730
@@ -8171,23 +5848,14 @@ msgstr "最早可以支持dom0的Fedora发行版是Fedora 8。"
 #. Tag: para
 #: Virtualization.xml:734
 #, fuzzy, no-c-format
-msgid ""
-"Booting a Xen domU guest within a Fedora 11 host requires the KVM based "
-"xenner. Xenner runs the guest kernel and a small Xen emulator together as a "
-"KVM guest."
-msgstr ""
-"在 Fedora 10 主机中引导 Xen domU 客户端需要基于 <command>xenner</command> 的 "
-"KVM。Xenner å°†å®¢æˆ·ç«¯å†…æ ¸å’Œå°åž‹ Xen 仿真程序一同作为 KVM 客户端运行。"
+msgid "Booting a Xen domU guest within a Fedora 11 host requires the KVM based xenner. Xenner runs the guest kernel and a small Xen emulator together as a KVM guest."
+msgstr "在 Fedora 10 主机中引导 Xen domU 客户端需要基于 <command>xenner</command> çš„ KVM。Xenner å°†å®¢æˆ·ç«¯å†…æ ¸å’Œå°åž‹ Xen 仿真程序一同作为 KVM 客户端运行。"
 
 #. Tag: para
 #: Virtualization.xml:741
 #, no-c-format
-msgid ""
-"KVM requires hardware virtualization features in the host system. Systems "
-"lacking hardware virtualization do not support Xen guests at this time."
-msgstr ""
-"KVM要求宿主机系统具有硬件虚拟化功能。目前系统没有硬件虚拟化功能的不支持 Xen "
-"客户端。"
+msgid "KVM requires hardware virtualization features in the host system. Systems lacking hardware virtualization do not support Xen guests at this time."
+msgstr "KVM要求宿主机系统具有硬件虚拟化功能。目前系统没有硬件虚拟化功能的不支持 Xen 客户端。"
 
 #. Tag: para
 #: Virtualization.xml:748
@@ -8228,14 +5896,8 @@ msgstr "网页服务器和内容服务器"
 #. Tag: remark
 #: WebServers.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Documentation_Web_Servers_Beat\">https://fedoraproject.org/wiki/"
-"Documentation_Web_Servers_Beat</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Documentation_Web_Servers_Beat\">https://fedoraproject.org/wiki/"
-"Documentation_Web_Servers_Beat</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Web_Servers_Beat\">https://fedoraproject.org/wiki/Documentation_Web_Servers_Beat</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_Web_Servers_Beat\">https://fedoraproject.org/wiki/Documentation_Web_Servers_Beat</ulink>"
 
 #. Tag: term
 #: WebServers.xml:11
@@ -8246,13 +5908,8 @@ msgstr "Apache"
 #. Tag: para
 #: WebServers.xml:13
 #, no-c-format
-msgid ""
-"The <package>httpd</package> server has been updated to version 2.2.11. This "
-"is primarily a bugfix release and no configuration changes should be "
-"required."
-msgstr ""
-"<package>httpd</package>服务器更新至2.2.11。主要是修正了以前的bug，并不需要更"
-"改设置。"
+msgid "The <package>httpd</package> server has been updated to version 2.2.11. This is primarily a bugfix release and no configuration changes should be required."
+msgstr "<package>httpd</package>服务器更新至2.2.11。主要是修正了以前的bug，并不需要更改设置。"
 
 #. Tag: term
 #: WebServers.xml:21
@@ -8263,25 +5920,14 @@ msgstr "WordPress"
 #. Tag: para
 #: WebServers.xml:23
 #, no-c-format
-msgid ""
-"The <package>wordpress</package> package has been updated to 2.7.1. This is "
-"a major update and includes a number of new features such as sticky posts, a "
-"one-click plugin install and comment threading, plus many others."
-msgstr ""
-"<package>wordpress</package>包更新到了2.7.1。这是一次较大的升级，包含了一系列"
-"的新特性，如sticky posts，一键插件安装以及comment threading等等。"
+msgid "The <package>wordpress</package> package has been updated to 2.7.1. This is a major update and includes a number of new features such as sticky posts, a one-click plugin install and comment threading, plus many others."
+msgstr "<package>wordpress</package>包更新到了2.7.1。这是一次较大的升级，包含了一系列的新特性，如sticky posts，一键插件安装以及comment threading等等。"
 
 #. Tag: para
 #: WebServers.xml:29
 #, no-c-format
-msgid ""
-"See the Wordpress feature page at <ulink type=\"http\" url=\"http://codex."
-"wordpress.org/Version_2.7\">http://codex.wordpress.org/Version_2.7</ulink> "
-"for complete information."
-msgstr ""
-"请参考<ulink type=\"http\" url=\"http://codex.wordpress.org/Version_2.7"
-"\">http://codex.wordpress.org/Version_2.7</ulink>关于Wordpress特性的完整信"
-"息。"
+msgid "See the Wordpress feature page at <ulink type=\"http\" url=\"http://codex.wordpress.org/Version_2.7\">http://codex.wordpress.org/Version_2.7</ulink> for complete information."
+msgstr "请参考<ulink type=\"http\" url=\"http://codex.wordpress.org/Version_2.7\">http://codex.wordpress.org/Version_2.7</ulink>关于Wordpress特性的完整信息。"
 
 #. Tag: term
 #: WebServers.xml:37
@@ -8292,12 +5938,7 @@ msgstr ""
 #. Tag: para
 #: WebServers.xml:39
 #, no-c-format
-msgid ""
-"<package>moin</package> is updated to 1.8.2. Users should review the files "
-"in <filename>/user/share/doc/moin-1.8.2/*</filename>. The <filename>CHANGES</"
-"filename> file lists changes, <filename>UPDATE</filename> describes how to "
-"update. <filename>README.migration</filename> describes how to migrate your "
-"existing data."
+msgid "<package>moin</package> is updated to 1.8.2. Users should review the files in <filename>/user/share/doc/moin-1.8.2/*</filename>. The <filename>CHANGES</filename> file lists changes, <filename>UPDATE</filename> describes how to update. <filename>README.migration</filename> describes how to migrate your existing data."
 msgstr ""
 
 #. Tag: title
@@ -8309,108 +5950,56 @@ msgstr "欢迎使用 Fedora"
 #. Tag: remark
 #: Welcome.xml:7
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Welcome\">https://fedoraproject.org/wiki/Docs/Beats/"
-"Welcome</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Welcome\">https://fedoraproject.org/wiki/Docs/Beats/Welcome</"
-"ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Welcome\">https://fedoraproject.org/wiki/Docs/Beats/Welcome</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Welcome\">https://fedoraproject.org/wiki/Docs/Beats/Welcome</ulink>"
 
 #. Tag: para
 #: Welcome.xml:8
 #, no-c-format
-msgid ""
-"Fedora is a Linux-based operating system that showcases the latest in free "
-"and open source software. Fedora is always free for anyone to use, modify, "
-"and distribute. It is built by people across the globe who work together as "
-"a community: the Fedora Project. The Fedora Project is open and anyone is "
-"welcome to join. The Fedora Project is out front for you, leading the "
-"advancement of free, open software and content."
-msgstr ""
-"Fedora 是基于 Linux 的操作系统，包含最新的自由开源软件。任何人都可用永远免费"
-"使用、修改和发布 Fedora。它是由全球社区（Fedora 项目）人员创建。Fedora 项目是"
-"ä¸€ä¸ªå¼€æ”¾é¡¹ç›®å¹¶æ¬¢è¿Žä»»ä½•äººåŠ å…¥ã€‚Fedora 项目是一个领先的项目，引领自由开放软件和"
-"组件的最新成果。"
+msgid "Fedora is a Linux-based operating system that showcases the latest in free and open source software. Fedora is always free for anyone to use, modify, and distribute. It is built by people across the globe who work together as a community: the Fedora Project. The Fedora Project is open and anyone is welcome to join. The Fedora Project is out front for you, leading the advancement of free, open software and content."
+msgstr "Fedora 是基于 Linux 的操作系统，包含最新的自由开源软件。任何人都可用永远免费使用、修改和发布 Fedora。它是由全球社区（Fedora 项目）人员创建。Fedora é¡¹ç›®æ˜¯ä¸€ä¸ªå¼€æ”¾é¡¹ç›®å¹¶æ¬¢è¿Žä»»ä½•äººåŠ å…¥ã€‚Fedora 项目是一个领先的项目，引领自由开放软件和组件的最新成果。"
 
 #. Tag: para
 #: Welcome.xml:12
 #, no-c-format
-msgid ""
-"Visit <ulink type=\"http\" url=\"http://docs.fedoraproject.org/release-notes/"
-"\">http://docs.fedoraproject.org/release-notes/</ulink> to view the latest "
-"release notes for Fedora, especially if you are upgrading. If you are "
-"migrating from a release of Fedora older than the immediately previous one, "
-"you should refer to older Release Notes for additional information."
-msgstr ""
-"请访问<ulink type=\"http\" url=\"http://docs.fedoraproject.org/release-notes/"
-"\">http://docs.fedoraproject.org/release-notes/</ulink>来了解Fedora最新的发行"
-"注记，特别是在您要升级的时候。如果您打算从上个版本之前的Fedora发行版升级系统"
-"时，您还需要参考那个版本的发行注记来了解更多信息。"
+msgid "Visit <ulink type=\"http\" url=\"http://docs.fedoraproject.org/release-notes/\">http://docs.fedoraproject.org/release-notes/</ulink> to view the latest release notes for Fedora, especially if you are upgrading. If you are migrating from a release of Fedora older than the immediately previous one, you should refer to older Release Notes for additional information."
+msgstr "请访问<ulink type=\"http\" url=\"http://docs.fedoraproject.org/release-notes/\">http://docs.fedoraproject.org/release-notes/</ulink>来了解Fedora最新的发行注记，特别是在您要升级的时候。如果您打算从上个版本之前的Fedora发行版升级系统时，您还需要参考那个版本的发行注记来了解更多信息。"
 
 #. Tag: para
 #: Welcome.xml:16
 #, fuzzy, no-c-format
-msgid ""
-"You can help the Fedora Project community continue to improve Fedora if you "
-"file bug reports and enhancement requests. Refer to <ulink type=\"http\" url="
-"\"http://fedoraproject.org/wiki/Bugs_and_feature_requests\">http://"
-"fedoraproject.org/wiki/Bugs_and_feature_requests</ulink> for more "
-"information about bug and feature reporting. Thank you for your "
-"participation."
-msgstr ""
-"您只要提交错误报告以及功能增强请求，就可以帮助 Fedora 项目和社区不断地改进 "
-"Fedora。有关 but 及特性报告请参考 <ulink url=\"http://fedoraproject.org/wiki/"
-"BugsAndFeatureRequests\"/>。感谢您的参与。"
+msgid "You can help the Fedora Project community continue to improve Fedora if you file bug reports and enhancement requests. Refer to <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Bugs_and_feature_requests\">http://fedoraproject.org/wiki/Bugs_and_feature_requests</ulink> for more information about bug and feature reporting. Thank you for your participation."
+msgstr "您只要提交错误报告以及功能增强请求，就可以帮助 Fedora 项目和社区不断地改进 Fedora。有关 but 及特性报告请参考 <ulink url=\"http://fedoraproject.org/wiki/BugsAndFeatureRequests\"/>。感谢您的参与。"
 
 #. Tag: para
 #: Welcome.xml:19
 #, no-c-format
-msgid ""
-"To find out more general information about Fedora, refer to the following "
-"Web pages:"
+msgid "To find out more general information about Fedora, refer to the following Web pages:"
 msgstr "想知道更多 Fedora 的信息，请访问下列页面: "
 
 #. Tag: para
 #: Welcome.xml:23
 #, no-c-format
-msgid ""
-"Fedora Overview (<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"Overview\">http://fedoraproject.org/wiki/Overview</ulink>)"
-msgstr ""
-"Fedora 概述（(<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"Overview\">http://fedoraproject.org/wiki/Overview</ulink>）"
+msgid "Fedora Overview (<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Overview\">http://fedoraproject.org/wiki/Overview</ulink>)"
+msgstr "Fedora 概述（(<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Overview\">http://fedoraproject.org/wiki/Overview</ulink>）"
 
 #. Tag: para
 #: Welcome.xml:28
 #, no-c-format
-msgid ""
-"Fedora FAQ (<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/FAQ"
-"\">http://fedoraproject.org/wiki/FAQ</ulink>)"
-msgstr ""
-"Fedora FAQ（<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/FAQ"
-"\">http://fedoraproject.org/wiki/FAQ</ulink>）"
+msgid "Fedora FAQ (<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/FAQ\">http://fedoraproject.org/wiki/FAQ</ulink>)"
+msgstr "Fedora FAQ（<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/FAQ\">http://fedoraproject.org/wiki/FAQ</ulink>）"
 
 #. Tag: para
 #: Welcome.xml:33
 #, no-c-format
-msgid ""
-"Help and Discussions (<ulink type=\"http\" url=\"http://fedoraproject.org/"
-"wiki/Communicate\">http://fedoraproject.org/wiki/Communicate</ulink>)"
-msgstr ""
-"帮助和讨论（<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"Communicate\">http://fedoraproject.org/wiki/Communicate</ulink>）"
+msgid "Help and Discussions (<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Communicate\">http://fedoraproject.org/wiki/Communicate</ulink>)"
+msgstr "帮助和讨论（<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Communicate\">http://fedoraproject.org/wiki/Communicate</ulink>）"
 
 #. Tag: para
 #: Welcome.xml:39
 #, no-c-format
-msgid ""
-"Participate in the Fedora Project (<ulink type=\"http\" url=\"http://"
-"fedoraproject.org/wiki/Join\">http://fedoraproject.org/wiki/Join</ulink>)"
-msgstr ""
-"参与 Fedora 项目（<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"Join\">http://fedoraproject.org/wiki/Join</ulink>）"
+msgid "Participate in the Fedora Project (<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Join\">http://fedoraproject.org/wiki/Join</ulink>)"
+msgstr "参与 Fedora 项目（<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Join\">http://fedoraproject.org/wiki/Join</ulink>）"
 
 #. Tag: title
 #: Xorg.xml:7
@@ -8421,20 +6010,13 @@ msgstr "X 窗口系统（图形）"
 #. Tag: remark
 #: Xorg.xml:8
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Docs/Beats/Xorg\">https://fedoraproject.org/wiki/Docs/Beats/Xorg</"
-"ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Xorg\">https://fedoraproject.org/wiki/Docs/Beats/Xorg</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Xorg\">https://fedoraproject.org/wiki/Docs/Beats/Xorg</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Xorg\">https://fedoraproject.org/wiki/Docs/Beats/Xorg</ulink>"
 
 #. Tag: para
 #: Xorg.xml:11
 #, fuzzy, no-c-format
-msgid ""
-"This section contains information related to the X Window System "
-"implementation, Xorg, provided with Fedora."
+msgid "This section contains information related to the X Window System implementation, Xorg, provided with Fedora."
 msgstr "这一节包含与 Fedora 中采用的 X 窗口系统相关的信息。"
 
 #. Tag: title
@@ -8446,24 +6028,13 @@ msgstr "X 服务器"
 #. Tag: para
 #: Xorg.xml:19
 #, no-c-format
-msgid ""
-"The key combination <keycombo><keycap>Ctrl</keycap><keycap>Alt</"
-"keycap><keycap>Backspace</keycap></keycombo> to kill the X server has been "
-"removed from the default XKB maps. To restore it, you must enable the xkb "
-"option <code>terminate:ctrl_alt_bksp</code>. From the main menu, select "
-"<guimenu>System > Preferences > Keyboard</guimenu>. In the <code>Keyboard "
-"Preferences</code> dialog, select the <code>Layout</code> tab, then select "
-"<code>Layout Options</code>. Select <code>Key sequence to kill the X server</"
-"code> and then tick the checkbox for <keycap>Control</keycap> + <keycap>Alt</"
-"keycap> + <keycap>Backspace</keycap>."
+msgid "The key combination <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Backspace</keycap></keycombo> to kill the X server has been removed from the default XKB maps. To restore it, you must enable the xkb option <code>terminate:ctrl_alt_bksp</code>. From the main menu, select <guimenu>System > Preferences > Keyboard</guimenu>. In the <code>Keyboard Preferences</code> dialog, select the <code>Layout</code> tab, then select <code>Layout Options</code>. Select <code>Key sequence to kill the X server</code> and then tick the checkbox for <keycap>Control</keycap> + <keycap>Alt</keycap> + <keycap>Backspace</keycap>."
 msgstr ""
 
 #. Tag: para
 #: Xorg.xml:33
 #, no-c-format
-msgid ""
-"Alternatively, run the following command to enable the key combination "
-"temporarily:"
+msgid "Alternatively, run the following command to enable the key combination temporarily:"
 msgstr ""
 
 #. Tag: screen
@@ -8475,13 +6046,7 @@ msgstr ""
 #. Tag: para
 #: Xorg.xml:38
 #, no-c-format
-msgid ""
-"The package <package>fedora-setup-keyboard</package> automatically merges "
-"this XKB option at X server startup, making the <keycap>Control</keycap> + "
-"<keycap>Alt</keycap> + <keycap>Backspace</keycap> key combination functional "
-"in gdm, or if the server is started without the GNOME desktop environment. "
-"It is deactivated once GNOME applies the user-configured keyboard layout "
-"unless the user has enabled it in the preferences menu as detailed above."
+msgid "The package <package>fedora-setup-keyboard</package> automatically merges this XKB option at X server startup, making the <keycap>Control</keycap> + <keycap>Alt</keycap> + <keycap>Backspace</keycap> key combination functional in gdm, or if the server is started without the GNOME desktop environment. It is deactivated once GNOME applies the user-configured keyboard layout unless the user has enabled it in the preferences menu as detailed above."
 msgstr ""
 
 #. Tag: title
@@ -8493,35 +6058,23 @@ msgstr "第三方的显卡驱动程序"
 #. Tag: para
 #: Xorg.xml:53
 #, no-c-format
-msgid ""
-"Refer to the Xorg third-party drivers page for detailed guidelines on using "
-"third-party video drivers: <ulink type=\"http\" url=\"http://fedoraproject."
-"org/wiki/Xorg/3rdPartyVideoDrivers\">http://fedoraproject.org/wiki/"
-"Xorg/3rdPartyVideoDrivers</ulink>"
-msgstr ""
-"有关使用第三方显卡驱动程序的详情请参考 Xorg 第三方驱动程序页面：<ulink type="
-"\"http\" url=\"http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers"
-"\">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers</ulink>"
+msgid "Refer to the Xorg third-party drivers page for detailed guidelines on using third-party video drivers: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers\">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers</ulink>"
+msgstr "有关使用第三方显卡驱动程序的详情请参考 Xorg 第三方驱动程序页面：<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers\">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers</ulink>"
 
 #~ msgid "mysql"
 #~ msgstr "mysql"
-
 #~ msgid "MySQL has been updated to 5.1.31."
 #~ msgstr "已将 MySQL 更新到 5.1.31。"
-
 #~ msgid "Backwards Comparibility"
 #~ msgstr "向下兼容"
-
 #~ msgid ""
 #~ "Some of the changes involve syntax changes that have the potential to "
 #~ "break existing code."
 #~ msgstr "æœ‰äº›æ”¹åŠ¨åŒ…æ‹¬å¯¹è¯­æ³•çš„æ›´æ”¹ï¼Œå¯èƒ½ç ´åçŽ°æœ‰ç¼–ç ã€‚"
-
 #~ msgid ""
 #~ "DNSSEC (DNS SECurity) is mechanism which provides integrity and "
 #~ "authenticity of DNS data."
 #~ msgstr "DNSSEC (DNS SECurity)是一个提供完整和安全的DNS数据的机制。"
-
 #~ msgid ""
 #~ "The key combination <keycombo><keycap>Ctrl</keycap><keycap>Alt</"
 #~ "keycap><keycap>Backspace</keycap></keycombo> to kill the X server has "
@@ -8541,7 +6094,6 @@ msgstr ""
 #~ "<filename>xorg.conf</filename>æ–‡ä»¶é‡ŒåŠ å…¥å¦‚ä¸‹å†…å®¹æ¥æ›´æ”¹æ­¤é»˜è®¤è®¾ç½®ã€‚å¦‚æžœè¯¥æ–‡"
 #~ "件不存在，您可使用文本编辑器手动创建它，<filename>/etc/X11/xorg.conf</"
 #~ "filename>，之后Xorg就会使用那个设置。"
-
 #~ msgid ""
 #~ "Section \"ServerFlags\"\n"
 #~ "Option \"DontZap\" \"false\"\n"
@@ -8550,14 +6102,12 @@ msgstr ""
 #~ "Section \"ServerFlags\"\n"
 #~ "Option \"DontZap\" \"false\"\n"
 #~ "EndSection"
-
 #~ msgid ""
 #~ "If you use kickstart or want to use scripts to change this setting "
 #~ "automatically across multiple systems, you can use the following snippet:"
 #~ msgstr ""
 #~ "如果您想要使用 kickstart 或者脚本自动在多系统间更改这个设定，您可以使用以"
 #~ "下小程序："
-
 #~ msgid ""
 #~ "%post\n"
 #~ "\n"
@@ -8586,7 +6136,6 @@ msgstr ""
 #~ "fi\n"
 #~ "\n"
 #~ "%end"
-
 #~ msgid ""
 #~ "The Xorg project has changed the default DontZap setting to \"true\" "
 #~ "after complaints from desktop users that accidentally hit "
@@ -8607,3 +6156,4 @@ msgstr ""
 #~ "keycap></keycombo>组合键，Xorg项目已决定将默认的DontZap设置改为“true”。"
 #~ "<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Backspace</"
 #~ "keycap></keycombo>实际上也是Emacs中Cå’ŒJavaæ¨¡å¼åˆ é™¤æŸäº›è¡¨è¾¾å¼çš„å¿«æ·é”®ã€‚"
+