diff --git a/po/ChangeLog b/po/ChangeLog
index e8001b987..299e523db 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-21  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
 2006-01-20  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index de252d074..18705f7e9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-22 06:28+0100\n"
-"PO-Revision-Date: 2005-11-22 17:14+0800\n"
+"POT-Creation-Date: 2006-01-20 14:48+0100\n"
+"PO-Revision-Date: 2006-01-21 00:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -56,15 +56,15 @@ msgstr "关于我"
 msgid "Set your personal information"
 msgstr "设定您的个人信息"
 
-#: ../capplets/about-me/gnome-about-me.c:596
+#: ../capplets/about-me/gnome-about-me.c:601
 msgid "Select Image"
 msgstr "选择图像"
 
-#: ../capplets/about-me/gnome-about-me.c:598
+#: ../capplets/about-me/gnome-about-me.c:603
 msgid "No Image"
 msgstr "无图像"
 
-#: ../capplets/about-me/gnome-about-me.c:761
+#: ../capplets/about-me/gnome-about-me.c:766
 msgid ""
 "There was an error while trying to get the addressbook information\n"
 "Evolution Data Server can't handle the protocol"
@@ -72,68 +72,72 @@ msgstr ""
 "试图获取地址簿信息时出错\n"
 "Evolution 数据服务器无法处理协议"
 
-#: ../capplets/about-me/gnome-about-me.c:782
+#: ../capplets/about-me/gnome-about-me.c:787
 msgid "Unable to open address book"
 msgstr "无法打开地址簿"
 
-#: ../capplets/about-me/gnome-about-me.c:794
+#: ../capplets/about-me/gnome-about-me.c:799
 msgid "Unknown login ID, the user database might be corrupted"
 msgstr "未知的登录 ID，用户数据库可能已经损坏"
 
-#: ../capplets/about-me/gnome-about-me.c:825
-#: ../capplets/about-me/gnome-about-me.c:827
+#: ../capplets/about-me/gnome-about-me.c:830
+#: ../capplets/about-me/gnome-about-me.c:832
 #, c-format
 msgid "About %s"
 msgstr "关于 %s"
 
-#: ../capplets/about-me/gnome-about-me-password.c:101
-#: ../capplets/about-me/gnome-about-me-password.c:479
+#: ../capplets/about-me/gnome-about-me-password.c:116
+#: ../capplets/about-me/gnome-about-me-password.c:707
 msgid "Old password is incorrect, please retype it"
 msgstr "旧密码不正确，请重新输入"
 
-#: ../capplets/about-me/gnome-about-me-password.c:112
+#: ../capplets/about-me/gnome-about-me-password.c:127
 msgid "System error has occurred"
 msgstr "发生了系统错误"
 
-#: ../capplets/about-me/gnome-about-me-password.c:113
+#: ../capplets/about-me/gnome-about-me-password.c:128
 msgid "Could not run /usr/bin/passwd"
 msgstr "无法运行 /usr/bin/passwd"
 
-#: ../capplets/about-me/gnome-about-me-password.c:114
+#: ../capplets/about-me/gnome-about-me-password.c:129
 msgid "Unable to launch backend"
 msgstr "无法调用后端"
 
-#: ../capplets/about-me/gnome-about-me-password.c:116
-#: ../capplets/about-me/gnome-about-me-password.c:117
+#: ../capplets/about-me/gnome-about-me-password.c:131
+#: ../capplets/about-me/gnome-about-me-password.c:132
 msgid "Unexpected error has occurred"
 msgstr "发生了意外错误"
 
-#: ../capplets/about-me/gnome-about-me-password.c:315
+#: ../capplets/about-me/gnome-about-me-password.c:331
 msgid "Password is too short"
 msgstr "密码太短"
 
-#: ../capplets/about-me/gnome-about-me-password.c:318
-#: ../capplets/about-me/gnome-about-me-password.c:321
+#: ../capplets/about-me/gnome-about-me-password.c:334
+#: ../capplets/about-me/gnome-about-me-password.c:337
 msgid "Password is too simple"
 msgstr "密码太简单"
 
-#: ../capplets/about-me/gnome-about-me-password.c:324
+#: ../capplets/about-me/gnome-about-me-password.c:340
 msgid "Old and new passwords are too similar"
 msgstr "旧密码和新密码太相似"
 
-#: ../capplets/about-me/gnome-about-me-password.c:328
+#: ../capplets/about-me/gnome-about-me-password.c:343
+msgid "Must contain numeric or special character(s)"
+msgstr "必须包含数字或特殊字符"
+
+#: ../capplets/about-me/gnome-about-me-password.c:348
 msgid "Old and new password are the same"
 msgstr "旧密码和新密码相同"
 
-#: ../capplets/about-me/gnome-about-me-password.c:406
+#: ../capplets/about-me/gnome-about-me-password.c:634
 msgid "Please type the passwords."
 msgstr "请重新输入新密码。"
 
-#: ../capplets/about-me/gnome-about-me-password.c:414
+#: ../capplets/about-me/gnome-about-me-password.c:642
 msgid "Please type the password again, it is wrong."
 msgstr "请再输入一次密码，密码不对。"
 
-#: ../capplets/about-me/gnome-about-me-password.c:417
+#: ../capplets/about-me/gnome-about-me-password.c:645
 msgid "Click on Change Password to change the password."
 msgstr "单击更改密码按钮可更改密码。"
 
@@ -469,7 +473,6 @@ msgid ""
 msgstr "此系统好像没有 XKB 扩展。键盘辅助功能必须依赖该扩展才能实现。"
 
 #: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:1
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:2
 #: ../capplets/theme-switcher/theme-install.glade.h:1
 msgid "*"
@@ -682,6 +685,11 @@ msgid "_Add Wallpaper"
 msgstr "添加壁纸(_A)"
 
 #: ../capplets/background/gnome-background-properties.glade.h:6
+#: ../capplets/theme-switcher/theme-properties.glade.h:19
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#: ../capplets/background/gnome-background-properties.glade.h:7
 msgid "_Style:"
 msgstr "样式(_S)："
 
@@ -692,51 +700,48 @@ msgstr "样式(_S)："
 msgid "There was an error displaying help: %s"
 msgstr "显示帮助时出错：%s"
 
-#: ../capplets/background/gnome-wp-capplet.c:1060
-#: ../capplets/background/gnome-wp-capplet.c:1078
+#: ../capplets/background/gnome-wp-capplet.c:984
 msgid "Centered"
 msgstr "居中"
 
-#: ../capplets/background/gnome-wp-capplet.c:1086
-#: ../capplets/background/gnome-wp-capplet.c:1103
+#: ../capplets/background/gnome-wp-capplet.c:988
 msgid "Fill Screen"
 msgstr "填充屏幕"
 
-#: ../capplets/background/gnome-wp-capplet.c:1111
-#: ../capplets/background/gnome-wp-capplet.c:1128
+#: ../capplets/background/gnome-wp-capplet.c:992
 msgid "Scaled"
 msgstr "缩放"
 
-#: ../capplets/background/gnome-wp-capplet.c:1136
-#: ../capplets/background/gnome-wp-capplet.c:1153
+#: ../capplets/background/gnome-wp-capplet.c:996
+msgid "Zoom"
+msgstr "放大"
+
+#: ../capplets/background/gnome-wp-capplet.c:1000
 msgid "Tiled"
 msgstr "平铺"
 
-#: ../capplets/background/gnome-wp-capplet.c:1177
-#: ../capplets/background/gnome-wp-capplet.c:1186
+#: ../capplets/background/gnome-wp-capplet.c:1021
 msgid "Solid Color"
 msgstr "纯色"
 
-#: ../capplets/background/gnome-wp-capplet.c:1194
-#: ../capplets/background/gnome-wp-capplet.c:1203
+#: ../capplets/background/gnome-wp-capplet.c:1025
 msgid "Horizontal Gradient"
 msgstr "水平渐变"
 
-#: ../capplets/background/gnome-wp-capplet.c:1211
-#: ../capplets/background/gnome-wp-capplet.c:1220
+#: ../capplets/background/gnome-wp-capplet.c:1029
 msgid "Vertical Gradient"
 msgstr "垂直渐变"
 
 #. Create the file chooser dialog stuff here
-#: ../capplets/background/gnome-wp-capplet.c:1269
+#: ../capplets/background/gnome-wp-capplet.c:1075
 msgid "Add Wallpaper"
 msgstr "添加壁纸"
 
-#: ../capplets/background/gnome-wp-capplet.c:1286
+#: ../capplets/background/gnome-wp-capplet.c:1092
 msgid "Images"
 msgstr "图像"
 
-#: ../capplets/background/gnome-wp-capplet.c:1290
+#: ../capplets/background/gnome-wp-capplet.c:1096
 msgid "All Files"
 msgstr "全部文件"
 
@@ -744,8 +749,8 @@ msgstr "全部文件"
 msgid "No Wallpaper"
 msgstr "无壁纸"
 
-#: ../capplets/background/gnome-wp-item.c:296
-#: ../capplets/background/gnome-wp-item.c:298
+#: ../capplets/background/gnome-wp-item.c:305
+#: ../capplets/background/gnome-wp-item.c:307
 msgid "pixel"
 msgid_plural "pixels"
 msgstr[0] "像素"
@@ -773,8 +778,7 @@ msgid "Just apply settings and quit"
 msgstr "应用设置并退出"
 
 #: ../capplets/common/capplet-util.c:243
-#: ../capplets/default-applications/gnome-default-applications-properties.c:765
-#: ../capplets/keyboard/gnome-keyboard-properties.c:222
+#: ../capplets/keyboard/gnome-keyboard-properties.c:225
 #: ../capplets/mouse/gnome-mouse-properties.c:1015
 #: ../capplets/sound/sound-properties-capplet.c:244
 msgid "Retrieve and store legacy settings"
@@ -956,245 +960,248 @@ msgstr "首选应用程序"
 msgid "Select your default applications"
 msgstr "选择默认的应用程序"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Debian Sensible Browser"
-msgstr "Debian Sensible 浏览器"
+#: ../capplets/default-applications/gnome-da-capplet.c:56
+msgid "Could not display help"
+msgstr "无法显示帮助"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Epiphany"
-msgstr "Epiphany"
+#: ../capplets/default-applications/gnome-da-capplet.c:58
+#: ../capplets/default-applications/gnome-da-capplet.c:704
+msgid "Please make sure that the applet is properly installed"
+msgstr ""
+"请确定小程序已经正确安装了。"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Galeon"
-msgstr "Galeon"
+#: ../capplets/default-applications/gnome-da-capplet.c:93
+#: ../capplets/default-applications/gnome-da-capplet.c:126
+#: ../capplets/default-applications/gnome-da-capplet.c:185
+#: ../capplets/default-applications/gnome-da-capplet.c:230
+#: ../capplets/default-applications/gnome-da-capplet.c:287
+#: ../capplets/default-applications/gnome-da-capplet.c:339
+#: ../capplets/default-applications/gnome-da-capplet.c:534
+#: ../capplets/default-applications/gnome-da-capplet.c:557
+#, c-format
+msgid "Error saving configuration: %s"
+msgstr "保存配置出错：%s"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:12
-msgid "Encompass"
-msgstr "Encompass"
+#: ../capplets/default-applications/gnome-da-capplet.c:680
+msgid "Custom"
+msgstr "自定义"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:13
-msgid "Firebird"
-msgstr "Firebird"
+#: ../capplets/default-applications/gnome-da-capplet.c:702
+msgid "Could not load the main interface"
+msgstr "无法装入主界面"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M 文字浏览器"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx 文字浏览器"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links 文字浏览器"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:39
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:40
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:41
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Evolution Mail Reader"
-msgstr "Evolution 邮件阅读程序"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:43
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:1
 msgid "Balsa"
 msgstr "Balsa"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:44
-msgid "KMail"
-msgstr "KMail"
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:2
+msgid "Debian Sensible Browser"
+msgstr "Debian Sensible 浏览器"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:45
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:46
-msgid "Thunderbird"
-msgstr "Thunderbird"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:47
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:48
-msgid "Mutt"
-msgstr "Mutt"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:49
-msgid "Sylpheed-Claws"
-msgstr "Sylpheed-Claws"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:59
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:3
 msgid "Debian Terminal Emulator"
 msgstr "Debian 终端模拟器"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:60
-msgid "GNOME Terminal"
-msgstr "GNOME 终端"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:61
-msgid "Standard XTerminal"
-msgstr "标准 X 终端"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:62
-msgid "NXterm"
-msgstr "NXterm"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:63
-msgid "RXVT"
-msgstr "RXVT"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:64
-msgid "aterm"
-msgstr "aterm"
-
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:65
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:4
 msgid "ETerm"
 msgstr "ETerm"
 
-#: ../capplets/default-applications/gnome-default-applications-properties.c:123
-msgid "Please specify a name and a command for this editor."
-msgstr "请指定此编辑器的名称和命令。"
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:5
+msgid "Encompass"
+msgstr "Encompass"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:6
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:7
+msgid "Evolution Mail Reader"
+msgstr "Evolution 邮件阅读程序"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:8
+msgid "Evolution Mail Reader 1.4"
+msgstr "Evolution 邮件阅读程序 1.4"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:9
+msgid "Evolution Mail Reader 1.5"
+msgstr "Evolution 邮件阅读程序 1.5"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:10
+msgid "Evolution Mail Reader 1.6"
+msgstr "Evolution 邮件阅读程序 1.6"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:11
+msgid "Evolution Mail Reader 2.0"
+msgstr "Evolution 邮件阅读程序 2.0"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:12
+msgid "Evolution Mail Reader 2.2"
+msgstr "Evolution 邮件阅读程序 2.2"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:13
+msgid "Evolution Mail Reader 2.4"
+msgstr "Evolution 邮件阅读程序 2.4"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:14
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:15
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:16
+msgid "GNOME Terminal"
+msgstr "GNOME 终端"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:17
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:18
+msgid "KMail"
+msgstr "KMail"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:19
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:20
+msgid "Links Text Browser"
+msgstr "Links 文字浏览器"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:21
+msgid "Lynx Text Browser"
+msgstr "Lynx 文字浏览器"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:22
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:23
+msgid "Mozilla 1.6"
+msgstr "Mozilla 1.6"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:24
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:25
+msgid "Mozilla Thunderbird"
+msgstr "Mozilla Thunderbird"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:26
+msgid "Mutt"
+msgstr "Mutt"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:27
+msgid "NXterm"
+msgstr "NXterm"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:28
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:29
+msgid "Opera"
+msgstr "Opera"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:30
+msgid "RXVT"
+msgstr "RXVT"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:31
+msgid "Standard XTerminal"
+msgstr "标准 X 终端"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:32
+msgid "Sylpheed-Claws"
+msgstr "Sylpheed-Claws"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:33
+msgid "Thunderbird"
+msgstr "Thunderbird"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:34
+msgid "W3M Text Browser"
+msgstr "W3M 文字浏览器"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:35
+msgid "aterm"
+msgstr "aterm"
+
+#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:1
+msgid "<b>Audio Player</b>"
+msgstr "<b>音频播放器</b>"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:2
-msgid "Add..."
-msgstr "添加..."
+msgid "<b>Image Viewer</b>"
+msgstr "<b>图像查看器</b>"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom"
-msgstr "自定义(_U)"
+msgid "<b>Instant Messenger</b>"
+msgstr "<b>即时通讯工具</b>"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom:"
-msgstr "自定义(_U)："
+msgid "<b>Mail Reader</b>"
+msgstr "<b>邮件阅读器</b>"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "Can open _URIs"
-msgstr "可打开 _URI"
+msgid "<b>Terminal Emulator</b>"
+msgstr "<b>终端模拟器</b>"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "Can open multiple _files"
-msgstr "可打开多个文件(_F)"
+msgid "<b>Text Editor</b>"
+msgstr "<b>文本编辑器</b>"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:7
+msgid "<b>Video Player</b>"
+msgstr "<b>视频播放器</b>"
+
+#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:8
+msgid "<b>Web Browser</b>"
+msgstr "<b>Web 浏览器</b>"
+
+#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:10
+#, no-c-format
+msgid "All %s occurrences will be replaced with actual link"
+msgstr "出现的全部 %s 都将被替换为实际链接"
+
+#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:11
 msgid "Co_mmand:"
 msgstr "命令(_M)："
 
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:8
-msgid "Custom Editor Properties"
-msgstr "自定义编辑器属性"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:9
-msgid "Default Mail Reader"
-msgstr "默认邮件阅读器"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:10
-msgid "Default Terminal"
-msgstr "默认终端"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:11
-msgid "Default Text Editor"
-msgstr "默认文本编辑器"
-
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:12
-msgid "Default Web Browser"
-msgstr "默认 Web 浏览器"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:13
-msgid "Default Window Manager"
-msgstr "默认窗口管理器"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:14
-msgid "Delete"
-msgstr "删除"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:15
-msgid "E_xec Flag:"
+msgid "E_xecute flag:"
 msgstr "执行标志(_X)："
 
+#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:13
+msgid "Internet"
+msgstr "Internet"
+
+#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:14
+msgid "Multimedia"
+msgstr "多媒体"
+
+#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:15
+msgid "Open link in new _tab"
+msgstr "在新标签中打开链接(_T)"
+
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:16
-msgid "Edit..."
-msgstr "编辑..."
+msgid "Open link in new _window"
+msgstr "在新窗口中打开链接(_W)"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:17
-msgid "Mail Reader"
-msgstr "邮件阅读器"
+msgid "Open link with web browser _default"
+msgstr "使用 Web 浏览器默认值打开链接(_D)"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:19
-msgid "Run in a _terminal"
-msgstr "在终端中运行(_T)"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Run in a t_erminal"
+msgid "Run in t_erminal"
 msgstr "在终端中运行(_E)"
 
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:21
-msgid ""
-"Select the window manager you want.  You will need to hit apply, wave the "
-"magic wand, and do a magic dance for it to work."
-msgstr ""
-"选择您想要的窗口管理器。您需要点击“应用”，挥舞魔法杖，跳起巫术舞才能让它工"
-"作。"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:22
-msgid "Terminal"
-msgstr "终端"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "Text Editor"
-msgstr "文本编辑器"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "Understands _Netscape Remote Control"
-msgstr "识别 _Netscape 远程控制"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "Use this _editor to open text files in the file manager"
-msgstr "使用此编辑器在文件管理器中打开文本文件(_E)"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:26
-msgid "Web Browser"
-msgstr "Web 浏览器"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:27
-msgid "Window Manager"
-msgstr "窗口管理器"
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:28
-msgid "_Command:"
-msgstr "命令(_C)："
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:29
-msgid "_Name:"
-msgstr "名称(_N)："
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:30
-msgid "_Properties..."
-msgstr "属性(_P)..."
-
-#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:31
-msgid "_Select:"
-msgstr "选择(_S)："
+#: ../capplets/default-applications/gnome-default-applications-properties.glade.h:20
+msgid "System"
+msgstr "系统"
 
 #: ../capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
@@ -1458,29 +1465,29 @@ msgid "The type of accelerator."
 msgstr "加速键类型。"
 
 #: ../capplets/keybindings/eggcellrendererkeys.c:242
-#: ../capplets/keybindings/gnome-keybinding-properties.c:197
-#: ../libbackground/applier.c:624 ../typing-break/drwright.c:477
+#: ../capplets/keybindings/gnome-keybinding-properties.c:191
+#: ../libbackground/applier.c:624 ../typing-break/drwright.c:471
 msgid "Disabled"
 msgstr "禁用"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:544
+#: ../capplets/keybindings/gnome-keybinding-properties.c:538
 msgid "<Unknown Action>"
 msgstr "<未知操作>"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:565
+#: ../capplets/keybindings/gnome-keybinding-properties.c:559
 msgid "Desktop"
 msgstr "桌面"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:566
+#: ../capplets/keybindings/gnome-keybinding-properties.c:560
 #: ../capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "音效"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:570
+#: ../capplets/keybindings/gnome-keybinding-properties.c:564
 msgid "Window Management"
 msgstr "窗口管理器"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:667
+#: ../capplets/keybindings/gnome-keybinding-properties.c:661
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1489,21 +1496,21 @@ msgstr ""
 "快捷键“%s”已经用于：\n"
 "“%s”\n"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:699
+#: ../capplets/keybindings/gnome-keybinding-properties.c:693
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "在配置数据库中设置新加速键时出错：%s\n"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:749
+#: ../capplets/keybindings/gnome-keybinding-properties.c:743
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "在配置数据库中取消设置新加速键时出错：%s\n"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:856
+#: ../capplets/keybindings/gnome-keybinding-properties.c:850
 msgid "Action"
 msgstr "动作"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:880
+#: ../capplets/keybindings/gnome-keybinding-properties.c:874
 msgid "Shortcut"
 msgstr "快捷键"
 
@@ -1543,24 +1550,24 @@ msgstr "默认"
 msgid "Models"
 msgstr "型号"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:106
+#: ../capplets/keyboard/gnome-keyboard-properties.c:109
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
 msgstr "调用键盘 capplet 出错：%s"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:199
+#: ../capplets/keyboard/gnome-keyboard-properties.c:202
 msgid "_Accessibility"
 msgstr "辅助功能(_A)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:218
-#: ../capplets/keyboard/gnome-keyboard-properties.c:220
+#: ../capplets/keyboard/gnome-keyboard-properties.c:221
+#: ../capplets/keyboard/gnome-keyboard-properties.c:223
 #: ../capplets/sound/sound-properties-capplet.c:240
 #: ../capplets/sound/sound-properties-capplet.c:242
 msgid ""
 "Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr "应用设置并退出(仅为兼容，现在已由守护进程处理)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:224
+#: ../capplets/keyboard/gnome-keyboard-properties.c:227
 msgid "Start the page with the typing break settings showing"
 msgstr "以显示的打字间隔设置启动页面"
 
@@ -1609,11 +1616,11 @@ msgid "Check if breaks are allowed to be postponed"
 msgstr "检查是否允许推迟间断"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:14
-msgid "Choose A Keyboard Model"
+msgid "Choose a Keyboard Model"
 msgstr "选择键盘型号"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:15
-msgid "Choose A Layout"
+msgid "Choose a Layout"
 msgstr "选择布局"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:16
@@ -1975,13 +1982,13 @@ msgid "Enable sound and associate sounds with events"
 msgstr "启用窗口管理器的事件音效"
 
 #: ../capplets/sound/sound-properties-capplet.c:271
-#: ../capplets/sound/sound-properties.glade.h:6
+#: ../capplets/sound/sound-properties.glade.h:4
 msgid "Sound Preferences"
 msgstr "声音首选项"
 
 #: ../capplets/sound/sound-properties.glade.h:1
-msgid "E_nable sound server startup"
-msgstr "启用音效服务器(_N)"
+msgid "E_nable software sound mixing (ESD)"
+msgstr "允许软件混音(ESD)(_N)"
 
 #: ../capplets/sound/sound-properties.glade.h:2
 msgid "Flash _entire screen"
@@ -1991,29 +1998,25 @@ msgstr "闪烁整个屏幕(_E)"
 msgid "Flash _window titlebar"
 msgstr "闪烁窗口标题栏(_W)"
 
-#: ../capplets/sound/sound-properties.glade.h:4
-msgid "General"
-msgstr "常规"
-
 #: ../capplets/sound/sound-properties.glade.h:5
-msgid "Sound Events"
-msgstr "事件音效"
+msgid "Sounds"
+msgstr "音效"
 
-#: ../capplets/sound/sound-properties.glade.h:7
-msgid "System Bell"
+#: ../capplets/sound/sound-properties.glade.h:6
+msgid "System Beep"
 msgstr "系统响铃"
 
+#: ../capplets/sound/sound-properties.glade.h:7
+msgid "_Enable system beep"
+msgstr "启用系统响铃(_E)"
+
 #: ../capplets/sound/sound-properties.glade.h:8
-msgid "_Sound an audible bell"
-msgstr "有声响铃(_S)"
+msgid "_Play system sounds"
+msgstr "播放系统声音(_P)"
 
 #: ../capplets/sound/sound-properties.glade.h:9
-msgid "_Sounds for events"
-msgstr "事件产生音效(_S)"
-
-#: ../capplets/sound/sound-properties.glade.h:10
-msgid "_Visual feedback:"
-msgstr "视觉反馈(_V)："
+msgid "_Visual system beep"
+msgstr "系统视觉响铃(_V)"
 
 #: ../capplets/theme-switcher/gnome-theme-details.c:368
 msgid "Would you like to remove this theme?"
@@ -2142,15 +2145,15 @@ msgstr ""
 "无法安装主题。\n"
 "您的系统中未安装 tar 程序。"
 
-#: ../capplets/theme-switcher/gnome-theme-manager.c:680
+#: ../capplets/theme-switcher/gnome-theme-manager.c:686
 msgid "Custom theme"
 msgstr "自定义主题"
 
-#: ../capplets/theme-switcher/gnome-theme-manager.c:680
+#: ../capplets/theme-switcher/gnome-theme-manager.c:686
 msgid "You can save this theme by pressing the Save Theme button."
 msgstr "按保存主题按钮可以保存此主题。"
 
-#: ../capplets/theme-switcher/gnome-theme-manager.c:1479
+#: ../capplets/theme-switcher/gnome-theme-manager.c:1584
 msgid ""
 "The default theme schemas could not be found on your system.  This means "
 "that you probably don't have metacity installed, or that your gconf is "
@@ -2264,11 +2267,6 @@ msgstr "窗口边框"
 msgid "_Install Theme..."
 msgstr "安装主题(_I)..."
 
-#: ../capplets/theme-switcher/theme-properties.glade.h:19
-#: ../libsounds/sound-view.c:366
-msgid "_Remove"
-msgstr "删除(_R)"
-
 #: ../capplets/theme-switcher/theme-properties.glade.h:20
 msgid "_Revert"
 msgstr "复原(_R)"
@@ -2401,24 +2399,24 @@ msgstr ""
 "%s"
 
 #: ../capplets/windows/gnome-window-properties.c:642
-msgid "Control"
-msgstr "Ctrl"
+msgid "C_ontrol"
+msgstr "C_trl"
 
 #: ../capplets/windows/gnome-window-properties.c:647
-msgid "Alt"
-msgstr "Alt"
+msgid "_Alt"
+msgstr "_Alt"
 
 #: ../capplets/windows/gnome-window-properties.c:653
-msgid "Hyper"
-msgstr "Hyper"
+msgid "H_yper"
+msgstr "H_yper"
 
 #: ../capplets/windows/gnome-window-properties.c:660
-msgid "Super (or \"Windows logo\")"
-msgstr "Super (或“Windows 标志”)"
+msgid "S_uper (or \"Windows logo\")"
+msgstr "S_uper (或“Windows 标志”)"
 
 #: ../capplets/windows/gnome-window-properties.c:667
-msgid "Meta"
-msgstr "Meta"
+msgid "_Meta"
+msgstr "_Meta"
 
 #: ../capplets/windows/gnome-window-properties.glade.h:1
 msgid "<b>Movement Key</b>"
@@ -2433,8 +2431,8 @@ msgid "<b>Window Selection</b>"
 msgstr "<b>窗口选择</b>"
 
 #: ../capplets/windows/gnome-window-properties.glade.h:4
-msgid "To _move a window, press-and-hold this key then grab the window:"
-msgstr "要移动窗口，按住此键然后拖曳窗口(_M)："
+msgid "To move a window, press-and-hold this key then grab the window:"
+msgstr "要移动窗口，按住此键然后拖曳窗口："
 
 #: ../capplets/windows/gnome-window-properties.glade.h:5
 msgid "Window Preferences"
@@ -2468,7 +2466,7 @@ msgstr "窗口"
 msgid "Others"
 msgstr "其它"
 
-#: ../control-center/control-center.c:42
+#: ../control-center/control-center.c:93
 msgid "Desktop Preferences"
 msgstr "桌面首选项"
 
@@ -2481,6 +2479,18 @@ msgstr "GNOME 控制中心"
 msgid "The GNOME configuration tool"
 msgstr "GNOME 配置工具"
 
+#: ../gnome-settings-daemon/actions/acme-fb-level.c:149
+msgid "No '/dev/pmu' device found"
+msgstr "未找到“/dev/pmu”设备"
+
+#: ../gnome-settings-daemon/actions/acme-fb-level.c:156
+msgid "Not a powerbook"
+msgstr "不是 Powerbook"
+
+#: ../gnome-settings-daemon/actions/acme-fb-level.c:173
+msgid "Wrong permission for '/dev/pmu' device"
+msgstr "“/dev/pmu”设备的权限出错"
+
 #: ../gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "音量"
@@ -2538,7 +2548,8 @@ msgstr "您想要激活粘滞键吗？"
 msgid "Do you want to deactivate Sticky Keys?"
 msgstr "您想要禁用粘滞键吗？"
 
-#: ../gnome-settings-daemon/gnome-settings-font.c:107
+#: ../gnome-settings-daemon/gnome-settings-font.c:74
+#: ../gnome-settings-daemon/gnome-settings-font.c:96
 #, c-format
 msgid ""
 "Cannot create the directory \"%s\".\n"
@@ -2663,12 +2674,7 @@ msgstr ""
 "无法将机器转入休眠。\n"
 "请检查机器是否已正确配置。"
 
-#: ../gnome-settings-daemon/gnome-settings-multimedia-keys.c:155
-#, c-format
-msgid "Permissions on the file %s are broken\n"
-msgstr "文件 %s 的权限有误\n"
-
-#: ../gnome-settings-daemon/gnome-settings-multimedia-keys.c:200
+#: ../gnome-settings-daemon/gnome-settings-multimedia-keys.c:180
 msgid ""
 "Couldn't load the Glade file.\n"
 "Make sure that this daemon is properly installed."
@@ -2695,7 +2701,7 @@ msgstr ""
 msgid "_Do not show this message again"
 msgstr "不再显示此信息(_D)"
 
-#: ../gnome-settings-daemon/gnome-settings-sound.c:129
+#: ../gnome-settings-daemon/gnome-settings-sound.c:150
 #, c-format
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "无法载入声音文件 %s 作为示例 %s"
@@ -2705,7 +2711,7 @@ msgstr "无法载入声音文件 %s 作为示例 %s"
 msgid "Cannot determine user's home directory"
 msgstr "无法确定用户的主目录"
 
-#: ../gnome-settings-daemon/gnome-settings-xsettings.c:210
+#: ../gnome-settings-daemon/gnome-settings-xsettings.c:212
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "GConf 键 %s 被设为 %s 类型，但是期望的类型是 %s\n"
@@ -2778,48 +2784,31 @@ msgstr "BGApplier 绘图的屏幕"
 msgid "There was an error loading an image: %s"
 msgstr "装入图像时出错：%s"
 
-#: ../libsounds/sound-view.c:122 ../libsounds/sound-view.c:147
+#: ../libsounds/sound-view.c:115
+msgid "Sound not set for this event."
+msgstr "此事件未设定音效。"
+
+#: ../libsounds/sound-view.c:124
+msgid ""
+"The sound file for this event does not exist.\n"
+"You may want to install the gnome-audio package for a set of default sounds."
+msgstr ""
+"此事件的声音文件不存在。\n"
+"您需要安装 gnome-audio 软件包"
+"以获得一组默认声音。"
+
+#: ../libsounds/sound-view.c:135
 msgid "The sound file for this event does not exist."
 msgstr "此事件的声音文件不存在。"
 
-#: ../libsounds/sound-view.c:149
-msgid ""
-"The sound file for this event does not exist.\n"
-"You may want to install the gnome-audio package\n"
-"for a set of default sounds."
-msgstr ""
-"此事件的声音文件不存在。\n"
-"您需要安装 gnome-audio 软件包\n"
-"以获得系统的默认声音。"
-
-#: ../libsounds/sound-view.c:224
-#, c-format
-msgid "The file %s is not a valid wav file"
-msgstr "文件 %s 不是有效的 wav 文件"
-
-#: ../libsounds/sound-view.c:289
-msgid "Event"
-msgstr "事件"
-
-#: ../libsounds/sound-view.c:298
-msgid "Sound File"
-msgstr "声音文件"
-
-#: ../libsounds/sound-view.c:314
-msgid "_Sounds:"
-msgstr "音效(_S)："
-
-#: ../libsounds/sound-view.c:328
-msgid "Sound _file:"
-msgstr "声音文件(_F)："
-
-#: ../libsounds/sound-view.c:332
+#: ../libsounds/sound-view.c:164
 msgid "Select Sound File"
 msgstr "选择声音文件"
 
-#: ../libsounds/sound-view.c:356
-msgid "_Play"
-msgstr "播放(_P)"
+#: ../libsounds/sound-view.c:182
+#, c-format
+msgid "The file %s is not a valid wav file"
+msgstr "文件 %s 不是有效的 wav 文件"
 
 #: ../libwindow-settings/gnome-wm-manager.c:320
 #, c-format
@@ -2916,90 +2905,50 @@ msgid "Log out's shortcut."
 msgstr "注销的快捷键。"
 
 #: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:19
-msgid "Next track key's shortcut."
-msgstr "下一轨的快捷键。"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:20
-msgid "Pause"
-msgstr "暂停"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:21
-msgid "Pause key's shortcut."
-msgstr "暂停键的快捷键。"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:22
-msgid "Play (or play/pause)"
-msgstr "播放(或播放/暂停)"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:23
-msgid "Play (or play/pause) key's shortcut."
-msgstr "播放(或播放/暂停)键的快捷键。"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:24
-msgid "Previous track key's shortcut."
-msgstr "上一轨的快捷键。"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:25
 msgid "Search"
 msgstr "搜索"
 
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:26
+#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:20
 msgid "Search's shortcut."
 msgstr "搜索的快捷键。"
 
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:27
-msgid "Skip to next track"
-msgstr "跳到下一轨"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:28
-msgid "Skip to previous track"
-msgstr "跳到上一轨"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:29
+#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:21
 msgid "Sleep"
 msgstr "休眠"
 
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:30
+#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:22
 msgid "Sleep's shortcut."
 msgstr "休眠的快捷键。"
 
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:31
-msgid "Stop playback key"
-msgstr "停止回放"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:32
-msgid "Stop playback key's shortcut."
-msgstr "停止回放的快捷键。"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:33
+#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:23
 msgid "Volume down"
 msgstr "音量降低"
 
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:34
+#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:24
 msgid "Volume down's shortcut."
 msgstr "音量降低的快捷键。"
 
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:35
+#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:25
 msgid "Volume mute"
 msgstr "静音"
 
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:36
+#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:26
 msgid "Volume mute's shortcut"
 msgstr "静音的快捷键"
 
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:37
+#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:27
 msgid "Volume step"
 msgstr "音量步进"
 
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:38
+#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:28
 msgid "Volume step as percentage of volume."
 msgstr "以音量百分比步进音量。"
 
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:39
+#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:29
 msgid "Volume up"
 msgstr "音量升高"
 
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:40
+#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:30
 msgid "Volume up's shortcut."
 msgstr "音量升高的快捷键。"
 
@@ -3098,61 +3047,61 @@ msgstr "键盘型号"
 msgid "modmap file list"
 msgstr "modmap 文件列表"
 
-#: ../typing-break/drw-break-window.c:212
+#: ../typing-break/drw-break-window.c:213
 msgid "_Postpone break"
 msgstr "推迟间隔(_P)"
 
-#: ../typing-break/drw-break-window.c:259
+#: ../typing-break/drw-break-window.c:260
 msgid "Take a break!"
 msgstr "歇一会儿！"
 
 #. { N_("/_Enabled"),      NULL, GIF_CB (popup_enabled_cb),     POPUP_ITEM_ENABLED, "<ToggleItem>", NULL },
-#: ../typing-break/drwright.c:141
+#: ../typing-break/drwright.c:135
 msgid "/_Preferences"
 msgstr "/首选项(_P)"
 
-#: ../typing-break/drwright.c:142
+#: ../typing-break/drwright.c:136
 msgid "/_About"
 msgstr "/关于(_A)"
 
-#: ../typing-break/drwright.c:144
+#: ../typing-break/drwright.c:138
 msgid "/_Take a Break"
 msgstr "/歇一会儿(_T)"
 
-#: ../typing-break/drwright.c:495
+#: ../typing-break/drwright.c:489
 #, c-format
 msgid "%d minute until the next break"
 msgid_plural "%d minutes until the next break"
 msgstr[0] "距下次间隔还有 %d 分钟"
 
-#: ../typing-break/drwright.c:499
+#: ../typing-break/drwright.c:493
 msgid "Less than one minute until the next break"
 msgstr "距下次间隔还有不到一分钟。"
 
-#: ../typing-break/drwright.c:587
+#: ../typing-break/drwright.c:581
 #, c-format
 msgid ""
 "Unable to bring up the typing break properties dialog with the following "
 "error: %s"
 msgstr "无法启动打字间隔属性对话框，错误如下：%s"
 
-#: ../typing-break/drwright.c:635
+#: ../typing-break/drwright.c:629
 msgid "About GNOME Typing Monitor"
 msgstr "关于 GNOME 打字监视器"
 
-#: ../typing-break/drwright.c:659
+#: ../typing-break/drwright.c:653
 msgid "A computer break reminder."
 msgstr "计算机间隔提醒程序。"
 
-#: ../typing-break/drwright.c:660
+#: ../typing-break/drwright.c:654
 msgid "Written by Richard Hult &lt;richard@imendio.com&gt;"
 msgstr "由 Richard Hult &lt;richard@imendio.com&gt; 编写"
 
-#: ../typing-break/drwright.c:661
+#: ../typing-break/drwright.c:655
 msgid "Eye candy added by Anders Carlsson"
 msgstr "Anders Carlsson 添加了视觉效果"
 
-#: ../typing-break/drwright.c:837
+#: ../typing-break/drwright.c:831
 msgid "Break reminder"
 msgstr "间隔提醒程序"
 
@@ -3164,11 +3113,7 @@ msgstr "方向"
 msgid "The orientation of the tray."
 msgstr "托盘的方向。"
 
-#: ../typing-break/main.c:93
-msgid "The typing monitor is already running."
-msgstr "已经运行了打字提醒程序。"
-
-#: ../typing-break/main.c:106
+#: ../typing-break/main.c:100
 msgid ""
 "The typing monitor uses the notification area to display information. You "
 "don't seem to have a notification area on your panel. You can add it by "