diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3854c8c83..820fec0bc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,7 +16,7 @@
 # Aron Xu <happyaron.xu@gmail.com>, 2010, 2011.
 # 指冷玉笙寒 (dhyang) <dhyang555@gmail.com>, 2011.
 # Lele Long <schemacs@gmail.com>, 2011.
-# Yinghua Wang <wantinghard@gmail.com>, 2011.
+# Wylmer Wang <wantinghard@gmail.com>, 2011.
 # Wind He <lofwind@gmail.com>, 2011.
 # YunQiang Su <wzssyqa@gmail.com>, 2011.
 #
@@ -25,9 +25,9 @@ msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-09-29 15:54+0000\n"
-"PO-Revision-Date: 2011-10-23 18:19+0800\n"
-"Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
+"POT-Creation-Date: 2011-11-14 17:33+0000\n"
+"PO-Revision-Date: 2011-11-19 22:21+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,7 +125,7 @@ msgstr "Flickr"
 
 #: ../panels/background/cc-background-item.c:148
 msgid "multiple sizes"
-msgstr "多个尺寸"
+msgstr "多种尺寸"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
@@ -139,48 +139,48 @@ msgid "No Desktop Background"
 msgstr "无桌面背景"
 
 #. Add some common languages first
-#: ../panels/common/cc-common-language.c:512
+#: ../panels/common/cc-common-language.c:513
 msgid "English"
 msgstr "英语"
 
-#: ../panels/common/cc-common-language.c:513
+#: ../panels/common/cc-common-language.c:515
 msgid "British English"
 msgstr "英国英语"
 
-#: ../panels/common/cc-common-language.c:514
+#: ../panels/common/cc-common-language.c:517
 msgid "German"
 msgstr "德语"
 
-#: ../panels/common/cc-common-language.c:515
+#: ../panels/common/cc-common-language.c:519
 msgid "French"
 msgstr "法语"
 
-#: ../panels/common/cc-common-language.c:516
+#: ../panels/common/cc-common-language.c:521
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: ../panels/common/cc-common-language.c:517
+#: ../panels/common/cc-common-language.c:523
 msgid "Chinese (simplified)"
 msgstr "简体中文"
 
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:546
+#: ../panels/common/cc-common-language.c:552
 msgid "United States"
 msgstr "美国"
 
-#: ../panels/common/cc-common-language.c:547
+#: ../panels/common/cc-common-language.c:553
 msgid "Germany"
 msgstr "德国"
 
-#: ../panels/common/cc-common-language.c:548
+#: ../panels/common/cc-common-language.c:554
 msgid "France"
 msgstr "法国"
 
-#: ../panels/common/cc-common-language.c:549
+#: ../panels/common/cc-common-language.c:555
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../panels/common/cc-common-language.c:550
+#: ../panels/common/cc-common-language.c:556
 msgid "China"
 msgstr "中国"
 
@@ -192,13 +192,13 @@ msgstr "其他..."
 msgid "Select a region"
 msgstr "选择一个地区"
 
-#: ../panels/common/gdm-languages.c:773
+#: ../panels/common/gdm-languages.c:774
 msgid "Unspecified"
 msgstr "未指定"
 
 #: ../panels/common/language-chooser.ui.h:1
 msgid "Select a language"
-msgstr "选择一个语言"
+msgstr "选择一种语言"
 
 #: ../panels/common/language-chooser.ui.h:2
 #: ../panels/printers/new-printer-dialog.ui.h:4
@@ -413,7 +413,7 @@ msgstr "拖拽以更改主显示设备。"
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
-msgstr "选择一个显示器来更改它的属性；拖动它来排列位置。"
+msgstr "选择一台显示器来更改它的属性；拖动它来排列位置。"
 
 #: ../panels/display/cc-display-panel.c:2102
 msgid "%a %R"
@@ -504,20 +504,20 @@ msgstr "默认应用程序"
 msgid "Graphics"
 msgstr "图形"
 
-#: ../panels/info/cc-info-panel.c:1194
+#: ../panels/info/cc-info-panel.c:1195
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../panels/info/cc-info-panel.c:1244
+#: ../panels/info/cc-info-panel.c:1245
 msgid "Install Updates"
 msgstr "安装更新"
 
-#: ../panels/info/cc-info-panel.c:1248
+#: ../panels/info/cc-info-panel.c:1249
 msgid "System Up-To-Date"
 msgstr "系统已是最新"
 
-#: ../panels/info/cc-info-panel.c:1252
+#: ../panels/info/cc-info-panel.c:1253
 msgid "Checking for Updates"
 msgstr "正在检查更新"
 
@@ -813,7 +813,7 @@ msgstr ""
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
-msgstr "如果你重新设定快捷键 %s，则快捷键 %s 将被禁用"
+msgstr "如果你重新设置快捷键 %s，则快捷键 %s 将被禁用"
 
 #: ../panels/keyboard/keyboard-shortcuts.c:1383
 msgid "_Reassign"
@@ -955,10 +955,9 @@ msgstr "选择要在连接音乐播放器后运行的应用程序"
 msgid "Select an application to run when a camera is connected"
 msgstr "选择要在连接相机后运行的应用程序"
 
-# 这个翻译太有歧义了
 #: ../panels/media/cc-media-panel.c:438
 msgid "Select an application for software CDs"
-msgstr "选择运行软件 CD 的应用程序"
+msgstr "选择要在插入软件 CD 时运行的应用程序"
 
 #. translators: these strings are duplicates of shared-mime-info
 #. * strings, just here to fix capitalization of the English originals.
@@ -967,7 +966,7 @@ msgstr "选择运行软件 CD 的应用程序"
 #.
 #: ../panels/media/cc-media-panel.c:450
 msgid "audio DVD"
-msgstr "视频 DVD"
+msgstr "音频 DVD"
 
 #: ../panels/media/cc-media-panel.c:451
 msgid "blank Blu-ray disc"
@@ -1073,7 +1072,7 @@ msgstr "cd;dvd;usb;audio;video;disc;音频;视频;光盘;"
 
 #: ../panels/online-accounts/cc-online-accounts-panel.c:308
 msgid "Error logging into the account"
-msgstr "登录到该帐户出错"
+msgstr "登录到该账户出错"
 
 #: ../panels/online-accounts/cc-online-accounts-panel.c:354
 msgid "Expired credentials. Please log in again."
@@ -1085,11 +1084,11 @@ msgstr "登录(_L)"
 
 #: ../panels/online-accounts/cc-online-accounts-panel.c:466
 msgid "To add a new account, first select the account type"
-msgstr "要添加一个新帐户，请先选择帐户类型"
+msgstr "要添加一个新账户，请先选择账户类型"
 
 #: ../panels/online-accounts/cc-online-accounts-panel.c:469
 msgid "Account Type:"
-msgstr "帐户类型："
+msgstr "账户类型："
 
 #: ../panels/online-accounts/cc-online-accounts-panel.c:501
 msgid "_Add..."
@@ -1097,19 +1096,19 @@ msgstr "添加(_A)..."
 
 #: ../panels/online-accounts/cc-online-accounts-panel.c:554
 msgid "Error creating account"
-msgstr "创建帐户出错"
+msgstr "创建账户出错"
 
 #: ../panels/online-accounts/cc-online-accounts-panel.c:588
 msgid "Error removing account"
-msgstr "移除帐户出错"
+msgstr "移除账户出错"
 
 #: ../panels/online-accounts/cc-online-accounts-panel.c:624
 msgid "Are you sure you want to remove the account?"
-msgstr "您确定要移除该帐户吗？"
+msgstr "您确定要移除该账户吗？"
 
 #: ../panels/online-accounts/cc-online-accounts-panel.c:626
 msgid "This will not remove the account on the server."
-msgstr "这不会将该帐户从服务器上移除。"
+msgstr "这不会将该账户从服务器上移除。"
 
 #: ../panels/online-accounts/cc-online-accounts-panel.c:627
 msgid "_Remove"
@@ -1124,217 +1123,217 @@ msgstr ""
 
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
 msgid "Manage online accounts"
-msgstr "管理在线帐户"
+msgstr "管理在线账户"
 
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
 msgid "Online Accounts"
-msgstr "在线帐户"
+msgstr "在线账户"
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
 msgid "Select an account"
-msgstr "选择一个帐户"
+msgstr "选择一个账户"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:520
+#: ../panels/printers/cc-printers-panel.c:525
 msgid "Low on toner"
 msgstr "墨粉不足"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:522
+#: ../panels/printers/cc-printers-panel.c:527
 msgid "Out of toner"
 msgstr "墨粉用尽"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:525
+#: ../panels/printers/cc-printers-panel.c:530
 msgid "Low on developer"
 msgstr "显影剂不足"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:528
+#: ../panels/printers/cc-printers-panel.c:533
 msgid "Out of developer"
 msgstr "显影剂用尽"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:530
+#: ../panels/printers/cc-printers-panel.c:535
 msgid "Low on a marker supply"
 msgstr "标记墨水不足"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:532
+#: ../panels/printers/cc-printers-panel.c:537
 msgid "Out of a marker supply"
 msgstr "标记墨水用尽"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:534
+#: ../panels/printers/cc-printers-panel.c:539
 msgid "Open cover"
 msgstr "打开上盖"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:536
+#: ../panels/printers/cc-printers-panel.c:541
 msgid "Open door"
 msgstr "打开后门"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:538
+#: ../panels/printers/cc-printers-panel.c:543
 msgid "Low on paper"
 msgstr "纸张不足"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:540
+#: ../panels/printers/cc-printers-panel.c:545
 msgid "Out of paper"
 msgstr "纸张用尽"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:542
+#: ../panels/printers/cc-printers-panel.c:547
 msgctxt "printer state"
 msgid "Offline"
 msgstr "离线"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:544
+#: ../panels/printers/cc-printers-panel.c:549
 msgctxt "printer state"
 msgid "Paused"
 msgstr "已暂停"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:546
+#: ../panels/printers/cc-printers-panel.c:551
 msgid "Waste receptacle almost full"
 msgstr "废粉仓将满"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:548
+#: ../panels/printers/cc-printers-panel.c:553
 msgid "Waste receptacle full"
 msgstr "废粉仓已满"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:550
+#: ../panels/printers/cc-printers-panel.c:555
 msgid "The optical photo conductor is near end of life"
 msgstr "感光鼓接近使用寿命"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:552
+#: ../panels/printers/cc-printers-panel.c:557
 msgid "The optical photo conductor is no longer functioning"
 msgstr "感光鼓无法工作"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:724
+#: ../panels/printers/cc-printers-panel.c:729
 msgctxt "printer state"
 msgid "Ready"
 msgstr "就绪"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:728
+#: ../panels/printers/cc-printers-panel.c:733
 msgctxt "printer state"
 msgid "Processing"
 msgstr "正在处理"
 
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:732
+#: ../panels/printers/cc-printers-panel.c:737
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "已停止"
 
 # 以下几个level似乎译为“量”更好
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:851
+#: ../panels/printers/cc-printers-panel.c:856
 msgid "Toner Level"
 msgstr "碳粉量"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:854
+#: ../panels/printers/cc-printers-panel.c:859
 msgid "Ink Level"
 msgstr "墨水量"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:857
+#: ../panels/printers/cc-printers-panel.c:862
 msgid "Supply Level"
 msgstr "耗材量"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:872
-#: ../panels/printers/cc-printers-panel.c:1256
+#: ../panels/printers/cc-printers-panel.c:877
+#: ../panels/printers/cc-printers-panel.c:1263
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u 个活动任务"
 
 #. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:977
+#: ../panels/printers/cc-printers-panel.c:982
 msgid "No printers available"
 msgstr "无可用打印机"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:1299
+#: ../panels/printers/cc-printers-panel.c:1306
 msgctxt "print job"
 msgid "Pending"
 msgstr "等待中"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:1303
+#: ../panels/printers/cc-printers-panel.c:1310
 msgctxt "print job"
 msgid "Held"
 msgstr "挂起"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:1307
+#: ../panels/printers/cc-printers-panel.c:1314
 msgctxt "print job"
 msgid "Processing"
 msgstr "处理中"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:1311
+#: ../panels/printers/cc-printers-panel.c:1318
 msgctxt "print job"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:1315
+#: ../panels/printers/cc-printers-panel.c:1322
 msgctxt "print job"
 msgid "Canceled"
 msgstr "已取消"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:1319
+#: ../panels/printers/cc-printers-panel.c:1326
 msgctxt "print job"
 msgid "Aborted"
 msgstr "已中止"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:1323
+#: ../panels/printers/cc-printers-panel.c:1330
 msgctxt "print job"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:1406
+#: ../panels/printers/cc-printers-panel.c:1413
 msgid "Job Title"
 msgstr "任务标题"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:1415
+#: ../panels/printers/cc-printers-panel.c:1422
 msgid "Job State"
 msgstr "任务状态"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:1421
+#: ../panels/printers/cc-printers-panel.c:1428
 msgid "Time"
 msgstr "时间"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:2017
+#: ../panels/printers/cc-printers-panel.c:2024
 msgid "Failed to add new printer."
 msgstr "添加新打印机失败。"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2221
-#: ../panels/printers/cc-printers-panel.c:2235
+#: ../panels/printers/cc-printers-panel.c:2228
+#: ../panels/printers/cc-printers-panel.c:2242
 msgid "Test page"
 msgstr "测试页"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2477
+#: ../panels/printers/cc-printers-panel.c:2489
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "无法装入界面：%s"
@@ -1349,7 +1348,7 @@ msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr "Printer;Queue;Print;Paper;Ink;Toner;打印机;队列;打印;纸张;墨水;墨粉;"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
-#: ../panels/printers/pp-new-printer-dialog.c:142
+#: ../panels/printers/pp-new-printer-dialog.c:147
 msgid "Printers"
 msgstr "打印机"
 
@@ -1369,11 +1368,11 @@ msgstr "添加(_A)"
 msgid "_Search by Address"
 msgstr "按地址搜索(_S)"
 
-#: ../panels/printers/pp-new-printer-dialog.c:627
+#: ../panels/printers/pp-new-printer-dialog.c:651
 msgid "Getting devices..."
 msgstr "正在获取设备..."
 
-#: ../panels/printers/pp-new-printer-dialog.c:1262
+#: ../panels/printers/pp-new-printer-dialog.c:1294
 msgid ""
 "FirewallD is not running. Network printer detection needs services mdns, "
 "ipp, ipp-client and samba-client enabled on firewall."
@@ -1382,42 +1381,42 @@ msgstr ""
 "samba-client 服务。"
 
 #. Translators: Column of devices which can be installed
-#: ../panels/printers/pp-new-printer-dialog.c:1282
-#: ../panels/printers/pp-new-printer-dialog.c:1287
+#: ../panels/printers/pp-new-printer-dialog.c:1322
+#: ../panels/printers/pp-new-printer-dialog.c:1327
 msgid "Devices"
 msgstr "设备"
 
 #. Translators: Local means local printers
-#: ../panels/printers/pp-new-printer-dialog.c:1312
+#: ../panels/printers/pp-new-printer-dialog.c:1352
 msgctxt "printer type"
 msgid "Local"
 msgstr "本地"
 
 #. Translators: Network means network printers
-#: ../panels/printers/pp-new-printer-dialog.c:1314
+#: ../panels/printers/pp-new-printer-dialog.c:1354
 msgctxt "printer type"
 msgid "Network"
 msgstr "网络"
 
 #. Translators: Device types column (network or local)
-#: ../panels/printers/pp-new-printer-dialog.c:1355
+#: ../panels/printers/pp-new-printer-dialog.c:1395
 msgid "Device types"
 msgstr "设备类型"
 
 #. Translators: Name of job which makes printer to autoconfigure itself
-#: ../panels/printers/pp-new-printer-dialog.c:1654
+#: ../panels/printers/pp-new-printer-dialog.c:1696
 msgid "Automatic configuration"
 msgstr "自动配置"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1750
+#: ../panels/printers/pp-new-printer-dialog.c:1777
 msgid "Opening firewall for mDNS connections"
 msgstr "为 mDNS 连接打开防火墙"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1759
+#: ../panels/printers/pp-new-printer-dialog.c:1786
 msgid "Opening firewall for Samba connections"
 msgstr "为 Samba 连接打开防火墙"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1768
+#: ../panels/printers/pp-new-printer-dialog.c:1795
 msgid "Opening firewall for IPP connections"
 msgstr "为 IPP 连接打开防火墙"
 
@@ -1436,8 +1435,8 @@ msgid "Allowed users"
 msgstr "允许的用户"
 
 #: ../panels/printers/printers.ui.h:6
-#: ../panels/network/cc-network-panel.c:1992
-#: ../panels/network/cc-network-panel.c:1995 ../panels/network/network.ui.h:11
+#: ../panels/network/cc-network-panel.c:1990
+#: ../panels/network/cc-network-panel.c:1993 ../panels/network/network.ui.h:11
 msgid "IP Address"
 msgstr "IP 地址"
 
@@ -1496,11 +1495,11 @@ msgstr "选项(_O)"
 msgid "_Show"
 msgstr "显示(_O)"
 
-#: ../panels/region/gnome-region-panel-formats.c:140
+#: ../panels/region/gnome-region-panel-formats.c:142
 msgid "Imperial"
 msgstr "英制"
 
-#: ../panels/region/gnome-region-panel-formats.c:142
+#: ../panels/region/gnome-region-panel-formats.c:144
 msgid "Metric"
 msgstr "公制"
 
@@ -1525,7 +1524,7 @@ msgid "Allow different layouts for individual windows"
 msgstr "允许各个窗口拥有不同的布局"
 
 #: ../panels/region/gnome-region-panel.ui.h:2
-#: ../panels/region/gnome-region-panel-system.c:303
+#: ../panels/region/gnome-region-panel-system.c:406
 msgid "Copy Settings..."
 msgstr "复制设置..."
 
@@ -1614,14 +1613,14 @@ msgid "System settings"
 msgstr "系统设置"
 
 #: ../panels/region/gnome-region-panel.ui.h:26
-#: ../panels/region/gnome-region-panel-system.c:297
+#: ../panels/region/gnome-region-panel-system.c:400
 msgid ""
 "The login screen, system accounts and new user accounts use the system-wide "
 "Region and Language settings. You may change the system settings to match "
 "yours."
 msgstr ""
-"登录屏幕、系统帐号和新用户均使用系统的“区域和语言”设定。您可以在那里按需修改"
-"相关系统设定。"
+"登录屏幕、系统账号和新用户均使用系统的“区域和语言”设置。您可以在那里按需修改"
+"相关系统设置。"
 
 #: ../panels/region/gnome-region-panel.ui.h:27
 msgid "Times"
@@ -1643,15 +1642,15 @@ msgstr "我的设置"
 msgid "_Options..."
 msgstr "选项(_O)..."
 
-#: ../panels/region/gnome-region-panel-system.c:292
+#: ../panels/region/gnome-region-panel-system.c:395
 msgid ""
 "The login screen, system accounts and new user accounts use the system-wide "
 "Region and Language settings."
-msgstr "登录屏幕、系统帐号和新用户均使用系统的“区域和语言”设定。"
+msgstr "登录屏幕、系统账号和新用户均使用系统的“区域和语言”设置。"
 
-#: ../panels/region/gnome-region-panel-system.c:300
+#: ../panels/region/gnome-region-panel-system.c:403
 msgid "Copy Settings"
-msgstr "复制设定"
+msgstr "复制设置"
 
 #: ../panels/region/gnome-region-panel-xkblt.c:210
 msgid "Layout"
@@ -1813,104 +1812,104 @@ msgstr "对于不可信的公共网络，不建议这样做。"
 #. TRANSLATORS: this is when the access point is not listed
 #. * in the dropdown (or hidden) and the user has to select
 #. * another entry manually
-#: ../panels/network/cc-network-panel.c:951
+#: ../panels/network/cc-network-panel.c:949
 msgctxt "Wireless access point"
 msgid "Other..."
 msgstr "其他..."
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/cc-network-panel.c:1109
-#: ../panels/network/cc-network-panel.c:1516
+#: ../panels/network/cc-network-panel.c:1107
+#: ../panels/network/cc-network-panel.c:1514
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/cc-network-panel.c:1113
-#: ../panels/network/cc-network-panel.c:1520
+#: ../panels/network/cc-network-panel.c:1111
+#: ../panels/network/cc-network-panel.c:1518
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/cc-network-panel.c:1117
+#: ../panels/network/cc-network-panel.c:1115
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/cc-network-panel.c:1122
+#: ../panels/network/cc-network-panel.c:1120
 msgid "Enterprise"
 msgstr "企业"
 
 #. TRANSLATORS: this no (!) WiFi security
-#: ../panels/network/cc-network-panel.c:1128
-#: ../panels/network/cc-network-panel.c:1511
+#: ../panels/network/cc-network-panel.c:1126
+#: ../panels/network/cc-network-panel.c:1509
 #: ../panels/universal-access/uap.ui.h:41
 msgid "None"
 msgstr "无"
 
-#: ../panels/network/cc-network-panel.c:1579
+#: ../panels/network/cc-network-panel.c:1577
 msgid "Hotspot"
 msgstr "热点"
 
 #. Translators: network device speed
-#: ../panels/network/cc-network-panel.c:1645
-#: ../panels/network/cc-network-panel.c:1733
+#: ../panels/network/cc-network-panel.c:1643
+#: ../panels/network/cc-network-panel.c:1731
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/秒"
 
-#: ../panels/network/cc-network-panel.c:1988 ../panels/network/network.ui.h:12
+#: ../panels/network/cc-network-panel.c:1986 ../panels/network/network.ui.h:12
 msgid "IPv4 Address"
 msgstr "IPv4 地址"
 
-#: ../panels/network/cc-network-panel.c:1989 ../panels/network/network.ui.h:13
+#: ../panels/network/cc-network-panel.c:1987 ../panels/network/network.ui.h:13
 msgid "IPv6 Address"
 msgstr "IPv6 地址"
 
-#: ../panels/network/cc-network-panel.c:2042
-#: ../panels/network/cc-network-panel.c:2415
+#: ../panels/network/cc-network-panel.c:2040
+#: ../panels/network/cc-network-panel.c:2413
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:2150
+#: ../panels/network/cc-network-panel.c:2148
 msgid "Proxy"
 msgstr "代理"
 
-#: ../panels/network/cc-network-panel.c:2224
+#: ../panels/network/cc-network-panel.c:2222
 msgid "Network proxy"
 msgstr "网络代理"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:2482
+#: ../panels/network/cc-network-panel.c:2480
 msgid "The system network services are not compatible with this version."
 msgstr "系统的网络服务与此版本的网络管理器不兼容。"
 
-#: ../panels/network/cc-network-panel.c:3097
+#: ../panels/network/cc-network-panel.c:3095
 msgid "Not connected to the internet."
 msgstr "未连接到互联网。"
 
-#: ../panels/network/cc-network-panel.c:3098
+#: ../panels/network/cc-network-panel.c:3096
 msgid "Create the hotspot anyway?"
 msgstr "仍然创建热点？"
 
-#: ../panels/network/cc-network-panel.c:3116
+#: ../panels/network/cc-network-panel.c:3114
 #, c-format
 msgid "Disconnect from %s and create a new hotspot?"
 msgstr "从 %s 断开并创建一个新热点？"
 
-#: ../panels/network/cc-network-panel.c:3119
+#: ../panels/network/cc-network-panel.c:3117
 msgid "This is your only connection to the internet."
 msgstr "这是您惟一的互联网连接。"
 
-#: ../panels/network/cc-network-panel.c:3137
+#: ../panels/network/cc-network-panel.c:3135
 msgid "Create _Hotspot"
 msgstr "创建热点(_H)"
 
-#: ../panels/network/cc-network-panel.c:3197
+#: ../panels/network/cc-network-panel.c:3195
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止热点并断开所有用户？"
 
-#: ../panels/network/cc-network-panel.c:3200
+#: ../panels/network/cc-network-panel.c:3198
 msgid "_Stop Hotspot"
 msgstr "停止热点(_S)"
 
@@ -1957,7 +1956,7 @@ msgstr "组密码"
 
 #: ../panels/network/network.ui.h:8
 msgid "H_TTPS Proxy"
-msgstr "H_TTP 代理"
+msgstr "H_TTPS 代理"
 
 #: ../panels/network/network.ui.h:9
 msgid "Hardware Address"
@@ -2418,76 +2417,76 @@ msgstr[0] "%i 周"
 msgid "Less than 1 week"
 msgstr "不到一周"
 
-#: ../panels/color/cc-color-panel.c:1375
+#: ../panels/color/cc-color-panel.c:1377
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "默认 RGB"
 
-#: ../panels/color/cc-color-panel.c:1380
+#: ../panels/color/cc-color-panel.c:1382
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "默认 CMYK"
 
-#: ../panels/color/cc-color-panel.c:1385
+#: ../panels/color/cc-color-panel.c:1387
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "默认灰度"
 
-#: ../panels/color/cc-color-panel.c:1500 ../panels/color/cc-color-panel.c:1532
-#: ../panels/color/cc-color-panel.c:1543
+#: ../panels/color/cc-color-panel.c:1505 ../panels/color/cc-color-panel.c:1537
+#: ../panels/color/cc-color-panel.c:1548
 msgid "Uncalibrated"
 msgstr "未校准"
 
-#: ../panels/color/cc-color-panel.c:1503
+#: ../panels/color/cc-color-panel.c:1508
 msgid "This device is not color managed."
 msgstr "此设备没有进行颜色管理。"
 
-#: ../panels/color/cc-color-panel.c:1535
+#: ../panels/color/cc-color-panel.c:1540
 msgid "This device is using manufacturing calibrated data."
 msgstr "此设备正在使用出厂校准数据。"
 
-#: ../panels/color/cc-color-panel.c:1546
+#: ../panels/color/cc-color-panel.c:1551
 msgid ""
 "This device does not have a profile suitable for whole-screen color "
 "correction."
 msgstr "此设备没有一份适于全屏颜色修正的配置。"
 
-#: ../panels/color/cc-color-panel.c:1573
+#: ../panels/color/cc-color-panel.c:1578
 msgid "This device has an old profile that may no longer be accurate."
 msgstr "此设备有一份可能已经不准确的旧配置。"
 
 #. TRANSLATORS: this is when the calibration profile age is not
 #. * specified as it has been autogenerated from the hardware
-#: ../panels/color/cc-color-panel.c:1600
+#: ../panels/color/cc-color-panel.c:1605
 msgid "Not specified"
 msgstr "未指定"
 
 #. add the 'No devices detected' entry
-#: ../panels/color/cc-color-panel.c:1779
+#: ../panels/color/cc-color-panel.c:1793
 msgid "No devices supporting color management detected"
 msgstr "没有检测到支持色彩管理的设备"
 
-#: ../panels/color/cc-color-panel.c:2008
+#: ../panels/color/cc-color-panel.c:2022
 msgctxt "Device kind"
 msgid "Display"
 msgstr "显示"
 
-#: ../panels/color/cc-color-panel.c:2010
+#: ../panels/color/cc-color-panel.c:2024
 msgctxt "Device kind"
 msgid "Scanner"
 msgstr "扫描仪"
 
-#: ../panels/color/cc-color-panel.c:2012
+#: ../panels/color/cc-color-panel.c:2026
 msgctxt "Device kind"
 msgid "Printer"
 msgstr "打印机"
 
-#: ../panels/color/cc-color-panel.c:2014
+#: ../panels/color/cc-color-panel.c:2028
 msgctxt "Device kind"
 msgid "Camera"
 msgstr "相机"
 
-#: ../panels/color/cc-color-panel.c:2016
+#: ../panels/color/cc-color-panel.c:2030
 msgctxt "Device kind"
 msgid "Webcam"
 msgstr "摄像头"
@@ -3156,6 +3155,7 @@ msgid "Mouse Keys"
 msgstr "鼠标键"
 
 #: ../panels/universal-access/uap.ui.h:40
+#, fuzzy
 msgid "Nomon"
 msgstr "日冕定位"
 
@@ -3165,7 +3165,7 @@ msgstr "屏幕键盘"
 
 #: ../panels/universal-access/uap.ui.h:43
 msgid "OnBoard"
-msgstr "板载"
+msgstr "OnBoard"
 
 #: ../panels/universal-access/uap.ui.h:44
 msgid "Options..."
@@ -3465,7 +3465,7 @@ msgstr "无法访问“%s”设备"
 #: ../panels/user-accounts/um-fingerprint-dialog.c:481
 #, c-format
 msgid "Could not start finger capture on '%s' device"
-msgstr "无法在“%s”设备上启动手指捕捉"
+msgstr "无法在“%s”设备上启动指纹采集"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:533
 msgid "Could not access any fingerprint readers"
@@ -3615,7 +3615,7 @@ msgstr "删除用户失败"
 
 #: ../panels/user-accounts/um-user-panel.c:417
 msgid "You cannot delete your own account."
-msgstr "您不能删除自己的帐户。"
+msgstr "您不能删除自己的账户。"
 
 #: ../panels/user-accounts/um-user-panel.c:426
 #, c-format
@@ -3626,7 +3626,7 @@ msgstr "%s 已经登录"
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
-msgstr "在用户已登录时删除帐号可能导致系统处于不一致状态。"
+msgstr "在用户已登录时删除账号可能导致系统处于不一致状态。"
 
 #: ../panels/user-accounts/um-user-panel.c:439
 #, c-format
@@ -3650,7 +3650,7 @@ msgstr "保留文件(_K)"
 #: ../panels/user-accounts/um-user-panel.c:499
 msgctxt "Password mode"
 msgid "Account disabled"
-msgstr "帐户已禁用"
+msgstr "账户已禁用"
 
 #: ../panels/user-accounts/um-user-panel.c:507
 msgctxt "Password mode"
@@ -3664,7 +3664,7 @@ msgstr "无"
 
 #: ../panels/user-accounts/um-user-panel.c:845
 msgid "Failed to contact the accounts service"
-msgstr "联系帐户服务失败"
+msgstr "联系账户服务失败"
 
 #: ../panels/user-accounts/um-user-panel.c:847
 msgid "Please make sure that the AccountService is installed and enabled."
@@ -3706,11 +3706,11 @@ msgstr ""
 
 #: ../panels/user-accounts/um-user-panel.c:1134
 msgid "My Account"
-msgstr "我的帐户"
+msgstr "我的账户"
 
 #: ../panels/user-accounts/um-user-panel.c:1144
 msgid "Other Accounts"
-msgstr "其他帐户"
+msgstr "其他账户"
 
 #: ../panels/user-accounts/um-utils.c:512
 #, c-format
@@ -3751,7 +3751,7 @@ msgstr ""
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
 msgid "User Accounts"
-msgstr "用户帐户"
+msgstr "用户账户"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:3
 msgid "Cr_eate"
@@ -3759,11 +3759,11 @@ msgstr "创建(_E)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:4
 msgid "Create new account"
-msgstr "创建新帐户"
+msgstr "创建新账户"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:5
 msgid "_Account Type"
-msgstr "帐户类型(_A)"
+msgstr "账户类型(_A)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
 msgid "_Full name"
@@ -3799,11 +3799,11 @@ msgstr "当前密码(_P)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:7
 msgid "Disable this account"
-msgstr "禁用此帐户"
+msgstr "禁用此账户"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Enable this account"
-msgstr "启用此帐户"
+msgstr "启用此账户"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:9
 msgid "Fair"
@@ -3860,7 +3860,7 @@ msgstr "更换照片："
 #: ../panels/user-accounts/data/photo-dialog.ui.h:5
 msgid ""
 "Choose a picture that will be shown at the login screen for this account."
-msgstr "选择一个在登录屏幕上和此帐户一同显示的图片。"
+msgstr "选择一个在登录屏幕上和此账户一同显示的图片。"
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:6
 msgid "Gallery"
@@ -3880,11 +3880,11 @@ msgstr "自动登录(_U)"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
 msgid "Account Information"
-msgstr "帐户信息"
+msgstr "账户信息"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
 msgid "Account _type"
-msgstr "帐户类型(_T)"
+msgstr "账户类型(_T)"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Login Options"
@@ -4043,7 +4043,7 @@ msgstr "手写板首选项"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:23
 msgid "Tip Pressure Feel"
-msgstr "轻触压力感"
+msgstr "轻触压力感应"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:24
 msgid "Top Button"