Branch 'f13' - zh-CN/Desktop.po

[Transifex System User]

 zh-CN/Desktop.po |  900 +++++++++++++------------------------------------------
 1 file changed, 221 insertions(+), 679 deletions(-)

New commits:
commit aec446044dfd8112ad345799318f4351a8381aa6
Author: tiansworld <tiansworld at fedoraproject.org>
Date:   Mon Apr 26 01:38:10 2010 +0000

    l10n: Updates to Chinese (China) (zh_CN) translation
    
    Transmitted-via: Transifex (translate.fedoraproject.org)

diff --git a/zh-CN/Desktop.po b/zh-CN/Desktop.po
index dc2f343..a19a22b 100644
--- a/zh-CN/Desktop.po
+++ b/zh-CN/Desktop.po
@@ -50,15 +50,8 @@ msgstr "PackageKit完整集成"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"<application>Brasero</application> has gained the ability to automatically "
-"install missing <application>GStreamer</application> codecs when they are "
-"needed for burning audio CDs. <application>File-roller</application> can now "
-"install missing tools for handling archive formats."
-msgstr ""
-"在刻录音频CD时<application>Brasero</application>会自动安装缺失的"
-"<application>GStreamer</application>ç¼–ç å™¨ã€‚<application>File-roller</"
-"application>可安装缺失工具来处理归档文件。"
+msgid "<application>Brasero</application> has gained the ability to automatically install missing <application>GStreamer</application> codecs when they are needed for burning audio CDs. <application>File-roller</application> can now install missing tools for handling archive formats."
+msgstr "在刻录音频CDæ—¶<application>Brasero</application>会自动安装缺失的<application>GStreamer</application>ç¼–ç å™¨ã€‚<application>File-roller</application>可安装缺失工具来处理归档文件。"
 
 #. Tag: title
 #, no-c-format
@@ -72,41 +65,18 @@ msgstr "技术预览"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"This Fedora &PRODVER; feature is an add-on option that shows future "
-"direction and progress."
-msgstr ""
-"Fedora &PRODVER; çš„è¿™ä¸ªåŠŸèƒ½æ˜¯ä¸€ä¸ªåŠ è½½é€‰é¡¹ï¼Œå®ƒå°†å±•çŽ°æœªæ¥å¼€å‘æ–¹å‘å’Œè¿›åº¦ã€‚"
+msgid "This Fedora &PRODVER; feature is an add-on option that shows future direction and progress."
+msgstr "Fedora &PRODVER; çš„è¿™ä¸ªåŠŸèƒ½æ˜¯ä¸€ä¸ªåŠ è½½é€‰é¡¹ï¼Œå®ƒå°†å±•çŽ°æœªæ¥å¼€å‘æ–¹å‘å’Œè¿›åº¦ã€‚"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"The user account tool has been completely redesigned. The tool has functions "
-"to configure personal information in user accounts, and make a personal "
-"profile picture or icon. It also helps users generate strong passphrases, "
-"set up additional login options such as automatic login, and determine "
-"special roles for users such as in the case of a single owner of a personal "
-"laptop or an administrator of a shared system. This new feature was designed "
-"and implemented by several members of the Fedora Desktop SIG. Refer to <xref "
-"linkend=\"sect-Release_Notes-Security\" /> for details of the security "
-"enhancements included in this feature."
-msgstr ""
-"ç”¨æˆ·è´¦æˆ·å·¥å…·å·²å®Œå…¨é‡æ–°è®¾è®¡ã€‚å·¥å…·å¯è®¾ç½®ç”¨æˆ·ä¸ªäººä¿¡æ¯ï¼Œæ·»åŠ ä¸ªäººèµ„æ–™ç…§ç‰‡æˆ–å›¾æ ‡ã€‚"
-"åŒæ—¶å¯å¸®åŠ©ç”¨æˆ·ç”Ÿæˆå¼ºå¯†ç ï¼Œè®¾ç½®å¦‚è‡ªåŠ¨ç™»å½•ç­‰çš„é¢å¤–ç™»å½•é€‰é¡¹ï¼Œå¹¶å†³å®šç”¨æˆ·æ‰€å¤„è§’"
-"色，例如是个人笔记本上的单个用户还是一个公共系统管理员。这些新特性是由Fedora"
-"桌面SIG的一些成员设计并落实的。参考<xref linkend=\"sect-Release_Notes-"
-"Security\" />来了解本特性中关于安全增强的详情。"
+msgid "The user account tool has been completely redesigned. The tool has functions to configure personal information in user accounts, and make a personal profile picture or icon. It also helps users generate strong passphrases, set up additional login options such as automatic login, and determine special roles for users such as in the case of a single owner of a personal laptop or an administrator of a shared system. This new feature was designed and implemented by several members of the Fedora Desktop SIG. Refer to <xref linkend=\"sect-Release_Notes-Security\" /> for details of the security enhancements included in this feature."
+msgstr "ç”¨æˆ·è´¦æˆ·å·¥å…·å·²å®Œå…¨é‡æ–°è®¾è®¡ã€‚å·¥å…·å¯è®¾ç½®ç”¨æˆ·ä¸ªäººä¿¡æ¯ï¼Œæ·»åŠ ä¸ªäººèµ„æ–™ç…§ç‰‡æˆ–å›¾æ ‡ã€‚åŒæ—¶å¯å¸®åŠ©ç”¨æˆ·ç”Ÿæˆå¼ºå¯†ç ï¼Œè®¾ç½®å¦‚è‡ªåŠ¨ç™»å½•ç­‰çš„é¢å¤–ç™»å½•é€‰é¡¹ï¼Œå¹¶å†³å®šç”¨æˆ·æ‰€å¤„è§’è‰²ï¼Œä¾‹å¦‚æ˜¯ä¸ªäººç¬”è®°æœ¬ä¸Šçš„å•ä¸ªç”¨æˆ·è¿˜æ˜¯ä¸€ä¸ªå…¬å…±ç³»ç»Ÿç®¡ç†å‘˜ã€‚è¿™äº›æ–°ç‰¹æ€§æ˜¯ç”±Fedora桌面SIG的一些成员设计并落实的。参考<xref linkend=\"sect-Release_Notes-Security\" />来了解本特性中关于安全增强的详情。"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"To install and try the new user account tool, install the "
-"<package>accountsdialog</package> and <package>accountsservice</package> "
-"packages, and then run the <command>accounts-dialog</command> command."
-msgstr ""
-"要安装试用新的用户帐户工具，请安装<package>accountsdialog</package>和"
-"<package>accountsservice</package> ，然后运行<command>accounts-dialog</"
-"command>命令。"
+msgid "To install and try the new user account tool, install the <package>accountsdialog</package> and <package>accountsservice</package> packages, and then run the <command>accounts-dialog</command> command."
+msgstr "要安装试用新的用户帐户工具，请安装<package>accountsdialog</package>和<package>accountsservice</package> ，然后运行<command>accounts-dialog</command>命令。"
 
 #. Tag: title
 #, no-c-format
@@ -125,52 +95,12 @@ msgstr "实验性3D支持扩展至针对Nvidia的Nouveau驱动"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"Fedora&nbsp;&PREVVER; included experimental 3D support for newer ATI cards "
-"in the free and open source Radeon driver, and now experimental 3D support "
-"has been extended in Fedora&nbsp;&PRODVER; to the <application>nouveau</"
-"application> driver for a range of NVIDIA video cards. Fedora and its "
-"sponsor Red Hat are dedicated to improving the quality and coverage of "
-"completely free accelerated video drivers. While we support user choice and "
-"do not prevent use of closed, proprietary drivers, we also recognize that "
-"these drivers sometimes conflict with and cause problems in the software "
-"written by FOSS community members. We prefer to honor the commitment of the "
-"FOSS community with our own commitment to free drivers that complement their "
-"work, and work in the upstream Nouveau community to make these drivers "
-"better. Simply install the <package>mesa-dri-drivers-experimental</package> "
-"package to take advantage of this new feature."
-msgstr ""
-"Fedora&nbsp;&PREVVER;之前在自由开源的Radeon驱动中提供了对较新ATI显卡的实验性"
-"3D支持，如今Fedora&nbsp;&PRODVER;中实验性的3D支持已扩展至针对一些列NVIDIA显卡"
-"的<application>nouveau</application>驱动中。Fedora及其资助商Red Hat致力于提高"
-"å®Œå…¨è‡ªç”±åŠ é€Ÿçš„æ˜¾å¡é©±åŠ¨çš„è´¨é‡å’Œè¦†ç›–é¢ã€‚åŒæ—¶æˆ‘ä»¬æ”¯æŒç”¨æˆ·çš„é€‰æ‹©ï¼Œå¹¶ä¸é˜»æ­¢ç”¨æˆ·ä½¿"
-"用闭源专有的驱动程序，我们也认识到这些驱动有时会与FOSS社区成员编写的软件产生"
-"冲突并导致问题。 我们希望用我们自己的驱动来做为FOSS社区工作的补充，以尊重我们"
-"对FOSS社区的承诺，以及上游Nouveauç¤¾åŒºä¸ºé©±åŠ¨ç¨‹åºæ›´åŠ å®Œå–„è€Œåšçš„åŠªåŠ›ã€‚åªéœ€å®‰è£…"
-"<package>mesa-dri-drivers-experimental</package>便可体验这个新功能。"
-
-#. Tag: title
-#, fuzzy, no-c-format
-msgid "Shotwell replaces Gthumb and F-Spot as default photo organizer"
-msgstr "Shotwell代替Gthumb成为默认的照片管理程序"
-
-#. Tag: para
-#, fuzzy, no-c-format
-msgid ""
-"<application>Shotwell</application> is a free and open source photo "
-"organizer designed for the GNOME desktop environment and has replaced "
-"<application>Gthumb</application> and <application>Gthumb</application> by "
-"default in Fedora&nbsp;&PRODVER;. It supports the following features:"
-msgstr ""
-"<application>Shotwell</application>是一款面向GNOME桌面环境的开源照片管理程"
-"序，Fedora&nbsp;&PRODVER;中已代替<application>Gthumb</application>成为默认照"
-"片管理软件。它包括如下特性："
+msgid "Fedora&nbsp;&PREVVER; included experimental 3D support for newer ATI cards in the free and open source Radeon driver, and now experimental 3D support has been extended in Fedora&nbsp;&PRODVER; to the <application>nouveau</application> driver for a range of NVIDIA video cards. Fedora and its sponsor Red Hat are dedicated to improving the quality and coverage of completely free accelerated video drivers. While we support user choice and do not prevent use of closed, proprietary drivers, we also recognize that these drivers sometimes conflict with and cause problems in the software written by FOSS community members. We prefer to honor the commitment of the FOSS community with our own commitment to free drivers that complement their work, and work in the upstream Nouveau community to make these drivers better. Simply install the <package>mesa-dri-drivers-experimental</package> package to take advantage of this new feature."
+msgstr "Fedora&nbsp;&PREVVER;之前在自由开源的Radeon驱动中提供了对较新ATI显卡的实验性3D支持，如今Fedora&nbsp;&PRODVER;中实验性的3D支持已扩展至针对一些列NVIDIA显卡的<application>nouveau</application>驱动中。Fedora及其资助商Red Hatè‡´åŠ›äºŽæé«˜å®Œå…¨è‡ªç”±åŠ é€Ÿçš„æ˜¾å¡é©±åŠ¨çš„è´¨é‡å’Œè¦†ç›–é¢ã€‚åŒæ—¶æˆ‘ä»¬æ”¯æŒç”¨æˆ·çš„é€‰æ‹©ï¼Œå¹¶ä¸é˜»æ­¢ç”¨æˆ·ä½¿ç”¨é—­æºä¸“æœ‰çš„é©±åŠ¨ç¨‹åºï¼Œæˆ‘ä»¬ä¹Ÿè®¤è¯†åˆ°è¿™äº›é©±åŠ¨æœ‰æ—¶ä¼šä¸ŽFOSS社区成员编写的软件产生冲突并导致问题。 我们希望用我们自己的驱动来做为FOSS社区工作的补充，以尊重我们对FOSS社区的承诺，以及上游Nouveauç¤¾åŒºä¸ºé©±åŠ¨ç¨‹åºæ›´åŠ å®Œå–„è€Œåšçš„åŠªåŠ›ã€‚åªéœ€å®‰è£…<package>mesa-dri-drivers-experimental</package>便可体验这个新功能。"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"import photos from any digital camera supported by <application>gPhoto</"
-"application>"
+msgid "import photos from any digital camera supported by <application>gPhoto</application>"
 msgstr "可从<application>gPhoto</application>支持的任意相机导入照片"
 
 #. Tag: para
@@ -185,19 +115,13 @@ msgstr "ä½¿ç”¨æ ‡ç­¾ç®¡ç†ç›¸å†Œ"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"edit non-destructively when altering photos, without ruining originals or "
-"using disk space for each copy"
+msgid "edit non-destructively when altering photos, without ruining originals or using disk space for each copy"
 msgstr "ä¿®æ”¹ç…§ç‰‡æ—¶å¯åšéžç ´åæ€§ç¼–è¾‘ï¼Œæ— éœ€ä½¿ç”¨åŽŸå§‹ç…§ç‰‡æˆ–ä¸ºæ¯ä¸ªæ‹·è´ä½¿ç”¨ç£ç›˜ç©ºé—´ã€‚"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"publish photos to <citetitle>Facebook</citetitle>, <citetitle>Flickr</"
-"citetitle> or <citetitle>Picasa</citetitle>"
-msgstr ""
-"向<citetitle>Facebook</citetitle>, <citetitle>Flickr</citetitle> 或"
-"<citetitle>Picasa</citetitle>发布照片"
+msgid "publish photos to <citetitle>Facebook</citetitle>, <citetitle>Flickr</citetitle> or <citetitle>Picasa</citetitle>"
+msgstr "向<citetitle>Facebook</citetitle>, <citetitle>Flickr</citetitle> 或<citetitle>Picasa</citetitle>发布照片"
 
 #. Tag: para
 #, no-c-format
@@ -211,448 +135,304 @@ msgstr "旋转、镜像和裁剪照片"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"reduce red-eye and adjust the exposure, saturation, tint, and temperature of "
-"your photos"
+msgid "reduce red-eye and adjust the exposure, saturation, tint, and temperature of your photos"
 msgstr "消除照片的红眼以及调整照片曝光度、饱和度、色彩和色温"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"edit any photo, even if it's not imported to the <application>Shotwell</"
-"application> library"
+msgid "edit any photo, even if it's not imported to the <application>Shotwell</application> library"
 msgstr "编辑任意照片，即便它没有导入到<application>Shotwell</application>库中"
 
-#. Tag: para
-#, fuzzy, no-c-format
-msgid ""
-"For more information about <application>Shotwell</application>, refer to "
-"<ulink url=\"http://yorba.org/shotwell/\" />. <application>Gthumb</"
-"application> and <application>F-Spot</application> continue to be maintained "
-"and available in the Fedora repository. They are not installed by default "
-"anymore."
-msgstr ""
-"有关<application>Shotwell</application>更多信息，请参见<ulink url=\"http://"
-"yorba.org/shotwell/\" />，<application>Gthumb</application>将继续维护并保留在"
-"Fedora软件库中。"
+#. Tag: title
+#, no-c-format
+msgid "Déjà Dup simple backup tool"
+msgstr "Déjà Dup简单备份工具"
 
 #. Tag: title
 #, no-c-format
-msgid "Pino microblogging"
-msgstr ""
+msgid "Features:"
+msgstr "特性："
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"To support the rapid rise of microblogging via services like identi.ca and "
-"twitter, Pino, a desktop client is included by default. It is a simple and "
-"fast. It supports many features including the following:"
-msgstr ""
+msgid "Support for local or remote backup locations, including Amazon S3"
+msgstr "支持本地或远程备份源，包括Amazon S3"
 
 #. Tag: para
 #, no-c-format
-msgid "Identi.ca and twitter support"
-msgstr ""
+msgid "Securely encrypts and compresses your data"
+msgstr "å®‰å…¨åŠ å¯†å¹¶åŽ‹ç¼©æ‚¨çš„æ•°æ®"
 
 #. Tag: para
 #, no-c-format
-msgid "Multiple accounts"
-msgstr ""
+msgid "Incrementally backs up, letting you restore from any particular backup"
+msgstr "增量备份，可让您从任何特定的备份中恢复"
 
 #. Tag: para
 #, no-c-format
-msgid "Follow/unfollow users"
-msgstr ""
+msgid "Schedules regular backups"
+msgstr "计划常规备份"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"Support for status.net sites and API proxies for use with any identi.ca-like "
-"service, secure connections for Twitter and Twitter proxies, like birdnest "
-"and twit)"
-msgstr ""
+msgid "Integrates well into your GNOME desktop"
+msgstr "很好地集成于您的GNOME桌面"
+
+#. Tag: title
+#, no-c-format
+msgid "Simple Scan scanning utility"
+msgstr "Simple Scan扫描工具"
 
 #. Tag: para
 #, no-c-format
-msgid "URL shortening via goo.gl and is.gd and ur1.ca"
-msgstr ""
+msgid "<application>Simple Scan</application> is the default scanning utility for Fedora&nbsp;&PRODVER;. <application>Simple Scan</application> is an easy-to-use application, designed to let users connect their scanner and import the image or document in an appropriate format. More details are available at <ulink url=\"http://lwn.net/Articles/377063/\" />."
+msgstr "<application>Simple Scan</application>是Fedora&nbsp;&PRODVER;默认的扫描工具。<application>Simple Scan</application>æ˜“äºŽä½¿ç”¨ï¼Œå¯è®©ç”¨æˆ·è¿žæŽ¥æ‰«æä»ªå¹¶ä»¥é€‚å½“æ ¼å¼å¯¼å…¥å›¾åƒæˆ–æ–‡æ¡£ã€‚æ›´å¤šä¿¡æ¯ä½äºŽ<ulink url=\"http://lwn.net/Articles/377063/\" />。"
 
 #. Tag: para
 #, no-c-format
-msgid "Nicks, tags and urls highlighting in the input widget"
+msgid "The standalone application can be selected as an optional package in the <guilabel>Graphics</guilabel> group in <application>PackageKit</application>. The <application>GIMP</application> plugin is installed along with the <application>GIMP</application> main package if the Graphics group is selected."
 msgstr ""
 
+#. Tag: title
+#, no-c-format
+msgid "GNOME Color Manager"
+msgstr "GNOME颜色管理器"
+
 #. Tag: para
 #, no-c-format
-msgid "Direct messages with more than 140 characters"
-msgstr ""
+msgid "Color management helps artists, photographers, designers, and others display and print work more accurately using completely free software. Color management supports setting output gamma tables for most monitors, including when they are hotplugged during a session. Users can also install vendor-supplied ICC or ICM files by double-clicking them, and calibrate displays and scanners with external devices and color targets using the <package>ArgyllCMS</package> package. Written by Richard Hughes, Red Hat engineer and Fedora contributor."
+msgstr "é¢œè‰²ç®¡ç†è®©è‰ºæœ¯å®¶ã€æ‘„å½±å¸ˆã€è®¾è®¡å¸ˆåŠå…¶ä»–äººå‘˜çš„æ˜¾ç¤ºåŠæ‰“å°å·¥ä½œæ›´åŠ ç²¾ç¡®ã€‚é¢œè‰²ç®¡ç†å¯ä»¥ä¸ºå¤šæ•°æ˜¾ç¤ºå™¨è®¾ç½®è¾“å‡ºä¼½çŽ›è¡¨ï¼Œè¿™åŒ…æ‹¬ä½¿ç”¨ä¸­çš„çƒ­æ’æ‹”æ˜¾ç¤ºå™¨ã€‚ç”¨æˆ·ä¹Ÿå¯é€šè¿‡åŒå‡»å®‰è£…ä¾›åº”å•†æä¾›çš„ICC或ICMæ–‡ä»¶ï¼Œç”¨å¤–éƒ¨è®¾å¤‡æ ¡æ­£æ˜¾ç¤ºå™¨å’Œæ‰«æä»ªï¼Œä»¥åŠä½¿ç”¨<package>ArgyllCMS</package>软件包做颜色采集。 ç”±Red Hat工程师、Fedora贡献人员 Richard Hughes所写。"
 
 #. Tag: para
 #, no-c-format
-msgid "Support for favorites (add/remove/list)"
-msgstr ""
+msgid "Color management helps you control and produce more accurate color output for displays, printers, and scanners."
+msgstr "颜色管理可帮助您控制显示器、打印机及扫描仪输出的颜色精确度。"
+
+#. Tag: title
+#, no-c-format
+msgid "Nautilus Enhancements"
+msgstr "Nautilus的改进"
 
 #. Tag: para
 #, no-c-format
-msgid "Conversation view"
-msgstr ""
+msgid "The <application>Nautilus</application> file manager now defaults browser mode. The user interface for this mode has been reorganized. Additionally, nautilus can now offer two directories side-by-side, in the new split-view mode."
+msgstr "<application>Nautilus</application>文件管理器默认为浏览器模式。此模式的用户界面经过了重新组织。另外nautilus可在新的分割浏览模式中实现两侧双目录。"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"For more details, refer to <ulink url=\"http://pino-app.appspot.com/\" />."
-msgstr ""
+msgid "Spatial mode is still available as an option."
+msgstr "Spatial模式做为选项仍然提供。"
 
 #. Tag: title
 #, no-c-format
-msgid "Déjà Dup simple backup tool"
-msgstr "Déjà Dup简单备份工具"
+msgid "Gnote Enhancements"
+msgstr "Gnote的改进"
 
 #. Tag: para
-#, fuzzy, no-c-format
-msgid ""
-"<application>Déjà Dup</application> is the default simple backup tool for "
-"the GNOME desktop in Fedora&nbsp;&PRODVER;. It hides the complexity of doing "
-"backups properly, and uses <application>duplicity</application> as the "
-"backend."
-msgstr ""
-"GNOME桌面下的<application>Déjà Dup</application>是Fedora&nbsp;&PRODVER;默认的"
-"简单备份工具。它适当地隐藏了备份的复杂性，使用<application>duplicity</"
-"application>做为后端。"
+#, no-c-format
+msgid "<application>Gnote</application> is a C++ port of <application>Tomboy</application>. It is the default desktop note-taking application for GNOME in Fedora and has a number of enhancements and bug fixes. <application>Gnote</application> now has a few new add-ins, and follows the XDG directory specification from freedesktop.org. Notes stored in previous versions are automatically migrated from <filename class=\"directory\">.gnote</filename> to <filename class=\"directory\">.local/share/gnote</filename> in the user's home directory."
+msgstr "<application>Gnote</application>是<application>Tomboy</application>的一个C++端。它是Fedora中GNOME环境默认的笔记记录程序，做了很多增强和bug修正。<application>Gnote</application>æœ‰äº†ä¸€äº›æ–°çš„åŠ è½½é¡¹ï¼Œå¹¶éµç…§äº†freedesktop.orgçš„XDGç›®å½•æ ‡å‡†ã€‚å…ˆå‰ç‰ˆæœ¬ä¸­å­˜å‚¨çš„ç¬”è®°å°†è‡ªåŠ¨ä»Žç”¨æˆ·ä¸»ç›®å½•çš„<filename class=\"directory\">.gnote</filename>转移到<filename class=\"directory\">.local/share/gnote</filename>。"
 
 #. Tag: title
 #, no-c-format
-msgid "Features:"
-msgstr "特性："
+msgid "GNOME DVB Daemon"
+msgstr "GNOME DVB守护程序"
 
 #. Tag: para
 #, no-c-format
-msgid "Support for local or remote backup locations, including Amazon S3"
-msgstr "支持本地或远程备份源，包括Amazon S3"
+msgid "DVB support in <application>Totem</application> is now handled through the GNOME DVB Daemon, which brings things like <firstterm>Electronic Program Guide</firstterm> (EPG) support, easy to use tuning, and Exporting of TV channels through UPNP (with <application>Rygel</application>)."
+msgstr "通过GNOME DVB守护程序，<application>Totem</application>可支持DVB，这带来了像易于使用和调整的<firstterm>Electronic Program Guide</firstterm> (EPG)支持，以及通过UPNP (使用<application>Rygel</application>)电视频道导出。"
 
-#. Tag: para
+#. Tag: title
 #, no-c-format
-msgid "Securely encrypts and compresses your data"
-msgstr "å®‰å…¨åŠ å¯†å¹¶åŽ‹ç¼©æ‚¨çš„æ•°æ®"
+msgid "Xfce Software Changes"
+msgstr "Xfce软件变更"
 
 #. Tag: para
 #, no-c-format
-msgid "Incrementally backs up, letting you restore from any particular backup"
-msgstr "增量备份，可让您从任何特定的备份中恢复"
+msgid "The Fedora&nbsp;&PRODVER; Xfce Spin brings several changes to the default applications:"
+msgstr "Fedora&nbsp;&PRODVER; Xfce定制版对默认程序做了一些更改："
 
 #. Tag: para
 #, no-c-format
-msgid "Schedules regular backups"
-msgstr "计划常规备份"
+msgid "<application>Gftp</application> has been dropped, as this functionality is provided by <application>Thunar</application> and <application>Gigolo</application>"
+msgstr "去掉了<application>Gftp</application>，此功能由<application>Thunar</application>和<application>Gigolo</application>提供。"
 
 #. Tag: para
 #, no-c-format
-msgid "Integrates well into your GNOME desktop"
-msgstr "很好地集成于您的GNOME桌面"
+msgid "<application>Totem</application> has been replaced by <application>Parole</application>, a media player designed for the Xfce desktop with simplicity, speed and resource usage in mind"
+msgstr "<application>Parole</application>替代了<application>Totem</application>，这是一个针对Xfce桌面设计的简单、迅速并考虑资源使用的媒体播放器。"
 
-#. Tag: title
+#. Tag: para
 #, no-c-format
-msgid "Simple Scan scanning utility"
-msgstr "Simple Scan扫描工具"
+msgid "<application>Gnome-screensaver</application> has been replaced by <application>Xscreensaver</application>"
+msgstr "<application>Xscreensaver</application>代替了<application>Gnome-screensaver</application>"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"<application>Simple Scan</application> is the default scanning utility for "
-"Fedora&nbsp;&PRODVER;. <application>Simple Scan</application> is an easy-to-"
-"use application, designed to let users connect their scanner and import the "
-"image or document in an appropriate format. More details are available at "
-"<ulink url=\"http://lwn.net/Articles/377063/\" />."
-msgstr ""
-"<application>Simple Scan</application>是Fedora&nbsp;&PRODVER;默认的扫描工具。"
-"<application>Simple Scan</application>æ˜“äºŽä½¿ç”¨ï¼Œå¯è®©ç”¨æˆ·è¿žæŽ¥æ‰«æä»ªå¹¶ä»¥é€‚å½“æ ¼"
-"式导入图像或文档。更多信息位于<ulink url=\"http://lwn.net/Articles/377063/"
-"\" />。"
+msgid "<application>TigerVNC</application> has been replaced by <application>Remmina</application>, with support for additional protocols (RDP, XDMCP, SSH) and improved integration with the Xfce desktop via the accompanying panel plugin"
+msgstr "<application>Remmina</application>代替<application>TigerVNC</application>，它支持更多协议(RDP, XDMCP, SSH)并且通过附带的面板插件提高了与Xfce桌面的集成性。"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"The <application>XSane</application> standalone application and its "
-"<application>GIMP</application> plugin are still available for users who "
-"need to perform any of the following tasks:"
-msgstr ""
+msgid "Related feature pages:"
+msgstr "相关特性页面："
 
 #. Tag: para
 #, no-c-format
-msgid "tweak more parameters offered by the scanner drivers"
-msgstr ""
+msgid "<ulink url=\"http://fedoraproject.org/wiki/Features/ColorManagement\">http://fedoraproject.org/wiki/Features/ColorManagement</ulink>"
+msgstr "<ulink url=\"http://fedoraproject.org/wiki/Features/ColorManagement\">http://fedoraproject.org/wiki/Features/ColorManagement</ulink>"
 
 #. Tag: para
 #, no-c-format
-msgid "use the scanner for directly copying or faxing"
-msgstr ""
+msgid "<ulink url=\"http://fedoraproject.org/wiki/Features/Gnome2.30\">http://fedoraproject.org/wiki/Features/Gnome2.30</ulink>"
+msgstr "<ulink url=\"http://fedoraproject.org/wiki/Features/Gnome2.30\">http://fedoraproject.org/wiki/Features/Gnome2.30</ulink>"
 
 #. Tag: para
 #, no-c-format
-msgid "scan directly from within the GNU Image Manipulation Program (GIMP)"
-msgstr ""
+msgid "<ulink url=\"http://fedoraproject.org/wiki/Features/KDE44\">http://fedoraproject.org/wiki/Features/KDE44</ulink>"
+msgstr "<ulink url=\"http://fedoraproject.org/wiki/Features/KDE44\">http://fedoraproject.org/wiki/Features/KDE44</ulink>"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"The standalone application can be selected as an optional package in the "
-"<guilabel>Graphics</guilabel> group in <application>PackageKit</"
-"application>. The <application>GIMP</application> plugin is installed along "
-"with the <application>GIMP</application> main package if the Graphics group "
-"is selected."
-msgstr ""
+msgid "<ulink url=\"http://fedoraproject.org/wiki/Features/Sugar_0.88\">http://fedoraproject.org/wiki/Features/Sugar_0.88</ulink>"
+msgstr "<ulink url=\"http://fedoraproject.org/wiki/Features/Sugar_0.88\">http://fedoraproject.org/wiki/Features/Sugar_0.88</ulink>"
 
-#. Tag: title
+#. Tag: para
 #, no-c-format
-msgid "GNOME Color Manager"
-msgstr "GNOME颜色管理器"
+msgid "<ulink url=\"http://fedoraproject.org/wiki/Features/Moblin-2.2\">http://fedoraproject.org/wiki/Features/Moblin-2.2</ulink>"
+msgstr "<ulink url=\"http://fedoraproject.org/wiki/Features/Moblin-2.2\">http://fedoraproject.org/wiki/Features/Moblin-2.2</ulink>"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"Color management helps artists, photographers, designers, and others display "
-"and print work more accurately using completely free software. Color "
-"management supports setting output gamma tables for most monitors, including "
-"when they are hotplugged during a session. Users can also install vendor-"
-"supplied ICC or ICM files by double-clicking them, and calibrate displays "
-"and scanners with external devices and color targets using the "
-"<package>ArgyllCMS</package> package. Written by Richard Hughes, Red Hat "
-"engineer and Fedora contributor."
-msgstr ""
-"é¢œè‰²ç®¡ç†è®©è‰ºæœ¯å®¶ã€æ‘„å½±å¸ˆã€è®¾è®¡å¸ˆåŠå…¶ä»–äººå‘˜çš„æ˜¾ç¤ºåŠæ‰“å°å·¥ä½œæ›´åŠ ç²¾ç¡®ã€‚é¢œè‰²ç®¡ç†"
-"可以为多数显示器设置输出伽玛表，这包括使用中的热插拔显示器。用户也可通过双击"
-"安装供应商提供的ICC或ICMæ–‡ä»¶ï¼Œç”¨å¤–éƒ¨è®¾å¤‡æ ¡æ­£æ˜¾ç¤ºå™¨å’Œæ‰«æä»ªï¼Œä»¥åŠä½¿ç”¨"
-"<package>ArgyllCMS</package>软件包做颜色采集。 由Red Hat工程师、Fedora贡献人"
-"员 Richard Hughes所写。"
+msgid "<application>Déjà Dup</application> is the default simple backup tool for the GNOME desktop in Fedora&nbsp;&PRODVER;. It hides the complexity of doing backups properly, and uses <application>duplicity</application> as the backend."
+msgstr "<application>Déjà Dup</application>是Fedora&nbsp;&PRODVER; GNOME桌面环境下默认的简单备份工具。它适当地隐藏了备份的复杂性，使用 <application>duplicity</application> 做为后端。"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"Color management helps you control and produce more accurate color output "
-"for displays, printers, and scanners."
-msgstr "颜色管理可帮助您控制显示器、打印机及扫描仪输出的颜色精确度。"
+msgid "scan directly from within the GNU Image Manipulation Program (GIMP)"
+msgstr "在 GNU 图像处理程序 (GIMP) 下直接扫描"
 
-#. Tag: title
+#. Tag: para
 #, no-c-format
-msgid "Nautilus Enhancements"
-msgstr "Nautilus的改进"
+msgid "The <application>XSane</application> standalone application and its <application>GIMP</application> plugin are still available for users who need to perform any of the following tasks:"
+msgstr "<application>XSane</application> 独立应用及其 <application>GIMP</application> 插件仍然为需做以下事务的用户提供："
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"The <application>Nautilus</application> file manager now defaults browser "
-"mode. The user interface for this mode has been reorganized. Additionally, "
-"nautilus can now offer two directories side-by-side, in the new split-view "
-"mode."
-msgstr ""
-"<application>Nautilus</application>文件管理器默认为浏览器模式。此模式的用户界"
-"面经过了重新组织。另外nautilus可在新的分割浏览模式中实现两侧双目录。"
+msgid "use the scanner for directly copying or faxing"
+msgstr "ä½¿ç”¨æ‰«æä»ªç›´æŽ¥è¿›è¡Œå¤åˆ¶å’Œä¼ çœŸ"
 
 #. Tag: para
 #, no-c-format
-msgid "Spatial mode is still available as an option."
-msgstr "Spatial模式做为选项仍然提供。"
+msgid "tweak more parameters offered by the scanner drivers"
+msgstr "调整扫描仪驱动提供的多个参数"
 
 #. Tag: title
 #, no-c-format
-msgid "Gnote Enhancements"
-msgstr "Gnote的改进"
+msgid "Rhythmbox iPod Touch and iPhone music management"
+msgstr "Rhythmbox可管理 iPod Touch及iPhone中的音乐"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"<application>Gnote</application> is a C++ port of <application>Tomboy</"
-"application>. It is the default desktop note-taking application for GNOME in "
-"Fedora and has a number of enhancements and bug fixes. <application>Gnote</"
-"application> now has a few new add-ins, and follows the XDG directory "
-"specification from freedesktop.org. Notes stored in previous versions are "
-"automatically migrated from <filename class=\"directory\">.gnote</filename> "
-"to <filename class=\"directory\">.local/share/gnote</filename> in the user's "
-"home directory."
+msgid "Building on the file system access added in Fedora 12, Fedora 13 adds support for music management in <application>Rhythmbox</application> for iPod Touch and iPhone devices through the <systemitem class=\"library\">libgpod</systemitem> library, as well as more appropriate icons for those devices."
 msgstr ""
-"<application>Gnote</application>是<application>Tomboy</application>的一个C+"
-"+端。它是Fedora中GNOME环境默认的笔记记录程序，做了很多增强和bug修正。"
-"<application>Gnote</application>æœ‰äº†ä¸€äº›æ–°çš„åŠ è½½é¡¹ï¼Œå¹¶éµç…§äº†freedesktop.orgçš„"
-"XDGç›®å½•æ ‡å‡†ã€‚å…ˆå‰ç‰ˆæœ¬ä¸­å­˜å‚¨çš„ç¬”è®°å°†è‡ªåŠ¨ä»Žç”¨æˆ·ä¸»ç›®å½•çš„<filename class="
-"\"directory\">.gnote</filename>转移到<filename class=\"directory\">.local/"
-"share/gnote</filename>。"
 
-#. Tag: title
+#. Tag: para
 #, no-c-format
-msgid "GNOME DVB Daemon"
-msgstr "GNOME DVB守护程序"
+msgid "For more details, refer to <ulink url=\"http://pino-app.appspot.com/\" />."
+msgstr "更多信息请查看 <ulink url=\"http://pino-app.appspot.com/\" />。"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"DVB support in <application>Totem</application> is now handled through the "
-"GNOME DVB Daemon, which brings things like <firstterm>Electronic Program "
-"Guide</firstterm> (EPG) support, easy to use tuning, and Exporting of TV "
-"channels through UPNP (with <application>Rygel</application>)."
-msgstr ""
-"通过GNOME DVB守护程序，<application>Totem</application>可支持DVB，这带来了像"
-"易于使用和调整的<firstterm>Electronic Program Guide</firstterm> (EPG)支持，以"
-"及通过UPNP (使用<application>Rygel</application>)电视频道导出。"
+msgid "<application>Shotwell</application> is a free and open source photo organizer designed for the GNOME desktop environment and has replaced <application>Gthumb</application> and <application>Gthumb</application> by default in Fedora&nbsp;&PRODVER;. It supports the following features:"
+msgstr "<application>Shotwell</application>是一款面向GNOME桌面环境的开源照片管理程序，Fedora&nbsp;&PRODVER;中它已代替<application>Gthumb</application>和<application>F-Spot</application>成为默认照片管理软件。它包括如下特性："
 
 #. Tag: title
 #, no-c-format
-msgid "Rhythmbox iPod Touch and iPhone music management"
-msgstr ""
+msgid "Shotwell replaces Gthumb and F-Spot as default photo organizer"
+msgstr "Shotwell代替Gthumb和F-Spot成为默认的照片管理程序"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"Building on the file system access added in Fedora 12, Fedora 13 adds "
-"support for music management in <application>Rhythmbox</application> for "
-"iPod Touch and iPhone devices through the <systemitem class=\"library"
-"\">libgpod</systemitem> library, as well as more appropriate icons for those "
-"devices."
-msgstr ""
+msgid "For more information about <application>Shotwell</application>, refer to <ulink url=\"http://yorba.org/shotwell/\" />. <application>Gthumb</application> and <application>F-Spot</application> continue to be maintained and available in the Fedora repository. They are not installed by default anymore."
+msgstr "有关<application>Shotwell</application>更多信息，请查看<ulink url=\"http://yorba.org/shotwell/\" />，<application>Gthumb</application>和<application>F-Spot</application>仍会得到维护并保留在Fedora软件库中。但是它们不再默认安装。"
 
 #. Tag: title
 #, no-c-format
-msgid "Xfce Software Changes"
-msgstr "Xfce软件变更"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The Fedora&nbsp;&PRODVER; Xfce Spin brings several changes to the default "
-"applications:"
-msgstr "Fedora&nbsp;&PRODVER; Xfce定制版对默认程序做了一些更改："
+msgid "Pino microblogging"
+msgstr "Pino 微博工具"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"<application>Gftp</application> has been dropped, as this functionality is "
-"provided by <application>Thunar</application> and <application>Gigolo</"
-"application>"
-msgstr ""
-"去掉了<application>Gftp</application>，此功能由<application>Thunar</"
-"application>和<application>Gigolo</application>提供。"
+msgid "Follow/unfollow users"
+msgstr "关注/取消关注 用户"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"<application>Totem</application> has been replaced by <application>Parole</"
-"application>, a media player designed for the Xfce desktop with simplicity, "
-"speed and resource usage in mind"
-msgstr ""
-"<application>Parole</application>替代了<application>Totem</application>，这是"
-"一个针对Xfce桌面设计的简单、迅速并考虑资源使用的媒体播放器。"
+msgid "Multiple accounts"
+msgstr "多用户"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"<application>Gnome-screensaver</application> has been replaced by "
-"<application>Xscreensaver</application>"
-msgstr ""
-"<application>Xscreensaver</application>代替了<application>Gnome-screensaver</"
-"application>"
+msgid "Identi.ca and twitter support"
+msgstr "支持 identi.ca 和 twitter"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"<application>TigerVNC</application> has been replaced by "
-"<application>Remmina</application>, with support for additional protocols "
-"(RDP, XDMCP, SSH) and improved integration with the Xfce desktop via the "
-"accompanying panel plugin"
-msgstr ""
-"<application>Remmina</application>代替<application>TigerVNC</application>，它"
-"支持更多协议(RDP, XDMCP, SSH)并且通过附带的面板插件提高了与Xfce桌面的集成性。"
+msgid "To support the rapid rise of microblogging via services like identi.ca and twitter, Pino, a desktop client is included by default. It is a simple and fast. It supports many features including the following:"
+msgstr "为了支持通过identi.ca和twitter等发送微博，默认提供了桌面客户端Pino。它简单而且速度快。它支持众多功能，其中包括："
 
 #. Tag: para
 #, no-c-format
-msgid "Related feature pages:"
-msgstr "相关特性页面："
+msgid "Direct messages with more than 140 characters"
+msgstr "超过140个字符的私信"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"<ulink url=\"http://fedoraproject.org/wiki/Features/ColorManagement\">http://"
-"fedoraproject.org/wiki/Features/ColorManagement</ulink>"
-msgstr ""
-"<ulink url=\"http://fedoraproject.org/wiki/Features/ColorManagement\">http://"
-"fedoraproject.org/wiki/Features/ColorManagement</ulink>"
+msgid "Nicks, tags and urls highlighting in the input widget"
+msgstr "è¾“å…¥æ¡†ä¸­é«˜äº®æ˜¾ç¤ºæ˜µç§°ã€æ ‡ç­¾ä»¥åŠurl地址"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"<ulink url=\"http://fedoraproject.org/wiki/Features/Gnome2.30\">http://"
-"fedoraproject.org/wiki/Features/Gnome2.30</ulink>"
-msgstr ""
-"<ulink url=\"http://fedoraproject.org/wiki/Features/Gnome2.30\">http://"
-"fedoraproject.org/wiki/Features/Gnome2.30</ulink>"
+msgid "URL shortening via goo.gl and is.gd and ur1.ca"
+msgstr "经goo.gl、is.gd及 ur1.ca 的URL地址缩写"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"<ulink url=\"http://fedoraproject.org/wiki/Features/KDE44\">http://"
-"fedoraproject.org/wiki/Features/KDE44</ulink>"
-msgstr ""
-"<ulink url=\"http://fedoraproject.org/wiki/Features/KDE44\">http://"
-"fedoraproject.org/wiki/Features/KDE44</ulink>"
+msgid "Support for status.net sites and API proxies for use with any identi.ca-like service, secure connections for Twitter and Twitter proxies, like birdnest and twit)"
+msgstr "支持 status.net 以及用于identi.ca类似服务的API 代理，支持 Twitter 和 Twitter 代理的安全连接，如 birdnest 和 twit"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"<ulink url=\"http://fedoraproject.org/wiki/Features/Sugar_0.88\">http://"
-"fedoraproject.org/wiki/Features/Sugar_0.88</ulink>"
-msgstr ""
-"<ulink url=\"http://fedoraproject.org/wiki/Features/Sugar_0.88\">http://"
-"fedoraproject.org/wiki/Features/Sugar_0.88</ulink>"
+msgid "Conversation view"
+msgstr "会话视图"
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"<ulink url=\"http://fedoraproject.org/wiki/Features/Moblin-2.2\">http://"
-"fedoraproject.org/wiki/Features/Moblin-2.2</ulink>"
-msgstr ""
-"<ulink url=\"http://fedoraproject.org/wiki/Features/Moblin-2.2\">http://"
-"fedoraproject.org/wiki/Features/Moblin-2.2</ulink>"
+msgid "Support for favorites (add/remove/list)"
+msgstr "æ”¯æŒå–œå¥½ï¼ˆæ·»åŠ /åˆ é™¤/列表）"
 
 #~ msgid "Spanning Desktop"
 #~ msgstr "桌面横跨多个显示器"
 
-#~ 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'''，如果您连接了两个显示器，那么这两个显示器将显示整个上管理系统，而不是显示两个相同的上管理系统。这与其它作业系统的行为一致。"
 
 #~ msgid "Better webcam support"
 #~ msgstr "更好的摄像头支持"
 
-#~ msgid ""
-#~ "The better webcam support feature for Fedora&nbsp;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&nbsp;10中更好地摄像头功能增强了摄像头在Linux下的支持。目前我们拥有"
-#~ "了能够解压用户磁盘内各种属性视频的库(<application>libv4l</application>) ，"
-#~ "å‡ ä¹Žæ‰€æœ‰ä½¿ç”¨æ‘„åƒå¤´çš„ç¨‹åºéƒ½å·²ç»ä½¿ç”¨äº†è¯¥åº“ã€‚"
+#~ msgid "The better webcam support feature for Fedora&nbsp;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&nbsp;10中更好地摄像头功能增强了摄像头在Linux下的支持。目前我们拥有了能够解压用户磁盘内各种属性视频的库(<application>libv4l</application>) ï¼Œå‡ ä¹Žæ‰€æœ‰ä½¿ç”¨æ‘„åƒå¤´çš„ç¨‹åºéƒ½å·²ç»ä½¿ç”¨äº†è¯¥åº“ã€‚"
 
-#~ msgid ""
-#~ "Fedora&nbsp;12 contains a second push for better webcam support, "
-#~ "comprising three pieces:"
+#~ msgid "Fedora&nbsp;12 contains a second push for better webcam support, comprising three pieces:"
 #~ msgstr "Fedora&nbsp;12提供了更多的摄像头支持特性，包括以下三项："
 
-#~ 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 "å¯¹å·²æœ‰çš„å†…æ ¸å†…ç½®é©±åŠ¨è¿›è¡Œäº†å¤§é‡æµ‹è¯•ï¼Œä¿®æ­£å’Œæé«˜ã€‚"
 
-#~ 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>å¢žåŠ äº†è§†é¢‘å¤„ç†ï¼Œä¸ºé‚£äº›ç¡¬ä»¶ä¸Šç¼ºä¹ä»¥ä¸‹å†…å®¹çš„æ‘„åƒå¤´æä¾›æ›´å¥½çš„è§†é¢‘è´¨é‡ã€‚"
 
 #~ msgid "White balancing"
 #~ msgstr "白平衡"
@@ -663,46 +443,23 @@ msgstr ""
 #~ msgid "Automatic adjustment of exposure (gain)"
 #~ msgstr "自动调节曝光（增益）"
 
-#~ 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度"
 
-#~ 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>并合并到主版本，具体如下："
 
-#~ 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å†…æ ¸å·²ä½¿ç”¨ï¼‰"
 
-#~ 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完成)"
 
-#~ 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å†…æ ¸å·²ä½¿ç”¨ï¼‰"
 
-#~ 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å†…æ ¸å·²ä½¿ç”¨ï¼‰"
 
 #~ msgid "<title>ABRT</title>"
 #~ msgstr "<title>ABRT</title>"
@@ -710,52 +467,24 @@ msgstr ""
 #~ msgid "<primary>ABRT</primary>"
 #~ msgstr "<primary>ABRT</primary>"
 
-#~ msgid ""
-#~ "The <application>ABRT</application> automatic bug reporting tool replaces "
-#~ "<application>bug-buddy</application> and <application>kerneloops</"
-#~ "application> in the Fedora&nbsp;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&nbsp;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&nbsp;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&nbsp;12桌面采用<application>ABRT</application>bug自动报告工具替代了<application>bug-buddy</application>å’Œ<application>kerneloops</application>。<application>ABRT</application>æ‹¥æœ‰å¯æ‰©å±•æž¶æž„ï¼Œå®ƒä¸ä»…å¯ä»¥æ•èŽ·å¹¶æäº¤å±€éƒ¨é”™è¯¯å’Œå†…æ ¸æ•…éšœï¼ŒåŒæ—¶ä¹Ÿèƒ½å›žæº¯python。与<application>bug-buddy</application>相比，它可以在任何二进制程序中捕获错误，而不仅仅是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+程序中看到如下"
-#~ "的警告信息："
+#~ 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 ""
-#~ "<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>"
 
-#~ 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 "要停止这些信息，可以在终端機上执行以下的命令："
 
-#~ 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>"
 
 #~ msgid "GNOME 2.28"
 #~ msgstr "GNOME 2.28"
@@ -763,98 +492,53 @@ msgstr ""
 #~ msgid "GNOME"
 #~ msgstr "GNOME"
 
-#~ 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>。"
 
 #~ msgid "Icons in menus and buttons"
 #~ msgstr "菜单及按钮中的图像"
 
-#~ 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é”®å€¼æ¥å¯ç”¨èœå•å’ŒæŒ‰é’®å›¾æ ‡ï¼š"
 
 #~ 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>"
 
 #~ msgid "Additional imrpovements in GNOME 2.28"
 #~ msgstr "GNOME 2.28的其它改进"
 
-#~ 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桌面默认设置上还有一些其它改变："
 
-#~ 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包中提供"
 
-#~ 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包中仍然提供"
 
 #~ msgid "The user switcher has been moved to the far right of the top panel"
 #~ 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 ""
-#~ "移除了“显示桌面”按钮。如果您需要，可通过点击右键，\"æ·»åŠ åˆ°é¢æ¿...\"然后选"
-#~ "æ‹©\"显示桌面\" æ·»åŠ ã€‚"
+#~ 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 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个"
 
-#~ 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 ""
-#~ "é¢æ¿é€šçŸ¥åŒºåŸŸä¸­çš„å°ç¨‹åºåŠå›¾æ ‡ä¹‹é—´å¢žåŠ äº†é—´è·ã€‚å¯é€šè¿‡ä»¥ä¸‹å‘½ä»¤åŽ»é™¤é—´è·ï¼š"
+#~ 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 "é¢æ¿é€šçŸ¥åŒºåŸŸä¸­çš„å°ç¨‹åºåŠå›¾æ ‡ä¹‹é—´å¢žåŠ äº†é—´è·ã€‚å¯é€šè¿‡ä»¥ä¸‹å‘½ä»¤åŽ»é™¤é—´è·ï¼š"
 
 #~ msgid ""
 #~ "gconftool-2 --type int --set /apps/panel/toplevels/top_panel/padding 0\n"
-#~ "gconftool-2 --type int --set /apps/panel/toplevels/bottom_panel/padding "
-#~ "0\n"
+#~ "gconftool-2 --type int --set /apps/panel/toplevels/bottom_panel/padding 0\n"
 #~ "gconftool-2 --type int --set /apps/panel/applets/systray/prefs/padding 0"
 #~ msgstr ""
 #~ "gconftool-2 --type int --set /apps/panel/toplevels/top_panel/padding 0\n"
-#~ "gconftool-2 --type int --set /apps/panel/toplevels/bottom_panel/padding "
-#~ "0\n"
+#~ "gconftool-2 --type int --set /apps/panel/toplevels/bottom_panel/padding 0\n"
 #~ "gconftool-2 --type int --set /apps/panel/applets/systray/prefs/padding 0"
 
 #~ msgid "Gnote"
@@ -866,45 +550,8 @@ msgstr ""
 #~ msgid "tomboy"
 #~ msgstr "tomboy"
 
-#~ 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 ca
 n 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>ä¸Žä¹‹å…±ç”¨åŒç§æ–‡ä»¶æ ¼å¼ï¼Œå¹¶ä¸”<applicatio
 n>Gnote</application>中附带插件可在其首次运行时自动导入<application>Tomboy</application>中的笔记。很多<application>Tomboy</application>插件已转为<application>Gnote</application>插件。以下插件做为<application>Gnote</application>的一部分提供："
 
 #~ msgid "Bugzilla Links"
 #~ msgstr "Bugzilla链接"
@@ -930,24 +577,14 @@ msgstr ""
 #~ msgid "Backlinks"
 #~ msgstr "Backlinks"
 
-#~ 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>中。"
 
 #~ msgid "<command>cp -r .tomboy .gnote</command>"
 #~ msgstr "<command>cp -r .tomboy .gnote</command>"
 
-#~ 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便签程序。"
 
 #~ msgid "Sound preferences"
 #~ msgstr "声音选项"
@@ -964,56 +601,22 @@ msgstr ""
 #~ msgid "pidgin"
 #~ msgstr "pidgin"
 
-#~ 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>，并将继续维护。"
 
-#~ 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>的主要优缺点如下："
 
 #~ msgid "Advantages"
 #~ msgstr "有点"
 
-#~ 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>é‚£æ ·ä»¥çº¯æ–‡æœ¬æ ¼å¼å­˜å‚¨ã€‚"
 
-#~ 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>目前使用相同的结构。"
 
-#~ 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>及其她程序协作"
 
 #~ msgid "Geo Location (very recent feature)"
@@ -1022,13 +625,8 @@ msgstr ""
 #~ msgid "Disdvantages"
 #~ msgstr "缺点"
 
-#~ 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>ä¸‹æä¾›çš„å¾ˆå¤šé¢å¤–åŠŸèƒ½ï¼ˆå¦‚åŠ å¯†ï¼‰å°†ä¸å†æä¾›"
 
 #~ msgid "No proxy support"
 #~ msgstr "æ— ä»£ç†æ”¯æŒ"
@@ -1042,13 +640,8 @@ msgstr ""
 #~ msgid "gstreamer"
 #~ msgstr "gstreamer"
 
-#~ 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>后端。"
 
 #~ msgid "Epiphany"
 #~ msgstr "Epiphany"
@@ -1056,13 +649,8 @@ msgstr ""
 #~ msgid "epiphany"
 #~ msgstr "epiphany"
 
-#~ 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引擎。"
 
 #~ msgid "GNOME Shell &mdash; preview of GNOME 3"
 #~ msgstr "GNOME Shell &mdash; GNOME 3预览"
@@ -1070,39 +658,24 @@ msgstr ""
 #~ msgid "GNOME shell"
 #~ msgstr "GNOME shell"
 
-#~ 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>软件包："
 
 #~ msgid "<command>yum install desktop-effects gnome-shell</command>"
 #~ msgstr "<command>yum install desktop-effects gnome-shell</command>"
 
-#~ 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>"
 
 #~ msgid "If you would like to configure it manually, run"
 #~ msgstr "如果您希望手动设置，请执行"
 
 #~ 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>"
 
 #~ msgid "You can also run the following to invoke it directly."
 #~ msgstr "ä½ äº¦å¯ä»¥é€šè¿‡ç›´æŽ¥å¼•å¯¼æ¥æ‰§è¡Œä»¥ä¸‹çš„ç¨‹åºã€‚"
@@ -1116,33 +689,11 @@ msgstr ""
 #~ msgid "<primary>KDE</primary>"
 #~ msgstr "<primary>KDE</primary>"
 
-#~ 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闪存盘。"
 
-#~ 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å˜å¾—æ›´åŠ å®¹æ˜“ã€‚"
 
 #~ msgid "Moblin Desktop"
 #~ msgstr "Moblin桌面"
@@ -1150,20 +701,11 @@ msgstr ""
 #~ msgid "moblin-desktop"
 #~ msgstr "moblin-桌面"
 
-#~ 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系统的应用。"
 
-#~ 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桌面预览版。"
 
 #~ msgid "The Moblin Desktop may be installed as a group with yum:"
 #~ msgstr "Moblin桌面将以组件通过yum安装："