diff --git a/gnome-help/zh_CN/zh_CN.po b/gnome-help/zh_CN/zh_CN.po
index a12ae81..31fb51d 100644
--- a/gnome-help/zh_CN/zh_CN.po
+++ b/gnome-help/zh_CN/zh_CN.po
@@ -5743,11 +5743,11 @@ msgstr ""
 
 #: C/files-autorun.page:52(item/p)
 msgid ""
-"If you don't see the device or media type that you want to change in the "
-"list (such as Blu-ray discs or E-book readers), click <gui>Other Media</gui> "
-"to see a more detailed list of devices. Select the type of device or media "
-"from the <gui>Type</gui> drop-down and the application or action from the "
-"<gui>Action</gui> drop-down."
+"If you do not see the device or media type that you want to change in "
+"the list (such as Blu-ray discs or E-book readers), click <gui>Other "
+"Media…</gui> to see a more detailed list of devices. Select the type of "
+"device or media from the <gui>Type</gui> drop-down and the application or "
+"action from the <gui>Action</gui> drop-down."
 msgstr ""
 "如果您在列表中没有看到您想要更改的设备或媒体类型(如蓝光光盘或电子书阅读器)，"
 "单击<gui>其他媒体</gui>查看更详细的设备列表。"
@@ -5771,10 +5771,11 @@ msgstr "音乐光碟"
 
 #: C/files-autorun.page:71(item/p)
 msgid ""
-"Choose your favorite music application or CD audio extractor to handle audio "
-"CDs. If you use audio DVDs (DVD-A), select how to open them under <gui>Other "
-"Media</gui>. If you open an audio disc with the file manager, the tracks "
-"will appear as WAV files that you can play in any audio player application."
+"Choose your favorite music application or CD audio extractor to handle "
+"audio CDs. If you use audio DVDs (DVD-A), select how to open them under "
+"<gui>Other Media…</gui>. If you open an audio disc with the file manager, "
+"the tracks will appear as WAV files that you can play in any audio player "
+"application."
 msgstr ""
 "选择您喜爱的音乐程序或 CD 音乐播放器与之关联，如果您使用的是音乐 DVD(DVD-A)，"
 "在下边的“<gui>其他媒体</gui>中选择如何打开。如果您选择用文件管理器打开音乐 "
@@ -5787,9 +5788,9 @@ msgstr "视频光碟"
 #: C/files-autorun.page:79(item/p)
 msgid ""
 "Choose your favorite video application to handle video DVDs. Use the "
-"<gui>Other Media</gui> button to set an application for Blu-ray, HD DVD, "
-"video CD (VCD), and super video CD (SVCD). If DVDs or other video discs do "
-"not work correctly when you insert them, see <link xref=\"video-dvd\"/>."
+"<gui>Other Media…</gui> button to set an application for Blu-ray, HD DVD, "
+"video CD (VCD), and super video CD (SVCD). If DVDs or other video discs "
+"do not work correctly when you insert them, see <link xref=\"video-dvd\"/>."
 msgstr ""
 "选择您喜爱的视频播放程序与之关联，在下边的“<gui>其他媒体</gui>中选择如何打开 "
 "Blu-ray、HD DVD、 video CD (VCD) 和 超级 VCD(SVCD)。如果 DVD 或其他视频光碟不"
@@ -5801,8 +5802,9 @@ msgstr "空白光盘"
 
 #: C/files-autorun.page:87(item/p)
 msgid ""
-"Use the <gui>Other Media</gui> button to select a disc-writing application "
-"for blank CDs, blank DVDs, blank Blu-ray discs, and blank HD DVDs."
+"Use the <gui>Other Media…</gui> button to select a disc-writing "
+"application for blank CDs, blank DVDs, blank Blu-ray discs, and blank HD "
+"DVDs."
 msgstr ""
 "点击<gui>其他媒体</gui>按钮，选择一个磁盘刻录程序与空白的光盘、DVD 光盘、Blu-"
 "ray discs、HD DVD 关联。"
@@ -5824,9 +5826,10 @@ msgstr ""
 
 #: C/files-autorun.page:97(item/p)
 msgid ""
-"Under <gui>Other Media</gui>, you can select an application to open Kodak "
-"picture CDs, such as those you might have made in a store. These are regular "
-"data CDs with JPEG images in a folder called <file>PICTURES</file>."
+"Under <gui>Other Media…</gui>, you can select an application to open "
+"Kodak picture CDs, such as those you might have made in a store. These are "
+"regular data CDs with JPEG images in a folder called "
+"<file>Pictures</file>."
 msgstr ""
 "在<gui>其他媒体</gui>中，您可以为存储图片的类似柯达图片光碟选择一个应用程序，"
 "这些是流行的数据光盘。以 JPEG 图片格式存储在 <file>PICTURES</file> 文件夹中。"
@@ -5849,9 +5852,9 @@ msgstr "电子书阅读器"
 
 #: C/files-autorun.page:108(item/p)
 msgid ""
-"Use the <gui>Other Media</gui> button to choose an application to manage the "
-"books on your e-book reader, or manage the files yourself using the file "
-"manager."
+"Use the <gui>Other Media…</gui> button to choose an application to "
+"manage the books on your e-book reader, or manage the files yourself "
+"using the file manager."
 msgstr ""
 "点击<gui>其他媒体</gui>按钮来选择一个，管理您的电子书阅读器上的文件，或者您也"
 "可以在文件管理器中管理。"
@@ -5872,7 +5875,7 @@ msgstr ""
 "问。"
 
 #: C/files-autorun.page:118(note/p)
-msgid "Never run software from media you don't trust."
+msgid "Never run software from media you don’t trust."
 msgstr "不要运行不可信媒体上的程序。"
 
 #: C/files-browse.page:9(info/desc)
@@ -5896,10 +5899,10 @@ msgstr ""
 
 #: C/files-browse.page:47(page/p)
 msgid ""
-"To start the file manager, open <app>Files</app> in the <gui>Activities</"
-"gui> overview. You can also search for files and folders through the "
-"overview in the same way you would <link xref=\"shell-apps-open\">search for "
-"applications</link>."
+"To start the file manager, open <app>Files</app> in the "
+"<gui xref=\"shell-introduction#activities\">Activities</gui> overview. You can also search "
+"for files and folders through the overview in the same way you would "
+"<link xref=\"shell-apps-open\">search for applications</link>."
 msgstr ""
 "要管理文件，在<gui>活动</gui>概览中，打开<app>文件管理器</app>，您也可以在活"
 "动视图中搜索文件和文件夹，同样的方法还可以<link xref=\"shell-apps-open\">搜索"
@@ -5931,14 +5934,14 @@ msgstr ""
 #: C/files-browse.page:65(section/p)
 msgid ""
 "The <em>path bar</em> above the list of files and folders shows you which "
-"folder you're viewing, including the parent folders of the current folder. "
+"folder you’re viewing, including the parent folders of the current folder. "
 "Click a parent folder in the path bar to go to that folder. Right-click any "
-"folder in the path bar to open it in a new tab or window, copy or move it, "
-"or access its properties."
+"folder in the path bar to open it in a new tab or window, or access its "
+"properties."
 msgstr ""
 "在文件和文件夹上面的<em>路径栏</em>用按钮显示了当前文件夹的路径，包含了上一级"
 "的文件夹。点击路径中的上一级按钮，可以转到这个文件夹，右击可以在新标签或者新"
-"窗口打开它、复制它，或者查看它的属性。"
+"窗口打开它、或者查看它的属性。"
 
 #: C/files-browse.page:71(section/p)
 msgid ""
@@ -5992,8 +5995,8 @@ msgstr ""
 msgid ""
 "For example, you might want to copy a presentation onto a memory stick so "
 "you can take it to work with you. Or, you could make a back-up copy of a "
-"document before you make changes to it (and then use the old copy if you "
-"don't like your changes)."
+"document before you make changes to it (and then use the old copy if you don’t "
+"like your changes)."
 msgstr ""
 "例如，您可能需要把演示文稿复制一份放进 U 盘以便随身携带和修改。或者，您也可能"
 "需要在修改文档之前先复制一份(这样如果您不喜欢更改后的，可以使用旧的备份文"
@@ -6028,11 +6031,12 @@ msgstr "再打开您想要存放复制后文件的目录。"
 
 #: C/files-copy.page:48(item/p)
 msgid ""
-"Click the gear icon and pick <gui>Paste</gui> to finish copying the file, or "
-"press <keyseq><key>Ctrl</key><key>V</key></keyseq>. There will now be a copy "
-"of the file in the original folder and the other folder."
+"Click the menu button and pick <gui>Paste</gui> to finish copying the "
+"file, or press <keyseq><key>Ctrl</key><key>V</key></keyseq>. There "
+"will now be a copy of the file in the original folder and the other "
+"folder."
 msgstr ""
-"点击齿轮图标，选择<gui>粘贴</gui>命令完成复制操作，或者也可以按组合键 "
+"点击菜单按钮，选择<gui>粘贴</gui>命令完成复制操作，或者也可以按组合键 "
 "<keyseq><key>Ctrl</key><key>V</key></keyseq>。这样就会得到一个原来文件或文件"
 "夹的复制。"
 
@@ -6058,11 +6062,12 @@ msgstr "再打开您想要存放移动后项目的文件夹。"
 
 #: C/files-copy.page:60(item/p)
 msgid ""
-"Click the gear button in the toolbar and pick <gui>Paste</gui> to finish "
-"moving the file, or press <keyseq><key>Ctrl</key><key>V</key></keyseq>. The "
-"file will be taken out of its original folder and moved to the other folder."
+"Click the menu button in the toolbar and pick <gui>Paste</gui> to "
+"finish moving the file, or press <keyseq><key>Ctrl</key><key>V</key></keyseq>. "
+"The file will be taken out of its original folder and moved to the other "
+"folder."
 msgstr ""
-"点击工具栏上的齿轮图标，然后选择<gui>粘贴</gui>命令完成移动文件，或者也可以按"
+"点击工具栏中的菜单按钮，然后选择<gui>粘贴</gui>命令完成移动文件，或者也可以按"
 "组合键 <keyseq><key>Ctrl</key><key>V</key></keyseq>。文件会被移出原来的文件"
 "夹，放到了另外的文件夹中。"
 
@@ -6100,7 +6105,7 @@ msgstr ""
 #: C/files-copy.page:78(item/p)
 msgid ""
 "For example, if you drag a file from a USB memory stick to your Home folder, "
-"it will be copied, because you're dragging from one device to another."
+"it will be copied, because you’re dragging from one device to another."
 msgstr ""
 "例如，如果您将一个文件从 U 盘拖动到主文件夹，这份文件将被复制，因为您是在不同"
 "的设备中进行拖动。"
@@ -6116,10 +6121,11 @@ msgstr ""
 
 #: C/files-copy.page:87(note/p)
 msgid ""
-"You can't copy or move a file into a folder that is <em>read-only</em>. Some "
-"folders are read-only to prevent you from making changes to their contents. "
-"You can change things from being read-only by <link xref=\"nautilus-file-"
-"properties-permissions\">changing file permissions </link>."
+"You cannot copy or move a file into a folder that is <em>read-only</em>. "
+"Some folders are read-only to prevent you from making changes to their "
+"contents. You can change things from being read-only by "
+"<link xref=\"nautilus-file-properties-permissions\">changing file permissions "
+"</link>."
 msgstr ""
 "您不能将文件复制或移动到<em>只读</em>文件夹。有些文件是只读的以防止您更改其内"
 "容。您可以通过<link xref=\"nautilus-file-properties-permissions\">更改文件权"
@@ -6135,11 +6141,11 @@ msgstr "删除文件和文件夹"
 
 #: C/files-delete.page:33(page/p)
 msgid ""
-"If you don't want a file or folder any more, you can delete it. When you "
-"delete an item it is moved to the <gui>Trash</gui> folder, where it is "
-"stored until you empty the trash. You can <link xref=\"files-recover"
-"\">restore items </link> in the <gui>Trash</gui> folder to their original "
-"location if you decide you need them, or if they were accidentally deleted."
+"If you do not want a file or folder any more, you can delete it. When you "
+"delete an item it is moved to the <gui>Trash</gui> folder, where it is stored "
+"until you empty the trash. You can <link xref=\"files-recover\">restore "
+"items</link> in the <gui>Trash</gui> folder to their original location if you "
+"decide you need them, or if they were accidentally deleted."
 msgstr ""
 "当您删除某个项目时，该项目被移到“回收站”文件夹，在您清空回收站之前，它将一直"
 "存储在此处。如果您认为您还需要存储在“回收站”文件夹中的项目，或者这些项目是被"
@@ -6155,11 +6161,10 @@ msgstr "单击选中您想要删除的项目。"
 
 #: C/files-delete.page:43(item/p)
 msgid ""
-"Press <keyseq><key>Ctrl</key><key>Delete</key></keyseq> on your keyboard. "
-"Alternatively, drag the item to the <gui>Trash</gui> in the sidebar."
+"Press <key>Delete</key> on your keyboard. Alternatively, drag the "
+"item to the <gui>Trash</gui> in the sidebar."
 msgstr ""
-"按组合键 <keyseq><key>Ctrl</key><key>Delete</key>，或者把它们拖到侧边栏的</"
-"keyseq><gui>回收站</gui>图标上。"
+"按<key>Delete</key>键，或者把它们拖到侧边栏的<gui>回收站</gui>图标上。"
 
 #: C/files-delete.page:48(page/p)
 msgid ""
@@ -6317,12 +6322,12 @@ msgstr ""
 "退出。"
 
 #: C/files-disc-write.page:68(section/title)
-msgid "If the disc wasn't burned properly"
+msgid "If the disc wasn’t burned properly"
 msgstr "如果未能成功进行光盘刻录"
 
 #: C/files-disc-write.page:69(section/p)
 msgid ""
-"Sometimes the computer doesn't record the data correctly, and you won't be "
+"Sometimes the computer doesn’t record the data correctly, and you won’t be "
 "able to see the files you put onto the disc when you insert it into a "
 "computer."
 msgstr ""
@@ -6331,17 +6336,19 @@ msgstr ""
 
 #: C/files-disc-write.page:72(section/p)
 msgid ""
-"In this case, try burning the disc again but use a lower burning speed, e.g. "
-"12x rather than 48x. Burning at slower speeds is more reliable. You can "
-"choose the speed by clicking the <gui>Properties</gui> button in the <gui>CD/"
-"DVD Creator</gui> window."
+"In this case, try burning the disc again but use a lower burning speed, "
+"for example, 12x rather than 48x. Burning at slower speeds is more reliable. "
+"You can choose the speed by clicking the <gui>Properties</gui> button in the "
+"<gui>CD/DVD Creator</gui> window."
 msgstr ""
 "在这种情况下，请使用较低的刻录速度，如 12x 而不是 48x，重新尝试刻录一次。以较"
 "低的速度刻录更为可靠。您可以通过单击 <gui>CD/DVD 创建器</gui>中的<gui>属性</"
 "gui>按钮来选择速度。"
 
 #: C/files-hidden.page:7(info/desc)
-msgid "Make a file invisible, so you can't see it in the file manager."
+msgid ""
+"Make a file invisible, so you cannot see it in the file "
+"manager."
 msgstr "让文件不可见，在文件管理器中看不到它。"
 
 #: C/files-hidden.page:22(page/title)
@@ -6350,18 +6357,19 @@ msgstr "隐藏文件"
 
 #: C/files-hidden.page:24(page/p)
 msgid ""
-"The GNOME file manager gives you the ability to hide and unhide files at "
-"your discretion. When a file is hidden, it isn't displayed by the file "
-"manager, but it's still there in its folder."
+"The <app>Files</app> file manager gives you the ability to hide and unhide "
+"files at your discretion. When a file is hidden, it is not displayed by the "
+"file manager, but it is still there in its folder."
 msgstr ""
-"GNOME 文件管理器赋予您根据需要，隐藏和不隐藏文件的能力。当一个文件被隐藏，它"
+"<app>Files</app>文件管理器赋予您根据需要，隐藏和不隐藏文件的能力。当一个文件被隐藏，它"
 "将不显示在文件管理器中，但它仍然在那个文件夹中。"
 
 #: C/files-hidden.page:28(page/p)
 msgid ""
-"To hide a file, <link xref=\"files-rename\">rename it</link> with a <key>.</"
-"key> at the beginning of its name. For example, to hide a file named <file> "
-"example.txt</file>, you should rename it to <file>.example.txt</file>."
+"To hide a file, <link xref=\"files-rename\">rename it</link> with a "
+"<file>.</file> at the beginning of its name. For example, to hide a file "
+"named <file>example.txt</file>, you should rename it to "
+"<file>.example.txt</file>."
 msgstr ""
 "要隐藏文件，在名称前添加 \".\" 来<link xref=\"files-rename\">重命名</link>文"
 "件。例如，要隐藏文件 <file>example.txt</file>，您应将其重命名为 <file>."
@@ -6369,8 +6377,8 @@ msgstr ""
 
 #: C/files-hidden.page:34(note/p)
 msgid ""
-"You can hide folders in the same way that you can hide files. Hide a folder "
-"by placing a <key>.</key> at the beginning of the folder's name."
+"You can hide folders in the same way that you can hide files. Hide a "
+"folder by placing a <file>.</file> at the beginning of the folder’s name."
 msgstr ""
 "您可以用与隐藏文件相同的方式隐藏文件夹。在名称前添加 \".\" 来重命名文件夹。"
 
@@ -6444,16 +6452,18 @@ msgstr ""
 
 #: C/files-hidden.page:73(note/p)
 msgid ""
-"Most hidden files will have a <key>.</key> at the beginning of their name, "
-"but others might have a <key>~</key> at the end of their name instead. These "
-"files are backup files. See <link xref=\"files-tilde\"/> for more "
-"information."
+"Most hidden files will have a <file>.</file> at the "
+"beginning of their name, but others might have a <file>~</file> at the end of "
+"their name instead. These files are backup files. See "
+"<link xref=\"files-tilde\"/> for more information."
 msgstr ""
 "有些隐藏文件的名称以 \".\" 开头。另一些隐藏文件可能以 \"~\" 结尾(参阅<link "
 "xref=\"files-tilde\"/>)。"
 
 #: C/files-lost.page:10(info/desc)
-msgid "Follow these tips if you can't find a file you created or downloaded."
+msgid ""
+"Follow these tips if you can’t find a file you created or "
+"downloaded."
 msgstr "如果您找不到创建或下载的文件，请按下列提示操作。"
 
 #: C/files-lost.page:29(page/title)
@@ -6462,24 +6472,25 @@ msgstr "查找丢失的文件"
 
 #: C/files-lost.page:31(page/p)
 msgid ""
-"If you created or downloaded a file, but now you can't find it, follow these "
-"tips."
+"If you created or downloaded a file, but now you cannot find it, follow "
+"these tips."
 msgstr "如果您创建或下载了一个文件，但是却找不到了，请按下面提示操作。"
 
 #: C/files-lost.page:35(item/p)
 msgid ""
-"If you don't remember where you saved the file, but you have some idea of "
-"how you named it, you can search for the file by name. See <link xref="
-"\"files-search\"/> to learn how."
+"If you do not remember where you saved the file, but you have some "
+"idea of how you named it, you can <link xref=\"files-search\">search for the "
+"file by name</link>."
 msgstr ""
 "如果您不记得保存到哪儿 ，但还记得一些文件名，可以试着按文件名搜索，请参阅 "
 "<link xref=\"files-search\"/>。"
 
 #: C/files-lost.page:39(item/p)
 msgid ""
-"If you just downloaded the file, your web browser might have automatically "
-"saved it to a common folder. Check the Desktop and Downloads folders in your "
-"home folder."
+"If you just downloaded the file, your web browser might "
+"have automatically saved it to a common folder. Check the "
+"<file>Desktop</file> and <file>Downloads</file> folders in your home "
+"folder."
 msgstr ""
 "如果您刚刚下载了该文件，您的浏览器可能已自动将其保存在某个文件夹中。检查您的"
 "主文件夹中的<file>桌面</file>和<file>下载</file>文件夹。"
@@ -6496,11 +6507,12 @@ msgstr ""
 
 #: C/files-lost.page:48(item/p)
 msgid ""
-"You might have renamed the file in a way that made the file hidden. Files "
-"that start with a <file>.</file> or end with a <file>~</file> are hidden in "
-"the file manager. Click the <media type=\"image\" src=\"figures/go-down.png"
-"\">down</media> button in the file manager toolbar and pick <gui>Show Hidden "
-"Files</gui> to display them. See <link xref=\"files-hidden\"/> to learn more."
+"You might have renamed the file in a way that made the file hidden. "
+"Files that start with a <file>.</file> or end with a <file>~</file> are "
+"hidden in the file manager. Click the "
+"view options button in the <app>Files</app> toolbar and enable <gui>Show "
+"Hidden Files</gui> to display them. See <link xref=\"files-hidden\"/> to learn "
+"more."
 msgstr ""
 "您可以重命名一个文件使它隐藏起来，文件名以点 <file>.</file>  开头，或者以 "
 "<file>~</file> 结尾，都会在文件管理器中隐藏起来。点击工具栏上的 <media type="
@@ -6509,8 +6521,8 @@ msgstr ""
 
 #: C/files-open.page:10(info/desc)
 msgid ""
-"Open files using an application that isn't the default one for that type of "
-"file. You can change the default too."
+"Open files using an application that isn’t the default one for that "
+"type of file. You can change the default too."
 msgstr "不用默认的应用程序打开文件，您也可以更改默认打开程序。"
 
 #: C/files-open.page:24(page/title)
@@ -6519,33 +6531,33 @@ msgstr "用其他程序打开文件"
 
 #: C/files-open.page:26(page/p)
 msgid ""
-"When you double-click a file in the file manager, it will be opened with the "
-"default application for that file type. You can open it in a different "
-"application, search online for applications, or set the default application "
-"for all files of the same type."
+"When you double-click (or middle-click) a file in the file manager, it "
+"will be opened with the default application for that file type. You can open "
+"it in a different application, search online for applications, or set the "
+"default application for all files of the same type."
 msgstr ""
-"当您在文件管理器中双击一个文件，它会以默认的应用程序打开。您可以用其他程序打"
+"当您在文件管理器中双击（或者中键点击）一个文件，它会以默认的应用程序打开。您可以用其他程序打"
 "开它，搜索在线的程序，或者设置那个类型文件的默认打开程序。"
 
 #: C/files-open.page:31(page/p)
 msgid ""
-"To open a file with an application other than the default, right-click the "
-"file and select the application you want from the top of the menu. If you "
-"don't see the application you want, click <gui>Open With Other Application</"
-"gui>. By default, the file manager only shows applications it knows can "
-"handle the file. To look through all the applications on your computer, "
-"click <gui>Show other applications</gui>."
+"To open a file with an application other than the default, right-click "
+"the file and select the application you want from the top of the menu. If "
+"you do not see the application you want, select <gui>Open With Other "
+"Application</gui>. By default, the file manager only shows applications that "
+"are known to handle the file. To look through all the applications on your "
+"computer, click <gui>View All Applications</gui>."
 msgstr ""
 "要用其他程序打开一个文件，右击该文件，在出来的菜单顶部选择其他程序，如果里面"
 "没有您想用的程序，点击<gui>使用其他程序打开</gui>。默认情况下，文件管理器只显"
-"示相关联的程序，要查看系统中的所有应用程序，点击<gui>显示其他应用程序</gui>。"
+"示相关联的程序，要查看系统中的所有应用程序，点击<gui>查看所有应用程序</gui>。"
 
 #: C/files-open.page:38(page/p)
 msgid ""
-"If you still can't find the application you want, you can search for more "
-"applications by clicking <gui>Find applications online</gui>. The file "
-"manager will search online for packages containing applications that are "
-"known to handle files of that type."
+"If you still cannot find the application you want, you can search for "
+"more applications by clicking <gui>Find New Applications</gui>. The "
+"file manager will search online for packages containing applications "
+"that are known to handle files of that type."
 msgstr ""
 "如果您仍然没找到想要的应用程序，可以点击<gui>在线寻找应用程序</gui>搜索更多的"
 "程序。文件管理器将搜索已知那种类型文件相关联的应用程序包。"
@@ -6583,21 +6595,18 @@ msgstr "选择<gui>打开方式</gui>标签。"
 
 #: C/files-open.page:56(item/p)
 msgid ""
-"Select the application you want and click <gui>Set as default</gui>. By "
-"default, the file manager only shows applications it knows can handle the "
-"file. To look through all the applications on your computer, click <gui>Show "
-"other applications</gui>."
+"Select the application you want and click "
+"<gui>Set as default</gui>."
 msgstr ""
-"选中想用的应用程序，然后点<gui>设为默认值</gui>。默认情况下，文件管理器仅显示"
-"已知的相关应用程序。要查看所有程序，点<gui>显示其他应用程序</gui>。"
+"选中想用的应用程序，然后点<gui>设为默认值</gui>。"
 
 #: C/files-open.page:60(item/p)
 msgid ""
-"If <gui>Other Applications</gui> contains an application you sometimes want "
-"to use, but don't want to make the default, select that application and "
-"click <gui>Add</gui>. This will add it to <gui>Recommended Applications</"
-"gui>. You will then be able to use this application by right-clicking the "
-"file and selecting it from the list."
+"If <gui>Other Applications</gui> contains an application you sometimes "
+"want to use, but do not want to make the default, select that application "
+"and click <gui>Add</gui>. This will add it to <gui>Recommended "
+"Applications</gui>. You will then be able to use this application by "
+"right-clicking the file and selecting it from the list."
 msgstr ""
 "如果<gui>其他应用程序</gui>中包含您有时会用到，但又不想设为默认的程序，选中这"
 "个程序，然后点<gui>添加</gui>。这将添加到<gui>推荐的应用程序</gui>列表中，您"
@@ -6657,16 +6666,12 @@ msgstr ""
 
 #: C/files-preview.page:29(page/p)
 msgid ""
-"To view a preview full-screen, click the <media type=\"image\" src=\"figures/"
-"view-fullscreen-16.png\">fullscreen</media> button near the bottom, or press "
-"<key>f</key>. Click <media type=\"image\" src=\"figures/view-fullscreen-16."
-"png\">fullscreen</media> or press <key>f</key> again to leave full-screen, "
-"or press the space bar to exit the preview completely."
+"To view a preview full-screen, press <key>F</key> or <key>F11</key>. Press "
+"<key>F</key> or <key>F11</key> again to leave full-screen, or press the space "
+"bar to exit the preview completely."
 msgstr ""
-"要全屏查看文件，点击底部的<media type=\"image\" src=\"figures/view-"
-"fullscreen-16.png\">全屏</media>按钮，或者按 <key>f</key> 键。再次点击<media "
-"type=\"image\" src=\"figures/view-fullscreen-16.png\">全屏</media>按钮，或者"
-"按 <key>f</key> 键返回普通窗口，或者也可以再按空格键退出预览。"
+"要全屏查看文件，按 <key>F</key> 键或者<key>F11</key>键。"
+"再次按 <key>F</key> 键或者<key>F11</key>键离开全屏，或者按空格键完全退出预览。"
 
 #: C/files-recover.page:8(info/desc)
 msgid "Deleted files are normally sent to the Trash, but can be recovered."
@@ -6700,18 +6705,19 @@ msgstr "点侧边栏中的<gui>回收站</gui>。"
 
 #: C/files-recover.page:29(item/p)
 msgid ""
-"If your deleted file is there, click on it and select <gui> Restore</gui>. "
-"It will be restored to the folder from where it was deleted."
+"If your deleted file is there, click on it and select "
+"<gui>Restore</gui>. It will be restored to the folder from where it was "
+"deleted."
 msgstr ""
 "如果您删除的文件在它里面，在它上面右击，选择<gui>还原</gui>，它将恢复到原来删"
 "除前所在的文件夹。"
 
 #: C/files-recover.page:34(page/p)
 msgid ""
-"If you deleted the file by pressing <keyseq><key>Shift</key><key>Delete </"
-"key></keyseq>, or by using the command line, the file has been permanently "
-"deleted. Files that have been permanently deleted can't be recovered from "
-"the <gui>Trash</gui>."
+"If you deleted the file by pressing <keyseq><key>Shift</key><key>Delete "
+"</key></keyseq>, or by using the command line, the file has been permanently "
+"deleted. Files that have been permanently deleted can’t be recovered from the "
+"<gui>Trash</gui>."
 msgstr ""
 "如果您删除文件时使用的是 <keyseq><key>Shift</key><key>Delete</key></keyseq> "
 "或命令行，文件将无法使用该方法还原，因为它已被永久删除。"
@@ -6721,7 +6727,7 @@ msgid ""
 "There are a number of recovery tools available that are sometimes able to "
 "recover files that were permanently deleted. These tools are generally not "
 "very easy to use, however. If you accidentally permanently deleted a file, "
-"it's probably best to ask for advice on a support forum to see if you can "
+"it’s probably best to ask for advice on a support forum to see if you can "
 "recover it."
 msgstr ""
 "有一些还原工具有时能够还原永久删除的文件。不过，一般用起来不太容易。如果您意"
@@ -6754,7 +6760,9 @@ msgid "To eject a removable device:"
 msgstr "格式化可移动磁盘"
 
 #: C/files-removedrive.page:38(item/p)
-msgid "From the <gui>Activities</gui> overview, open <app>Files</app>."
+msgid ""
+"From the <gui xref=\"shell-introduction#activities\">Activities</gui> overview, "
+"open <app>Files</app>."
 msgstr "在<gui>活动</gui>概览中，打开<app>文件管理器</app>。"
 
 #: C/files-removedrive.page:40(item/p)
@@ -6815,10 +6823,10 @@ msgstr "重命名文件或文件夹"
 
 #: C/files-rename.page:32(page/p)
 msgid ""
-"As with other file managers, you can use the GNOME file manager to change "
-"the name of a file or folder."
+"As with other file managers, you can use <app>Files</app> to change the "
+"name of a file or folder."
 msgstr ""
-"跟其他文件管理器一样，您也可以使用 GNOME 文件管理器来重命名文件或文件夹。"
+"跟其他文件管理器一样，您也可以使用<app>文件</app>来重命名文件或文件夹。"
 
 #: C/files-rename.page:35(steps/title)
 msgid "To rename a file or folder:"
@@ -6833,8 +6841,9 @@ msgstr ""
 "key> 键。"
 
 #: C/files-rename.page:38(item/p)
-msgid "Type the new name and press <key>Enter</key>."
-msgstr "输入新的文件名，然后按<key>回车键</key>。"
+msgid "Type the new name and press <key>Enter</key> or click "
+"<gui>Rename</gui>."
+msgstr "输入新的文件名，然后按<key>回车键</key>或者点击<gui>重命名</gui>。"
 
 #: C/files-rename.page:41(page/p)
 msgid ""
@@ -6847,10 +6856,11 @@ msgstr ""
 #: C/files-rename.page:44(page/p)
 msgid ""
 "When you rename a file, only the first part of the name of the file is "
-"selected, not the file extension (the part after the \".\"). The extension "
-"normally denotes what type of file it is (e.g. <file>file.pdf</file> is a "
-"PDF document), and you usually do not want to change that. If you need to "
-"change the extension as well, select the entire file name and change it."
+"selected, not the file extension (the part after the last <file>.</file>). "
+"The extension normally denotes what type of file it is (for example, "
+"<file>file.pdf</file> is a PDF document), and you usually do not want to "
+"change that. If you need to change the extension as well, select the entire "
+"file name and change it."
 msgstr ""
 "当您重命名文件时，仅会选择文件名称的第一部分，而不会选择文件扩展名(\".\" 之后"
 "的部分)。扩展名通常指示文件是什么类型(如，<file>file.pdf</file> 是 PDF 文"
@@ -6859,12 +6869,15 @@ msgstr ""
 
 #: C/files-rename.page:51(note/p)
 msgid ""
-"If you renamed the wrong file, or named your file improperly, you can undo "
-"the rename. To revert the action, immediately click the gear button in the "
-"toolbar and select <gui>Undo</gui> to restore the former name."
+"If you renamed the wrong file, or named your file improperly, you can "
+"undo the rename. To revert the action, immediately click the menu button in "
+"the toolbar and select <gui>Undo Rename</gui>, or press "
+"<keyseq><key>Ctrl</key><key>Z</key></keyseq>, to restore the former "
+"name."
 msgstr ""
 "如果您重命名错了，或者不太合适，您可以撤消重命名。当您发现重命名错误时，立刻"
-"点点击工具栏上的齿轮图标，选择<gui>撤消</gui>命令，就可以恢复原来的文件名。"
+"点击工具栏上的菜单按钮，选择<gui>撤消重命名</gui>命令，或者按<keyseq><key>Ctrl</key><key>Z</key></keyseq>键"
+"就可以恢复原来的文件名。"
 
 #: C/files-rename.page:57(section/title)
 msgid "Valid characters for file names"
@@ -6872,12 +6885,12 @@ msgstr "有效的文件名字符"
 
 #: C/files-rename.page:58(section/p)
 msgid ""
-"You can use any character except the <key>/</key> (slash) character in file "
-"names. Some devices, however, use a <em>file system</em> that has more "
+"You can use any character except the <file>/</file> (slash) character in "
+"file names. Some devices, however, use a <em>file system</em> that has more "
 "restrictions on file names. Therefore, it is a best practice to avoid the "
-"following characters in your file names: <key>|</key>, <key>\\</key>, <key>?"
-"</key>, <key>*</key>, <key>&lt;</key>, <key>\"</key>, <key>:</key>, <key>&gt;"
-"</key>, <key>/</key>."
+"following characters in your file names: <file>|</file>, <file>\\</file>, "
+"<file>?</file>, <file>*</file>, <file>&lt;</file>, <file>\"</file>, "
+"<file>:</file>, <file>&gt;</file>, <file>/</file>."
 msgstr ""
 "在文件名称中，您可以使用除 <key>/</key> (斜杠)字符以外的任何字符。不过有些设"
 "备，使用的<em>文件系统</em>对文件名称有更多限制。例如，USB 闪存驱动器常常利"
@@ -6888,9 +6901,9 @@ msgstr ""
 
 #: C/files-rename.page:66(note/p)
 msgid ""
-"If you name a file with a <key>.</key> as the first character, the file will "
-"be <link xref=\"files-hidden\">hidden</link> when you attempt to view it in "
-"the file manager."
+"If you name a file with a <file>.</file> as the first character, the "
+"file will be <link xref=\"files-hidden\">hidden</link> when you attempt to "
+"view it in the file manager."
 msgstr ""
 "如果您使用 <key>.</key> 作为第一个字符为文件命名，该文件将被<link xref="
 "\"files-hidden\">隐藏</link>。"
@@ -6906,9 +6919,9 @@ msgstr "该名称已被使用"
 
 #: C/files-rename.page:77(item/p)
 msgid ""
-"You can't have two files or folders with the same name in the same folder. "
-"If you try to rename a file to a name that already exists in the folder you "
-"are working in, the file manager will not allow it."
+"You cannot have two files or folders with the same name in the same "
+"folder. If you try to rename a file to a name that already exists in "
+"the folder you are working in, the file manager will not allow it."
 msgstr ""
 "在同一文件夹中不能有两个文件或文件夹使用同一名称。如果您尝试将文件重命名为您"
 "所在文件夹中已存在的名称，文件管理器将不允许该操作。使用不同的名称。"
@@ -6929,10 +6942,11 @@ msgstr "文件名称过长"
 
 #: C/files-rename.page:87(item/p)
 msgid ""
-"On some file systems, file names can have no more than 255 characters in "
-"their names. This 255 character limit includes both the file name and the "
-"path to the file (e.g., <file>/home/wanda/Documents/work/business-proposals/"
-"… </file>), so you should avoid long file and folder names where possible."
+"On some file systems, file names can have no more than 255 "
+"characters in their names. This 255 character limit includes both the "
+"file name and the path to the file (for example, "
+"<file>/home/wanda/Documents/work/business-proposals/…</file>), so you "
+"should avoid long file and folder names where possible."
 msgstr ""
 "在一些文件系统中，文件名不能超过255个字符，其中还包括文件的路径在内(例如："
 "<file>/home/wanda/Documents/work/business-proposals/… </file>)，因此您应当尽"
@@ -6955,17 +6969,15 @@ msgstr ""
 
 #: C/files-search.page:10(info/desc)
 msgid ""
-"Locate files based on file name and type. Save your searches for later use."
-msgstr "定位文件基于文件名和类型。保存搜索结果以便将来使用。"
+"Locate files based on file name and type."
+msgstr "定位文件基于文件名和类型。"
 
 #: C/files-search.page:29(page/p)
 msgid ""
-"You can search for files based on their name or file type directly within "
-"the file manager. You can even save common searches, and they will appear as "
-"special folders in your home folder."
+"You can search for files based on their name or file type directly "
+"within the file manager."
 msgstr ""
-"您可以在文件管理器中，根据文件名和类型直接查找文件。您甚至可以保存搜索结果，"
-"它们会像一个普通文件夹一样出现在您主文件夹中。"
+"您可以在文件管理器中，根据文件名和类型直接查找文件。"
 
 #: C/files-search.page:34(links/title)
 msgid "Other search applications"
@@ -6992,12 +7004,13 @@ msgstr ""
 
 #: C/files-search.page:47(item/p)
 msgid ""
-"Type a word or words that you know appear in the file name. For example, if "
-"you name all your invoices with the word \"Invoice\", type <input>invoice</"
-"input>. Press <key>Enter</key>. Words are matched regardless of case."
+"Type a word or words that you know appear in the file name, and they "
+"will be shown in the search bar. For example, if you name all your "
+"invoices with the word “Invoice”, type <input>invoice</input>. Words are "
+"matched regardless of case."
 msgstr ""
-"输入您知道的文件名中的字词，例如，如果您将所有发票文件以“Invoice”命名，输入 "
-"<input>invoice</input> 后按<key>回车键</key>。字母不区分大小写。"
+"输入您知道的文件名中的字词，并且它们会显示在搜索栏中。例如，如果您将所有发票文件以“Invoice”命名，输入 "
+"<input>invoice</input>。字母不区分大小写。"
 
 #: C/files-search.page:51(item/p)
 msgid "You can narrow your results by location and file type."
@@ -7013,12 +7026,13 @@ msgstr ""
 
 #: C/files-search.page:56(item/p)
 msgid ""
-"Click <key>+</key> and pick a <gui>File Type</gui> from the drop-down list "
-"to narrow the search results based on file type. Click the <key>x</key> "
-"button to remove this option and widen the search results."
+"Click the <gui>+</gui> button and pick a <gui>File Type</gui> from "
+"the drop-down list to narrow the search results based on file type. "
+"Click the <gui>×</gui> button to remove this option and widen the "
+"search results."
 msgstr ""
-"点击 <key>+</key>，然后从下拉列表中选择一种<gui>文件类型</gui>，这样可以缩小"
-"搜索范围只搜索指定类型的文件。点击 <key>x</key> 按钮删除此选项，拓宽搜索结"
+"点击 <gui>+</gui>，然后从下拉列表中选择一种<gui>文件类型</gui>，这样可以缩小"
+"搜索范围只搜索指定类型的文件。点击 <gui>x</gui> 按钮删除此选项，拓宽搜索结"
 "果。"
 
 #: C/files-search.page:62(item/p)
@@ -7142,9 +7156,9 @@ msgstr "<file>Vacation-???.jpg</file>"
 
 #: C/files-select.page:46(item/p)
 msgid ""
-"If you have photos as before, but you've edited some of them and added "
-"<file>-edited</file> to the end of the file name of the photos you've "
-"edited, select the edited photos with"
+"If you have photos as before, but you have edited some of them and "
+"added <file>-edited</file> to the end of the file name of the photos you "
+"have edited, select the edited photos with"
 msgstr ""
 "如果您有上面的文件，但您编辑了其中一些，在它们的文件名后面添加了 <file>-"
 "edited</file>，使用下面的模式选中这些编辑过后的照片"
@@ -7154,20 +7168,9 @@ msgid "<file>Vacation-???-edited.jpg</file>"
 msgstr "<file>Vacation-???-edited.jpg</file>"
 
 #: C/files-share.page:9(info/desc)
-#, fuzzy
-msgid "Easily transfer files to your email contacts from the file manager."
-msgstr "在文件管理器中很容易传输文件给您的好友和设备。"
-
-#: C/files-share.page:25(page/title)
-#, fuzzy
-msgid "Share files by email"
-msgstr "用通配符选择多个文件"
-
-#: C/files-share.page:37(page/p)
-#, fuzzy
 msgid ""
-"You can easily share files with your contacts by email directly from the "
-"file manager."
+"Easily transfer files to your email contacts from the file "
+"manager."
 msgstr "在文件管理器中很容易传输文件给您的好友和设备。"
 
 #: C/files-share.page:41(note/p)
@@ -7179,16 +7182,11 @@ msgstr ""
 "首先，请确保您的电脑开启了蓝牙。请查阅<link xref=\"bluetooth-turn-on-off\"/"
 ">。"
 
-#: C/files-share.page:46(steps/title)
-#, fuzzy
-msgid "To share a file by email:"
-msgstr "要将文件移动到回收站："
-
 #: C/files-share.page:47(item/p) C/video-sending.page:29(item/p)
 msgid ""
-"Open the <app>Files</app> application from the <gui>Activities</gui> "
-"overview."
-msgstr "在<gui>活动</gui>概览中打开<app>文件管理器</app>。"
+"Open the <app>Files</app> application from the "
+"<gui xref=\"shell-introduction#activities\">Activities</gui> overview."
+msgstr "在<gui xref=\"shell-introduction#activities\">活动</gui>概览中打开<app>文件管理器</app>。"
 
 #: C/files-share.page:49(item/p)
 msgid "Locate the file you want to transfer."
@@ -7200,13 +7198,6 @@ msgid ""
 "Message</gui> window will appear with the file attached."
 msgstr ""
 
-#: C/files-share.page:52(item/p)
-msgid ""
-"Click <gui>To</gui> to choose a contact, or enter an email address where you "
-"want to send the file. Fill in the <gui>Subject</gui> and the body of the "
-"message as required and click <gui>Send</gui>."
-msgstr ""
-
 #: C/files-share.page:58(note/p)
 #, fuzzy
 msgid ""
@@ -7271,8 +7262,8 @@ msgstr ""
 #: C/files-sort.page:49(section/p)
 msgid ""
 "You can sort in the reverse order by selecting <gui>Reversed Order</gui> "
-"from the pull-down menu."
-msgstr "您可以在下拉菜单中选中<gui>逆序</gui>，这时文件名按相反顺序排列。"
+"from the menu."
+msgstr "您可以在菜单中选中<gui>逆序</gui>，这时文件名按相反顺序排列。"
 
 #: C/files-sort.page:54(section/title)
 msgid "List view"
@@ -7379,9 +7370,9 @@ msgstr "创建要用作模板的文档。例如，可在字处理应用程序中
 
 #: C/files-templates.page:34(item/p)
 msgid ""
-"Save the file with the template content in the <file>Templates </file> "
-"folder in your <file>Home</file> folder. If the <file>Templates </file> "
-"folder doesn't exist, you will need to create it first."
+"Save the file with the template content in the <file>Templates</file> "
+"folder in your <file>Home</file> folder. If the <file>Templates</file> "
+"folder does not exist, you will need to create it first."
 msgstr ""
 "将含有模板内容的文件存入 <file>主文件夹</file> 文件夹中的 <file>模板</file> "
 "文件夹。如果 <file>模板</file> 文件夹不存在，则必须先创建该文件夹。"
@@ -7420,15 +7411,16 @@ msgid "These are backup files. They are hidden by default."
 msgstr "这些是备份文件，默认是隐藏的。"
 
 #: C/files-tilde.page:23(page/title)
-msgid "What is a file with a \"~\" at the end of its name?"
+msgid "What is a file with a <file>~</file> at the end of its name?"
 msgstr "文件名末尾带“~”的是什么文件？"
 
 #: C/files-tilde.page:25(page/p)
 msgid ""
-"Files with a \"~\" at the end of their names (for example, <file>example."
-"txt~</file>) are automatically created backup copies of documents edited in "
-"the <app>gedit</app> text editor or other applications. It is safe to delete "
-"them, but there's no harm to leave them on your computer."
+"Files with a <file>~</file> at the end of their names (for example, "
+"<file>example.txt~</file>) are automatically created backup copies of "
+"documents edited in the <app>gedit</app> text editor or other applications. "
+"It is safe to delete them, but there is no harm to leave them on your "
+"computer."
 msgstr ""
 "对于在 <app>Gedit</app> 文本编辑器及其他应用程序中编辑过的文档，文件名末尾有 "
 "\"~\" 的文件(如 <file>example.txt~</file>)都是自动创建的备份副本。将其删除通"
@@ -7599,31 +7591,10 @@ msgstr ""
 "您可以发送<link href=\"mailto:gnome-doc-list@gnome.org\">邮件</link>到 GNOME "
 "文档列表，了解如何加入文档项目组。"
 
-#: C/gnome-classic.page:11(info/desc)
-msgid ""
-"Consider switching to GNOME Classic if you prefer a more traditional desktop "
-"experience."
-msgstr ""
-
 #: C/gnome-classic.page:18(credit/name)
 msgid "Petr Kovar"
 msgstr ""
 
-#: C/gnome-classic.page:25(page/title)
-#, fuzzy
-msgid "What is GNOME Classic?"
-msgstr "什么是 MAC 地址？"
-
-#: C/gnome-classic.page:27(page/p)
-msgid ""
-"<em>GNOME Classic</em> is a feature for users who prefer a more traditional "
-"desktop experience. While <em>GNOME Classic</em> is based on <em>GNOME 3</"
-"em> technologies, it provides a number of changes to the user interface, "
-"such as the <gui xref=\"shell-terminology\">Applications</gui> and <gui xref="
-"\"shell-terminology\">Places</gui> menus on the top bar, and a window list "
-"at the bottom of the screen."
-msgstr ""
-
 #: C/gnome-classic.page:34(page/p)
 msgid ""
 "You can use the <gui xref=\"shell-terminology\">Applications</gui> menu on "
@@ -7638,18 +7609,6 @@ msgid ""
 "can also press the <key xref=\"keyboard-key-super\">Super</key> key."
 msgstr ""
 
-#: C/gnome-classic.page:43(section/title)
-#: C/shell-terminology.page:126(item/title)
-#, fuzzy
-msgid "Window list"
-msgstr "窗口"
-
-#: C/gnome-classic.page:45(section/p) C/shell-introduction.page:281(when/p)
-msgid ""
-"The window list at the bottom of the screen provides access to all your open "
-"windows and applications and lets you quickly minimize and restore them."
-msgstr ""
-
 #: C/gnome-classic.page:48(section/p) C/shell-introduction.page:285(when/p)
 msgid ""
 "At the right-hand side of the window list, GNOME displays a short identifier "
@@ -7659,29 +7618,6 @@ msgid ""
 "identifier and select the workspace you want to use from the menu."
 msgstr ""
 
-#: C/gnome-classic.page:54(section/p)
-msgid ""
-"If an application or a system component wants to get your attention, it will "
-"display a blue icon at the right-hand side of the window list. Clicking the "
-"blue icon shows the <link xref=\"shell-notifications\">message tray</link>, "
-"which lets you access all your notifications."
-msgstr ""
-
-#: C/gnome-classic.page:62(section/title)
-msgid "Switch to and from GNOME Classic"
-msgstr ""
-
-#: C/gnome-classic.page:65(note/p)
-msgid ""
-"GNOME Classic is only available on systems with certain GNOME Shell "
-"extensions installed. Some Linux distributions may not have these extensions "
-"available or installed by default."
-msgstr ""
-
-#: C/gnome-classic.page:71(steps/title)
-msgid "To switch from <em>GNOME</em> to <em>GNOME Classic</em>:"
-msgstr ""
-
 #: C/gnome-classic.page:73(item/p) C/gnome-classic.page:98(item/p)
 #: C/session-fingerprint.page:70(item/p)
 #, fuzzy
@@ -7699,16 +7635,6 @@ msgid ""
 "The login screen appears."
 msgstr "在出来的确认对话框中，选择<gui>注销</gui>，返回到登录界面。"
 
-#: C/gnome-classic.page:81(item/p) C/gnome-classic.page:106(item/p)
-#, fuzzy
-msgid "At the login screen, select your name from the list."
-msgstr "在登录界面，选择您的用户名，出来密码输入框。"
-
-#: C/gnome-classic.page:84(item/p) C/gnome-classic.page:109(item/p)
-#, fuzzy
-msgid "Enter your password in the password entry box."
-msgstr "在出来的提示里输入自己的密码。"
-
 #: C/gnome-classic.page:87(item/p)
 msgid ""
 "Click <gui>Session</gui> below the password entry box and choose <gui>GNOME "
@@ -7720,10 +7646,6 @@ msgstr ""
 msgid "Click <gui>Sign In</gui>."
 msgstr "点击<gui>声音</gui>。"
 
-#: C/gnome-classic.page:96(steps/title)
-msgid "To switch from <em>GNOME Classic</em> to <em>GNOME</em>:"
-msgstr ""
-
 #: C/gnome-classic.page:112(item/p)
 msgid ""
 "Click <gui>Session</gui> below the password entry box and choose <gui>GNOME</"
@@ -7804,13 +7726,13 @@ msgstr ""
 
 #: C/hardware-cardreader.page:54(page/p)
 msgid ""
-"If no cards or drives are available in the <gui>Computer</gui> folder, it is "
-"possible that your card reader does not work with Linux due to driver "
-"issues. If your card reader is internal (inside the computer instead of "
-"sitting outside) this is more likely. The best solution is to directly "
-"connect your device (camera, cell phone, etc.) to a USB port on the "
-"computer. USB external card readers are also available, and are far better "
-"supported by Linux."
+"If no cards or drives are shown when browsing the <gui>Computer</gui> "
+"location, it is possible that your card reader does not work with Linux due to "
+"driver issues. If your card reader is internal (inside the computer instead of "
+"sitting outside) this is more likely. The best solution is to directly connect "
+"your device (camera, cell phone, etc.) to a USB port on the computer. USB "
+"external card readers are also available, and are far better supported by "
+"Linux."
 msgstr ""
 "如果<gui>计算机</gui>文件夹中没有卡或读卡器，可能您的读卡器因为驱动问题无法"
 "在 Linux 上使用。如果您的读卡器是内置的(在计算机里而不是外部)，这可能性较大。"
@@ -7829,9 +7751,9 @@ msgstr "什么是驱动？"
 
 #: C/hardware-driver.page:20(page/p)
 msgid ""
-"Devices are the physical \"parts\" of your computer. They may be "
-"<em>external</em> like printers and monitor or <em>internal</em> like "
-"graphics and audio cards."
+"Devices are the physical “parts” of your computer. They may be "
+"<em>external</em> like printers and monitor or <em>internal</em> like graphics "
+"and audio cards."
 msgstr ""
 "设备是您计算机实际“部分”，它们可能是<em>外置</em>的，比如打印机和显示器，也可"
 "能是<em>内置</em>的，比如显卡和声卡。"
@@ -7848,7 +7770,7 @@ msgstr ""
 msgid ""
 "When you attach a device to your computer, you must have the correct driver "
 "installed for that device to work. For example, if you plug in a printer but "
-"the correct driver isn't available, you won't be able to use the printer. "
+"the correct driver is not available, you will not be able to use the printer. "
 "Normally, each model of device uses a driver that is not compatible with any "
 "other model."
 msgstr ""
@@ -7868,9 +7790,9 @@ msgstr ""
 
 #: C/hardware-driver.page:28(page/p)
 msgid ""
-"In addition, some existing drivers are incomplete or partially non-"
-"functional. For example, you might find that your printer can't do double-"
-"sided printing, but is otherwise completely functional."
+"In addition, some existing drivers are incomplete or partially "
+"non-functional. For example, you might find that your printer cannot do "
+"double-sided printing, but is otherwise completely functional."
 msgstr ""
 "另外，有些驱动不完整或者工作不正常。这种情况下，有些设备的性能将不能发挥出"
 "来，例如，您可能发现打印机不能进行双面打印，但这在其他地方是可以使用。"
@@ -7941,11 +7863,9 @@ msgstr ""
 "获得其他 GNOME 用户和开发者的帮助和建议。"
 
 #: C/help-irc.page:24(page/p)
-#, fuzzy
 msgid ""
-"To connect to the GNOME IRC server, use <app>empathy</app> or <app>xchat</"
-"app>, or use a web interface like <link href=\"http://chat.mibbit.com/"
-"\">mibbit</link>."
+"To connect to the GNOME IRC server, use <app>empathy</app> or <app>xchat</app>, "
+"or use a web interface like <link href=\"http://chat.mibbit.com/\">mibbit</link>."
 msgstr ""
 "要连接到 GNOME IRC 服务器，请使用 <app>empathy</app> 或 <app>xchat</app> 程"
 "序，也可以使用像 <link href=\"http://chat.mibbit.com/\">mibbit</link> 这样的"
@@ -7971,18 +7891,17 @@ msgstr ""
 "gnome\"/> 来访问 <sys>gnome</sys> 频道。"
 
 #: C/help-irc.page:37(page/p)
-#, fuzzy
 msgid ""
-"While IRC being a real-time discussion, people tend to not reply "
-"immediately, so be patient."
+"While IRC is a real-time discussion medium, people tend to not reply immediately, so be patient."
 msgstr "因为 IRC 是进行实时讨论，人们往往不能立即回复，所以请耐心等待。"
 
 #: C/help-irc.page:41(note/p)
 msgid ""
-"Please note the <link href=\"https://live.gnome.org/CodeOfConduct/\">GNOME "
-"code of conduct</link> applies when you chat on IRC."
+"Please note the "
+"<link href=\"https://wiki.gnome.org/Foundation/CodeOfConduct\">GNOME code of "
+"conduct</link> applies when you chat on IRC."
 msgstr ""
-"请在使用 IRC 聊天时，遵守<link href=\"https://live.gnome.org/CodeOfConduct/"
+"请在使用 IRC 聊天时，遵守<link href=\"https://wiki.gnome.org/Foundation/CodeOfConduct/"
 "\">GNOME 行为守则</link>。"
 
 #: C/help-mailing-list.page:7(info/desc)
@@ -8006,8 +7925,8 @@ msgstr ""
 
 #: C/help-mailing-list.page:30(note/p)
 msgid ""
-"You may need to register to the mailing-list before being able to send an "
-"email to it."
+"You may need to subscribe to the mailing-list before being able to send "
+"an email to it."
 msgstr "在使用邮件列表前需要先在此邮件列表上注册。"
 
 #: C/help-mailing-list.page:34(page/p)
@@ -8066,57 +7985,10 @@ msgstr ""
 msgid "Juanjo Marin"
 msgstr ""
 
-#: C/keyboard-key-menu.page:21(info/desc)
-msgid ""
-"The <key>Menu</key> key launches a context menu with the keyboard rather "
-"than with a right-click."
-msgstr ""
-
 #: C/keyboard-key-menu.page:24(license/p) C/translate.page:21(license/p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "知识共享许可协议(CC)相同方式共享3.0"
 
-#: C/keyboard-key-menu.page:27(page/title)
-#, fuzzy
-msgid "What is the <key>Menu</key> key?"
-msgstr "Super 键是什么？"
-
-#: C/keyboard-key-menu.page:29(page/p)
-msgid ""
-"The <key>Menu</key> key, also known as the <em>Application</em> key, is a "
-"key found on some Windows-oriented keyboards. This key is usually on the "
-"bottom-right of the keyboard, next to the <key>Ctrl</key> key, but it can be "
-"placed in a different location by keyboard manufacturers. Its is usually "
-"depicted as a cursor hovering above a menu: <media type=\"image\" mime="
-"\"image/svg\" src=\"figures/keyboard-key-menu.svg\"> <key>Menu</key> key "
-"icon</media>."
-msgstr ""
-
-#: C/keyboard-key-menu.page:43(page/p)
-msgid ""
-"The primary function of this key is to launch a context menu with the "
-"keyboard rather than by clicking the right mouse button: this is useful if "
-"mouse or a similar device is not available, or when the right mouse button "
-"is not present."
-msgstr ""
-
-#: C/keyboard-key-menu.page:48(page/p)
-msgid ""
-"The <key>Menu</key> key is sometimes omitted in the interest of space, "
-"particularly on portable and laptop keyboards. In this case, some keyboards "
-"include a <key>Menu</key> function key that can be activated in combination "
-"with the Function (<key>Fn</key>) key."
-msgstr ""
-
-#: C/keyboard-key-menu.page:53(page/p)
-msgid ""
-"The <em>context menu</em> is a menu that pops up when you right-click. The "
-"menu that you see, if any, is dependent on the context and function of the "
-"area that you right-clicked. When you use the <key>Menu</key> key, the "
-"context menu is shown for the area of the screen that your cursor is over at "
-"the point when the key is pressed."
-msgstr ""
-
 #: C/keyboard-key-super.page:21(info/desc)
 #, fuzzy
 msgid ""
@@ -8126,33 +7998,33 @@ msgstr ""
 "按 Super 键可以打开活动概览，您可以在键盘的 <key>Alt</key> 键旁边找到它。"
 
 #: C/keyboard-key-super.page:25(page/title)
-#, fuzzy
 msgid "What is the <key>Super</key> key?"
 msgstr "Super 键是什么？"
 
 #: C/keyboard-key-super.page:27(page/p)
-#, fuzzy
 msgid ""
-"When you press the <key>Super</key> key, the activities overview is "
-"displayed. This key can usually be found on the bottom-left of your "
-"keyboard, next to the <key>Alt</key> key, and usually has a Windows logo on "
-"it. It is sometimes called the <em>Windows key</em> or system key."
+"When you press the <key>Super</key> key, the <gui>Activities</gui> "
+"overview is displayed. This key can usually be found on the bottom-left of "
+"your keyboard, next to the <key>Alt</key> key, and usually has a Windows logo "
+"on it. It is sometimes called the <em>Windows key</em> or system key."
 msgstr ""
 "当您按下<em>Super</em> 键后，就会显示活动概览，这个键通常可以在键盘左下角找"
 "到，挨着 <key>Alt</key> 键，键上面有个窗口或方块徽标。它也被称作 Windows 键、"
 "徽标键或者系统键。"
 
 #: C/keyboard-key-super.page:33(note/p)
-#, fuzzy
 msgid ""
-"If you have an Apple keyboard, you will have a <key>⌘</key> (Command) key "
-"instead of the Windows key."
+"If you have an Apple keyboard, you will have a <key>⌘</key> (Command) "
+"key instead of the Windows key, while Chromebooks have a magnifying glass "
+"instead."
 msgstr ""
 "如果您使用苹果键盘，它上面没有 Windows 键，<key>⌘</key> (Command)键可以用来代"
 "替。"
 
 #: C/keyboard-key-super.page:42(page/p)
-msgid "To change which key is used to display the activities overview:"
+msgid ""
+"To change which key is used to display the <gui>Activities</gui> "
+"overview:"
 msgstr "要更改用于显示活动概览的按键："
 
 #: C/keyboard-key-super.page:49(item/p) C/tips-specialchars.page:55(item/p)
@@ -8160,7 +8032,8 @@ msgid "Click <gui>Keyboard</gui>."
 msgstr "点<gui>键盘</gui>。"
 
 #: C/keyboard-key-super.page:52(item/p)
-msgid "Click the <gui>Shortcuts</gui> tab."
+msgid ""
+"Click the <gui style=\"tab\">Shortcuts</gui> tab."
 msgstr "点击<gui>快捷键</gui>标签。"
 
 #: C/keyboard-key-super.page:55(item/p)
@@ -8237,12 +8110,7 @@ msgstr ""
 msgid "Juanjo Marín"
 msgstr ""
 
-#: C/keyboard-layouts.page:31(info/desc)
-msgid "Add keyboard layouts and switch between them."
-msgstr ""
-
 #: C/keyboard-layouts.page:34(page/title)
-#, fuzzy
 msgid "Use alternative keyboard layouts"
 msgstr "使用其他键盘布局"
 
@@ -8293,30 +8161,19 @@ msgid ""
 msgstr ""
 
 #: C/keyboard-layouts.page:77(page/p)
-#, fuzzy
 msgid ""
 "When you use multiple layouts, you can choose to have all windows use the "
 "same layout or to set a different layout for each window. Using a different "
-"layout for each window is useful, for example, if you're writing an article "
+"layout for each window is useful, for example, if you’re writing an article "
 "in another language in a word processor window. Your keyboard selection will "
-"be remembered for each window as you switch between windows. Press the <gui "
-"style=\"button\">Options</gui> button to select how you want to manage "
+"be remembered for each window as you switch between windows. Press the "
+"<gui style=\"button\">Options</gui> button to select how you want to manage "
 "multiple layouts."
 msgstr ""
 "当您使用多个键盘布局时，可以设置所有窗口使用同一语言布局，或者设置各个窗口对"
 "应不同布局。不同窗口设置不同语言是很有用的，例如，如果您在文字编辑器中用其他"
 "语言书写文章，键盘选择器会记住您对各个窗口的语言选择。"
 
-#: C/keyboard-layouts.page:85(page/p)
-msgid ""
-"The top bar will display a short identifier for the current layout, such as "
-"<gui>en</gui> for the standard English layout. Click the layout indicator "
-"and select the layout you want to use from the menu. If the selected "
-"language has any extra settings, they will be shown below the list of "
-"available layouts. This gives you a quick overview of your settings. You can "
-"also open an image with the current keyboard layout for reference."
-msgstr ""
-
 #: C/keyboard-layouts.page:92(page/p)
 msgid ""
 "The fastest way to change to another layout is by using the <gui>Input "
@@ -8485,11 +8342,10 @@ msgid "Open the application menu on the top bar."
 msgstr "在顶部面板中打开应用程序菜单。"
 
 #: C/keyboard-nav.page:116(td/p)
-#, fuzzy
 msgid ""
-"<keyseq><key>Shift</key><key>F10</key></keyseq> or <key xref=\"keyboard-key-"
-"menu\">Menu</key>"
-msgstr "<keyseq><key>Shift</key><key>F10</key></keyseq> 或菜单键"
+"<keyseq><key>Shift</key><key>F10</key></keyseq> or "
+"<key xref=\"keyboard-key-menu\">Menu</key>"
+msgstr "<keyseq><key>Shift</key><key>F10</key></keyseq> 或<key xref=\"keyboard-key-menu\">菜单键</key>"
 
 #: C/keyboard-nav.page:119(td/p)
 msgid ""
@@ -8556,8 +8412,8 @@ msgstr "<keyseq><key>Ctrl</key><key>A</key></keyseq>"
 
 #: C/keyboard-nav.page:165(td/p)
 msgid ""
-"<link xref=\"shell-notifications#messagingtray\">Open the message tray.</"
-"link> Press <key>Esc</key> to close."
+"<link xref=\"shell-notifications#messagetray\">Open the message "
+"tray.</link> Press <key>Esc</key> to close."
 msgstr ""
 "<link xref=\"shell-notifications#messagingtray\">打开消息托盘。</link>按 "
 "<key>Esc</key> 键关闭。"
@@ -8575,19 +8431,18 @@ msgid "Close the current window."
 msgstr "关闭当前窗口。"
 
 #: C/keyboard-nav.page:177(td/p)
-#, fuzzy
 msgid ""
-"<keyseq><key>Alt</key><key>F5</key></keyseq> or <keyseq><key>Super</"
-"key><key>↓</key></keyseq>"
+"<keyseq><key>Alt</key><key>F5</key></keyseq> or "
+"<keyseq><key>Super</key><key>↓</key></keyseq>"
 msgstr ""
-"<keyseq><key>Alt</key><key>F5</key></keyseq> 或 <keyseq><key xref=\"windows-"
-"key\">Super</key><key>↓</key></keyseq>"
+"<keyseq><key>Alt</key><key>F5</key></keyseq> 或 <keyseq><key>Super</key><key>↓</key></keyseq>"
 
 #: C/keyboard-nav.page:179(td/p)
 msgid ""
-"Restore a maximized window to its original size. Use <keyseq><key>Alt</key> "
-"<key>F10</key></keyseq> to maximize. <keyseq><key>Alt</key><key>F10</key></"
-"keyseq> both maximizes and restores."
+"Restore a maximized window to its original size. Use "
+"<keyseq><key>Alt</key><key>F10</key></keyseq> to maximize. "
+"<keyseq><key>Alt</key><key>F10</key></keyseq> both maximizes and "
+"restores."
 msgstr ""
 "恢复一个最大化的窗口至原始大小，按组合键 <keyseq><key>Alt</key> <key>F10</"
 "key></keyseq> 最大化，按 <keyseq><key>Alt</key><key>F10</key></keyseq> 在最大"
@@ -8622,23 +8477,22 @@ msgstr ""
 "的尺寸。"
 
 #: C/keyboard-nav.page:199(td/p)
-#, fuzzy
 msgid ""
-"<keyseq><key>Alt</key><key>F10</key></keyseq> or <keyseq><key>Super</"
-"key><key>↑</key></keyseq>"
+"<keyseq><key>Alt</key><key>F10</key></keyseq> or "
+"<keyseq><key>Super</key><key>↑</key></keyseq>"
 msgstr ""
-"<keyseq><key>Alt</key><key>F10</key></keyseq> 或 <keyseq><key xref=\"windows-"
-"key\">Super</key><key>↑</key></keyseq>"
+"<keyseq><key>Alt</key><key>F10</key></keyseq> 或 <keyseq><key"
+">Super</key><key>↑</key></keyseq>"
 
 #: C/keyboard-nav.page:202(td/p)
-#, fuzzy
 msgid ""
 "<link xref=\"shell-windows-maximize\">Maximize</link> a window. Press "
-"<keyseq><key>Alt</key><key>F10</key></keyseq> or <keyseq><key>Super</"
-"key><key>↓</key></keyseq> to restore a maximized window to its original size."
+"<keyseq><key>Alt</key><key>F10</key></keyseq> or "
+"<keyseq><key>Super</key><key>↓</key></keyseq> to "
+"restore a maximized window to its original size."
 msgstr ""
 "<link xref=\"shell-windows-maximize\">最大化</link>一个窗口。再次按组合键 "
-"<keyseq><key>Alt</key><key>F10</key></keyseq> 恢复一个最大化窗口至原来大小。"
+"<keyseq><key>Alt</key><key>F10</key></keyseq> 或<keyseq><key>Super</key><key>↓</key></keyseq>恢复一个最大化窗口至原来大小。"
 
 #: C/keyboard-nav.page:208(td/p) C/keyboard-shortcuts-set.page:401(td/p)
 #, fuzzy
@@ -8646,7 +8500,6 @@ msgid "<keyseq><key>Super</key><key>H</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>A</key></keyseq>"
 
 #: C/keyboard-nav.page:209(td/p)
-#, fuzzy
 msgid "Minimize a window."
 msgstr "最小化窗口"
 
@@ -8656,14 +8509,14 @@ msgid "<keyseq><key>Super</key><key>←</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>A</key></keyseq>"
 
 #: C/keyboard-nav.page:213(td/p)
-#, fuzzy
 msgid ""
-"Maximize a window vertically along the left side of the screen. Press again "
-"to restore the window to its previous size. Press <keyseq><key>Super</"
-"key><key>→</key></keyseq> to switch sides."
+"Maximize a window vertically along the left side of the screen. "
+"Press again to restore the window to its previous size. Press "
+"<keyseq><key>Super</key><key>→</key></keyseq> to switch "
+"sides."
 msgstr ""
-"在屏幕左半边最大化一个窗口，再次按下恢复原来的大小。按 <keyseq><key xref="
-"\"windows-key\">Super</key><key>→</key></keyseq>  切换到屏幕另一边。"
+"在屏幕左半边最大化一个窗口，再次按下恢复原来的大小。按 <keyseq><key"
+">Super</key><key>→</key></keyseq>  切换到屏幕另一边。"
 
 #: C/keyboard-nav.page:219(td/p) C/keyboard-shortcuts-set.page:441(td/p)
 #, fuzzy
@@ -8671,14 +8524,14 @@ msgid "<keyseq><key>Super</key><key>→</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>A</key></keyseq>"
 
 #: C/keyboard-nav.page:220(td/p)
-#, fuzzy
 msgid ""
-"Maximize a window vertically along the right side of the screen. Press again "
-"to restore the window to its previous size. Press <keyseq><key>Super</"
-"key><key>←</key></keyseq> to switch sides."
+"Maximize a window vertically along the right side of the screen. "
+"Press again to restore the window to its previous size. Press "
+"<keyseq><key>Super</key><key>←</key></keyseq> to "
+"switch sides."
 msgstr ""
-"在屏幕右半边最大化一个窗口，再次按下恢复原来的大小。按 <keyseq><key xref="
-"\"windows-key\">Super</key><key>←</key></keyseq> 切换到屏幕另一边。"
+"在屏幕右半边最大化一个窗口，再次按下恢复原来的大小。按 <keyseq><key"
+">Super</key><key>←</key></keyseq> 切换到屏幕另一边。"
 
 #: C/keyboard-nav.page:226(td/p) C/keyboard-shortcuts-set.page:373(td/p)
 msgid "<keyseq><key>Alt</key><key>Space</key></keyseq>"
@@ -8694,11 +8547,12 @@ msgstr "Jeremy Bicha"
 
 #: C/keyboard-osk.page:22(info/desc)
 msgid ""
-"Use an on-screen keyboard to enter text by clicking buttons with the mouse."
-msgstr "通过使用鼠标点击屏幕键盘来输入文字。"
+"Use an on-screen keyboard to enter text by clicking buttons with the "
+"mouse or a touchscreen."
+msgstr "通过使用鼠标或者触屏点击屏幕键盘来输入文字。"
 
 #: C/keyboard-osk.page:28(page/title)
-msgid "Use a screen keyboard"
+msgid "Use an on-screen keyboard"
 msgstr "使用屏幕键盘"
 
 #: C/keyboard-osk.page:30(page/p)
@@ -8798,8 +8652,8 @@ msgstr ""
 #: C/keyboard-shortcuts-set.page:54(item/p)
 msgid ""
 "Hold down the desired key combination, or press <key>Backspace</key> to "
-"clear."
-msgstr "按下想要设置的快捷键，或者按<key>退格键</key>清除。"
+"reset, or press <key>Esc</key> to cancel."
+msgstr "按下想要设置的快捷键，或者按<key>退格键</key>清除，或者按<key>Esc</key>结束。"
 
 #: C/keyboard-shortcuts-set.page:61(section/title)
 msgid "Pre-defined shortcuts"
@@ -8956,7 +8810,6 @@ msgid "<keyseq><key>Super</key><key>Tab</key></keyseq>"
 msgstr "<keyseq><key>Alt</key><key>Tab</key></keyseq>"
 
 #: C/keyboard-shortcuts-set.page:134(td/p)
-#, fuzzy
 msgid "Switch windows"
 msgstr "切换窗口"
 
@@ -9100,11 +8953,6 @@ msgstr "复制选区截图到剪贴板"
 msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>Print</key></keyseq>"
 msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>Print</key></keyseq>"
 
-#: C/keyboard-shortcuts-set.page:222(td/p)
-#, fuzzy
-msgid "Record a screencast"
-msgstr "捕获视频"
-
 #: C/keyboard-shortcuts-set.page:223(td/p)
 #, fuzzy
 msgid ""
@@ -9233,37 +9081,17 @@ msgstr "锁定屏幕"
 msgid "<keyseq><key>Ctrl</key><key>Alt</key><key>L</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>Alt</key><key>L</key></keyseq>"
 
-#: C/keyboard-shortcuts-set.page:291(td/p)
-#, fuzzy
-msgid "Show the message tray"
-msgstr "消息托盘"
-
-#: C/keyboard-shortcuts-set.page:295(td/p)
-#, fuzzy
-msgid "Focus the active notification"
-msgstr "通知是什么？"
-
 #: C/keyboard-shortcuts-set.page:296(td/p)
 #, fuzzy
 msgid "<keyseq><key>Super</key><key>N</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>A</key></keyseq>"
 
-#: C/keyboard-shortcuts-set.page:299(td/p)
-#, fuzzy
-msgid "Show all applications"
-msgstr "启动应用程序"
-
 #: C/keyboard-shortcuts-set.page:300(td/p)
 #: C/shell-keyboard-shortcuts.page:80(td/p)
 #, fuzzy
 msgid "<keyseq><key>Super</key><key>A</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>A</key></keyseq>"
 
-#: C/keyboard-shortcuts-set.page:303(td/p)
-#, fuzzy
-msgid "Open the application menu"
-msgstr "在顶部面板中打开应用程序菜单。"
-
 #: C/keyboard-shortcuts-set.page:304(td/p)
 #, fuzzy
 msgid "<keyseq><key>Super</key><key>F10</key></keyseq>"
@@ -9273,11 +9101,7 @@ msgstr ""
 
 #: C/keyboard-shortcuts-set.page:309(table/title)
 msgid "Typing"
-msgstr ""
-
-#: C/keyboard-shortcuts-set.page:311(td/p)
-msgid "Switch to next input source"
-msgstr ""
+msgstr "打字"
 
 #: C/keyboard-shortcuts-set.page:312(td/p)
 #, fuzzy
@@ -9286,23 +9110,6 @@ msgstr ""
 "在工具栏中单击<gui>搜索</gui>，或按 <keyseq><key>Ctrl</key><key>F</key></"
 "keyseq> 键。"
 
-#: C/keyboard-shortcuts-set.page:316(td/p)
-msgid "Switch to previous input source"
-msgstr ""
-
-#: C/keyboard-shortcuts-set.page:320(td/p)
-msgid "Modifiers-only switch to next source"
-msgstr ""
-
-#: C/keyboard-shortcuts-set.page:324(td/p)
-#, fuzzy
-msgid "Compose Key"
-msgstr "Compose 键"
-
-#: C/keyboard-shortcuts-set.page:328(td/p)
-msgid "Alternative Characters Key"
-msgstr ""
-
 #: C/keyboard-shortcuts-set.page:334(table/title)
 msgid "Universal Access"
 msgstr "辅助功能"
@@ -9400,11 +9207,6 @@ msgstr "切换阴影状态"
 msgid "Close window"
 msgstr "关闭窗口"
 
-#: C/keyboard-shortcuts-set.page:400(td/p)
-#, fuzzy
-msgid "Hide window"
-msgstr "平铺窗口"
-
 #: C/keyboard-shortcuts-set.page:404(td/p)
 msgid "Move window"
 msgstr "移动窗口"
@@ -9527,17 +9329,6 @@ msgstr ""
 "点这一行里的<gui>禁用</gui>开始添加，当它变为<gui>新建快捷键...</gui>时，按下"
 "想要设置的快捷键。"
 
-#: C/keyboard-shortcuts-set.page:500(section/p)
-#, fuzzy
-msgid ""
-"The command name that you type should be a valid system command. You can "
-"check that the command works by opening a Terminal and typing it in there. "
-"The command that opens an application cannot have the same name as the "
-"application itself."
-msgstr ""
-"您设定的命令名称必须是有效的系统命令。您可以打开一个终端输入命令来查看其是否"
-"有效。一般来说用于打开程序的命令就是该程序的名字。"
-
 #: C/keyboard-shortcuts-set.page:505(section/p)
 msgid ""
 "If you want to change the command that is associated with a custom keyboard "
@@ -9562,9 +9353,8 @@ msgid "Keyboard"
 msgstr "键盘"
 
 #: C/keyboard.page:35(links/title) C/prefs-language.page:26(page/title)
-#, fuzzy
 msgid "Region &amp; Language"
-msgstr "点击<gui>区域和语言</gui>。"
+msgstr "区域和语言"
 
 #: C/look-background.page:11(info/desc)
 msgid "Set an image, color, or gradient as your desktop background."
@@ -9580,9 +9370,9 @@ msgstr "更改桌面背景"
 
 #: C/look-background.page:42(page/p)
 msgid ""
-"You can change the image used for your desktop background, or set it to a "
-"simple color or gradient."
-msgstr "您可以更改用作桌面背景的图像，也可将其设置为单色或渐变色背景。"
+"You can change the image used for your backgrounds or set it to be a "
+"solid color."
+msgstr "您可以更改用作桌面背景的图像，也可将其设置为单色。"
 
 #: C/look-background.page:47(item/p)
 msgid "Open <gui>Background</gui>."
@@ -9622,8 +9412,8 @@ msgstr ""
 "<guiseq><gui>图片</gui><gui>设为墙纸</gui></guiseq>。"
 
 #: C/look-background.page:64(item/p)
-msgid "Select <gui>Colors</gui> to just use a flat color or a linear gradient."
-msgstr "选择<gui>颜色</gui>将使用纯色或线性渐变色背景。"
+msgid "Select <gui>Colors</gui> to just use a flat color."
+msgstr "选择<gui>颜色</gui>将使用纯色。"
 
 #: C/look-background.page:68(item/p)
 msgid "The settings are applied immediately."
@@ -9733,10 +9523,10 @@ msgstr ""
 "转</em>中，设置对象出现的方向(例如，您旋转了屏幕显示)。"
 
 #: C/look-resolution.page:38(item/p)
-#, fuzzy
 msgid ""
 "If you have multiple displays and they are not mirrored, you can have "
-"different settings on each display. Select a display in the preview area."
+"different settings on each display. Select a display in the preview "
+"area."
 msgstr ""
 "如果您拥有多个显示器并且它们并不是镜像显示，您可以对每台显示器做出不同的设"
 "置。在预览区域选择一台显示器的预览图像。"
@@ -9769,19 +9559,6 @@ msgstr ""
 msgid "Resolution"
 msgstr "分辨率"
 
-#: C/look-resolution.page:53(section/p)
-msgid ""
-"The resolution is the number of pixels (dots on the screen) in each "
-"direction that can be displayed. Each resolution has an <em>aspect ratio</"
-"em>, the ratio of the width to the height. Wide-screen displays use a 16:9 "
-"aspect ratio, while traditional displays use 4:3. If you choose a resolution "
-"that does not match the aspect ratio of your display, the screen will be "
-"letterboxed to avoid distortion."
-msgstr ""
-"分辨率是指在每个方向上所能显示的像素数量。每个显示器都有一个高宽比。宽屏显示"
-"器一般使用 16：9 的高宽比，而普通显示器则一般使用 4：3，如果您选择了不正确的"
-"高宽比设置，屏幕将会在适当的边缘加入黑边以避免图像被拉伸变形。"
-
 #: C/look-resolution.page:58(section/p)
 msgid ""
 "You can choose the resolution you prefer from the <gui>Resolution</gui> drop-"
@@ -9938,10 +9715,10 @@ msgstr "调整双击速度"
 
 #: C/mouse-doubleclick.page:31(page/p)
 msgid ""
-"Double-clicking only happens when you press the mouse button twice quickly "
-"enough. If the second press is too long after the first, you'll just get two "
-"separate clicks, not a double click. If you have difficulty pressing the "
-"mouse button quickly, you should increase the timeout."
+"Double-clicking only happens when you press the mouse button twice "
+"quickly enough. If the second press is too long after the first, you’ll "
+"just get two separate clicks, not a double click. If you have difficulty "
+"pressing the mouse button quickly, you should increase the timeout."
 msgstr ""
 "仅当连续按鼠标键两次的动作足够快时，才能执行双击操作。如果按第二次与按第一次"
 "的时间差过大，则仅会分别执行两次单击操作，而不是一次双击操作。如果您难以将鼠"
@@ -10005,9 +9782,9 @@ msgstr "在<gui>常规</gui>区段，切换<gui>主按钮</gui>至<gui>右手</g
 
 #: C/mouse-middleclick.page:6(info/desc)
 msgid ""
-"Use the middle mouse button to open applications, paste text, open tabs, and "
+"Use the middle mouse button to open applications, open tabs and "
 "more."
-msgstr "使用鼠标中键来打开程序、粘贴文本、打开标签等等。"
+msgstr "使用鼠标中键来打开程序、打开标签等等。"
 
 #: C/mouse-middleclick.page:29(page/title)
 msgid "Middle-click"
@@ -10015,10 +9792,11 @@ msgstr "单击中键"
 
 #: C/mouse-middleclick.page:31(page/p)
 msgid ""
-"Many mice and some touchpads have a middle mouse button. On a mouse with a "
-"scroll wheel, you can usually press directly down on the scroll wheel to "
-"middle-click. If you don't have a middle mouse button, you can press the "
-"left and right mouse buttons at the same time to middle-click."
+"Many mice and some touchpads have a middle mouse button. On a mouse "
+"with a scroll wheel, you can usually press directly down on the scroll "
+"wheel to middle-click. If you don’t have a middle mouse button, you "
+"can press the left and right mouse buttons at the same time to "
+"middle-click."
 msgstr ""
 "许多鼠标和触摸板都有一个中键，在鼠标的滚轮上，您可以直接按滚轮来完成中键点"
 "击，如果您没有中键可以同时按下左键和右键来完成中键点击。"
@@ -10066,11 +9844,11 @@ msgstr ""
 
 #: C/mouse-middleclick.page:59(item/p)
 msgid ""
-"In the <gui>Activities</gui> overview, you can quickly open a new window for "
-"an application in its own new workspace with middle-click. Simply middle-"
-"click on the application's icon, either in the dash on the left, or in the "
-"applications overview. The applications overview is diplayed using the grid "
-"button in the dash."
+"In the <gui>Activities</gui> overview, you can quickly open a new "
+"window for an application with middle-click. Simply middle-click on the "
+"application’s icon, either in the dash on the left, or in the applications "
+"overview. The applications overview is displayed using the grid button in the "
+"dash."
 msgstr ""
 "在<gui>活动</gui>概览中，您可以通过中键点击，在新工作区快速打开一个应用程序窗"
 "口。在应用程序图标上点击鼠标中键，可以在左侧的快速启动栏中，也可以在应用程序"
@@ -10078,18 +9856,12 @@ msgstr ""
 
 #: C/mouse-middleclick.page:65(item/p)
 msgid ""
-"Most web browsers allow you to open links in tabs quickly with the middle "
-"mouse button. Just click any link with your middle mouse button, and it will "
-"open in a new tab. Be careful clicking the link in the <app>Firefox</app> "
-"web browser, though. In <app>Firefox</app>, if you middle-click anywhere "
-"except on a link, it will try to load your selected text as a URL, as if you "
-"used middle-click to paste it to the location bar and pressed <key>Enter</"
-"key>."
+"Most web browsers allow you to open links in tabs quickly with the "
+"middle mouse button. Just click any link with your middle mouse button, and "
+"it will open in a new tab."
 msgstr ""
 "绝大多数浏览器都允许使用中键在新标签打开链接，只需用中键点击一个链接，它就会"
-"在新标签页打开，但是在<app>火狐</app>中要特别小心，在<app>火狐</app>中，如果"
-"您中键点击到别的地方而不是链接上，它会试图将选中的文本作为链接打开，就像是用"
-"中键粘贴文本到地址栏，然后按了<key>回车键</key>。"
+"在新标签页打开。"
 
 #: C/mouse-middleclick.page:73(item/p)
 msgid ""
@@ -10103,15 +9875,17 @@ msgstr ""
 
 #: C/mouse-middleclick.page:79(page/p)
 msgid ""
-"Some specialized applications allow you to use the middle mouse button for "
-"other functions. Search your application's help for <em>middle-click</em> or "
-"<em>middle mouse button</em>."
+"Some specialized applications allow you to use the middle mouse "
+"button for other functions. Search your application’s help for "
+"<em>middle-click</em> or <em>middle mouse button</em>."
 msgstr ""
 "一些程序允许您使用中键按钮执行其他功能。搜索程序帮助，查找<em>中键点击</em>或"
 "<em>鼠标中键</em>的相关说明。"
 
 #: C/mouse-mousekeys.page:11(info/desc)
-msgid "Enable mouse keys to control the mouse with the keypad."
+msgid ""
+"Enable mouse keys to control the mouse with the numeric "
+"keypad."
 msgstr "启用鼠标键，使用键盘来控制鼠标指针。"
 
 #: C/mouse-mousekeys.page:30(page/title)
@@ -10167,15 +9941,16 @@ msgstr ""
 
 #: C/mouse-mousekeys.page:54(page/p)
 msgid ""
-"The keypad is a set of numerical buttons on your keyboard, usually arranged "
-"into a square grid. If you have a keyboard without a keypad (such as a "
-"laptop keyboard), you may need to hold down the function (<key>Fn</key>) key "
-"and use certain other keys on your keyboard as a keypad. If you use this "
-"feature often on a laptop, you can purchase external USB keypads."
+"The keypad is a set of numerical buttons on your keyboard, usually "
+"arranged into a square grid. If you have a keyboard without a keypad (such as "
+"a laptop keyboard), you may need to hold down the function (<key>Fn</key>) "
+"key and use certain other keys on your keyboard as a keypad. If you use this "
+"feature often on a laptop, you can purchase external USB or Bluetooth numeric "
+"keypads."
 msgstr ""
 "键盘上有一组数字按键，通常排列成四方形，如果您的键盘上没有它(比如笔记本键"
 "盘)，您需要按住功能键(<key>Fn</key>)和另外一个指定键来开启它。如果您要经常在"
-"笔记本上使用，可以购买一个 USB 外置键盘。"
+"笔记本上使用，可以购买一个 USB 外置键盘或者蓝牙数字键盘。"
 
 #: C/mouse-mousekeys.page:60(page/p)
 msgid ""
@@ -10188,13 +9963,12 @@ msgstr ""
 "向下。按<key>5</key>是向单击，快速按两下是双击。"
 
 #: C/mouse-mousekeys.page:65(page/p)
-#, fuzzy
 msgid ""
-"Most keyboards have a special key which allows you to right-click, sometimes "
-"called the <key xref=\"keyboard-key-menu\">Menu</key> key. Note, however, "
-"that this key responds to where your keyboard focus is, not where your mouse "
-"pointer is. See <link xref=\"a11y-right-click\"/> for information on how to "
-"right-click by holding down <key>5</key> or the left mouse button."
+"Most keyboards have a special key which allows you to right-click, "
+"sometimes called the <key xref=\"keyboard-key-menu\">Menu</key> key. Note, "
+"however, that this key responds to where your keyboard focus is, not where "
+"your mouse pointer is. See <link xref=\"a11y-right-click\"/> for information on "
+"how to right-click by holding down <key>5</key> or the left mouse button."
 msgstr ""
 "大部分键盘上都有一个可以模拟右键单击的键；一般位于空格键的右边。请注意这个键"
 "将在焦点处而不是鼠标指针所在处触发鼠标右键。您可以查阅<link xref=\"a11y-"
@@ -10217,7 +9991,7 @@ msgid ""
 msgstr "键盘上面还有一排普通数字键，它们不能控制鼠标指针，只能当数字按键使用。"
 
 #: C/mouse-problem-notmoving.page:8(info/desc)
-msgid "How to check your mouse if it is not working."
+msgid "How to check why your mouse is not working."
 msgstr "如果鼠标工作不正常，如何进行检测。"
 
 #: C/mouse-problem-notmoving.page:23(page/title)
@@ -10451,8 +10225,9 @@ msgstr "要双击，触击两次。"
 
 #: C/mouse-touchpad-click.page:41(item/p)
 msgid ""
-"To drag an item, double-tap but don't lift your finger after the second tap. "
-"Drag the item where you want it, then lift your finger to drop."
+"To drag an item, double-tap but don’t lift your finger after the "
+"second tap. Drag the item where you want it, then lift your finger to "
+"drop."
 msgstr ""
 "要拖动一个项目，双击这一项目并保持手指停在触摸板上，然后拖动项目到任意地方，"
 "然后抬起手指离开触摸板。"
@@ -10478,9 +10253,9 @@ msgstr ""
 
 #: C/mouse-touchpad-click.page:52(note/p)
 msgid ""
-"When tapping or dragging with multiple fingers, make sure your fingers are "
-"spread far enough apart. If your fingers are too close, your computer may "
-"think they're a single finger."
+"When tapping or dragging with multiple fingers, make sure your fingers "
+"are spread far enough apart. If your fingers are too close, your computer "
+"may think they’re a single finger."
 msgstr ""
 "当您进行多指点击或拖动时，请确保您的手指分得够开。如果手指过于接近，电脑可能"
 "会误认为是单指动作。"
@@ -10533,26 +10308,23 @@ msgstr "在<gui>触摸板</gui>区段，打勾选中<gui>内容跟随手指</gui
 
 #: C/mouse-touchpad-click.page:104(note/p)
 msgid ""
-"This feature is also known as <em>Natural Scrolling</em> or <em>Reverse "
-"Scrolling</em>."
-msgstr "这种特性也称作<em>自然滚屏</em>或者<em>反向滚屏</em>。"
+"This feature is also known as <em>Reverse Scrolling</em>."
+msgstr "这种特性也称作<em>自然滚屏</em>。"
 
 #: C/mouse-wakeup.page:10(info/desc)
 msgid "If you have to wiggle or click the mouse before it responds."
 msgstr "鼠标要先晃几下或点击才能响应。"
 
 #: C/mouse-wakeup.page:19(page/title)
-#, fuzzy
 msgid "Mouse reacts with delay before it starts working"
 msgstr "鼠标在它工作前有一段延迟"
 
 #: C/mouse-wakeup.page:21(page/p)
-#, fuzzy
 msgid ""
 "Wireless and optical mice, as well as touchpads on laptops, may need to "
-"\"wake up\" before they start working. They automatically go to sleep when "
-"not in use to save battery power. To wake up your mouse or touchpad, you can "
-"click on a mouse button or wiggle the mouse."
+"“wake up” before they start working. They automatically go to sleep when not in "
+"use to save battery power. To wake up your mouse or touchpad, you can click on "
+"a mouse button or wiggle the mouse."
 msgstr ""
 "无线和光电鼠标，还有笔记本上的触摸板，在它们工作之前需要“唤醒”一下。它们在不"
 "用时会自动进入睡眠以省电。要唤醒鼠标或触摸板，可以点两下或晃一晃鼠标。"