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

Transifex System User transif at fedoraproject.org
Wed Nov 18 13:41:15 UTC 2009 

 po/zh_CN.po | 3716 +++++++++++++++++-------------------------------------------
 1 file changed, 1079 insertions(+), 2637 deletions(-)

New commits:
commit e55dc6ec17fda90739a9ebe8f751480b2399c83f
Author: tiansworld <tiansworld at fedoraproject.org>
Date:   Wed Nov 18 13:41:05 2009 +0000

    Sending translation for Chinese (Simplified)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index ec291d4..a6f73a1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: docs-release-notes.f12-tx\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2009-11-12 14:43+0000\n"
-"PO-Revision-Date: 2009-11-18 11:43+0800\n"
-"Last-Translator: TianShixiong <tiansworld at gmail.com>\n"
+"PO-Revision-Date: 2009-11-18 21:25+0800\n"
+"Last-Translator: Tian Shixiong <tiansworld at gmail.com>\n"
 "Language-Team: Simplified Chinese <zh at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,16 +27,8 @@ msgstr "Fedora &PRODVER;的所有更改"
 #. Tag: para
 #: AllChanges.xml:8
 #, no-c-format
-msgid ""
-"This section details all the changed packages since the release of "
-"Fedora &PREVVER;. The tables are organized according to the groups "
-"identified in the repository data. This grouping may be viewed differently "
-"by different people, so you may find it easier to look up the particular "
-"package of interest in the index."
-msgstr ""
-"本节详细介绍了自Fedora &PREVVER;发行以来所有变更的软件包。 表格是按照软"
-"件仓库中的软件组排列的。这样编组可以让不同的人看到不同的结果，所以您在目录里"
-"查找自己感兴趣的软件包时会更容易。"
+msgid "This section details all the changed packages since the release of Fedora &PREVVER;. The tables are organized according to the groups identified in the repository data. This grouping may be viewed differently by different people, so you may find it easier to look up the particular package of interest in the index."
+msgstr "本节详细介绍了自Fedora &PREVVER;发行以来所有变更的软件包。 表格是按照软件仓库中的软件组排列的。这样编组可以让不同的人看到不同的结果，所以您在目录里查找自己感兴趣的软件包时会更容易。"
 
 #. Tag: title
 #: AllChanges.xml:17
@@ -51,7 +43,9 @@ msgid "Applications"
 msgstr "应用程序"
 
 #. Tag: title
-#: AllChanges.xml:40 Development.xml:6 table-development.xml:7
+#: AllChanges.xml:40
+#: Development.xml:6
+#: table-development.xml:7
 #, no-c-format
 msgid "Development"
 msgstr "开发"
@@ -77,45 +71,20 @@ 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:8
 #, no-c-format
-msgid ""
-"Fedora &PRODVER; 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. Interesting "
-"applications may also be found under Circuit Design, Embedded Development, "
-"and Science and Mathematics. For a complete list of amateur radio "
-"applications available within Fedora see <citetitle>Applications for amateur "
-"radio</citetitle> at <ulink type=\"http\" url=\"https://fedoraproject.org/"
-"wiki/Applications_for_Amateur_Radio\"></ulink> on the wiki."
-msgstr ""
-"Fedora &PRODVER;包括了很多业余无线电和电子爱好者感兴趣的应用程序和库。这些应"
-"用程序大多包含在 Fedora 的电子实验室定制版中。同时在电路设计，嵌入式开发及科"
-"学和数学中也可找到这些有趣的程序。有关Fedora提供的业余无线电程序完整列表请查"
-"看位于<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Applications_for_Amateur_Radio\"></ulink>的<citetitle>业余无线电程序</"
-"citetitle>wiki页面。"
+msgid "Fedora &PRODVER; 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. Interesting applications may also be found under Circuit Design, Embedded Development, and Science and Mathematics. For a complete list of amateur radio applications available within Fedora see <citetitle>Applications for amateur radio</citetitle> at <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Applications_for_Amateur_Radio\"></ulink> on the wiki."
+msgstr "Fedora &PRODVER;包括了很多业余无线电和电子爱好者感兴趣的应用程序和库。这些应用程序大多包含在 Fedora 的电子实验室定制版中。同时在电路设计，嵌入式开发及科学和数学中也可找到这些有趣的程序。有关Fedora提供的业余无线电程序完整列表请查看位于<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Applications_for_Amateur_Radio\"></ulink>的<citetitle>业余无线电程序</citetitle>wiki页面。"
 
 #. Tag: para
 #: AmateurRadio.xml:20
 #, no-c-format
-msgid ""
-"This section outline significant changes in these applications since the "
-"last release of Fedora. For complete information on all changes, major or "
-"minor, refer to the tables at the end of this document."
-msgstr ""
-"本节主要介绍自上个Fedora发行版以来这些应用程序的关键更新。要了解所有更新信"
-"息，请参考本文档末尾的表格。"
+msgid "This section outline significant changes in these applications since the last release of Fedora. For complete information on all changes, major or minor, refer to the tables at the end of this document."
+msgstr "本节主要介绍自上个Fedora发行版以来这些应用程序的关键更新。要了解所有更新信息，请参考本文档末尾的表格。"
 
 #. Tag: term
 #: AmateurRadio.xml:30
@@ -174,17 +143,8 @@ msgstr "<primary>xlog</primary>"
 #. Tag: para
 #: AmateurRadio.xml:54
 #, no-c-format
-msgid ""
-"In addition to a number of bug fixes, <package>xlog</package> now includes a "
-"feature to ease handling of unknown countries. When \"<guimenu>Tools -> Find "
-"unknown countries</guimenu>\" is selected, <package>xlog</package> will show "
-"a list of contacts for which DXCC lookup fails. You can then correct this by "
-"using a \"<command>DXCC-</command>\" string in the awards column."
-msgstr ""
-"除了修正bug外，<package>xlog</package>还新增了可以方便未知国家操作的特性。当"
-"选中\"<guimenu>工具 ->查找未知国家</guimenu>\"选项后，<package>xlog</package>"
-"会显示DXCC查找失败的联系人列表。然后您可以使用awards列中的\"<command>DXCC-</"
-"command>\"进行修正。"
+msgid "In addition to a number of bug fixes, <package>xlog</package> now includes a feature to ease handling of unknown countries. When \"<guimenu>Tools -> Find unknown countries</guimenu>\" is selected, <package>xlog</package> will show a list of contacts for which DXCC lookup fails. You can then correct this by using a \"<command>DXCC-</command>\" string in the awards column."
+msgstr "除了修正bug外，<package>xlog</package>还新增了可以方便未知国家操作的特性。当选中\"<guimenu>工具 ->查找未知国家</guimenu>\"选项后，<package>xlog</package>会显示DXCC查找失败的联系人列表。然后您可以使用awards列中的\"<command>DXCC-</command>\"进行修正。"
 
 #. Tag: title
 #: ArchSpecific.xml:6
@@ -195,21 +155,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:8
 #, 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
@@ -227,11 +179,8 @@ msgstr "Fedora 11 以 i586 作为 32-bit x86 的基本结构。"
 #. Tag: para
 #: ArchSpecific.xml:17
 #, no-c-format
-msgid ""
-"For Fedora 12, we are switching to i686 as the base architecture (including "
-"CMOV), and optimize for Atom processors."
-msgstr ""
-"Fedora 12 以 i686 作为基本结构（包括CMOV），并针对Atom处理器进行了优化。"
+msgid "For Fedora 12, we are switching to i686 as the base architecture (including CMOV), and optimize for Atom processors."
+msgstr "Fedora 12 以 i686 作为基本结构（包括CMOV），并针对Atom处理器进行了优化。"
 
 #. Tag: para
 #: ArchSpecific.xml:22
@@ -266,13 +215,8 @@ msgstr "AMD Geode GX"
 #. Tag: para
 #: ArchSpecific.xml:32
 #, no-c-format
-msgid ""
-"AMD Geode LX (as used in the OLPC XO laptop) and later Geode NX processors "
-"should still work. Those interested are, of course, welcome to set up a "
-"secondary arch for older processors"
-msgstr ""
-"AMD Geode LX（用於 OLPC XO 系列的膝上计算机）及往后的 Geode NX 处理器应该还可"
-"以使用。有兴趣者当然欢迎为这些较旧型的处理器设立次级保构支持。"
+msgid "AMD Geode LX (as used in the OLPC XO laptop) and later Geode NX processors should still work. Those interested are, of course, welcome to set up a secondary arch for older processors"
+msgstr "AMD Geode LX（用於 OLPC XO 系列的膝上计算机）及往后的 Geode NX 处理器应该还可以使用。有兴趣者当然欢迎为这些较旧型的处理器设立次级保构支持。"
 
 #. Tag: para
 #: ArchSpecific.xml:38
@@ -283,19 +227,13 @@ msgstr "优点："
 #. Tag: para
 #: ArchSpecific.xml:41
 #, no-c-format
-msgid ""
-"Faster binaries on mainstream architectures (Pentium M, Via C7, all 64-bit "
-"arches, Atom)"
-msgstr ""
-"在主流结构（Pentium M, Via C7, all 64-bit arches, Atom）上，二进制文件的执行"
-"速度较快"
+msgid "Faster binaries on mainstream architectures (Pentium M, Via C7, all 64-bit arches, Atom)"
+msgstr "在主流结构（Pentium M, Via C7, all 64-bit arches, Atom）上，二进制文件的执行速度较快"
 
 #. Tag: para
 #: ArchSpecific.xml:45
 #, no-c-format
-msgid ""
-"Realistically, we don't support i586 as a practical matter. Enforce that "
-"more logically."
+msgid "Realistically, we don't support i586 as a practical matter. Enforce that more logically."
 msgstr "实际上我们并不支持i586架构。所以只是在逻辑上强调而已。"
 
 #. Tag: para
@@ -313,21 +251,13 @@ msgstr "针对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:8
 #, 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
@@ -339,21 +269,13 @@ msgstr "针对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:8
 #, 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
@@ -365,21 +287,13 @@ msgstr "针对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:8
 #, 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 "缺省情况下，当硬件支持时，会在32位硬件下使用PAE核心。"
 
 #. Tag: title
@@ -421,38 +335,19 @@ 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:8
 #, 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"
-"<command>su -c 'yum groupinstall \"Legacy Software Development\" '</"
-"command>\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用户口令。"
 
 #. Tag: title
@@ -464,13 +359,8 @@ msgstr "Fedora 12 引导时间"
 #. 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: title
 #: Boot.xml:10
@@ -481,20 +371,8 @@ msgstr "支持ext4的GRUB"
 #. Tag: para
 #: Boot.xml:12
 #, no-c-format
-msgid ""
-"Fedora 9 originally included experimental support for ext4 and "
-"Fedora 11 included ext4 by default. However, <application>GRUB</"
-"application> in that version did not support ext4 and hence required a "
-"separate boot partition formatted as ext3 or ext2. Fedora 12 now "
-"includes a updated version of <application>GRUB</application> with ext4 "
-"support. <application>Anaconda</application> (the Fedora installer) will "
-"permit this as well."
-msgstr ""
-"Fedora 9开始实验性的支持了ext4，之后Fedora 11缺省支持了ext4。然而那"
-"个版本的<application>GRUB</application>并不支持ext4，因此需要独立的ext3或ext2"
-"çš„boot割区。Fedora 12集成了支持ext4的新版<application>GRUB</"
-"application>。同时<application>Anaconda</application> （Fedora安装器）也将支"
-"持。"
+msgid "Fedora 9 originally included experimental support for ext4 and Fedora 11 included ext4 by default. However, <application>GRUB</application> in that version did not support ext4 and hence required a separate boot partition formatted as ext3 or ext2. Fedora 12 now includes a updated version of <application>GRUB</application> with ext4 support. <application>Anaconda</application> (the Fedora installer) will permit this as well."
+msgstr "Fedora 9开始实验性的支持了ext4，之后Fedora 11缺省支持了ext4。然而那个版本的<application>GRUB</application>并不支持ext4，因此需要独立的ext3或ext2çš„boot割区。Fedora 12集成了支持ext4的新版<application>GRUB</application>。同时<application>Anaconda</application> （Fedora安装器）也将支持。"
 
 #. Tag: title
 #: Boot.xml:18
@@ -505,22 +383,8 @@ msgstr "Dracut — 新引导系统"
 #. Tag: para
 #: Boot.xml:20
 #, no-c-format
-msgid ""
-"Up until Fedora 10, the boot system (<firstterm>initial ram disk</"
-"firstterm> or <firstterm>initrd</firstterm>) used to boot Fedora was "
-"monolithic, very distribution-specific and did not provide much flexibility. "
-"This will be replaced with <application>Dracut</application>, an initial ram "
-"disk with an event-based framework designed to be distribution-independent. "
-"It has been also adopted by the Fedora-derived OLPC project's XO operating "
-"system. OLPC modules for <application>Dracut</application> are available in "
-"the Fedora repository. Early feedback and testing is welcome."
-msgstr ""
-"Fedora 10之前，用于Fedora启动的引导体系 (<firstterm>initial ram disk</"
-"firstterm>或者<firstterm>initrd</firstterm>) 是单片式的，只针对某个发行版并且"
-"没有足够的适应性。这会被<application>Dracut</application>，一个基于事件化框架"
-"设计的，独立于发行版的的初始ram盘取代。在Fedora衍生的OLPC项目的XO操作系统中已"
-"经开始使用。 Fedora仓库中含有<application>Dracut</application>的OLPC模块。欢"
-"迎对此进行测试和反馈。"
+msgid "Up until Fedora 10, the boot system (<firstterm>initial ram disk</firstterm> or <firstterm>initrd</firstterm>) used to boot Fedora was monolithic, very distribution-specific and did not provide much flexibility. This will be replaced with <application>Dracut</application>, an initial ram disk with an event-based framework designed to be distribution-independent. It has been also adopted by the Fedora-derived OLPC project's XO operating system. OLPC modules for <application>Dracut</application> are available in the Fedora repository. Early feedback and testing is welcome."
+msgstr "Fedora 10之前，用于Fedora启动的引导体系 (<firstterm>initial ram disk</firstterm>或者<firstterm>initrd</firstterm>) 是单片式的，只针对某个发行版并且没有足够的适应性。这会被<application>Dracut</application>，一个基于事件化框架设计的，独立于发行版的的初始ram盘取代。在Fedora衍生的OLPC项目的XO操作系统中已经开始使用。 Fedora仓库中含有<application>Dracut</application>çš„OLPC模块。欢迎对此进行测试和反馈。"
 
 #. Tag: title
 #: Boot.xml:26
@@ -531,30 +395,14 @@ msgstr "更快更稳的图形化引导"
 #. Tag: para
 #: Boot.xml:28
 #, no-c-format
-msgid ""
-"<firstterm>Kernel Mode Setting</firstterm> (KMS) is now enabled by default "
-"on NVIDIA systems as well, through the <application>Nouveau</application> "
-"driver. Fedora 10 originally included support for KMS, but only for "
-"some ATI display cards. In Fedora 11, this was extended to Intel cards "
-"as well. This release has extended it further to support NVIDIA cards as "
-"well."
-msgstr ""
-"<firstterm>Kernel Mode Setting</firstterm> (KMS) 通过<application>Nouveau</"
-"application> 驱动程序，现时在NVIDIA系统上的缺省值亦已设置为启用。"
-"Fedora 10 原来亦包括对KMS的支持，但只限於部份ATI 显卡。在"
-"Fedora 11，这支持亦已扩展至Intel的显卡。到了这一版，连NVIDIA的显卡亦支"
-"持。"
+msgid "<firstterm>Kernel Mode Setting</firstterm> (KMS) is now enabled by default on NVIDIA systems as well, through the <application>Nouveau</application> driver. Fedora 10 originally included support for KMS, but only for some ATI display cards. In Fedora 11, this was extended to Intel cards as well. This release has extended it further to support NVIDIA cards as well."
+msgstr "<firstterm>Kernel Mode Setting</firstterm> (KMS) 通过<application>Nouveau</application> 驱动程序，现时在NVIDIA系统上的缺省值亦已设置为启用。Fedora 10 原来亦包括对KMS的支持，但只限於部份ATI 显卡。在Fedora 11，这支持亦已扩展至Intel的显卡。到了这一版，连NVIDIA的显卡亦支持。"
 
 #. Tag: para
 #: Boot.xml:32
 #, no-c-format
-msgid ""
-"As as result of this improvement, you will get a faster and smoother "
-"graphical boot on nearly all systems, via the <application>plymouth</"
-"application> graphical boot system developed within Fedora."
-msgstr ""
-"这次改进的结果就是，您可以通过Fedora开发的<application>plymouth</application>"
-"图形化引导程序在几乎所有机器上更快更稳的进行图形化引导。"
+msgid "As as result of this improvement, you will get a faster and smoother graphical boot on nearly all systems, via the <application>plymouth</application> graphical boot system developed within Fedora."
+msgstr "这次改进的结果就是，您可以通过Fedora开发的<application>plymouth</application>图形化引导程序在几乎所有机器上更快更稳的进行图形化引导。"
 
 #. Tag: title
 #: CircuitDesign.xml:6
@@ -569,7 +417,9 @@ msgid "<primary>Circuit Design</primary>"
 msgstr "<primary>电路设计</primary>"
 
 #. Tag: secondary
-#: CircuitDesign.xml:10 Devel-Embedded.xml:10 Multimedia.xml:11
+#: CircuitDesign.xml:10
+#: Devel-Embedded.xml:10
+#: Multimedia.xml:11
 #, no-c-format
 msgid "Section"
 msgstr "节"
@@ -577,14 +427,8 @@ msgstr "节"
 #. Tag: para
 #: CircuitDesign.xml:12
 #, no-c-format
-msgid ""
-"Fedora &PRODVER; includes a complete set of applications for schematic "
-"capture, circuit simulation, and PCB layout. The following are major changes "
-"to these applications. A complete list of changes may be found at the end of "
-"this document."
-msgstr ""
-"Fedora &PRODVER;为电路图捕获，电路模拟及PCB布局等提供了一套完整的程序。以下就"
-"是这些程序的主要更新。本文档末尾可找到这些更新的完整列表。"
+msgid "Fedora &PRODVER; includes a complete set of applications for schematic capture, circuit simulation, and PCB layout. The following are major changes to these applications. A complete list of changes may be found at the end of this document."
+msgstr "Fedora &PRODVER;为电路图捕获，电路模拟及PCB布局等提供了一套完整的程序。以下就是这些程序的主要更新。本文档末尾可找到这些更新的完整列表。"
 
 #. Tag: term
 #: CircuitDesign.xml:21
@@ -601,13 +445,8 @@ msgstr "<primary>geda</primary>"
 #. Tag: para
 #: CircuitDesign.xml:26
 #, no-c-format
-msgid ""
-"In Fedora 12, the <package>geda</package> suite, previously packaged as a "
-"number of individual applications, is now provided in a single, complete "
-"package."
-msgstr ""
-"在 Fedora 12，<package>geda</package>组件在之前被包装成为多套不同的应用软件程"
-"序，现时以一个整全的组件形式提供。"
+msgid "In Fedora 12, the <package>geda</package> suite, previously packaged as a number of individual applications, is now provided in a single, complete package."
+msgstr "在 Fedora 12，<package>geda</package>组件在之前被包装成为多套不同的应用软件程序，现时以一个整全的组件形式提供。"
 
 #. Tag: term
 #: CircuitDesign.xml:35
@@ -624,16 +463,8 @@ msgstr "<primary>gspiceui</primary>"
 #. Tag: para
 #: CircuitDesign.xml:40
 #, no-c-format
-msgid ""
-"Fedora’s <package>gspiceui</package> is now compiled under <package>wxgtk</"
-"package> 2.8 instead of the old <package>wxgtk</package> 2.6. This improves "
-"GSpiceUIi’s GUI interface. GSpiceUI includes missing opamp-3.sym to /usr/"
-"share/gEDA/sym/misc/ (geda symbols directory)."
-msgstr ""
-"Fedora的<package>gspiceui</package>已经由以前的<package>wxgtk</package> 2.6编"
-"译改为<package>wxgtk</package> 2.8编译。这提高了GSpiceUIi的GUI界面。GSpiceUI"
-"将漏掉的opamp-3.sym包含在了/usr/share/gEDA/sym/misc/目录下（geda symbols 目"
-"录）。"
+msgid "Fedora’s <package>gspiceui</package> is now compiled under <package>wxgtk</package> 2.8 instead of the old <package>wxgtk</package> 2.6. This improves GSpiceUIi’s GUI interface. GSpiceUI includes missing opamp-3.sym to /usr/share/gEDA/sym/misc/ (geda symbols directory)."
+msgstr "Fedora的<package>gspiceui</package>已经由以前的<package>wxgtk</package> 2.6编译改为<package>wxgtk</package> 2.8编译。这提高了GSpiceUIi的GUI界面。GSpiceUI将漏掉的opamp-3.sym包含在了/usr/share/gEDA/sym/misc/目录下（geda symbols 目录）。"
 
 #. Tag: title
 #: CircuitDesign.xml:47
@@ -644,11 +475,8 @@ msgstr "PPC64"
 #. Tag: para
 #: CircuitDesign.xml:48
 #, no-c-format
-msgid ""
-"GSpiceUI is not available on Fedora supported PPC64 architecture as a result "
-"of missing gwave for that architecture."
-msgstr ""
-"由于gwave缺少对PPC64架构的支持，GSpiceUI将不会出现在Fedora PPC64架构中。"
+msgid "GSpiceUI is not available on Fedora supported PPC64 architecture as a result of missing gwave for that architecture."
+msgstr "由于gwave缺少对PPC64架构的支持，GSpiceUI将不会出现在Fedora PPC64架构中。"
 
 #. Tag: term
 #: CircuitDesign.xml:59
@@ -665,16 +493,8 @@ msgstr "<primary>kicad</primary>"
 #. Tag: para
 #: CircuitDesign.xml:64
 #, no-c-format
-msgid ""
-"Fedora 12 includes the latest version of <package>kicad</package>package> "
-"which incorporates a huge number of minor bug fixes and usability "
-"improvements. For a complete description of the many changes please refer to "
-"the upstream changelog at <ulink type=\"http\" url=\"http://www.lis.inpg.fr/"
-"realise_au_lis/kicad/\"></ulink>."
-msgstr ""
-"Fedora12包含了最新的<package>kicad</package>package>，该软件包修正了大量bug并"
-"提高了使用性。要了解这些更新的详细信息请参考上游的变更日志<ulink type=\"http"
-"\" url=\"http://www.lis.inpg.fr/realise_au_lis/kicad/\"></ulink>。"
+msgid "Fedora 12 includes the latest version of <package>kicad</package>package> which incorporates a huge number of minor bug fixes and usability improvements. For a complete description of the many changes please refer to the upstream changelog at <ulink type=\"http\" url=\"http://www.lis.inpg.fr/realise_au_lis/kicad/\"></ulink>."
+msgstr "Fedora12包含了最新的<package>kicad</package>package>，该软件包修正了大量bug并提高了使用性。要了解这些更新的详细信息请参考上游的变更日志<ulink type=\"http\" url=\"http://www.lis.inpg.fr/realise_au_lis/kicad/\"></ulink>。"
 
 #. Tag: term
 #: CircuitDesign.xml:75
@@ -697,8 +517,7 @@ msgstr "<package>ngspice</package> 已更新至rework 19。"
 #. Tag: para
 #: CircuitDesign.xml:84
 #, no-c-format
-msgid ""
-"Memory management: fixed memory leaks (Bug 514484 - A Long Warning Message)"
+msgid "Memory management: fixed memory leaks (Bug 514484 - A Long Warning Message)"
 msgstr "内存管理：修复内存溢出（Bug 514484 - 长串警告信息）"
 
 #. Tag: para
@@ -716,18 +535,14 @@ msgstr "plots和cli界面的bug修复."
 #. Tag: para
 #: CircuitDesign.xml:100
 #, no-c-format
-msgid ""
-"Rework of BSim models, integration of EPFL-EKV model V2.63, ADMS models "
-"mextram, hicum0, hicum2."
-msgstr ""
-"重写的BSim模型，EPFL-EKV模型V2.63，ADMS模型mextram，hicum0，hicum2的集成。"
+msgid "Rework of BSim models, integration of EPFL-EKV model V2.63, ADMS models mextram, hicum0, hicum2."
+msgstr "重写的BSim模型，EPFL-EKV模型V2.63，ADMS模型mextram，hicum0，hicum2的集成。"
 
 #. Tag: para
-#: CircuitDesign.xml:106 CircuitDesign.xml:208
+#: CircuitDesign.xml:106
+#: CircuitDesign.xml:208
 #, no-c-format
-msgid ""
-"Fedora’s ngspice has been patched to accept calls from Xcircuit TCL "
-"interface."
+msgid "Fedora’s ngspice has been patched to accept calls from Xcircuit TCL interface."
 msgstr "Fedora的ngspice已打补丁，可以接受来自Xcircuit TCL界面的呼叫。"
 
 #. Tag: term
@@ -751,27 +566,14 @@ msgstr "Fedora &PRODVER;中新加入了<package>tclspice</package>包。"
 #. Tag: para
 #: CircuitDesign.xml:125
 #, no-c-format
-msgid ""
-"Before ngspice-rework-19, Fedora has considered <package>tclspice</"
-"package>’s stability too fragile. Examples of <package>tclspice</package> "
-"can be found via <command>rpm -qd tclspice</command>."
-msgstr ""
-"在npspice-rework-19之前，<package>tclspice</package>的稳定性很差。"
-"<package>tclspice</package>的样本可通过命令 <command>rpm -qd tclspice</"
-"command>找到。"
+msgid "Before ngspice-rework-19, Fedora has considered <package>tclspice</package>’s stability too fragile. Examples of <package>tclspice</package> can be found via <command>rpm -qd tclspice</command>."
+msgstr "在npspice-rework-19之前，<package>tclspice</package>的稳定性很差。<package>tclspice</package>的样本可通过命令 <command>rpm -qd tclspice</command>找到。"
 
 #. Tag: para
 #: CircuitDesign.xml:131
 #, no-c-format
-msgid ""
-"Tclspice provides Fedora users with extended capabilities for mixed-signal "
-"design via its TCL backend. Since Fedora is also providing tools for boolean "
-"manipulation (explained in the following section), Fedora users have "
-"adequate materials to spin his or her own mixed-signal EDA plugin."
-msgstr ""
-"Tclspice通过TCL后端向Fedora用户提供了带有扩展功能的混合信号设计。由于Fedora同"
-"时提供了布尔操作（下一节中解释）的工具，因此Fedora用户有足够的资源来定制他"
-"（她）自己的混合信号EDA插件。"
+msgid "Tclspice provides Fedora users with extended capabilities for mixed-signal design via its TCL backend. Since Fedora is also providing tools for boolean manipulation (explained in the following section), Fedora users have adequate materials to spin his or her own mixed-signal EDA plugin."
+msgstr "Tclspice通过TCL后端向Fedora用户提供了带有扩展功能的混合信号设计。由于Fedora同时提供了布尔操作（下一节中解释）的工具，因此Fedora用户有足够的资源来定制他（她）自己的混合信号EDA插件。"
 
 #. Tag: term
 #: CircuitDesign.xml:142
@@ -788,9 +590,7 @@ msgstr "<primary>xcircuit</primary>"
 #. Tag: para
 #: CircuitDesign.xml:147
 #, no-c-format
-msgid ""
-"<package>xcircuit</package> has been updated to version 3.6.161. Highlights "
-"include:"
+msgid "<package>xcircuit</package> has been updated to version 3.6.161. Highlights include:"
 msgstr "<package>xcircuit</package> 更新至3.6.161。主要包括："
 
 #. Tag: para
@@ -802,54 +602,30 @@ msgstr "支持多示意图布局窗口"
 #. Tag: para
 #: CircuitDesign.xml:158
 #, no-c-format
-msgid ""
-"A complete overhaul of the key-function binding routines and the function "
-"dispatch mechanism was effected."
+msgid "A complete overhaul of the key-function binding routines and the function dispatch mechanism was effected."
 msgstr "对键与功能的绑定程序和功能分派机制的完全精查产生效果。"
 
 #. Tag: para
 #: CircuitDesign.xml:166
 #, no-c-format
-msgid ""
-"Several additions and corrections need to be made to make the multiplewindow "
-"implementation work properly."
+msgid "Several additions and corrections need to be made to make the multiplewindow implementation work properly."
 msgstr "为了使多窗口正常工作，还需做一些增补和修正工作。"
 
 #. Tag: para
 #: CircuitDesign.xml:173
 #, no-c-format
-msgid ""
-"The way libraries are handled by making the distinction between library "
-"pages and files using the concept of \"technology namespaces\" has improved. "
-"Each object has a name composed of a \"technology prefix\", a double colon "
-"(\"::\"), and the object’s name. Each library file declares a technology "
-"name, which is used as the prefix for all objects in that file. The prefixes "
-"are used by XCircuit to track which objects came from which file, regardless "
-"of the library page onto which they were loaded. Added support for wires "
-"connected to symbol pins remain connected while the symbol is moved. It also "
-"expands upon the \"Attach-to\" function, allowing wires to be (semi-) "
-"automatically attached to pin labels or symbol pins. The key macro for "
-"\"attach-to\" (key \"A\") can also be used like the \"wire\" function (key "
-"\"w\") to start a wire with its start-point attached to a symbol pin or pin "
-"label."
-msgstr ""
-"改进了通过区别在库页面和在文件中使用\"技术命名空间\"概念的操作方式。每个目标"
-"的名字都由一个\"技术前缀\"，一个双冒号（\"::\"）以及目标名组成。每个库文件均"
-"声明一个技术名称，作为那个文件中的所有目标的前缀。前缀通常被XCircut用来追踪目"
-"标来自哪一个文件，而不考虑被加载到哪一个库页面。增加支持保持当符号移除后连接"
-"到符号接口的线路仍然连接。同时它可在 \"附到\" 功能上扩展，允许电线(半)自动地"
-"附到接口标签或符号接口上。 \"附到\" (\"A\"键) 的关键宏也可以像\"画电线\" 功"
-"能 (\"w\"键) 那样，从附到符号接口或符号标签上的始端开始画一条电线。"
+msgid "The way libraries are handled by making the distinction between library pages and files using the concept of \"technology namespaces\" has improved. Each object has a name composed of a \"technology prefix\", a double colon (\"::\"), and the object’s name. Each library file declares a technology name, which is used as the prefix for all objects in that file. The prefixes are used by XCircuit to track which objects came from which file, regardless of the library page onto which they were loaded. Added support for wires connected to symbol pins remain connected while the symbol is moved. It also expands upon the \"Attach-to\" function, allowing wires to be (semi-) automatically attached to pin labels or symbol pins. The key macro for \"attach-to\" (key \"A\") can also be used like the \"wire\" function (key \"w\") to start a wire with its start-point attached to a symbol pin or pin label."
+msgstr "改进了通过区别在库页面和在文件中使用\"技术命名空间\"概念的操作方式。每个目标的名字都由一个\"技术前缀\"，一个双冒号（\"::\"）以及目标名组成。每个库文件均声明一个技术名称，作为那个文件中的所有目标的前缀。前缀通常被XCircut用来追踪目标来自哪一个文件，而不考虑被加载到哪一个库页面。增加支持保持当符号移除后连接到符号接口的线路仍然连接。同时它可在 \"附到\" 功能上扩展，允许电线(半)自动地附到接口标签或符号接口上。 \"附到\" (\"A\"键) 的关键宏也可以像\"画电线\" 功能 (\"w\"键) 那样，从附到符号接口或符号标签上的始端开始画一条电线。"
 
 #. Tag: para
 #: CircuitDesign.xml:195
 #, no-c-format
-msgid ""
-"The way info labels for PCB are handled was changed as from version 3.6.66."
+msgid "The way info labels for PCB are handled was changed as from version 3.6.66."
 msgstr "3.6.66版本后改变了PCB信息标签操作方法。"
 
 #. Tag: para
-#: CircuitDesign.xml:202 ElectronicDesignAssistants.xml:331
+#: CircuitDesign.xml:202
+#: ElectronicDesignAssistants.xml:331
 #, no-c-format
 msgid "Runtime speed has been improved."
 msgstr "提高了执行速度。"
@@ -863,21 +639,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 12."
+msgid "This section highlights changes and additions to the clustering tools in Fedora 12."
 msgstr "这节主要介绍 Fedora 12 中群集工具的变更和新增特性。"
 
 #. Tag: title
@@ -889,24 +657,14 @@ msgstr "常见错误"
 #. Tag: para
 #: CommonBugs.xml:7
 #, no-c-format
-msgid ""
-"Most complex software contains bugs. One of the features of free and open "
-"source software is the ability to report bugs, helping to fix or improve the "
-"software you use."
-msgstr ""
-"大多数复杂的软件都可能存在bug。自由开放源码软件的特点之一，就是能够报告bug，"
-"让开发人员可以通过你所报告的错误来修复或者改进您使用的软件。"
+msgid "Most complex software contains bugs. One of the features of free and open source software is the ability to report bugs, helping to fix or improve the software you use."
+msgstr "大多数复杂的软件都可能存在bug。自由开放源码软件的特点之一，就是能够报告bug，让开发人员可以通过你所报告的错误来修复或者改进您使用的软件。"
 
 #. Tag: para
 #: CommonBugs.xml:10
 #, no-c-format
-msgid ""
-"A list of common bugs is maintained for each release by the Fedora Project "
-"as a good place to start when you are having a problem that might be a bug "
-"in the software:"
-msgstr ""
-"每个发行版的一般 bug 清单都是由 Fedora 项目维护的，当您遇到问题并怀疑是一个软"
-"件 bug 时，这里是一个很好的起点。"
+msgid "A list of common bugs is maintained for each release by the Fedora Project as a good place to start when you are having a problem that might be a bug in the software:"
+msgstr "每个发行版的一般 bug 清单都是由 Fedora 项目维护的，当您遇到问题并怀疑是一个软件 bug 时，这里是一个很好的起点。"
 
 #. Tag: title
 #: DatabaseServers.xml:6
@@ -917,14 +675,8 @@ msgstr "数据库服务器"
 #. Tag: remark
 #: DatabaseServers.xml:7
 #, 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:8
@@ -941,14 +693,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:10
@@ -959,14 +705,8 @@ msgstr "桌面横跨多个显示器"
 #. Tag: para
 #: Desktop.xml:11
 #, no-c-format
-msgid ""
-"In the latest version of '''Xorg''' included in this release, if you have a "
-"dual monitor setup, your desktop display will span across them instead of "
-"using a cloned display by default. This matches the behaviour of other "
-"operating systems."
-msgstr ""
-"本发行版中最新的'''Xorg'''，如果您连接了两个显示器，那么这两个显示器将显示整"
-"个上管理系统，而不是显示两个相同的上管理系统。这与其它作业系统的行为一致。"
+msgid "In the latest version of '''Xorg''' included in this release, if you have a dual monitor setup, your desktop display will span across them instead of using a cloned display by default. This matches the behaviour of other operating systems."
+msgstr "本发行版中最新的'''Xorg'''，如果您连接了两个显示器，那么这两个显示器将显示整个上管理系统，而不是显示两个相同的上管理系统。这与其它作业系统的行为一致。"
 
 #. Tag: title
 #: Desktop.xml:17
@@ -977,41 +717,26 @@ msgstr "更好的摄像头支持"
 #. Tag: para
 #: Desktop.xml:19
 #, no-c-format
-msgid ""
-"The better webcam support feature for Fedora 10 did much to improve "
-"webcam support in Linux. We now have a library (<application>libv4l</"
-"application>) for decompressing various proprietary video formats in user "
-"space, and almost all applications that use webcams have been patched to use "
-"this library."
-msgstr ""
-"Fedora 10中更好地摄像头功能增强了摄像头在Linux下的支持。目前我们拥有了能"
-"够解压用户磁盘内各种属性视频的库(<application>libv4l</application>) ，几乎所"
-"有使用摄像头的程序都已经使用了该库。"
+msgid "The better webcam support feature for Fedora 10 did much to improve webcam support in Linux. We now have a library (<application>libv4l</application>) for decompressing various proprietary video formats in user space, and almost all applications that use webcams have been patched to use this library."
+msgstr "Fedora 10中更好地摄像头功能增强了摄像头在Linux下的支持。目前我们拥有了能够解压用户磁盘内各种属性视频的库(<application>libv4l</application>) ，几乎所有使用摄像头的程序都已经使用了该库。"
 
 #. Tag: para
 #: Desktop.xml:23
 #, no-c-format
-msgid ""
-"Fedora 12 contains a second push for better webcam support, comprising "
-"three pieces:"
+msgid "Fedora 12 contains a second push for better webcam support, comprising three pieces:"
 msgstr "Fedora 12提供了更多的摄像头支持特性，包括以下三项："
 
 #. Tag: para
 #: Desktop.xml:25
 #, no-c-format
-msgid ""
-"Lots of testing, fixing bugs, and improving of existing in-kernel drivers."
+msgid "Lots of testing, fixing bugs, and improving of existing in-kernel drivers."
 msgstr "对已有的内核内置驱动进行了大量测试，修正和提高。"
 
 #. Tag: para
 #: Desktop.xml:26
 #, no-c-format
-msgid ""
-"Add video processing to <application>libv4l</application> for better video "
-"quality for cams which lack any of the following in hardware:"
-msgstr ""
-"<application>libv4l</application>增加了视频处理，为那些硬件上缺乏以下内容的摄"
-"像头提供更好的视频质量。"
+msgid "Add video processing to <application>libv4l</application> for better video quality for cams which lack any of the following in hardware:"
+msgstr "<application>libv4l</application>增加了视频处理，为那些硬件上缺乏以下内容的摄像头提供更好的视频质量。"
 
 #. Tag: para
 #: Desktop.xml:28
@@ -1034,60 +759,38 @@ msgstr "自动调节曝光（增益）"
 #. Tag: para
 #: Desktop.xml:31
 #, no-c-format
-msgid ""
-"Recognize laptop cams which are known to be installed upside down and rotate "
-"the image 180 degrees in software"
+msgid "Recognize laptop cams which are known to be installed upside down and rotate the image 180 degrees in software"
 msgstr "识别那些倒装的笔记本电脑摄像头并在软件中旋转180度"
 
 #. Tag: para
 #: Desktop.xml:33
 #, no-c-format
-msgid ""
-"Clean up existing out-of-tree drivers, moving the decompression to "
-"<application>libv4l</application> where needed and merge them into the "
-"mainline, specifically the following ones:"
-msgstr ""
-"去除了主版本以外的驱动，移动至<application>libv4l</application>并合并到主版"
-"本，具体如下："
+msgid "Clean up existing out-of-tree drivers, moving the decompression to <application>libv4l</application> where needed and merge them into the mainline, specifically the following ones:"
+msgstr "去除了主版本以外的驱动，移动至<application>libv4l</application>并合并到主版本，具体如下："
 
 #. Tag: para
 #: Desktop.xml:35
 #, no-c-format
-msgid ""
-"qc-usb: stv0600 (and similar)-based cams, mainly Logitech QuickCam Express "
-"(done as of kernel 2.6.29)"
-msgstr ""
-"qc-usb：基于stv0600（及类似）的摄像头，Logitech QuikCam Express主要系列"
-"（2.6.29内核已使用）"
+msgid "qc-usb: stv0600 (and similar)-based cams, mainly Logitech QuickCam Express (done as of kernel 2.6.29)"
+msgstr "qc-usb：基于stv0600（及类似）的摄像头，Logitech QuikCam Express主要系列（2.6.29内核已使用）"
 
 #. Tag: para
 #: Desktop.xml:36
 #, no-c-format
-msgid ""
-"ov51x-jpeg: ov511(+) and ov518(+) driver (done as of kernel 2.6.31rc1, "
-"libv4l-0.6.0)"
-msgstr ""
-"ov51x-jpeg: ov511(+) 及 ov518(+) 的驱动程序 (已在 kernel 2.6.31rc1, libv4l-"
-"0.6.0完成)"
+msgid "ov51x-jpeg: ov511(+) and ov518(+) driver (done as of kernel 2.6.31rc1, libv4l-0.6.0)"
+msgstr "ov51x-jpeg: ov511(+) 及 ov518(+) 的驱动程序 (已在 kernel 2.6.31rc1, libv4l-0.6.0完成)"
 
 #. Tag: para
 #: Desktop.xml:37
 #, no-c-format
-msgid ""
-"qc-usb-messenger: st6422-based cams mainly Logitech QuickCam Messenger "
-"models (done as of kernel 2.6.31rc1)"
-msgstr ""
-"qc-usb-messenger：基于stv6422的摄像头，主要为Logitech QuikCam Express系列"
-"（2.6.31rc1内核已使用）"
+msgid "qc-usb-messenger: st6422-based cams mainly Logitech QuickCam Messenger models (done as of kernel 2.6.31rc1)"
+msgstr "qc-usb-messenger：基于stv6422的摄像头，主要为Logitech QuikCam Express系列（2.6.31rc1内核已使用）"
 
 #. Tag: para
 #: Desktop.xml:38
 #, no-c-format
-msgid ""
-"sn9c20x: sn9c20x-based cams, many newer cheap cams (done as of kernel "
-"2.6.31rc2)"
-msgstr ""
-"sn9-20x：基于sn9c20x的摄像头，还有很多新出的廉价摄像头（2.6.31rc2内核已使用）"
+msgid "sn9c20x: sn9c20x-based cams, many newer cheap cams (done as of kernel 2.6.31rc2)"
+msgstr "sn9-20x：基于sn9c20x的摄像头，还有很多新出的廉价摄像头（2.6.31rc2内核已使用）"
 
 #. Tag: title
 #: Desktop.xml:44
@@ -1104,63 +807,36 @@ msgstr "<primary>ABRT</primary>"
 #. Tag: para
 #: Desktop.xml:47
 #, no-c-format
-msgid ""
-"The <application>ABRT</application> automatic bug reporting tool replaces "
-"<application>bug-buddy</application> and <application>kerneloops</"
-"application> in the Fedora 12 desktop. <application>ABRT</application> "
-"has an extensible architecture and can not only catch and report "
-"segmentation faults and kernel oops, but also python backtraces. In contrast "
-"to <application>bug-buddy</application>, it can catch segmentation faults in "
-"any binary, not just GTK+ applications."
-msgstr ""
-"Fedora 12桌面采用<application>ABRT</application>bug自动报告工具替代了"
-"<application>bug-buddy</application>和<application>kerneloops</application>。"
-"<application>ABRT</application>拥有可扩展架构，它不仅可以捕获并提交局部错误和"
-"内核故障，同时也能回溯python。与<application>bug-buddy</application>相比，它"
-"可以在任何二进制程序中捕获错误，而不仅仅是GTK+程序。"
+msgid "The <application>ABRT</application> automatic bug reporting tool replaces <application>bug-buddy</application> and <application>kerneloops</application> in the Fedora 12 desktop. <application>ABRT</application> has an extensible architecture and can not only catch and report segmentation faults and kernel oops, but also python backtraces. In contrast to <application>bug-buddy</application>, it can catch segmentation faults in any binary, not just GTK+ applications."
+msgstr "Fedora 12桌面采用<application>ABRT</application>bug自动报告工具替代了<application>bug-buddy</application>å’Œ<application>kerneloops</application>。<application>ABRT</application>拥有可扩展架构，它不仅可以捕获并提交局部错误和内核故障，同时也能回溯python。与<application>bug-buddy</application>相比，它可以在任何二进制程序中捕获错误，而不仅仅是GTK+程序。"
 
 #. Tag: para
 #: Desktop.xml:51
 #, no-c-format
-msgid ""
-"If you have manually modified the <application>GConf</application> settings "
-"for the <application>bug-buddy</application> GTK+ module before, you may see "
-"warning messages like the following from GTK+ applications:"
-msgstr ""
-"如果您之前手动修改过<application>GConf</application>设置中的<application>bug-"
-"buddy</application>GTK+模块，您可能会在GTK+程序中看到如下的警告信息："
+msgid "If you have manually modified the <application>GConf</application> settings for the <application>bug-buddy</application> GTK+ module before, you may see warning messages like the following from GTK+ applications:"
+msgstr "如果您之前手动修改过<application>GConf</application>设置中的<application>bug-buddy</application>GTK+模块，您可能会在GTK+程序中看到如下的警告信息："
 
 #. Tag: screen
 #: Desktop.xml:53
 #, no-c-format
 msgid ""
-"<computeroutput>Gtk-Message: Failed to load module \"gnomebreakpad\":</"
-"computeroutput>\n"
-"<computeroutput>libgnomebreakpad.so: cannot open shared object file: No such "
-"file or directory</computeroutput>"
+"<computeroutput>Gtk-Message: Failed to load module \"gnomebreakpad\":</computeroutput>\n"
+"<computeroutput>libgnomebreakpad.so: cannot open shared object file: No such file or directory</computeroutput>"
 msgstr ""
-"<computeroutput>Gtk-Message: \"gnomebreakpad\"模块载入失败:</"
-"computeroutput>\n"
-"<computeroutput>libgnomebreakpad.so: 无法打开共享文件：文件或目录不存在</"
-"computeroutput>"
+"<computeroutput>Gtk-Message: \"gnomebreakpad\"模块载入失败:</computeroutput>\n"
+"<computeroutput>libgnomebreakpad.so: 无法打开共享文件：文件或目录不存在</computeroutput>"
 
 #. Tag: para
 #: Desktop.xml:56
 #, no-c-format
-msgid ""
-"To stop these messages, run the following command in a terminal in your "
-"session:"
+msgid "To stop these messages, run the following command in a terminal in your session:"
 msgstr "要停止这些信息，可以在终端機上执行以下的命令："
 
 #. Tag: screen
 #: Desktop.xml:58
 #, no-c-format
-msgid ""
-"<command>gconftool-2 --type bool --set /apps/gnome_settings_daemon/gtk-"
-"modules/gnomebreakpad false</command>"
-msgstr ""
-"<command>gconftool-2 --type bool --set /apps/gnome_settings_daemon/gtk-"
-"modules/gnomebreakpad false</command>"
+msgid "<command>gconftool-2 --type bool --set /apps/gnome_settings_daemon/gtk-modules/gnomebreakpad false</command>"
+msgstr "<command>gconftool-2 --type bool --set /apps/gnome_settings_daemon/gtk-modules/gnomebreakpad false</command>"
 
 #. Tag: title
 #: Desktop.xml:64
@@ -1177,18 +853,8 @@ msgstr "GNOME"
 #. Tag: para
 #: Desktop.xml:67
 #, no-c-format
-msgid ""
-"The <application>GNOME 2.28.1</application> desktop is part of this release, "
-"and is the default environment used in the Fedora Desktop Live image. The "
-"Desktop Live image is a downloadable CD you can use to test the new GNOME "
-"environment with or without installing it. The image can be written to CD, "
-"or to a USB flash disk; for instructions, refer to <ulink url=\"https://"
-"fedoraproject.org/wiki/FedoraLiveCD/USBHowTo\"></ulink>."
-msgstr ""
-"<application>GNOME 2.28.1</application>是本发行版的一部分，它是Fedora桌面live"
-"镜像默认环境。桌面镜像是可以下载的CD格式，您无需安装就可以用它来测试新的GNOME"
-"环境。镜像可以刻录成CD，或写入到USB闪存盘；有关说明请参考<ulink url="
-"\"https://fedoraproject.org/wiki/FedoraLiveCD/USBHowTo\"></ulink>。"
+msgid "The <application>GNOME 2.28.1</application> desktop is part of this release, and is the default environment used in the Fedora Desktop Live image. The Desktop Live image is a downloadable CD you can use to test the new GNOME environment with or without installing it. The image can be written to CD, or to a USB flash disk; for instructions, refer to <ulink url=\"https://fedoraproject.org/wiki/FedoraLiveCD/USBHowTo\"></ulink>."
+msgstr "<application>GNOME 2.28.1</application>是本发行版的一部分，它是Fedora桌面live镜像默认环境。桌面镜像是可以下载的CD格式，您无需安装就可以用它来测试新的GNOME环境。镜像可以刻录成CD，或写入到USB闪存盘；有关说明请参考<ulink url=\"https://fedoraproject.org/wiki/FedoraLiveCD/USBHowTo\"></ulink>。"
 
 #. Tag: title
 #: Desktop.xml:73
@@ -1199,35 +865,18 @@ msgstr "菜单及按钮中的图像"
 #. Tag: para
 #: Desktop.xml:74
 #, no-c-format
-msgid ""
-"Icons in menus and buttons are not shown by default in <application>GNOME "
-"2.28</application>. To get the old, icon-rich appearance back, select "
-"<menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</"
-"guimenuitem><guimenuitem>Appearance</guimenuitem></menuchoice>, click the "
-"<guilabel>Interface</guilabel> tab and enable <guilabel>Show icons in menus</"
-"guilabel>. There is, however, no menu interface to enable the icons for the "
-"buttons. To set the corresponding GConf keys instead for enabling both the "
-"menus and buttons to have icons:"
-msgstr ""
-"<application>GNOME 2.28</application>中的菜单及按钮图标默认不显示。要想回到以"
-"前充满图标的外观，请选择<menuchoice><guimenu>系统</guimenu><guimenuitem>偏好"
-"设置</guimenuitem><guimenuitem>外观</guimenuitem></menuchoice>，点击"
-"<guilabel>界面</guilabel>选项，启用<guilabel>显示菜单中的图标</guilabel>。然"
-"而并没有菜单选项用来显示按钮图标。请使用对应的GConf键值来启用菜单和按钮图标："
+msgid "Icons in menus and buttons are not shown by default in <application>GNOME 2.28</application>. To get the old, icon-rich appearance back, select <menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Appearance</guimenuitem></menuchoice>, click the <guilabel>Interface</guilabel> tab and enable <guilabel>Show icons in menus</guilabel>. There is, however, no menu interface to enable the icons for the buttons. To set the corresponding GConf keys instead for enabling both the menus and buttons to have icons:"
+msgstr "<application>GNOME 2.28</application>中的菜单及按钮图标默认不显示。要想回到以前充满图标的外观，请选择<menuchoice><guimenu>系统</guimenu><guimenuitem>偏好设置</guimenuitem><guimenuitem>外观</guimenuitem></menuchoice>，点击<guilabel>界面</guilabel>选项，启用<guilabel>显示菜单中的图标</guilabel>。然而并没有菜单选项用来显示按钮图标。请使用对应的GConf键值来启用菜单和按钮图标："
 
 #. Tag: screen
 #: Desktop.xml:76
 #, no-c-format
 msgid ""
-"<command>gconftool-2 --type boolean --set /desktop/gnome/interface/"
-"buttons_have_icons true</command>\n"
-"<command>gconftool-2 --type boolean --set /desktop/gnome/interface/"
-"menus_have_icons true</command>"
+"<command>gconftool-2 --type boolean --set /desktop/gnome/interface/buttons_have_icons true</command>\n"
+"<command>gconftool-2 --type boolean --set /desktop/gnome/interface/menus_have_icons true</command>"
 msgstr ""
-"<command>gconftool-2 --type boolean --set /desktop/gnome/interface/"
-"buttons_have_icons true</command>\n"
-"<command>gconftool-2 --type boolean --set /desktop/gnome/interface/"
-"menus_have_icons true</command>"
+"<command>gconftool-2 --type boolean --set /desktop/gnome/interface/buttons_have_icons true</command>\n"
+"<command>gconftool-2 --type boolean --set /desktop/gnome/interface/menus_have_icons true</command>"
 
 #. Tag: title
 #: Desktop.xml:80
@@ -1238,25 +887,19 @@ msgstr "GNOME 2.28的其它改进"
 #. Tag: para
 #: Desktop.xml:81
 #, no-c-format
-msgid ""
-"Compared to previous Fedora releases, there are a number of other changes in "
-"the default configuration of the GNOME desktop:"
+msgid "Compared to previous Fedora releases, there are a number of other changes in the default configuration of the GNOME desktop:"
 msgstr "与前一个Fedora发行版相比，GNOME桌面默认设置上还有一些其它改变："
 
 #. Tag: para
 #: Desktop.xml:86
 #, no-c-format
-msgid ""
-"The 'Windows' preference dialog is no longer installed by default. It is "
-"still available in the control-center-extra package"
+msgid "The 'Windows' preference dialog is no longer installed by default. It is still available in the control-center-extra package"
 msgstr "“窗口”设置对话框不再默认安装。但仍会在control-center-extra包中提供"
 
 #. Tag: para
 #: Desktop.xml:90
 #, no-c-format
-msgid ""
-"The 'Main Menu' preference dialog is no longer installed by default. It is "
-"still available in the alacarte package"
+msgid "The 'Main Menu' preference dialog is no longer installed by default. It is still available in the alacarte package"
 msgstr "“主菜单”设置对话框默认不再安装。alacarte包中仍然提供"
 
 #. Tag: para
@@ -1268,27 +911,19 @@ msgstr "用户切换移动至桌面顶端面板的最右侧"
 #. Tag: para
 #: Desktop.xml:97
 #, no-c-format
-msgid ""
-"The 'Show Desktop' button has been removed by default. If you prefer, you "
-"can add this panel applet back with right click, \"Add to Panel...\" and "
-"selecting \"Show Desktop\"."
-msgstr ""
-"移除了“显示桌面”按钮。如果您需要，可通过点击右键，\"添加到面板...\"然后选择"
-"\"显示桌面\" 添加。"
+msgid "The 'Show Desktop' button has been removed by default. If you prefer, you can add this panel applet back with right click, \"Add to Panel...\" and selecting \"Show Desktop\"."
+msgstr "移除了“显示桌面”按钮。如果您需要，可通过点击右键，\"添加到面板...\"然后选择\"显示桌面\" 添加。"
 
 #. Tag: para
 #: Desktop.xml:102
 #, no-c-format
-msgid ""
-"The number of workspaces in the 'Workspace Switcher' has been reduced to 2"
+msgid "The number of workspaces in the 'Workspace Switcher' has been reduced to 2"
 msgstr "“工作区域切换”的工作区数量减少为2个"
 
 #. Tag: para
 #: Desktop.xml:105
 #, no-c-format
-msgid ""
-"The panel now adds padding between applets and between icons in the "
-"notification area. The padding can be removed with the following commands:"
+msgid "The panel now adds padding between applets and between icons in the notification area. The padding can be removed with the following commands:"
 msgstr "面板通知区域中的小程序及图标之间增加了间距。可通过以下命令去除间距："
 
 #. Tag: screen
@@ -1324,43 +959,8 @@ msgstr "tomboy"
 #. Tag: para
 #: Desktop.xml:122
 #, no-c-format
-msgid ""
-"<application>Gnote</application> is installed by default in GNOME for this "
-"release replacing <application>Tomboy</application>. <application>Gnote</"
-"application> is a port of <application>Tomboy</application> from Mono to C++ "
-"and consumes fewer resources. <application>Gnote</application> is both an "
-"applet that can sit in your GNOME panel as well as a individual application "
-"you can run within other desktop environments. Fedora Desktop Live CD since "
-"the Fedora 10 release has excluded Mono and hence Mono-based applications "
-"like <application>Tomboy</application> due to lack of space. "
-"<application>Gnote</application> will be installed by default in the Live CD "
-"as well in this release. <application>Tomboy</application> is still "
-"available as a optional alternative. If you are upgrading from the previous "
-"release you will not be migrated to <application>Gnote</application> and "
-"will continue to have <application>Tomboy</application>. "
-"<application>Tomboy</application> users can migrate easily to "
-"<application>Gnote</application> as it shares the file format and a plugin "
-"is available in <application>Gnote</application> that will automatically "
-"import <application>Tomboy</application> notes on first run. Many of the "
-"<application>Tomboy</application> plugins have been ported to "
-"<application>Gnote</application>. The following plugins are available as "
-"part of <application>Gnote</application>:"
-msgstr ""
-"本发行版中GNOME默认使用<application>Gnote</application>替代了"
-"<application>Tomboy</application>。<application>Gnote</application>是"
-"<application>Tomboy</application>从Mono到C++的一个版本，消耗资源更少。"
-"<application>Gnote</application>既可以放入GNOME面板也可以做为单独程序在其它桌"
-"面环境下运行。由于缺乏空间，自Fedora10起Fedora桌面Live CD剔除了Mono以及像"
-"<application>Tomboy</application>这样的基于Mono的程序。<application>Gnote</"
-"application>也默认集成在本发行版的Live CD中。<application>Tomboy</"
-"application>做为额外选择仍然提供。如果您从之前版本升级到本发行版，您可继续使"
-"用<application>Tomboy</application>而不会被迁移到<application>Gnote</"
-"application>。<application>Tomboy</application>的用户可以很轻松地迁移到"
-"<application>Gnote</application>，因为<application>Gnote</application>与之共"
-"用同种文件格式，并且<application>Gnote</application>中附带插件可在其首次运行"
-"时自动导入<application>Tomboy</application>中的笔记。很多"
-"<application>Tomboy</application>插件已转为<application>Gnote</application>插"
-"件。以下插件做为<application>Gnote</application>的一部分提供："
+msgid "<application>Gnote</application> is installed by default in GNOME for this release replacing <application>Tomboy</application>. <application>Gnote</application> is a port of <application>Tomboy</application> from Mono to C++ and consumes fewer resources. <application>Gnote</application> is both an applet that can sit in your GNOME panel as well as a individual application you can run within other desktop environments. Fedora Desktop Live CD since the Fedora 10 release has excluded Mono and hence Mono-based applications like <application>Tomboy</application> due to lack of space. <application>Gnote</application> will be installed by default in the Live CD as well in this release. <application>Tomboy</application> is still available as a optional alternative. If you are upgrading from the previous release you will not be migrated to <application>Gnote</application> and will continue to have <application>Tomboy</application>. <application>Tomboy</application> users can m
 igrate easily to <application>Gnote</application> as it shares the file format and a plugin is available in <application>Gnote</application> that will automatically import <application>Tomboy</application> notes on first run. Many of the <application>Tomboy</application> plugins have been ported to <application>Gnote</application>. The following plugins are available as part of <application>Gnote</application>:"
+msgstr "本发行版中GNOME默认使用<application>Gnote</application>替代了<application>Tomboy</application>。<application>Gnote</application>是<application>Tomboy</application>从Mono到C++的一个版本，消耗资源更少。<application>Gnote</application>既可以放入GNOME面板也可以做为单独程序在其它桌面环境下运行。由于缺乏空间，自Fedora10起Fedora桌面Live CD剔除了Mono以及像<application>Tomboy</application>这样的基于Mono的程序。<application>Gnote</application>也默认集成在本发行版的Live CD中。<application>Tomboy</application>做为额外选择仍然提供。如果您从之前版本升级到本发行版，您可继续使用<application>Tomboy</application>而不会被迁移到<application>Gnote</application>。<application>Tomboy</application>的用户可以很轻松地迁移到<application>Gnote</application>，因为<application>Gnote</application>与之共用同种文件格式，并且<application>G
 note</application>中附带插件可在其首次运行时自动导入<application>Tomboy</application>中的笔记。很多<application>Tomboy</application>插件已转为<application>Gnote</application>插件。以下插件做为<application>Gnote</application>的一部分提供："
 
 #. Tag: para
 #: Desktop.xml:127
@@ -1413,13 +1013,8 @@ msgstr "Backlinks"
 #. Tag: para
 #: Desktop.xml:137
 #, no-c-format
-msgid ""
-"You can copy the notes from <application>Tomboy</application> to "
-"<application>Gnote</application> using the following command in your home "
-"directory:"
-msgstr ""
-"在您的主目录中执行以下命令，可将<application>Tomboy</application>的笔记复制到"
-"<application>Gnote</application>中。"
+msgid "You can copy the notes from <application>Tomboy</application> to <application>Gnote</application> using the following command in your home directory:"
+msgstr "在您的主目录中执行以下命令，可将<application>Tomboy</application>的笔记复制到<application>Gnote</application>中。"
 
 #. Tag: screen
 #: Desktop.xml:139
@@ -1430,13 +1025,8 @@ msgstr "<command>cp -r .tomboy .gnote</command>"
 #. Tag: para
 #: Desktop.xml:141
 #, no-c-format
-msgid ""
-"The sticky notes applet is not provided anymore since <application>Gnote</"
-"application> provides a better note taking utility and is available by "
-"default in this release."
-msgstr ""
-"由于<application>Gnote</application>提供了更好的笔记摘录特性并已经集成在本发"
-"行版，因此不再提供sticky notes便签程序。"
+msgid "The sticky notes applet is not provided anymore since <application>Gnote</application> provides a better note taking utility and is available by default in this release."
+msgstr "由于<application>Gnote</application>提供了更好的笔记摘录特性并已经集成在本发行版，因此不再提供sticky notes便签程序。"
 
 #. Tag: title
 #: Desktop.xml:146
@@ -1471,33 +1061,13 @@ msgstr "pidgin"
 #. Tag: para
 #: Desktop.xml:158
 #, no-c-format
-msgid ""
-"<application>Empathy</application> replaces <application>Pidgin</"
-"application> as the default instant messenger in GNOME. "
-"<application>Empathy</application> is better integrated with GNOME and "
-"provides audio and video functionality for users of the Extensible Messaging "
-"and Presence Protocol (XMPP, formerly Jabber) with more improvements "
-"planned. <application>Empathy</application> supports importing accounts from "
-"<application>Pidgin</application> on first run so you can migrate more "
-"easily. If you are upgrading from a previous release, you will continue to "
-"have <application>Pidgin</application> by default. <application>Pidgin</"
-"application> continues to be available in the repository and is actively "
-"maintained."
-msgstr ""
-"<application>Empathy</application>取代<application>Pidgin</application>做为"
-"GNOME下默认的即时通讯工具。 <application>Empathy</application>能够与GNOME更好"
-"地集成并为使用Extensible Messaging and Presence协议（XMPP，前身为Jabber）的用"
-"户提供了音频和视频功能。<application>Empathy</application>支持在首次运行时从"
-"<application>Pidgin</application>导入用户，以便您可轻松迁移。如果您从之前版本"
-"升级，您默认继续使用<application>Pidgin</application>。仓库中将继续提供"
-"<application>Pidgin</application>，并将继续维护。"
+msgid "<application>Empathy</application> replaces <application>Pidgin</application> as the default instant messenger in GNOME. <application>Empathy</application> is better integrated with GNOME and provides audio and video functionality for users of the Extensible Messaging and Presence Protocol (XMPP, formerly Jabber) with more improvements planned. <application>Empathy</application> supports importing accounts from <application>Pidgin</application> on first run so you can migrate more easily. If you are upgrading from a previous release, you will continue to have <application>Pidgin</application> by default. <application>Pidgin</application> continues to be available in the repository and is actively maintained."
+msgstr "<application>Empathy</application>取代<application>Pidgin</application>做为GNOME下默认的即时通讯工具。 <application>Empathy</application>能够与GNOME更好地集成并为使用Extensible Messaging and Presence协议（XMPP，前身为Jabber）的用户提供了音频和视频功能。<application>Empathy</application>支持在首次运行时从<application>Pidgin</application>导入用户，以便您可轻松迁移。如果您从之前版本升级，您默认继续使用<application>Pidgin</application>。仓库中将继续提供<application>Pidgin</application>，并将继续维护。"
 
 #. Tag: para
 #: Desktop.xml:164
 #, no-c-format
-msgid ""
-"The major advantages and disadvantages of <application>Empathy</application> "
-"are:"
+msgid "The major advantages and disadvantages of <application>Empathy</application> are:"
 msgstr "<application>Empathy</application>的主要优缺点如下："
 
 #. Tag: title
@@ -1509,42 +1079,25 @@ msgstr "有点"
 #. Tag: para
 #: Desktop.xml:167
 #, no-c-format
-msgid ""
-"Better GNOME integration. Passwords are stored in the keyring instead of "
-"plain text like in <application>Pidgin</application>"
-msgstr ""
-"更好地GNOME集成。密码以密匙环存储，而不像<application>Pidgin</application>那"
-"样以纯文本格式存储。"
+msgid "Better GNOME integration. Passwords are stored in the keyring instead of plain text like in <application>Pidgin</application>"
+msgstr "更好地GNOME集成。密码以密匙环存储，而不像<application>Pidgin</application>那样以纯文本格式存储。"
 
 #. Tag: para
 #: Desktop.xml:168
 #, no-c-format
-msgid ""
-"Voice chat with <application>GoogleTalk</application>. Voice chat requires "
-"extra <application>gstreamer</application> codecs and manual firewall "
-"reconfiguration and <application>Pidgin</application> now uses the same "
-"framework as well."
-msgstr ""
-"与<application>GoogleTalk</application>进行语音聊天。语音聊天需要额外的"
-"<application>gstreamer</application>解码器并需要手动配置防火墙。"
-"<application>Pidgin</application>目前使用相同的结构。"
+msgid "Voice chat with <application>GoogleTalk</application>. Voice chat requires extra <application>gstreamer</application> codecs and manual firewall reconfiguration and <application>Pidgin</application> now uses the same framework as well."
+msgstr "与<application>GoogleTalk</application>进行语音聊天。语音聊天需要额外的<application>gstreamer</application>解码器并需要手动配置防火墙。<application>Pidgin</application>目前使用相同的结构。"
 
 #. Tag: para
 #: Desktop.xml:169
 #, no-c-format
-msgid ""
-"Account migration support from <application>Pidgin</application> has been "
-"added to <application>Empathy</application>."
-msgstr ""
-"<application>Empathy</application>已增加从<application>Pidgin</application>迁"
-"移帐户的支持。"
+msgid "Account migration support from <application>Pidgin</application> has been added to <application>Empathy</application>."
+msgstr "<application>Empathy</application>已增加从<application>Pidgin</application>迁移帐户的支持。"
 
 #. Tag: para
 #: Desktop.xml:170
 #, no-c-format
-msgid ""
-"Support for collaboration with <application>Abiword</application> and other "
-"programs"
+msgid "Support for collaboration with <application>Abiword</application> and other programs"
 msgstr "支持与<application>Abiword</application>及其她程序协作"
 
 #. Tag: para
@@ -1562,13 +1115,8 @@ msgstr "缺点"
 #. Tag: para
 #: Desktop.xml:175
 #, no-c-format
-msgid ""
-"Missing plugin system, so many of the add-on features available to "
-"<application>Pidgin</application> (like encryption) are not available to "
-"<application>Empathy</application>"
-msgstr ""
-"<application>Empathy</application>缺少插件系统，因此<application>Pidgin</"
-"application>下提供的很多额外功能（如加密）将不再提供"
+msgid "Missing plugin system, so many of the add-on features available to <application>Pidgin</application> (like encryption) are not available to <application>Empathy</application>"
+msgstr "<application>Empathy</application>缺少插件系统，因此<application>Pidgin</application>下提供的很多额外功能（如加密）将不再提供"
 
 #. Tag: para
 #: Desktop.xml:176
@@ -1597,13 +1145,8 @@ msgstr "gstreamer"
 #. Tag: para
 #: Desktop.xml:187
 #, no-c-format
-msgid ""
-"<application>Totem</application> only supports a <application>gstreamer</"
-"application> back end now. The <application>totem-xine</application> back "
-"end has been removed completely."
-msgstr ""
-"<application>Totem</application>目前仅支持<application>gstreamer</"
-"application>后端。彻底移除了<application>totem-xine</application>后端。"
+msgid "<application>Totem</application> only supports a <application>gstreamer</application> back end now. The <application>totem-xine</application> back end has been removed completely."
+msgstr "<application>Totem</application>目前仅支持<application>gstreamer</application>后端。彻底移除了<application>totem-xine</application>后端。"
 
 #. Tag: title
 #: Desktop.xml:193
@@ -1620,12 +1163,8 @@ msgstr "epiphany"
 #. Tag: para
 #: Desktop.xml:196
 #, no-c-format
-msgid ""
-"<application>Epiphany</application> in this release is now using the WebKit "
-"engine instead of the Gecko engine from <application>Firefox</application>."
-msgstr ""
-"本发行版中的<application>Epiphany</application>使用Webkit引擎，取代了之前来自"
-"<application>Firefox</application>的Gecko引擎。"
+msgid "<application>Epiphany</application> in this release is now using the WebKit engine instead of the Gecko engine from <application>Firefox</application>."
+msgstr "本发行版中的<application>Epiphany</application>使用Webkit引擎，取代了之前来自<application>Firefox</application>的Gecko引擎。"
 
 #. Tag: title
 #: Desktop.xml:202
@@ -1642,16 +1181,8 @@ msgstr "GNOME shell"
 #. Tag: para
 #: Desktop.xml:205
 #, no-c-format
-msgid ""
-"A very early version of GNOME Shell is now available in the repository. "
-"GNOME Shell is a key part of GNOME 3 and is in active development with the "
-"heavy involvement of Fedora developers and interaction designers. A simple "
-"way to try out GNOME Shell is to install the <package>desktop-effects</"
-"package> package:"
-msgstr ""
-"仓库现提供了GNOME Shell的早期版本。GNOME Shell是GNOME 3的关键部分，目前在"
-"Fedora开发及界面设计人员的广泛参与下处于开发之中。试用GNOME Shell的唯一方法是"
-"安装<package>desktop-effects</package>软件包："
+msgid "A very early version of GNOME Shell is now available in the repository. GNOME Shell is a key part of GNOME 3 and is in active development with the heavy involvement of Fedora developers and interaction designers. A simple way to try out GNOME Shell is to install the <package>desktop-effects</package> package:"
+msgstr "仓库现提供了GNOME Shell的早期版本。GNOME Shell是GNOME 3的关键部分，目前在Fedora开发及界面设计人员的广泛参与下处于开发之中。试用GNOME Shell的唯一方法是安装<package>desktop-effects</package>软件包："
 
 #. Tag: screen
 #: Desktop.xml:208
@@ -1662,12 +1193,8 @@ msgstr "<command>yum install desktop-effects gnome-shell</command>"
 #. Tag: para
 #: Desktop.xml:210
 #, no-c-format
-msgid ""
-"Then, click <menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</"
-"guimenuitem><guimenuitem>Desktop Effects</guimenuitem></menuchoice>"
-msgstr ""
-"然后点击<menuchoice><guimenu>系统</guimenu><guimenuitem>偏好设置</"
-"guimenuitem><guimenuitem>桌面效果</guimenuitem></menuchoice>"
+msgid "Then, click <menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Desktop Effects</guimenuitem></menuchoice>"
+msgstr "然后点击<menuchoice><guimenu>系统</guimenu><guimenuitem>偏好设置</guimenuitem><guimenuitem>桌面效果</guimenuitem></menuchoice>"
 
 #. Tag: para
 #: Desktop.xml:213
@@ -1680,12 +1207,10 @@ msgstr "如果您希望手动设置，请执行"
 #, no-c-format
 msgid ""
 "<command>mkdir ~/.config/autostart</command>\n"
-"<command>ln -s /usr/share/applications/gnome-shell.desktop ~/.config/"
-"autostart</command>"
+"<command>ln -s /usr/share/applications/gnome-shell.desktop ~/.config/autostart</command>"
 msgstr ""
 "<command>mkdir ~/.config/autostart</command>\n"
-"<command>ln -s /usr/share/applications/gnome-shell.desktop ~/.config/"
-"autostart</command>"
+"<command>ln -s /usr/share/applications/gnome-shell.desktop ~/.config/autostart</command>"
 
 #. Tag: para
 #: Desktop.xml:217
@@ -1714,36 +1239,14 @@ msgstr "<primary>KDE</primary>"
 #. Tag: para
 #: Desktop.xml:228
 #, no-c-format
-msgid ""
-"<application>KDE 4.3</application> is part of this release and is the "
-"default environment in the Fedora KDE Desktop Live image. The KDE Desktop "
-"Live image is a downloadable CD you can use to test the new KDE environment "
-"with or without installing it. You can write the image to a CD or to a USB "
-"flash drive."
-msgstr ""
-"<application>KDE 4.3</application>是本发行版的一部分，是Fedora KDE桌面Live镜"
-"像的默认环境。KDE桌面Lve镜像是可下载的CD镜像，无论安装与否，您都可以用它来测"
-"试新的KDE环境。您可以将镜像刻录到CD或写入USB闪存盘。"
+msgid "<application>KDE 4.3</application> is part of this release and is the default environment in the Fedora KDE Desktop Live image. The KDE Desktop Live image is a downloadable CD you can use to test the new KDE environment with or without installing it. You can write the image to a CD or to a USB flash drive."
+msgstr "<application>KDE 4.3</application>是本发行版的一部分，是Fedora KDE桌面Live镜像的默认环境。KDE桌面Lve镜像是可下载的CD镜像，无论安装与否，您都可以用它来测试新的KDE环境。您可以将镜像刻录到CD或写入USB闪存盘。"
 
 #. Tag: para
 #: Desktop.xml:232
 #, no-c-format
-msgid ""
-"<application>KDE 4.3</application> is the latest release of KDE 4, with many "
-"enhancements and new features. <application>Plasma</application> has a new "
-"<citetitle>Air</citetitle> look, improved job and notification management "
-"and fully-configurable keyboard shortcuts. There are also new "
-"<application>Plasma</application> widgets and existing ones are improved. "
-"<application>KWin</application> is optimized for performance and brings new "
-"desktop effects to KDE. KDE now contains a new bug reporting tool, making it "
-"easier to report bugs to the KDE developers."
-msgstr ""
-"<application>KDE 4.3</application>是KDE 4的最新版本，做了很多改进并增加了很多"
-"新特性。<application>Plasma</application>有了新的<citetitle>Air</citetitle>外"
-"观，增强的任务和通知管理以及完全可配置的键盘快捷键。同时包括新增的"
-"<application>Plasma</application>小程序以及对已有小程序的改进。对"
-"<application>KWin</application>进行了性能优化并为KDE引入新的桌面特效。KDE提供"
-"了新的bug报告工具，向KDE开发人员报告bug变得更加容易。"
+msgid "<application>KDE 4.3</application> is the latest release of KDE 4, with many enhancements and new features. <application>Plasma</application> has a new <citetitle>Air</citetitle> look, improved job and notification management and fully-configurable keyboard shortcuts. There are also new <application>Plasma</application> widgets and existing ones are improved. <application>KWin</application> is optimized for performance and brings new desktop effects to KDE. KDE now contains a new bug reporting tool, making it easier to report bugs to the KDE developers."
+msgstr "<application>KDE 4.3</application>是KDE 4的最新版本，做了很多改进并增加了很多新特性。<application>Plasma</application>有了新的<citetitle>Air</citetitle>外观，增强的任务和通知管理以及完全可配置的键盘快捷键。同时包括新增的<application>Plasma</application>小程序以及对已有小程序的改进。对<application>KWin</application>进行了性能优化并为KDE引入新的桌面特效。KDE提供了新的bug报告工具，向KDE开发人员报告bug变得更加容易。"
 
 #. Tag: title
 #: Desktop.xml:238
@@ -1760,22 +1263,14 @@ msgstr "moblin-桌面"
 #. Tag: para
 #: Desktop.xml:241
 #, no-c-format
-msgid ""
-"The Moblin Architecture is designed to support multiple platforms and usage "
-"models ranging from Netbooks and NetTops to Mobile Internet Devices (MID) "
-"and various embedded usage models, such as In Vehicle Infotainment systems."
-msgstr ""
-"Moblin架构支持多平台，及从Netbooks、NetTops到移动互联网设备（MID）和各种嵌入"
-"式设备如In Vehcile Infotainment系统的应用。"
+msgid "The Moblin Architecture is designed to support multiple platforms and usage models ranging from Netbooks and NetTops to Mobile Internet Devices (MID) and various embedded usage models, such as In Vehicle Infotainment systems."
+msgstr "Moblin架构支持多平台，及从Netbooks、NetTops到移动互联网设备（MID）和各种嵌入式设备如In Vehcile Infotainment系统的应用。"
 
 #. Tag: para
 #: Desktop.xml:249
 #, no-c-format
-msgid ""
-"A preview of the Core Moblin 2 desktop environment for NetBook/NetTop/MID "
-"devices is available for testing in Fedora."
-msgstr ""
-"Fedora提供测试用的用于NetBook/NetTop/MID设备的Core Moblin 2桌面预览版。"
+msgid "A preview of the Core Moblin 2 desktop environment for NetBook/NetTop/MID devices is available for testing in Fedora."
+msgstr "Fedora提供测试用的用于NetBook/NetTop/MID设备的Core Moblin 2桌面预览版。"
 
 #. Tag: para
 #: Desktop.xml:254
@@ -1798,60 +1293,26 @@ 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 ""
-"<application>Eclipse</application> has had a major update to version 3.5 "
-"(Galileo). Users should read the <citetitle>Eclipse New & Noteworthy</"
-"citetitle> page available at <ulink type=\"http\" url=\"http://update."
-"eclipse.org/downloads/drops/R-3.5-200906111540/eclipse-news-all.html\"></"
-"ulink> to see the release notes for this version."
-msgstr ""
-"<application>Eclipse</application>有较大更新，更新为3.5 (Galileo)。用户可阅读"
-"位于<ulink type=\"http\" url=\"http://update.eclipse.org/downloads/drops/R-"
-"3.5-200906111540/eclipse-news-all.html\"></ulink>çš„<citetitle>Eclipse New "
-"& Noteworthy</citetitle>页面了解本版本的发行注记。"
+msgid "<application>Eclipse</application> has had a major update to version 3.5 (Galileo). Users should read the <citetitle>Eclipse New & Noteworthy</citetitle> page available at <ulink type=\"http\" url=\"http://update.eclipse.org/downloads/drops/R-3.5-200906111540/eclipse-news-all.html\"></ulink> to see the release notes for this version."
+msgstr "<application>Eclipse</application>有较大更新，更新为3.5 (Galileo)。用户可阅读位于<ulink type=\"http\" url=\"http://update.eclipse.org/downloads/drops/R-3.5-200906111540/eclipse-news-all.html\"></ulink>的<citetitle>Eclipse New & Noteworthy</citetitle>页面了解本版本的发行注记。"
 
 #. Tag: para
 #: Devel-Eclipse.xml:13
 #, no-c-format
-msgid ""
-"Fedora now includes more <application>Eclipse</application> plug-ins than "
-"ever before with the new inclusion of Doxygen Integration (<package>eclipse-"
-"eclox</package>), the Remote System Explorer (<package>eclipse-rse</"
-"package>) and a Verilog/VHDL Editor (<package>eclipse-veditor</package>)."
-msgstr ""
-"Fedora采用新加入的Doxygen Integration（<package>eclipse-eclox</package>）为"
-"<application>Eclipse</application>提供了比之前版本更丰富的插件，Remote "
-"System Explorer （<package>eclipse-rse</package>）和Verilog/VHDL编辑器"
-"（<package>eclipse-veditor</package>）。"
+msgid "Fedora now includes more <application>Eclipse</application> plug-ins than ever before with the new inclusion of Doxygen Integration (<package>eclipse-eclox</package>), the Remote System Explorer (<package>eclipse-rse</package>) and a Verilog/VHDL Editor (<package>eclipse-veditor</package>)."
+msgstr "Fedora采用新加入的Doxygen Integration（<package>eclipse-eclox</package>）为<application>Eclipse</application>提供了比之前版本更丰富的插件，Remote System Explorer （<package>eclipse-rse</package>）和Verilog/VHDL编辑器（<package>eclipse-veditor</package>）。"
 
 #. Tag: para
 #: Devel-Eclipse.xml:19
 #, no-c-format
-msgid ""
-"Other major changes in <application>Eclipse</application> plug-ins include "
-"the Data Tools Platform now contains the full database development IDE "
-"(<package>eclipse-dtp</package>), the Dynamic Language Toolkit now includes "
-"Remote System Explorer integration (<package>eclipse-dltk-rse</package>) and "
-"the Eclipse Modelling Framework SDO component was obsoleted and removed "
-"(<package>eclipse-emf-sdo</package>)."
-msgstr ""
-"<application>Eclipse</application>插件中的其它变更包括：数据工具平台（Data "
-"Tools Platform）包含了完整的数据库开发IDE（<package>eclipse-dtp</package>），"
-"动态语言工具包（Dynamic Language Toolkit）包含了Remote System Explorer集成"
-"（<package>eclipse-dltk-rse</package>）， 移除了过时的Eclipse Modelling "
-"Framework SDO组件（<package>eclipse-emf-sdo</package>）。"
+msgid "Other major changes in <application>Eclipse</application> plug-ins include the Data Tools Platform now contains the full database development IDE (<package>eclipse-dtp</package>), the Dynamic Language Toolkit now includes Remote System Explorer integration (<package>eclipse-dltk-rse</package>) and the Eclipse Modelling Framework SDO component was obsoleted and removed (<package>eclipse-emf-sdo</package>)."
+msgstr "<application>Eclipse</application>插件中的其它变更包括：数据工具平台（Data Tools Platform）包含了完整的数据库开发IDE（<package>eclipse-dtp</package>），动态语言工具包（Dynamic Language Toolkit）包含了Remote System Explorer集成（<package>eclipse-dltk-rse</package>）， 移除了过时的Eclipse Modelling Framework SDO组件（<package>eclipse-emf-sdo</package>）。"
 
 #. Tag: title
 #: Devel-Embedded.xml:6
@@ -1862,14 +1323,8 @@ msgstr "<title>嵌入式开发</title>"
 #. 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: primary
 #: Devel-Embedded.xml:9
@@ -1880,21 +1335,8 @@ msgstr "<primary>嵌入式开发</primary>"
 #. Tag: para
 #: Devel-Embedded.xml:12
 #, no-c-format
-msgid ""
-"Fedora &PRODVER; 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 "
-"<citetitle>Packages for embedded development on the wiki</citetitle> "
-"available at <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Packages_For_Embedded_Development\"></ulink> ."
-msgstr ""
-"Fedora &PRODVER;提供了一系列的包来支持嵌入式开发。对AVR和相关部件以及"
-"Microchip PIC提供了广泛的支持。此外，还提供了在Z80，8051等较旧的、不常用的部"
-"件上进行开发的包。引用<ulink type=\"http\" url=\"https://fedoraproject.org/"
-"wiki/Packages_For_Embedded_Development\"></ulink>下的<citetitle>嵌入式开发包"
-"</citetitle>以了解更多的介绍。"
+msgid "Fedora &PRODVER; 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 <citetitle>Packages for embedded development on the wiki</citetitle> available at <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Packages_For_Embedded_Development\"></ulink> ."
+msgstr "Fedora &PRODVER;提供了一系列支持嵌入式开发的软件包。对AVR和相关部件以及Microchip PIC提供了广泛的支持。此外，还提供了在Z80，8051等较旧的、不常用的部件上进行开发的包。引用<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Packages_For_Embedded_Development\"></ulink>下的<citetitle>嵌入式开发包</citetitle>以了解更多的介绍。"
 
 #. Tag: term
 #: Devel-Embedded.xml:25
@@ -1911,16 +1353,8 @@ msgstr "gnusim8085"
 #. Tag: para
 #: Devel-Embedded.xml:28
 #, no-c-format
-msgid ""
-"<package>gnusim8085</package> is new to Fedora. GNUSim8085 is a graphical "
-"simulator for Intel 8085 microprocessor assembly language. It has some very "
-"nice features including a keypad which can be used to write assembly "
-"language programs with much ease. It also has stack, memory and port viewers "
-"which can be used for debugging the programs."
-msgstr ""
-"Fedora新增了<package>gnusim8085</package>。GNUSim8085是一个针对Intel 8085微处"
-"理器汇编语言的图形模拟器。它提供了一些很好的特性，例如更容易编写汇编程序的键"
-"盘。同时它带有用于调试程序的堆栈，内存及端口监视器。"
+msgid "<package>gnusim8085</package> is new to Fedora. GNUSim8085 is a graphical simulator for Intel 8085 microprocessor assembly language. It has some very nice features including a keypad which can be used to write assembly language programs with much ease. It also has stack, memory and port viewers which can be used for debugging the programs."
+msgstr "Fedora新增了<package>gnusim8085</package>。GNUSim8085是一个针对Intel 8085微处理器汇编语言的图形模拟器。它提供了一些很好的特性，例如更容易编写汇编程序的键盘。同时它带有用于调试程序的堆栈，内存及端口监视器。"
 
 #. Tag: term
 #: Devel-Embedded.xml:39
@@ -1937,13 +1371,8 @@ msgstr "<primary>gputils</primary>"
 #. Tag: para
 #: Devel-Embedded.xml:44
 #, no-c-format
-msgid ""
-"<package>gputils</package> has added support for a number of newer "
-"processors. <package>gputils</package> now supports all processors supported "
-"by MPLAB 8.20 (except for EEPROM and similar devices)."
-msgstr ""
-"<package>gputils</package>增加了对新处理器的支持。<package>gputils</package>"
-"目前支持MPLAB 8.20支持的所有处理器（EEPROM及类似设备除外）。"
+msgid "<package>gputils</package> has added support for a number of newer processors. <package>gputils</package> now supports all processors supported by MPLAB 8.20 (except for EEPROM and similar devices)."
+msgstr "<package>gputils</package>增加了对新处理器的支持。<package>gputils</package>目前支持MPLAB 8.20支持的所有处理器（EEPROM及类似设备除外）。"
 
 #. Tag: term
 #: Devel-Embedded.xml:53
@@ -1960,15 +1389,8 @@ msgstr "<primary>gsim85</primary>"
 #. Tag: para
 #: Devel-Embedded.xml:58
 #, no-c-format
-msgid ""
-"<package>gsim85</package> is an 8085 microprocessor simulator. It is having "
-"very user friendly graphical user interface. It can be used to test 8085 "
-"programs before actualy implementing them on target board. <package>gsim85</"
-"package> is new to Fedora &PRODVER;."
-msgstr ""
-"<package>gsim85</package>是一个8085微处理器模拟器。它配有非常友好的图形用户界"
-"面。在8085程序真正在目标板上执行前可用它来进行测试。<package>gsim85</package>"
-"为Fedora &PRODVER;新增程序。"
+msgid "<package>gsim85</package> is an 8085 microprocessor simulator. It is having very user friendly graphical user interface. It can be used to test 8085 programs before actualy implementing them on target board. <package>gsim85</package> is new to Fedora &PRODVER;."
+msgstr "<package>gsim85</package>是一个8085微处理器模拟器。它配有非常友好的图形用户界面。在8085程序真正在目标板上执行前可用它来进行测试。<package>gsim85</package>为Fedora &PRODVER;新增程序。"
 
 #. Tag: term
 #: Devel-Embedded.xml:68
@@ -1985,20 +1407,13 @@ msgstr "<primary>mcu8051ide</primary>"
 #. Tag: para
 #: Devel-Embedded.xml:73
 #, no-c-format
-msgid ""
-"Fedora &PRODVER; includes the new package, <package>mcu8051ide</package>. "
-"MCU 8051 IDE is integrated development enviroment for microcontrollers based "
-"on 8051. Supported programming languages are C and assembly."
-msgstr ""
-"Fedora &PRODVER;包含了新软件包<package>mcu8051ide</package>。MCU 8051 IDE是针"
-"对基于8051微控制器的集成开发环境。支持C语言和汇编语言。"
+msgid "Fedora &PRODVER; includes the new package, <package>mcu8051ide</package>. MCU 8051 IDE is integrated development enviroment for microcontrollers based on 8051. Supported programming languages are C and assembly."
+msgstr "Fedora &PRODVER;包含了新软件包<package>mcu8051ide</package>。MCU 8051 IDE是针对基于8051微控制器的集成开发环境。支持C语言和汇编语言。"
 
 #. Tag: para
 #: Devel-Embedded.xml:79
 #, no-c-format
-msgid ""
-"It has its own assembler and support for 2 external assemblers. For C "
-"language, it uses SDCC compiler."
+msgid "It has its own assembler and support for 2 external assemblers. For C language, it uses SDCC compiler."
 msgstr "它拥有自己的汇编器并支持两个外部汇编器。对于C语言，它使用SDCC编译器。"
 
 #. Tag: term
@@ -2016,15 +1431,8 @@ msgstr "<primary>openocd</primary>"
 #. Tag: para
 #: Devel-Embedded.xml:91
 #, no-c-format
-msgid ""
-"New for Fedora &PRODVER;, the Open On-Chip Debugger (OpenOCD) provides "
-"debugging, in-system programming and boundary-scan testing for embedded "
-"devices. Various different boards, targets, and interfaces are supported to "
-"ease development time."
-msgstr ""
-"Fedora &PRODVER;新增了Open On-Chip Debugger (OpenOCD)，为嵌入式设备提供调试，"
-"系统内编程及边界扫描功能。支持众多不同的 boards，targets及interfaces以节省开"
-"发时间。"
+msgid "New for Fedora &PRODVER;, the Open On-Chip Debugger (OpenOCD) provides debugging, in-system programming and boundary-scan testing for embedded devices. Various different boards, targets, and interfaces are supported to ease development time."
+msgstr "Fedora &PRODVER;新增了Open On-Chip Debugger (OpenOCD)，为嵌入式设备提供调试，系统内编程及边界扫描功能。支持众多不同的 boards，targets及interfaces以节省开发时间。"
 
 #. Tag: term
 #: Devel-Embedded.xml:101
@@ -2041,13 +1449,8 @@ msgstr "<primary>sdcc</primary>"
 #. Tag: para
 #: Devel-Embedded.xml:106
 #, no-c-format
-msgid ""
-"<package>sdcc</package> 2.9.0 includes a number of new features. Refer to "
-"<ulink type=\"http\" url=\"http://sdcc.sourceforge.net/\"></ulink> for the "
-"complete list."
-msgstr ""
-"<package>sdcc</package>2.9.0版包含了一系列新特徴。详细改动清单请引用<ulink "
-"type=\"http\" url=\"http://sdcc.sourceforge.net/\"></ulink>。"
+msgid "<package>sdcc</package> 2.9.0 includes a number of new features. Refer to <ulink type=\"http\" url=\"http://sdcc.sourceforge.net/\"></ulink> for the complete list."
+msgstr "<package>sdcc</package>2.9.0版包含了一系列新特徴。详细改动清单请引用<ulink type=\"http\" url=\"http://sdcc.sourceforge.net/\"></ulink>。"
 
 #. Tag: title
 #: Devel-Embedded.xml:112
@@ -2058,12 +1461,8 @@ msgstr "代码可能不兼容"
 #. Tag: para
 #: Devel-Embedded.xml:113
 #, no-c-format
-msgid ""
-"Code developed for <package>sdcc</package> 2.8.0 may not be fully compatible "
-"with 2.9.0."
-msgstr ""
-"为<package>sdcc</package> 2.8.0 版本开发的代码可能不能跟 2.9.0 版本完全兼容。"
-"with 2.9.0."
+msgid "Code developed for <package>sdcc</package> 2.8.0 may not be fully compatible with 2.9.0."
+msgstr "为<package>sdcc</package> 2.8.0 版本开发的代码可能不能跟 2.9.0 版本完全兼容。with 2.9.0."
 
 #. Tag: title
 #: Devel-GCC.xml:6
@@ -2074,14 +1473,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
@@ -2098,13 +1491,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-Languages.xml:6
@@ -2115,28 +1503,14 @@ msgstr "语言"
 #. Tag: remark
 #: Devel-Languages.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-Languages.xml:9
 #, no-c-format
-msgid ""
-"Fedora &PRODVER; includes all of the popular programming languages. "
-"This section outlines the major changes since Fedora &PREVVER;. Since "
-"Fedora tries to include the lastest of everything from upstream, there are, "
-"of course, many minor changes. See the tables at the end of this document "
-"for details."
-msgstr ""
-"Fedora &PRODVER;包括了所有流行的编程语言。本节介绍了自Fedora "
-"&PREVVER;以来的主要变化。由于Fedora一直努力集成着来自上游的一切新资源，因此包"
-"括了很多小的变更。查看本文档最后的表格来了解详情。"
+msgid "Fedora &PRODVER; includes all of the popular programming languages. This section outlines the major changes since Fedora &PREVVER;. Since Fedora tries to include the lastest of everything from upstream, there are, of course, many minor changes. See the tables at the end of this document for details."
+msgstr "Fedora &PRODVER;包括了所有流行的编程语言。本节介绍了自Fedora &PREVVER;以来的主要变化。由于Fedora一直努力集成着来自上游的一切新资源，因此包括了很多小的变更。查看本文档最后的表格来了解详情。"
 
 #. Tag: term
 #: Devel-Languages.xml:20
@@ -2147,33 +1521,19 @@ msgstr "Haskell"
 #. Tag: para
 #: Devel-Languages.xml:22
 #, no-c-format
-msgid ""
-"Fedora 12 includes the <package>haskell-platform</package>-2009.2.0.2. "
-"Haskell Platform is standard set of libraries and tools which provide a "
-"stable known platform for developing Haskell projects."
-msgstr ""
-"Fedora 12收入了<package>haskell-platform</package>-2009.2.0.2。Haskell平台是"
-"一套标准的库和工具，这些库和工具为Haskell项目开发提供了稳定的平台。"
+msgid "Fedora 12 includes the <package>haskell-platform</package>-2009.2.0.2. Haskell Platform is standard set of libraries and tools which provide a stable known platform for developing Haskell projects."
+msgstr "Fedora 12收入了<package>haskell-platform</package>-2009.2.0.2。Haskell平台是一套标准的库和工具，这些库和工具为Haskell项目开发提供了稳定的平台。"
 
 #. Tag: para
 #: Devel-Languages.xml:29
 #, no-c-format
-msgid ""
-"<package>ghc</package> has been updated to 6.10.4. The xmonad window manager "
-"and quite a few more libraries have also been added (cgi, editline, fgl, "
-"GLUT, haskell-platform, network, OpenGL, tar, time, utf8-string, X11-xft, "
-"xmonad, xmonad-contrib)."
-msgstr ""
-"<package>ghc</package>更新至6.10.4。加入了xmonad窗口管理器以及很多库（cgi，"
-"editline，fgl，GLUT，haskell-platform，network，OpenGL，tar，time，uft8-"
-"string，X11-xft，xmonad，xmonad-contrib）。"
+msgid "<package>ghc</package> has been updated to 6.10.4. The xmonad window manager and quite a few more libraries have also been added (cgi, editline, fgl, GLUT, haskell-platform, network, OpenGL, tar, time, utf8-string, X11-xft, xmonad, xmonad-contrib)."
+msgstr "<package>ghc</package>更新至6.10.4。加入了xmonad窗口管理器以及很多库（cgi，editline，fgl，GLUT，haskell-platform，network，OpenGL，tar，time，uft8-string，X11-xft，xmonad，xmonad-contrib）。"
 
 #. Tag: para
 #: Devel-Languages.xml:36
 #, no-c-format
-msgid ""
-"<package>ghc-rpm-macros</package> contains the rpm macros used in the "
-"Haskell Packaging Guidelines."
+msgid "<package>ghc-rpm-macros</package> contains the rpm macros used in the Haskell Packaging Guidelines."
 msgstr "<package>ghc-rpm-macros</package>包括了Haskell打包向导中用到的rpm宏。"
 
 #. Tag: term
@@ -2185,28 +1545,14 @@ msgstr "<term>php</term>"
 #. Tag: para
 #: Devel-Languages.xml:46
 #, no-c-format
-msgid ""
-"Fedora 12 includes version 5.3.0 of <package>php</package>. This includes a "
-"number of significant new features including support for namespaces, late "
-"binding, more consistent float rounding as well as a number of performance "
-"enhancements. For complete details see <ulink type=\"http\" url=\"http://php."
-"net/releases/5_3_0.php\"></ulink>."
-msgstr ""
-"Fedora 12使用<package>php</package>5.3.0。本版本包括了一系列的重要特性，包括"
-"对命名空间、late binding的支持，更一致的浮点四舍五入以及大量的性能增强。有关"
-"详细信息请见<ulink type=\"http\" url=\"http://php.net/releases/5_3_0.php\"></"
-"ulink>。"
+msgid "Fedora 12 includes version 5.3.0 of <package>php</package>. This includes a number of significant new features including support for namespaces, late binding, more consistent float rounding as well as a number of performance enhancements. For complete details see <ulink type=\"http\" url=\"http://php.net/releases/5_3_0.php\"></ulink>."
+msgstr "Fedora 12使用<package>php</package>5.3.0。本版本包括了一系列的重要特性，包括对命名空间、late binding的支持，更一致的浮点四舍五入以及大量的性能增强。有关详细信息请见<ulink type=\"http\" url=\"http://php.net/releases/5_3_0.php\"></ulink>。"
 
 #. 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:8
@@ -2223,14 +1569,8 @@ 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: title
 #: Devel-Tools.xml:6
@@ -2241,28 +1581,14 @@ 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
 #, no-c-format
-msgid ""
-"Fedora &PRODVER; includes a rich set of development tools including all "
-"popular programming languages, the best and latest IDEs, and an extensive "
-"set of libraries. This section addresses the major changes for Fedora 12. "
-"For a complete list of the hundreds of updated development components see "
-"the tables at the end of this document."
-msgstr ""
-"Fedora &PRODVER;包括了丰富的开发工具套装，包括了所有流行的编程语言，最好和最"
-"新的IDEs，以及可扩展的库。这节介绍针对Fedora 12的主要变更。有关开发组件大量更"
-"新的完整列表请查看本文档最后的表格。"
+msgid "Fedora &PRODVER; includes a rich set of development tools including all popular programming languages, the best and latest IDEs, and an extensive set of libraries. This section addresses the major changes for Fedora 12. For a complete list of the hundreds of updated development components see the tables at the end of this document."
+msgstr "Fedora &PRODVER;包括了丰富的开发工具套装，包括了所有流行的编程语言，最好和最新的IDEs，以及可扩展的库。这节介绍针对Fedora 12的主要变更。有关开发组件大量更新的完整列表请查看本文档最后的表格。"
 
 #. Tag: term
 #: Devel-Tools.xml:20
@@ -2273,9 +1599,7 @@ msgstr "emacs"
 #. Tag: para
 #: Devel-Tools.xml:22
 #, no-c-format
-msgid ""
-"<package>emacs</package> has been updated to version 23. Emacs 23 has a wide "
-"variety of new features, including:"
+msgid "<package>emacs</package> has been updated to version 23. Emacs 23 has a wide variety of new features, including:"
 msgstr "<package>emacs</package>更新至23。Emacs 23包括了众多新特性："
 
 #. Tag: para
@@ -2293,31 +1617,20 @@ msgstr "使用Fontconfig和Xft进行字体渲染。"
 #. Tag: para
 #: Devel-Tools.xml:37
 #, no-c-format
-msgid ""
-"Support for using X displays and text terminals in one session, and for "
-"running as a daemon."
+msgid "Support for using X displays and text terminals in one session, and for running as a daemon."
 msgstr "支持在一个会话中使用X和字符终端，并支持以守护进程运行。"
 
 #. Tag: para
 #: Devel-Tools.xml:42
 #, no-c-format
-msgid ""
-"Support for multi-file commits in distributed version-control systems (VC-"
-"dir)."
+msgid "Support for multi-file commits in distributed version-control systems (VC-dir)."
 msgstr "支持在分布版本控制系统（VC-dir）中的多文件执行。"
 
 #. Tag: para
 #: Devel-Tools.xml:47
 #, no-c-format
-msgid ""
-"New modes and packages for viewing PDF and postscript files (Doc-view mode), "
-"connecting to processes through D-Bus (dbus), connecting to the GNU Privacy "
-"Guard (EasyPG), editing XML documents (nXML mode), editing Ruby programs "
-"(Ruby mode), and more."
-msgstr ""
-"新增了浏览PDF和postcript文件（Doc浏览模式）的模式和包，通过D-Bus（dbus）连接"
-"进程，连接到GNU Privacy Guard（EasyPG），编辑XML文档（nXML模式），编辑Ruby程"
-"序（Ruby模式）等等。"
+msgid "New modes and packages for viewing PDF and postscript files (Doc-view mode), connecting to processes through D-Bus (dbus), connecting to the GNU Privacy Guard (EasyPG), editing XML documents (nXML mode), editing Ruby programs (Ruby mode), and more."
+msgstr "新增了浏览PDF和postcript文件（Doc浏览模式）的模式和包，通过D-Bus（dbus）连接进程，连接到GNU Privacy Guard（EasyPG），编辑XML文档（nXML模式），编辑Ruby程序（Ruby模式）等等。"
 
 #. Tag: term
 #: Devel-Tools.xml:61
@@ -2328,9 +1641,7 @@ msgstr "mercurial"
 #. Tag: para
 #: Devel-Tools.xml:63
 #, no-c-format
-msgid ""
-"Version 1.3.1 of <package>mercurial</package> now includes experimental "
-"support for sub-repositories."
+msgid "Version 1.3.1 of <package>mercurial</package> now includes experimental support for sub-repositories."
 msgstr "1.3.1版的<package>mercurial</package>包含了对子仓库的实验性支持。"
 
 #. Tag: title
@@ -2342,14 +1653,8 @@ msgstr "<title>电子设计自动化<title>"
 #. Tag: remark
 #: ElectronicDesignAssistants.xml:6
 #, no-c-format
-msgid ""
-"This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject."
-"org/wiki/Documentation_EDA_Beat\">https://fedoraproject.org/wiki/"
-"Documentation_EDA_Beat</ulink>"
-msgstr ""
-"这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Documentation_EDA_Beat\">https://fedoraproject.org/wiki/"
-"Documentation_EDA_Beat</ulink>"
+msgid "This beat is located here: <ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_EDA_Beat\">https://fedoraproject.org/wiki/Documentation_EDA_Beat</ulink>"
+msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Documentation_EDA_Beat\">https://fedoraproject.org/wiki/Documentation_EDA_Beat</ulink>"
 
 #. Tag: primary
 #: ElectronicDesignAssistants.xml:10
@@ -2366,16 +1671,8 @@ msgstr "Fedora 电子实验室"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:12
 #, no-c-format
-msgid ""
-"This section outlines changes in the Fedora Electronic Lab for Fedora 12. "
-"Note that a number of the applications in FEL have application to a number "
-"of communities. These specific applications are outlined in the Circuit "
-"Design (which includes simulation and PCB layout) and Embedded Development "
-"sections of these notes."
-msgstr ""
-"本节概括了Fedora 12中Fedora Electronic Lab的更新。注意FEL中的很多程序在应用上"
-"有很多联系。这些特定的程序在电路设计（包括模拟和PCB布局）及嵌入式开发章节的相"
-"关部分做了介绍。"
+msgid "This section outlines changes in the Fedora Electronic Lab for Fedora 12. Note that a number of the applications in FEL have application to a number of communities. These specific applications are outlined in the Circuit Design (which includes simulation and PCB layout) and Embedded Development sections of these notes."
+msgstr "本节概括了Fedora 12中Fedora Electronic Lab的更新。注意FEL中的很多程序在应用上有很多联系。这些特定的程序在电路设计（包括模拟和PCB布局）及嵌入式开发章节的相关部分做了介绍。"
 
 #. Tag: title
 #: ElectronicDesignAssistants.xml:21
@@ -2392,31 +1689,14 @@ msgstr "<primary>协同代码评审</primary>"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:23
 #, no-c-format
-msgid ""
-"One of the many faces of digital hardware design entails tracking many files "
-"to be fed to multiple EDA tools. The eventual reports or netlists are "
-"carefully analysed and logged as part of the sign-off methodology. Each "
-"company tracks these project dependent files under a certain directory "
-"structure and under a certain revision controlled system of their choice."
-msgstr ""
-"数字硬件设计的众多方面之一就是需要追踪很多文件来供多个EDA工具使用。最终报告或"
-"netlists都将做为sign-off methodology的一部分仔细分析并记录。每个公司都会在某"
-"个目录下，选择某个修订控制系统对这些项目依赖文件进行追踪。"
+msgid "One of the many faces of digital hardware design entails tracking many files to be fed to multiple EDA tools. The eventual reports or netlists are carefully analysed and logged as part of the sign-off methodology. Each company tracks these project dependent files under a certain directory structure and under a certain revision controlled system of their choice."
+msgstr "数字硬件设计的众多方面之一就是需要追踪很多文件来供多个EDA工具使用。最终报告或netlists都将做为sign-off methodology的一部分仔细分析并记录。每个公司都会在某个目录下，选择某个修订控制系统对这些项目依赖文件进行追踪。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:31
 #, no-c-format
-msgid ""
-"We have included an efficient and reliable code review solution into the "
-"Fedora collection. This trac-based peerreview solution will also help create "
-"links and seamless references between bugs, tasks, changesets and files. "
-"Project coordinators will have a more realistic the overview of the on-going "
-"project and track the progress very easy with respect to different "
-"milestones and deadlines."
-msgstr ""
-"我们为Fedora引入了一个高效可靠的代码审阅方案。这个基于trac的同行审阅方案同时"
-"也可帮助在bug、任务、变更集和文件间建立链接和无缝引用。项目协调人员将对正在进"
-"行的项目有一个更真实的概览并且可以按照不同的进展和里程轻松地进行跟踪。"
+msgid "We have included an efficient and reliable code review solution into the Fedora collection. This trac-based peerreview solution will also help create links and seamless references between bugs, tasks, changesets and files. Project coordinators will have a more realistic the overview of the on-going project and track the progress very easy with respect to different milestones and deadlines."
+msgstr "我们为Fedora引入了一个高效可靠的代码审阅方案。这个基于trac的同行审阅方案同时也可帮助在bug、任务、变更集和文件间建立链接和无缝引用。项目协调人员将对正在进行的项目有一个更真实的概览并且可以按照不同的进展和里程轻松地进行跟踪。"
 
 #. Tag: title
 #: ElectronicDesignAssistants.xml:43
@@ -2439,21 +1719,13 @@ msgstr "<secondary>电子设计自动化</secondary>"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:48
 #, no-c-format
-msgid ""
-"With the help and support from Fedora Eclipse team, Eclipse becomes FEL’s "
-"prime IDE for HDL IP development and documentation. This adoption is to "
-"maintain true interoperability between tools offered by different embedded "
-"software vendors."
-msgstr ""
-"在Fedora Eclipse团队的协助和支持下，Eclipse成为了FEL在HDL IP开发和文档上主要"
-"的IDE。这样是为了在不同嵌入式软件商提供的工具之间保持真正的互操作性。"
+msgid "With the help and support from Fedora Eclipse team, Eclipse becomes FEL’s prime IDE for HDL IP development and documentation. This adoption is to maintain true interoperability between tools offered by different embedded software vendors."
+msgstr "在Fedora Eclipse团队的协助和支持下，Eclipse成为了FEL在HDL IP开发和文档上主要的IDE。这样是为了在不同嵌入式软件商提供的工具之间保持真正的互操作性。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:55
 #, no-c-format
-msgid ""
-"The following plugins provided by default on the Fedora Electronic Lab "
-"platform will enhance :"
+msgid "The following plugins provided by default on the Fedora Electronic Lab platform will enhance :"
 msgstr "Fedora Electronic实验平台默认提供的如下插件将会增强："
 
 #. Tag: para
@@ -2465,8 +1737,7 @@ msgstr "前端设计"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:65
 #, no-c-format
-msgid ""
-"autogeneration of documentation and maintenance of professional datasheets"
+msgid "autogeneration of documentation and maintenance of professional datasheets"
 msgstr "专业数据表的文档自动生成及维护"
 
 #. Tag: para
@@ -2536,31 +1807,48 @@ msgid "<primary>eclipse-egit</primary>"
 msgstr "<primary>eclipse-egit</primary>"
 
 #. Tag: entry
-#: ElectronicDesignAssistants.xml:94 table-amusements-games.xml:14
-#: table-amusements-graphics.xml:15 table-application-editors.xml:15
+#: ElectronicDesignAssistants.xml:94
+#: table-amusements-games.xml:14
+#: table-amusements-graphics.xml:15
+#: table-application-editors.xml:15
 #: table-applications-archiving.xml:16
 #: table-applications-communications.xml:14
-#: table-applications-databases.xml:14 table-applications-editors.xml:14
-#: table-applications-emulators.xml:14 table-applications-engineering.xml:14
-#: table-applications-file.xml:14 table-applications-internet.xml:14
-#: table-applications-multimedia.xml:14 table-applications-productivity.xml:14
-#: table-applications-publishing.xml:14 table-applications-system.xml:14
-#: table-applications-text.xml:14 table-desktop-accessibility.xml:15
-#: table-development-build_tools.xml:14 table-development-debuggers.xml:14
-#: table-development-documentation.xml:14 table-development-java.xml:14
-#: table-development-languages.xml:14 table-development-libraries-java.xml:14
-#: table-development-libraries.xml:14 table-development.xml:14
-#: table-development-python.xml:14 table-development-ruby.xml:14
-#: table-development-system.xml:14 table-development-tools.xml:14
-#: table-documentation.xml:14 table-sugar-activities.xml:14
+#: table-applications-databases.xml:14
+#: table-applications-editors.xml:14
+#: table-applications-emulators.xml:14
+#: table-applications-engineering.xml:14
+#: table-applications-file.xml:14
+#: table-applications-internet.xml:14
+#: table-applications-multimedia.xml:14
+#: table-applications-productivity.xml:14
+#: table-applications-publishing.xml:14
+#: table-applications-system.xml:14
+#: table-applications-text.xml:14
+#: table-desktop-accessibility.xml:15
+#: table-development-build_tools.xml:14
+#: table-development-debuggers.xml:14
+#: table-development-documentation.xml:14
+#: table-development-java.xml:14
+#: table-development-languages.xml:14
+#: table-development-libraries-java.xml:14
+#: table-development-libraries.xml:14
+#: table-development.xml:14
+#: table-development-python.xml:14
+#: table-development-ruby.xml:14
+#: table-development-system.xml:14
+#: table-development-tools.xml:14
+#: table-documentation.xml:14
+#: table-sugar-activities.xml:14
 #: table-system_environment-base.xml:14
 #: table-system_environment-daemons.xml:14
 #: table-system_environment-kernel.xml:14
 #: table-system_environment-libraries.xml:14
 #: table-system_environment-shells.xml:14
-#: table-system_environment-tools.xml:14 table-systems_management-base.xml:14
+#: table-system_environment-tools.xml:14
+#: table-systems_management-base.xml:14
 #: table-text_editors-integrated_development_environments__ide_.xml:131
-#: table-text_processing-markup-xml.xml:17 table-user_interface-desktop.xml:15
+#: table-text_processing-markup-xml.xml:17
+#: table-user_interface-desktop.xml:15
 #: table-user_interface-desktops.xml:14
 #: table-user_interface-x_hardware_support.xml:14
 #: table-user_interface-x.xml:14
@@ -2583,13 +1871,8 @@ msgstr "<entry>eclipse-veditor</entry>"
 #. Tag: entry
 #: ElectronicDesignAssistants.xml:107
 #, no-c-format
-msgid ""
-"Helps digital IC designers/FPGA designers develop Verilog/ VHDL code on "
-"Eclipse. Provides a realtime error and warnings notification of typos, "
-"missing signals, unnecessary signals etc."
-msgstr ""
-"帮助数字IC设计人员/FPGA设计人员在Eclipse上开发Verilog/ VHDL代码。提供了对拼写"
-"错误，缺失信号及不必要信号等的实时错误和警告提示。"
+msgid "Helps digital IC designers/FPGA designers develop Verilog/ VHDL code on Eclipse. Provides a realtime error and warnings notification of typos, missing signals, unnecessary signals etc."
+msgstr "帮助数字IC设计人员/FPGA设计人员在Eclipse上开发Verilog/ VHDL代码。提供了对拼写错误，缺失信号及不必要信号等的实时错误和警告提示。"
 
 #. Tag: entry
 #: ElectronicDesignAssistants.xml:115
@@ -2600,12 +1883,8 @@ msgstr "<entry>eclipse-eclox</entry>"
 #. Tag: entry
 #: ElectronicDesignAssistants.xml:118
 #, no-c-format
-msgid ""
-"If the vhdl code entails doxygen style comments, a pdf can be autogenerated "
-"and used either during internal meetings or sent to the client."
-msgstr ""
-"如果vhdl代码需要doxygen式的注释，可自动生成pdf文件以便在内部会议中使用或发送"
-"给客户。"
+msgid "If the vhdl code entails doxygen style comments, a pdf can be autogenerated and used either during internal meetings or sent to the client."
+msgstr "如果vhdl代码需要doxygen式的注释，可自动生成pdf文件以便在内部会议中使用或发送给客户。"
 
 #. Tag: entry
 #: ElectronicDesignAssistants.xml:125
@@ -2616,14 +1895,8 @@ msgstr "<entry>eclipse-texlipse</entry>"
 #. Tag: entry
 #: ElectronicDesignAssistants.xml:128
 #, no-c-format
-msgid ""
-"Since the pdf is generated from latex, the texlipse plugin will provide some "
-"additional page layout formatting and easy pdf creation. The pdf creation is "
-"now only Ctrl-S, rather than a manual click like one would do on kile. That "
-"said, kile will be removed from the FEL livedvd."
-msgstr ""
-"由于pdf由latex生成，texlipse插件将提供一些额外的页面输出格式以方便pdf创建。"
-"pdf创建目前只有Ctrl-S，而不是像kile中手动点击。就是说FEL livedvd将移除kile。"
+msgid "Since the pdf is generated from latex, the texlipse plugin will provide some additional page layout formatting and easy pdf creation. The pdf creation is now only Ctrl-S, rather than a manual click like one would do on kile. That said, kile will be removed from the FEL livedvd."
+msgstr "由于pdf由latex生成，texlipse插件将提供一些额外的页面输出格式以方便pdf创建。pdf创建目前只有Ctrl-S，而不是像kile中手动点击。就是说FEL livedvd将移除kile。"
 
 #. Tag: entry
 #: ElectronicDesignAssistants.xml:138
@@ -2706,24 +1979,14 @@ msgstr "<primary>toped</primary>"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:197
 #, no-c-format
-msgid ""
-"Updated to the consolidation release 0.9.4. The Fedora Toped package sets "
-"the variable $TPD_GLOBAL to /usr/share/toped by default so that the user "
-"could run toped out of the box."
-msgstr ""
-"Fedora Toped更新至合并版本0.9.4，将变量$TPD_GLOBAL的值默认设置为/usr/share/"
-"toped，以方便用户直接运行。"
+msgid "Updated to the consolidation release 0.9.4. The Fedora Toped package sets the variable $TPD_GLOBAL to /usr/share/toped by default so that the user could run toped out of the box."
+msgstr "Fedora Toped更新至合并版本0.9.4，将变量$TPD_GLOBAL的值默认设置为/usr/share/toped，以方便用户直接运行。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:203
 #, no-c-format
-msgid ""
-"Graham Petley and Krustev Svilen provided 2 TELL files as a demonstration "
-"how toped can interact with Pharosc Standard Cells via toped’s GDSII and CIF "
-"parsers."
-msgstr ""
-"Graham Petley和Krustev Svilen为TELL提供了2个文件，做为示例解释toped如何通过"
-"toped的GDSII和CIF解析器与Pharosc标准Cells进行交互。"
+msgid "Graham Petley and Krustev Svilen provided 2 TELL files as a demonstration how toped can interact with Pharosc Standard Cells via toped’s GDSII and CIF parsers."
+msgstr "Graham Petley和Krustev Svilen为TELL提供了2个文件，做为示例解释toped如何通过toped的GDSII和CIF解析器与Pharosc标准Cells进行交互。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:209
@@ -2734,20 +1997,13 @@ msgstr "重点"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:213
 #, no-c-format
-msgid ""
-"New graphic renderer which speeds-up the drawing up-to 3.5 times. Requires "
-"openGL version 1.4 (F-11 uses 1.3, but this is not an issue) and Virtual "
-"Buffer Objects. It will be used as a base for future graphical effects."
-msgstr ""
-"新的图形渲染将绘图速度提升了近3.5倍。需要openGL 1.4（F-11用户是1.3，不过这不"
-"成问题）及Virtual Buffer Objects。它将做为未来图形效果的基础。"
+msgid "New graphic renderer which speeds-up the drawing up-to 3.5 times. Requires openGL version 1.4 (F-11 uses 1.3, but this is not an issue) and Virtual Buffer Objects. It will be used as a base for future graphical effects."
+msgstr "新的图形渲染将绘图速度提升了近3.5倍。需要openGL 1.4（F-11用户是1.3，不过这不成问题）及Virtual Buffer Objects。它将做为未来图形效果的基础。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:222
 #, no-c-format
-msgid ""
-"The old renderer remains to cover graphic drivers implementing older openGL "
-"versions and particularly virtual desktops."
+msgid "The old renderer remains to cover graphic drivers implementing older openGL versions and particularly virtual desktops."
 msgstr "保留了旧的渲染器以使得驱动程序执行旧版openGL以及虚拟桌面。"
 
 #. Tag: para
@@ -2769,7 +2025,8 @@ msgid "New utility for conversion of Virtuoso(C) technology files to TELL."
 msgstr "针对Virtuoso(C)技术文件到TELL会话的新工具。"
 
 #. Tag: para
-#: ElectronicDesignAssistants.xml:246 ElectronicDesignAssistants.xml:252
+#: ElectronicDesignAssistants.xml:246
+#: ElectronicDesignAssistants.xml:252
 #, no-c-format
 msgid "TDT format updated with new records. Version updated to 0.7."
 msgstr "TDT格式更新，使用了新纪录。版本更新至0.7。"
@@ -2783,30 +2040,20 @@ msgstr "用户界面自定义的更多更新 - 工具栏。"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:264
 #, no-c-format
-msgid ""
-"Updates in the internal handling of the cell references. In result layer 0 "
-"is handled as a normal layer now."
+msgid "Updates in the internal handling of the cell references. In result layer 0 is handled as a normal layer now."
 msgstr "对cell引用的内部操作进行了更新。图层0将当做正常层。"
 
 #. Tag: title
 #: ElectronicDesignAssistants.xml:273
 #, no-c-format
-msgid ""
-"Old Toped releases will not be able to read TDT files produced by this "
-"release."
+msgid "Old Toped releases will not be able to read TDT files produced by this release."
 msgstr "老版本的Toped将无法读取本版本生成的TDT文件。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:277
 #, no-c-format
-msgid ""
-"There is a certain amount of code which is not yet merged to the main "
-"development trunk, including the calibre error report parser. The suggestion "
-"is to do that after the release. Some features were postponed instead of "
-"sacrificing stability at this stage."
-msgstr ""
-"还有一些代码没有整合到主开发中，包括口径错误报告分析器。建议在发行后做此工"
-"作。为了保证当前版本的稳定，搁浅了部分功能。"
+msgid "There is a certain amount of code which is not yet merged to the main development trunk, including the calibre error report parser. The suggestion is to do that after the release. Some features were postponed instead of sacrificing stability at this stage."
+msgstr "还有一些代码没有整合到主开发中，包括口径错误报告分析器。建议在发行后做此工作。为了保证当前版本的稳定，搁浅了部分功能。"
 
 #. Tag: term
 #: ElectronicDesignAssistants.xml:290
@@ -2835,15 +2082,8 @@ msgstr "Fedora Magic 已更新至 8.0.54 版本。"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:301
 #, no-c-format
-msgid ""
-"Fedora Magic package has its documentation on a separate package called : "
-"<package>magic-doc</package>. The latter includes some examples of scmos and "
-"tutorials. Advanced Magic VLSI users would also be interested in reading the "
-"documentation again to grasp the fine details entailed in the 8.0 series."
-msgstr ""
-"Fedora Magic的文档使用了单独的包，叫做：<package>magic-doc</package>。文档中"
-"集合了一些scmos的样例和教程。Magic VLSI高级用户应该也会有兴趣再次读此文档，来"
-"掌握8.0系列中不可缺少的详情。"
+msgid "Fedora Magic package has its documentation on a separate package called : <package>magic-doc</package>. The latter includes some examples of scmos and tutorials. Advanced Magic VLSI users would also be interested in reading the documentation again to grasp the fine details entailed in the 8.0 series."
+msgstr "Fedora Magic的文档使用了单独的包，叫做：<package>magic-doc</package>。文档中集合了一些scmos的样例和教程。Magic VLSI高级用户应该也会有兴趣再次读此文档，来掌握8.0系列中不可缺少的详情。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:309
@@ -2854,9 +2094,7 @@ msgstr "特性："
 #. Tag: para
 #: ElectronicDesignAssistants.xml:312
 #, no-c-format
-msgid ""
-"outline vector fonts (courtesy of the freefont project), and aims to clean "
-"up a lot of problems associated with labels in Magic."
+msgid "outline vector fonts (courtesy of the freefont project), and aims to clean up a lot of problems associated with labels in Magic."
 msgstr "轮廓矢量字体（freefont项目），目的在于清理Magic中相关标签的问题。"
 
 #. Tag: para
@@ -2868,18 +2106,13 @@ msgstr "所有显示、操作及OpenGL都是完整的。"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:324
 #, no-c-format
-msgid ""
-"Features some \"cifoutput\" operators for use with the new \"cif paint\" "
-"command, for manipulating layout using boolean operators."
-msgstr ""
-"为了使用布尔运算符操作布局，新的\"cif paint\" 命令提供了一些\"cifoutput\"操作"
-"功能。"
+msgid "Features some \"cifoutput\" operators for use with the new \"cif paint\" command, for manipulating layout using boolean operators."
+msgstr "为了使用布尔运算符操作布局，新的\"cif paint\" 命令提供了一些\"cifoutput\"操作功能。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:336
 #, no-c-format
-msgid ""
-"Two additional menus have been added for grid manipulation and text settings."
+msgid "Two additional menus have been added for grid manipulation and text settings."
 msgstr "为网格操作和字符设置增加了两个额外菜单。"
 
 #. Tag: term
@@ -2903,17 +2136,8 @@ msgstr "<package>electric</package> 已更新至 8.09 版本"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:355
 #, no-c-format
-msgid ""
-"Please note that because most of the electric userbase use third party "
-"plugins that due to the licensing incompatibilities wih Fedora, FEL can not "
-"add those plugins. That said, Fedora Electronic Lab team understands that "
-"releasing a new upstream version would break interoperability with the "
-"user’s plugins. Hence new versions of electric will once make their way to "
-"the updates-testing repository."
-msgstr ""
-"请注意大量电气用户群使用的第三方插件由于许可方面不能与Fedora兼容，因此FEL无法"
-"把这些插件加入其中。Fedora电气实验团队理解由于上游版本的更新造成的与用户插件"
-"互操作性的破坏。因此新版的电气包将放到更新测试仓库。"
+msgid "Please note that because most of the electric userbase use third party plugins that due to the licensing incompatibilities wih Fedora, FEL can not add those plugins. That said, Fedora Electronic Lab team understands that releasing a new upstream version would break interoperability with the user’s plugins. Hence new versions of electric will once make their way to the updates-testing repository."
+msgstr "请注意大量电气用户群使用的第三方插件由于许可方面不能与Fedora兼容，因此FEL无法把这些插件加入其中。Fedora电气实验团队理解由于上游版本的更新造成的与用户插件互操作性的破坏。因此新版的电气包将放到更新测试仓库。"
 
 #. Tag: title
 #: ElectronicDesignAssistants.xml:372
@@ -2936,45 +2160,26 @@ msgstr "dinotrace"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:382
 #, no-c-format
-msgid ""
-"New to Fedora &PRODVER;,Dinotrace is a waveform viewer which understands "
-"Verilog Value Change Dumps, ASCII, and other trace formats."
-msgstr ""
-"Dinotrace是Fedora &PRODVER;新增的，一个可以识别Verilog值变更转储，ASCII及其它"
-"跟踪格式的波形查看器。"
+msgid "New to Fedora &PRODVER;,Dinotrace is a waveform viewer which understands Verilog Value Change Dumps, ASCII, and other trace formats."
+msgstr "Dinotrace是Fedora &PRODVER;新增的，一个可以识别Verilog值变更转储，ASCII及其它跟踪格式的波形查看器。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:387
 #, no-c-format
-msgid ""
-"It allows placing cursors, highlighting signals, searching, printing, and "
-"other capabilities superior to many commercial waveform viewers."
-msgstr ""
-"它允许定位鼠标，高亮信号，搜索，打印及其它优于多数商业波形监视器的能力。"
+msgid "It allows placing cursors, highlighting signals, searching, printing, and other capabilities superior to many commercial waveform viewers."
+msgstr "它允许定位鼠标，高亮信号，搜索，打印及其它优于多数商业波形监视器的能力。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:392
 #, no-c-format
-msgid ""
-"Dinotrace is optimized for rapid debugging. With VTRACE, a simulation "
-"failure will automatically place cursors where errors occur, add comments "
-"visible in the wave form viewer. Four mouse clicks and the errors will be "
-"highlighted in the log files, and the values of signals at the error will be "
-"seen in the source."
-msgstr ""
-"Dinotrace针对快速调试进行了优化。有了VTRACE，模拟失败时会自动在波形查看器中将"
-"光标定位在错误处，添加可见注释。点击鼠标4次，日志文件中的错误将以高亮显示，并"
-"且可在源文件中看到错误位置的信号值。"
+msgid "Dinotrace is optimized for rapid debugging. With VTRACE, a simulation failure will automatically place cursors where errors occur, add comments visible in the wave form viewer. Four mouse clicks and the errors will be highlighted in the log files, and the values of signals at the error will be seen in the source."
+msgstr "Dinotrace针对快速调试进行了优化。有了VTRACE，模拟失败时会自动在波形查看器中将光标定位在错误处，添加可见注释。点击鼠标4次，日志文件中的错误将以高亮显示，并且可在源文件中看到错误位置的信号值。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:400
 #, no-c-format
-msgid ""
-"Fedora also ships <code>dinotrace-mode</code> for emacs as <package>emacs-"
-"dinotrace-mode</package>."
-msgstr ""
-"Fedora为emacs提供了<code>dinotrace-mode</code>做为<package>emacs-dinotrace-"
-"mode</package>。"
+msgid "Fedora also ships <code>dinotrace-mode</code> for emacs as <package>emacs-dinotrace-mode</package>."
+msgstr "Fedora为emacs提供了<code>dinotrace-mode</code>做为<package>emacs-dinotrace-mode</package>。"
 
 #. Tag: term
 #: ElectronicDesignAssistants.xml:409
@@ -2991,16 +2196,8 @@ msgstr "<primary>eqntott</primary>"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:414
 #, no-c-format
-msgid ""
-"<package>eqntott</package> converts Boolean logic expressions into a truth "
-"table that is useful for preparing input to espresso package for logic "
-"minimization, converting logic expressions into simpler forms, and for "
-"creating truth tables. <package>eqntott</package> is new for Fedora "
-"&PRODVER;."
-msgstr ""
-"<package>eqntott</package>将布尔逻辑表达式转换为真值表。这对 espresso 包为逻"
-"辑最小化准备输入数据，将逻辑表达式转换为简单形式以及创建真值表都有所帮助。"
-"<package>eqntott</package>是为Fedora &PRODVER;新增的工具。"
+msgid "<package>eqntott</package> converts Boolean logic expressions into a truth table that is useful for preparing input to espresso package for logic minimization, converting logic expressions into simpler forms, and for creating truth tables. <package>eqntott</package> is new for Fedora &PRODVER;."
+msgstr "<package>eqntott</package>将布尔逻辑表达式转换为真值表。这对 espresso 包为逻辑最小化准备输入数据，将逻辑表达式转换为简单形式以及创建真值表都有所帮助。<package>eqntott</package>是为Fedora &PRODVER;新增的工具。"
 
 #. Tag: term
 #: ElectronicDesignAssistants.xml:428
@@ -3017,15 +2214,8 @@ msgstr "<primary>expresso-ab</primary>"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:433
 #, no-c-format
-msgid ""
-"New for Fedora &PRODVER;, <package>espresso</package> takes as input a two-"
-"level representation of a two-valued (or multiplevalued) Boolean function, "
-"and produces a minimal equivalent representation. It is a boolean logic "
-"minimization tool."
-msgstr ""
-"<package>espresso</package>为Fedora &PRODVER;新增工具，takes as input a two-"
-"level representation of a two-valued (or multiplevalued) Boolean function, "
-"and produces a minimal equivalent representation。它是个布尔逻辑最小化工具。"
+msgid "New for Fedora &PRODVER;, <package>espresso</package> takes as input a two-level representation of a two-valued (or multiplevalued) Boolean function, and produces a minimal equivalent representation. It is a boolean logic minimization tool."
+msgstr "<package>espresso</package>为Fedora &PRODVER;新增工具，takes as input a two-level representation of a two-valued (or multiplevalued) Boolean function, and produces a minimal equivalent representation。它是个布尔逻辑最小化工具。"
 
 #. Tag: term
 #: ElectronicDesignAssistants.xml:445
@@ -3042,16 +2232,8 @@ msgstr "verilator"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:450
 #, no-c-format
-msgid ""
-"Verilator is the fastest free Verilog HDL simulator. It compiles "
-"synthesizable Verilog, plus some PSL, SystemVerilog and Synthesis assertions "
-"into C++ or SystemC code. It is designed for large projects where fast "
-"simulation performance is of primary concern, and is especially well suited "
-"to create executable models of CPUs for embedded software design teams."
-msgstr ""
-"Verilator是最快的免费Verilog HDL模拟器。它能够编译可合成的Verilog，向C++或"
-"SystemC代码中添加PSL，SystemVerilog及Synthesis判断。它的设计主要针对注重快速"
-"模拟性能的大项目，并能很好的用于为嵌入式软件设计团队创建CPU可执行模型。"
+msgid "Verilator is the fastest free Verilog HDL simulator. It compiles synthesizable Verilog, plus some PSL, SystemVerilog and Synthesis assertions into C++ or SystemC code. It is designed for large projects where fast simulation performance is of primary concern, and is especially well suited to create executable models of CPUs for embedded software design teams."
+msgstr "Verilator是最快的免费Verilog HDL模拟器。它能够编译可合成的Verilog，向C++或SystemC代码中添加PSL，SystemVerilog及Synthesis判断。它的设计主要针对注重快速模拟性能的大项目，并能很好的用于为嵌入式软件设计团队创建CPU可执行模型。"
 
 #. Tag: term
 #: ElectronicDesignAssistants.xml:464
@@ -3068,14 +2250,8 @@ msgstr "<primary>vrq</primary>"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:469
 #, no-c-format
-msgid ""
-"VRQ is modular verilog parser that supports plugin tools to process verilog. "
-"Multiple tools may be invoked in a pipeline fashion within a single "
-"execution of vrq. It is a generic front-end parser with support for plugin "
-"backend customizable tools."
-msgstr ""
-"VRQ是模块式的verilog分析器，它支持用插件工具处理verilog。通过执行vrq可以管道"
-"形式逐步调用多个工具。它是一个以自定义插件做后端的通用前端分析器。"
+msgid "VRQ is modular verilog parser that supports plugin tools to process verilog. Multiple tools may be invoked in a pipeline fashion within a single execution of vrq. It is a generic front-end parser with support for plugin backend customizable tools."
+msgstr "VRQ是模块式的verilog分析器，它支持用插件工具处理verilog。通过执行vrq可以管道形式逐步调用多个工具。它是一个以自定义插件做后端的通用前端分析器。"
 
 #. Tag: term
 #: ElectronicDesignAssistants.xml:481
@@ -3092,32 +2268,14 @@ msgstr "<primary>Alliance</primary>"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:486
 #, no-c-format
-msgid ""
-"Fedora Alliance CVS devel repository got its 100th patch in August 2009, "
-"with respect to stability on 64 architecture and we are happy that upstream "
-"has applied all our patches for alliance. We have also built this new "
-"release for all Fedora supported testing repositories and EPEL-5 testing "
-"repository. There is also a new GUI <package>xgra</package> coming with this "
-"new release which is a Graph viewer."
-msgstr ""
-"Fedora Alliance CVS开发仓库在2009年八月得到了它的第100个补丁，以解决在64位架"
-"构上的稳定性。我们为上游使用了全部补丁而感到高兴。同时我们为所有Fedora支持的"
-"测试仓库及EPEL-5测试仓库构建了这个新版本。本版本带来了一个全新的"
-"GUI<package>xgra</package>，它是个图形查看器。"
+msgid "Fedora Alliance CVS devel repository got its 100th patch in August 2009, with respect to stability on 64 architecture and we are happy that upstream has applied all our patches for alliance. We have also built this new release for all Fedora supported testing repositories and EPEL-5 testing repository. There is also a new GUI <package>xgra</package> coming with this new release which is a Graph viewer."
+msgstr "Fedora Alliance CVS开发仓库在2009年八月得到了它的第100个补丁，以解决在64位架构上的稳定性。我们为上游使用了全部补丁而感到高兴。同时我们为所有Fedora支持的测试仓库及EPEL-5测试仓库构建了这个新版本。本版本带来了一个全新的GUI<package>xgra</package>，它是个图形查看器。"
 
 #. Tag: para
 #: ElectronicDesignAssistants.xml:496
 #, no-c-format
-msgid ""
-"We will not replace Alliance VLSI by herb (which was supported to be a fork "
-"of alliance) on Fedora. Before F-11’s release, herb development was active "
-"but died out after F-11 was released. Since Alliance VLSI upstream is active "
-"and responsive to our wishes, there is currently no valid reason behind "
-"obsoleting alliance in favour of herb."
-msgstr ""
-"Fedora不会用herb（被认为是Alliance的一支）替代Alliance。在F-11发布之前herb的"
-"开发一直活跃，但是在F-11发布后却停止了。由于Alliance VLSI上游仍然活跃并且也反"
-"应出我们的意愿，因此目前没有理由用herb代替alliance。"
+msgid "We will not replace Alliance VLSI by herb (which was supported to be a fork of alliance) on Fedora. Before F-11’s release, herb development was active but died out after F-11 was released. Since Alliance VLSI upstream is active and responsive to our wishes, there is currently no valid reason behind obsoleting alliance in favour of herb."
+msgstr "Fedora不会用herb（被认为是Alliance的一支）替代Alliance。在F-11发布之前herb的开发一直活跃，但是在F-11发布后却停止了。由于Alliance VLSI上游仍然活跃并且也反应出我们的意愿，因此目前没有理由用herb代替alliance。"
 
 #. Tag: title
 #: ElectronicDesignAssistants.xml:512
@@ -3146,15 +2304,8 @@ msgstr "这是Fedora &PRODVER;的一个新软件包。"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:519
 #, no-c-format
-msgid ""
-"SystemPerl is a version of the SystemC language. It is designed to expand "
-"text so that needless repetition in the language is minimized. By using "
-"sp_preproc, SystemPerl files can be expanded into C++ files at compile time, "
-"or expanded in place to make them valid stand-alone SystemC files."
-msgstr ""
-"SystemPerl是SystemC语言的一个版本。它设计之初是为了扩展文本以最小化该语言中没"
-"有必要的重复。通过使用sp_preproc，SystemPerl文件可在编译时扩展成C++文件，或者"
-"在place中扩展使它们成为有效独立的SystemC文件。"
+msgid "SystemPerl is a version of the SystemC language. It is designed to expand text so that needless repetition in the language is minimized. By using sp_preproc, SystemPerl files can be expanded into C++ files at compile time, or expanded in place to make them valid stand-alone SystemC files."
+msgstr "SystemPerl是SystemC语言的一个版本。它设计之初是为了扩展文本以最小化该语言中没有必要的重复。通过使用sp_preproc，SystemPerl文件可在编译时扩展成C++文件，或者在place中扩展使它们成为有效独立的SystemC文件。"
 
 #. Tag: term
 #: ElectronicDesignAssistants.xml:529
@@ -3171,9 +2322,7 @@ msgstr "<primary>perl-Verilog-Perl</primary>"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:532
 #, no-c-format
-msgid ""
-"<package>perl-Verilog-Perl</package> has been updated to version 3.123. New "
-"features include:"
+msgid "<package>perl-Verilog-Perl</package> has been updated to version 3.123. New features include:"
 msgstr "<package>perl-Verilog-Perl</package>已更新到3.123。新特性包括："
 
 #. Tag: para
@@ -3203,11 +2352,8 @@ msgstr "修正了Perl 5.8.8的callbackgen编译错误。"
 #. Tag: para
 #: ElectronicDesignAssistants.xml:558
 #, no-c-format
-msgid ""
-"perl-Verilog-Perl obsoletes perl-Verilog. Fedora users are advised to tune "
-"their home-made Perl scripts accordingly."
-msgstr ""
-"perl-Verilog-Perl替代了perl-Verilog。建议Fedora用户据此调整自己写的Perl脚本。"
+msgid "perl-Verilog-Perl obsoletes perl-Verilog. Fedora users are advised to tune their home-made Perl scripts accordingly."
+msgstr "perl-Verilog-Perl替代了perl-Verilog。建议Fedora用户据此调整自己写的Perl脚本。"
 
 #. Tag: title
 #: Entertainment.xml:6
@@ -3218,14 +2364,8 @@ 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: primary
 #: Entertainment.xml:10
@@ -3242,13 +2382,8 @@ msgstr "wesnoth"
 #. Tag: para
 #: Entertainment.xml:13
 #, no-c-format
-msgid ""
-"Battle for Wesnoth has been updated to the new 1.6 release. Refer to the "
-"upstream site ( <ulink type=\"http\" url=\"http:www.wesnoth.org\"></"
-"ulink>ulink> )."
-msgstr ""
-"Battle for Wesnoth已更新到1.6版。请查看上游网站( <ulink type=\"http\" url="
-"\"http:www.wesnoth.org\"></ulink> )。"
+msgid "Battle for Wesnoth has been updated to the new 1.6 release. Refer to the upstream site ( <ulink type=\"http\" url=\"http:www.wesnoth.org\"></ulink>ulink> )."
+msgstr "Battle for Wesnoth已更新到1.6版。请查看上游网站( <ulink type=\"http\" url=\"http:www.wesnoth.org\"></ulink> )。"
 
 #. Tag: title
 #: Feedback.xml:6
@@ -3259,17 +2394,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. A list of commonly reported bugs and "
-"known issues for this release is available from <ulink type=\"http\" url="
-"\"http://fedoraproject.org/wiki/Common_F12_bugs\"></ulink>."
-msgstr ""
-"感谢您花时间向 Fedora 社区提出评论、推荐和错误报告。这样可以帮助我们提高 "
-"Fedora、Linux 以及全球自由软件的水平。<ulink type=\"http\" url=\"http://"
-"fedoraproject.org/wiki/Common_F12_bugs\"></ulink>列出了本发行版已报告的bug及"
-"已知问题。"
+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. A list of commonly reported bugs and known issues for this release is available from <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Common_F12_bugs\"></ulink>."
+msgstr "感谢您花时间向 Fedora 社区提出评论、推荐和错误报告。这样可以帮助我们提高 Fedora、Linux 以及全球自由软件的水平。<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Common_F12_bugs\"></ulink>列出了本发行版已报告的bug及已知问题。"
 
 #. Tag: title
 #: Feedback.xml:14
@@ -3280,35 +2406,20 @@ msgstr "反馈的其它方式"
 #. Tag: para
 #: Feedback.xml:15
 #, no-c-format
-msgid ""
-"You can learn more about the Bugzilla process at <ulink type=\"http\" url="
-"\"http://fedoraproject.org/wiki/Bugs_and_feature_requests\"></ulink>. "
-"However, if you are not comfortable leaving feedback through Bugzilla, you "
-"could also:"
-msgstr ""
-"您可在<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"Bugs_and_feature_requests\"></ulink>获取更多关于Bugzilla过程的信息。然而如果"
-"您不愿使用Bugzilla提交反馈，您也可以："
+msgid "You can learn more about the Bugzilla process at <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Bugs_and_feature_requests\"></ulink>. However, if you are not comfortable leaving feedback through Bugzilla, you could also:"
+msgstr "您可在<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Bugs_and_feature_requests\"></ulink>获取更多关于Bugzilla过程的信息。然而如果您不愿使用Bugzilla提交反馈，您也可以："
 
 #. Tag: para
 #: Feedback.xml:20
 #, no-c-format
-msgid ""
-"If you have a Fedora account, edit content directly at <ulink type=\"http\" "
-"url=\"http://fedoraproject.org/wiki/Documentation_Beats\"></ulink>."
-msgstr ""
-"如果您有 Fedora 帐户，请直接在 <ulink type=\"http\" url=\"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\"></ulink>."
+msgstr "如果您有 Fedora 帐户，请直接在 <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Documentation_Beats\"></ulink> 编辑内容。"
 
 #. Tag: para
 #: Feedback.xml:25
 #, no-c-format
-msgid ""
-"Email <ulink type=\"mailto\" url=\"mailto:relnotes at fedoraproject.org"
-"\">relnotes at fedoraproject.org</ulink>."
-msgstr ""
-"电子邮件<ulink type=\"mailto\" url=\"mailto:relnotes at fedoraproject.org"
-"\">relnotes at fedoraproject.org</ulink>。"
+msgid "Email <ulink type=\"mailto\" url=\"mailto:relnotes at fedoraproject.org\">relnotes at fedoraproject.org</ulink>."
+msgstr "电子邮件<ulink type=\"mailto\" url=\"mailto:relnotes at fedoraproject.org\">relnotes at fedoraproject.org</ulink>。"
 
 #. Tag: title
 #: FileServers.xml:6
@@ -3319,14 +2430,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: title
 #: FileSystems.xml:6
@@ -3337,14 +2442,8 @@ msgstr "文件系统"
 #. 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:10
@@ -3361,19 +2460,8 @@ msgstr "<primary>fusecompress</primary>"
 #. Tag: para
 #: FileSystems.xml:15
 #, no-c-format
-msgid ""
-"<package>Fusecompress</package> is a compressing filesystem mountable by "
-"unprivileged users. Fedora-11 had fusecompress-1.99.19. Fedora-12 updates to "
-"fusecompress-2.6. This fixes many very nasty bugs but changes the on-disk "
-"format. Users with fusecompress filesystems will need to migrate their data "
-"to the new format. Unless they decompress before upgrading, they will need "
-"the <package>fusecompress_offline1</package> package to do so."
-msgstr ""
-"<package>Fusecompress</package>是个无权限用户也可挂载的压缩文件系统。Fedora-"
-"11使用fusecompress-1.99.19。Fedora-12更新至fusecompress-2.6。不仅修复了很多非"
-"常讨厌的bug而且更改了磁盘上的格式。有fusecompress文件系统的用户需要将数据迁移"
-"至新格式。除非更新之前解压，否则需要<package>fusecompress_offline1</package>"
-"包来完成。"
+msgid "<package>Fusecompress</package> is a compressing filesystem mountable by unprivileged users. Fedora-11 had fusecompress-1.99.19. Fedora-12 updates to fusecompress-2.6. This fixes many very nasty bugs but changes the on-disk format. Users with fusecompress filesystems will need to migrate their data to the new format. Unless they decompress before upgrading, they will need the <package>fusecompress_offline1</package> package to do so."
+msgstr "<package>Fusecompress</package>是个无权限用户也可挂载的压缩文件系统。Fedora-11使用fusecompress-1.99.19。Fedora-12更新至fusecompress-2.6。不仅修复了很多非常讨厌的bug而且更改了磁盘上的格式。有fusecompress文件系统的用户需要将数据迁移至新格式。除非更新之前解压，否则需要<package>fusecompress_offline1</package>包来完成。"
 
 #. Tag: title
 #: FileSystems.xml:26
@@ -3384,13 +2472,8 @@ msgstr "您必须转换您的文件系统"
 #. Tag: para
 #: FileSystems.xml:27
 #, no-c-format
-msgid ""
-"If a user doesn't read these release notes and realize they need to upgrade "
-"the format, the first indication they'll have that something is wrong will "
-"probably be when they try to read a text file and it is binary:"
-msgstr ""
-"如果用户没有阅读这些发行注记并且他们意识到需要更新格式，他们出错后的第一表现"
-"很可能是当它们打算阅读文本文件时文件成了二进制："
+msgid "If a user doesn't read these release notes and realize they need to upgrade the format, the first indication they'll have that something is wrong will probably be when they try to read a text file and it is binary:"
+msgstr "如果用户没有阅读这些发行注记并且他们意识到需要更新格式，他们出错后的第一表现很可能是当它们打算阅读文本文件时文件成了二进制："
 
 #. Tag: screen
 #: FileSystems.xml:32
@@ -3405,29 +2488,16 @@ msgstr ""
 #. Tag: para
 #: FileSystems.xml:35
 #, no-c-format
-msgid ""
-"The basic method of updating their system is documented in a <filename>/usr/"
-"share/doc/fusecompress_offline1-%{version}/README.fedora</filename> file in "
-"the fusecompress1 package. The fusecompress package has a <filename>README."
-"fedora</filename> that tells the user to install "
-"<package>fusecompress_offline1</package> and read that file. The upgrade "
-"instructions are repeated below:"
-msgstr ""
-"更新文件系统的基本方法位于fusecompress1软件包的<filename>/usr/share/doc/"
-"fusecompress_offline1-%{version}/README.fedora</filename>文件内。fusecompress"
-"包中的<filename>README.fedora</filename>文件告诉用户安装"
-"<package>fusecompress_offline1</package>并阅读那个文件。更新说明重复如下："
+msgid "The basic method of updating their system is documented in a <filename>/usr/share/doc/fusecompress_offline1-%{version}/README.fedora</filename> file in the fusecompress1 package. The fusecompress package has a <filename>README.fedora</filename> that tells the user to install <package>fusecompress_offline1</package> and read that file. The upgrade instructions are repeated below:"
+msgstr "更新文件系统的基本方法位于fusecompress1软件包的<filename>/usr/share/doc/fusecompress_offline1-%{version}/README.fedora</filename>文件内。fusecompress包中的<filename>README.fedora</filename>文件告诉用户安装<package>fusecompress_offline1</package>并阅读那个文件。更新说明重复如下："
 
 #. Tag: screen
 #: FileSystems.xml:44
 #, no-c-format
 msgid ""
-"Let's say that in Fedora 11 your old fusecompress rootDir (where the files "
-"are\n"
-"actually stored) is in ~/.fusestorage and you mount it on ~/storage. Now "
-"you've\n"
-"updated to Fedora 12 and need to get your fusecompress filesystems updated "
-"to\n"
+"Let's say that in Fedora 11 your old fusecompress rootDir (where the files are\n"
+"actually stored) is in ~/.fusestorage and you mount it on ~/storage. Now you've\n"
+"updated to Fedora 12 and need to get your fusecompress filesystems updated to\n"
 "the new on-disk format.  Here's the basic steps::\n"
 "\n"
 "    # Make sure the old fusecompress filesystem is unmounted\n"
@@ -3436,8 +2506,7 @@ msgid ""
 "    mv ~/.fusestorage ~/.fusestorage.old\n"
 "    # Create a new directory for our new format data\n"
 "    mkdir ~/.fusestorage\n"
-"    # Mount the new directory.  It's now a new format fusecompress "
-"filesystem\n"
+"    # Mount the new directory.  It's now a new format fusecompress filesystem\n"
 "    fusecompress ~/.fusestorage ~/storage\n"
 "    # Decompress all the files in the old fusecompress data directory\n"
 "    fusecompress_offline1 ~/.fusestorage.old\n"
@@ -3447,11 +2516,9 @@ msgid ""
 "    mv .fusestorage.old/.?* ~/storage\n"
 "\n"
 "Note that to use this exact procedure you need to have enough disk space to\n"
-"uncompress all of the files stored in ~/.fusestorage.old.  If you don't "
-"have\n"
+"uncompress all of the files stored in ~/.fusestorage.old.  If you don't have\n"
 "that much space, you'll have to run fusecompress_offline1 on portions of\n"
-"~/.fusestorage.old and move them to ~/storage where they'll be "
-"recompressed,\n"
+"~/.fusestorage.old and move them to ~/storage where they'll be recompressed,\n"
 "freeing up the space for you to run fusecompress_offline1 on more files."
 msgstr ""
 "假设Fedora 11中您的旧fusecompress根目录（文件实际\n"
@@ -3489,14 +2556,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
@@ -3507,13 +2568,8 @@ msgstr "最低的可能总是不够"
 #. Tag: para
 #: HardwareOverview.xml:10
 #, no-c-format
-msgid ""
-"The minimum memory listed below may not be sufficient for all situations. In "
-"particular, installation in a virtual machine may require memory closer to "
-"the \"Recommended\" value."
-msgstr ""
-"以下列出的最低内存要求在针对所有情形时可能会不够。特别是在虚拟机中安装时，内"
-"存要求接近\"推荐\"值。 "
+msgid "The minimum memory listed below may not be sufficient for all situations. In particular, installation in a virtual machine may require memory closer to the \"Recommended\" value."
+msgstr "以下列出的最低内存要求在针对所有情形时可能会不够。特别是在虚拟机中安装时，内存要求接近\"推荐\"值。 "
 
 #. Tag: title
 #: HardwareOverview.xml:18
@@ -3530,16 +2586,8 @@ msgstr "最小 CPU：PowerPC G3 / POWER3"
 #. Tag: para
 #: HardwareOverview.xml:26
 #, no-c-format
-msgid ""
-"Fedora &PRODVER; 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 &PRODVER;支持 Apple 在 1999年左右及其后发布的“新生代”Power Macintosh。"
-"虽然原则上讲，“旧生代”主机也可正常工作，但其所需特殊的引导安装程序没有包括在"
-"本 Fedora 发行版中。Fedora 还在 POWER5 和 POWER6的计算机上进行了安装和测试。"
+msgid "Fedora &PRODVER; 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 &PRODVER;支持 Apple 在 1999年左右及其后发布的“新生代”Power Macintosh。虽然原则上讲，“旧生代”主机也可正常工作，但其所需特殊的引导安装程序没有包括在本 Fedora 发行版中。Fedora 还在 POWER5 和 POWER6的计算机上进行了安装和测试。"
 
 #. Tag: para
 #: HardwareOverview.xml:36
@@ -3550,27 +2598,19 @@ msgstr "Fedora &PRODVER;支持 pSeries 和 Cell 宽带引擎机。"
 #. Tag: para
 #: HardwareOverview.xml:42
 #, no-c-format
-msgid ""
-"Fedora &PRODVER; also supports the Sony PlayStation 3 and Genesi Pegasos II "
-"and Efika."
-msgstr ""
-"Fedora &PRODVER;还支持 Sony 的 PlayStation 3 和 Genesi Pegasos II 以及 "
-"Efika。"
+msgid "Fedora &PRODVER; also supports the Sony PlayStation 3 and Genesi Pegasos II and Efika."
+msgstr "Fedora &PRODVER;还支持 Sony 的 PlayStation 3 和 Genesi Pegasos II 以及 Efika。"
 
 #. Tag: para
 #: HardwareOverview.xml:48
 #, no-c-format
-msgid ""
-"Fedora &PRODVER; includes new hardware support for the P.A. Semiconductor "
-"'Electra' machines."
+msgid "Fedora &PRODVER; includes new hardware support for the P.A. Semiconductor 'Electra' machines."
 msgstr "Fedora &PRODVER;集成了对 P.A. 半导体“Electra” 机器的新硬件支持。"
 
 #. Tag: para
 #: HardwareOverview.xml:54
 #, no-c-format
-msgid ""
-"Fedora &PRODVER; also includes support for Terrasoft Solutions powerstation "
-"workstations."
+msgid "Fedora &PRODVER; also includes support for Terrasoft Solutions powerstation workstations."
 msgstr "Fedora &PRODVER;还集成了对 Terrasoft 解决方案电源工作站的支持。"
 
 #. Tag: para
@@ -3594,16 +2634,8 @@ msgstr "x86 构架的处理器和内存要求"
 #. Tag: para
 #: HardwareOverview.xml:74
 #, 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 &PRODVER; requires an Intel Pentium Pro or better processor, "
-"and is optimized for i686 and later processors."
-msgstr ""
-"下列 CPU规格采用 Intel 处理器型号来说明。Fedora 也可运行于其它处理器厂商 (包"
-"括 AMD, Cyrix 和 VIA ) 的兼容产品上。Fedora &PRODVER;要求Intel Pentium Pro级"
-"别或更好级别的处理器，并为i686及其后续处理器进行了优化。"
+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 &PRODVER; requires an Intel Pentium Pro or better processor, and is optimized for i686 and later processors."
+msgstr "下列 CPU规格采用 Intel 处理器型号来说明。Fedora 也可运行于其它处理器厂商 (包括 AMD, Cyrix 和 VIA ) 的兼容产品上。Fedora &PRODVER;要求Intel Pentium Pro级别或更好级别的处理器，并为i686及其后续处理器进行了优化。"
 
 #. Tag: para
 #: HardwareOverview.xml:83
@@ -3668,40 +2700,20 @@ msgstr "所有构架的硬盘空间要求"
 #. Tag: para
 #: HardwareOverview.xml:136
 #, 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:145
 #, 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:150
 #, 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
@@ -3776,7 +2788,9 @@ msgid "<primary>Chinese</primary>"
 msgstr "<primary>中文</primary>"
 
 #. Tag: secondary
-#: I18n.xml:40 I18n.xml:44 I18n.xml:48
+#: I18n.xml:40
+#: I18n.xml:44
+#: I18n.xml:48
 #, no-c-format
 msgid "Language"
 msgstr "语言"
@@ -3802,9 +2816,7 @@ msgstr "<title>iBus</title>"
 #. Tag: para
 #: I18n.xml:53
 #, no-c-format
-msgid ""
-"<package>iBus</package> has undergone further development and improvements, "
-"such as:"
+msgid "<package>iBus</package> has undergone further development and improvements, such as:"
 msgstr "<package>iBus</package>经过了个更多的开发和改进，比如："
 
 #. Tag: para
@@ -3816,12 +2828,8 @@ msgstr "针对Qt4的本土输入法模块（<package>ibus-qt</package>）。"
 #. Tag: para
 #: I18n.xml:64
 #, no-c-format
-msgid ""
-"Key layout support for input method developers. It also enables non-US-"
-"QWERTY users to use input methods that were designed only for US-QWERTY."
-msgstr ""
-"针对输入法开发人员的键盘布局支持。同时也让非-US-QWERTY键盘用户能够使用只为US-"
-"QWERTY键盘设计的输入法。"
+msgid "Key layout support for input method developers. It also enables non-US-QWERTY users to use input methods that were designed only for US-QWERTY."
+msgstr "针对输入法开发人员的键盘布局支持。同时也让非-US-QWERTY键盘用户能够使用只为US-QWERTY键盘设计的输入法。"
 
 #. Tag: title
 #: I18n.xml:75
@@ -3844,11 +2852,8 @@ msgstr "<title>印地语</title>"
 #. Tag: para
 #: I18n.xml:84
 #, no-c-format
-msgid ""
-"Lohit fonts have been split to subpackages for every supported script. Lohit "
-"fonts are now Unicode 5.1 compatible."
-msgstr ""
-"Lohit字体为每种支持的文字分装为单个软件包。Lohit字体现在兼容Unicode 5.1。"
+msgid "Lohit fonts have been split to subpackages for every supported script. Lohit fonts are now Unicode 5.1 compatible."
+msgstr "Lohit字体为每种支持的文字分装为单个软件包。Lohit字体现在兼容Unicode 5.1。"
 
 #. Tag: title
 #: I18n.xml:91
@@ -3859,15 +2864,8 @@ msgstr "<title>日语</title>"
 #. Tag: para
 #: I18n.xml:92
 #, no-c-format
-msgid ""
-"IPA fonts have been added to provide good quality fonts with cover of "
-"JIS2004. Installation of <package>ipa-gothic-fonts</package>, <package>ipa-"
-"pgothic-fonts</package>, ipa-mincho-fonts and <package>ipa-pmincho-fonts</"
-"package> packages is recommended to get JIS2004 features on Fedora."
-msgstr ""
-"加入了IPA字体以在JIS2004下的显示高质量的字体。要在Fedora下使用JIS2004的功能，"
-"建议安装<package>ipa-gothic-fonts</package>、<package>ipa-pgothic-fonts</"
-"package>、ipa-mincho-fonts和<package>ipa-pmincho-fonts</package>软件包。"
+msgid "IPA fonts have been added to provide good quality fonts with cover of JIS2004. Installation of <package>ipa-gothic-fonts</package>, <package>ipa-pgothic-fonts</package>, ipa-mincho-fonts and <package>ipa-pmincho-fonts</package> packages is recommended to get JIS2004 features on Fedora."
+msgstr "加入了IPA字体以在JIS2004下的显示高质量的字体。要在Fedora下使用JIS2004的功能，建议安装<package>ipa-gothic-fonts</package>、<package>ipa-pgothic-fonts</package>、ipa-mincho-fonts和<package>ipa-pmincho-fonts</package>软件包。"
 
 #. Tag: title
 #: Installer.xml:6
@@ -3878,49 +2876,20 @@ msgstr "安装注记"
 #. Tag: remark
 #: Installer.xml:7
 #, 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:10
 #, no-c-format
-msgid ""
-"To learn how to install Fedora, refer to either the <citetitle>Fedora "
-"Installation Quick Start Guide</citetitle> available from <ulink url="
-"\"http://docs.fedoraproject.org/installation-quick-start-guide/\"></ulink> "
-"or the <citetitle>Fedora Installation Guide</citetitle> available from "
-"<ulink type=\"http\" url=\"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 ""
-"要了解如何安装Fedora，引用<ulink url=\"http://docs.fedoraproject.org/"
-"installation-quick-start-guide/\"></ulink>的<citetitle>Fedora安装入门指南</"
-"citetitle>或者<ulink type=\"http\" url=\"http://docs.fedoraproject.org/"
-"install-guide/\"></ulink>的<citetitle>Fedora安装指南</citetitle>。如果您在安"
-"装时遇到了本发行注记中未涉及的问题，请引用 <ulink type=\"http\" url=\"http://"
-"www.fedoraproject.org/wiki/FAQ\"> http://www.fedoraproject.org/wiki/FAQ</"
-"ulink>和<ulink type=\"http\" url=\"http://www.fedoraproject.org/wiki/Bugs/"
-"Common\"> http://www.fedoraproject.org/wiki/Bugs/Common</ulink>。"
+msgid "To learn how to install Fedora, refer to either the <citetitle>Fedora Installation Quick Start Guide</citetitle> available from <ulink url=\"http://docs.fedoraproject.org/installation-quick-start-guide/\"></ulink> or the <citetitle>Fedora Installation Guide</citetitle> available from <ulink type=\"http\" url=\"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 "要了解如何安装Fedora，引用<ulink url=\"http://docs.fedoraproject.org/installation-quick-start-guide/\"></ulink>的<citetitle>Fedora安装入门指南</citetitle>或者<ulink type=\"http\" url=\"http://docs.fedoraproject.org/install-guide/\"></ulink>的<citetitle>Fedora安装指南</citetitle>。如果您在安装时遇到了本发行注记中未涉及的问题，请引用 <ulink type=\"http\" url=\"http://www.fedoraproject.org/wiki/FAQ\"> http://www.fedoraproject.org/wiki/FAQ</ulink>和<ulink type=\"http\" url=\"http://www.fedoraproject.org/wiki/Bugs/Common\"> http://www.fedoraproject.org/wiki/Bugs/Common</ulink>。"
 
 #. Tag: para
 #: Installer.xml:12
 #, 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 &PRODVER;."
-msgstr ""
-"<application>Anaconda</application> 是 Fedora 安装程序的名称。这部分概括了与 "
-"<application>Anaconda</application> 和Fedora &PRODVER; 安装相关的问题。"
+msgid "<application>Anaconda</application> is the name of the Fedora installer. This section outlines issues related to <application>anaconda</application> and installing Fedora &PRODVER;."
+msgstr "<application>Anaconda</application> 是 Fedora 安装程序的名称。这部分概括了与 <application>Anaconda</application> 和Fedora &PRODVER; 安装相关的问题。"
 
 #. Tag: title
 #: Installer.xml:17
@@ -3931,18 +2900,8 @@ msgstr "针对boot分区的Ext4"
 #. Tag: para
 #: Installer.xml:18
 #, no-c-format
-msgid ""
-"Although ext4 was the default file system in Fedora 11, the version of "
-"the GRUB bootloader included with Fedora 11 could not read ext4 "
-"partitions. Fedora 11 therefore required a separate ext3 boot "
-"partition. The version of GRUB included in Fedora 12 now supports ext4, "
-"so <application>anaconda</application> now allows you to place <filename>/"
-"boot</filename> on an ext4 partition."
-msgstr ""
-"尽管在Fedora 11中就采用ext4做为默认文件系统，但是Fedora 11中的GRUB"
-"无法读取ext4分区。因此Fedora 11需要一个独立的ext3格式的boot分区。"
-"Fedora 12中的GRUB支持ext4，因此<application>anaconda</application>允许您"
-"将<filename>/boot</filename>设置为ext4分区。"
+msgid "Although ext4 was the default file system in Fedora 11, the version of the GRUB bootloader included with Fedora 11 could not read ext4 partitions. Fedora 11 therefore required a separate ext3 boot partition. The version of GRUB included in Fedora 12 now supports ext4, so <application>anaconda</application> now allows you to place <filename>/boot</filename> on an ext4 partition."
+msgstr "尽管在Fedora 11中就采用ext4做为默认文件系统，但是Fedora 11中的GRUB无法读取ext4分区。因此Fedora 11需要一个独立的ext3格式的boot分区。Fedora 12中的GRUB支持ext4，因此<application>anaconda</application>允许您将<filename>/boot</filename>设置为ext4分区。"
 
 #. Tag: title
 #: Kernel.xml:6
@@ -3953,21 +2912,13 @@ msgstr "Linux 核心"
 #. 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:8
 #, no-c-format
-msgid ""
-"This section covers changes and important information regarding the 2.6.29 "
-"based kernel in Fedora &PRODVER;."
+msgid "This section covers changes and important information regarding the 2.6.29 based kernel in Fedora &PRODVER;."
 msgstr "这部分介绍了Fedora &PRODVER;中基于2.6.29内核的改动和重要信息。"
 
 #. Tag: title
@@ -3979,19 +2930,12 @@ msgstr "报告 Bug"
 #. Tag: para
 #: Kernel.xml:16
 #, 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:39
+#: Legal.xml:6
+#: Legal.xml:39
 #, no-c-format
 msgid "Legal Information"
 msgstr "法律信息"
@@ -4011,22 +2955,8 @@ 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>"
-msgstr ""
-" 每个发行版都包含了Fedora License Agreement。参考版本位于Fedora Project网站："
-"<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 " 每个发行版都包含了Fedora License Agreement。参考版本位于Fedora Project网站：<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>"
 
 #. Tag: title
 #: Legal.xml:18
@@ -4037,17 +2967,8 @@ msgstr "商标"
 #. Tag: para
 #: Legal.xml:19
 #, 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."
-msgstr ""
-"‘Fedora’和 Fedora 图像是RedHat公司商标，并遵从Fedora商标指导条例：<ulink "
-"type=\"http\" url=\"http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"
-"\">http://fedoraproject.org/wiki/Legal/TrademarkGuidelines</ulink>所有的其它"
-"商标有各自属主持有。"
+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 "‘Fedora’和 Fedora 图像是RedHat公司商标，并遵从Fedora商标指导条例：<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Legal/TrademarkGuidelines\">http://fedoraproject.org/wiki/Legal/TrademarkGuidelines</ulink>所有的其它商标有各自属主持有。"
 
 #. Tag: title
 #: Legal.xml:25
@@ -4058,18 +2979,8 @@ msgstr "外部引用"
 #. Tag: para
 #: Legal.xml:26
 #, 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:32
@@ -4080,28 +2991,14 @@ msgstr "导出"
 #. Tag: para
 #: Legal.xml:33
 #, 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:40
 #, 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 ""
-"以下法律信息涉及了Fedora中的一些软件。部分版权所有 Copyright © 2002-"
-"2007 Charlie Poole，或者版权所有 Copyright © 2002-2004 James W. "
-"Newkirk, Michael C. Two, Alexei A. Vorontsov，或者版权所有 Copyright © "
-"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 "以下法律信息涉及了Fedora中的一些软件。部分版权所有 Copyright © 2002-2007 Charlie Poole，或者版权所有 Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov，或者版权所有 Copyright © 2000-2002 Philip A. Craig"
 
 #. Tag: title
 #: Legal.xml:46
@@ -4112,15 +3009,8 @@ msgstr "更多详情"
 #. Tag: para
 #: Legal.xml:47
 #, 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>"
-msgstr ""
-"这个文件中附加法律信息和 Fedora 项目发行本请引用 Fedora 项目网页：<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 项目网页：<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Legal \">http://fedoraproject.org/wiki/Legal </ulink>"
 
 #. Tag: title
 #: Live.xml:6
@@ -4131,47 +3021,26 @@ 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:8
 #, 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."
-msgstr ""
-"<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Games_Spin\">Games "
-"Spin</ulink> 提供了一个包含众多游戏的Live DVD。"
+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 "<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Games_Spin\">Games Spin</ulink> 提供了一个包含众多游戏的Live DVD。"
 
 #. Tag: para
 #: Live.xml:11
 #, 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."
-msgstr ""
-"对电子设计师，<ulink type=\"http\" url=\"http://chitlesh.fedorapeople.org/"
-"FEL/\">Fedora电子实验室（FEL）</ulink>预备了完整的IC芯片设计工具链"
+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 "对电子设计师，<ulink type=\"http\" url=\"http://chitlesh.fedorapeople.org/FEL/\">Fedora电子实验室（FEL）</ulink>预备了完整的IC芯片设计工具链"
 
 #. Tag: para
 #: Live.xml:14
 #, 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."
-msgstr ""
-"Fedora Spins SIG（<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"SIGs/Spins\">http://fedoraproject.org/wiki/SIGs/Spins</ulink>）一直在针对不同"
-"目的开发特定的Live镜像。"
+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 "Fedora Spins SIG（<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/SIGs/Spins\">http://fedoraproject.org/wiki/SIGs/Spins</ulink>）一直在针对不同目的开发特定的Live镜像。"
 
 #. Tag: title
 #: MailServers.xml:6
@@ -4182,14 +3051,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: title
 #: Multimedia.xml:6
@@ -4200,14 +3063,8 @@ msgstr "<title>多媒体</title>"
 #. 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: primary
 #: Multimedia.xml:10
@@ -4230,26 +3087,8 @@ msgstr "<primary>Thusnelda</primary>"
 #. Tag: para
 #: Multimedia.xml:22
 #, no-c-format
-msgid ""
-"In support of free culture, the open web, and to reduce the hold of "
-"proprietary and patent-encumbered codecs, Red Hat has been sponsoring "
-"improvements on the open Ogg Theora video codec implementation codenamed "
-"<application>Thusnelda</application> via Christopher Montgomery (xiphmont), "
-"who created the format and work has resulted in drastic improvements to the "
-"codec. This release features this next generation codec, compared to "
-"<application>libtheora 1.0</application>, the new encoder can produce "
-"comparable quality encodings at a lower bitrate, or better quality at the "
-"same bitrate. All applications using <application>libtheora</application> "
-"library including all the <application>GStreamer</application> applications "
-"will automatically and transparently be taking advantage of the improvements."
-msgstr ""
-"在自由开放的网络支持下，以及为了减少专利解码器的持有量，红帽公司一直支持着由"
-"Christopher Montgomery（xiphmont）开发代号为<application>Thusnelda</"
-"application>的开放Ogg Theora视频解码器的改进工作，并且已经对编码器做出了大幅"
-"改进。本发行版使用了这个下一代编码器，与<application>libtheora 1.0</"
-"application>相比，新编码器能够以更低的比特率生成相同质量的文件，或者以相同比"
-"特率生成更高质量的文件。包括<application>GStreamer</application>在内所有使用"
-"<application>libtheora</application>的程序将自动并透明地利用此项改进："
+msgid "In support of free culture, the open web, and to reduce the hold of proprietary and patent-encumbered codecs, Red Hat has been sponsoring improvements on the open Ogg Theora video codec implementation codenamed <application>Thusnelda</application> via Christopher Montgomery (xiphmont), who created the format and work has resulted in drastic improvements to the codec. This release features this next generation codec, compared to <application>libtheora 1.0</application>, the new encoder can produce comparable quality encodings at a lower bitrate, or better quality at the same bitrate. All applications using <application>libtheora</application> library including all the <application>GStreamer</application> applications will automatically and transparently be taking advantage of the improvements."
+msgstr "在自由开放的网络支持下，以及为了减少专利解码器的持有量，红帽公司一直支持着由Christopher Montgomery（xiphmont）开发代号为<application>Thusnelda</application>的开放Ogg Theora视频解码器的改进工作，并且已经对编码器做出了大幅改进。本发行版使用了这个下一代编码器，与<application>libtheora 1.0</application>相比，新编码器能够以更低的比特率生成相同质量的文件，或者以相同比特率生成更高质量的文件。包括<application>GStreamer</application>在内所有使用<application>libtheora</application>的程序将自动并透明地利用此项改进："
 
 #. Tag: term
 #: Multimedia.xml:41
@@ -4266,15 +3105,8 @@ msgstr "pulseaudio"
 #. Tag: para
 #: Multimedia.xml:46
 #, no-c-format
-msgid ""
-"Fedora developers have been made several improvements to the "
-"<application>PulseAudio</application> system. More details are available "
-"from <ulink url=\"http://0pointer.de/blog/projects/oh-nine-sixteen.html\"></"
-"ulink>. These include the following:"
-msgstr ""
-"Fedora开发人员对<application>PulseAudio</application>进行了一些改进。更多详情"
-"请参考<ulink url=\"http://0pointer.de/blog/projects/oh-nine-sixteen.html\"></"
-"ulink>。这些改进包括："
+msgid "Fedora developers have been made several improvements to the <application>PulseAudio</application> system. More details are available from <ulink url=\"http://0pointer.de/blog/projects/oh-nine-sixteen.html\"></ulink>. These include the following:"
+msgstr "Fedora开发人员对<application>PulseAudio</application>进行了一些改进。更多详情请参考<ulink url=\"http://0pointer.de/blog/projects/oh-nine-sixteen.html\"></ulink>。这些改进包括："
 
 #. Tag: para
 #: Multimedia.xml:51
@@ -4315,16 +3147,8 @@ msgstr "<primary>Fedora Studio</primary>"
 #. Tag: para
 #: Multimedia.xml:67
 #, no-c-format
-msgid ""
-"<application>Fedora Studio</application> is an optional multimedia menus "
-"package that allows users to have their audio and video applications "
-"classified in their desktop menu. In previous versions of Fedora, all "
-"multimedia applications were in one large group. This package makes it "
-"easier for users to navigate audio and video applications."
-msgstr ""
-"<application>Fedora Studio</application>为可选的多媒体菜单程序，它可将用户桌"
-"面菜单中的音频及视频程序分类。上一版的Fedora中，所有多媒体程序都在一个大组"
-"中。这个程序可让用户方便的寻找音频和视频程序。"
+msgid "<application>Fedora Studio</application> is an optional multimedia menus package that allows users to have their audio and video applications classified in their desktop menu. In previous versions of Fedora, all multimedia applications were in one large group. This package makes it easier for users to navigate audio and video applications."
+msgstr "<application>Fedora Studio</application>为可选的多媒体菜单程序，它可将用户桌面菜单中的音频及视频程序分类。上一版的Fedora中，所有多媒体程序都在一个大组中。这个程序可让用户方便的寻找音频和视频程序。"
 
 #. Tag: title
 #: Networking.xml:6
@@ -4335,24 +3159,14 @@ 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: title
 #: Networking.xml:10
 #, no-c-format
-msgid ""
-"<application>NetworkManager</application> with system-wide connections and "
-"enhanced support for mobile broadband"
-msgstr ""
-"<application>NetworkManager</application>提供了系统范围的连接以及增强了对移动"
-"宽带的支持"
+msgid "<application>NetworkManager</application> with system-wide connections and enhanced support for mobile broadband"
+msgstr "<application>NetworkManager</application>提供了系统范围的连接以及增强了对移动宽带的支持"
 
 #. Tag: primary
 #: Networking.xml:14
@@ -4363,26 +3177,8 @@ msgstr "NetworkManager"
 #. Tag: para
 #: Networking.xml:14
 #, no-c-format
-msgid ""
-"<application>NetworkManager</application> can now create and edit system-"
-"wide network connections in <filename>/etc/sysconfig</filename>. "
-"<application>NetworkManager</application> has been able to read information "
-"about system-wide network connections from <filename>/etc/sysconfig</"
-"filename> for a while. Now we have enabled full read-write support for "
-"system connections. The ability to create or modify new system connections "
-"will be controlled by <application>PolicyKit</application> policies. "
-"Initially, only wired and wireless connections will be supported. Later on, "
-"vpn connections will follow. For connections that require secrets, those "
-"will be stored in <filename>.keys</filename> files in <filename>/etc/"
-"sysconfig</filename>."
-msgstr ""
-"<application>NetworkManager</application>如今可在<filename>/etc/sysconfig</"
-"filename>中创建并编辑全局的网络连接。<application>NetworkManager</"
-"application>能够从<filename>/etc/sysconfig</filename>中读取全局的网络连接信息"
-"已经有段时间了。现在则支持对全局网络连接完全的读写。这个创建并修改连接的功能"
-"由<application>PolicyKit</application>控制。开始只支持有线和无线连接。稍后会"
-"支持vpn连接。对于需要加密的连接，会被存储到<filename>/etc/sysconfig</"
-"filename>目录下的<filename>.keys</filename>文件中。"
+msgid "<application>NetworkManager</application> can now create and edit system-wide network connections in <filename>/etc/sysconfig</filename>. <application>NetworkManager</application> has been able to read information about system-wide network connections from <filename>/etc/sysconfig</filename> for a while. Now we have enabled full read-write support for system connections. The ability to create or modify new system connections will be controlled by <application>PolicyKit</application> policies. Initially, only wired and wireless connections will be supported. Later on, vpn connections will follow. For connections that require secrets, those will be stored in <filename>.keys</filename> files in <filename>/etc/sysconfig</filename>."
+msgstr "<application>NetworkManager</application>如今可在<filename>/etc/sysconfig</filename>中创建并编辑全局的网络连接。<application>NetworkManager</application>能够从<filename>/etc/sysconfig</filename>中读取全局的网络连接信息已经有段时间了。现在则支持对全局网络连接完全的读写。这个创建并修改连接的功能由<application>PolicyKit</application>控制。开始只支持有线和无线连接。稍后会支持vpn连接。对于需要加密的连接，会被存储到<filename>/etc/sysconfig</filename>目录下的<filename>.keys</filename>文件中。"
 
 #. Tag: primary
 #: Networking.xml:21
@@ -4399,18 +3195,8 @@ msgstr "移动-宽带-供应商-信息"
 #. Tag: para
 #: Networking.xml:24
 #, no-c-format
-msgid ""
-"By providing a database of preconfigured mobile broadband providers, "
-"supporting more hardware, and permitting scanning of GSM networks, "
-"<application>NetworkManager</application> makes the use of mobile broadband "
-"much easier. Your broadband provider will be automatically recognized by "
-"<application>NetworkManager</application> and it will make it easy to just "
-"plug it your USB device and get you online within minutes."
-msgstr ""
-"通过提供预先配置的移动宽带服务商数据库，支持更多地硬件以及允许GSM网络扫描，"
-"<application>NetworkManager</application>使得移动宽带的使用更加容易。"
-"<application>NetworkManager</application>将自动识别您的移动宽带服务商，只需插"
-"上您的USB设备，几分钟内便可以上网。"
+msgid "By providing a database of preconfigured mobile broadband providers, supporting more hardware, and permitting scanning of GSM networks, <application>NetworkManager</application> makes the use of mobile broadband much easier. Your broadband provider will be automatically recognized by <application>NetworkManager</application> and it will make it easy to just plug it your USB device and get you online within minutes."
+msgstr "通过提供预先配置的移动宽带服务商数据库，支持更多地硬件以及允许GSM网络扫描，<application>NetworkManager</application>使得移动宽带的使用更加容易。<application>NetworkManager</application>将自动识别您的移动宽带服务商，只需插上您的USB设备，几分钟内便可以上网。"
 
 #. Tag: title
 #: Networking.xml:32
@@ -4433,33 +3219,14 @@ msgstr "ifcfg"
 #. Tag: para
 #: Networking.xml:39
 #, no-c-format
-msgid ""
-"For non-GUI users, and those that use <filename>ifcfg</filename> files "
-"directly, <application>NetworkManager</application> should bring up the "
-"interface with IPv6 connectivity correctly at boot. No modification of the "
-"<filename>ifcfg</filename> files should be necessary."
-msgstr ""
-"对非GUI用户以及直接使用<filename>ifcfg</filename>文件的用户来说，"
-"<application>NetworkManager</application>可在系统启动时开启正确配置的IPV6连"
-"接。并不需要修改<filename>ifcfg</filename>文件。"
+msgid "For non-GUI users, and those that use <filename>ifcfg</filename> files directly, <application>NetworkManager</application> should bring up the interface with IPv6 connectivity correctly at boot. No modification of the <filename>ifcfg</filename> files should be necessary."
+msgstr "对非GUI用户以及直接使用<filename>ifcfg</filename>文件的用户来说，<application>NetworkManager</application>可在系统启动时开启正确配置的IPV6连接。并不需要修改<filename>ifcfg</filename>文件。"
 
 #. Tag: para
 #: Networking.xml:44
 #, no-c-format
-msgid ""
-"For GUI users, a new IPv6 tab will appear in the connection editor which "
-"will allow for control if the IPv6 settings similar to control of IPv4 "
-"settings already. After selecting the configuration method (<literal>auto</"
-"literal> is the default, which will honor router-advertisements and attempt "
-"to retrieve DNS information with DHCPv6 information-only mode) and entering "
-"any additional settings they may wish to use, then saving the connection, "
-"activating that connection should configure the interface fully with IPv6 as "
-"requested by the user."
-msgstr ""
-"对于GUI用户来说，连接编辑器中将配有新的IPv6标签，如果此IPv6设置与IPv4设置相似"
-"时可允许控制Pv6设置。选择配置方法（默认为<literal>auto</literal>，将以路由-"
-"advertisements，试图以DHCPv6信息只读模式解析DNS信息。）并输入所需的额外设置"
-"后，保存此连接并激活，将会按用户要求为该连接配置完整的IPv6。"
+msgid "For GUI users, a new IPv6 tab will appear in the connection editor which will allow for control if the IPv6 settings similar to control of IPv4 settings already. After selecting the configuration method (<literal>auto</literal> is the default, which will honor router-advertisements and attempt to retrieve DNS information with DHCPv6 information-only mode) and entering any additional settings they may wish to use, then saving the connection, activating that connection should configure the interface fully with IPv6 as requested by the user."
+msgstr "对于GUI用户来说，连接编辑器中将配有新的IPv6标签，如果此IPv6设置与IPv4设置相似时可允许控制Pv6设置。选择配置方法（默认为<literal>auto</literal>，将以路由-advertisements，试图以DHCPv6信息只读模式解析DNS信息。）并输入所需的额外设置后，保存此连接并激活，将会按用户要求为该连接配置完整的IPv6。"
 
 #. Tag: title
 #: Networking.xml:50
@@ -4480,7 +3247,9 @@ msgid "netcf"
 msgstr "netcf"
 
 #. Tag: primary
-#: Networking.xml:60 Virtualization.xml:16 Virtualization.xml:223
+#: Networking.xml:60
+#: Virtualization.xml:16
+#: Virtualization.xml:223
 #, no-c-format
 msgid "libvirt"
 msgstr "libvirt"
@@ -4488,86 +3257,32 @@ msgstr "libvirt"
 #. Tag: para
 #: Networking.xml:60
 #, no-c-format
-msgid ""
-"Configuring the network interfaces on a machine for moderately complicated "
-"yet common scenarios is generally only accessible to advanced users, and "
-"very poorly supported by existing tools. Such scenarios include creating a "
-"bridge and enslaving a physical NIC to it, or bonding two NICs, adding a "
-"VLAN interface to the bond and enslaving that to a bridge."
-msgstr ""
-"通常只有高级用户才能在一台计算机上配置一个中度复杂但又较常见的网络连接，并且"
-"已有的工具支持都较差。这些网络连接包括桥接，并为它指定一个从属网卡或者为它绑"
-"定两个网卡，以及向此网桥的从属网卡及绑定网卡添加虚拟局域网连接。"
+msgid "Configuring the network interfaces on a machine for moderately complicated yet common scenarios is generally only accessible to advanced users, and very poorly supported by existing tools. Such scenarios include creating a bridge and enslaving a physical NIC to it, or bonding two NICs, adding a VLAN interface to the bond and enslaving that to a bridge."
+msgstr "通常只有高级用户才能在一台计算机上配置一个中度复杂但又较常见的网络连接，并且已有的工具支持都较差。这些网络连接包括桥接，并为它指定一个从属网卡或者为它绑定两个网卡，以及向此网桥的从属网卡及绑定网卡添加虚拟局域网连接。"
 
 #. Tag: para
 #: Networking.xml:65
 #, no-c-format
-msgid ""
-"Complicated bridge setups are commonly needed on virtualized hosts, and "
-"often have to be performed remotely by higher-level management tools, rather "
-"than a human user."
-msgstr ""
-"通常虚拟主机上都需要做复杂的桥接，并且经常要通过高级管理工具远程配置，而不是"
-"由用户。"
+msgid "Complicated bridge setups are commonly needed on virtualized hosts, and often have to be performed remotely by higher-level management tools, rather than a human user."
+msgstr "通常虚拟主机上都需要做复杂的桥接，并且经常要通过高级管理工具远程配置，而不是由用户。"
 
 #. Tag: para
 #: Networking.xml:69
 #, no-c-format
-msgid ""
-"This feature addresses these needs by providing a general-purpose network "
-"configuration library (<application>netcf</application>) and additions to "
-"the <application>libvirt</application> API to expose <application>netcf</"
-"application>'s local API through <application>libvirt</application>'s "
-"remoting facilities."
-msgstr ""
-"此特性通过提供通用目的的网络配置库（<application>netcf</application>）以及使"
-"用<application>libvirt</application>的远程设备补充<application>libvirt</"
-"application>API以显示<application>netcf</application>的本地API来满足这些需"
-"求。"
+msgid "This feature addresses these needs by providing a general-purpose network configuration library (<application>netcf</application>) and additions to the <application>libvirt</application> API to expose <application>netcf</application>'s local API through <application>libvirt</application>'s remoting facilities."
+msgstr "此特性通过提供通用目的的网络配置库（<application>netcf</application>）以及使用<application>libvirt</application>的远程设备补充<application>libvirt</application>API以显示<application>netcf</application>的本地API来满足这些需求。"
 
 #. Tag: para
 #: Networking.xml:73
 #, no-c-format
-msgid ""
-"With <application>netcf</application>, a logical network interface (for "
-"example, a bridge and its slaves) is described as a unit, and "
-"<application>netcf</application> takes care of translating that description "
-"into the appropriate <filename>ifcfg-*</filename> files. To guarantee the "
-"happy coexistence of <application>netcf</application> with other network "
-"configuration utilities, including <application>vi</application>, "
-"<application>netcf</application> is bidirectional: it modifies "
-"<filename>ifcfg-*</filename> files based on a <application>netcf</"
-"application> interface description, but also reads <filename>ifcfg-*</"
-"filename> files to generate such a description. It is therefore possible to "
-"use <application>netcf</application> side-by-side with any other method of "
-"changing network configuration, and many of the pitfalls of earlier attempts "
-"to do this — for example, the Xen networking scripts — are "
-"avoided."
-msgstr ""
-"<application>netcf</application>会把逻辑网络连接（如桥接及其从属连接）看作一"
-"个单元，<application>netcf</application>将根据它们的属性把它们转换成合适的"
-"<filename>ifcfg-*</filename>文件。这样就保证了<application>netcf</"
-"application>与其它网络配置工具的和谐共存，包括<application>vi</application>，"
-"<application>netcf</application>是双向的：它根据连接属性修改<filename>ifcfg-"
-"*</filename>文件，也从<filename>ifcfg-*</filename>文件读取内容来生成新的连接"
-"属性。因此<application>netcf</application>可以跟其它网络配置方法并存，并且避"
-"免了很多如Xen网络脚本 &mdash一类的缺陷。"
+msgid "With <application>netcf</application>, a logical network interface (for example, a bridge and its slaves) is described as a unit, and <application>netcf</application> takes care of translating that description into the appropriate <filename>ifcfg-*</filename> files. To guarantee the happy coexistence of <application>netcf</application> with other network configuration utilities, including <application>vi</application>, <application>netcf</application> is bidirectional: it modifies <filename>ifcfg-*</filename> files based on a <application>netcf</application> interface description, but also reads <filename>ifcfg-*</filename> files to generate such a description. It is therefore possible to use <application>netcf</application> side-by-side with any other method of changing network configuration, and many of the pitfalls of earlier attempts to do this — for example, the Xen networking scripts — are avoided."
+msgstr "<application>netcf</application>会把逻辑网络连接（如桥接及其从属连接）看作一个单元，<application>netcf</application>将根据它们的属性把它们转换成合适的<filename>ifcfg-*</filename>文件。这样就保证了<application>netcf</application>与其它网络配置工具的和谐共存，包括<application>vi</application>，<application>netcf</application>是双向的：它根据连接属性修改<filename>ifcfg-*</filename>文件，也从<filename>ifcfg-*</filename>文件读取内容来生成新的连接属性。因此<application>netcf</application>可以跟其它网络配置方法并存，并且避免了很多如Xen网络脚本 — 一类的缺陷。"
 
 #. Tag: para
 #: Networking.xml:77
 #, no-c-format
-msgid ""
-"It is planned to switch <application>NetworkManager</application> to "
-"<application>netcf</application> as the backend for system-wide network "
-"configuration in a future release; while it is not part of this feature, it "
-"will further unify the user experience around network configuration. "
-"Similarly, it is planned to expose network configuration functionality in a "
-"future release of <application>virt-manager</application>."
-msgstr ""
-"在未来的发行版中计划用<application>netcf</application>取代"
-"<application>NetworkManager</application>做为系统范围的网络配置后端；然而它并"
-"不是此特性的一部分，它最终将统一用户的网络配置。与此类似，将在未来版本的"
-"<application>virt-manager</application>增加网络配置功能。"
+msgid "It is planned to switch <application>NetworkManager</application> to <application>netcf</application> as the backend for system-wide network configuration in a future release; while it is not part of this feature, it will further unify the user experience around network configuration. Similarly, it is planned to expose network configuration functionality in a future release of <application>virt-manager</application>."
+msgstr "在未来的发行版中计划用<application>netcf</application>取代<application>NetworkManager</application>做为系统范围的网络配置后端；然而它并不是此特性的一部分，它最终将统一用户的网络配置。与此类似，将在未来版本的<application>virt-manager</application>增加网络配置功能。"
 
 #. Tag: title
 #: Networking.xml:83
@@ -4584,16 +3299,8 @@ msgstr "蓝牙"
 #. Tag: para
 #: Networking.xml:87
 #, no-c-format
-msgid ""
-"In order to support Bluetooth devices, the Bluetooth background service was "
-"started by default in previous versions of Fedora. In this release, the "
-"Bluetooth service is started on demand when needed and automatically stops "
-"30 seconds after last device use instead. This reduces initial startup time "
-"and resources."
-msgstr ""
-"为了支持蓝牙设备，前一版的Fedora默认开启蓝牙后台服务。本发行版中，蓝牙服务将"
-"按需启动，并且在上一个设备使用后自动停止30秒。这样降低了初始化时间并节省了资"
-"源。"
+msgid "In order to support Bluetooth devices, the Bluetooth background service was started by default in previous versions of Fedora. In this release, the Bluetooth service is started on demand when needed and automatically stops 30 seconds after last device use instead. This reduces initial startup time and resources."
+msgstr "为了支持蓝牙设备，前一版的Fedora默认开启蓝牙后台服务。本发行版中，蓝牙服务将按需启动，并且在上一个设备使用后自动停止30秒。这样降低了初始化时间并节省了资源。"
 
 #. Tag: title
 #: OverView.xml:6
@@ -4604,34 +3311,14 @@ msgstr "Fedora &PRODVER; 概述"
 #. Tag: remark
 #: OverView.xml:7
 #, 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:8
 #, 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 &PRODVER; 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 &PRODVER中的其它特徴，请引用其各自详述特徴目标和"
-"程序的 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 &PRODVER; 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 &PRODVER中的其它特徴，请引用其各自详述特徴目标和程序的 wiki 页面："
 
 #. Tag: ulink
 #: OverView.xml:12
@@ -4642,9 +3329,7 @@ msgstr "http://www.fedoraproject.org/wiki/Releases/12/FeatureList"
 #. Tag: para
 #: OverView.xml:14
 #, 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
@@ -4734,14 +3419,8 @@ 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: title
 #: Release_Notes.xml:8
@@ -4782,10 +3461,8 @@ msgstr "修订记录"
 #. Tag: para
 #: Revision_History.xml:12
 #, no-c-format
-msgid ""
-"0.6 Mon 9 Nov 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
-msgstr ""
-"0.6 Mon 9 Nov 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
+msgid "0.6 Mon 9 Nov 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
+msgstr "0.6 Mon 9 Nov 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
 
 #. Tag: member
 #: Revision_History.xml:18
@@ -4832,10 +3509,8 @@ msgstr "所有更改更新至当前测试版"
 #. Tag: para
 #: Revision_History.xml:43
 #, no-c-format
-msgid ""
-"0.5 Tue 27 Oct 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
-msgstr ""
-"0.5 Tue 27 Oct 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
+msgid "0.5 Tue 27 Oct 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
+msgstr "0.5 Tue 27 Oct 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
 
 #. Tag: member
 #: Revision_History.xml:49
@@ -4858,10 +3533,8 @@ msgstr "更新表格至当前测试版"
 #. Tag: para
 #: Revision_History.xml:56
 #, no-c-format
-msgid ""
-"0.4 Mon 26 Oct 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
-msgstr ""
-"0.4 Mon 26 Oct 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
+msgid "0.4 Mon 26 Oct 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
+msgstr "0.4 Mon 26 Oct 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
 
 #. Tag: member
 #: Revision_History.xml:62
@@ -4896,10 +3569,8 @@ msgstr "文件系统的Wiki更新"
 #. Tag: para
 #: Revision_History.xml:72
 #, no-c-format
-msgid ""
-"0.3 Fri 04 Sep 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
-msgstr ""
-"0.3 Fri 04 Sep 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
+msgid "0.3 Fri 04 Sep 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
+msgstr "0.3 Fri 04 Sep 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
 
 #. Tag: member
 #: Revision_History.xml:78
@@ -4910,16 +3581,13 @@ msgstr "针对所有更新添加一节"
 #. Tag: para
 #: Revision_History.xml:83
 #, no-c-format
-msgid ""
-"0.2 Thu 03 Sep 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
-msgstr ""
-"0.2 Thu 03 Sep 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
+msgid "0.2 Thu 03 Sep 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
+msgstr "0.2 Thu 03 Sep 2009 John McDonough <email>jjmcd at fedoraproject.org</email>"
 
 #. Tag: member
 #: Revision_History.xml:89
 #, no-c-format
-msgid ""
-"Test adding index entries to help users find specific packages among beats"
+msgid "Test adding index entries to help users find specific packages among beats"
 msgstr "测试增加目录以帮助用户在beats中找到特定的包"
 
 #. Tag: member
@@ -4931,10 +3599,8 @@ msgstr "把编辑人员换成团队"
 #. Tag: para
 #: Revision_History.xml:96
 #, no-c-format
-msgid ""
-"0.1 Thu 30 Jul 2009 Rüdiger Landmann <email>r.landmann at redhat.com</email>"
-msgstr ""
-"0.1 Thu 30 Jul 2009 Rüdiger Landmann <email>r.landmann at redhat.com</email>"
+msgid "0.1 Thu 30 Jul 2009 Rüdiger Landmann <email>r.landmann at redhat.com</email>"
+msgstr "0.1 Thu 30 Jul 2009 Rüdiger Landmann <email>r.landmann at redhat.com</email>"
 
 #. Tag: member
 #: Revision_History.xml:102
@@ -4951,23 +3617,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
@@ -4996,18 +3653,8 @@ msgstr "Clustered Samba"
 #. Tag: para
 #: Samba.xml:24
 #, no-c-format
-msgid ""
-"With the availability of a clustered database (CTDB) for <application>Samba</"
-"application>, multiple instances of <application>smbd</application> across "
-"different nodes of a cluster are able to share state. It is now possible to "
-"export a gfs2 filesystem through one or more nodes in the cluster in a "
-"active/passive or active/active configuration to provide a highly-available "
-"<application>Samba</application> service."
-msgstr ""
-"随着针对<application>Samba</application>的集群数据库的可用，同一个集群内不同"
-"节点之间的多个<application>smbd</application>能够共享状态。同时它可以通过集群"
-"中一个或更多个设置为active/passive或active/active的节点输出一个gfs2文件系统，"
-"以提供一个高可用性的<application>Samba</application>服务。"
+msgid "With the availability of a clustered database (CTDB) for <application>Samba</application>, multiple instances of <application>smbd</application> across different nodes of a cluster are able to share state. It is now possible to export a gfs2 filesystem through one or more nodes in the cluster in a active/passive or active/active configuration to provide a highly-available <application>Samba</application> service."
+msgstr "随着针对<application>Samba</application>的集群数据库的可用，同一个集群内不同节点之间的多个<application>smbd</application>能够共享状态。同时它可以通过集群中一个或更多个设置为active/passive或active/active的节点输出一个gfs2文件系统，以提供一个高可用性的<application>Samba</application>服务。"
 
 #. Tag: title
 #: ScientificTechnical.xml:6
@@ -5018,24 +3665,14 @@ 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:8
 #, no-c-format
-msgid ""
-"Fedora &PRODVER; includes a range of packages for science and mathematics. "
-"The following packages have been updated for Fedora &PRODVER;."
-msgstr ""
-"Fedora &PRODVER包括了一系列的科学和数学软件包。以下软件包已随Fedora &PRODVER"
-"更新。"
+msgid "Fedora &PRODVER; includes a range of packages for science and mathematics. The following packages have been updated for Fedora &PRODVER;."
+msgstr "Fedora &PRODVER包括了一系列的科学和数学软件包。以下软件包已随Fedora &PRODVER更新。"
 
 #. Tag: term
 #: ScientificTechnical.xml:15
@@ -5052,15 +3689,8 @@ msgstr "<primary>R</primary>"
 #. Tag: para
 #: ScientificTechnical.xml:20
 #, no-c-format
-msgid ""
-"<package>R</package> and many of its subpackages have been updated to the "
-"latest versions. There are a large number of new features which are "
-"described in detail on the project's mailing list: <ulink type=\"http\" url="
-"\"https://stat.ethz.ch/pipermail/r-announce/2009/thread.html\"></ulink>."
-msgstr ""
-"<package>R</package>及其相关套件已更新至最新版本。本项目的邮件列表中详细介绍"
-"了大量的新功能：<ulink type=\"http\" url=\"https://stat.ethz.ch/pipermail/r-"
-"announce/2009/thread.html\"></ulink>."
+msgid "<package>R</package> and many of its subpackages have been updated to the latest versions. There are a large number of new features which are described in detail on the project's mailing list: <ulink type=\"http\" url=\"https://stat.ethz.ch/pipermail/r-announce/2009/thread.html\"></ulink>."
+msgstr "<package>R</package>及其相关套件已更新至最新版本。本项目的邮件列表中详细介绍了大量的新功能：<ulink type=\"http\" url=\"https://stat.ethz.ch/pipermail/r-announce/2009/thread.html\"></ulink>."
 
 #. Tag: term
 #: ScientificTechnical.xml:31
@@ -5077,28 +3707,14 @@ msgstr "<primary>fet</primary>"
 #. Tag: para
 #: ScientificTechnical.xml:36
 #, no-c-format
-msgid ""
-"<package>fet</package> is a scheduling program for schools and universities. "
-"In addition to a large number of bug fixes and performance improvements, fet "
-"5.10.2 allows for scheduling fixed time events, allows constraints to be "
-"placed on hours for teachers, allows activities to be locked and unlocked, "
-"and setting preferred starting times and rooms. The details may be found in "
-"the fet news at <ulink type=\"http\" url=\"http://lalescu.ro/liviu/fet/\"></"
-"ulink>."
-msgstr ""
-"<package>fet</package>是针对中学和大学的一个调度程序。除了大量的bug修正和性能"
-"改进外，fet 5.10.2允许安排固定时间的事项，为教师提供允许以小时为单位的约束，"
-"允许锁定和解锁活动，并可设定首选开始时间和教室。详情可参考位于<ulink type="
-"\"http\" url=\"http://lalescu.ro/liviu/fet/\"></ulink>的fet新闻。"
+msgid "<package>fet</package> is a scheduling program for schools and universities. In addition to a large number of bug fixes and performance improvements, fet 5.10.2 allows for scheduling fixed time events, allows constraints to be placed on hours for teachers, allows activities to be locked and unlocked, and setting preferred starting times and rooms. The details may be found in the fet news at <ulink type=\"http\" url=\"http://lalescu.ro/liviu/fet/\"></ulink>."
+msgstr "<package>fet</package>是针对中学和大学的一个调度程序。除了大量的bug修正和性能改进外，fet 5.10.2允许安排固定时间的事项，为教师提供允许以小时为单位的约束，允许锁定和解锁活动，并可设定首选开始时间和教室。详情可参考位于<ulink type=\"http\" url=\"http://lalescu.ro/liviu/fet/\"></ulink>的fet新闻。"
 
 #. Tag: para
 #: ScientificTechnical.xml:50
 #, no-c-format
-msgid ""
-"A large number of other packages have undergone minor or bugfix updates. "
-"Refer to the tables at the end of this document for details."
-msgstr ""
-"其它大量软件包也做了较小的更新和bug修正。请参考本文档结尾的表格来了解详情。"
+msgid "A large number of other packages have undergone minor or bugfix updates. Refer to the tables at the end of this document for details."
+msgstr "其它大量软件包也做了较小的更新和bug修正。请参考本文档结尾的表格来了解详情。"
 
 #. Tag: title
 #: Security.xml:6
@@ -5109,14 +3725,8 @@ msgstr "安全性"
 #. Tag: remark
 #: Security.xml:7
 #, 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 ""
-"这个 beat位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
-"Docs/Beats/Security\">https://fedoraproject.org/wiki/Docs/Beats/Security</"
-"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 "这个 beat位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/Docs/Beats/Security\">https://fedoraproject.org/wiki/Docs/Beats/Security</ulink>"
 
 #. Tag: para
 #: Security.xml:8
@@ -5133,74 +3743,26 @@ msgstr "低处理能力"
 #. Tag: para
 #: Security.xml:15
 #, no-c-format
-msgid ""
-"Daemons running as root have been reviewed and patched to run with lower "
-"process capabilities. This reduces the desirability of using these daemons "
-"for privilege escalation. Additionally, the shadow file permissions have "
-"been changed to <literal>000</literal> and several directories in <filename>"
-"$PATH</filename> have been set to <literal>555</literal> in order to prevent "
-"daemons without <literal>DAC_OVERRIDE</literal> from being able to access "
-"the shadow file or write to the <filename>$PATH</filename> directories."
-msgstr ""
-"以root用户运行的守护进程经过审核和补丁，开始以低处理能力运行。这降低了使用这"
-"些守护进程提升权限的风险。此外，卷影文件权限更改为<literal>000</literal>，"
-"<filename>$PATH</filename>下的一些目录权限设置为<literal>555</literal>，以防"
-"止守护进程在没有<literal>DAC_OVERRIDE</literal>时访问卷影文件或向<filename>"
-"$PATH</filename>目录写入内容。"
+msgid "Daemons running as root have been reviewed and patched to run with lower process capabilities. This reduces the desirability of using these daemons for privilege escalation. Additionally, the shadow file permissions have been changed to <literal>000</literal> and several directories in <filename>$PATH</filename> have been set to <literal>555</literal> in order to prevent daemons without <literal>DAC_OVERRIDE</literal> from being able to access the shadow file or write to the <filename>$PATH</filename> directories."
+msgstr "以root用户运行的守护进程经过审核和补丁，开始以低处理能力运行。这降低了使用这些守护进程提升权限的风险。此外，卷影文件权限更改为<literal>000</literal>，<filename>$PATH</filename>下的一些目录权限设置为<literal>555</literal>，以防止守护进程在没有<literal>DAC_OVERRIDE</literal>时访问卷影文件或向<filename>$PATH</filename>目录写入内容。"
 
 #. Tag: para
 #: Security.xml:19
 #, no-c-format
-msgid ""
-"When someone attacks a system, they normally can not do much unless they can "
-"escalate privileges. This feature reduces the number of attack targets that "
-"can be used to escalate privileges. If root processes do not have all "
-"capabilities, they will be harder to use to subvert the system."
-msgstr ""
-"当有人入侵系统时，除非他们提高了自己的权限，否则一般做不了太多事情。此特性降"
-"低了可用来提升权限的攻击目标数量。如果root进程不包括所有能力，那么他们也很难"
-"破坏系统。"
+msgid "When someone attacks a system, they normally can not do much unless they can escalate privileges. This feature reduces the number of attack targets that can be used to escalate privileges. If root processes do not have all capabilities, they will be harder to use to subvert the system."
+msgstr "当有人入侵系统时，除非他们提高了自己的权限，否则一般做不了太多事情。此特性降低了可用来提升权限的攻击目标数量。如果root进程不包括所有能力，那么他们也很难破坏系统。"
 
 #. Tag: para
 #: Security.xml:23
 #, no-c-format
-msgid ""
-"Processes with the root uid can still damage a system, because they can "
-"write to nearly any file and of course read the <filename>/etc/shadow file</"
-"filename>. However, if the system is hardened so that root requires the "
-"<literal>DAC_OVERRIDE</literal> capability, then only a limited number of "
-"processes can damage the system. This will not affect any admin abilities "
-"because they always get full privileges which includes "
-"<literal>DAC_OVERRIDE</literal>. Therefore, even if someone does "
-"successfully attack a root process, it is now harder for them to take "
-"advantage of this attack."
-msgstr ""
-"由于拥有root uid的进程可向几乎所有的文件写入并且可以读取<filename>/etc/"
-"shadow file</filename>，因此这些进程仍可能会破坏系统。然而如果将系统强化使得"
-"root需要<literal>DAC_OVERRIDE</literal>能力，那么能够破坏系统的进程只剩少数。"
-"这不会对管理能力造成影响，因为它们都拥有包括<literal>DAC_OVERRIDE</literal>在"
-"内的完整权限。因此即使有人成功入侵了一个root进程，也很难利用此进程做出更多破"
-"坏。"
+msgid "Processes with the root uid can still damage a system, because they can write to nearly any file and of course read the <filename>/etc/shadow file</filename>. However, if the system is hardened so that root requires the <literal>DAC_OVERRIDE</literal> capability, then only a limited number of processes can damage the system. This will not affect any admin abilities because they always get full privileges which includes <literal>DAC_OVERRIDE</literal>. Therefore, even if someone does successfully attack a root process, it is now harder for them to take advantage of this attack."
+msgstr "由于拥有root uid的进程可向几乎所有的文件写入并且可以读取<filename>/etc/shadow file</filename>，因此这些进程仍可能会破坏系统。然而如果将系统强化使得root需要<literal>DAC_OVERRIDE</literal>能力，那么能够破坏系统的进程只剩少数。这不会对管理能力造成影响，因为它们都拥有包括<literal>DAC_OVERRIDE</literal>在内的完整权限。因此即使有人成功入侵了一个root进程，也很难利用此进程做出更多破坏。"
 
 #. Tag: para
 #: Security.xml:27
 #, no-c-format
-msgid ""
-"A hardened system would have permissions like: <literal>555</literal> "
-"<filename>/bin</filename>, <literal>555</literal> <filename>/lib</filename>, "
-"<literal>000</literal> <filename>/etc/shadow</filename> and so on. The "
-"current scope is to cover the directories in <filename>$PATH</filename> "
-"variable, library dirs, <filename>/boot</filename>, and <filename>/root</"
-"filename>. This scheme does not affect SELinux in any way and complements it "
-"since capabilities are DAC controls and they have first vote on allowing an "
-"access."
-msgstr ""
-"强化的系统应该有类似的权限：<literal>555</literal> <filename>/bin</"
-"filename>, <literal>555</literal> <filename>/lib</filename>, <literal>000</"
-"literal> <filename>/etc/shadow</filename>等。当前范围是覆盖<filename>$PATH</"
-"filename>变量下的目录、库目录、<filename>/boot</filename>及<filename>/root</"
-"filename>。此方案不但不会影响SELinux，而且会对其进行补充。因为这些能力属于"
-"DAC controls，而它们首先决定是否允许访问。"
+msgid "A hardened system would have permissions like: <literal>555</literal> <filename>/bin</filename>, <literal>555</literal> <filename>/lib</filename>, <literal>000</literal> <filename>/etc/shadow</filename> and so on. The current scope is to cover the directories in <filename>$PATH</filename> variable, library dirs, <filename>/boot</filename>, and <filename>/root</filename>. This scheme does not affect SELinux in any way and complements it since capabilities are DAC controls and they have first vote on allowing an access."
+msgstr "强化的系统应该有类似的权限：<literal>555</literal> <filename>/bin</filename>, <literal>555</literal> <filename>/lib</filename>, <literal>000</literal> <filename>/etc/shadow</filename>等。当前范围是覆盖<filename>$PATH</filename>变量下的目录、库目录、<filename>/boot</filename>及<filename>/root</filename>。此方案不但不会影响SELinux，而且会对其进行补充。因为这些能力属于DAC controls，而它们首先决定是否允许访问。"
 
 #. Tag: title
 #: Security.xml:33
@@ -5211,40 +3773,20 @@ msgstr "SELinux Sandbox"
 #. Tag: para
 #: Security.xml:34
 #, no-c-format
-msgid ""
-"The SELinux sandbox allows a command to be run in a highly constrained "
-"fashion. Unfortunately, the nature of GUI applications is such that it is "
-"very difficult to use this capability on those applications that need it "
-"most."
-msgstr ""
-"SeLinux sandbox允许命令以高限制的方式运行。不幸的是，由于GUI程序的特性，在最"
-"那些需要的GUI程序上使用这个功能是非常困难的。"
+msgid "The SELinux sandbox allows a command to be run in a highly constrained fashion. Unfortunately, the nature of GUI applications is such that it is very difficult to use this capability on those applications that need it most."
+msgstr "SeLinux sandbox允许命令以高限制的方式运行。不幸的是，由于GUI程序的特性，在最那些需要的GUI程序上使用这个功能是非常困难的。"
 
 #. Tag: para
 #: Security.xml:40
 #, no-c-format
-msgid ""
-"A new <command>sandbox -X</command> command allows many GUI applications to "
-"be tightly constrained. By applying this within some web applications, a "
-"user may specify, for example, that Open Office should run normally when "
-"invoked by the user, but should be constrained when invoked from the web."
-msgstr ""
-"新命令<command>sandbox -X</command>可用来限制多个GUI程序。用户可以在某些网络"
-"程序中运行此命令，比如Open Office在用户调用后可以正常运行，但如果由网络调用"
-"时，它会受到限制。"
+msgid "A new <command>sandbox -X</command> command allows many GUI applications to be tightly constrained. By applying this within some web applications, a user may specify, for example, that Open Office should run normally when invoked by the user, but should be constrained when invoked from the web."
+msgstr "新命令<command>sandbox -X</command>可用来限制多个GUI程序。用户可以在某些网络程序中运行此命令，比如Open Office在用户调用后可以正常运行，但如果由网络调用时，它会受到限制。"
 
 #. Tag: para
 #: Security.xml:48
 #, no-c-format
-msgid ""
-"When run from the SELinux sandbox, a GUI application may only access a "
-"limited directory structure which is destroyed on exit, is denied access to "
-"the network, and runs in an isolated X-server, which prevents it from "
-"accessing other X applications."
-msgstr ""
-"当GUI程序通过SELinux sandbox运行后，它只能读取有限的目录，这些目录在其退出后"
-"就会被删除，它也无法访问网络，并运行在一个孤立的X-server中，这样就阻止了它读"
-"取其它X程序。"
+msgid "When run from the SELinux sandbox, a GUI application may only access a limited directory structure which is destroyed on exit, is denied access to the network, and runs in an isolated X-server, which prevents it from accessing other X applications."
+msgstr "当GUI程序通过SELinux sandbox运行后，它只能读取有限的目录，这些目录在其退出后就会被删除，它也无法访问网络，并运行在一个孤立的X-server中，这样就阻止了它读取其它X程序。"
 
 #. Tag: title
 #: ServerTools.xml:6
@@ -5255,24 +3797,14 @@ 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 &PRODVER;."
-msgstr ""
-"这部分突出介绍了 Fedora &PRODVER 中对各种 GUI 服务器和系统分配工具的更改和添"
-"加。"
+msgid "This section highlights changes and additions to the various GUI server and system configuration tools in Fedora &PRODVER;."
+msgstr "这部分突出介绍了 Fedora &PRODVER 中对各种 GUI 服务器和系统分配工具的更改和添加。"
 
 #. Tag: title
 #: SystemDaemons.xml:6
@@ -5283,14 +3815,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: title
 #: table-amusements-games.xml:7
@@ -5305,30 +3831,47 @@ msgid "All Amusements-Games changes"
 msgstr "所有娱乐-游戏的更新"
 
 #. Tag: entry
-#: table-amusements-games.xml:17 table-amusements-graphics.xml:18
-#: table-application-editors.xml:18 table-applications-archiving.xml:19
+#: table-amusements-games.xml:17
+#: table-amusements-graphics.xml:18
+#: table-application-editors.xml:18
+#: table-applications-archiving.xml:19
 #: table-applications-communications.xml:17
-#: table-applications-databases.xml:17 table-applications-editors.xml:17
-#: table-applications-emulators.xml:17 table-applications-engineering.xml:17
-#: table-applications-file.xml:17 table-applications-internet.xml:17
-#: table-applications-multimedia.xml:17 table-applications-productivity.xml:17
-#: table-applications-publishing.xml:17 table-applications-system.xml:17
-#: table-applications-text.xml:17 table-desktop-accessibility.xml:18
-#: table-development-build_tools.xml:17 table-development-debuggers.xml:17
-#: table-development-documentation.xml:17 table-development-java.xml:17
-#: table-development-languages.xml:17 table-development-libraries-java.xml:17
-#: table-development-libraries.xml:17 table-development.xml:17
-#: table-development-python.xml:17 table-development-ruby.xml:17
-#: table-development-system.xml:17 table-development-tools.xml:17
-#: table-documentation.xml:17 table-sugar-activities.xml:17
+#: table-applications-databases.xml:17
+#: table-applications-editors.xml:17
+#: table-applications-emulators.xml:17
+#: table-applications-engineering.xml:17
+#: table-applications-file.xml:17
+#: table-applications-internet.xml:17
+#: table-applications-multimedia.xml:17
+#: table-applications-productivity.xml:17
+#: table-applications-publishing.xml:17
+#: table-applications-system.xml:17
+#: table-applications-text.xml:17
+#: table-desktop-accessibility.xml:18
+#: table-development-build_tools.xml:17
+#: table-development-debuggers.xml:17
+#: table-development-documentation.xml:17
+#: table-development-java.xml:17
+#: table-development-languages.xml:17
+#: table-development-libraries-java.xml:17
+#: table-development-libraries.xml:17
+#: table-development.xml:17
+#: table-development-python.xml:17
+#: table-development-ruby.xml:17
+#: table-development-system.xml:17
+#: table-development-tools.xml:17
+#: table-documentation.xml:17
+#: table-sugar-activities.xml:17
 #: table-system_environment-base.xml:17
 #: table-system_environment-daemons.xml:17
 #: table-system_environment-kernel.xml:17
 #: table-system_environment-libraries.xml:17
 #: table-system_environment-shells.xml:17
-#: table-system_environment-tools.xml:17 table-systems_management-base.xml:17
+#: table-system_environment-tools.xml:17
+#: table-systems_management-base.xml:17
 #: table-text_editors-integrated_development_environments__ide_.xml:134
-#: table-text_processing-markup-xml.xml:20 table-user_interface-desktop.xml:18
+#: table-text_processing-markup-xml.xml:20
+#: table-user_interface-desktop.xml:18
 #: table-user_interface-desktops.xml:17
 #: table-user_interface-x_hardware_support.xml:17
 #: table-user_interface-x.xml:17
@@ -5337,30 +3880,47 @@ msgid "Old Version"
 msgstr "老版本"
 
 #. Tag: entry
-#: table-amusements-games.xml:20 table-amusements-graphics.xml:21
-#: table-application-editors.xml:21 table-applications-archiving.xml:22
+#: table-amusements-games.xml:20
+#: table-amusements-graphics.xml:21
+#: table-application-editors.xml:21
+#: table-applications-archiving.xml:22
 #: table-applications-communications.xml:20
-#: table-applications-databases.xml:20 table-applications-editors.xml:20
-#: table-applications-emulators.xml:20 table-applications-engineering.xml:20
-#: table-applications-file.xml:20 table-applications-internet.xml:20
-#: table-applications-multimedia.xml:20 table-applications-productivity.xml:20
-#: table-applications-publishing.xml:20 table-applications-system.xml:20
-#: table-applications-text.xml:20 table-desktop-accessibility.xml:21
-#: table-development-build_tools.xml:20 table-development-debuggers.xml:20
-#: table-development-documentation.xml:20 table-development-java.xml:20
-#: table-development-languages.xml:20 table-development-libraries-java.xml:20
-#: table-development-libraries.xml:20 table-development.xml:20
-#: table-development-python.xml:20 table-development-ruby.xml:20
-#: table-development-system.xml:20 table-development-tools.xml:20
-#: table-documentation.xml:20 table-sugar-activities.xml:20
+#: table-applications-databases.xml:20
+#: table-applications-editors.xml:20
+#: table-applications-emulators.xml:20
+#: table-applications-engineering.xml:20
+#: table-applications-file.xml:20
+#: table-applications-internet.xml:20
+#: table-applications-multimedia.xml:20
+#: table-applications-productivity.xml:20
+#: table-applications-publishing.xml:20
+#: table-applications-system.xml:20
+#: table-applications-text.xml:20
+#: table-desktop-accessibility.xml:21
+#: table-development-build_tools.xml:20
+#: table-development-debuggers.xml:20
+#: table-development-documentation.xml:20
+#: table-development-java.xml:20
+#: table-development-languages.xml:20
+#: table-development-libraries-java.xml:20
+#: table-development-libraries.xml:20
+#: table-development.xml:20
+#: table-development-python.xml:20
+#: table-development-ruby.xml:20
+#: table-development-system.xml:20
+#: table-development-tools.xml:20
+#: table-documentation.xml:20
+#: table-sugar-activities.xml:20
 #: table-system_environment-base.xml:20
 #: table-system_environment-daemons.xml:20
 #: table-system_environment-kernel.xml:20
 #: table-system_environment-libraries.xml:20
 #: table-system_environment-shells.xml:20
-#: table-system_environment-tools.xml:20 table-systems_management-base.xml:20
+#: table-system_environment-tools.xml:20
+#: table-systems_management-base.xml:20
 #: table-text_editors-integrated_development_environments__ide_.xml:137
-#: table-text_processing-markup-xml.xml:23 table-user_interface-desktop.xml:21
+#: table-text_processing-markup-xml.xml:23
+#: table-user_interface-desktop.xml:21
 #: table-user_interface-desktops.xml:20
 #: table-user_interface-x_hardware_support.xml:20
 #: table-user_interface-x.xml:20
@@ -5369,30 +3929,47 @@ msgid "New Version"
 msgstr "新版本"
 
 #. Tag: entry
-#: table-amusements-games.xml:23 table-amusements-graphics.xml:24
-#: table-application-editors.xml:24 table-applications-archiving.xml:25
+#: table-amusements-games.xml:23
+#: table-amusements-graphics.xml:24
+#: table-application-editors.xml:24
+#: table-applications-archiving.xml:25
 #: table-applications-communications.xml:23
-#: table-applications-databases.xml:23 table-applications-editors.xml:23
-#: table-applications-emulators.xml:23 table-applications-engineering.xml:23
-#: table-applications-file.xml:23 table-applications-internet.xml:23
-#: table-applications-multimedia.xml:23 table-applications-productivity.xml:23
-#: table-applications-publishing.xml:23 table-applications-system.xml:23
-#: table-applications-text.xml:23 table-desktop-accessibility.xml:24
-#: table-development-build_tools.xml:23 table-development-debuggers.xml:23
-#: table-development-documentation.xml:23 table-development-java.xml:23
-#: table-development-languages.xml:23 table-development-libraries-java.xml:23
-#: table-development-libraries.xml:23 table-development.xml:23
-#: table-development-python.xml:23 table-development-ruby.xml:23
-#: table-development-system.xml:23 table-development-tools.xml:23
-#: table-documentation.xml:23 table-sugar-activities.xml:23
+#: table-applications-databases.xml:23
+#: table-applications-editors.xml:23
+#: table-applications-emulators.xml:23
+#: table-applications-engineering.xml:23
+#: table-applications-file.xml:23
+#: table-applications-internet.xml:23
+#: table-applications-multimedia.xml:23
+#: table-applications-productivity.xml:23
+#: table-applications-publishing.xml:23
+#: table-applications-system.xml:23
+#: table-applications-text.xml:23
+#: table-desktop-accessibility.xml:24
+#: table-development-build_tools.xml:23
+#: table-development-debuggers.xml:23
+#: table-development-documentation.xml:23
+#: table-development-java.xml:23
+#: table-development-languages.xml:23
+#: table-development-libraries-java.xml:23
+#: table-development-libraries.xml:23
+#: table-development.xml:23
+#: table-development-python.xml:23
+#: table-development-ruby.xml:23
+#: table-development-system.xml:23
+#: table-development-tools.xml:23
+#: table-documentation.xml:23
+#: table-sugar-activities.xml:23
 #: table-system_environment-base.xml:23
 #: table-system_environment-daemons.xml:23
 #: table-system_environment-kernel.xml:23
 #: table-system_environment-libraries.xml:23
 #: table-system_environment-shells.xml:23
-#: table-system_environment-tools.xml:23 table-systems_management-base.xml:23
+#: table-system_environment-tools.xml:23
+#: table-systems_management-base.xml:23
 #: table-text_editors-integrated_development_environments__ide_.xml:140
-#: table-text_processing-markup-xml.xml:26 table-user_interface-desktop.xml:24
+#: table-text_processing-markup-xml.xml:26
+#: table-user_interface-desktop.xml:24
 #: table-user_interface-desktops.xml:23
 #: table-user_interface-x_hardware_support.xml:23
 #: table-user_interface-x.xml:23
@@ -5401,19 +3978,32 @@ msgid "Upstream URL"
 msgstr "上游URL"
 
 #. Tag: entry
-#: table-amusements-games.xml:30 table-amusements-games.xml:33
-#: table-amusements-games.xml:36 table-amusements-games.xml:39
-#: table-amusements-games.xml:51 table-amusements-games.xml:52
-#: table-amusements-games.xml:53 table-amusements-graphics.xml:31
-#: table-amusements-graphics.xml:34 table-amusements-graphics.xml:37
-#: table-amusements-graphics.xml:40 table-amusements-graphics.xml:53
-#: table-amusements-graphics.xml:54 table-amusements-graphics.xml:55
-#: table-application-editors.xml:34 table-application-editors.xml:37
-#: table-application-editors.xml:40 table-application-editors.xml:52
-#: table-application-editors.xml:53 table-application-editors.xml:54
-#: table-applications-archiving.xml:32 table-applications-archiving.xml:35
-#: table-applications-archiving.xml:38 table-applications-archiving.xml:41
-#: table-applications-archiving.xml:53 table-applications-archiving.xml:54
+#: table-amusements-games.xml:30
+#: table-amusements-games.xml:33
+#: table-amusements-games.xml:36
+#: table-amusements-games.xml:39
+#: table-amusements-games.xml:51
+#: table-amusements-games.xml:52
+#: table-amusements-games.xml:53
+#: table-amusements-graphics.xml:31
+#: table-amusements-graphics.xml:34
+#: table-amusements-graphics.xml:37
+#: table-amusements-graphics.xml:40
+#: table-amusements-graphics.xml:53
+#: table-amusements-graphics.xml:54
+#: table-amusements-graphics.xml:55
+#: table-application-editors.xml:34
+#: table-application-editors.xml:37
+#: table-application-editors.xml:40
+#: table-application-editors.xml:52
+#: table-application-editors.xml:53
+#: table-application-editors.xml:54
+#: table-applications-archiving.xml:32
+#: table-applications-archiving.xml:35
+#: table-applications-archiving.xml:38
+#: table-applications-archiving.xml:41
+#: table-applications-archiving.xml:53
+#: table-applications-archiving.xml:54
 #: table-applications-archiving.xml:55
 #: table-applications-communications.xml:30
 #: table-applications-communications.xml:33
@@ -5422,107 +4012,195 @@ msgstr "上游URL"
 #: table-applications-communications.xml:51
 #: table-applications-communications.xml:52
 #: table-applications-communications.xml:53
-#: table-applications-databases.xml:30 table-applications-databases.xml:33
-#: table-applications-databases.xml:36 table-applications-databases.xml:39
-#: table-applications-databases.xml:51 table-applications-databases.xml:52
-#: table-applications-databases.xml:53 table-applications-editors.xml:30
-#: table-applications-editors.xml:33 table-applications-editors.xml:36
-#: table-applications-editors.xml:39 table-applications-editors.xml:51
-#: table-applications-editors.xml:52 table-applications-editors.xml:53
-#: table-applications-emulators.xml:30 table-applications-emulators.xml:33
-#: table-applications-emulators.xml:36 table-applications-emulators.xml:39
-#: table-applications-emulators.xml:51 table-applications-emulators.xml:52
-#: table-applications-emulators.xml:53 table-applications-engineering.xml:30
-#: table-applications-engineering.xml:33 table-applications-engineering.xml:36
-#: table-applications-engineering.xml:39 table-applications-engineering.xml:51
-#: table-applications-engineering.xml:52 table-applications-engineering.xml:53
-#: table-applications-file.xml:30 table-applications-file.xml:33
-#: table-applications-file.xml:36 table-applications-file.xml:39
-#: table-applications-file.xml:51 table-applications-file.xml:52
-#: table-applications-file.xml:53 table-applications-internet.xml:30
-#: table-applications-internet.xml:33 table-applications-internet.xml:36
-#: table-applications-internet.xml:39 table-applications-internet.xml:51
-#: table-applications-internet.xml:52 table-applications-internet.xml:53
-#: table-applications-multimedia.xml:30 table-applications-multimedia.xml:33
-#: table-applications-multimedia.xml:36 table-applications-multimedia.xml:39
-#: table-applications-multimedia.xml:51 table-applications-multimedia.xml:52
-#: table-applications-multimedia.xml:53 table-applications-productivity.xml:30
+#: table-applications-databases.xml:30
+#: table-applications-databases.xml:33
+#: table-applications-databases.xml:36
+#: table-applications-databases.xml:39
+#: table-applications-databases.xml:51
+#: table-applications-databases.xml:52
+#: table-applications-databases.xml:53
+#: table-applications-editors.xml:30
+#: table-applications-editors.xml:33
+#: table-applications-editors.xml:36
+#: table-applications-editors.xml:39
+#: table-applications-editors.xml:51
+#: table-applications-editors.xml:52
+#: table-applications-editors.xml:53
+#: table-applications-emulators.xml:30
+#: table-applications-emulators.xml:33
+#: table-applications-emulators.xml:36
+#: table-applications-emulators.xml:39
+#: table-applications-emulators.xml:51
+#: table-applications-emulators.xml:52
+#: table-applications-emulators.xml:53
+#: table-applications-engineering.xml:30
+#: table-applications-engineering.xml:33
+#: table-applications-engineering.xml:36
+#: table-applications-engineering.xml:39
+#: table-applications-engineering.xml:51
+#: table-applications-engineering.xml:52
+#: table-applications-engineering.xml:53
+#: table-applications-file.xml:30
+#: table-applications-file.xml:33
+#: table-applications-file.xml:36
+#: table-applications-file.xml:39
+#: table-applications-file.xml:51
+#: table-applications-file.xml:52
+#: table-applications-file.xml:53
+#: table-applications-internet.xml:30
+#: table-applications-internet.xml:33
+#: table-applications-internet.xml:36
+#: table-applications-internet.xml:39
+#: table-applications-internet.xml:51
+#: table-applications-internet.xml:52
+#: table-applications-internet.xml:53
+#: table-applications-multimedia.xml:30
+#: table-applications-multimedia.xml:33
+#: table-applications-multimedia.xml:36
+#: table-applications-multimedia.xml:39
+#: table-applications-multimedia.xml:51
+#: table-applications-multimedia.xml:52
+#: table-applications-multimedia.xml:53
+#: table-applications-productivity.xml:30
 #: table-applications-productivity.xml:33
 #: table-applications-productivity.xml:36
 #: table-applications-productivity.xml:39
 #: table-applications-productivity.xml:51
 #: table-applications-productivity.xml:52
-#: table-applications-productivity.xml:53 table-applications-publishing.xml:30
-#: table-applications-publishing.xml:33 table-applications-publishing.xml:36
-#: table-applications-publishing.xml:39 table-applications-publishing.xml:51
-#: table-applications-publishing.xml:52 table-applications-publishing.xml:53
-#: table-applications-system.xml:30 table-applications-system.xml:33
-#: table-applications-system.xml:36 table-applications-system.xml:39
-#: table-applications-system.xml:51 table-applications-system.xml:52
-#: table-applications-system.xml:53 table-applications-text.xml:30
-#: table-applications-text.xml:33 table-applications-text.xml:36
-#: table-applications-text.xml:39 table-applications-text.xml:51
-#: table-applications-text.xml:52 table-applications-text.xml:53
-#: table-desktop-accessibility.xml:31 table-desktop-accessibility.xml:34
-#: table-desktop-accessibility.xml:37 table-desktop-accessibility.xml:40
-#: table-desktop-accessibility.xml:52 table-desktop-accessibility.xml:53
-#: table-desktop-accessibility.xml:54 table-development-build_tools.xml:30
-#: table-development-build_tools.xml:33 table-development-build_tools.xml:36
-#: table-development-build_tools.xml:39 table-development-build_tools.xml:51
-#: table-development-build_tools.xml:52 table-development-build_tools.xml:53
-#: table-development-debuggers.xml:30 table-development-debuggers.xml:33
-#: table-development-debuggers.xml:36 table-development-debuggers.xml:39
-#: table-development-debuggers.xml:51 table-development-debuggers.xml:52
-#: table-development-debuggers.xml:53 table-development-documentation.xml:30
+#: table-applications-productivity.xml:53
+#: table-applications-publishing.xml:30
+#: table-applications-publishing.xml:33
+#: table-applications-publishing.xml:36
+#: table-applications-publishing.xml:39
+#: table-applications-publishing.xml:51
+#: table-applications-publishing.xml:52
+#: table-applications-publishing.xml:53
+#: table-applications-system.xml:30
+#: table-applications-system.xml:33
+#: table-applications-system.xml:36
+#: table-applications-system.xml:39
+#: table-applications-system.xml:51
+#: table-applications-system.xml:52
+#: table-applications-system.xml:53
+#: table-applications-text.xml:30
+#: table-applications-text.xml:33
+#: table-applications-text.xml:36
+#: table-applications-text.xml:39
+#: table-applications-text.xml:51
+#: table-applications-text.xml:52
+#: table-applications-text.xml:53
+#: table-desktop-accessibility.xml:31
+#: table-desktop-accessibility.xml:34
+#: table-desktop-accessibility.xml:37
+#: table-desktop-accessibility.xml:40
+#: table-desktop-accessibility.xml:52
+#: table-desktop-accessibility.xml:53
+#: table-desktop-accessibility.xml:54
+#: table-development-build_tools.xml:30
+#: table-development-build_tools.xml:33
+#: table-development-build_tools.xml:36
+#: table-development-build_tools.xml:39
+#: table-development-build_tools.xml:51
+#: table-development-build_tools.xml:52
+#: table-development-build_tools.xml:53
+#: table-development-debuggers.xml:30
+#: table-development-debuggers.xml:33
+#: table-development-debuggers.xml:36
+#: table-development-debuggers.xml:39
+#: table-development-debuggers.xml:51
+#: table-development-debuggers.xml:52
+#: table-development-debuggers.xml:53
+#: table-development-documentation.xml:30
 #: table-development-documentation.xml:33
 #: table-development-documentation.xml:36
 #: table-development-documentation.xml:39
 #: table-development-documentation.xml:51
 #: table-development-documentation.xml:52
-#: table-development-documentation.xml:53 table-development-java.xml:30
-#: table-development-java.xml:33 table-development-java.xml:36
-#: table-development-java.xml:39 table-development-java.xml:51
-#: table-development-java.xml:52 table-development-java.xml:53
-#: table-development-languages.xml:30 table-development-languages.xml:33
-#: table-development-languages.xml:36 table-development-languages.xml:39
-#: table-development-languages.xml:51 table-development-languages.xml:52
-#: table-development-languages.xml:53 table-development-libraries-java.xml:30
+#: table-development-documentation.xml:53
+#: table-development-java.xml:30
+#: table-development-java.xml:33
+#: table-development-java.xml:36
+#: table-development-java.xml:39
+#: table-development-java.xml:51
+#: table-development-java.xml:52
+#: table-development-java.xml:53
+#: table-development-languages.xml:30
+#: table-development-languages.xml:33
+#: table-development-languages.xml:36
+#: table-development-languages.xml:39
+#: table-development-languages.xml:51
+#: table-development-languages.xml:52
+#: table-development-languages.xml:53
+#: table-development-libraries-java.xml:30
 #: table-development-libraries-java.xml:33
 #: table-development-libraries-java.xml:36
 #: table-development-libraries-java.xml:39
 #: table-development-libraries-java.xml:51
 #: table-development-libraries-java.xml:52
-#: table-development-libraries-java.xml:53 table-development-libraries.xml:30
-#: table-development-libraries.xml:33 table-development-libraries.xml:36
-#: table-development-libraries.xml:39 table-development-libraries.xml:51
-#: table-development-libraries.xml:52 table-development-libraries.xml:53
-#: table-development.xml:30 table-development.xml:33 table-development.xml:36
-#: table-development.xml:39 table-development.xml:51 table-development.xml:52
-#: table-development.xml:53 table-development-python.xml:30
-#: table-development-python.xml:33 table-development-python.xml:36
-#: table-development-python.xml:39 table-development-python.xml:51
-#: table-development-python.xml:52 table-development-python.xml:53
-#: table-development-ruby.xml:30 table-development-ruby.xml:33
-#: table-development-ruby.xml:36 table-development-ruby.xml:39
-#: table-development-ruby.xml:51 table-development-ruby.xml:52
-#: table-development-ruby.xml:53 table-development-system.xml:30
-#: table-development-system.xml:33 table-development-system.xml:36
-#: table-development-system.xml:39 table-development-system.xml:51
-#: table-development-system.xml:52 table-development-system.xml:53
-#: table-development-tools.xml:30 table-development-tools.xml:33
-#: table-development-tools.xml:36 table-development-tools.xml:39
-#: table-development-tools.xml:51 table-development-tools.xml:52
-#: table-development-tools.xml:53 table-documentation.xml:30
-#: table-documentation.xml:33 table-documentation.xml:36
-#: table-documentation.xml:39 table-documentation.xml:51
-#: table-documentation.xml:52 table-documentation.xml:53
-#: table-sugar-activities.xml:30 table-sugar-activities.xml:33
-#: table-sugar-activities.xml:36 table-sugar-activities.xml:39
-#: table-sugar-activities.xml:51 table-sugar-activities.xml:52
-#: table-sugar-activities.xml:53 table-system_environment-base.xml:30
-#: table-system_environment-base.xml:33 table-system_environment-base.xml:36
-#: table-system_environment-base.xml:39 table-system_environment-base.xml:51
-#: table-system_environment-base.xml:52 table-system_environment-base.xml:53
+#: table-development-libraries-java.xml:53
+#: table-development-libraries.xml:30
+#: table-development-libraries.xml:33
+#: table-development-libraries.xml:36
+#: table-development-libraries.xml:39
+#: table-development-libraries.xml:51
+#: table-development-libraries.xml:52
+#: table-development-libraries.xml:53
+#: table-development.xml:30
+#: table-development.xml:33
+#: table-development.xml:36
+#: table-development.xml:39
+#: table-development.xml:51
+#: table-development.xml:52
+#: table-development.xml:53
+#: table-development-python.xml:30
+#: table-development-python.xml:33
+#: table-development-python.xml:36
+#: table-development-python.xml:39
+#: table-development-python.xml:51
+#: table-development-python.xml:52
+#: table-development-python.xml:53
+#: table-development-ruby.xml:30
+#: table-development-ruby.xml:33
+#: table-development-ruby.xml:36
+#: table-development-ruby.xml:39
+#: table-development-ruby.xml:51
+#: table-development-ruby.xml:52
+#: table-development-ruby.xml:53
+#: table-development-system.xml:30
+#: table-development-system.xml:33
+#: table-development-system.xml:36
+#: table-development-system.xml:39
+#: table-development-system.xml:51
+#: table-development-system.xml:52
+#: table-development-system.xml:53
+#: table-development-tools.xml:30
+#: table-development-tools.xml:33
+#: table-development-tools.xml:36
+#: table-development-tools.xml:39
+#: table-development-tools.xml:51
+#: table-development-tools.xml:52
+#: table-development-tools.xml:53
+#: table-documentation.xml:30
+#: table-documentation.xml:33
+#: table-documentation.xml:36
+#: table-documentation.xml:39
+#: table-documentation.xml:51
+#: table-documentation.xml:52
+#: table-documentation.xml:53
+#: table-sugar-activities.xml:30
+#: table-sugar-activities.xml:33
+#: table-sugar-activities.xml:36
+#: table-sugar-activities.xml:39
+#: table-sugar-activities.xml:51
+#: table-sugar-activities.xml:52
+#: table-sugar-activities.xml:53
+#: table-system_environment-base.xml:30
+#: table-system_environment-base.xml:33
+#: table-system_environment-base.xml:36
+#: table-system_environment-base.xml:39
+#: table-system_environment-base.xml:51
+#: table-system_environment-base.xml:52
+#: table-system_environment-base.xml:53
 #: table-system_environment-daemons.xml:30
 #: table-system_environment-daemons.xml:33
 #: table-system_environment-daemons.xml:36
@@ -5551,20 +4229,34 @@ msgstr "上游URL"
 #: table-system_environment-shells.xml:51
 #: table-system_environment-shells.xml:52
 #: table-system_environment-shells.xml:53
-#: table-system_environment-tools.xml:30 table-system_environment-tools.xml:33
-#: table-system_environment-tools.xml:36 table-system_environment-tools.xml:39
-#: table-system_environment-tools.xml:51 table-system_environment-tools.xml:52
-#: table-system_environment-tools.xml:53 table-systems_management-base.xml:30
-#: table-systems_management-base.xml:33 table-systems_management-base.xml:36
-#: table-systems_management-base.xml:39 table-systems_management-base.xml:51
-#: table-systems_management-base.xml:52 table-systems_management-base.xml:53
-#: table-user_interface-desktop.xml:31 table-user_interface-desktop.xml:34
-#: table-user_interface-desktop.xml:37 table-user_interface-desktop.xml:40
-#: table-user_interface-desktop.xml:52 table-user_interface-desktop.xml:53
-#: table-user_interface-desktop.xml:54 table-user_interface-desktops.xml:30
-#: table-user_interface-desktops.xml:33 table-user_interface-desktops.xml:36
-#: table-user_interface-desktops.xml:39 table-user_interface-desktops.xml:51
-#: table-user_interface-desktops.xml:52 table-user_interface-desktops.xml:53
+#: table-system_environment-tools.xml:30
+#: table-system_environment-tools.xml:33
+#: table-system_environment-tools.xml:36
+#: table-system_environment-tools.xml:39
+#: table-system_environment-tools.xml:51
+#: table-system_environment-tools.xml:52
+#: table-system_environment-tools.xml:53
+#: table-systems_management-base.xml:30
+#: table-systems_management-base.xml:33
+#: table-systems_management-base.xml:36
+#: table-systems_management-base.xml:39
+#: table-systems_management-base.xml:51
+#: table-systems_management-base.xml:52
+#: table-systems_management-base.xml:53
+#: table-user_interface-desktop.xml:31
+#: table-user_interface-desktop.xml:34
+#: table-user_interface-desktop.xml:37
+#: table-user_interface-desktop.xml:40
+#: table-user_interface-desktop.xml:52
+#: table-user_interface-desktop.xml:53
+#: table-user_interface-desktop.xml:54
+#: table-user_interface-desktops.xml:30
+#: table-user_interface-desktops.xml:33
+#: table-user_interface-desktops.xml:36
+#: table-user_interface-desktops.xml:39
+#: table-user_interface-desktops.xml:51
+#: table-user_interface-desktops.xml:52
+#: table-user_interface-desktops.xml:53
 #: table-user_interface-x_hardware_support.xml:30
 #: table-user_interface-x_hardware_support.xml:33
 #: table-user_interface-x_hardware_support.xml:36
@@ -5572,39 +4264,59 @@ msgstr "上游URL"
 #: table-user_interface-x_hardware_support.xml:51
 #: table-user_interface-x_hardware_support.xml:52
 #: table-user_interface-x_hardware_support.xml:53
-#: table-user_interface-x.xml:30 table-user_interface-x.xml:33
-#: table-user_interface-x.xml:36 table-user_interface-x.xml:39
-#: table-user_interface-x.xml:51 table-user_interface-x.xml:52
+#: table-user_interface-x.xml:30
+#: table-user_interface-x.xml:33
+#: table-user_interface-x.xml:36
+#: table-user_interface-x.xml:39
+#: table-user_interface-x.xml:51
+#: table-user_interface-x.xml:52
 #: table-user_interface-x.xml:53
 #, no-c-format
 msgid "<entry>-</entry>"
 msgstr "<entry>-</entry>"
 
 #. Tag: entry
-#: table-amusements-games.xml:51 table-amusements-graphics.xml:53
-#: table-application-editors.xml:52 table-applications-archiving.xml:53
+#: table-amusements-games.xml:51
+#: table-amusements-graphics.xml:53
+#: table-application-editors.xml:52
+#: table-applications-archiving.xml:53
 #: table-applications-communications.xml:51
-#: table-applications-databases.xml:51 table-applications-editors.xml:51
-#: table-applications-emulators.xml:51 table-applications-engineering.xml:51
-#: table-applications-file.xml:51 table-applications-internet.xml:51
-#: table-applications-multimedia.xml:51 table-applications-productivity.xml:51
-#: table-applications-publishing.xml:51 table-applications-system.xml:51
-#: table-applications-text.xml:51 table-desktop-accessibility.xml:52
-#: table-development-build_tools.xml:51 table-development-debuggers.xml:51
-#: table-development-documentation.xml:51 table-development-java.xml:51
-#: table-development-languages.xml:51 table-development-libraries-java.xml:51
-#: table-development-libraries.xml:51 table-development.xml:51
-#: table-development-python.xml:51 table-development-ruby.xml:51
-#: table-development-system.xml:51 table-development-tools.xml:51
-#: table-documentation.xml:51 table-sugar-activities.xml:51
+#: table-applications-databases.xml:51
+#: table-applications-editors.xml:51
+#: table-applications-emulators.xml:51
+#: table-applications-engineering.xml:51
+#: table-applications-file.xml:51
+#: table-applications-internet.xml:51
+#: table-applications-multimedia.xml:51
+#: table-applications-productivity.xml:51
+#: table-applications-publishing.xml:51
+#: table-applications-system.xml:51
+#: table-applications-text.xml:51
+#: table-desktop-accessibility.xml:52
+#: table-development-build_tools.xml:51
+#: table-development-debuggers.xml:51
+#: table-development-documentation.xml:51
+#: table-development-java.xml:51
+#: table-development-languages.xml:51
+#: table-development-libraries-java.xml:51
+#: table-development-libraries.xml:51
+#: table-development.xml:51
+#: table-development-python.xml:51
+#: table-development-ruby.xml:51
+#: table-development-system.xml:51
+#: table-development-tools.xml:51
+#: table-documentation.xml:51
+#: table-sugar-activities.xml:51
 #: table-system_environment-base.xml:51
 #: table-system_environment-daemons.xml:51
 #: table-system_environment-kernel.xml:51
 #: table-system_environment-libraries.xml:51
 #: table-system_environment-shells.xml:51
-#: table-system_environment-tools.xml:51 table-systems_management-base.xml:51
+#: table-system_environment-tools.xml:51
+#: table-systems_management-base.xml:51
 #: table-text_editors-integrated_development_environments__ide_.xml:700
-#: table-text_processing-markup-xml.xml:54 table-user_interface-desktop.xml:52
+#: table-text_processing-markup-xml.xml:54
+#: table-user_interface-desktop.xml:52
 #: table-user_interface-desktops.xml:51
 #: table-user_interface-x_hardware_support.xml:51
 #: table-user_interface-x.xml:51
@@ -5613,30 +4325,47 @@ msgid "Packages changed"
 msgstr "已更改软件包"
 
 #. Tag: entry
-#: table-amusements-games.xml:52 table-amusements-graphics.xml:54
-#: table-application-editors.xml:53 table-applications-archiving.xml:54
+#: table-amusements-games.xml:52
+#: table-amusements-graphics.xml:54
+#: table-application-editors.xml:53
+#: table-applications-archiving.xml:54
 #: table-applications-communications.xml:52
-#: table-applications-databases.xml:52 table-applications-editors.xml:52
-#: table-applications-emulators.xml:52 table-applications-engineering.xml:52
-#: table-applications-file.xml:52 table-applications-internet.xml:52
-#: table-applications-multimedia.xml:52 table-applications-productivity.xml:52
-#: table-applications-publishing.xml:52 table-applications-system.xml:52
-#: table-applications-text.xml:52 table-desktop-accessibility.xml:53
-#: table-development-build_tools.xml:52 table-development-debuggers.xml:52
-#: table-development-documentation.xml:52 table-development-java.xml:52
-#: table-development-languages.xml:52 table-development-libraries-java.xml:52
-#: table-development-libraries.xml:52 table-development.xml:52
-#: table-development-python.xml:52 table-development-ruby.xml:52
-#: table-development-system.xml:52 table-development-tools.xml:52
-#: table-documentation.xml:52 table-sugar-activities.xml:52
+#: table-applications-databases.xml:52
+#: table-applications-editors.xml:52
+#: table-applications-emulators.xml:52
+#: table-applications-engineering.xml:52
+#: table-applications-file.xml:52
+#: table-applications-internet.xml:52
+#: table-applications-multimedia.xml:52
+#: table-applications-productivity.xml:52
+#: table-applications-publishing.xml:52
+#: table-applications-system.xml:52
+#: table-applications-text.xml:52
+#: table-desktop-accessibility.xml:53
+#: table-development-build_tools.xml:52
+#: table-development-debuggers.xml:52
+#: table-development-documentation.xml:52
+#: table-development-java.xml:52
+#: table-development-languages.xml:52
+#: table-development-libraries-java.xml:52
+#: table-development-libraries.xml:52
+#: table-development.xml:52
+#: table-development-python.xml:52
+#: table-development-ruby.xml:52
+#: table-development-system.xml:52
+#: table-development-tools.xml:52
+#: table-documentation.xml:52
+#: table-sugar-activities.xml:52
 #: table-system_environment-base.xml:52
 #: table-system_environment-daemons.xml:52
 #: table-system_environment-kernel.xml:52
 #: table-system_environment-libraries.xml:52
 #: table-system_environment-shells.xml:52
-#: table-system_environment-tools.xml:52 table-systems_management-base.xml:52
+#: table-system_environment-tools.xml:52
+#: table-systems_management-base.xml:52
 #: table-text_editors-integrated_development_environments__ide_.xml:701
-#: table-text_processing-markup-xml.xml:55 table-user_interface-desktop.xml:53
+#: table-text_processing-markup-xml.xml:55
+#: table-user_interface-desktop.xml:53
 #: table-user_interface-desktops.xml:52
 #: table-user_interface-x_hardware_support.xml:52
 #: table-user_interface-x.xml:52
@@ -5645,30 +4374,47 @@ msgid "Packages unchanged"
 msgstr "未更改软件包"
 
 #. Tag: entry
-#: table-amusements-games.xml:53 table-amusements-graphics.xml:55
-#: table-application-editors.xml:54 table-applications-archiving.xml:55
+#: table-amusements-games.xml:53
+#: table-amusements-graphics.xml:55
+#: table-application-editors.xml:54
+#: table-applications-archiving.xml:55
 #: table-applications-communications.xml:53
-#: table-applications-databases.xml:53 table-applications-editors.xml:53
-#: table-applications-emulators.xml:53 table-applications-engineering.xml:53
-#: table-applications-file.xml:53 table-applications-internet.xml:53
-#: table-applications-multimedia.xml:53 table-applications-productivity.xml:53
-#: table-applications-publishing.xml:53 table-applications-system.xml:53
-#: table-applications-text.xml:53 table-desktop-accessibility.xml:54
-#: table-development-build_tools.xml:53 table-development-debuggers.xml:53
-#: table-development-documentation.xml:53 table-development-java.xml:53
-#: table-development-languages.xml:53 table-development-libraries-java.xml:53
-#: table-development-libraries.xml:53 table-development.xml:53
-#: table-development-python.xml:53 table-development-ruby.xml:53
-#: table-development-system.xml:53 table-development-tools.xml:53
-#: table-documentation.xml:53 table-sugar-activities.xml:53
+#: table-applications-databases.xml:53
+#: table-applications-editors.xml:53
+#: table-applications-emulators.xml:53
+#: table-applications-engineering.xml:53
+#: table-applications-file.xml:53
+#: table-applications-internet.xml:53
+#: table-applications-multimedia.xml:53
+#: table-applications-productivity.xml:53
+#: table-applications-publishing.xml:53
+#: table-applications-system.xml:53
+#: table-applications-text.xml:53
+#: table-desktop-accessibility.xml:54
+#: table-development-build_tools.xml:53
+#: table-development-debuggers.xml:53
+#: table-development-documentation.xml:53
+#: table-development-java.xml:53
+#: table-development-languages.xml:53
+#: table-development-libraries-java.xml:53
+#: table-development-libraries.xml:53
+#: table-development.xml:53
+#: table-development-python.xml:53
+#: table-development-ruby.xml:53
+#: table-development-system.xml:53
+#: table-development-tools.xml:53
+#: table-documentation.xml:53
+#: table-sugar-activities.xml:53
 #: table-system_environment-base.xml:53
 #: table-system_environment-daemons.xml:53
 #: table-system_environment-kernel.xml:53
 #: table-system_environment-libraries.xml:53
 #: table-system_environment-shells.xml:53
-#: table-system_environment-tools.xml:53 table-systems_management-base.xml:53
+#: table-system_environment-tools.xml:53
+#: table-systems_management-base.xml:53
 #: table-text_editors-integrated_development_environments__ide_.xml:702
-#: table-text_processing-markup-xml.xml:56 table-user_interface-desktop.xml:54
+#: table-text_processing-markup-xml.xml:56
+#: table-user_interface-desktop.xml:54
 #: table-user_interface-desktops.xml:53
 #: table-user_interface-x_hardware_support.xml:53
 #: table-user_interface-x.xml:53
@@ -6201,24 +4947,23 @@ msgstr "<title>虚拟化</title>"
 #. 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: primary
-#: Virtualization.xml:11 Virtualization.xml:225
+#: Virtualization.xml:11
+#: Virtualization.xml:225
 #, no-c-format
 msgid "<primary>Virtualization</primary>"
 msgstr "<primary>虚拟化</primary>"
 
 #. Tag: primary
-#: Virtualization.xml:12 Virtualization.xml:46 Virtualization.xml:65
-#: Virtualization.xml:85 Virtualization.xml:100 Virtualization.xml:127
+#: Virtualization.xml:12
+#: Virtualization.xml:46
+#: Virtualization.xml:65
+#: Virtualization.xml:85
+#: Virtualization.xml:100
+#: Virtualization.xml:127
 #, no-c-format
 msgid "<primary>KVM</primary>"
 msgstr "<primary>KVM</primary>"
@@ -6230,25 +4975,29 @@ msgid "<primary>Xen</primary>"
 msgstr "<primary>Xen</primary>"
 
 #. Tag: primary
-#: Virtualization.xml:14 Virtualization.xml:302
+#: Virtualization.xml:14
+#: Virtualization.xml:302
 #, no-c-format
 msgid "qemu"
 msgstr "qemu"
 
 #. Tag: primary
-#: Virtualization.xml:15 Virtualization.xml:301
+#: Virtualization.xml:15
+#: Virtualization.xml:301
 #, no-c-format
 msgid "gPXE"
 msgstr "gPXE"
 
 #. Tag: primary
-#: Virtualization.xml:17 Virtualization.xml:151
+#: Virtualization.xml:17
+#: Virtualization.xml:151
 #, no-c-format
 msgid "libguestfs"
 msgstr "libguestfs"
 
 #. Tag: primary
-#: Virtualization.xml:18 Virtualization.xml:152
+#: Virtualization.xml:18
+#: Virtualization.xml:152
 #, no-c-format
 msgid "guestfish"
 msgstr "guestfish"
@@ -6256,47 +5005,26 @@ msgstr "guestfish"
 #. Tag: para
 #: Virtualization.xml:18
 #, no-c-format
-msgid ""
-"Virtualization in Fedora 12 includes major changes, and new features, "
-"that continue to support KVM, Xen, and many other virtual machine platforms."
-msgstr ""
-"Fedora 12中的虚拟化包含重大修改和新特徴，依然继续支持 KVM、Xen 以及许多"
-"其它虚拟机器平台。"
+msgid "Virtualization in Fedora 12 includes major changes, and new features, that continue to support KVM, Xen, and many other virtual machine platforms."
+msgstr "Fedora 12中的虚拟化包含重大修改和新特徴，依然继续支持 KVM、Xen 以及许多其它虚拟机器平台。"
 
 #. Tag: para
 #: Virtualization.xml:23
 #, no-c-format
-msgid ""
-"KVM and QEMU have gained a number of new features in this release. KVM guest "
-"memory usage and performance is improved by the addition of KSM and KVM Huge "
-"Page Backed Memory. The performance of the qcow2 image format is greatly "
-"improved. Support for both SR-IOV and NIC hotplug has been added. Finally, "
-"gPXE is now used in place of etherboot for guest PXE booting."
-msgstr ""
-"本发行版的KVM和QEMU增加了一系列的新特性。通过加入KSM及KVM大页面备份内存，KVM"
-"客户机内存使用及性能都有所提高。qcow2镜像格式的性能大幅提高。增加了对SR-IOV和"
-"NIC热插拔支持。gPXE取代etherboot用于客户机PXE的引导。"
+msgid "KVM and QEMU have gained a number of new features in this release. KVM guest memory usage and performance is improved by the addition of KSM and KVM Huge Page Backed Memory. The performance of the qcow2 image format is greatly improved. Support for both SR-IOV and NIC hotplug has been added. Finally, gPXE is now used in place of etherboot for guest PXE booting."
+msgstr "本发行版的KVM和QEMU增加了一系列的新特性。通过加入KSM及KVM大页面备份内存，KVM客户机内存使用及性能都有所提高。qcow2镜像格式的性能大幅提高。增加了对SR-IOV和NIC热插拔支持。gPXE取代etherboot用于客户机PXE的引导。"
 
 #. Tag: para
 #: Virtualization.xml:31
 #, no-c-format
-msgid ""
-"On the libvirt side, APIs have been added for storage management and network "
-"interface management. libvirt now also runs QEMU processes unprivileged."
-msgstr ""
-"libvirt方面，增加了针对存储管理和网络界面管理的API。libvirt无需权限即可运行"
-"QEMU进程。"
+msgid "On the libvirt side, APIs have been added for storage management and network interface management. libvirt now also runs QEMU processes unprivileged."
+msgstr "libvirt方面，增加了针对存储管理和网络界面管理的API。libvirt无需权限即可运行QEMU进程。"
 
 #. Tag: para
 #: Virtualization.xml:36
 #, no-c-format
-msgid ""
-"A new library (<application>libguestfs</application>) and an interactive "
-"tool (<application>guestfish</application>) is now available for accessing "
-"and modifying virtual machine disk images."
-msgstr ""
-"新的库（<application>libguestfs</application>）和交互式工具"
-"（<application>guestfish</application>）可读取及修改虚拟机磁盘镜像。"
+msgid "A new library (<application>libguestfs</application>) and an interactive tool (<application>guestfish</application>) is now available for accessing and modifying virtual machine disk images."
+msgstr "新的库（<application>libguestfs</application>）和交互式工具（<application>guestfish</application>）可读取及修改虚拟机磁盘镜像。"
 
 #. Tag: title
 #: Virtualization.xml:43
@@ -6319,28 +5047,14 @@ msgstr "内核"
 #. Tag: para
 #: Virtualization.xml:47
 #, no-c-format
-msgid ""
-"<firstterm>Kernel SamePage Merging</firstterm> (KSM) allows identical memory "
-"pages to be merged by the kernel into a single page shared between one or "
-"more processes. This feature is leveraged by KVM to allow multiple, similar, "
-"guest virtual machines to have a reduced memory footprint. Because memory is "
-"shared, the combined memory usage of the guests is reduced."
-msgstr ""
-"<firstterm>Kernel SamePage Merging</firstterm> (KSM) 允许完全相同的记忆分页由"
-"内核合并成一个分页，并在一个或多个处理器间共享。这项功能让KVM通过杠杆作用，使"
-"多个执行相近作业系统的客户虚拟机可以减少内存足迹。由於内存共享，使各个虚拟机"
-"合共使用的内存得以减少。"
+msgid "<firstterm>Kernel SamePage Merging</firstterm> (KSM) allows identical memory pages to be merged by the kernel into a single page shared between one or more processes. This feature is leveraged by KVM to allow multiple, similar, guest virtual machines to have a reduced memory footprint. Because memory is shared, the combined memory usage of the guests is reduced."
+msgstr "<firstterm>Kernel SamePage Merging</firstterm> (KSM) 允许完全相同的记忆分页由内核合并成一个分页，并在一个或多个处理器间共享。这项功能让KVM通过杠杆作用，使多个执行相近作业系统的客户虚拟机可以减少内存足迹。由於内存共享，使各个虚拟机合共使用的内存得以减少。"
 
 #. Tag: para
 #: Virtualization.xml:55
 #, no-c-format
-msgid ""
-"For further details refer to <ulink url=\"http://fedoraproject.org/wiki/"
-"Features/KSM\"></ulink> and <ulink url=\"http://lwn.net/Articles/306704/\"></"
-"ulink>"
-msgstr ""
-"详情请参考<ulink url=\"http://fedoraproject.org/wiki/Features/KSM\"></ulink>"
-"和<ulink url=\"http://lwn.net/Articles/306704/\"></ulink>"
+msgid "For further details refer to <ulink url=\"http://fedoraproject.org/wiki/Features/KSM\"></ulink> and <ulink url=\"http://lwn.net/Articles/306704/\"></ulink>"
+msgstr "详情请参考<ulink url=\"http://fedoraproject.org/wiki/Features/KSM\"></ulink>和<ulink url=\"http://lwn.net/Articles/306704/\"></ulink>"
 
 #. Tag: title
 #: Virtualization.xml:63
@@ -6357,28 +5071,14 @@ msgstr "大页面备份内存"
 #. Tag: para
 #: Virtualization.xml:67
 #, no-c-format
-msgid ""
-"Enable KVM guests to use huge page backed memory in order to reduce memory "
-"consumption and improve performance by reducing CPU cache pressure. Users of "
-"KVM guests using huge page backed memory should experience improved "
-"performance with some savings in host memory consumption. The performance "
-"benefit is workload dependent.Using huge pages for guest memory does have a "
-"downside, however - you can no longer swap nor balloon guest memory."
-msgstr ""
-"为KVM客户机启用大页面备份内存是为了减少内存消耗和通过降低CPU缓存压力来提高性"
-"能。使用大页面备份内存的KVM客户机用户应该能体会到通过降低主机内存消耗而带来的"
-"性能提升。性能提高取决于工作量。虽然客户机使用大页面也有缺点，但是您不必再为"
-"客户机交换或增加内存。"
+msgid "Enable KVM guests to use huge page backed memory in order to reduce memory consumption and improve performance by reducing CPU cache pressure. Users of KVM guests using huge page backed memory should experience improved performance with some savings in host memory consumption. The performance benefit is workload dependent.Using huge pages for guest memory does have a downside, however - you can no longer swap nor balloon guest memory."
+msgstr "为KVM客户机启用大页面备份内存是为了减少内存消耗和通过降低CPU缓存压力来提高性能。使用大页面备份内存的KVM客户机用户应该能体会到通过降低主机内存消耗而带来的性能提升。性能提高取决于工作量。虽然客户机使用大页面也有缺点，但是您不必再为客户机交换或增加内存。"
 
 #. Tag: para
 #: Virtualization.xml:77
 #, no-c-format
-msgid ""
-"For further details refer to: <ulink type=\"http\" url=\"http://"
-"fedoraproject.org/wiki/Features/KVM_Huge_Page_Backed_Memory\"></ulink>."
-msgstr ""
-"详情请参考：<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"Features/KVM_Huge_Page_Backed_Memory\"></ulink>。"
+msgid "For further details refer to: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Features/KVM_Huge_Page_Backed_Memory\"></ulink>."
+msgstr "详情请参考：<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Features/KVM_Huge_Page_Backed_Memory\"></ulink>。"
 
 #. Tag: title
 #: Virtualization.xml:83
@@ -6395,23 +5095,14 @@ msgstr "NIC热插拔"
 #. Tag: para
 #: Virtualization.xml:87
 #, no-c-format
-msgid ""
-"Network interfaces may now be added to a running KVM guest using "
-"<package>libvirt</package>/<package>virt-manager</package> without the need "
-"to restart the guest."
-msgstr ""
-"在不重启客户机的情况下使用<package>libvirt</package>/<package>virt-manager</"
-"package>可将网络连接添加到运行的KVM客户机上。"
+msgid "Network interfaces may now be added to a running KVM guest using <package>libvirt</package>/<package>virt-manager</package> without the need to restart the guest."
+msgstr "在不重启客户机的情况下使用<package>libvirt</package>/<package>virt-manager</package>可将网络连接添加到运行的KVM客户机上。"
 
 #. Tag: para
 #: Virtualization.xml:92
 #, no-c-format
-msgid ""
-"For further details refer to: <ulink type=\"http\" url=\"http://"
-"fedoraproject.org/wiki/Features/KVM_NIC_Hotplug\"></ulink>."
-msgstr ""
-"详情请参考：<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"Features/KVM_NIC_Hotplug\"></ulink>。"
+msgid "For further details refer to: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Features/KVM_NIC_Hotplug\"></ulink>."
+msgstr "详情请参考：<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Features/KVM_NIC_Hotplug\"></ulink>。"
 
 #. Tag: title
 #: Virtualization.xml:98
@@ -6428,49 +5119,26 @@ msgstr "qcow2性能"
 #. Tag: para
 #: Virtualization.xml:102
 #, no-c-format
-msgid ""
-"The native disk image file format of <package>qemu</package> is "
-"<command>qcow2</command>. Qcow2 provides enhanced features over raw images, "
-"including: base images, snapshots, compression, and encryption."
-msgstr ""
-"<package>qemu</package>的本地磁盘镜像文件格式为<command>qcow2</command>。"
-"Qcow2为原生镜像提供了增强功能，包括：基本镜像、快照、压缩以及加密。"
+msgid "The native disk image file format of <package>qemu</package> is <command>qcow2</command>. Qcow2 provides enhanced features over raw images, including: base images, snapshots, compression, and encryption."
+msgstr "<package>qemu</package>的本地磁盘镜像文件格式为<command>qcow2</command>。Qcow2为原生镜像提供了增强功能，包括：基本镜像、快照、压缩以及加密。"
 
 #. Tag: para
 #: Virtualization.xml:108
 #, no-c-format
-msgid ""
-"Users wishing to protect guest machine data from host crashes commonly "
-"disable write caching on the host. Previously, this led to very poor "
-"performance for guests in qcow2 images."
-msgstr ""
-"用户通常会禁用主机上的写如缓存以防止客户机的数据受到主机破坏。之前这将会明显"
-"降低qcow2镜像中客户机的性能。"
+msgid "Users wishing to protect guest machine data from host crashes commonly disable write caching on the host. Previously, this led to very poor performance for guests in qcow2 images."
+msgstr "用户通常会禁用主机上的写如缓存以防止客户机的数据受到主机破坏。之前这将会明显降低qcow2镜像中客户机的性能。"
 
 #. Tag: para
 #: Virtualization.xml:113
 #, no-c-format
-msgid ""
-"The I/O performance of qcow2 disk images has been greatly improved. Users "
-"who did not use qcow2 because of the poor performance may consider to switch "
-"and take advantage of the additional features the format provides over raw "
-"disk images."
-msgstr ""
-"qcow2磁盘镜像的I/O性能得到很大改进。由于qcow2性能较差而不去使用的用户，现在可"
-"以考虑转换并利用该格式提供的针对原生磁盘镜像的特性。"
+msgid "The I/O performance of qcow2 disk images has been greatly improved. Users who did not use qcow2 because of the poor performance may consider to switch and take advantage of the additional features the format provides over raw disk images."
+msgstr "qcow2磁盘镜像的I/O性能得到很大改进。由于qcow2性能较差而不去使用的用户，现在可以考虑转换并利用该格式提供的针对原生磁盘镜像的特性。"
 
 #. Tag: para
 #: Virtualization.xml:119
 #, no-c-format
-msgid ""
-"For further details refer to: <ulink type=\"http\" url=\"http://"
-"fedoraproject.org/wiki/Features/KVM_qcow2_Performance\"></ulink> and <ulink "
-"type=\"http\" url=\"http://www.gnome.org/~markmc/qcow-image-format.html\"></"
-"ulink>."
-msgstr ""
-"详情请参考：<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"Features/KVM_qcow2_Performance\"></ulink>和<ulink type=\"http\" url=\"http://"
-"www.gnome.org/~markmc/qcow-image-format.html\"></ulink>."
+msgid "For further details refer to: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Features/KVM_qcow2_Performance\"></ulink> and <ulink type=\"http\" url=\"http://www.gnome.org/~markmc/qcow-image-format.html\"></ulink>."
+msgstr "详情请参考：<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Features/KVM_qcow2_Performance\"></ulink>和<ulink type=\"http\" url=\"http://www.gnome.org/~markmc/qcow-image-format.html\"></ulink>."
 
 #. Tag: title
 #: Virtualization.xml:125
@@ -6487,40 +5155,20 @@ msgstr "穩定客戶端 ABI"
 #. Tag: para
 #: Virtualization.xml:129
 #, no-c-format
-msgid ""
-"KVM guests are presented with an emulated hardware platform or application "
-"binary interface that includes (e.g. a CPU model, APIC, PIT, ACPI tables, "
-"IDE/USB/VGA controllers, NICs etc.). When QEMU is updated to a new version, "
-"some aspects of this platform may change as new hardware capabilities are "
-"added. This is problematic for Windows guests where a guest ABI change may "
-"require a installation to be reactivated."
-msgstr ""
-"KVM客户机通过硬件模拟平台或者包含此平台的程序二进制接口（例如CPU、APIC、PIT、"
-"ACPI表、IDE/USB/VGA控制器、NIC等）得以实现。当QEMU更新至新版本时，此平台的某"
-"些层面会因新增的硬件性能而有所变化。这对Windows客户机来说是个问题，因为客户机"
-"ABI的变化可能需要重新进行安装。"
+msgid "KVM guests are presented with an emulated hardware platform or application binary interface that includes (e.g. a CPU model, APIC, PIT, ACPI tables, IDE/USB/VGA controllers, NICs etc.). When QEMU is updated to a new version, some aspects of this platform may change as new hardware capabilities are added. This is problematic for Windows guests where a guest ABI change may require a installation to be reactivated."
+msgstr "KVM客户机通过硬件模拟平台或者包含此平台的程序二进制接口（例如CPU、APIC、PIT、ACPI表、IDE/USB/VGA控制器、NIC等）得以实现。当QEMU更新至新版本时，此平台的某些层面会因新增的硬件性能而有所变化。这对Windows客户机来说是个问题，因为客户机ABI的变化可能需要重新进行安装。"
 
 #. Tag: para
 #: Virtualization.xml:138
 #, no-c-format
-msgid ""
-"Guest virtual machines will now be presented with the same ABI across QEMU "
-"upgrades."
+msgid "Guest virtual machines will now be presented with the same ABI across QEMU upgrades."
 msgstr "通过QEMU更新，客户虚拟机将使用相同的ABI。"
 
 #. Tag: para
 #: Virtualization.xml:142
 #, no-c-format
-msgid ""
-"For further details refer to: <ulink type=\"http\" url=\"http://"
-"fedoraproject.org/wiki/Features/KVM_Stable_Guest_ABI\"></ulink> and <ulink "
-"type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"KVM_Stable_Guest_ABI_Design_Notes\"></ulink>."
-msgstr ""
-"详情请参考：<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/"
-"Features/KVM_Stable_Guest_ABI\"></ulink> and <ulink type=\"http\" url="
-"\"http://fedoraproject.org/wiki/KVM_Stable_Guest_ABI_Design_Notes\"></"
-"ulink>。"
+msgid "For further details refer to: <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Features/KVM_Stable_Guest_ABI\"></ulink> and <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/KVM_Stable_Guest_ABI_Design_Notes\"></ulink>."
+msgstr "详情请参考：<ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Features/KVM_Stable_Guest_ABI\"></ulink> and <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/KVM_Stable_Guest_ABI_Design_Notes\"></ulink>。"
 
 #. Tag: title
 #: Virtualization.xml:149
@@ -6549,17 +5197,8 @@ msgstr "virt-cat"
 #. Tag: para
 #: Virtualization.xml:155
 #, no-c-format
-msgid ""
-"Added very late in the Fedora 11 development cycle, <package>libguestfs</"
-"package> is now an official feature in Fedora 12. <package>libguestfs</"
-"package> is a library for accessing and modifying guest disk images. Using "
-"Linux kernel and <package>qemu</package> code, <package>libguestfs</package> "
-"can access any type of guest filesystem that Linux and QEMU can."
-msgstr ""
-"Fedora 11开发周期中很晚才加入的<package>libguestfs</package>，现已成为Fedora "
-"12的正式特性。<package>libguestfs</package>是读取和修改客户机磁盘镜像的库。通"
-"过Linux内核及<package>qemu</package>代码，<package>libguestfs</package>可访问"
-"Linux和QEMU所能访问的任何客户机文件系统。"
+msgid "Added very late in the Fedora 11 development cycle, <package>libguestfs</package> is now an official feature in Fedora 12. <package>libguestfs</package> is a library for accessing and modifying guest disk images. Using Linux kernel and <package>qemu</package> code, <package>libguestfs</package> can access any type of guest filesystem that Linux and QEMU can."
+msgstr "Fedora 11开发周期中很晚才加入的<package>libguestfs</package>，现已成为Fedora 12的正式特性。<package>libguestfs</package>是读取和修改客户机磁盘镜像的库。通过Linux内核及<package>qemu</package>代码，<package>libguestfs</package>可访问Linux和QEMU所能访问的任何客户机文件系统。"
 
 #. Tag: para
 #: Virtualization.xml:164
@@ -6576,44 +5215,37 @@ msgstr "针对OCaml、Perl、Python、Ruby及Java编程语言的绑定。"
 #. Tag: para
 #: Virtualization.xml:174
 #, no-c-format
-msgid ""
-"<package>guestfish</package> - Provides an interactive shell for editing "
-"virtual machine filesystems and executing commands in the context of the "
-"guest."
-msgstr ""
-"<package>guestfish</package> - 为编辑虚拟机文件系统及客户机上执行命令提供交互"
-"式shell。"
+msgid "<package>guestfish</package> - Provides an interactive shell for editing virtual machine filesystems and executing commands in the context of the guest."
+msgstr "<package>guestfish</package> - 为编辑虚拟机文件系统及客户机上执行命令提供交互式shell。"
 
 #. Tag: para
 #: Virtualization.xml:181
 #, no-c-format
-msgid ""
-"<package>virt-df</package> - Displays free space on virtual machine "
-"filesystems"
+msgid "<package>virt-df</package> - Displays free space on virtual machine filesystems"
 msgstr "<package>virt-df</package> -显示虚拟机文件系统的剩余空间"
 
 #. Tag: para
 #: Virtualization.xml:187
 #, no-c-format
-msgid ""
-"<package>virt-inspector</package> - Displays OS version, kernel, drivers, "
-"mount points, applications, etc. in a virtual machine."
-msgstr ""
-"<package>virt-inspector</package> -显示虚拟机的操作系统版本、内核、驱动、挂载"
-"点、应用程序等。"
+msgid "<package>virt-inspector</package> - Displays OS version, kernel, drivers, mount points, applications, etc. in a virtual machine."
+msgstr "<package>virt-inspector</package> -显示虚拟机的操作系统版本、内核、驱动、挂载点、应用程序等。"
 
 #. Tag: para
 #: Virtualization.xml:194
 #, no-c-format
-msgid ""
-"<package>virt-cat</package> - \"Cat\" out any file from inside a virtual "
-"machine."
+msgid "<package>virt-cat</package> - \"Cat\" out any file from inside a virtual machine."
 msgstr "<package>virt-cat</package> - 从虚拟机内 \"Cat\" 任意文件。 "
 
 #. Tag: para
-#: Virtualization.xml:201 Virtualization.xml:235 Virtualization.xml:273
-#: Virtualization.xml:307 Virtualization.xml:364 Virtualization.xml:390
-#: Virtualization.xml:419 Virtualization.xml:445 Virtualization.xml:481
+#: Virtualization.xml:201
+#: Virtualization.xml:235
+#: Virtualization.xml:273
+#: Virtualization.xml:307
+#: Virtualization.xml:364
+#: Virtualization.xml:390
+#: Virtualization.xml:419
+#: Virtualization.xml:445
+#: Virtualization.xml:481
 #, no-c-format
 msgid "For further details refer to:"
 msgstr "了解更多信息请参考："
@@ -6633,16 +5265,8 @@ msgstr "网络界面管理"
 #. Tag: para
 #: Virtualization.xml:227
 #, no-c-format
-msgid ""
-"Commonly used host network configurations, like bridges, bonds, VLAN's and "
-"sensible combinations thereof may now be created using the general-purpose "
-"network configuration library, netcf. Enhancements to the <package>libvirt</"
-"package> API expose this new functionality to remote managment hosts with "
-"<package>libvirtd</package>"
-msgstr ""
-"像桥接、绑定、虚拟局域网以及其合理组合等常用的主机网络配置，现在可由通用网络"
-"配置库-netcf来创建。对<package>libvirt</package> API的增强展现了这个通过"
-"<package>libvirtd</package>进行主机远程管理的新特性。"
+msgid "Commonly used host network configurations, like bridges, bonds, VLAN's and sensible combinations thereof may now be created using the general-purpose network configuration library, netcf. Enhancements to the <package>libvirt</package> API expose this new functionality to remote managment hosts with <package>libvirtd</package>"
+msgstr "像桥接、绑定、虚拟局域网以及其合理组合等常用的主机网络配置，现在可由通用网络配置库-netcf来创建。对<package>libvirt</package> API的增强展现了这个通过<package>libvirtd</package>进行主机远程管理的新特性。"
 
 #. Tag: title
 #: Virtualization.xml:261
@@ -6659,17 +5283,8 @@ msgstr "<primary>Single Root I/O Virtualizaton</primary>"
 #. Tag: para
 #: Virtualization.xml:263
 #, no-c-format
-msgid ""
-"Single Root I/O Virtualization is a PCI feature which allows virtual "
-"functions (VF) to be created that share the resources of a physical function "
-"(PF). The VF devices are assigned to guest virtual machines and appear as "
-"physical PCI devices inside the guest. Because the guest OS is effectively "
-"driving the hardware directly, the I/O performance is on par with bare metal "
-"performance."
-msgstr ""
-"Single Root I/O虚拟化是一种PCI特性，它允许创建与物理功能资源共享的虚拟功能"
-"（VF）。VF设备位于客户虚拟机中并以客户机PCI设备的形式出现。由于客户系统在直接"
-"有效地驱动硬件，因此I/O性能与实际硬件性能是一致的。"
+msgid "Single Root I/O Virtualization is a PCI feature which allows virtual functions (VF) to be created that share the resources of a physical function (PF). The VF devices are assigned to guest virtual machines and appear as physical PCI devices inside the guest. Because the guest OS is effectively driving the hardware directly, the I/O performance is on par with bare metal performance."
+msgstr "Single Root I/O虚拟化是一种PCI特性，它允许创建与物理功能资源共享的虚拟功能（VF）。VF设备位于客户虚拟机中并以客户机PCI设备的形式出现。由于客户系统在直接有效地驱动硬件，因此I/O性能与实际硬件性能是一致的。"
 
 #. Tag: title
 #: Virtualization.xml:299
@@ -6680,13 +5295,8 @@ msgstr "客户端默认使用gPXE"
 #. Tag: para
 #: Virtualization.xml:302
 #, no-c-format
-msgid ""
-"QEMU guests now make use of the more modern and currently maintained "
-"<package>gpxe</package> rather than the deprecated etherboot tool for PXE "
-"booting."
-msgstr ""
-"QEMU客户机目前使用更新的并且处于维护中的<package>gpxe</package>代替了"
-"etherboot工具用于PXE引导。"
+msgid "QEMU guests now make use of the more modern and currently maintained <package>gpxe</package> rather than the deprecated etherboot tool for PXE booting."
+msgstr "QEMU客户机目前使用更新的并且处于维护中的<package>gpxe</package>代替了etherboot工具用于PXE引导。"
 
 #. Tag: title
 #: Virtualization.xml:326
@@ -6697,59 +5307,38 @@ msgstr "Virt 权限"
 #. Tag: para
 #: Virtualization.xml:327
 #, no-c-format
-msgid ""
-"Changes have been introduced for QEMU/KVM virtual machines to improve host "
-"security in the event of a flaw in the QEMU binary."
-msgstr ""
-"对QEMU/KVM虚拟机做了一些修正，以改进在QEMU二进制中发生一个瑕疵事件时的主机安"
-"全性。"
+msgid "Changes have been introduced for QEMU/KVM virtual machines to improve host security in the event of a flaw in the QEMU binary."
+msgstr "对QEMU/KVM虚拟机做了一些修正，以改进在QEMU二进制中发生一个瑕疵事件时的主机安全性。"
 
 #. Tag: para
 #: Virtualization.xml:332
 #, no-c-format
-msgid ""
-"Permissions on /dev/kvm have been updated to allow unprivileged users to "
-"utilize KVM hardware acceleration."
+msgid "Permissions on /dev/kvm have been updated to allow unprivileged users to utilize KVM hardware acceleration."
 msgstr "/dev/kvm的权限更新，可让无权限用户使用KVM硬件加速。"
 
 #. Tag: para
 #: Virtualization.xml:338
 #, no-c-format
-msgid ""
-"QEMU processes spawned by virt-manager on a local desktop install now run as "
-"the desktop user."
+msgid "QEMU processes spawned by virt-manager on a local desktop install now run as the desktop user."
 msgstr "由在本地桌面安装的virt-manager生成的QEMU进程现在以桌面用户身份运行。"
 
 #. Tag: para
 #: Virtualization.xml:344
 #, no-c-format
-msgid ""
-"QEMU processes spawned by the privileged libvirtd daemon now run as an "
-"unprivileged account, user 'qemu', group 'qemu'."
-msgstr ""
-"由具有权限的libvirtd守护程序生成的QEMU进程，现在将以无权限帐户运行，用"
-"户“qemu”，组“qemu”。"
+msgid "QEMU processes spawned by the privileged libvirtd daemon now run as an unprivileged account, user 'qemu', group 'qemu'."
+msgstr "由具有权限的libvirtd守护程序生成的QEMU进程，现在将以无权限帐户运行，用户“qemu”，组“qemu”。"
 
 #. Tag: para
 #: Virtualization.xml:350
 #, no-c-format
-msgid ""
-"libvirtd will change ownership of any disks assigned to a virtual machine at "
-"startup, to user 'qemu', group 'qemu', except for readonly/shared disks."
-msgstr ""
-"除了只读/共享磁盘外，libvirtd在虚拟机启动时将把虚拟机上所有磁盘的所有者更改为"
-"用户“qemu”，组“qemu”。"
+msgid "libvirtd will change ownership of any disks assigned to a virtual machine at startup, to user 'qemu', group 'qemu', except for readonly/shared disks."
+msgstr "除了只读/共享磁盘外，libvirtd在虚拟机启动时将把虚拟机上所有磁盘的所有者更改为用户“qemu”，组“qemu”。"
 
 #. Tag: para
 #: Virtualization.xml:357
 #, no-c-format
-msgid ""
-"To revert to previous Fedora behaviour of running all QEMU instances as "
-"'root', two config parameters are introduced in /etc/libvirt/qemu.conf. It "
-"is not recommended to change these."
-msgstr ""
-"要恢复之前Fedora中以“root”用户运行QEMU的行为，涉及到/etc/libvirt/qemu.conf文"
-"件中的两个配置参数。并不推荐修改。"
+msgid "To revert to previous Fedora behaviour of running all QEMU instances as 'root', two config parameters are introduced in /etc/libvirt/qemu.conf. It is not recommended to change these."
+msgstr "要恢复之前Fedora中以“root”用户运行QEMU的行为，涉及到/etc/libvirt/qemu.conf文件中的两个配置参数。并不推荐修改。"
 
 #. Tag: title
 #: Virtualization.xml:377
@@ -6760,27 +5349,14 @@ msgstr "虚拟化存储管理"
 #. Tag: para
 #: Virtualization.xml:378
 #, no-c-format
-msgid ""
-"Fibre Channel N_Port ID Virtualization or NPIV allows the creation of "
-"multiple virtual N_Ports on a single physical host bus adapter. The libvirt "
-"node device APIs have been extended to create and destroy virtual adapters "
-"using NPIV."
-msgstr ""
-"Fibre Channel N_Port ID虚拟化或NPIV允许在单一物理主机总线适配器上创建多个虚拟"
-"N_Ports。libvirt节点设备API已扩展可使用NPIV创建和破坏虚拟适配器。"
+msgid "Fibre Channel N_Port ID Virtualization or NPIV allows the creation of multiple virtual N_Ports on a single physical host bus adapter. The libvirt node device APIs have been extended to create and destroy virtual adapters using NPIV."
+msgstr "Fibre Channel N_Port ID虚拟化或NPIV允许在单一物理主机总线适配器上创建多个虚拟N_Ports。libvirt节点设备API已扩展可使用NPIV创建和破坏虚拟适配器。"
 
 #. Tag: para
 #: Virtualization.xml:384
 #, no-c-format
-msgid ""
-"The APIs permitting storage discovery and pool creation have been extended "
-"to discover and rescan storage on a per-SCSI-host basis. Administrators may "
-"now discover, configure, and provision storage for virtual machines without "
-"the need for multiple tools."
-msgstr ""
-"这些API的允许储存设备发现和池创建的功能扩展至在per-SCSI-host基础上发现和重新"
-"扫描储存设备。管理员现在不再需要多种工具就可以为虚拟机发现、配置以及提供储存"
-"设备。"
+msgid "The APIs permitting storage discovery and pool creation have been extended to discover and rescan storage on a per-SCSI-host basis. Administrators may now discover, configure, and provision storage for virtual machines without the need for multiple tools."
+msgstr "这些API的允许储存设备发现和池创建的功能扩展至在per-SCSI-host基础上发现和重新扫描储存设备。管理员现在不再需要多种工具就可以为虚拟机发现、配置以及提供储存设备。"
 
 #. Tag: title
 #: Virtualization.xml:409
@@ -6797,16 +5373,8 @@ msgstr "Libvirt Technology 兼容性套件"
 #. Tag: para
 #: Virtualization.xml:412
 #, no-c-format
-msgid ""
-"Fedora now includes the libvirt Technology Compatibility Kit (TCK). The TCK "
-"is a functional test suite which provides detailed reports on functionality "
-"available for each libvirt driver and can be used to quickly identify "
-"failures or regressions in the development of Fedora's virtualization "
-"features."
-msgstr ""
-"Fedora增加了libvirt 的技术兼容性套件（Technology Compatibility Kit，TCK）。这"
-"是一个功能测试套件，它能够提供功能上的详细报告，可供每一个libvirt驱动使用，还"
-"可以用来快速识别Fedora虚拟化特性开发中出现的错误或回归。"
+msgid "Fedora now includes the libvirt Technology Compatibility Kit (TCK). The TCK is a functional test suite which provides detailed reports on functionality available for each libvirt driver and can be used to quickly identify failures or regressions in the development of Fedora's virtualization features."
+msgstr "Fedora增加了libvirt 的技术兼容性套件（Technology Compatibility Kit，TCK）。这是一个功能测试套件，它能够提供功能上的详细报告，可供每一个libvirt驱动使用，还可以用来快速识别Fedora虚拟化特性开发中出现的错误或回归。"
 
 #. Tag: title
 #: Virtualization.xml:438
@@ -6817,14 +5385,8 @@ msgstr "虚拟化技术预览库"
 #. Tag: para
 #: Virtualization.xml:439
 #, no-c-format
-msgid ""
-"The Virtualization Preview Repository has been created for people who would "
-"like to test the very latest virtualization related packages. This repo is "
-"intended primarily as an aid to testing and early experimentation. It is not "
-"intended for 'production' deployment."
-msgstr ""
-"为喜欢测试最新虚拟化相关软件包的用户建立了虚拟化预览仓库。本仓库目的主要是为"
-"了协助测试和早期实验。并不打算为“生产”部署。"
+msgid "The Virtualization Preview Repository has been created for people who would like to test the very latest virtualization related packages. This repo is intended primarily as an aid to testing and early experimentation. It is not intended for 'production' deployment."
+msgstr "为喜欢测试最新虚拟化相关软件包的用户建立了虚拟化预览仓库。本仓库目的主要是为了协助测试和早期实验。并不打算为“生产”部署。"
 
 #. Tag: title
 #: Virtualization.xml:458
@@ -6835,15 +5397,8 @@ msgstr "Xen 内核支持"
 #. Tag: para
 #: Virtualization.xml:459
 #, no-c-format
-msgid ""
-"The kernel package in Fedora 12 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 kernel 2.6.33 "
-"and Fedora 13."
-msgstr ""
-"Fedora 12 的内核支持作为用户机 domU 引导，但还不能作为 dom0 使用，直到上游内"
-"核可提供这种支持。这些工作正在进行，并且很有希望在Fedora 13和2.6.33的核心中得"
-"到支持。"
+msgid "The kernel package in Fedora 12 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 kernel 2.6.33 and Fedora 13."
+msgstr "Fedora 12 的内核支持作为用户机 domU 引导，但还不能作为 dom0 使用，直到上游内核可提供这种支持。这些工作正在进行，并且很有希望在Fedora 13和2.6.33的核心中得到支持。"
 
 #. Tag: para
 #: Virtualization.xml:465
@@ -6854,13 +5409,8 @@ msgstr "最早可以支持dom0的Fedora发行版是Fedora 8。"
 #. Tag: para
 #: Virtualization.xml:468
 #, no-c-format
-msgid ""
-"Booting a Xen domU guest within a Fedora 12 host requires the KVM based "
-"xenner. Xenner runs the guest kernel and a small Xen emulator together as a "
-"KVM guest."
-msgstr ""
-"在 Fedora 12 主机中引导 Xen domU 用户机需要基于xenner的KVM。Xenner将虚拟机内"
-"核和小型Xen模拟器当作KVM的虚拟机一起运行。"
+msgid "Booting a Xen domU guest within a Fedora 12 host requires the KVM based xenner. Xenner runs the guest kernel and a small Xen emulator together as a KVM guest."
+msgstr "在 Fedora 12 主机中引导 Xen domU 用户机需要基于xenner的KVM。Xenner将虚拟机内核和小型Xen模拟器当作KVM的虚拟机一起运行。"
 
 #. Tag: title
 #: Virtualization.xml:474
@@ -6871,9 +5421,7 @@ msgstr "KVM需要宿主系统有硬件虚拟功能。"
 #. Tag: para
 #: Virtualization.xml:476
 #, no-c-format
-msgid ""
-"Systems lacking hardware virtualization do not support Xen guests at this "
-"time."
+msgid "Systems lacking hardware virtualization do not support Xen guests at this time."
 msgstr "当前没有硬件虚拟化功能的系统不支持 Xen 虚拟机。"
 
 #. Tag: title
@@ -6885,14 +5433,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: title
 #: WebServers.xml:10
@@ -6915,24 +5457,8 @@ msgstr "fixconf.sed"
 #. Tag: para
 #: WebServers.xml:16
 #, no-c-format
-msgid ""
-"This release includes <package>mod_fcgid</package> 2.3.4, the first non-beta "
-"release from its new home as part of the Apache httpd project. There should "
-"be no compatibility problems with existing applications designed to work "
-"with older versions of <package>mod_fcgid</package> but the configuration "
-"directives of <package>mod_fcgid</package> itself have all been renamed to "
-"avoid any potential conflicts with other parts of the Apache httpd project. "
-"This means that users updating from older releases may need to edit their "
-"<package>mod_fcgid</package> configuration: a script \"<filename>fixconf."
-"sed</filename>\" is included in the <package>mod_fcgid</package> package to "
-"convert configurations from the old directive names to the new ones."
-msgstr ""
-"本发行版加入了<package>mod_fcgid</package> 2.3.4，此版本是其成为Apache httpd"
-"项目的一部分后第一个非beta版本。它不会与已有的使用旧版<package>mod_fcgid</"
-"package>的程序存在兼容性问题，但是为了避免与Apache httpd项目其它部分出现冲"
-"突，<package>mod_fcgid</package>配置目录已重命名。这就意味着从旧版升级的用户"
-"需要修改<package>mod_fcgid</package>配置：<package>mod_fcgid</package>包附带"
-"了转换配置目录名的脚本 \"<filename>fixconf.sed</filename>\"。"
+msgid "This release includes <package>mod_fcgid</package> 2.3.4, the first non-beta release from its new home as part of the Apache httpd project. There should be no compatibility problems with existing applications designed to work with older versions of <package>mod_fcgid</package> but the configuration directives of <package>mod_fcgid</package> itself have all been renamed to avoid any potential conflicts with other parts of the Apache httpd project. This means that users updating from older releases may need to edit their <package>mod_fcgid</package> configuration: a script \"<filename>fixconf.sed</filename>\" is included in the <package>mod_fcgid</package> package to convert configurations from the old directive names to the new ones."
+msgstr "本发行版加入了<package>mod_fcgid</package> 2.3.4，此版本是其成为Apache httpd项目的一部分后第一个非beta版本。它不会与已有的使用旧版<package>mod_fcgid</package>的程序存在兼容性问题，但是为了避免与Apache httpd项目其它部分出现冲突，<package>mod_fcgid</package>配置目录已重命名。这就意味着从旧版升级的用户需要修改<package>mod_fcgid</package>配置：<package>mod_fcgid</package>包附带了转换配置目录名的脚本 \"<filename>fixconf.sed</filename>\"。"
 
 #. Tag: title
 #: Welcome.xml:6
@@ -6943,109 +5469,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
 #, 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。更多有关於错误和功能报告上的相关信息，请引用 <ulink type=\"http\" "
-"url=\"http://fedoraproject.org/wiki/Bugs_and_feature_requests\">http://"
-"fedoraproject.org/wiki/Bugs_and_feature_requests</ulink>。感谢您的参与。"
+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。更多有关於错误和功能报告上的相关信息，请引用 <ulink type=\"http\" url=\"http://fedoraproject.org/wiki/Bugs_and_feature_requests\">http://fedoraproject.org/wiki/Bugs_and_feature_requests</ulink>。感谢您的参与。"
 
 #. 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:38
 #, 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:6
@@ -7056,20 +5529,13 @@ msgstr "X 窗口系统（图形）"
 #. Tag: remark
 #: Xorg.xml:7
 #, 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:8
 #, no-c-format
-msgid ""
-"This section contains information related to the X Window System "
-"implementation, X.Org, provided with Fedora."
+msgid "This section contains information related to the X Window System implementation, X.Org, provided with Fedora."
 msgstr "这一节包含与 Fedora 中采用的 X 窗口系统，X.org等相关的信息。"
 
 #. Tag: title
@@ -7099,28 +5565,14 @@ msgstr "<secondary>DisplayPort</secondary>"
 #. Tag: para
 #: Xorg.xml:22
 #, no-c-format
-msgid ""
-"DisplayPort is a new digital display connector and protocol. DisplayPort "
-"allows a higher bandwidth display interface, permitting display "
-"manufacturers to offer higher resolutions, higher color depths and higher "
-"refresh rates."
-msgstr ""
-"DisplayPort是新型的显示连接器和协议。它允许较高带宽的显示接口，允许显示器制造"
-"商采用更高分辨率，更高颜色深度及更高的刷新率。"
+msgid "DisplayPort is a new digital display connector and protocol. DisplayPort allows a higher bandwidth display interface, permitting display manufacturers to offer higher resolutions, higher color depths and higher refresh rates."
+msgstr "DisplayPort是新型的显示连接器和协议。它允许较高带宽的显示接口，允许显示器制造商采用更高分辨率，更高颜色深度及更高的刷新率。"
 
 #. Tag: para
 #: Xorg.xml:28
 #, no-c-format
-msgid ""
-"Fedora &PRODVER; includes enhanced DisplayPort capabilities for Intel "
-"adapters supporting that feature. Apple, HP and Dell offer DisplayPort "
-"display devices. Because DisplayPort has the potential for power reduction, "
-"it is expected that future laptops may contain embedded DisplayPort "
-"interfaces."
-msgstr ""
-"Fedora &PRODVER;为支持该特性的Intel适配器提供了增强的DisplayPort性能。Apple，"
-"HP和Dell生产DisplayPort显示设备。由于DisplayPort拥有节能潜质，因此未来的笔记"
-"本电脑有望含有嵌入的DisplayPort接口。"
+msgid "Fedora &PRODVER; includes enhanced DisplayPort capabilities for Intel adapters supporting that feature. Apple, HP and Dell offer DisplayPort display devices. Because DisplayPort has the potential for power reduction, it is expected that future laptops may contain embedded DisplayPort interfaces."
+msgstr "Fedora &PRODVER;为支持该特性的Intel适配器提供了增强的DisplayPort性能。Apple，HP和Dell生产DisplayPort显示设备。由于DisplayPort拥有节能潜质，因此未来的笔记本电脑有望含有嵌入的DisplayPort接口。"
 
 #. Tag: title
 #: Xorg.xml:38
@@ -7143,19 +5595,11 @@ msgstr "第三方"
 #. Tag: para
 #: Xorg.xml:43
 #, 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 "ABRT"
 #~ msgstr "ABRT"
-
 #~ msgid ""
 #~ "This beat is located here: <ulink type=\"http\" url=\"https://"
 #~ "fedoraproject.org/wiki/Docs/Beats/I18n\">https://fedoraproject.org/wiki/"
@@ -7163,10 +5607,8 @@ msgstr ""
 #~ msgstr ""
 #~ "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
 #~ "Docs/Beats/I18n\">https://fedoraproject.org/wiki/Docs/Beats/I18n</ulink>"
-
 #~ msgid "NFS V4 Default"
 #~ msgstr "默认使用NFS V4"
-
 #~ msgid ""
 #~ "The latest version of the NFS protocol is version 4, which was first "
 #~ "introduced in Fedora Core 2 (the first distro to have such "
@@ -7177,9 +5619,9 @@ msgstr ""
 #~ "NFS协议的最新版为第4版，Fedora Core 2首先引入（第一个有此支持的"
 #~ "发行版）。之前默认的NFS是第3版。因此当一个简单的NFS挂载完成后"
 #~ "（<command>mount server:/export /mnt</command>），首先尝试的协议是第3版。"
-
 #~ msgid ""
 #~ "In Fedora 12, version 4 is tried first. If the server does not "
 #~ "support version 4, the mount then tries version 3."
 #~ msgstr ""
 #~ "Fedora 12将首先尝试版本4。如果服务器不支持4，mount将尝试版本3。"
+

More information about the Fedora-docs-commits mailing list