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

[Transifex System User]

 po/zh_CN.po | 1253 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 1106 insertions(+), 147 deletions(-)

New commits:
commit d4e77e07a350cb812e06ff5ef4ca53a4bd5ecfb2
Author: tiansworld <tiansworld at fedoraproject.org>
Date:   Sun Nov 15 13:38:07 2009 +0000

    Sending translation for Chinese (Simplified)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2e6e90e..db236e6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: docs-release-notes.f12-tx\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-10-28 00:29+0000\n"
-"PO-Revision-Date: 2009-11-07 21:12+0800\n"
-"Last-Translator: Sun Junwen <sunjw8888 at gmail.com>\n"
+"POT-Creation-Date: 2009-11-12 14:43+0000\n"
+"PO-Revision-Date: 2009-11-15 21:34+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"
@@ -43,13 +43,21 @@ msgid "Applications"
 msgstr "应用程序"
 
 #. Tag: title
+#: AllChanges.xml:40
+#: Development.xml:6
+#: table-development.xml:7
+#, no-c-format
+msgid "Development"
+msgstr "开发"
+
+#. Tag: title
 #: AllChanges.xml:57
 #, no-c-format
 msgid "System Environment"
 msgstr "系统环境"
 
 #. Tag: title
-#: AllChanges.xml:68
+#: AllChanges.xml:69
 #, no-c-format
 msgid "User Interface"
 msgstr "用户界面"
@@ -408,6 +416,14 @@ msgstr "<title>电路设计</title>"
 msgid "<primary>Circuit Design</primary>"
 msgstr "<primary>电路设计</primary>"
 
+#. Tag: secondary
+#: CircuitDesign.xml:10
+#: Devel-Embedded.xml:10
+#: Multimedia.xml:11
+#, no-c-format
+msgid "Section"
+msgstr "节"
+
 #. Tag: para
 #: CircuitDesign.xml:12
 #, no-c-format
@@ -607,6 +623,13 @@ msgstr "改进了通过区别在库页面和在文件中使用\"technology names
 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
+#, no-c-format
+msgid "Runtime speed has been improved."
+msgstr "提高了执行速度。"
+
 #. Tag: title
 #: Clusters.xml:6
 #, no-c-format
@@ -772,23 +795,29 @@ msgstr "sn9-20x：基于sn9c20x的摄像头，还有很多新出的廉价摄像
 #. Tag: title
 #: Desktop.xml:44
 #, no-c-format
-msgid "ABRT"
-msgstr "ABRT"
+msgid "<title>ABRT</title>"
+msgstr "<title>ABRT</title>"
+
+#. Tag: primary
+#: Desktop.xml:47
+#, no-c-format
+msgid "<primary>ABRT</primary>"
+msgstr "<primary>ABRT</primary>"
 
 #. Tag: para
-#: Desktop.xml:45
+#: 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+程序。"
 
 #. Tag: para
-#: Desktop.xml:47
+#: 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+程序中看到如下的警告信息："
 
 #. Tag: screen
-#: Desktop.xml:49
+#: Desktop.xml:53
 #, no-c-format
 msgid ""
 "<computeroutput>Gtk-Message: Failed to load module \"gnomebreakpad\":</computeroutput>\n"
@@ -798,43 +827,49 @@ msgstr ""
 "<computeroutput>libgnomebreakpad.so: æ— æ³•æ‰“å¼€å…±äº«æ–‡ä»¶ï¼šæ–‡ä»¶æˆ–ç›®å½•ä¸å­˜åœ¨</computeroutput>"
 
 #. Tag: para
-#: Desktop.xml:52
+#: Desktop.xml:56
 #, no-c-format
 msgid "To stop these messages, run the following command in a terminal in your session:"
 msgstr "要停止这些信息，可以在终端機上执行以下的命令："
 
 #. Tag: screen
-#: Desktop.xml:54
+#: 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>"
 
 #. Tag: title
-#: Desktop.xml:60
+#: Desktop.xml:64
 #, no-c-format
 msgid "GNOME 2.28"
 msgstr "GNOME 2.28"
 
+#. Tag: primary
+#: Desktop.xml:67
+#, no-c-format
+msgid "GNOME"
+msgstr "GNOME"
+
 #. Tag: para
-#: Desktop.xml:61
+#: 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>。"
 
 #. Tag: title
-#: Desktop.xml:65
+#: Desktop.xml:73
 #, no-c-format
 msgid "Icons in menus and buttons"
 msgstr "菜单及按钮中的图像"
 
 #. Tag: para
-#: Desktop.xml:66
+#: 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é”®å€¼æ¥å¯ç”¨èœå•å’ŒæŒ‰é’®å›¾æ ‡ï¼š"
 
 #. Tag: screen
-#: Desktop.xml:68
+#: Desktop.xml:76
 #, no-c-format
 msgid ""
 "<command>gconftool-2 --type boolean --set /desktop/gnome/interface/buttons_have_icons true</command>\n"
@@ -844,55 +879,55 @@ msgstr ""
 "<command>gconftool-2 --type boolean --set /desktop/gnome/interface/menus_have_icons true</command>"
 
 #. Tag: title
-#: Desktop.xml:72
+#: Desktop.xml:80
 #, no-c-format
 msgid "Additional imrpovements in GNOME 2.28"
 msgstr "GNOME 2.28的其它改进"
 
 #. Tag: para
-#: Desktop.xml:73
+#: 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:"
 msgstr "与前一个Fedora发行版相比，GNOME桌面默认设置上还有一些其它改变："
 
 #. Tag: para
-#: Desktop.xml:78
+#: 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"
 msgstr "“窗口”设置对话框不再默认安装。但仍会在control-center-extra包中提供"
 
 #. Tag: para
-#: Desktop.xml:82
+#: 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"
 msgstr "“主菜单”设置对话框默认不再安装。alacarte包中仍然提供"
 
 #. Tag: para
-#: Desktop.xml:86
+#: Desktop.xml:94
 #, no-c-format
 msgid "The user switcher has been moved to the far right of the top panel"
 msgstr "用户切换移动至桌面顶端面板的最右侧"
 
 #. Tag: para
-#: Desktop.xml:89
+#: 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 "移除了“显示桌面”按钮。如果您需要，可通过点击右键，\"æ·»åŠ åˆ°é¢æ¿...\"然后选择\"显示桌面\" æ·»åŠ ã€‚"
 
 #. Tag: para
-#: Desktop.xml:94
+#: Desktop.xml:102
 #, no-c-format
 msgid "The number of workspaces in the 'Workspace Switcher' has been reduced to 2"
 msgstr "“工作区域切换”的工作区数量减少为2个"
 
 #. Tag: para
-#: Desktop.xml:97
+#: 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:"
 msgstr "é¢æ¿é€šçŸ¥åŒºåŸŸä¸­çš„å°ç¨‹åºåŠå›¾æ ‡ä¹‹é—´å¢žåŠ äº†é—´è·ã€‚å¯é€šè¿‡ä»¥ä¸‹å‘½ä»¤åŽ»é™¤é—´è·ï¼š"
 
 #. Tag: screen
-#: Desktop.xml:101
+#: Desktop.xml:109
 #, no-c-format
 msgid ""
 "gconftool-2 --type int --set /apps/panel/toplevels/top_panel/padding 0\n"
@@ -904,223 +939,271 @@ msgstr ""
 "gconftool-2 --type int --set /apps/panel/applets/systray/prefs/padding 0"
 
 #. Tag: title
-#: Desktop.xml:108
+#: Desktop.xml:116
 #, no-c-format
 msgid "Gnote"
 msgstr "Gnote"
 
+#. Tag: primary
+#: Desktop.xml:119
+#, no-c-format
+msgid "gnote"
+msgstr "gnote"
+
+#. Tag: primary
+#: Desktop.xml:122
+#, no-c-format
+msgid "tomboy"
+msgstr "tomboy"
+
 #. Tag: para
-#: Desktop.xml:109
+#: 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 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:113
+#: Desktop.xml:127
 #, no-c-format
 msgid "Bugzilla Links"
 msgstr "Bugzilla链接"
 
 #. Tag: para
-#: Desktop.xml:114
+#: Desktop.xml:128
 #, no-c-format
 msgid "Tomboy Importer"
 msgstr "Tomboy导入"
 
 #. Tag: para
-#: Desktop.xml:115
+#: Desktop.xml:129
 #, no-c-format
 msgid "Fixed Width"
 msgstr "å›ºå®šæ å®½"
 
 #. Tag: para
-#: Desktop.xml:116
+#: Desktop.xml:130
 #, no-c-format
 msgid "Insert Timestamp"
 msgstr "插入时间戳"
 
 #. Tag: para
-#: Desktop.xml:117
+#: Desktop.xml:131
 #, no-c-format
 msgid "Export to HTML"
 msgstr "导出为HTML"
 
 #. Tag: para
-#: Desktop.xml:118
+#: Desktop.xml:132
 #, no-c-format
 msgid "Printing Support"
 msgstr "打印支持"
 
 #. Tag: para
-#: Desktop.xml:119
+#: Desktop.xml:133
 #, no-c-format
 msgid "Sticky Notes Importer"
 msgstr "Sticky Notes导入"
 
 #. Tag: para
-#: Desktop.xml:120
+#: Desktop.xml:134
 #, no-c-format
 msgid "Backlinks"
 msgstr "Backlinks"
 
 #. Tag: para
-#: Desktop.xml:123
+#: 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>中。"
 
 #. Tag: screen
-#: Desktop.xml:125
+#: Desktop.xml:139
 #, no-c-format
 msgid "<command>cp -r .tomboy .gnote</command>"
 msgstr "<command>cp -r .tomboy .gnote</command>"
 
 #. Tag: para
-#: Desktop.xml:127
+#: 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便签程序。"
 
 #. Tag: title
-#: Desktop.xml:132
+#: Desktop.xml:146
 #, no-c-format
 msgid "Sound preferences"
 msgstr "声音选项"
 
 #. Tag: para
-#: Desktop.xml:133
+#: Desktop.xml:147
 #, no-c-format
 msgid "The GNOME sound preferences now supports profile switching."
 msgstr "GNOME声音偏好设置开始支持profile切换。"
 
 #. Tag: title
-#: Desktop.xml:138
+#: Desktop.xml:152
 #, no-c-format
 msgid "Empathy"
 msgstr "Empathy"
 
+#. Tag: primary
+#: Desktop.xml:155
+#, no-c-format
+msgid "empathy"
+msgstr "empathy"
+
+#. Tag: primary
+#: Desktop.xml:158
+#, no-c-format
+msgid "pidgin"
+msgstr "pidgin"
+
 #. Tag: para
-#: Desktop.xml:139
+#: 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>，并将继续维护。"
 
 #. Tag: para
-#: Desktop.xml:143
+#: Desktop.xml:164
 #, no-c-format
 msgid "The major advantages and disadvantages of <application>Empathy</application> are:"
 msgstr "<application>Empathy</application>的主要优缺点如下："
 
 #. Tag: title
-#: Desktop.xml:145
+#: Desktop.xml:166
 #, no-c-format
 msgid "Advantages"
 msgstr "有点"
 
 #. Tag: para
-#: Desktop.xml:146
+#: 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>é‚£æ ·ä»¥çº¯æ–‡æœ¬æ ¼å¼å­˜å‚¨ã€‚"
 
 #. Tag: para
-#: Desktop.xml:147
+#: 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>目前使用相同的结构。"
 
 #. Tag: para
-#: Desktop.xml:148
+#: 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>迁移帐户的支持。"
 
 #. Tag: para
-#: Desktop.xml:149
+#: Desktop.xml:170
 #, no-c-format
 msgid "Support for collaboration with <application>Abiword</application> and other programs"
 msgstr "支持与<application>Abiword</application>及其她程序协作"
 
 #. Tag: para
-#: Desktop.xml:150
+#: Desktop.xml:171
 #, no-c-format
 msgid "Geo Location (very recent feature)"
 msgstr "地理位置（最新功能）"
 
 #. Tag: title
-#: Desktop.xml:153
+#: Desktop.xml:174
 #, no-c-format
 msgid "Disdvantages"
 msgstr "缺点"
 
 #. Tag: para
-#: Desktop.xml:154
+#: 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>ä¸‹æä¾›çš„å¾ˆå¤šé¢å¤–åŠŸèƒ½ï¼ˆå¦‚åŠ å¯†ï¼‰å°†ä¸å†æä¾›"
 
 #. Tag: para
-#: Desktop.xml:155
+#: Desktop.xml:176
 #, no-c-format
 msgid "No proxy support"
 msgstr "æ— ä»£ç†æ”¯æŒ"
 
 #. Tag: title
-#: Desktop.xml:160
+#: Desktop.xml:181
 #, no-c-format
 msgid "Totem"
 msgstr "Totem"
 
+#. Tag: primary
+#: Desktop.xml:184
+#, no-c-format
+msgid "totem"
+msgstr "totem"
+
+#. Tag: primary
+#: Desktop.xml:187
+#, no-c-format
+msgid "gstreamer"
+msgstr "gstreamer"
+
 #. Tag: para
-#: Desktop.xml:161
+#: 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>后端。"
 
 #. Tag: title
-#: Desktop.xml:166
+#: Desktop.xml:193
 #, no-c-format
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Tag: primary
+#: Desktop.xml:196
+#, no-c-format
+msgid "epiphany"
+msgstr "epiphany"
+
 #. Tag: para
-#: Desktop.xml:167
+#: 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引擎。"
 
 #. Tag: title
-#: Desktop.xml:172
+#: Desktop.xml:202
 #, no-c-format
 msgid "GNOME Shell — preview of GNOME 3"
 msgstr "GNOME Shell — GNOME 3预览"
 
+#. Tag: primary
+#: Desktop.xml:205
+#, no-c-format
+msgid "GNOME shell"
+msgstr "GNOME shell"
+
 #. Tag: para
-#: Desktop.xml:173
+#: 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>软件包："
 
 #. Tag: screen
-#: Desktop.xml:175
+#: Desktop.xml:208
 #, no-c-format
 msgid "<command>yum install desktop-effects gnome-shell</command>"
 msgstr "<command>yum install desktop-effects gnome-shell</command>"
 
 #. Tag: para
-#: Desktop.xml:177
+#: 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>"
 
 #. Tag: para
-#: Desktop.xml:180
+#: Desktop.xml:213
 #, no-c-format
 msgid "If you would like to configure it manually, run"
 msgstr "如果您希望手动设置，请执行"
 
 #. Tag: screen
-#: Desktop.xml:182
+#: Desktop.xml:215
 #, no-c-format
 msgid ""
 "<command>mkdir ~/.config/autostart</command>\n"
@@ -1130,36 +1213,78 @@ msgstr ""
 "<command>ln -s /usr/share/applications/gnome-shell.desktop ~/.config/autostart</command>"
 
 #. Tag: para
-#: Desktop.xml:184
+#: Desktop.xml:217
 #, no-c-format
 msgid "You can also run the following to invoke it directly."
 msgstr "ä½ äº¦å¯ä»¥é€šè¿‡ç›´æŽ¥å¼•å¯¼æ¥æ‰§è¡Œä»¥ä¸‹çš„ç¨‹åºã€‚"
 
 #. Tag: screen
-#: Desktop.xml:186
+#: Desktop.xml:219
 #, no-c-format
 msgid "<command>gnome-shell --replace &</command>"
 msgstr "<command>gnome-shell --replace &</command>"
 
 #. Tag: title
-#: Desktop.xml:192
+#: Desktop.xml:225
 #, no-c-format
 msgid "KDE 4.3"
 msgstr "KDE 4.3"
 
+#. Tag: primary
+#: Desktop.xml:228
+#, no-c-format
+msgid "<primary>KDE</primary>"
+msgstr "<primary>KDE</primary>"
+
 #. Tag: para
-#: Desktop.xml:193
+#: 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闪存盘。"
 
 #. Tag: para
-#: Desktop.xml:196
+#: 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å˜å¾—æ›´åŠ å®¹æ˜“ã€‚"
 
 #. Tag: title
+#: Desktop.xml:238
+#, no-c-format
+msgid "Moblin Desktop"
+msgstr "Moblin桌面"
+
+#. Tag: primary
+#: Desktop.xml:241
+#, no-c-format
+msgid "moblin-desktop"
+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 ""
+
+#. 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桌面预览版。"
+
+#. Tag: para
+#: Desktop.xml:254
+#, no-c-format
+msgid "The Moblin Desktop may be installed as a group with yum:"
+msgstr "Moblin桌面将以组件通过yum安装："
+
+#. Tag: screen
+#: Desktop.xml:256
+#, no-c-format
+msgid "sudo yum install @moblin-desktop"
+msgstr "sudo yum install @moblin-desktop"
+
+#. Tag: title
 #: Devel-Eclipse.xml:6
 #, no-c-format
 msgid "Eclipse"
@@ -1682,6 +1807,56 @@ 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
+#: 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-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-text_editors-integrated_development_environments__ide_.xml:131
+#: 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
+#, no-c-format
+msgid "Package"
+msgstr "组件"
+
+#. Tag: entry
 #: ElectronicDesignAssistants.xml:97
 #, no-c-format
 msgid "Description"
@@ -2285,39 +2460,39 @@ msgstr "<primary>fusecompress</primary>"
 #. Tag: para
 #: FileSystems.xml:15
 #, no-c-format
-msgid "<package>Fusecompress</package> is a compressing filesystem mountable by unprivileged users. (Note: this may mean we don't want this note in the system admin section). 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:27
+#: FileSystems.xml:26
 #, no-c-format
 msgid "You must convert your filesystem"
 msgstr "您必须转换您的文件系统"
 
 #. Tag: para
-#: FileSystems.xml:28
+#: 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 "å¦‚æžœç”¨æˆ·æ²¡æœ‰é˜…è¯»è¿™äº›å‘è¡Œæ³¨è®°å¹¶ä¸”ä»–ä»¬æ„è¯†åˆ°éœ€è¦æ›´æ–°æ ¼å¼ï¼Œä»–ä»¬å‡ºé”™åŽçš„ç¬¬ä¸€è¡¨çŽ°å¾ˆå¯èƒ½æ˜¯å½“å®ƒä»¬æ‰“ç®—é˜…è¯»æ–‡æœ¬æ–‡ä»¶æ—¶æ–‡ä»¶æˆäº†äºŒè¿›åˆ¶ï¼š"
 
 #. Tag: screen
-#: FileSystems.xml:33
+#: FileSystems.xml:32
 #, no-c-format
 msgid ""
 "$ less test.txt\n"
-" \"test.dump\" may be a binary file.  See it anyway?"
+"\"test.txt\" may be a binary file.  See it anyway?"
 msgstr ""
 "$ less test.txt\n"
-" \"test.dump\" may be a binary file.  See it anyway?"
+"\"test.txt\" may be a binary file.  See it anyway?"
 
 #. Tag: para
-#: FileSystems.xml:36
+#: 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>并阅读那个文件。更新说明重复如下："
 
 #. Tag: screen
-#: FileSystems.xml:45
+#: FileSystems.xml:44
 #, no-c-format
 msgid ""
 "Let's say that in Fedora 11 your old fusecompress rootDir (where the files are\n"
@@ -2993,74 +3168,136 @@ msgstr "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.or
 msgid "<application>NetworkManager</application> with system-wide connections and enhanced support for mobile broadband"
 msgstr "<application>NetworkManager</application>提供了系统范围的连接以及增强了对移动宽带的支持"
 
+#. Tag: primary
+#: Networking.xml:14
+#, no-c-format
+msgid "NetworkManager"
+msgstr "NetworkManager"
+
 #. Tag: para
-#: Networking.xml:12
+#: 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>文件中。"
 
+#. Tag: primary
+#: Networking.xml:21
+#, no-c-format
+msgid "<primary>GSM</primary>"
+msgstr "<primary>GSM</primary>"
+
+#. Tag: primary
+#: Networking.xml:24
+#, no-c-format
+msgid "mobile-broadband-provider-info"
+msgstr "移动-宽带-供应商-信息"
+
 #. Tag: para
-#: Networking.xml:16
+#: 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è®¾å¤‡ï¼Œå‡ åˆ†é’Ÿå†…ä¾¿å¯ä»¥ä¸Šç½‘ã€‚"
 
 #. Tag: title
-#: Networking.xml:22
+#: Networking.xml:32
 #, no-c-format
 msgid "Enhanced IPv6 support in <application>NetworkManager</application>"
 msgstr "<application>NetworkManager</application>中增强的IPV6支持"
 
+#. Tag: primary
+#: Networking.xml:36
+#, no-c-format
+msgid "IPv6"
+msgstr "IPV6"
+
+#. Tag: primary
+#: Networking.xml:39
+#, no-c-format
+msgid "ifcfg"
+msgstr "ifcfg"
+
 #. Tag: para
-#: Networking.xml:24
+#: 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>文件。"
 
 #. Tag: para
-#: Networking.xml:28
+#: 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。"
 
+#. Tag: title
+#: Networking.xml:50
+#, no-c-format
+msgid "<title>Network Interface Management</title>"
+msgstr "<title>网络连接管理</title>"
+
+#. Tag: primary
+#: Networking.xml:54
+#, no-c-format
+msgid "<primary>Network Interface Management</primary>"
+msgstr "<primary>网络连接管理</primary>"
+
+#. Tag: primary
+#: Networking.xml:57
+#, no-c-format
+msgid "netcf"
+msgstr "netcf"
+
+#. Tag: primary
+#: Networking.xml:60
+#: Virtualization.xml:16
+#: Virtualization.xml:223
+#, no-c-format
+msgid "libvirt"
+msgstr "libvirt"
+
 #. Tag: para
-#: Networking.xml:36
+#: 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 "é€šå¸¸åªæœ‰é«˜çº§ç”¨æˆ·æ‰èƒ½åœ¨ä¸€å°è®¡ç®—æœºä¸Šé…ç½®ä¸€ä¸ªä¸­åº¦å¤æ‚ä½†åˆè¾ƒå¸¸è§çš„ç½‘ç»œè¿žæŽ¥ï¼Œå¹¶ä¸”å·²æœ‰çš„å·¥å…·æ”¯æŒéƒ½è¾ƒå·®ã€‚è¿™äº›ç½‘ç»œè¿žæŽ¥åŒ…æ‹¬æ¡¥æŽ¥ï¼Œå¹¶ä¸ºå®ƒæŒ‡å®šä¸€ä¸ªä»Žå±žç½‘å¡æˆ–è€…ä¸ºå®ƒç»‘å®šä¸¤ä¸ªç½‘å¡ï¼Œä»¥åŠå‘æ­¤ç½‘æ¡¥çš„ä»Žå±žç½‘å¡åŠç»‘å®šç½‘å¡æ·»åŠ è™šæ‹Ÿå±€åŸŸç½‘è¿žæŽ¥ã€‚"
 
 #. Tag: para
-#: Networking.xml:40
+#: 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 "通常虚拟主机上都需要做复杂的桥接，并且经常要通过高级管理工具远程配置，而不是由用户。"
 
 #. Tag: para
-#: Networking.xml:44
+#: Networking.xml:69
 #, fuzzy, 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来满足这些需求。"
 
 #. Tag: para
-#: Networking.xml:48
+#: 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一类的缺陷。"
 
 #. Tag: para
-#: Networking.xml:52
+#: 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>å¢žåŠ ç½‘ç»œé…ç½®åŠŸèƒ½ã€‚"
 
 #. Tag: title
-#: Networking.xml:58
+#: Networking.xml:83
 #, no-c-format
 msgid "Bluetooth Service On Demand"
 msgstr "按需的蓝牙服务"
 
+#. Tag: primary
+#: Networking.xml:87
+#, no-c-format
+msgid "Bluetooth"
+msgstr "蓝牙"
+
 #. Tag: para
-#: Networking.xml:60
+#: 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ç§’ã€‚è¿™æ ·é™ä½Žäº†åˆå§‹åŒ–æ—¶é—´å¹¶èŠ‚çœäº†èµ„æºã€‚"
@@ -3167,6 +3404,12 @@ msgstr "更多的安全改进"
 msgid "Features for Fedora &PRODVER; tracked on the feature list page:"
 msgstr "Fedora &PRODVER;的特性，追踪特性列表页面："
 
+#. Tag: para
+#: OverView.xml:77
+#, no-c-format
+msgid "A discussion putting these features in context may be found at:"
+msgstr ""
+
 #. Tag: title
 #: Printing.xml:6
 #, no-c-format
@@ -3210,94 +3453,157 @@ msgid "Changes in Fedora for Specific Audiences"
 msgstr "对特定爱好者来说 Fedora 的改动"
 
 #. Tag: title
-#: Revision_History.xml:6
+#: Revision_History.xml:8
 #, no-c-format
 msgid "Revision History"
 msgstr "修订记录"
 
-#. Tag: author
+#. Tag: para
 #: Revision_History.xml:12
-#: Revision_History.xml:28
-#: Revision_History.xml:46
-#: Revision_History.xml:60
 #, no-c-format
-msgid "<firstname>John</firstname> <surname>McDonough</surname> <email>jjmcd at fedoraproject.org</email>"
-msgstr "<firstname>John</firstname> <surname>McDonough</surname> <email>jjmcd at fedoraproject.org</email>"
+msgid "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:19
+#: Revision_History.xml:18
+#, no-c-format
+msgid "Rework revision history so that it works properly in help"
+msgstr "更新了修订历史以便在帮助中工作正常。"
+
+#. Tag: member
+#: Revision_History.xml:21
+#, no-c-format
+msgid "Include pointer to Fedora 12 Talking Points (bug #533574)"
+msgstr ""
+
+#. Tag: member
+#: Revision_History.xml:24
+#, no-c-format
+msgid "Note addition of sandbox -X (bug #533585)"
+msgstr "Note sandbox -Xçš„æ·»åŠ ï¼ˆbug #533585）"
+
+#. Tag: member
+#: Revision_History.xml:27
+#, no-c-format
+msgid "Describe DisplayPort (bug #533578)"
+msgstr "描述DisplayPort（bug #533578）"
+
+#. Tag: member
+#: Revision_History.xml:30
+#, no-c-format
+msgid "Correct typo on filename in File Systems section (bug #532448)"
+msgstr ""
+
+#. Tag: member
+#: Revision_History.xml:33
+#, no-c-format
+msgid "Note how to try out Moblin Desktop (bug #533577)"
+msgstr "Note 如何试验Moblin桌面（bug #533577）"
+
+#. Tag: member
+#: Revision_History.xml:36
+#, no-c-format
+msgid "Update AllChanges to latest rawhide"
+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>"
+
+#. Tag: member
+#: Revision_History.xml:49
 #, no-c-format
 msgid "Wiki updates to Development Languages"
 msgstr "开发语言的Wiki更新"
 
 #. Tag: member
-#: Revision_History.xml:20
+#: Revision_History.xml:50
 #, no-c-format
 msgid "Bug 530199, 529401, 525287, 529401, 524505"
 msgstr "Bug 530199, 529401, 525287, 529401, 524505"
 
 #. Tag: member
-#: Revision_History.xml:21
+#: Revision_History.xml:51
 #, no-c-format
 msgid "Update table to current rawhide"
 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>"
+
 #. Tag: member
-#: Revision_History.xml:35
+#: Revision_History.xml:62
 #, no-c-format
 msgid "Wiki updates to Desktop"
 msgstr "桌面的Wiki更新"
 
 #. Tag: member
-#: Revision_History.xml:36
+#: Revision_History.xml:63
 #, no-c-format
 msgid "Wiki updates to I18n"
 msgstr "I18nçš„Wikiæ›´æ–°"
 
 #. Tag: member
-#: Revision_History.xml:37
+#: Revision_History.xml:64
 #, no-c-format
 msgid "Wiki updates to Virtualization"
 msgstr "虚拟化的Wiki更新"
 
 #. Tag: member
-#: Revision_History.xml:38
+#: Revision_History.xml:65
 #, no-c-format
 msgid "Wiki updates to Web Servers"
 msgstr "Web服务器的Wiki更新"
 
 #. Tag: member
-#: Revision_History.xml:39
+#: Revision_History.xml:66
 #, no-c-format
 msgid "Wiki updates to File Systems"
 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>"
+
 #. Tag: member
-#: Revision_History.xml:53
+#: Revision_History.xml:78
 #, no-c-format
 msgid "Add section for all changes"
 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>"
+
 #. Tag: member
-#: Revision_History.xml:67
+#: Revision_History.xml:89
 #, no-c-format
 msgid "Test adding index entries to help users find specific packages among beats"
 msgstr "æµ‹è¯•å¢žåŠ ç›®å½•ä»¥å¸®åŠ©ç”¨æˆ·åœ¨beats中找到特定的包"
 
 #. Tag: member
-#: Revision_History.xml:68
+#: Revision_History.xml:91
 #, no-c-format
 msgid "Change editor to the team"
 msgstr "把编辑人员换成团队"
 
-#. Tag: author
-#: Revision_History.xml:75
+#. Tag: para
+#: Revision_History.xml:96
 #, no-c-format
-msgid "<firstname>Rüdiger </firstname> <surname>Landmann</surname> <email>r.landmann at redhat.com</email>"
-msgstr "<firstname>Rüdiger</firstname> <surname>Landmann</surname><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:82
+#: Revision_History.xml:102
 #, no-c-format
 msgid "Clean sheet"
 msgstr ""
@@ -3459,6 +3765,30 @@ msgid "A hardened system would have permissions like: <literal>555</literal> <fi
 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
+#, no-c-format
+msgid "SELinux Sandbox"
+msgstr "SELinux沙盘"
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. Tag: title
 #: ServerTools.xml:6
 #, no-c-format
 msgid "Server Tools"
@@ -3500,6 +3830,598 @@ msgstr "娱乐-游戏"
 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-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-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-text_editors-integrated_development_environments__ide_.xml:134
+#: 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
+#, no-c-format
+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-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-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-text_editors-integrated_development_environments__ide_.xml:137
+#: 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
+#, no-c-format
+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-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-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-text_editors-integrated_development_environments__ide_.xml:140
+#: 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
+#, no-c-format
+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-applications-archiving.xml:55
+#: table-applications-communications.xml:30
+#: table-applications-communications.xml:33
+#: table-applications-communications.xml:36
+#: table-applications-communications.xml:39
+#: 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-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-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-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-system_environment-daemons.xml:30
+#: table-system_environment-daemons.xml:33
+#: table-system_environment-daemons.xml:36
+#: table-system_environment-daemons.xml:39
+#: table-system_environment-daemons.xml:51
+#: table-system_environment-daemons.xml:52
+#: table-system_environment-daemons.xml:53
+#: table-system_environment-kernel.xml:30
+#: table-system_environment-kernel.xml:33
+#: table-system_environment-kernel.xml:36
+#: table-system_environment-kernel.xml:39
+#: table-system_environment-kernel.xml:51
+#: table-system_environment-kernel.xml:52
+#: table-system_environment-kernel.xml:53
+#: table-system_environment-libraries.xml:30
+#: table-system_environment-libraries.xml:33
+#: table-system_environment-libraries.xml:36
+#: table-system_environment-libraries.xml:39
+#: table-system_environment-libraries.xml:51
+#: table-system_environment-libraries.xml:52
+#: table-system_environment-libraries.xml:53
+#: table-system_environment-shells.xml:30
+#: table-system_environment-shells.xml:33
+#: table-system_environment-shells.xml:36
+#: table-system_environment-shells.xml:39
+#: 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-user_interface-x_hardware_support.xml:30
+#: table-user_interface-x_hardware_support.xml:33
+#: table-user_interface-x_hardware_support.xml:36
+#: table-user_interface-x_hardware_support.xml:39
+#: 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: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-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-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-text_editors-integrated_development_environments__ide_.xml:700
+#: 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
+#, no-c-format
+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-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-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-text_editors-integrated_development_environments__ide_.xml:701
+#: 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
+#, no-c-format
+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-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-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-text_editors-integrated_development_environments__ide_.xml:702
+#: 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
+#, no-c-format
+msgid "Total packages"
+msgstr "软件包总数"
+
 #. Tag: title
 #: table-amusements-graphics.xml:7
 #, no-c-format
@@ -3945,16 +4867,28 @@ msgid "All Systems_Management-Base changes"
 msgstr "系统环境-基础的所有更新"
 
 #. Tag: title
-#: table-text_editors-integrated_development_environments_(ide).xml:7
+#: table-text_editors-integrated_development_environments__ide_.xml:7
 #, no-c-format
 msgid "Text Editors-Integrated Development Environments (IDE)"
 msgstr "文本_编辑器-集成_开发_环境_（IDE）"
 
 #. Tag: title
-#: table-text_editors-integrated_development_environments_(ide).xml:10
+#: table-text_editors-integrated_development_environments__ide_.xml:127
 #, no-c-format
-msgid "All Text_Editors-Integrated_Development_Environments_(IDE) changes"
-msgstr "文本_编辑器-集成_开发_环境_（IDE）的所有变更"
+msgid "All Text Editors-Integrated Development Environments_(IDE) changes"
+msgstr "文本编辑器-集成开发环境_（IDE）的所有变更"
+
+#. Tag: title
+#: table-text_processing-markup-xml.xml:7
+#, no-c-format
+msgid "Text Processing-Markup-XML"
+msgstr "文本处理-æ ‡è®°-XML"
+
+#. Tag: title
+#: table-text_processing-markup-xml.xml:13
+#, no-c-format
+msgid "All Text_Processing-Markup-XML changes"
+msgstr "文本_处理-æ ‡è®°-XML的所有变更"
 
 #. Tag: title
 #: table-user_interface-desktop.xml:7
@@ -4055,13 +4989,6 @@ msgid "gPXE"
 msgstr "gPXE"
 
 #. Tag: primary
-#: Virtualization.xml:16
-#: Virtualization.xml:223
-#, no-c-format
-msgid "libvirt"
-msgstr "libvirt"
-
-#. Tag: primary
 #: Virtualization.xml:17
 #: Virtualization.xml:151
 #, no-c-format
@@ -4329,6 +5256,12 @@ msgstr "了解更多信息请参考："
 msgid "Network Interface management"
 msgstr "网络界面管理"
 
+#. Tag: secondary
+#: Virtualization.xml:226
+#, no-c-format
+msgid "Network Interface Management"
+msgstr "网络界面管理"
+
 #. Tag: para
 #: Virtualization.xml:227
 #, no-c-format
@@ -4608,23 +5541,65 @@ msgstr "这一节包含与 Fedora 中采用的 X 窗口系统，X.org等相关
 #. Tag: title
 #: Xorg.xml:14
 #, no-c-format
+msgid "<title>DisplayPort</title>"
+msgstr "<title>DisplayPort</title>"
+
+#. Tag: primary
+#: Xorg.xml:17
+#, no-c-format
+msgid "<primary>DisplayPort</primary>"
+msgstr "<primary>DisplayPort</primary>"
+
+#. Tag: primary
+#: Xorg.xml:20
+#, no-c-format
+msgid "Intel"
+msgstr "Intel"
+
+#. Tag: secondary
+#: Xorg.xml:21
+#, no-c-format
+msgid "<secondary>DisplayPort</secondary>"
+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æ˜¯æ–°åž‹çš„æ˜¾ç¤ºè¿žæŽ¥å™¨å’Œåè®®ã€‚å®ƒå…è®¸è¾ƒé«˜å¸¦å®½çš„æ˜¾ç¤ºæŽ¥å£ï¼Œå…è®¸æ˜¾ç¤ºå™¨åˆ¶é€ å•†é‡‡ç”¨æ›´é«˜åˆ†è¾¨çŽ‡ï¼Œæ›´é«˜é¢œè‰²æ·±åº¦åŠæ›´é«˜çš„åˆ·æ–°çŽ‡ã€‚"
+
+#. 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接口。"
+
+#. Tag: title
+#: Xorg.xml:38
+#, no-c-format
 msgid "Third-party Video Drivers"
 msgstr "第三方的显卡驱动程序"
 
+#. Tag: primary
+#: Xorg.xml:41
+#, no-c-format
+msgid "Video Driver"
+msgstr "显卡驱动程序"
+
+#. Tag: secondary
+#: Xorg.xml:42
+#, no-c-format
+msgid "Third Party"
+msgstr "第三方"
+
 #. Tag: para
-#: Xorg.xml:15
+#: 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 "Development"
-#~ msgstr "开发"
-#~ msgid "Section"
-#~ msgstr "节"
-#~ msgid "Runtime speed has been improved."
-#~ msgstr "提高了执行速度。"
-#~ msgid "Package"
-#~ msgstr "组件"
+#~ 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/"
@@ -4632,8 +5607,6 @@ msgstr "有关使用第三方显卡驱动程序的详情请引用 Xorg 第三方
 #~ msgstr ""
 #~ "这个 beat 位于：<ulink type=\"http\" url=\"https://fedoraproject.org/wiki/"
 #~ "Docs/Beats/I18n\">https://fedoraproject.org/wiki/Docs/Beats/I18n</ulink>"
-#~ msgid "Network Interface Management"
-#~ msgstr "网络界面管理"
 #~ msgid "NFS V4 Default"
 #~ msgstr "默认使用NFS V4"
 #~ msgid ""
@@ -4651,18 +5624,4 @@ msgstr "有关使用第三方显卡驱动程序的详情请引用 Xorg 第三方
 #~ "support version 4, the mount then tries version 3."
 #~ msgstr ""
 #~ "Fedora 12将首先尝试版本4。如果服务器不支持4，mount将尝试版本3。"
-#~ msgid "Old Version"
-#~ msgstr "老版本"
-#~ msgid "New Version"
-#~ msgstr "新版本"
-#~ msgid "Upstream URL"
-#~ msgstr "上游URL"
-#~ msgid "<entry>-</entry>"
-#~ msgstr "<entry>-</entry>"
-#~ msgid "Packages changed"
-#~ msgstr "已更改软件包"
-#~ msgid "Packages unchanged"
-#~ msgstr "未更改软件包"
-#~ msgid "Total packages"
-#~ msgstr "软件包总数"