[gnome-control-center] Updated zh_CN translation.

[Funda Wang <fwang src gnome org>]

commit 19ded6eb9b28383a3419e056c29e056d71748746
Author: Funda Wang <fwang kenobi mandriva com>
Date:   Sat Apr 17 18:39:38 2010 +0200

    Updated zh_CN translation.

 po/zh_CN.po |  813 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 465 insertions(+), 348 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dc6dc4e..29d18da 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,16 +8,17 @@
 # ç??é?²(Gan Lu) <rhythm gan gmail com>, 2009
 # Deng Xiyue <manphiz gmail com>, 2009
 # FujianWzh <fujianwzh gmail com>, 2009
-# Tao Wei <weitao1979 gmail com>, 2009.
+# Tao Wei <weitao1979 gmail com>, 2009, 2010.
+# Xhacker Liu <liu dongyuan gmail com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&component=general\n"
-"POT-Creation-Date: 2009-12-07 22:50+0000\n"
-"PO-Revision-Date: 2009-11-17 16:45+0800\n"
-"Last-Translator: Tao Wei <weitao1979 gmail com>\n"
-"Language-Team: i18n-zh <i18n-zh googlegroups com>\n"
+"POT-Creation-Date: 2010-04-16 15:08+0000\n"
+"PO-Revision-Date: 2010-04-15 20:50+0800\n"
+"Last-Translator: Xhacker Liu <liu dongyuan gmail com>\n"
+"Language-Team: zh_CN <zh_CN <i18n-translation lists linux net cn>>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +34,7 @@ msgstr "æ?´å¤?ç??è??æ?¯ç½?å??"
 
 #: ../gnome-control-center.schemas.in.h:3
 msgid "More themes URL"
-msgstr "æ?´å¤?主é¢?ç½?å??"
+msgstr "æ?´å¤?ç??主é¢?ç½?å??"
 
 #: ../gnome-control-center.schemas.in.h:4
 msgid ""
@@ -53,31 +54,31 @@ msgid ""
 "will not appear."
 msgstr "è?·å¾?æ?´å¤?æ¡?é?¢ä¸»é¢?ç??ç½?å??ã??å¦?æ??设å®?为空å­?符串ï¼?é?£ä¹?é?¾æ?¥å°?ä¸?ä¼?å?ºç?°ã??"
 
-#: ../capplets/about-me/eel-alert-dialog.c:114
+#: ../capplets/about-me/eel-alert-dialog.c:110
 msgid "Image/label border"
 msgstr "å?¾å??/æ ?签边æ¡?"
 
-#: ../capplets/about-me/eel-alert-dialog.c:115
+#: ../capplets/about-me/eel-alert-dialog.c:111
 msgid "Width of border around the label and image in the alert dialog"
 msgstr "æ??é??对è¯?æ¡?中ç??æ ?ç­¾å??å?¾å??å?¨å?´ç??è¾¹æ¡?宽度"
 
-#: ../capplets/about-me/eel-alert-dialog.c:124
+#: ../capplets/about-me/eel-alert-dialog.c:120
 msgid "Alert Type"
 msgstr "æ??é??ç±»å??"
 
-#: ../capplets/about-me/eel-alert-dialog.c:125
+#: ../capplets/about-me/eel-alert-dialog.c:121
 msgid "The type of alert"
 msgstr "æ??é??ç±»å??"
 
-#: ../capplets/about-me/eel-alert-dialog.c:133
+#: ../capplets/about-me/eel-alert-dialog.c:129
 msgid "Alert Buttons"
 msgstr "æ??é??æ??é?®"
 
-#: ../capplets/about-me/eel-alert-dialog.c:134
+#: ../capplets/about-me/eel-alert-dialog.c:130
 msgid "The buttons shown in the alert dialog"
 msgstr "æ??é??对è¯?æ¡?中æ?¾ç¤ºç??æ??é?®"
 
-#: ../capplets/about-me/eel-alert-dialog.c:198
+#: ../capplets/about-me/eel-alert-dialog.c:194
 msgid "Show more _details"
 msgstr "æ?¾ç¤ºæ?´å¤?ç»?è??(_D)"
 
@@ -215,12 +216,12 @@ msgid "No Image"
 msgstr "æ? å?¾å??"
 
 #: ../capplets/about-me/gnome-about-me.c:746
-#: ../capplets/appearance/appearance-desktop.c:654
+#: ../capplets/appearance/appearance-desktop.c:658
 msgid "Images"
 msgstr "å?¾å??"
 
 #: ../capplets/about-me/gnome-about-me.c:750
-#: ../capplets/appearance/theme-installer.c:763
+#: ../capplets/appearance/theme-installer.c:766
 msgid "All Files"
 msgstr "å?¨é?¨æ??件"
 
@@ -310,151 +311,154 @@ msgstr "å?¯ç?¨æ??纹ç?»å½?(_F)..."
 msgid "Full Name"
 msgstr "å?¨å??"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:18
+#. Home vs Work (phone)
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:19
 msgid "Hom_e:"
 msgstr "家庭(_E)�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:19
+#. Home vs Work (address)
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:21
 #: ../libslab/bookmark-agent.c:1135
 msgid "Home"
 msgstr "家庭"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:20
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:22
 msgid "IC_Q:"
 msgstr "IC_Qï¼?"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:21
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:23
 msgid "Instant Messaging"
 msgstr "å?³æ?¶é??讯"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:22
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:24
 msgid "Job"
 msgstr "工�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:23
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:25
 msgid "M_SN:"
 msgstr "M_SNï¼?"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:24
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:26
 msgid "P.O. _box:"
 msgstr "��信箱(_B)�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:25
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:27
 msgid "P._O. box:"
 msgstr "��信箱(_O)�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:26
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:28
 msgid "Personal Info"
 msgstr "个人信�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:27
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:29
 msgid "Select your photo"
 msgstr "é??æ?©æ?¨ç??ç?§ç??"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:28
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:30
 msgid "State/Pro_vince:"
 msgstr "å·?/ç??(_V)ï¼?"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:29
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:31
 msgid "Telephone"
 msgstr "��"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:30
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:32
 msgid "User name:"
 msgstr "ç?¨æ?·å??ï¼?"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:31
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:33
 msgid "Web"
 msgstr "ç½?ç»?"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:32
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:34
 msgid "Web _log:"
 msgstr "Web ��(_L)�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:33
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:35
 msgid "Wor_k:"
 msgstr "工�(_K)�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:34
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:36
 msgid "Work"
 msgstr "工�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:35
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:37
 msgid "Work _fax:"
 msgstr "å·¥ä½?ä¼ ç??(_F)ï¼?"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:36
-msgid "Zip/_Postal code:"
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:38
+msgid "ZIP/_Postal code:"
 msgstr "é?®æ?¿ç¼?ç ?(_P)ï¼?"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:37
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:39
 msgid "_Address:"
 msgstr "å?°å??(_A)ï¼?"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:38
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:40
 msgid "_Department:"
 msgstr "��(_D)�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:39
-msgid "_Groupwise:"
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:41
+msgid "_GroupWise:"
 msgstr "_Groupwiseï¼?"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:40
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:42
 msgid "_Home page:"
 msgstr "主页(_H)�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:41
+#. Home vs Work (email)
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:44
 msgid "_Home:"
 msgstr "家庭(_H)�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:42
-msgid "_Jabber:"
-msgstr "_Jabberï¼?"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:43
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:45
 msgid "_Manager:"
 msgstr "ç»?ç??(_M)ï¼?"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:44
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:46
 msgid "_Mobile:"
 msgstr "移���(_M)�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:45
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:47
 msgid "_Profession:"
 msgstr "��(_P)�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:46
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:48
 msgid "_State/Province:"
 msgstr "å·?/ç??(_S)ï¼?"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:47
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:49
 msgid "_Title:"
 msgstr "称�(_T)�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:48
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:50
 msgid "_Work:"
 msgstr "工�(_W)�"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:49
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:51
+msgid "_XMPP:"
+msgstr "_XMPPï¼?"
+
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:52
 msgid "_Yahoo:"
 msgstr "_Yahooï¼?"
 
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:50
-msgid "_Zip/Postal code:"
+#: ../capplets/about-me/gnome-about-me-dialog.ui.h:53
+msgid "_ZIP/Postal code:"
 msgstr "é?®æ?¿ç¼?ç ?(_Z)ï¼?"
 
 #: ../capplets/about-me/gnome-about-me.desktop.in.in.h:2
 msgid "Set your personal information"
-msgstr "设å®?æ?¨ç??个人信æ?¯"
+msgstr "设置æ?¨ç??个人信æ?¯"
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:97
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
-msgstr "ä½ æ?ªè¢«å??许访é?®è¯¥è®¾å¤?ã??请è??ç³»ä½ ç??ç³»ç»?管ç??å??ã??"
+msgstr "æ?¨æ?ªè¢«å??许访é?®è¯¥è®¾å¤?ã??请è??ç³»æ?¨ç??ç³»ç»?管ç??å??ã??"
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:99
 msgid "The device is already in use."
-msgstr "设�使�中"
+msgstr "设å¤?使ç?¨ä¸­ã??"
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:101
 msgid "An internal error occured"
@@ -474,7 +478,7 @@ msgid ""
 "disabled?"
 msgstr "ä½ æ?³å? é?¤å·²ç?»è®°ç??æ??纹å??ï¼?è¿?æ ·å??å°?ç¦?ç?¨æ??纹ç?»å½?ã??"
 
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:342
+#: ../capplets/about-me/gnome-about-me-fingerprint.c:356
 #: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:1
 msgid "Done!"
 msgstr "æ??å®?ï¼?"
@@ -482,29 +486,29 @@ msgstr "æ??å®?ï¼?"
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:388
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:410
+#: ../capplets/about-me/gnome-about-me-fingerprint.c:402
+#: ../capplets/about-me/gnome-about-me-fingerprint.c:424
 #, c-format
 msgid "Could not access '%s' device"
-msgstr "æ? æ³?访é?® '%s' 设å¤?"
+msgstr "æ? æ³?访é?®â??%sâ??设å¤?"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:459
+#: ../capplets/about-me/gnome-about-me-fingerprint.c:473
 #, c-format
 msgid "Could not start finger capture on '%s' device"
-msgstr "æ? æ³?å?¨ '%s' 设å¤?ä¸?å?¯å?¨æ??æ??æ??æ??"
+msgstr "æ? æ³?å?¨â??%sâ??设å¤?ä¸?å?¯å?¨æ??æ??æ??æ??"
 
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:506
+#: ../capplets/about-me/gnome-about-me-fingerprint.c:520
 msgid "Could not access any fingerprint readers"
 msgstr "æ? æ³?访é?®æ??纹读å??å?¨"
 
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:507
+#: ../capplets/about-me/gnome-about-me-fingerprint.c:521
 msgid "Please contact your system administrator for help."
 msgstr "请è??系系ç»?管ç??å??以寻æ±?帮å?©ã??"
 
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:537
+#: ../capplets/about-me/gnome-about-me-fingerprint.c:551
 #: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:2
 msgid "Enable Fingerprint Login"
 msgstr "å?¯ç?¨æ??纹ç?»å½?"
@@ -513,18 +517,18 @@ msgstr "å?¯ç?¨æ??纹ç?»å½?"
 #. * The variable is the name of the device, for example:
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:567
+#: ../capplets/about-me/gnome-about-me-fingerprint.c:581
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the '%s' device."
-msgstr "è¦?å?¯ç?¨æ??纹ç?»å½?ï¼?ä½ é??è¦?使ç?¨ '%s' 设å¤?æ?¥ä¿?å­?ä½ æ??纹ä¹?ä¸?ã??"
+msgstr "è¦?å?¯ç?¨æ??纹ç?»å½?ï¼?ä½ é??è¦?使ç?¨â??%sâ??设å¤?æ?¥ä¿?å­?æ?¨ç??ä¸?个æ??纹ã??"
 
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:576
+#: ../capplets/about-me/gnome-about-me-fingerprint.c:590
 msgid "Swipe finger on reader"
 msgstr "å?¨è¯»å??å?¨ä¸?å?·ä¸?ä¸?æ??æ??"
 
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:578
+#: ../capplets/about-me/gnome-about-me-fingerprint.c:592
 msgid "Place finger on reader"
 msgstr "å°?æ??æ??æ?¾å?¨è¯»å??å?¨ä¸?"
 
@@ -580,7 +584,7 @@ msgstr "é??æ?©æ??æ??"
 msgid ""
 "Your fingerprint was successfully saved. You should now be able to log in "
 "using your fingerprint reader."
-msgstr "ä½ æ??纹已æ??å??ä¿?å­?ã??ä½ ç?°å?¨åº?该å?¯ä»¥ä½¿ç?¨æ??纹读å??å?¨ç?»å½?äº?ã??"
+msgstr "æ?¨ç??æ??纹已æ??å??ä¿?å­?ã??æ?¨ç?°å?¨åº?该å?¯ä»¥ä½¿ç?¨æ??纹读å??å?¨ç?»å½?äº?ã??"
 
 #: ../capplets/about-me/gnome-about-me-password.c:161
 msgid "Child exited unexpectedly"
@@ -607,81 +611,81 @@ msgstr "å·²é??è¿?身份éª?è¯?ï¼?"
 #. Update status message and auth state
 #. Authentication failure
 #: ../capplets/about-me/gnome-about-me-password.c:474
-#: ../capplets/about-me/gnome-about-me-password.c:550
+#: ../capplets/about-me/gnome-about-me-password.c:554
 msgid ""
 "Your password has been changed since you initially authenticated! Please re-"
 "authenticate."
-msgstr "æ?¨ç??å¯?è?ªæ?¨å??å§?ç?»å½?以æ?¥å·²ç»?å??ç??äº?æ?´æ?¹ã??请é??æ?°è¿?è¡?身份éª?è¯?ã??"
+msgstr "æ?¨ç??å¯?ç ?å?¨æ?¨é¦?次ç?»å½?å??å·²ç»?æ?´æ?¹ã??请é??æ?°è¿?è¡?身份éª?è¯?ã??"
 
 #: ../capplets/about-me/gnome-about-me-password.c:476
 msgid "That password was incorrect."
-msgstr "å¯?ç ?ä¸?对ã??"
+msgstr "å¯?ç ?é??误ã??"
 
-#: ../capplets/about-me/gnome-about-me-password.c:523
+#: ../capplets/about-me/gnome-about-me-password.c:525
 msgid "Your password has been changed."
 msgstr "æ?¨ç??å¯?ç ?å·²æ?´æ?¹ã??"
 
 #. What does this indicate?
 #. * "Authentication information cannot be recovered?" from libpam?
-#: ../capplets/about-me/gnome-about-me-password.c:533
+#: ../capplets/about-me/gnome-about-me-password.c:535
 #, c-format
 msgid "System error: %s."
 msgstr "ç³»ç»?é??误ï¼?%sã??"
 
-#: ../capplets/about-me/gnome-about-me-password.c:536
+#: ../capplets/about-me/gnome-about-me-password.c:538
 msgid "The password is too short."
 msgstr "å¯?ç ?太ç?­ã??"
 
-#: ../capplets/about-me/gnome-about-me-password.c:539
+#: ../capplets/about-me/gnome-about-me-password.c:542
 msgid "The password is too simple."
 msgstr "å¯?ç ?太ç®?å??ã??"
 
-#: ../capplets/about-me/gnome-about-me-password.c:542
+#: ../capplets/about-me/gnome-about-me-password.c:546
 msgid "The old and new passwords are too similar."
 msgstr "æ?§å¯?ç ?å??æ?°å¯?ç ?太ç?¸ä¼¼ã??"
 
-#: ../capplets/about-me/gnome-about-me-password.c:544
+#: ../capplets/about-me/gnome-about-me-password.c:548
 msgid "The new password must contain numeric or special character(s)."
 msgstr "å¿?é¡»å??å?«æ?°å­?æ??ç?¹æ®?å­?符ã??"
 
-#: ../capplets/about-me/gnome-about-me-password.c:547
+#: ../capplets/about-me/gnome-about-me-password.c:551
 msgid "The old and new passwords are the same."
 msgstr "æ?§å¯?ç ?å??æ?°å¯?ç ?ç?¸å??ã??"
 
 #. translators: Unable to launch <program>: <error message>
-#: ../capplets/about-me/gnome-about-me-password.c:818
+#: ../capplets/about-me/gnome-about-me-password.c:822
 #, c-format
 msgid "Unable to launch %s: %s"
 msgstr "æ? æ³?å?¯å?¨ %sï¼?%s"
 
-#: ../capplets/about-me/gnome-about-me-password.c:822
+#: ../capplets/about-me/gnome-about-me-password.c:826
 msgid "Unable to launch backend"
 msgstr "æ? æ³?è°?ç?¨å??端"
 
-#: ../capplets/about-me/gnome-about-me-password.c:823
+#: ../capplets/about-me/gnome-about-me-password.c:827
 msgid "A system error has occurred"
 msgstr "å??ç??äº?ç³»ç»?é??误"
 
 #. Update status message
-#: ../capplets/about-me/gnome-about-me-password.c:843
+#: ../capplets/about-me/gnome-about-me-password.c:847
 msgid "Checking password..."
 msgstr "æ­£å?¨æ£?æ?¥å¯?ç ?..."
 
-#: ../capplets/about-me/gnome-about-me-password.c:930
+#: ../capplets/about-me/gnome-about-me-password.c:934
 msgid "Click <b>Change password</b> to change your password."
 msgstr "å??å?»<b>æ?´æ?¹å¯?ç ?</b>å?¯æ?´æ?¹å¯?ç ?ã??"
 
-#: ../capplets/about-me/gnome-about-me-password.c:933
+#: ../capplets/about-me/gnome-about-me-password.c:937
 msgid "Please type your password in the <b>New password</b> field."
 msgstr "请å?¨<b>æ?°å¯?ç ?</b>æ¡?中è¾?å?¥æ?¨ç??æ?°å¯?ç ?ã??"
 
-#: ../capplets/about-me/gnome-about-me-password.c:936
+#: ../capplets/about-me/gnome-about-me-password.c:940
 #: ../capplets/about-me/gnome-about-me-password.ui.h:5
 msgid ""
 "Please type your password again in the <b>Retype new password</b> field."
 msgstr "请å?¨<b>é??æ?°è¾?å?¥æ?°å¯?ç ?</b>æ¡?中å??è¾?å?¥ä¸?次å¯?ç ?ã??"
 
-#: ../capplets/about-me/gnome-about-me-password.c:939
+#: ../capplets/about-me/gnome-about-me-password.c:943
 msgid "The two passwords are not equal."
 msgstr "è¾?å?¥ç??两个å¯?ç ?ä¸?å??ã??"
 
@@ -695,7 +699,7 @@ msgstr "æ?´æ?¹å¯?ç ?"
 
 #: ../capplets/about-me/gnome-about-me-password.ui.h:3
 msgid "Change your password"
-msgstr "æ?´æ?¹å¯?ç ?"
+msgstr "æ?´æ?¹æ?¨ç??å¯?ç ?"
 
 #: ../capplets/about-me/gnome-about-me-password.ui.h:4
 msgid "Current _password:"
@@ -787,11 +791,11 @@ msgstr "é¦?é??åº?ç?¨ç¨?åº?(_P)"
 msgid "Choose which accessibility features to enable when you log in"
 msgstr "é??æ?©æ?¨ç?»å½?æ?¶æ?³è¦?å?¯ç?¨ç??è¾?å?©ç?¹æ?§"
 
-#: ../capplets/appearance/appearance-desktop.c:623
+#: ../capplets/appearance/appearance-desktop.c:627
 msgid "Add Wallpaper"
 msgstr "æ·»å? å£?纸"
 
-#: ../capplets/appearance/appearance-desktop.c:658
+#: ../capplets/appearance/appearance-desktop.c:662
 msgid "All files"
 msgstr "å?¨é?¨æ??件"
 
@@ -832,35 +836,35 @@ msgstr "使ç?¨å??å??ç??å­?ä½?"
 msgid "Use selected font"
 msgstr "使ç?¨é??中ç??å­?ä½?"
 
-#: ../capplets/appearance/appearance-main.c:54
+#: ../capplets/appearance/appearance-main.c:56
 #, c-format
 msgid "Could not load user interface file: %s"
 msgstr "æ? æ³?å? è½½ç?¨æ?·ç??é?¢æ??件ï¼?%s"
 
-#: ../capplets/appearance/appearance-main.c:133
+#: ../capplets/appearance/appearance-main.c:135
 msgid "Specify the filename of a theme to install"
 msgstr "æ??å®?è¦?å®?è£?ç??主é¢?æ??件å??"
 
-#: ../capplets/appearance/appearance-main.c:134
+#: ../capplets/appearance/appearance-main.c:136
 msgid "filename"
 msgstr "æ??件å??"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/appearance/appearance-main.c:141
+#: ../capplets/appearance/appearance-main.c:143
 msgid "Specify the name of the page to show (theme|background|fonts|interface)"
-msgstr "æ??å®?è¦?æ?¾ç¤ºç??页é?¢å??称(theme|background|fonts|interface)"
+msgstr "æ??å®?è¦?æ?¾ç¤ºç??页é?¢å??称 (theme|background|fonts|interface)"
 
-#: ../capplets/appearance/appearance-main.c:142
+#: ../capplets/appearance/appearance-main.c:144
 #: ../capplets/default-applications/gnome-da-capplet.c:960
 #: ../capplets/mouse/gnome-mouse-properties.c:591
 msgid "page"
 msgstr "page"
 
-#: ../capplets/appearance/appearance-main.c:149
+#: ../capplets/appearance/appearance-main.c:151
 msgid "[WALLPAPER...]"
 msgstr "[�纸...]"
 
-#: ../capplets/appearance/appearance-style.c:173
+#: ../capplets/appearance/appearance-style.c:172
 #: ../capplets/common/gnome-theme-info.c:446
 #: ../capplets/common/gnome-theme-info.c:638
 msgid "Default Pointer"
@@ -871,13 +875,13 @@ msgstr "é»?认æ??é??"
 msgid "Install"
 msgstr "��"
 
-#: ../capplets/appearance/appearance-style.c:255
+#: ../capplets/appearance/appearance-style.c:256
 #: ../capplets/common/gnome-theme-info.c:1646
 #, c-format
 msgid ""
 "This theme will not look as intended because the required GTK+ theme engine "
 "'%s' is not installed."
-msgstr "此主é¢?å?¯è?½ä¸?设计ä¹?å??ç??èµ·æ?¥ä¸?å??ï¼?å? 为å?¶æ??é??ç?? GTK+ 主é¢?å¼?æ??â??%sâ??æ?ªå®?è£?ã??"
+msgstr "此主é¢?å?¯è?½ä¸?设计æ?¶ç??èµ·æ?¥ä¸?å??ï¼?å? 为æ??é??ç?? GTK+ 主é¢?å¼?æ??â??%sâ??æ?ªå®?è£?ã??"
 
 #: ../capplets/appearance/appearance-themes.c:673
 msgid "Apply Background"
@@ -891,41 +895,41 @@ msgstr "����"
 msgid "Revert Font"
 msgstr "����"
 
-#: ../capplets/appearance/appearance-themes.c:711
+#: ../capplets/appearance/appearance-themes.c:712
 msgid ""
 "The current theme suggests a background and a font. Also, the last applied "
 "font suggestion can be reverted."
-msgstr "å½?å??主é¢?建议äº?ä¸?个è??æ?¯å??ä¸?ç§?å­?ä½?ã??å??æ?¶ï¼?ä¸?次åº?ç?¨ç??å­?ä½?建议å?¯è¢«æ?¢å¤?ã??"
+msgstr "å½?å??主é¢?æ?¨è??äº?ä¸?个è??æ?¯å??ä¸?ç§?å­?ä½?ã??å??æ?¶ï¼?ä¸?次åº?ç?¨ç??æ?¨è??å­?ä½?å?¯è¢«æ?¢å¤?ã??"
 
-#: ../capplets/appearance/appearance-themes.c:713
+#: ../capplets/appearance/appearance-themes.c:714
 msgid ""
 "The current theme suggests a background. Also, the last applied font "
 "suggestion can be reverted."
-msgstr "å½?å??主é¢?建议äº?ä¸?个è??æ?¯ã??å??æ?¶ï¼?ä¸?次åº?ç?¨ç??å­?ä½?建议å?¯è¢«æ?¢å¤?ã??"
+msgstr "å½?å??主é¢?æ?¨è??äº?ä¸?个è??æ?¯ã??å??æ?¶ï¼?ä¸?次åº?ç?¨ç??æ?¨è??å­?ä½?å?¯è¢«æ?¢å¤?ã??"
 
-#: ../capplets/appearance/appearance-themes.c:715
+#: ../capplets/appearance/appearance-themes.c:716
 msgid "The current theme suggests a background and a font."
-msgstr "å½?å??主é¢?建议äº?ä¸?个è??æ?¯å??ä¸?ç§?å­?ä½?ã??"
+msgstr "å½?å??主é¢?æ?¨è??äº?ä¸?个è??æ?¯å??ä¸?ç§?å­?ä½?ã??"
 
-#: ../capplets/appearance/appearance-themes.c:717
+#: ../capplets/appearance/appearance-themes.c:718
 msgid ""
 "The current theme suggests a font. Also, the last applied font suggestion "
 "can be reverted."
-msgstr "å½?å??主é¢?建议äº?ä¸?ç§?å­?ä½?ã??å??æ?¶ï¼?ä¸?次åº?ç?¨ç??å­?ä½?建议å?¯è¢«æ?¢å¤?ã??"
+msgstr "å½?å??主é¢?æ?¨è??äº?ä¸?ç§?å­?ä½?ã??å??æ?¶ï¼?ä¸?次åº?ç?¨ç??æ?¨è??å­?ä½?å?¯è¢«æ?¢å¤?ã??"
 
-#: ../capplets/appearance/appearance-themes.c:719
+#: ../capplets/appearance/appearance-themes.c:720
 msgid "The current theme suggests a background."
-msgstr "å½?å??主é¢?建议äº?ä¸?个è??æ?¯ã??"
+msgstr "å½?å??主é¢?æ?¨è??äº?ä¸?个è??æ?¯ã??"
 
-#: ../capplets/appearance/appearance-themes.c:721
+#: ../capplets/appearance/appearance-themes.c:722
 msgid "The last applied font suggestion can be reverted."
-msgstr "ä¸?次åº?ç?¨ç??å­?ä½?建议å?¯è¢«æ?¢å¤?ã??"
+msgstr "ä¸?次åº?ç?¨ç??æ?¨è??å­?ä½?å?¯è¢«æ?¢å¤?ã??"
 
-#: ../capplets/appearance/appearance-themes.c:723
+#: ../capplets/appearance/appearance-themes.c:724
 msgid "The current theme suggests a font."
-msgstr "å½?å??主é¢?建议äº?ä¸?ç§?å­?ä½?ã??"
+msgstr "å½?å??主é¢?æ?¨è??äº?ä¸?ç§?å­?ä½?ã??"
 
-#: ../capplets/appearance/appearance-themes.c:1045
+#: ../capplets/appearance/appearance-themes.c:1046
 #: ../capplets/default-applications/gnome-da-capplet.c:691
 msgid "Custom"
 msgstr "���"
@@ -1020,7 +1024,7 @@ msgid "Icons only"
 msgstr "ä»?å?¾æ ?"
 
 #: ../capplets/appearance/data/appearance.ui.h:24
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:16
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:17
 msgid "Large"
 msgstr "大"
 
@@ -1058,10 +1062,10 @@ msgstr "ä¿?å­?è??æ?¯å?¾å??(_B)"
 
 #: ../capplets/appearance/data/appearance.ui.h:33
 msgid "Scale"
-msgstr "平�"
+msgstr "���大"
 
 #: ../capplets/appearance/data/appearance.ui.h:34
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:30
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:31
 msgid "Small"
 msgstr "å°?"
 
@@ -1071,167 +1075,171 @@ msgstr "平�"
 
 #: ../capplets/appearance/data/appearance.ui.h:36
 msgid "Solid color"
-msgstr "���彩"
+msgstr "纯�"
 
 #: ../capplets/appearance/data/appearance.ui.h:37
-msgid "Stretch"
-msgstr "伸缩"
+msgid "Span"
+msgstr "é??å??宽度"
 
 #: ../capplets/appearance/data/appearance.ui.h:38
-msgid "Sub_pixel (LCDs)"
-msgstr "次å??ç´ (LCD)(_P)"
+msgid "Stretch"
+msgstr "伸�"
 
 #: ../capplets/appearance/data/appearance.ui.h:39
-msgid "Sub_pixel smoothing (LCDs)"
-msgstr "次å??ç´ å¹³æ»?(LCD)(_P)"
+msgid "Sub_pixel (LCDs)"
+msgstr "次å??ç´ (_P) (LCD)"
 
 #: ../capplets/appearance/data/appearance.ui.h:40
+msgid "Sub_pixel smoothing (LCDs)"
+msgstr "次å??ç´ å¹³æ»?(_P) (LCD)"
+
+#: ../capplets/appearance/data/appearance.ui.h:41
 msgid "Subpixel Order"
 msgstr "次å??ç´ é¡ºåº?"
 
-#: ../capplets/appearance/data/appearance.ui.h:41
+#: ../capplets/appearance/data/appearance.ui.h:42
 msgid "Text"
 msgstr "æ??æ?¬"
 
-#: ../capplets/appearance/data/appearance.ui.h:42
+#: ../capplets/appearance/data/appearance.ui.h:43
 msgid "Text below items"
 msgstr "æ??æ?¬å?¨ä¸?"
 
-#: ../capplets/appearance/data/appearance.ui.h:43
+#: ../capplets/appearance/data/appearance.ui.h:44
 msgid "Text beside items"
 msgstr "æ??æ?¬å?¨æ??"
 
-#: ../capplets/appearance/data/appearance.ui.h:44
+#: ../capplets/appearance/data/appearance.ui.h:45
 msgid "Text only"
 msgstr "ä»?æ??æ?¬"
 
-#: ../capplets/appearance/data/appearance.ui.h:45
+#: ../capplets/appearance/data/appearance.ui.h:46
 msgid "The current controls theme does not support color schemes."
 msgstr "å½?å??æ?§ä»¶ä¸»é¢?ä¸?æ?¯æ??é??è?²æ?¹æ¡?ã??"
 
-#: ../capplets/appearance/data/appearance.ui.h:46
+#: ../capplets/appearance/data/appearance.ui.h:47
 msgid "Theme"
 msgstr "主�"
 
-#: ../capplets/appearance/data/appearance.ui.h:47
+#: ../capplets/appearance/data/appearance.ui.h:48
 msgid "Tile"
 msgstr "平�"
 
 #. vertical hinting, pixel order blue, green, red
-#: ../capplets/appearance/data/appearance.ui.h:49
+#: ../capplets/appearance/data/appearance.ui.h:50
 msgid "VB_GR"
 msgstr "VB_GR"
 
-#: ../capplets/appearance/data/appearance.ui.h:50
+#: ../capplets/appearance/data/appearance.ui.h:51
 msgid "Vertical gradient"
 msgstr "å??ç?´æ¢¯åº¦"
 
-#: ../capplets/appearance/data/appearance.ui.h:51
+#: ../capplets/appearance/data/appearance.ui.h:52
 msgid "Window Border"
 msgstr "��边�"
 
-#: ../capplets/appearance/data/appearance.ui.h:52
+#: ../capplets/appearance/data/appearance.ui.h:53
 msgid "Zoom"
 msgstr "缩�"
 
-#: ../capplets/appearance/data/appearance.ui.h:53
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:36
+#: ../capplets/appearance/data/appearance.ui.h:54
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:45
 msgid "_Add..."
 msgstr "æ·»å? (_A)..."
 
-#: ../capplets/appearance/data/appearance.ui.h:54
+#: ../capplets/appearance/data/appearance.ui.h:55
 msgid "_Application font:"
 msgstr "������(_A)�"
 
 #. pixel order blue, green, red
-#: ../capplets/appearance/data/appearance.ui.h:56
+#: ../capplets/appearance/data/appearance.ui.h:57
 msgid "_BGR"
 msgstr "_BGR"
 
-#: ../capplets/appearance/data/appearance.ui.h:57
+#: ../capplets/appearance/data/appearance.ui.h:58
 msgid "_Description:"
 msgstr "æ??è¿°(_D)ï¼?"
 
-#: ../capplets/appearance/data/appearance.ui.h:58
+#: ../capplets/appearance/data/appearance.ui.h:59
 msgid "_Document font:"
 msgstr "æ??æ¡£å­?ä½?(_D)ï¼?"
 
-#: ../capplets/appearance/data/appearance.ui.h:59
+#: ../capplets/appearance/data/appearance.ui.h:60
 msgid "_Fixed width font:"
 msgstr "�宽��(_F)�"
 
-#: ../capplets/appearance/data/appearance.ui.h:60
+#: ../capplets/appearance/data/appearance.ui.h:61
 msgid "_Full"
 msgstr "å®?å?¨(_F)"
 
-#: ../capplets/appearance/data/appearance.ui.h:61
+#: ../capplets/appearance/data/appearance.ui.h:62
 msgid "_Input boxes:"
 msgstr "���(_I)�"
 
-#: ../capplets/appearance/data/appearance.ui.h:62
+#: ../capplets/appearance/data/appearance.ui.h:63
 msgid "_Install..."
 msgstr "��(_I)..."
 
-#: ../capplets/appearance/data/appearance.ui.h:63
+#: ../capplets/appearance/data/appearance.ui.h:64
 msgid "_Medium"
 msgstr "中�(_M)"
 
-#: ../capplets/appearance/data/appearance.ui.h:64
+#: ../capplets/appearance/data/appearance.ui.h:65
 msgid "_Monochrome"
 msgstr "å??è?²(_M)"
 
-#: ../capplets/appearance/data/appearance.ui.h:65
+#: ../capplets/appearance/data/appearance.ui.h:66
 #: ../capplets/keybindings/gnome-keybinding-properties.ui.h:5
 msgid "_Name:"
 msgstr "å??称(_N)ï¼?"
 
-#: ../capplets/appearance/data/appearance.ui.h:66
+#: ../capplets/appearance/data/appearance.ui.h:67
 msgid "_None"
 msgstr "æ? (_N)"
 
 #. pixel order red, green, blue
-#: ../capplets/appearance/data/appearance.ui.h:68
+#: ../capplets/appearance/data/appearance.ui.h:69
 msgid "_RGB"
 msgstr "_RGB"
 
-#: ../capplets/appearance/data/appearance.ui.h:69
+#: ../capplets/appearance/data/appearance.ui.h:70
 msgid "_Reset to Defaults"
 msgstr "é??置为é»?认å?¼(_R)"
 
-#: ../capplets/appearance/data/appearance.ui.h:70
+#: ../capplets/appearance/data/appearance.ui.h:71
 msgid "_Selected items:"
 msgstr "é??中项ç?®(_S)ï¼?"
 
-#: ../capplets/appearance/data/appearance.ui.h:71
+#: ../capplets/appearance/data/appearance.ui.h:72
 msgid "_Size:"
 msgstr "大�(_S)�"
 
-#: ../capplets/appearance/data/appearance.ui.h:72
+#: ../capplets/appearance/data/appearance.ui.h:73
 msgid "_Slight"
 msgstr "轻微(_S)"
 
-#: ../capplets/appearance/data/appearance.ui.h:73
+#: ../capplets/appearance/data/appearance.ui.h:74
 msgid "_Style:"
 msgstr "æ ·å¼?(_S)ï¼?"
 
-#: ../capplets/appearance/data/appearance.ui.h:74
+#: ../capplets/appearance/data/appearance.ui.h:75
 msgid "_Tooltips:"
 msgstr "å·¥å?·æ??示(_T)ï¼?"
 
 #. vertical hinting, pixel order red, green, blue
-#: ../capplets/appearance/data/appearance.ui.h:76
+#: ../capplets/appearance/data/appearance.ui.h:77
 msgid "_VRGB"
 msgstr "_VRGB"
 
-#: ../capplets/appearance/data/appearance.ui.h:77
+#: ../capplets/appearance/data/appearance.ui.h:78
 msgid "_Window title font:"
 msgstr "çª?å?£æ ?é¢?å­?ä½?(_W)ï¼?"
 
-#: ../capplets/appearance/data/appearance.ui.h:78
+#: ../capplets/appearance/data/appearance.ui.h:79
 msgid "_Windows:"
 msgstr "��(_W)�"
 
-#: ../capplets/appearance/data/appearance.ui.h:79
+#: ../capplets/appearance/data/appearance.ui.h:80
 msgid "dots per inch"
 msgstr "��寸��"
 
@@ -1259,20 +1267,26 @@ msgstr "Gnome 主é¢?å??"
 msgid "No Desktop Background"
 msgstr "æ? æ¡?é?¢è??æ?¯"
 
-#: ../capplets/appearance/gnome-wp-item.c:258
+#: ../capplets/appearance/gnome-wp-item.c:261
 msgid "Slide Show"
 msgstr "å¹»ç?¯ç??æ¼?示"
 
-#: ../capplets/appearance/gnome-wp-item.c:260
+#: ../capplets/appearance/gnome-wp-item.c:263
 msgid "Image"
 msgstr "å?¾å??"
 
-#: ../capplets/appearance/gnome-wp-item.c:266
+#: ../capplets/appearance/gnome-wp-item.c:269
 msgid "multiple sizes"
 msgstr "å¤?é??尺寸"
 
-#: ../capplets/appearance/gnome-wp-item.c:271
-#: ../capplets/appearance/gnome-wp-item.c:273
+#. translators: x pixel(s) by y pixel(s)
+#: ../capplets/appearance/gnome-wp-item.c:272
+#, c-format
+msgid "%d %s by %d %s"
+msgstr "%d %s * %d %s"
+
+#: ../capplets/appearance/gnome-wp-item.c:274
+#: ../capplets/appearance/gnome-wp-item.c:276
 msgid "pixel"
 msgid_plural "pixels"
 msgstr[0] "å??ç´ "
@@ -1281,7 +1295,7 @@ msgstr[0] "å??ç´ "
 #. * mime type, size
 #. * Folder: /path/to/file
 #.
-#: ../capplets/appearance/gnome-wp-item.c:279
+#: ../capplets/appearance/gnome-wp-item.c:284
 #, c-format
 msgid ""
 "<b>%s</b>\n"
@@ -1289,9 +1303,28 @@ msgid ""
 "Folder: %s"
 msgstr ""
 "<b>%s</b>\n"
-"%s, %s\n"
+"%sï¼?%s\n"
 "æ??件夹ï¼?%s"
 
+#. translators: <b>wallpaper name</b>
+#. * Image missing
+#. * Folder: /path/to/file
+#.
+#: ../capplets/appearance/gnome-wp-item.c:296
+#, c-format
+msgid ""
+"<b>%s</b>\n"
+"%s\n"
+"Folder: %s"
+msgstr ""
+"<b>%s</b>\n"
+"%s\n"
+"æ??件夹ï¼?%s"
+
+#: ../capplets/appearance/gnome-wp-item.c:300
+msgid "Image missing"
+msgstr "å?¾å??丢失"
+
 #: ../capplets/appearance/theme-installer.c:178
 #: ../capplets/appearance/theme-installer.c:234
 msgid "Cannot install theme"
@@ -1325,7 +1358,7 @@ msgstr "â??%sâ??ä¼¼ä¹?ä¸?æ?¯æ??æ??ç??主é¢?ã??å®?å?¯è?½æ?¯é??è¦?ç¼?è¯?æ??è?½ä½¿
 #: ../capplets/appearance/theme-installer.c:372
 #, c-format
 msgid "Installation for theme \"%s\" failed."
-msgstr "主é¢?â??%sâ??ç??å®?è£?失败ã??"
+msgstr "主é¢?â??%sâ??å®?è£?失败ã??"
 
 #: ../capplets/appearance/theme-installer.c:411
 #, c-format
@@ -1334,7 +1367,7 @@ msgstr "主é¢?â??%sâ??å·²å®?è£?ã??"
 
 #: ../capplets/appearance/theme-installer.c:421
 msgid "Would you like to apply it now, or keep your current theme?"
-msgstr "æ?¨æ?¯æ?³è¦?ç?°å?¨å°±åº?ç?¨ï¼?è¿?æ?¯ä¿?æ??æ?¨å½?å??ç??主é¢?ï¼?"
+msgstr "æ?¨æ?¯æ?³è¦?ç?°å?¨å°±åº?ç?¨ï¼?è¿?æ?¯ä¿?æ??å½?å??ç??主é¢?ï¼?"
 
 #: ../capplets/appearance/theme-installer.c:424
 msgid "Keep Current Theme"
@@ -1357,11 +1390,11 @@ msgstr "å??建临æ?¶ç?®å½?失败"
 msgid "New themes have been successfully installed."
 msgstr "æ?°ä¸»é¢?å·²æ??å??å®?è£?ã??"
 
-#: ../capplets/appearance/theme-installer.c:643
+#: ../capplets/appearance/theme-installer.c:646
 msgid "No theme file location specified to install"
 msgstr "æ?ªæ??å®?è¦?å®?è£?å¾?主é¢?æ??件ä½?ç½®"
 
-#: ../capplets/appearance/theme-installer.c:667
+#: ../capplets/appearance/theme-installer.c:670
 #, c-format
 msgid ""
 "Insufficient permissions to install the theme in:\n"
@@ -1370,11 +1403,11 @@ msgstr ""
 "没æ??足å¤?ç??æ??é??å°?主é¢?å®?è£?å?¨ï¼?\n"
 "%s"
 
-#: ../capplets/appearance/theme-installer.c:745
+#: ../capplets/appearance/theme-installer.c:748
 msgid "Select Theme"
 msgstr "é??æ?©ä¸»é¢?"
 
-#: ../capplets/appearance/theme-installer.c:756
+#: ../capplets/appearance/theme-installer.c:759
 msgid "Theme Packages"
 msgstr "主é¢?å??"
 
@@ -1414,7 +1447,7 @@ msgid ""
 msgstr ""
 "æ? æ³?å?¯å?¨è®¾ç½®ç®¡ç??å?¨â??gnome-settings-daemonâ??ã??\n"
 "å¦?æ??ä¸?è¿?è¡? GNOME 设置管ç??å?¨ï¼?æ??äº?é¦?é??项ä¸?ä¼?ç??æ??ã??è¿?å?¯è?½è¡¨æ?? DBus å?ºç?°é?®é¢?ï¼?æ??"
-"è??æ??个é?? GNOMEï¼?å¦? KDEï¼?设置管ç??å?¨å?¯è?½å·²ç»?å¤?äº?æ´»å?¨ç?¶æ??ï¼?并ä¸? GNOME 设置管ç??å?¨"
+"è??æ??个é?? GNOME (å¦? KDE) 设置管ç??å?¨å?¯è?½å·²ç»?å¤?äº?æ´»å?¨ç?¶æ??ï¼?并ä¸? GNOME 设置管ç??å?¨"
 "å??ç??å?²çª?ã??"
 
 #: ../capplets/common/capplet-stock-icons.c:66
@@ -1552,7 +1585,7 @@ msgstr "ç?¨æ?·ç??é?¢æ?§ä»¶"
 
 #: ../capplets/common/gconf-property-editor.c:166
 msgid "Object that controls the property (normally a widget)"
-msgstr "æ?§å?¶å±?æ?§ç??对象(é??常为é?¨ä»¶)"
+msgstr "æ?§å?¶å±?æ?§ç??对象 (é??常为é?¨ä»¶)"
 
 #: ../capplets/common/gconf-property-editor.c:181
 msgid "Property editor object data"
@@ -1636,26 +1669,26 @@ msgstr "大å?·ç??ç?½è?²æ??é??"
 msgid ""
 "This theme will not look as intended because the required GTK+ theme '%s' is "
 "not installed."
-msgstr "此主é¢?ç??å¤?è§?å°?ä¸?设计ä¹?å??ä¸?å??ï¼?å? 为æ??é??ç?? GTK+ 主é¢?â??%sâ??æ?ªå®?è£?ã??"
+msgstr "此主é¢?ç??å¤?è§?å°?ä¸?设计æ?¶ä¸?å??ï¼?å? 为æ??é??ç?? GTK+ 主é¢?â??%sâ??æ?ªå®?è£?ã??"
 
 #: ../capplets/common/gnome-theme-info.c:1630
 #, c-format
 msgid ""
 "This theme will not look as intended because the required window manager "
 "theme '%s' is not installed."
-msgstr "此主é¢?ç??å¤?è§?å°?ä¸?设计ä¹?å??ä¸?å??ï¼?å? 为æ??é??ç??çª?å?£ç®¡ç??å?¨ä¸»é¢?â??%sâ??æ?ªå®?è£?ã??"
+msgstr "此主é¢?ç??å¤?è§?å°?ä¸?设计æ?¶ä¸?å??ï¼?å? 为æ??é??ç??çª?å?£ç®¡ç??å?¨ä¸»é¢?â??%sâ??æ?ªå®?è£?ã??"
 
 #: ../capplets/common/gnome-theme-info.c:1637
 #, c-format
 msgid ""
 "This theme will not look as intended because the required icon theme '%s' is "
 "not installed."
-msgstr "此主é¢?ç??å¤?è§?å°?ä¸?设计ä¹?å??ä¸?å??ï¼?å? 为æ??é??ç??å?¾æ ?主é¢?â??%sâ??æ?ªå®?è£?ã??"
+msgstr "此主é¢?ç??å¤?è§?å°?ä¸?设计æ?¶ä¸?å??ï¼?å? 为æ??é??ç??å?¾æ ?主é¢?â??%sâ??æ?ªå®?è£?ã??"
 
 #: ../capplets/default-applications/default-applications.desktop.in.in.h:1
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:17
 msgid "Preferred Applications"
-msgstr "é¦?é??åº?ç?¨ç¨?åº?"
+msgstr "�认����"
 
 #: ../capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
@@ -1663,7 +1696,7 @@ msgstr "é??æ?©é»?认ç??åº?ç?¨ç¨?åº?"
 
 #: ../capplets/default-applications/gnome-at-session.desktop.in.in.h:1
 msgid "Start the preferred visual assistive technology"
-msgstr "å?¯å?¨é¦?é??ç??è§?è§?è¾?å?©æ??æ?¯"
+msgstr "å?¯å?¨é»?认ç??è§?è§?è¾?å?©æ??æ?¯"
 
 #: ../capplets/default-applications/gnome-at-session.desktop.in.in.h:2
 msgid "Visual Assistance"
@@ -1682,12 +1715,12 @@ msgstr "æ? æ³?è£?å?¥ä¸»ç??é?¢"
 
 #: ../capplets/default-applications/gnome-da-capplet.c:724
 msgid "Please make sure that the applet is properly installed"
-msgstr "请确å®?å°?ç¨?åº?å·²ç»?正确å®?è£?äº?ã??"
+msgstr "请确å®?å°?ç¨?åº?å·²ç»?正确å®?è£?ã??"
 
 #. TRANSLATORS: don't translate the terms in brackets
 #: ../capplets/default-applications/gnome-da-capplet.c:959
 msgid "Specify the name of the page to show (internet|multimedia|system|a11y)"
-msgstr "æ??å®?è¦?æ?¾ç¤ºç??页é?¢å??称(internet|multimedia|system|a11y)"
+msgstr "æ??å®?è¦?æ?¾ç¤ºç??页é?¢å??称 (internet|multimedia|system|a11y)"
 
 #: ../capplets/default-applications/gnome-da-capplet.c:964
 msgid "- GNOME Default Applications"
@@ -1730,7 +1763,7 @@ msgstr "å?³æ?¶é??讯工å?·"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:9
 msgid "Internet"
-msgstr "Internet"
+msgstr "äº?è??ç½?"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:10
 msgid "Mail Reader"
@@ -1738,7 +1771,7 @@ msgstr "é?®ä»¶é??读å?¨"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:11
 msgid "Mobility"
-msgstr "移�"
+msgstr "移�� "
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:12
 msgid "Multimedia"
@@ -1758,7 +1791,7 @@ msgstr "å?¨æ?°çª?å?£ä¸­æ??å¼?é?¾æ?¥(_W)"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:16
 msgid "Open link with web browser _default"
-msgstr "使ç?¨ Web æµ?è§?å?¨é»?认å?¼æ??å¼?é?¾æ?¥(_D)"
+msgstr "使ç?¨ç½?ç»?æµ?è§?å?¨ç??é»?认设置æ??å¼?é?¾æ?¥(_D)"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:18
 msgid "Run at st_art"
@@ -1790,7 +1823,7 @@ msgstr "è§?è§?æ??æ??"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:25
 msgid "Web Browser"
-msgstr "Web ���"
+msgstr "�����"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:26
 msgid "_Run at start"
@@ -1830,7 +1863,7 @@ msgstr "Encompass"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:9
 msgid "Epiphany Web Browser"
-msgstr "Epiphany Web ���"
+msgstr "Epiphany �����"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:10
 msgid "Evolution Mail Reader"
@@ -1874,7 +1907,7 @@ msgstr "Iceape"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:20
 msgid "Iceape Mail"
-msgstr "Iceape Mail"
+msgstr "Iceape �件"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:21
 msgid "Icedove"
@@ -1926,7 +1959,7 @@ msgstr "Mozilla 1.6"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:33
 msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
+msgstr "Mozilla �件"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:34
 msgid "Mozilla Thunderbird"
@@ -2005,30 +2038,30 @@ msgid "aterm"
 msgstr "aterm"
 
 #: ../capplets/display/display-capplet.ui.h:1
-msgid "Display Preferences"
-msgstr "æ?¾ç¤ºé¦?é??项"
-
-#: ../capplets/display/display-capplet.ui.h:2
-msgid "Drag the monitors to set their place"
-msgstr "æ??å?¨æ?¾ç¤ºå?¨ä»¥è®¾å®?å®?们ç??ä½?ç½®"
-
-#: ../capplets/display/display-capplet.ui.h:3
 msgid "Include _panel"
 msgstr "å??å?«é?¢æ?¿(_P)"
 
-#: ../capplets/display/display-capplet.ui.h:4
-#: ../capplets/display/xrandr-capplet.c:302
+#: ../capplets/display/display-capplet.ui.h:2
+#: ../capplets/display/xrandr-capplet.c:310
 msgid "Left"
 msgstr "å·¦"
 
-#: ../capplets/display/display-capplet.ui.h:5
-#: ../capplets/display/xrandr-capplet.c:440
+#: ../capplets/display/display-capplet.ui.h:3
+msgid "Make Default"
+msgstr "设为�认"
+
+#: ../capplets/display/display-capplet.ui.h:4
+#: ../capplets/display/xrandr-capplet.c:513
 msgid "Monitor"
 msgstr "�示�"
 
+#: ../capplets/display/display-capplet.ui.h:5
+msgid "Monitor Preferences"
+msgstr "æ?¾ç¤ºå?¨é¦?é??项"
+
 #: ../capplets/display/display-capplet.ui.h:6
-#: ../capplets/display/xrandr-capplet.c:301
-#: ../capplets/display/xrandr-capplet.c:340
+#: ../capplets/display/xrandr-capplet.c:309
+#: ../capplets/display/xrandr-capplet.c:348
 msgid "Normal"
 msgstr "æ?®é??"
 
@@ -2046,92 +2079,111 @@ msgstr "é?¢æ?¿å?¾æ ?"
 
 #: ../capplets/display/display-capplet.ui.h:10
 msgid "R_otation:"
-msgstr "æ??转(_O)"
+msgstr "æ??转(_O)ï¼?"
 
 #: ../capplets/display/display-capplet.ui.h:11
 msgid "Re_fresh rate:"
 msgstr "å?·æ?°ç??(_F)ï¼?"
 
 #: ../capplets/display/display-capplet.ui.h:12
-#: ../capplets/display/xrandr-capplet.c:303
+#: ../capplets/display/xrandr-capplet.c:311
 msgid "Right"
 msgstr "å?³"
 
 #: ../capplets/display/display-capplet.ui.h:13
-msgid "Upside-down"
-msgstr "ä¸?ä¸?é¢ å??"
+msgid "Sa_me image in all monitors"
+msgstr "å?¨æ??æ??æ?¾ç¤ºå?¨æ?¾ç¤ºå??æ ·ç??å?¾å??"
 
 #: ../capplets/display/display-capplet.ui.h:14
-msgid "_Detect Monitors"
-msgstr "���示�(_D)"
+msgid "Upside-down"
+msgstr "ä¸?ä¸?é¢ å??"
 
 #: ../capplets/display/display-capplet.ui.h:15
-msgid "_Mirror screens"
-msgstr "é??å??å±?å¹?(_M)"
+msgid "_Detect monitors"
+msgstr "���示�"
 
 #: ../capplets/display/display-capplet.ui.h:16
 msgid "_Resolution:"
 msgstr "å??辨ç??(_R)ï¼?"
 
 #: ../capplets/display/display-capplet.ui.h:17
-msgid "_Show displays in panel"
-msgstr "å?¨é?¢æ?¿ä¸­æ?¾ç¤ºâ??æ?¾ç¤ºå±?æ?§â??(_S)"
+msgid "_Show monitors in panel"
+msgstr "�����示�示�(_S)"
 
 #: ../capplets/display/display-properties.desktop.in.in.h:1
-msgid "Change screen resolution"
-msgstr "æ?´æ?¹å±?å¹?å??辨ç??"
+msgid "Change resolution and position of monitors"
+msgstr "æ?´æ?¹æ?¾ç¤ºå?¨ç??å??辨ç??å??ä½?ç½®"
 
 #: ../capplets/display/display-properties.desktop.in.in.h:2
-msgid "Display"
-msgstr "�示"
+msgid "Monitors"
+msgstr "�示�"
 
-#: ../capplets/display/xrandr-capplet.c:304
+#: ../capplets/display/xrandr-capplet.c:312
 msgid "Upside Down"
 msgstr "ä¸?ä¸?é¢ å??"
 
-#: ../capplets/display/xrandr-capplet.c:346
+#: ../capplets/display/xrandr-capplet.c:354
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../capplets/display/xrandr-capplet.c:432
+#. Translators:  this is the feature where what you see on your laptop's
+#. * screen is the same as your external monitor.  Here, "Mirror" is being
+#. * used as an adjective, not as a verb.  For example, the Spanish
+#. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
+#.
+#: ../capplets/display/xrandr-capplet.c:502
+#: ../capplets/display/xrandr-capplet.c:1648
+msgid "Mirror Screens"
+msgstr "é??å??å±?å¹?"
+
+#: ../capplets/display/xrandr-capplet.c:504
 #, c-format
 msgid "Monitor: %s"
 msgstr "�示��%s"
 
-#: ../capplets/display/xrandr-capplet.c:511
+#: ../capplets/display/xrandr-capplet.c:582
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#. Translators:  this is the feature where what you see on your laptop's
-#. * screen is the same as your external monitor.  Here, "Mirror" is being
-#. * used as an adjective, not as a verb.  For example, the Spanish
-#. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
-#.
-#: ../capplets/display/xrandr-capplet.c:1463
-msgid "Mirror Screens"
-msgstr "é??å??å±?å¹?"
+#: ../capplets/display/xrandr-capplet.c:1504
+msgid ""
+"Select a monitor to change its properties; drag it to rearrange its "
+"placement."
+msgstr "é??æ?©ä¸?个æ?¾ç¤ºå?¨æ?¥æ?´æ?¹å®?ç??å±?æ?§ï¼?æ??å?¨å®?æ?¥æ??å??ä½?ç½®ã??"
 
-#: ../capplets/display/xrandr-capplet.c:1883
+#: ../capplets/display/xrandr-capplet.c:2067
 msgid "Could not save the monitor configuration"
 msgstr "æ? æ³?ä¿?å­?æ?¾ç¤ºå?¨é??ç½®"
 
-#: ../capplets/display/xrandr-capplet.c:1894
+#: ../capplets/display/xrandr-capplet.c:2089
 msgid "Could not get session bus while applying display configuration"
 msgstr "åº?ç?¨æ?¾ç¤ºé??ç½®æ?¶æ? æ³?è?·å¾?ä¼?è¯?æ?»çº¿"
 
-#: ../capplets/display/xrandr-capplet.c:1936
+#: ../capplets/display/xrandr-capplet.c:2131
 msgid "Could not detect displays"
-msgstr "æ? æ³?æ£?æµ?æ?¾ç¤º"
+msgstr "æ? æ³?æ?¢æµ?æ?¾ç¤ºå?¨"
+
+#: ../capplets/display/xrandr-capplet.c:2323
+msgid "The monitor configuration has been saved"
+msgstr "æ?¾ç¤ºå?¨é??置已ä¿?å­?"
 
-#: ../capplets/display/xrandr-capplet.c:2151
+#: ../capplets/display/xrandr-capplet.c:2325
+msgid "This configuration will be used the next time someone logs in."
+msgstr "è¿?个设置å°?å?¨ä¸?次ç?»å?¥æ?¶ä½¿ç?¨ã??"
+
+#: ../capplets/display/xrandr-capplet.c:2359
+msgid "Could not set the default configuration for monitors"
+msgstr "æ? æ³?为æ?¾ç¤ºå?¨è®¾ç½®é»?认é??ç½®"
+
+#: ../capplets/display/xrandr-capplet.c:2401
 msgid "Could not get screen information"
 msgstr "æ? æ³?è?·å¾?å±?å¹?ä¿¡æ?¯"
 
 #: ../capplets/keybindings/00-multimedia-key.xml.in.h:1
 msgid "Sound"
-msgstr "é?³æ??"
+msgstr "声�"
 
 #: ../capplets/keybindings/01-desktop-key.xml.in.h:1
 #: ../libslab/bookmark-agent.c:1146
@@ -2155,7 +2207,7 @@ msgstr "å? é??é?®ä¿®é¥°é?®"
 #: ../capplets/keybindings/eggcellrendererkeys.c:182
 #: ../capplets/keybindings/eggcellrendererkeys.c:183
 msgid "Accelerator keycode"
-msgstr "å? é??é?®"
+msgstr "å? é??é?®é?®ç ?"
 
 #: ../capplets/keybindings/eggcellrendererkeys.c:193
 msgid "Accel Mode"
@@ -2167,7 +2219,7 @@ msgstr "å? é??é?®ç±»å??ã??"
 
 #: ../capplets/keybindings/eggcellrendererkeys.c:242
 #: ../capplets/keybindings/gnome-keybinding-properties.c:119
-#: ../typing-break/drwright.c:431
+#: ../typing-break/drwright.c:498
 msgid "Disabled"
 msgstr "��"
 
@@ -2191,7 +2243,7 @@ msgid ""
 "using this key.\n"
 "Please try with a key such as Control, Alt or Shift at the same time."
 msgstr ""
-"æ? æ³?使ç?¨å¿«æ?·é?®â??%sâ??ï¼?å??å? æ?¯ä½¿ç?¨æ­¤é?®å°?æ? æ³?è¾?å?¥ã??\n"
+"æ? æ³?使ç?¨å¿«æ?·é?®â??%sâ??ï¼?å? 为使ç?¨æ­¤é?®å°?æ? æ³?è¾?å?¥ã??\n"
 "请å??æ?¶ä½¿ç?¨ Ctrlã??Alt æ?? Shift å??è¯?ä¸?次ã??"
 
 #: ../capplets/keybindings/gnome-keybinding-properties.c:1201
@@ -2253,7 +2305,7 @@ msgstr "为å?½ä»¤æ??å®?å¿«æ?·é?®"
 #: ../capplets/keyboard/gnome-keyboard-properties.c:210
 msgid ""
 "Just apply settings and quit (compatibility only; now handled by daemon)"
-msgstr "åº?ç?¨è®¾ç½®å¹¶é??å?º(ä»?为å?¼å®¹ï¼?ç?°å?¨å·²ç?±å®?æ?¤è¿?ç¨?å¤?ç??)"
+msgstr "åº?ç?¨è®¾ç½®å¹¶é??å?º (ä»?为å?¼å®¹ï¼?ç?°å?¨å·²ç?±å®?æ?¤è¿?ç¨?å¤?ç??)"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.c:215
 msgid "Start the page with the typing break settings showing"
@@ -2310,7 +2362,7 @@ msgstr "é?ªç??æ?´ä¸ªå±?å¹?(_S)"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:11
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:14
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:14
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:15
 msgid "General"
 msgstr "常�"
 
@@ -2323,12 +2375,12 @@ msgid "Show _visual feedback for the alert sound"
 msgstr "为警å??声é?³æ?¾ç¤ºè§?è§?å??é¦?(_V)"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:14
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:31
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:39
 msgid "Slow Keys"
 msgstr "æ?¢é??é?®"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:15
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:32
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:40
 msgid "Sticky Keys"
 msgstr "ç²?æ»?é?®"
 
@@ -2379,7 +2431,7 @@ msgid "Duration of work before forcing a break"
 msgstr "强å?¶é?´æ?­å??ç??å·¥ä½?æ??ç»­æ?¶é?´"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:13
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:13
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:14
 msgid "Fast"
 msgstr "å¿«"
 
@@ -2400,121 +2452,157 @@ msgid "Layouts"
 msgstr "��"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:19
+msgid "List of keyboard layouts selected for usage"
+msgstr ""
+
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:20
 msgid ""
 "Lock screen after a certain duration to help prevent repetitive keyboard use "
 "injuries"
 msgstr "æ¯?é??ä¸?段æ?¶é?´é??å®?å±?å¹?ï¼?以便é??å¤?æ?§ç??é?®ç??å·¥ä½?使æ??è??è¿?度å?³ç´¯"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:20
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:18
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:21
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:19
 msgid "Long"
 msgstr "é?¿"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:21
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:22
 msgid "Mouse Keys"
 msgstr "é¼ æ ?é?®"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:22
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:23
 msgid "Move _Down"
 msgstr "å??ä¸?移å?¨(_D)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:23
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:24
 msgid "Move _Up"
 msgstr "å??ä¸?移å?¨(_U)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:24
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:25
+msgid "Move the selected keyboard layout down in the list"
+msgstr ""
+
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:26
+msgid "Move the selected keyboard layout up in the list"
+msgstr ""
+
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:27
 msgid "New windows u_se active window's layout"
 msgstr "æ?°çª?å?£ä½¿ç?¨æ´»å?¨çª?å?£ç??å¸?å±?(_S)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:25
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:28
+msgid "Print a diagram of the selected keyboard layout"
+msgstr ""
+
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:29
+msgid "Remove the selected keyboard layout from the list"
+msgstr ""
+
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:30
 msgid "Repeat Keys"
 msgstr "é??å¤?é?®"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:26
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:31
 msgid "Repeat keys speed"
 msgstr "é??å¤?é?®é??度"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:27
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:32
+msgid ""
+"Replace the current keyboard layout settings with the\n"
+"default settings"
+msgstr ""
+
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:34
 msgid "Reset to De_faults"
 msgstr "é??置为é»?认å?¼(_F)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:28
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:35
 msgid "S_peed:"
 msgstr "é??度(_P)ï¼?"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:29
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:26
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:36
+msgid "Select a keyboard layout to be added to the list"
+msgstr ""
+
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:37
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:27
 msgid "Short"
 msgstr "ç?­"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:30
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:29
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:38
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:30
 msgid "Slow"
 msgstr "æ?¢"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:33
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:41
 msgid "Typing Break"
 msgstr "æ??å­?é?´æ?­"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:34
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:36
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:42
+#, fuzzy
+#| msgid "Keyboard Layout Options"
+msgid "View and edit keyboard layout options"
+msgstr "é?®ç??å¸?å±?é??项"
+
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:43
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:37
 msgid "_Acceleration:"
 msgstr "å? é??(_A)ï¼?"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:35
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:44
 msgid "_Accessibility features can be toggled with keyboard shortcuts"
 msgstr "å??许é??è¿?å¿«æ?·é?®æ??å¼?æ??å?³é?­è¾?å?©ç?¹æ?§(_A)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:37
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:46
 msgid "_Break interval lasts:"
 msgstr "é?´æ?­é?´é??æ??ç»­(_B)ï¼?"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:38
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:37
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:47
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:38
 msgid "_Delay:"
 msgstr "延�(_D)�"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:39
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:48
 msgid "_Ignore fast duplicate keypresses"
 msgstr "忽ç?¥å¿«é??é??å¤?æ??é?®(_I)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:40
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:49
 msgid "_Lock screen to enforce typing break"
 msgstr "é??å®?å±?å¹?æ?¥å¼ºå?¶æ??å­?é?´æ?­(_L)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:41
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:50
 msgid "_Only accept long keypresses"
 msgstr "ä»?æ?¥å??é?¿æ??é?®(_O)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:42
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:51
 msgid "_Options..."
 msgstr "é??项(_O)..."
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:43
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:52
 msgid "_Pointer can be controlled using the keypad"
 msgstr "å??许使ç?¨é?®ç??æ?§å?¶æ??é??(_P)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:44
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:53
 msgid "_Separate layout for each window"
 msgstr "�个������(_S)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:45
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:54
 msgid "_Simulate simultaneous keypresses"
 msgstr "模æ??å??æ?¶æ??é?®(_S)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:46
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:55
 msgid "_Speed:"
 msgstr "é??度(_S)ï¼?"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:47
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:56
 msgid "_Type to test settings:"
 msgstr "���符���设置(_T)�"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:48
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:57
 msgid "_Work interval lasts:"
 msgstr "å·¥ä½?é?´é??æ??ç»­(_W)ï¼?"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:49
+#: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:58
 msgid "minutes"
 msgstr "å??é??"
 
@@ -2624,7 +2712,7 @@ msgstr "��"
 #. TRANSLATORS: don't translate the terms in brackets
 #: ../capplets/mouse/gnome-mouse-properties.c:590
 msgid "Specify the name of the page to show (general|accessibility)"
-msgstr "æ??å®?è¦?æ?¾ç¤ºç??页é?¢å??称(general|accessibility)"
+msgstr "æ??å®?è¦?æ?¾ç¤ºç??页é?¢å??称 (general|accessibility)"
 
 #: ../capplets/mouse/gnome-mouse-properties.c:595
 msgid "- GNOME Mouse Preferences"
@@ -2647,94 +2735,94 @@ msgid "D_rag click:"
 msgstr "æ??æ?³å?»(_R)ï¼?"
 
 #: ../capplets/mouse/gnome-mouse-properties.ui.h:8
+msgid "Disable _touchpad while typing"
+msgstr "æ??å­?æ?¶ç¦?ç?¨è§¦æ?¸æ?¿(_T)"
+
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:9
 msgid "Double-Click Timeout"
 msgstr "å??å?»è¶?æ?¶"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:9
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:10
 msgid "Drag and Drop"
 msgstr "æ??æ?¾"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:10
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:11
 msgid "Dwell Click"
 msgstr "æ?¬å??ç?¹å?»"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:11
-msgid "Enable _horizontal scrolling"
-msgstr "��水平��(_H)"
-
 #: ../capplets/mouse/gnome-mouse-properties.ui.h:12
-msgid "Enable mouse _clicks with touchpad"
-msgstr "å?¯ç?¨è§¦æ?¸æ?¿ç??é¼ æ ?ç?¹å?»(_C)"
+msgid "Enable _mouse clicks with touchpad"
+msgstr "å?¯ç?¨è§¦æ?¸æ?¿ç??é¼ æ ?ç?¹å?»(_M)"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:15
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:13
+msgid "Enable h_orizontal scrolling"
+msgstr "��水平��(_O)"
+
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:16
 msgid "High"
 msgstr "é«?"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:17
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:18
 msgid "Locate Pointer"
 msgstr "å®?ä½?æ??é??"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:19
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:20
 msgid "Low"
 msgstr "ä½?"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:20
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:21
 msgid "Mouse Orientation"
 msgstr "é¼ æ ?æ?¹å??"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:21
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:22
 msgid "Mouse Preferences"
 msgstr "é¼ æ ?é¦?é??项"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:22
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:23
 msgid "Pointer Speed"
 msgstr "æ??é??é??度"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:23
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:24
 msgid "Scrolling"
 msgstr "æ»?å?¨"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:24
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:25
 msgid "Seco_ndary click:"
 msgstr "第��(_N)�"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:25
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:26
 msgid "Sh_ow position of pointer when the Control key is pressed"
 msgstr "æ??ä½? Ctrl é?®æ?¶æ?¾ç¤ºæ??é??ä½?ç½®(_O)"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:27
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:28
 msgid "Show click type _window"
 msgstr "æ?¾ç¤ºç?¹å?»ç±»å??çª?å?£(_W)"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:28
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:29
 msgid "Simulated Secondary Click"
 msgstr "模æ??å??次ç?¹å?»"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:31
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:32
 msgid "Thr_eshold:"
 msgstr "é??å?¼(_E)ï¼?"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:32
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:33
 msgid ""
 "To test your double-click settings, try to double-click on the light bulb."
 msgstr "è¦?æµ?è¯?æ?¨ç??å??å?»è®¾ç½®ï¼?请è¯?ç??å??å?»å?³ä¾§ç??ç?¯æ³¡ã??"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:33
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:34
 msgid "Touchpad"
 msgstr "触��"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:34
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:35
 msgid "Two-_finger scrolling"
 msgstr "å??æ??æ»?å?¨(_F)"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:35
+#: ../capplets/mouse/gnome-mouse-properties.ui.h:36
 msgid "You can also use the Dwell Click panel applet to choose the click type."
 msgstr "æ?¨ä¹?å?¯ä»¥ä½¿ç?¨æ?¬å??ç?¹å?»é?¢æ?¿å°?ç¨?åº?æ?¥é??æ?©ç?¹å?»ç??ç±»å??ã??"
 
-#: ../capplets/mouse/gnome-mouse-properties.ui.h:38
-msgid "_Disable touchpad while typing"
-msgstr "æ??å­?æ?¶ç¦?ç?¨è§¦æ?¸æ?¿(_D)"
-
 #: ../capplets/mouse/gnome-mouse-properties.ui.h:39
 msgid "_Disabled"
 msgstr "��(_D)"
@@ -2802,15 +2890,15 @@ msgstr "设置æ?¨ç??ç½?ç»?代ç??é¦?é??项"
 
 #: ../capplets/network/gnome-network-properties.ui.h:1
 msgid "<b>Di_rect internet connection</b>"
-msgstr "<b>����� Internet(_R)</b>"
+msgstr "<b>ç?´æ?¥è¿?æ?¥å?°äº?è??ç½?(_R)</b>"
 
 #: ../capplets/network/gnome-network-properties.ui.h:2
 msgid "<b>_Automatic proxy configuration</b>"
-msgstr "<b>è?ªå?¨ä»£ç??é??ç½®(_A)</b>"
+msgstr "<b>è?ªå?¨é??置代ç??(_A)</b>"
 
 #: ../capplets/network/gnome-network-properties.ui.h:3
 msgid "<b>_Manual proxy configuration</b>"
-msgstr "<b>æ??å?¨é??置代ç??æ??å?¡å?¨(_M)</b>"
+msgstr "<b>æ??å?¨é??置代ç??(_M)</b>"
 
 #: ../capplets/network/gnome-network-properties.ui.h:4
 msgid "<b>_Use authentication</b>"
@@ -2834,7 +2922,7 @@ msgstr "HTTP 代ç??ç»?è??"
 
 #: ../capplets/network/gnome-network-properties.ui.h:9
 msgid "H_TTP proxy:"
-msgstr "HTTP 代ç??(_T)ï¼?"
+msgstr "H_TTP 代ç??ï¼?"
 
 #: ../capplets/network/gnome-network-properties.ui.h:10
 msgid "Ignore Host List"
@@ -2882,7 +2970,7 @@ msgstr "ç»?è??(_D)"
 
 #: ../capplets/network/gnome-network-properties.ui.h:21
 msgid "_FTP proxy:"
-msgstr "FTP 代ç??(_F)ï¼?"
+msgstr "_FTP 代ç??ï¼?"
 
 #: ../capplets/network/gnome-network-properties.ui.h:22
 msgid "_Location name:"
@@ -2902,7 +2990,7 @@ msgstr "为æ??æ??å??议使ç?¨ç?¸å??ç??代ç??(_U)"
 
 #: ../capplets/windows/gnome-window-properties.c:344
 msgid "Cannot start the preferences application for your window manager"
-msgstr "æ? æ³?å?¯å?¨æ?¨çª?å?£ç®¡ç??å?¨ç??é¦?é??项ç¨?åº?"
+msgstr "æ? æ³?å?¯å?¨æ?¨ç??çª?å?£ç®¡ç??å?¨ç??é¦?é??项ç¨?åº?"
 
 #: ../capplets/windows/gnome-window-properties.c:604
 msgid "_Alt"
@@ -2922,7 +3010,7 @@ msgstr "_Meta"
 
 #: ../capplets/windows/gnome-window-properties.ui.h:1
 msgid "Movement Key"
-msgstr "移å?¨é??å?¼"
+msgstr "移å?¨æ??é?®"
 
 #: ../capplets/windows/gnome-window-properties.ui.h:2
 msgid "Titlebar Action"
@@ -3004,7 +3092,7 @@ msgstr "���� [%s]\n"
 
 #: ../shell/control-center.c:143
 msgid "Hide on start (useful to preload the shell)"
-msgstr "å?¯å?¨æ?¶é??è??(对äº?é¢?å??å?¯å?¨ shell é??常æ??ç?¨)"
+msgstr "å?¯å?¨æ?¶é??è?? (对äº?é¢?å??å?¯å?¨ shell é??常æ??ç?¨)"
 
 #: ../shell/control-center.c:182
 msgid "Filter"
@@ -3029,7 +3117,7 @@ msgstr "�任��活�����中�"
 
 #: ../shell/control-center.schemas.in.h:2
 msgid "Exit shell on add or remove action performed"
-msgstr "æ?§è¡?æ·»å? æ??å? é?¤æ??ä½?æ?¶é??å?ºå¤?壳"
+msgstr "æ?§è¡?æ·»å? æ??移é?¤æ??ä½?æ?¶é??å?ºå¤?壳"
 
 #: ../shell/control-center.schemas.in.h:3
 msgid "Exit shell on help action performed"
@@ -3041,27 +3129,27 @@ msgstr "æ?§è¡?å?¯å?¨æ??ä½?æ?¶é??å?ºå¤?壳"
 
 #: ../shell/control-center.schemas.in.h:5
 msgid "Exit shell on upgrade or uninstall action performed"
-msgstr "å?¨å??级æ?¶é??å?ºäº? Shell æ??æ?§è¡?äº?å?¸è½½å?¨ä½?"
+msgstr "æ?§è¡?å??级æ??å?¸è½½æ??ä½?æ?¶é??å?ºå¤?壳"
 
 #: ../shell/control-center.schemas.in.h:6
 msgid "Indicates whether to close the shell when a help action is performed."
-msgstr "æ??示å?¨æ?§è¡?帮å?©å?¨ä½?æ?¶æ?¯å?¦å?³é?­ Shell"
+msgstr "æ??示å?¨æ?§è¡?帮å?©æ??ä½?æ?¶æ?¯å?¦å?³é?­å¤?壳"
 
 #: ../shell/control-center.schemas.in.h:7
 msgid "Indicates whether to close the shell when a start action is performed."
-msgstr "æ??示å?¨æ?§è¡?å?¯å?¨å?¨ä½?æ?¶æ?¯å?¦å?³é?­ Shell"
+msgstr "æ??示å?¨æ?§è¡?å?¯å?¨æ??ä½?æ?¶æ?¯å?¦å?³é?­å¤?壳"
 
 #: ../shell/control-center.schemas.in.h:8
 msgid ""
 "Indicates whether to close the shell when an add or remove action is "
 "performed."
-msgstr "æ??示å?¨æ?§è¡?æ·»å? æ??移é?¤å?¨ä½?æ?¶æ?¯å?¦å?³é?­ Shell"
+msgstr "æ??示å?¨æ?§è¡?æ·»å? æ??移é?¤æ??ä½?æ?¶æ?¯å?¦å?³é?­å¤?壳"
 
 #: ../shell/control-center.schemas.in.h:9
 msgid ""
 "Indicates whether to close the shell when an upgrade or uninstall action is "
 "performed."
-msgstr "æ??示å?¨æ?§è¡?å??级æ??å?¸è½½å?¨ä½?æ?¶æ?¯å?¦å?³é?­ Shell"
+msgstr "æ??示å?¨æ?§è¡?å??级æ??å?¸è½½æ??ä½?æ?¶æ?¯å?¦å?³é?­å¤?壳"
 
 #: ../shell/control-center.schemas.in.h:10
 msgid "Task names and associated .desktop files"
@@ -3102,68 +3190,79 @@ msgstr "æ?¨è¿?é?´é??(_P)"
 msgid "Take a break!"
 msgstr "�����"
 
-#: ../typing-break/drwright.c:116
+#: ../typing-break/drwright.c:136
 msgid "_Take a Break"
 msgstr "����(_T)"
 
-#: ../typing-break/drwright.c:440
+#: ../typing-break/drwright.c:507
+#, c-format
+msgid "Take a break now (next in %dm)"
+msgstr ""
+
+#: ../typing-break/drwright.c:509
 #, c-format
 msgid "%d minute until the next break"
 msgid_plural "%d minutes until the next break"
 msgstr[0] "è·?ä¸?次é?´é??è¿?æ?? %d å??é??"
 
-#: ../typing-break/drwright.c:444
+#: ../typing-break/drwright.c:515
+#, c-format
+msgid "Take a break now (next in less than one minute)"
+msgstr ""
+
+#: ../typing-break/drwright.c:517
 #, c-format
 msgid "Less than one minute until the next break"
 msgstr "è·?ä¸?次é?´é??è¿?æ??ä¸?å?°ä¸?å??é??ã??"
 
-#: ../typing-break/drwright.c:526
+#: ../typing-break/drwright.c:614
 #, c-format
 msgid ""
 "Unable to bring up the typing break properties dialog with the following "
 "error: %s"
 msgstr "æ? æ³?å?¯å?¨æ??å­?é?´é??å±?æ?§å¯¹è¯?æ¡?ï¼?é??误å¦?ä¸?ï¼?%s"
 
-#: ../typing-break/drwright.c:543
+#: ../typing-break/drwright.c:631
 msgid "Written by Richard Hult <richard imendio com>"
 msgstr "ç?± Richard Hult <richard imendio com> ç¼?å??"
 
-#: ../typing-break/drwright.c:544
+#: ../typing-break/drwright.c:632
 msgid "Eye candy added by Anders Carlsson"
-msgstr "ç?«å½©è§?è§?æ??æ??ç?± Anders Carlsson ä¸ºä½ å¸¦æ?¥"
+msgstr "ç?«å½©è§?è§?æ??æ??ç?± Anders Carlsson 带æ?¥"
 
-#: ../typing-break/drwright.c:553
+#: ../typing-break/drwright.c:641
 msgid "A computer break reminder."
 msgstr "计ç®?æ?ºé?´é??æ??é??ç¨?åº?ã??"
 
-#: ../typing-break/drwright.c:555
+#: ../typing-break/drwright.c:643
 msgid "translator-credits"
 msgstr ""
 "å¼?æº?å?½é??å??ä¹? GNOME ç®?ä½?中æ??ç»?\n"
-"Yang Zhang zyangmath gmail com (2007)\n"
-"ç??é?²(Gan Lu) <rhythm gan gmail com>"
+"Yang Zhang <zyangmath gmail com> (2007)\n"
+"ç??é?²(Gan Lu) <rhythm gan gmail com> (2009)\n"
+"Xhacler Liu <liu dongyuan gmail com> (2010)"
 
-#: ../typing-break/main.c:61
+#: ../typing-break/main.c:63
 msgid "Enable debugging code"
 msgstr "å?¯ç?¨è°?è¯?代ç ?"
 
-#: ../typing-break/main.c:63
+#: ../typing-break/main.c:65
 msgid "Don't check whether the notification area exists"
-msgstr "ä¸?æ£?æ?¥é??ç?¥å?ºæ?¯å?¦å­?å?¨"
+msgstr "ä¸?æ£?æ?¥é??ç?¥å?ºå??æ?¯å?¦å­?å?¨"
 
-#: ../typing-break/main.c:89
+#: ../typing-break/main.c:91
 msgid "Typing Monitor"
 msgstr "æ??å­?æ?¾ç¤ºå?¨"
 
-#: ../typing-break/main.c:105
+#: ../typing-break/main.c:108
 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 "
 "right-clicking on your panel and choosing 'Add to panel', selecting "
 "'Notification area' and clicking 'Add'."
 msgstr ""
-"æ??å­?æ?¾ç¤ºå?¨ä½¿ç?¨é??ç?¥å?ºæ?¾ç¤ºä¿¡æ?¯ã??ä¼¼ä¹?æ?¨å¹¶æ²¡æ??å?¨é?¢æ?¿ä¸?æ?¾ç½®é??ç?¥å?ºã??è¦?æ?³æ·»å? é??ç?¥"
-"å?ºï¼?å?ªé??ç?¨é¼ æ ?é?®ä»¶ç?¹å?»é?¢æ?¿ï¼?ç?¶å??é??æ?©â??æ·»å? å?°é?¢æ?¿ -> é??ç?¥å?ºâ??ã??"
+"æ??å­?æ?¾ç¤ºå?¨ä½¿ç?¨é??ç?¥å?ºå??æ?¾ç¤ºä¿¡æ?¯ã??ä¼¼ä¹?æ?¨å¹¶æ²¡æ??å?¨é?¢æ?¿ä¸?æ?¾ç½®é??ç?¥å?ºå??ã??è¦?æ·»å? é??ç?¥"
+"å?ºå??ï¼?å?ªé??ç?¨é¼ æ ?å?³é?®ç?¹å?»é?¢æ?¿ï¼?ç?¶å??é??æ?©â??æ·»å? å?°é?¢æ?¿ -> é??ç?¥å?ºå??â??ã??"
 
 #: ../font-viewer/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3261,7 +3360,7 @@ msgstr "æ??è¿°ï¼?"
 
 #: ../font-viewer/font-view.c:441
 msgid "Installed"
-msgstr "��"
+msgstr "已��"
 
 #: ../font-viewer/font-view.c:444
 msgid "Install Failed"
@@ -3286,7 +3385,7 @@ msgstr "����"
 
 #: ../font-viewer/font-thumbnailer.c:245
 msgid "Text to thumbnail (default: Aa)"
-msgstr "缩ç?¥å?¾ä½¿ç?¨æ??å­?(é»?认ï¼?Aa)"
+msgstr "缩ç?¥å?¾ä½¿ç?¨æ??å­? (é»?认ï¼?Aa)"
 
 #: ../font-viewer/font-thumbnailer.c:245
 msgid "TEXT"
@@ -3294,7 +3393,7 @@ msgstr "æ??å­?"
 
 #: ../font-viewer/font-thumbnailer.c:247
 msgid "Font size (default: 64)"
-msgstr "��大�(�认�64)"
+msgstr "��大� (�认�64)"
 
 #: ../font-viewer/font-thumbnailer.c:247
 msgid "SIZE"
@@ -3312,7 +3411,7 @@ msgstr "å¤?ç??å??æ?°æ?¶å?ºé??ï¼?%s\n"
 #: ../libslab/app-shell.c:754
 #, c-format
 msgid "Your filter \"%s\" does not match any items."
-msgstr "æ?¨ç??è¿?滤å?¨ \"%s\" ä¸?符å??ä»»ä½?æ?¡ç?®ã??"
+msgstr "æ?¨ç??è¿?滤å?¨â??%sâ??ä¸?符å??ä»»ä½?项ã??"
 
 #: ../libslab/app-shell.c:756
 msgid "No matches found."
@@ -3320,7 +3419,7 @@ msgstr "没æ??æ?¾å?°ç¬¦å??ç??ã??"
 
 #: ../libslab/app-shell.c:905
 msgid "Other"
-msgstr "��"
+msgstr "��"
 
 #. make start action
 #: ../libslab/application-tile.c:374
@@ -3394,7 +3493,7 @@ msgstr "é??å?½å??..."
 #: ../libslab/directory-tile.c:204 ../libslab/directory-tile.c:213
 #: ../libslab/document-tile.c:248 ../libslab/document-tile.c:257
 msgid "Send To..."
-msgstr "å??é??è?³..."
+msgstr "å??é??å?°..."
 
 #. make move to trash action
 #: ../libslab/directory-tile.c:228 ../libslab/document-tile.c:283
@@ -3409,11 +3508,11 @@ msgstr "å? é?¤"
 #: ../libslab/directory-tile.c:533 ../libslab/document-tile.c:985
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr "æ?¨ç¡®å®?æ?³è¦?æ°¸ä¹?å? é?¤â??%sâ??å??ï¼?"
+msgstr "æ?¨ç¡®å®?è¦?æ°¸ä¹?å? é?¤â??%sâ??å??ï¼?"
 
 #: ../libslab/directory-tile.c:534 ../libslab/document-tile.c:986
 msgid "If you delete an item, it is permanently lost."
-msgstr "å¦?æ??æ?¨å? é?¤ä¸?项ç??è¯?ï¼?å®?å°?æ°¸ä¹?丢失ã??"
+msgstr "å¦?æ??æ?¨å? é?¤ä¸?项ï¼?å®?å°?æ°¸ä¹?丢失ã??"
 
 #: ../libslab/document-tile.c:193
 #, c-format
@@ -3430,7 +3529,7 @@ msgstr "å?¨æ??件管ç??å?¨ä¸­æ??å¼?"
 
 #: ../libslab/document-tile.c:617
 msgid "?"
-msgstr "?"
+msgstr "ï¼?"
 
 #: ../libslab/document-tile.c:624
 msgid "%l:%M %p"
@@ -3470,6 +3569,24 @@ msgstr "<b>æ??å¼? %s</b>"
 msgid "Remove from System Items"
 msgstr "ä»?ç³»ç»?项ç?®ä¸­å? é?¤"
 
+#~ msgid "_Jabber:"
+#~ msgstr "_Jabberï¼?"
+
+#~ msgid "Display Preferences"
+#~ msgstr "æ?¾ç¤ºé¦?é??项"
+
+#~ msgid "Drag the monitors to set their place"
+#~ msgstr "æ??å?¨æ?¾ç¤ºå?¨ä»¥è®¾å®?å®?们ç??ä½?ç½®"
+
+#~ msgid "_Mirror screens"
+#~ msgstr "é??å??å±?å¹?(_M)"
+
+#~ msgid "Change screen resolution"
+#~ msgstr "æ?´æ?¹å±?å¹?å??辨ç??"
+
+#~ msgid "Display"
+#~ msgstr "�示"
+
 #~ msgid "C_ontrol"
 #~ msgstr "C_trl"