[gnome-control-center] Update Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit cb44acd659394a6cf11498b4673b18bdccd15f56
Author: Aron Xu <aronxu gnome org>
Date:   Sun Nov 14 04:04:46 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 4027 +++++++++++++++++++++++++----------------------------------
 1 files changed, 1690 insertions(+), 2337 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6288ea4..eed1fdb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,5 +1,5 @@
 # Simplified Chinese translation for gnome-control-center.
-# Copyright (C) 2002, 2003, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2006, 2009, 2010 Free Software Foundation, Inc.
 # some translations stolen from tranditional chinese translation
 # by Abel Cheung <maddog linuxhall org>, 2001
 # He Qiangqiang <carton linux net cn>, 2002
@@ -10,13 +10,15 @@
 # FujianWzh <fujianwzh gmail com>, 2009
 # Tao Wei <weitao1979 gmail com>, 2009, 2010.
 # Xhacker Liu <liu dongyuan gmail com>, 2010.
+# �� <bill_zt sina com>, 2010.
+# Aron Xu <happyaron xu 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: 2010-07-01 07:01+0000\n"
-"PO-Revision-Date: 2010-07-24 13:55+0800\n"
+"POT-Creation-Date: 2010-11-09 18:54+0000\n"
+"PO-Revision-Date: 2010-11-14 04:04+0800\n"
 "Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -54,1182 +56,222 @@ msgid ""
 "will not appear."
 msgstr "è?·å¾?æ?´å¤?æ¡?é?¢ä¸»é¢?ç??ç½?å??ã??å¦?æ??设å®?为空å­?符串ï¼?é?£ä¹?é?¾æ?¥å°?ä¸?ä¼?å?ºç?°ã??"
 
-#: ../capplets/about-me/eel-alert-dialog.c:110
-msgid "Image/label border"
-msgstr "å?¾å??/æ ?签边æ¡?"
-
-#: ../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:120
-msgid "Alert Type"
-msgstr "æ??é??ç±»å??"
-
-#: ../capplets/about-me/eel-alert-dialog.c:121
-msgid "The type of alert"
-msgstr "æ??é??ç±»å??"
-
-#: ../capplets/about-me/eel-alert-dialog.c:129
-msgid "Alert Buttons"
-msgstr "æ??é??æ??é?®"
-
-#: ../capplets/about-me/eel-alert-dialog.c:130
-msgid "The buttons shown in the alert dialog"
-msgstr "æ??é??对è¯?æ¡?中æ?¾ç¤ºç??æ??é?®"
-
-#: ../capplets/about-me/eel-alert-dialog.c:194
-msgid "Show more _details"
-msgstr "æ?¾ç¤ºæ?´å¤?ç»?è??(_D)"
-
-#: ../capplets/about-me/fingerprint-strings.h:28
-#, c-format
-msgid "Place your left thumb on %s"
-msgstr "请å°?å·¦æ??æ??æ??æ?¾å?¨ %s ä¹?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:28
-#, c-format
-msgid "Swipe your left thumb on %s"
-msgstr "请å°?å·¦æ??æ??æ??æ?¾å?¨ %s ä¹?ä¸?å?·ä¸?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:29
-#, c-format
-msgid "Place your left index finger on %s"
-msgstr "请å°?å·¦æ??é£?æ??æ?¾å?¨ %s ä¹?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:29
-#, c-format
-msgid "Swipe your left index finger on %s"
-msgstr "请å°?å·¦æ??é£?æ??æ?¾å?¨ %s ä¹?ä¸?å?·ä¸?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:30
-#, c-format
-msgid "Place your left middle finger on %s"
-msgstr "请å°?å·¦æ??中æ??æ?¾å?¨ %s ä¹?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:30
-#, c-format
-msgid "Swipe your left middle finger on %s"
-msgstr "请å°?å·¦æ??中æ??æ?¾å?¨ %s ä¹?ä¸?å?·ä¸?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:31
-#, c-format
-msgid "Place your left ring finger on %s"
-msgstr "请å°?å·¦æ??æ? å??æ??æ?¾å?¨ %s ä¹?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:31
-#, c-format
-msgid "Swipe your left ring finger on %s"
-msgstr "请å°?å·¦æ??æ? å??æ??æ?¾å?¨ %s ä¹?ä¸?å?·ä¸?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:32
-#, c-format
-msgid "Place your left little finger on %s"
-msgstr "请å°?å·¦æ??å°?æ??æ?¾å?¨ %s ä¹?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:32
-#, c-format
-msgid "Swipe your left little finger on %s"
-msgstr "请å°?å·¦æ??å°?æ??æ?¾å?¨ %s ä¹?ä¸?å?·ä¸?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:33
-#, c-format
-msgid "Place your right thumb on %s"
-msgstr "请å°?å?³æ??æ??æ??æ?¾å?¨ %s ä¹?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:33
-#, c-format
-msgid "Swipe your right thumb on %s"
-msgstr "请å°?å?³æ??æ??æ??æ?¾å?¨ %s ä¹?ä¸?å?·ä¸?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:34
-#, c-format
-msgid "Place your right index finger on %s"
-msgstr "请å°?å?³æ??é£?æ??æ?¾å?¨ %s ä¹?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:34
-#, c-format
-msgid "Swipe your right index finger on %s"
-msgstr "请å°?å?³æ??é£?æ??æ?¾å?¨ %s ä¹?ä¸?å?·ä¸?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:35
-#, c-format
-msgid "Place your right middle finger on %s"
-msgstr "请å°?å?³æ??中æ??æ?¾å?¨ %s ä¹?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:35
-#, c-format
-msgid "Swipe your right middle finger on %s"
-msgstr "请å°?å?³æ??中æ??æ?¾å?¨ %s ä¹?ä¸?å?·ä¸?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:36
-#, c-format
-msgid "Place your right ring finger on %s"
-msgstr "请å°?å?³æ??æ? å??æ??æ?¾å?¨ %s ä¹?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:36
-#, c-format
-msgid "Swipe your right ring finger on %s"
-msgstr "请å°?å?³æ??æ? å??æ??æ?¾å?¨ %s ä¹?ä¸?å?·ä¸?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:37
-#, c-format
-msgid "Place your right little finger on %s"
-msgstr "请å°?å?³æ??å°?æ??æ?¾å?¨ %s ä¹?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:37
-#, c-format
-msgid "Swipe your right little finger on %s"
-msgstr "请å°?å?³æ??å°?æ??æ?¾å?¨ %s ä¹?ä¸?å?·ä¸?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:72
-#: ../capplets/about-me/fingerprint-strings.h:98
-msgid "Place your finger on the reader again"
-msgstr "请å°?æ??æ??é??æ?°æ?¾å?¨è¯»å??å?¨ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:74
-#: ../capplets/about-me/fingerprint-strings.h:100
-msgid "Swipe your finger again"
-msgstr "请é??æ?°å?·ä¸?ä¸?æ??æ??"
-
-#: ../capplets/about-me/fingerprint-strings.h:77
-#: ../capplets/about-me/fingerprint-strings.h:103
-msgid "Swipe was too short, try again"
-msgstr "å?·å¾?太快ï¼?请é??è¯?"
-
-#: ../capplets/about-me/fingerprint-strings.h:79
-#: ../capplets/about-me/fingerprint-strings.h:105
-msgid "Your finger was not centered, try swiping your finger again"
-msgstr "æ??æ??æ?ªæ?¾å?¨æ­£ä¸­ï¼?请é??æ?°å?·ä¸?ä¸?"
-
-#: ../capplets/about-me/fingerprint-strings.h:81
-#: ../capplets/about-me/fingerprint-strings.h:107
-msgid "Remove your finger, and try swiping your finger again"
-msgstr "请移å¼?æ??æ??ï¼?ç?¶å??é??å?·ä¸?次"
-
-#: ../capplets/about-me/gnome-about-me.c:716
-msgid "Select Image"
-msgstr "é??æ?©å?¾å??"
-
-#: ../capplets/about-me/gnome-about-me.c:718
-msgid "No Image"
-msgstr "æ? å?¾å??"
-
-#: ../capplets/about-me/gnome-about-me.c:746
-#: ../capplets/appearance/appearance-desktop.c:658
-msgid "Images"
-msgstr "å?¾å??"
-
-#: ../capplets/about-me/gnome-about-me.c:750
-#: ../capplets/appearance/theme-installer.c:766
-msgid "All Files"
-msgstr "å?¨é?¨æ??件"
-
-#: ../capplets/about-me/gnome-about-me.c:890
-msgid ""
-"There was an error while trying to get the addressbook information\n"
-"Evolution Data Server can't handle the protocol"
-msgstr ""
-"è¯?å?¾è?·å??å?°å??ç°¿ä¿¡æ?¯æ?¶å?ºé??\n"
-"Evolution æ?°æ?®æ??å?¡å?¨æ? æ³?å¤?ç??å??è®®"
-
-#: ../capplets/about-me/gnome-about-me.c:911
-msgid "Unable to open address book"
-msgstr "æ? æ³?æ??å¼?å?°å??ç°¿"
-
-#: ../capplets/about-me/gnome-about-me.c:934
-#, c-format
-msgid "About %s"
-msgstr "�� %s"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:1
-msgid "A_IM/iChat:"
-msgstr "A_IM/iChatï¼?"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:2
-msgid "A_ddress:"
-msgstr "å?°å??(_D)ï¼?"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:3
-msgid "A_ssistant:"
-msgstr "å?©æ??(_S)ï¼?"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:4
-#: ../capplets/about-me/gnome-about-me.desktop.in.in.h:1
-msgid "About Me"
-msgstr "å?³äº?æ??"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:5
-msgid "Address"
-msgstr "å?°å??"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:6
-msgid "C_ity:"
-msgstr "å??å¸?(_I)ï¼?"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:7
-msgid "C_ompany:"
-msgstr "��(_O)�"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:8
-msgid "Cale_ndar:"
-msgstr "æ?¥å??(_N)ï¼?"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:9
-msgid "Change Passwo_rd..."
-msgstr "æ?´æ?¹å¯?ç ?(_R)..."
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:10
-msgid "Ci_ty:"
-msgstr "å??å¸?(_T)ï¼?"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:11
-msgid "Co_untry:"
-msgstr "�家/��(_U)�"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:12
-msgid "Contact"
-msgstr "è??ç³»"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:13
-msgid "Cou_ntry:"
-msgstr "�家/��(_N)�"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:14
-msgid "Disable _Fingerprint Login..."
-msgstr "ç¦?ç?¨æ??纹ç?»å½?(_F)..."
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:15
-msgid "Email"
-msgstr "���件"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:16
-msgid "Enable _Fingerprint Login..."
-msgstr "å?¯ç?¨æ??纹ç?»å½?(_F)..."
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:17
-msgid "Full Name"
-msgstr "å?¨å??"
-
-#. Home vs Work (phone)
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:19
-msgid "Hom_e:"
-msgstr "家庭(_E)�"
-
-#. Home vs Work (address)
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:21
-msgid "Home"
-msgstr "家庭"
-
-#: ../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:23
-msgid "Instant Messaging"
-msgstr "å?³æ?¶é??讯"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:24
-msgid "Job"
-msgstr "工�"
-
-#: ../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:26
-msgid "P.O. _box:"
-msgstr "��信箱(_B)�"
-
-#: ../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:28
-msgid "Personal Info"
-msgstr "个人信�"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:29
-msgid "Select your photo"
-msgstr "é??æ?©æ?¨ç??ç?§ç??"
-
-#: ../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:31
-msgid "Telephone"
-msgstr "��"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:32
-msgid "User name:"
-msgstr "ç?¨æ?·å??ï¼?"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:33
-msgid "Web"
-msgstr "ç½?ç»?"
-
-#: ../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:35
-msgid "Wor_k:"
-msgstr "工�(_K)�"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:36
-msgid "Work"
-msgstr "工�"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:37
-msgid "Work _fax:"
-msgstr "å·¥ä½?ä¼ ç??(_F)ï¼?"
-
-#: ../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:39
-msgid "_Address:"
-msgstr "å?°å??(_A)ï¼?"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:40
-msgid "_Department:"
-msgstr "��(_D)�"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:41
-msgid "_GroupWise:"
-msgstr "_Groupwiseï¼?"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:42
-msgid "_Home page:"
-msgstr "主页(_H)�"
-
-#. 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:45
-msgid "_Manager:"
-msgstr "ç»?ç??(_M)ï¼?"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:46
-msgid "_Mobile:"
-msgstr "移���(_M)�"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:47
-msgid "_Profession:"
-msgstr "��(_P)�"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:48
-msgid "_State/Province:"
-msgstr "å·?/ç??(_S)ï¼?"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:49
-msgid "_Title:"
-msgstr "称�(_T)�"
-
-#: ../capplets/about-me/gnome-about-me-dialog.ui.h:50
-msgid "_Work:"
-msgstr "工�(_W)�"
-
-#: ../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:53
-msgid "_ZIP/Postal code:"
-msgstr "é?®æ?¿ç¼?ç ?(_Z)ï¼?"
-
-#: ../capplets/about-me/gnome-about-me.desktop.in.in.h:2
-msgid "Set your personal information"
-msgstr "设置æ?¨ç??个人信æ?¯"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:97
-msgid ""
-"You are not allowed to access the device. Contact your system administrator."
-msgstr "æ?¨æ?ªè¢«å??许访é?®è¯¥è®¾å¤?ã??请è??ç³»æ?¨ç??ç³»ç»?管ç??å??ã??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:99
-msgid "The device is already in use."
-msgstr "设å¤?使ç?¨ä¸­ã??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:101
-msgid "An internal error occured"
-msgstr "å??ç??äº?ä¸?个å??é?¨é??误"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:218
-msgid "Delete registered fingerprints?"
-msgstr "è¦?å? é?¤å·²ç?»è®°ç??æ??纹å??ï¼?"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:221
-msgid "_Delete Fingerprints"
-msgstr "å? é?¤æ??纹(_D)"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:228
-msgid ""
-"Do you want to delete your registered fingerprints so fingerprint login is "
-"disabled?"
-msgstr "ä½ æ?³å? é?¤å·²ç?»è®°ç??æ??纹å??ï¼?è¿?æ ·å??å°?ç¦?ç?¨æ??纹ç?»å½?ã??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:356
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:1
-msgid "Done!"
-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:402
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:424
-#, c-format
-msgid "Could not access '%s' device"
-msgstr "æ? æ³?访é?®â??%sâ??设å¤?"
+#: ../libgnome-control-center/gconf-property-editor.c:134
+msgid "Key"
+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:473
-#, c-format
-msgid "Could not start finger capture on '%s' device"
-msgstr "æ? æ³?å?¨â??%sâ??设å¤?ä¸?å?¯å?¨æ??æ??æ??æ??"
+#: ../libgnome-control-center/gconf-property-editor.c:135
+msgid "GConf key to which this property editor is attached"
+msgstr "æ?¬å±?æ?§ç¼?è¾?å?¨ç¼?è¾?ç?? GConf é?®"
 
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:520
-msgid "Could not access any fingerprint readers"
-msgstr "æ? æ³?访é?®æ??纹读å??å?¨"
+#: ../libgnome-control-center/gconf-property-editor.c:141
+msgid "Callback"
+msgstr "å??è°?"
 
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:521
-msgid "Please contact your system administrator for help."
-msgstr "请è??系系ç»?管ç??å??以寻æ±?帮å?©ã??"
+#: ../libgnome-control-center/gconf-property-editor.c:142
+msgid "Issue this callback when the value associated with key gets changed"
+msgstr "å½?å??é?®å?³è??ç??å?¼æ?¹å??æ?¶æ?§è¡?该å??è°?"
 
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:551
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:2
-msgid "Enable Fingerprint Login"
-msgstr "å?¯ç?¨æ??纹ç?»å½?"
+#: ../libgnome-control-center/gconf-property-editor.c:147
+msgid "Change set"
+msgstr "æ?¹å?¨é??"
 
-#. translators:
-#. * 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:581
-#, c-format
+#: ../libgnome-control-center/gconf-property-editor.c:148
 msgid ""
-"To enable fingerprint login, you need to save one of your fingerprints, "
-"using the '%s' device."
-msgstr "è¦?å?¯ç?¨æ??纹ç?»å½?ï¼?ä½ é??è¦?使ç?¨â??%sâ??设å¤?æ?¥ä¿?å­?æ?¨ç??ä¸?个æ??纹ã??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:590
-msgid "Swipe finger on reader"
-msgstr "å?¨è¯»å??å?¨ä¸?å?·ä¸?ä¸?æ??æ??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.c:592
-msgid "Place finger on reader"
-msgstr "å°?æ??æ??æ?¾å?¨è¯»å??å?¨ä¸?"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:3
-msgid "Left index finger"
-msgstr "å·¦æ??é£?æ??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:4
-msgid "Left little finger"
-msgstr "å·¦æ??å°?æ??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:5
-msgid "Left middle finger"
-msgstr "å·¦æ??中æ??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:6
-msgid "Left ring finger"
-msgstr "å·¦æ??æ? å??æ??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:7
-msgid "Left thumb"
-msgstr "å·¦æ??æ??æ??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:8
-msgid "Other finger: "
-msgstr "å?¶ä»?æ??æ??ï¼?"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:9
-msgid "Right index finger"
-msgstr "å?³æ??é£?æ??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:10
-msgid "Right little finger"
-msgstr "å?³æ??å°?æ??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:11
-msgid "Right middle finger"
-msgstr "å?³æ??中æ??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:12
-msgid "Right ring finger"
-msgstr "å?³æ??æ? å??æ??"
-
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:13
-msgid "Right thumb"
-msgstr "å?³æ??æ??æ??"
+"GConf change set containing data to be forwarded to the gconf client on apply"
+msgstr "å??å?«åº?ç?¨ä¿®æ?¹æ?¶è¦?ä¼ é??ç»? gconf 客æ?·ç«¯ç??æ?°æ?®ç?? GConf æ?¹å?¨é??å??"
 
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:14
-msgid "Select finger"
-msgstr "é??æ?©æ??æ??"
+#: ../libgnome-control-center/gconf-property-editor.c:153
+msgid "Conversion to widget callback"
+msgstr "转æ?¢å?°é?¨ä»¶æ?¶ç??å??è°?"
 
-#: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:15
+#: ../libgnome-control-center/gconf-property-editor.c:154
 msgid ""
-"Your fingerprint was successfully saved. You should now be able to log in "
-"using your fingerprint reader."
-msgstr "æ?¨ç??æ??纹已æ??å??ä¿?å­?ã??æ?¨ç?°å?¨åº?该å?¯ä»¥ä½¿ç?¨æ??纹读å??å?¨ç?»å½?äº?ã??"
-
-#: ../capplets/about-me/gnome-about-me-password.c:161
-msgid "Child exited unexpectedly"
-msgstr "å­?è¿?ç¨?æ??å¤?é??å?º"
-
-#: ../capplets/about-me/gnome-about-me-password.c:296
-#, c-format
-msgid "Could not shutdown backend_stdin IO channel: %s"
-msgstr "æ? æ³?å?³é?­å??端æ ?å??è¾?å?¥é??é??ï¼?%s"
-
-#: ../capplets/about-me/gnome-about-me-password.c:309
-#, c-format
-msgid "Could not shutdown backend_stdout IO channel: %s"
-msgstr "æ? æ³?å?³é?­å??端æ ?å??è¾?å?ºé??é??ï¼?%s"
+"Callback to be issued when data are to be converted from GConf to the widget"
+msgstr "å½?æ?°æ?®ä»? GConf 转æ?¢å?°é?¨ä»¶æ?¶ä½¿ç?¨ç??å??è°?"
 
-#: ../capplets/about-me/gnome-about-me-password.c:408
-msgid "Authenticated!"
-msgstr "å·²é??è¿?身份éª?è¯?ï¼?"
+#: ../libgnome-control-center/gconf-property-editor.c:159
+msgid "Conversion from widget callback"
+msgstr "ä»?é?¨ä»¶è½¬æ?¢æ?¶ç??å??è°?"
 
-#. This is a re-auth, and it failed.
-#. * The password must have been changed in the meantime!
-#. * Ask the user to re-authenticate
-#.
-#. 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:559
+#: ../libgnome-control-center/gconf-property-editor.c:160
 msgid ""
-"Your password has been changed since you initially authenticated! Please re-"
-"authenticate."
-msgstr "æ?¨ç??å¯?ç ?å?¨æ?¨é¦?次ç?»å½?å??å·²ç»?æ?´æ?¹ã??请é??æ?°è¿?è¡?身份éª?è¯?ã??"
-
-#: ../capplets/about-me/gnome-about-me-password.c:476
-msgid "That password was incorrect."
-msgstr "å¯?ç ?é??误ã??"
-
-#: ../capplets/about-me/gnome-about-me-password.c:527
-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:537
-#, c-format
-msgid "System error: %s."
-msgstr "ç³»ç»?é??误ï¼?%sã??"
+"Callback to be issued when data are to be converted to GConf from the widget"
+msgstr "å½?æ?°æ?®ä»?é?¨ä»¶è½¬æ?¢å?° GConf æ?¶ä½¿ç?¨ç??å??è°?"
 
-#: ../capplets/about-me/gnome-about-me-password.c:540
-msgid "The password is too short."
-msgstr "å¯?ç ?太ç?­ã??"
+#: ../libgnome-control-center/gconf-property-editor.c:165
+msgid "UI Control"
+msgstr "ç?¨æ?·ç??é?¢æ?§ä»¶"
 
-#: ../capplets/about-me/gnome-about-me-password.c:544
-msgid "The password is too simple."
-msgstr "å¯?ç ?太ç®?å??ã??"
+#: ../libgnome-control-center/gconf-property-editor.c:166
+msgid "Object that controls the property (normally a widget)"
+msgstr "æ?§å?¶å±?æ?§ç??对象 (é??常为é?¨ä»¶)"
 
-#: ../capplets/about-me/gnome-about-me-password.c:549
-msgid "The old and new passwords are too similar."
-msgstr "æ?§å¯?ç ?å??æ?°å¯?ç ?太ç?¸ä¼¼ã??"
+#: ../libgnome-control-center/gconf-property-editor.c:181
+msgid "Property editor object data"
+msgstr "�����对象��"
 
-#: ../capplets/about-me/gnome-about-me-password.c:551
-msgid "The new password must contain numeric or special character(s)."
-msgstr "å¿?é¡»å??å?«æ?°å­?æ??ç?¹æ®?å­?符ã??"
+#: ../libgnome-control-center/gconf-property-editor.c:182
+msgid "Custom data required by the specific property editor"
+msgstr "ç?¹å®?ç??å±?æ?§ç¼?è¾?å?¨æ??é??è¦?ç??è?ªå®?ä¹?æ?°æ?®"
 
-#: ../capplets/about-me/gnome-about-me-password.c:554
-msgid "The old and new passwords are the same."
-msgstr "æ?§å¯?ç ?å??æ?°å¯?ç ?ç?¸å??ã??"
+#: ../libgnome-control-center/gconf-property-editor.c:188
+msgid "Property editor data freeing callback"
+msgstr "å±?æ?§ç¼?è¾?å?¨æ?°æ?®é??æ?¾å??è°?å?½æ?°"
 
-#: ../capplets/about-me/gnome-about-me-password.c:556
-msgid "The new password has already been used recently."
-msgstr "æ?°å¯?ç ?å?¨æ??è¿?å·²ç»?使ç?¨è¿?ã??"
+#: ../libgnome-control-center/gconf-property-editor.c:189
+msgid "Callback to be issued when property editor object data is to be freed"
+msgstr "å½?å±?æ?§ç¼?è¾?å?¨å¯¹è±¡æ?°æ?®è¦?被é??æ?¾æ?¶è¦?è°?ç?¨ç??å??è°?å?½æ?°"
 
-#. translators: Unable to launch <program>: <error message>
-#: ../capplets/about-me/gnome-about-me-password.c:827
+#: ../libgnome-control-center/gconf-property-editor.c:1406
 #, c-format
-msgid "Unable to launch %s: %s"
-msgstr "æ? æ³?å?¯å?¨ %sï¼?%s"
-
-#: ../capplets/about-me/gnome-about-me-password.c:831
-msgid "Unable to launch backend"
-msgstr "æ? æ³?è°?ç?¨å??端"
-
-#: ../capplets/about-me/gnome-about-me-password.c:832
-msgid "A system error has occurred"
-msgstr "å??ç??äº?ç³»ç»?é??误"
-
-#. Update status message
-#: ../capplets/about-me/gnome-about-me-password.c:852
-msgid "Checking password..."
-msgstr "æ­£å?¨æ£?æ?¥å¯?ç ?..."
-
-#: ../capplets/about-me/gnome-about-me-password.c:939
-msgid "Click <b>Change password</b> to change your password."
-msgstr "å??å?»<b>æ?´æ?¹å¯?ç ?</b>å?¯æ?´æ?¹å¯?ç ?ã??"
-
-#: ../capplets/about-me/gnome-about-me-password.c:942
-msgid "Please type your password in the <b>New password</b> field."
-msgstr "请å?¨<b>æ?°å¯?ç ?</b>æ¡?中è¾?å?¥æ?¨ç??æ?°å¯?ç ?ã??"
-
-#: ../capplets/about-me/gnome-about-me-password.c:945
-#: ../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:948
-msgid "The two passwords are not equal."
-msgstr "è¾?å?¥ç??两个å¯?ç ?ä¸?å??ã??"
-
-#: ../capplets/about-me/gnome-about-me-password.ui.h:1
-msgid "Change pa_ssword"
-msgstr "æ?´æ?¹å¯?ç ?(_S)"
-
-#: ../capplets/about-me/gnome-about-me-password.ui.h:2
-msgid "Change password"
-msgstr "æ?´æ?¹å¯?ç ?"
-
-#: ../capplets/about-me/gnome-about-me-password.ui.h:3
-msgid "Change your password"
-msgstr "æ?´æ?¹æ?¨ç??å¯?ç ?"
-
-#: ../capplets/about-me/gnome-about-me-password.ui.h:4
-msgid "Current _password:"
-msgstr "å½?å??å¯?ç ?(_P)ï¼?"
-
-#: ../capplets/about-me/gnome-about-me-password.ui.h:6
-msgid ""
-"To change your password, enter your current password in the field below and "
-"click <b>Authenticate</b>.\n"
-"After you have authenticated, enter your new password, retype it for "
-"verification and click <b>Change password</b>."
+"Couldn't find the file '%s'.\n"
+"\n"
+"Please make sure it exists and try again, or choose a different background "
+"picture."
 msgstr ""
-"è¦?æ?´æ?¹æ?¨ç??å¯?ç ?ï¼?请å?¨ä¸?é?¢ç??æ¡?中è¾?å?¥æ?¨ç?®å??ç??å¯?ç ?ï¼?ç?¶å??å??å?»<b>身份éª?è¯?</b>ã??\n"
-"å?¨æ?¨é??è¿?身份éª?è¯?ä¹?å??ï¼?è¾?å?¥æ?¨ç??æ?°å¯?ç ?ï¼?é??æ?°è¾?å?¥ä¸?次以便è¿?è¡?æ ¡éª?ï¼?ç?¶å??å??å?»<b>æ?´"
-"æ?¹å¯?ç ?</b>ã??"
-
-#: ../capplets/about-me/gnome-about-me-password.ui.h:8
-msgid "_Authenticate"
-msgstr "身份��(_A)"
-
-#: ../capplets/about-me/gnome-about-me-password.ui.h:9
-msgid "_New password:"
-msgstr "æ?°å¯?ç ?(_N)ï¼?"
-
-#: ../capplets/about-me/gnome-about-me-password.ui.h:10
-msgid "_Retype new password:"
-msgstr "é??æ?°è¾?å?¥æ?°å¯?ç ?(_R)ï¼?"
-
-#: ../capplets/appearance/appearance-desktop.c:627
-msgid "Add Wallpaper"
-msgstr "æ·»å? å£?纸"
-
-#: ../capplets/appearance/appearance-desktop.c:662
-msgid "All files"
-msgstr "å?¨é?¨æ??件"
-
-#: ../capplets/appearance/appearance-font.c:499
-msgid "Font may be too large"
-msgstr "����太大"
+"æ?¾ä¸?å?°æ??件â??%sâ??ã??\n"
+"\n"
+"请确å®?该æ??件å­?å?¨å??é??è¯?ï¼?æ??é??æ?©å?¦ä¸?è??æ?¯å?¾ç??ã??"
 
-#: ../capplets/appearance/appearance-font.c:503
-#, c-format
-msgid ""
-"The font selected is %d point large, and may make it difficult to "
-"effectively use the computer.  It is recommended that you select a size "
-"smaller than %d."
-msgid_plural ""
-"The font selected is %d points large, and may make it difficult to "
-"effectively use the computer. It is recommended that you select a size "
-"smaller than %d."
-msgstr[0] ""
-"é??中ç??å­?ä½?æ?¯ %d ç£?大ã??è¦?æ?³æ??æ??ç??使ç?¨è®¡ç®?æ?ºï¼?æ?¨è??æ?¨é??æ?©å°?äº? %d ç??大å°?ã??"
-
-#: ../capplets/appearance/appearance-font.c:516
-#, c-format
-msgid ""
-"The font selected is %d point large, and may make it difficult to "
-"effectively use the computer.  It is recommended that you select a smaller "
-"sized font."
-msgid_plural ""
-"The font selected is %d points large, and may make it difficult to "
-"effectively use the computer. It is recommended that you select a smaller "
-"sized font."
-msgstr[0] "é??中ç??å­?ä½?æ?¯ %d ç£?大ã??è¦?æ?³æ??æ??ç??使ç?¨è®¡ç®?æ?ºï¼?æ?¨è??æ?¨é??æ?©è¾?å°?ç??å­?ä½?ã??"
-
-#: ../capplets/appearance/appearance-font.c:539
-msgid "Use previous font"
-msgstr "使ç?¨å??å??ç??å­?ä½?"
-
-#: ../capplets/appearance/appearance-font.c:541
-msgid "Use selected font"
-msgstr "使ç?¨é??中ç??å­?ä½?"
-
-#: ../capplets/appearance/appearance-main.c:56
-#, c-format
-msgid "Could not load user interface file: %s"
-msgstr "æ? æ³?å? è½½ç?¨æ?·ç??é?¢æ??件ï¼?%s"
-
-#: ../capplets/appearance/appearance-main.c:135
-msgid "Specify the filename of a theme to install"
-msgstr "æ??å®?è¦?å®?è£?ç??主é¢?æ??件å??"
-
-#: ../capplets/appearance/appearance-main.c:136
-msgid "filename"
-msgstr "æ??件å??"
-
-#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/appearance/appearance-main.c:143
-msgid "Specify the name of the page to show (theme|background|fonts|interface)"
-msgstr "æ??å®?è¦?æ?¾ç¤ºç??页é?¢å??称 (theme|background|fonts|interface)"
-
-#: ../capplets/appearance/appearance-main.c:144
-msgid "page"
-msgstr "page"
-
-#: ../capplets/appearance/appearance-main.c:151
-msgid "[WALLPAPER...]"
-msgstr "[�纸...]"
-
-#: ../capplets/appearance/appearance-style.c:172
-#: ../capplets/common/gnome-theme-info.c:446
-#: ../capplets/common/gnome-theme-info.c:638
-msgid "Default Pointer"
-msgstr "é»?认æ??é??"
-
-#: ../capplets/appearance/appearance-style.c:235
-#: ../capplets/appearance/appearance-themes.c:685
-msgid "Install"
-msgstr "��"
-
-#: ../capplets/appearance/appearance-style.c:256
-#: ../capplets/common/gnome-theme-info.c:1646
+#: ../libgnome-control-center/gconf-property-editor.c:1414
 #, c-format
 msgid ""
-"This theme will not look as intended because the required GTK+ theme engine "
-"'%s' is not installed."
-msgstr "此主é¢?å?¯è?½ä¸?设计æ?¶ç??èµ·æ?¥ä¸?å??ï¼?å? 为æ??é??ç?? GTK+ 主é¢?å¼?æ??â??%sâ??æ?ªå®?è£?ã??"
-
-#: ../capplets/appearance/appearance-themes.c:673
-msgid "Apply Background"
-msgstr "åº?ç?¨è??æ?¯"
-
-#: ../capplets/appearance/appearance-themes.c:677
-msgid "Apply Font"
-msgstr "����"
-
-#: ../capplets/appearance/appearance-themes.c:681
-msgid "Revert Font"
-msgstr "����"
-
-#: ../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 "å½?å??主é¢?æ?¨è??äº?ä¸?个è??æ?¯å??ä¸?ç§?å­?ä½?ã??å??æ?¶ï¼?ä¸?次åº?ç?¨ç??æ?¨è??å­?ä½?å?¯è¢«æ?¢å¤?ã??"
-
-#: ../capplets/appearance/appearance-themes.c:714
-msgid ""
-"The current theme suggests a background. Also, the last applied font "
-"suggestion can be reverted."
-msgstr "å½?å??主é¢?æ?¨è??äº?ä¸?个è??æ?¯ã??å??æ?¶ï¼?ä¸?次åº?ç?¨ç??æ?¨è??å­?ä½?å?¯è¢«æ?¢å¤?ã??"
-
-#: ../capplets/appearance/appearance-themes.c:716
-msgid "The current theme suggests a background and a font."
-msgstr "å½?å??主é¢?æ?¨è??äº?ä¸?个è??æ?¯å??ä¸?ç§?å­?ä½?ã??"
-
-#: ../capplets/appearance/appearance-themes.c:718
-msgid ""
-"The current theme suggests a font. Also, the last applied font suggestion "
-"can be reverted."
-msgstr "å½?å??主é¢?æ?¨è??äº?ä¸?ç§?å­?ä½?ã??å??æ?¶ï¼?ä¸?次åº?ç?¨ç??æ?¨è??å­?ä½?å?¯è¢«æ?¢å¤?ã??"
-
-#: ../capplets/appearance/appearance-themes.c:720
-msgid "The current theme suggests a background."
-msgstr "å½?å??主é¢?æ?¨è??äº?ä¸?个è??æ?¯ã??"
-
-#: ../capplets/appearance/appearance-themes.c:722
-msgid "The last applied font suggestion can be reverted."
-msgstr "ä¸?次åº?ç?¨ç??æ?¨è??å­?ä½?å?¯è¢«æ?¢å¤?ã??"
-
-#: ../capplets/appearance/appearance-themes.c:724
-msgid "The current theme suggests a font."
-msgstr "å½?å??主é¢?æ?¨è??äº?ä¸?ç§?å­?ä½?ã??"
+"I don't know how to open the file '%s'.\n"
+"Perhaps it's a kind of picture that is not yet supported.\n"
+"\n"
+"Please select a different picture instead."
+msgstr ""
+"ä¸?ç?¥é??æ??æ ·æ??å¼?æ??件â??%sâ??ã??\n"
+"å?¯è?½æ?¯æ?ªæ?¯æ??ç??å?¾ç??ç±»å??ã??\n"
+"\n"
+"请é??æ?©å?¶ä»?å?¾ç??ã??"
 
-#: ../capplets/appearance/appearance-themes.c:1046
-#: ../panels/default-applications/gnome-da-capplet.c:693
-msgid "Custom"
-msgstr "���"
+#: ../libgnome-control-center/gconf-property-editor.c:1536
+msgid "Please select an image."
+msgstr "请é??æ?©å?¾ç??ã??"
 
-#: ../capplets/appearance/data/appearance.ui.h:1
-msgid "Appearance Preferences"
-msgstr "å¤?è§?é¦?é??项"
+#: ../libgnome-control-center/gconf-property-editor.c:1541
+msgid "_Select"
+msgstr "é??æ?©(_S)"
 
-#: ../capplets/appearance/data/appearance.ui.h:2
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
 msgid "Background"
 msgstr "è??æ?¯"
 
-#: ../capplets/appearance/data/appearance.ui.h:3
-msgid "Best _shapes"
-msgstr "æ??佳形ç?¶(_S)"
-
-#: ../capplets/appearance/data/appearance.ui.h:4
-msgid "Best co_ntrast"
-msgstr "æ??佳对æ¯?(_N)"
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+msgid "Change the background"
+msgstr "æ?´æ?¹è??æ?¯å?¾å??"
 
-#: ../capplets/appearance/data/appearance.ui.h:5
-msgid "C_olors:"
-msgstr "��(_O)"
-
-#: ../capplets/appearance/data/appearance.ui.h:6
-msgid "C_ustomize..."
-msgstr "���(_U)..."
-
-#: ../capplets/appearance/data/appearance.ui.h:7
+#: ../panels/background/background.ui.h:1
 msgid "Center"
 msgstr "�中"
 
-#: ../capplets/appearance/data/appearance.ui.h:8
-msgid "Changing your cursor theme takes effect the next time you log in."
-msgstr "æ?´æ?¹æ?¨ç??æ??é??主é¢?å°?ä¼?å?¨æ?¨ä¸?次ç?»å½?æ?¶ç??æ??ã??"
-
-#: ../capplets/appearance/data/appearance.ui.h:9
-msgid "Colors"
-msgstr "��"
-
-#: ../capplets/appearance/data/appearance.ui.h:10
-msgid "Controls"
-msgstr "�件"
-
-#: ../capplets/appearance/data/appearance.ui.h:11
-msgid "Customize Theme"
-msgstr "���主�"
-
-#: ../capplets/appearance/data/appearance.ui.h:12
-msgid "D_etails..."
-msgstr "ç»?è??(_E)..."
-
-#: ../capplets/appearance/data/appearance.ui.h:13
-msgid "Des_ktop font:"
-msgstr "����(_K)�"
-
-#: ../capplets/appearance/data/appearance.ui.h:14
-msgid "Font Rendering Details"
-msgstr "å­?ä½?渲æ??ç»?è??"
-
-#: ../capplets/appearance/data/appearance.ui.h:15
-msgid "Fonts"
-msgstr "å­?ä½?"
-
-#: ../capplets/appearance/data/appearance.ui.h:16
-msgid "Get more backgrounds online"
-msgstr "å?¨çº¿è?·å??æ?´å¤?è??æ?¯"
-
-#: ../capplets/appearance/data/appearance.ui.h:17
-msgid "Get more themes online"
-msgstr "å?¨çº¿è?·å??æ?´å¤?主é¢?"
-
-#: ../capplets/appearance/data/appearance.ui.h:18
-msgid "Gra_yscale"
-msgstr "�度(_Y)"
-
-#. font hinting
-#: ../capplets/appearance/data/appearance.ui.h:20
-msgid "Hinting"
-msgstr "微�"
-
-#: ../capplets/appearance/data/appearance.ui.h:21
-msgid "Horizontal gradient"
-msgstr "水平梯度"
-
-#: ../capplets/appearance/data/appearance.ui.h:22
-msgid "Icons"
-msgstr "å?¾æ ?"
-
-#: ../capplets/appearance/data/appearance.ui.h:23
-msgid "Icons only"
-msgstr "ä»?å?¾æ ?"
-
-#. large threshold
-#: ../capplets/appearance/data/appearance.ui.h:24
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
-#: ../panels/universal-access/uap.ui.h:50
-msgid "Large"
-msgstr "大"
-
-#: ../capplets/appearance/data/appearance.ui.h:25
-msgid "N_one"
-msgstr "æ? (_O)"
-
-#: ../capplets/appearance/data/appearance.ui.h:26
-msgid "Open a dialog to specify the color"
-msgstr "æ??å¼?æ??å®?é¢?è?²ç??对è¯?æ¡?"
+#: ../panels/background/background.ui.h:2
+msgid "Fill"
+msgstr "å¡«å??"
 
-#: ../capplets/appearance/data/appearance.ui.h:27
-msgid "Pointer"
-msgstr "æ??é??"
-
-#: ../capplets/appearance/data/appearance.ui.h:28
-msgid "R_esolution:"
-msgstr "å??辨ç??(_E)ï¼?"
-
-#: ../capplets/appearance/data/appearance.ui.h:29
-msgid "Rendering"
-msgstr "渲æ??"
-
-#: ../capplets/appearance/data/appearance.ui.h:30
-msgid "Save Theme As..."
-msgstr "主���为..."
-
-#: ../capplets/appearance/data/appearance.ui.h:31
-msgid "Save _As..."
-msgstr "��为(_A)..."
-
-#: ../capplets/appearance/data/appearance.ui.h:32
-msgid "Save _background image"
-msgstr "ä¿?å­?è??æ?¯å?¾å??(_B)"
-
-#: ../capplets/appearance/data/appearance.ui.h:33
+#: ../panels/background/background.ui.h:3
 msgid "Scale"
 msgstr "���大"
 
-#. small threshold
-#: ../capplets/appearance/data/appearance.ui.h:34
-#: ../panels/mouse/gnome-mouse-properties.ui.h:31
-#: ../panels/universal-access/uap.ui.h:78
-msgid "Small"
-msgstr "å°?"
-
-#: ../capplets/appearance/data/appearance.ui.h:35
-msgid "Smoothing"
-msgstr "平�"
-
-#: ../capplets/appearance/data/appearance.ui.h:36
-msgid "Solid color"
-msgstr "纯�"
-
-#: ../capplets/appearance/data/appearance.ui.h:37
+#: ../panels/background/background.ui.h:4
 msgid "Span"
 msgstr "é??å??宽度"
 
-#: ../capplets/appearance/data/appearance.ui.h:38
-msgid "Stretch"
-msgstr "伸�"
-
-#: ../capplets/appearance/data/appearance.ui.h:39
-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:42
-msgid "Text"
-msgstr "æ??æ?¬"
-
-#: ../capplets/appearance/data/appearance.ui.h:43
-msgid "Text below items"
-msgstr "æ??æ?¬å?¨ä¸?"
-
-#: ../capplets/appearance/data/appearance.ui.h:44
-msgid "Text beside items"
-msgstr "æ??æ?¬å?¨æ??"
-
-#: ../capplets/appearance/data/appearance.ui.h:45
-msgid "Text only"
-msgstr "ä»?æ??æ?¬"
-
-#: ../capplets/appearance/data/appearance.ui.h:46
-msgid "The current controls theme does not support color schemes."
-msgstr "å½?å??æ?§ä»¶ä¸»é¢?ä¸?æ?¯æ??é??è?²æ?¹æ¡?ã??"
-
-#: ../capplets/appearance/data/appearance.ui.h:47
-msgid "Theme"
-msgstr "主�"
-
-#: ../capplets/appearance/data/appearance.ui.h:48
+#: ../panels/background/background.ui.h:5
 msgid "Tile"
 msgstr "平�"
 
-#. vertical hinting, pixel order blue, green, red
-#: ../capplets/appearance/data/appearance.ui.h:50
-msgid "VB_GR"
-msgstr "VB_GR"
-
-#: ../capplets/appearance/data/appearance.ui.h:51
-msgid "Vertical gradient"
-msgstr "å??ç?´æ¢¯åº¦"
-
-#: ../capplets/appearance/data/appearance.ui.h:52
-msgid "Window Border"
-msgstr "��边�"
-
-#: ../capplets/appearance/data/appearance.ui.h:53
-#: ../panels/universal-access/uap.ui.h:95
+#: ../panels/background/background.ui.h:6
+#: ../panels/universal-access/uap.ui.h:94
 msgid "Zoom"
 msgstr "缩�"
 
-#: ../capplets/appearance/data/appearance.ui.h:54
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:45
-msgid "_Add..."
-msgstr "æ·»å? (_A)..."
-
-#: ../capplets/appearance/data/appearance.ui.h:55
-msgid "_Application font:"
-msgstr "������(_A)�"
-
-#. pixel order blue, green, red
-#: ../capplets/appearance/data/appearance.ui.h:57
-msgid "_BGR"
-msgstr "_BGR"
-
-#: ../capplets/appearance/data/appearance.ui.h:58
-msgid "_Description:"
-msgstr "æ??è¿°(_D)ï¼?"
-
-#: ../capplets/appearance/data/appearance.ui.h:59
-msgid "_Document font:"
-msgstr "æ??æ¡£å­?ä½?(_D)ï¼?"
-
-#: ../capplets/appearance/data/appearance.ui.h:60
-msgid "_Fixed width font:"
-msgstr "�宽��(_F)�"
-
-#: ../capplets/appearance/data/appearance.ui.h:61
-msgid "_Full"
-msgstr "å®?å?¨(_F)"
-
-#: ../capplets/appearance/data/appearance.ui.h:62
-msgid "_Input boxes:"
-msgstr "���(_I)�"
-
-#: ../capplets/appearance/data/appearance.ui.h:63
-msgid "_Install..."
-msgstr "��(_I)..."
-
-#: ../capplets/appearance/data/appearance.ui.h:64
-msgid "_Medium"
-msgstr "中�(_M)"
-
-#: ../capplets/appearance/data/appearance.ui.h:65
-msgid "_Monochrome"
-msgstr "å??è?²(_M)"
-
-#: ../capplets/appearance/data/appearance.ui.h:66
-#: ../panels/keybindings/gnome-keybinding-properties.ui.h:5
-msgid "_Name:"
-msgstr "å??称(_N)ï¼?"
-
-#: ../capplets/appearance/data/appearance.ui.h:67
-msgid "_None"
-msgstr "æ? (_N)"
-
-#. pixel order red, green, blue
-#: ../capplets/appearance/data/appearance.ui.h:69
-msgid "_RGB"
-msgstr "_RGB"
-
-#: ../capplets/appearance/data/appearance.ui.h:70
-msgid "_Reset to Defaults"
-msgstr "é??置为é»?认å?¼(_R)"
-
-#: ../capplets/appearance/data/appearance.ui.h:71
-msgid "_Selected items:"
-msgstr "é??中项ç?®(_S)ï¼?"
+#: ../panels/background/bg-colors-source.c:57
+msgid "Butter"
+msgstr ""
 
-#: ../capplets/appearance/data/appearance.ui.h:72
-msgid "_Size:"
-msgstr "大�(_S)�"
+#: ../panels/background/bg-colors-source.c:58
+msgid "Orange"
+msgstr "æ©?è?²"
 
-#: ../capplets/appearance/data/appearance.ui.h:73
-msgid "_Slight"
-msgstr "轻微(_S)"
+#: ../panels/background/bg-colors-source.c:59
+msgid "Chocolate"
+msgstr "èµ­è?²"
 
-#: ../capplets/appearance/data/appearance.ui.h:74
-msgid "_Style:"
-msgstr "æ ·å¼?(_S)ï¼?"
+#: ../panels/background/bg-colors-source.c:60
+msgid "Chameleon"
+msgstr ""
 
-#: ../capplets/appearance/data/appearance.ui.h:75
-msgid "_Tooltips:"
-msgstr "å·¥å?·æ??示(_T)ï¼?"
+#: ../panels/background/bg-colors-source.c:61
+msgid "Blue"
+msgstr "è??è?²"
 
-#. vertical hinting, pixel order red, green, blue
-#: ../capplets/appearance/data/appearance.ui.h:77
-msgid "_VRGB"
-msgstr "_VRGB"
+# �������
+#: ../panels/background/bg-colors-source.c:62
+#, fuzzy
+msgid "Plum"
+msgstr "æ??å­?"
 
-#: ../capplets/appearance/data/appearance.ui.h:78
-msgid "_Window title font:"
-msgstr "çª?å?£æ ?é¢?å­?ä½?(_W)ï¼?"
+#: ../panels/background/bg-colors-source.c:63
+msgid "Red"
+msgstr "红�"
 
-#: ../capplets/appearance/data/appearance.ui.h:79
-msgid "_Windows:"
-msgstr "��(_W)�"
+# ��
+#: ../panels/background/bg-colors-source.c:64
+msgid "Aluminium"
+msgstr "é??ç?½"
 
-#: ../capplets/appearance/data/appearance.ui.h:80
-msgid "dots per inch"
-msgstr "��寸��"
+#: ../panels/background/bg-colors-source.c:65
+msgid "Gray"
+msgstr "ç?°è?²"
 
-#: ../capplets/appearance/data/gnome-appearance-properties.desktop.in.in.h:1
-msgid "Appearance"
-msgstr "��"
+#: ../panels/background/bg-colors-source.c:66
+msgid "Black"
+msgstr "é»?è?²"
 
-#: ../capplets/appearance/data/gnome-appearance-properties.desktop.in.in.h:2
-msgid "Customize the look of the desktop"
-msgstr "�������"
+#: ../panels/background/cc-background-panel.c:622
+msgid "Wallpapers"
+msgstr "�纸"
 
-#: ../capplets/appearance/data/gnome-theme-installer.desktop.in.in.h:1
-msgid "Installs themes packages for various parts of the desktop"
-msgstr "为æ¡?é?¢ç??å??é?¨å??å®?è£?主é¢?å??"
+#: ../panels/background/cc-background-panel.c:630
+msgid "Pictures Folder"
+msgstr "å?¾ç??æ??件夹"
 
-#: ../capplets/appearance/data/gnome-theme-installer.desktop.in.in.h:2
-msgid "Theme Installer"
-msgstr "主�����"
+#: ../panels/background/cc-background-panel.c:638
+msgid "Colors"
+msgstr "��"
 
-#: ../capplets/appearance/data/gnome-theme-package.xml.in.h:1
-msgid "Gnome Theme Package"
-msgstr "Gnome 主é¢?å??"
+#: ../panels/background/cc-background-panel.c:647
+msgid "Flickr"
+msgstr "Flickr"
 
-#: ../capplets/appearance/gnome-wp-info.c:50
+#: ../panels/background/gnome-wp-info.c:50
 msgid "No Desktop Background"
 msgstr "æ? æ¡?é?¢è??æ?¯"
 
-#: ../capplets/appearance/gnome-wp-item.c:261
+#: ../panels/background/gnome-wp-item.c:294
 msgid "Slide Show"
 msgstr "å¹»ç?¯ç??æ¼?示"
 
-#: ../capplets/appearance/gnome-wp-item.c:263
+#: ../panels/background/gnome-wp-item.c:296
 msgid "Image"
 msgstr "å?¾å??"
 
-#: ../capplets/appearance/gnome-wp-item.c:269
+#: ../panels/background/gnome-wp-item.c:302
 msgid "multiple sizes"
 msgstr "å¤?é??尺寸"
 
 #. translators: x pixel(s) by y pixel(s)
-#: ../capplets/appearance/gnome-wp-item.c:272
+#: ../panels/background/gnome-wp-item.c:305
 #, 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
+#: ../panels/background/gnome-wp-item.c:307
+#: ../panels/background/gnome-wp-item.c:309
 msgid "pixel"
 msgid_plural "pixels"
 msgstr[0] "å??ç´ "
@@ -1238,7 +280,7 @@ msgstr[0] "å??ç´ "
 #. * mime type, size
 #. * Folder: /path/to/file
 #.
-#: ../capplets/appearance/gnome-wp-item.c:284
+#: ../panels/background/gnome-wp-item.c:317
 #, c-format
 msgid ""
 "<b>%s</b>\n"
@@ -1253,7 +295,7 @@ msgstr ""
 #. * Image missing
 #. * Folder: /path/to/file
 #.
-#: ../capplets/appearance/gnome-wp-item.c:296
+#: ../panels/background/gnome-wp-item.c:329
 #, c-format
 msgid ""
 "<b>%s</b>\n"
@@ -1264,390 +306,109 @@ msgstr ""
 "%s\n"
 "æ??件夹ï¼?%s"
 
-#: ../capplets/appearance/gnome-wp-item.c:300
+#: ../panels/background/gnome-wp-item.c:333
 msgid "Image missing"
 msgstr "å?¾å??丢失"
 
-#: ../capplets/appearance/theme-installer.c:178
-#: ../capplets/appearance/theme-installer.c:234
-msgid "Cannot install theme"
-msgstr "æ? æ³?å®?è£?主é¢?"
-
-#: ../capplets/appearance/theme-installer.c:180
-#, c-format
-msgid "The %s utility is not installed."
-msgstr "%s å·¥å?·æ?ªå®?è£?ã??"
-
-#: ../capplets/appearance/theme-installer.c:236
-msgid "There was a problem while extracting the theme."
-msgstr "æ??å??主é¢?æ?¶å??ç??äº?é??误ã??"
-
-#: ../capplets/appearance/theme-installer.c:264
-msgid "There was an error installing the selected file"
-msgstr "å®?è£?é??中æ??件æ?¶å?ºé??"
-
-#: ../capplets/appearance/theme-installer.c:265
-#, c-format
-msgid "\"%s\" does not appear to be a valid theme."
-msgstr "â??%sâ??ä¼¼ä¹?ä¸?æ?¯æ??æ??ç??主é¢?ã??"
-
-#: ../capplets/appearance/theme-installer.c:266
-#, c-format
-msgid ""
-"\"%s\" does not appear to be a valid theme. It may be a theme engine which "
-"you need to compile."
-msgstr "â??%sâ??ä¼¼ä¹?ä¸?æ?¯æ??æ??ç??主é¢?ã??å®?å?¯è?½æ?¯é??è¦?ç¼?è¯?æ??è?½ä½¿ç?¨ç??主é¢?å¼?æ??ã??"
-
-#: ../capplets/appearance/theme-installer.c:372
-#, c-format
-msgid "Installation for theme \"%s\" failed."
-msgstr "主é¢?â??%sâ??å®?è£?失败ã??"
-
-#: ../capplets/appearance/theme-installer.c:411
-#, c-format
-msgid "The theme \"%s\" has been installed."
-msgstr "主é¢?â??%sâ??å·²å®?è£?ã??"
-
-#: ../capplets/appearance/theme-installer.c:421
-msgid "Would you like to apply it now, or keep your current theme?"
-msgstr "æ?¨æ?¯æ?³è¦?ç?°å?¨å°±åº?ç?¨ï¼?è¿?æ?¯ä¿?æ??å½?å??ç??主é¢?ï¼?"
-
-#: ../capplets/appearance/theme-installer.c:424
-msgid "Keep Current Theme"
-msgstr "ä¿?æ??å½?å??主é¢?"
-
-#: ../capplets/appearance/theme-installer.c:427
-msgid "Apply New Theme"
-msgstr "���主�"
-
-#: ../capplets/appearance/theme-installer.c:471
-#, c-format
-msgid "GNOME Theme %s correctly installed"
-msgstr "GNOME 主� %s 已正确��"
-
-#: ../capplets/appearance/theme-installer.c:533
-msgid "Failed to create temporary directory"
-msgstr "å??建临æ?¶ç?®å½?失败"
-
-#: ../capplets/appearance/theme-installer.c:596
-msgid "New themes have been successfully installed."
-msgstr "æ?°ä¸»é¢?å·²æ??å??å®?è£?ã??"
-
-#: ../capplets/appearance/theme-installer.c:646
-msgid "No theme file location specified to install"
-msgstr "æ?ªæ??å®?è¦?å®?è£?å¾?主é¢?æ??件ä½?ç½®"
-
-#: ../capplets/appearance/theme-installer.c:670
-#, c-format
-msgid ""
-"Insufficient permissions to install the theme in:\n"
-"%s"
-msgstr ""
-"没æ??足å¤?ç??æ??é??å°?主é¢?å®?è£?å?¨ï¼?\n"
-"%s"
-
-#: ../capplets/appearance/theme-installer.c:748
-msgid "Select Theme"
-msgstr "é??æ?©ä¸»é¢?"
-
-#: ../capplets/appearance/theme-installer.c:759
-msgid "Theme Packages"
-msgstr "主é¢?å??"
-
-#: ../capplets/appearance/theme-save.c:93
-#, c-format
-msgid "Theme name must be present"
-msgstr "主é¢?å¿?é¡»æ??å??称"
-
-#: ../capplets/appearance/theme-save.c:156
-msgid "The theme already exists. Would you like to replace it?"
-msgstr "主é¢?å·²ç»?å­?å?¨ã??æ?¨æ?¯å?¦æ?³è¦?æ?¿æ?¢ï¼?"
-
-#: ../capplets/appearance/theme-save.c:157
-#: ../capplets/common/file-transfer-dialog.c:451
-msgid "_Overwrite"
-msgstr "è¦?ç??(_O)"
-
-#: ../capplets/appearance/theme-util.c:75
-msgid "Would you like to delete this theme?"
-msgstr "æ?¨æ?¯å?¦æ?³è¦?å? é?¤æ­¤ä¸»é¢?ï¼?"
-
-#: ../capplets/appearance/theme-util.c:125
-msgid "Theme cannot be deleted"
-msgstr "主é¢?æ? æ³?å? é?¤"
-
-#: ../capplets/appearance/theme-util.c:252
-msgid "Could not install theme engine"
-msgstr "æ? æ³?å®?è£?主é¢?å¼?æ??"
-
-#: ../capplets/common/activate-settings-daemon.c:16
-msgid ""
-"Unable to start the settings manager 'gnome-settings-daemon'.\n"
-"Without the GNOME settings manager running, some preferences may not take "
-"effect. This could indicate a problem with DBus, or a non-GNOME (e.g. KDE) "
-"settings manager may already be active and conflicting with the GNOME "
-"settings manager."
-msgstr ""
-"æ? æ³?å?¯å?¨è®¾ç½®ç®¡ç??å?¨â??gnome-settings-daemonâ??ã??\n"
-"å¦?æ??ä¸?è¿?è¡? GNOME 设置管ç??å?¨ï¼?æ??äº?é¦?é??项ä¸?ä¼?ç??æ??ã??è¿?å?¯è?½è¡¨æ?? DBus å?ºç?°é?®é¢?ï¼?æ??"
-"è??æ??个é?? GNOME (å¦? KDE) 设置管ç??å?¨å?¯è?½å·²ç»?å¤?äº?æ´»å?¨ç?¶æ??ï¼?并ä¸? GNOME 设置管ç??å?¨"
-"å??ç??å?²çª?ã??"
-
-#: ../capplets/common/capplet-stock-icons.c:66
-#: ../panels/mouse/capplet-stock-icons.c:66
-#, c-format
-msgid "Unable to load stock icon '%s'\n"
-msgstr "æ? æ³?è£?å?¥å?¾æ ?â??%sâ??\n"
-
-#: ../capplets/common/capplet-util.c:88
-#, c-format
-msgid "There was an error displaying help: %s"
-msgstr "æ?¾ç¤ºå¸®å?©æ?¶å?ºé??ï¼?%s"
-
-#: ../capplets/common/file-transfer-dialog.c:98
-#, c-format
-msgid "Copying file: %u of %u"
-msgstr "æ­£å?¨å¤?å?¶æ??件ï¼?第%u个ï¼?å?±%u个"
-
-#: ../capplets/common/file-transfer-dialog.c:145
-#, c-format
-msgid "Copying '%s'"
-msgstr "æ­£å?¨å¤?å?¶â??%sâ??"
-
-#: ../capplets/common/file-transfer-dialog.c:185
-#: ../capplets/common/file-transfer-dialog.c:313
-msgid "Copying files"
-msgstr "æ­£å?¨å¤?å?¶æ??件"
-
-#: ../capplets/common/file-transfer-dialog.c:224
-msgid "Parent Window"
-msgstr "���"
-
-#: ../capplets/common/file-transfer-dialog.c:225
-msgid "Parent window of the dialog"
-msgstr "对è¯?æ¡?ç??ç?¶çª?å?£"
-
-#: ../capplets/common/file-transfer-dialog.c:231
-msgid "From URI"
-msgstr "ä»? URI"
-
-#: ../capplets/common/file-transfer-dialog.c:232
-msgid "URI currently transferring from"
-msgstr "å½?å??ä¼ è¾?ç??æ?¥æº? URI"
-
-#: ../capplets/common/file-transfer-dialog.c:239
-msgid "To URI"
-msgstr "å?° URI"
-
-#: ../capplets/common/file-transfer-dialog.c:240
-msgid "URI currently transferring to"
-msgstr "å½?å??ä¼ è¾?ç??ç?®ç?? URI"
-
-#: ../capplets/common/file-transfer-dialog.c:247
-msgid "Fraction completed"
-msgstr "å®?æ??ç??æ¯?ä¾?"
-
-#: ../capplets/common/file-transfer-dialog.c:248
-msgid "Fraction of transfer currently completed"
-msgstr "ç?®å??å®?æ??ç??ä¼ è¾?æ¯?ä¾?"
-
-#: ../capplets/common/file-transfer-dialog.c:255
-msgid "Current URI index"
-msgstr "å½?å?? URI åº?å?·"
-
-#: ../capplets/common/file-transfer-dialog.c:256
-msgid "Current URI index - starts from 1"
-msgstr "å½?å?? URI åº?å?· - ä»?1å¼?å§?"
-
-#: ../capplets/common/file-transfer-dialog.c:263
-msgid "Total URIs"
-msgstr "URI ��"
-
-#: ../capplets/common/file-transfer-dialog.c:264
-msgid "Total number of URIs"
-msgstr "URI ç??æ?»æ?°"
-
-#: ../capplets/common/file-transfer-dialog.c:445
-#, c-format
-msgid "File '%s' already exists. Do you want to overwrite it?"
-msgstr "æ??件â??%sâ??å·²ç»?å­?å?¨ã??æ?¨æ?¯å?¦æ?³è¦?è¦?ç??ï¼?"
-
-#: ../capplets/common/file-transfer-dialog.c:448
-msgid "_Skip"
-msgstr "跳�(_S)"
-
-#: ../capplets/common/file-transfer-dialog.c:449
-msgid "Overwrite _All"
-msgstr "å?¨é?¨è¦?ç??(_A)"
-
-#: ../capplets/common/gconf-property-editor.c:134
-#: ../libgnome-control-center/gconf-property-editor.c:134
-msgid "Key"
-msgstr "é?®"
-
-#: ../capplets/common/gconf-property-editor.c:135
-#: ../libgnome-control-center/gconf-property-editor.c:135
-msgid "GConf key to which this property editor is attached"
-msgstr "æ?¬å±?æ?§ç¼?è¾?å?¨ç¼?è¾?ç?? GConf é?®"
-
-#: ../capplets/common/gconf-property-editor.c:141
-#: ../libgnome-control-center/gconf-property-editor.c:141
-msgid "Callback"
-msgstr "å??è°?"
-
-#: ../capplets/common/gconf-property-editor.c:142
-#: ../libgnome-control-center/gconf-property-editor.c:142
-msgid "Issue this callback when the value associated with key gets changed"
-msgstr "å½?å??é?®å?³è??ç??å?¼æ?¹å??æ?¶æ?§è¡?该å??è°?"
-
-#: ../capplets/common/gconf-property-editor.c:147
-#: ../libgnome-control-center/gconf-property-editor.c:147
-msgid "Change set"
-msgstr "æ?¹å?¨é??"
-
-#: ../capplets/common/gconf-property-editor.c:148
-#: ../libgnome-control-center/gconf-property-editor.c:148
-msgid ""
-"GConf change set containing data to be forwarded to the gconf client on apply"
-msgstr "å??å?«åº?ç?¨ä¿®æ?¹æ?¶è¦?ä¼ é??ç»? gconf 客æ?·ç«¯ç??æ?°æ?®ç?? GConf æ?¹å?¨é??å??"
+#: ../panels/datetime/datetime.ui.h:1
+msgid "12 hour format"
+msgstr "12 å°?æ?¶æ ¼å¼?"
 
-#: ../capplets/common/gconf-property-editor.c:153
-#: ../libgnome-control-center/gconf-property-editor.c:153
-msgid "Conversion to widget callback"
-msgstr "转æ?¢å?°é?¨ä»¶æ?¶ç??å??è°?"
+#: ../panels/datetime/datetime.ui.h:2
+msgid "16"
+msgstr "16"
 
-#: ../capplets/common/gconf-property-editor.c:154
-#: ../libgnome-control-center/gconf-property-editor.c:154
-msgid ""
-"Callback to be issued when data are to be converted from GConf to the widget"
-msgstr "å½?æ?°æ?®ä»? GConf 转æ?¢å?°é?¨ä»¶æ?¶ä½¿ç?¨ç??å??è°?"
+#: ../panels/datetime/datetime.ui.h:3
+msgid "2010"
+msgstr "2010"
 
-#: ../capplets/common/gconf-property-editor.c:159
-#: ../libgnome-control-center/gconf-property-editor.c:159
-msgid "Conversion from widget callback"
-msgstr "ä»?é?¨ä»¶è½¬æ?¢æ?¶ç??å??è°?"
+#: ../panels/datetime/datetime.ui.h:4
+msgid "22"
+msgstr "22"
 
-#: ../capplets/common/gconf-property-editor.c:160
-#: ../libgnome-control-center/gconf-property-editor.c:160
-msgid ""
-"Callback to be issued when data are to be converted to GConf from the widget"
-msgstr "å½?æ?°æ?®ä»?é?¨ä»¶è½¬æ?¢å?° GConf æ?¶ä½¿ç?¨ç??å??è°?"
+#: ../panels/datetime/datetime.ui.h:5
+msgid "24 hour format"
+msgstr "24 å°?æ?¶æ ¼å¼?"
 
-#: ../capplets/common/gconf-property-editor.c:165
-#: ../libgnome-control-center/gconf-property-editor.c:165
-msgid "UI Control"
-msgstr "ç?¨æ?·ç??é?¢æ?§ä»¶"
+#: ../panels/datetime/datetime.ui.h:6
+msgid "45"
+msgstr "45"
 
-#: ../capplets/common/gconf-property-editor.c:166
-#: ../libgnome-control-center/gconf-property-editor.c:166
-msgid "Object that controls the property (normally a widget)"
-msgstr "æ?§å?¶å±?æ?§ç??对象 (é??常为é?¨ä»¶)"
+#: ../panels/datetime/datetime.ui.h:7
+msgid ":"
+msgstr "ï¼?"
 
-#: ../capplets/common/gconf-property-editor.c:181
-#: ../libgnome-control-center/gconf-property-editor.c:181
-msgid "Property editor object data"
-msgstr "�����对象��"
+#: ../panels/datetime/datetime.ui.h:8
+msgid "April"
+msgstr "å??æ??"
 
-#: ../capplets/common/gconf-property-editor.c:182
-#: ../libgnome-control-center/gconf-property-editor.c:182
-msgid "Custom data required by the specific property editor"
-msgstr "ç?¹å®?ç??å±?æ?§ç¼?è¾?å?¨æ??é??è¦?ç??è?ªå®?ä¹?æ?°æ?®"
+#: ../panels/datetime/datetime.ui.h:9
+msgid "August"
+msgstr "å?«æ??"
 
-#: ../capplets/common/gconf-property-editor.c:188
-#: ../libgnome-control-center/gconf-property-editor.c:188
-msgid "Property editor data freeing callback"
-msgstr "å±?æ?§ç¼?è¾?å?¨æ?°æ?®é??æ?¾å??è°?å?½æ?°"
+#: ../panels/datetime/datetime.ui.h:10
+msgid "City:"
+msgstr "å??å¸?ï¼?"
 
-#: ../capplets/common/gconf-property-editor.c:189
-#: ../libgnome-control-center/gconf-property-editor.c:189
-msgid "Callback to be issued when property editor object data is to be freed"
-msgstr "å½?å±?æ?§ç¼?è¾?å?¨å¯¹è±¡æ?°æ?®è¦?被é??æ?¾æ?¶è¦?è°?ç?¨ç??å??è°?å?½æ?°"
+#: ../panels/datetime/datetime.ui.h:11
+msgid "Day:"
+msgstr "��"
 
-#: ../capplets/common/gconf-property-editor.c:1406
-#: ../libgnome-control-center/gconf-property-editor.c:1406
-#, c-format
-msgid ""
-"Couldn't find the file '%s'.\n"
-"\n"
-"Please make sure it exists and try again, or choose a different background "
-"picture."
-msgstr ""
-"æ?¾ä¸?å?°æ??件â??%sâ??ã??\n"
-"\n"
-"请确å®?该æ??件å­?å?¨å??é??è¯?ï¼?æ??é??æ?©å?¦ä¸?è??æ?¯å?¾ç??ã??"
+#: ../panels/datetime/datetime.ui.h:12
+msgid "December"
+msgstr "å??äº?æ??"
 
-#: ../capplets/common/gconf-property-editor.c:1414
-#: ../libgnome-control-center/gconf-property-editor.c:1414
-#, c-format
-msgid ""
-"I don't know how to open the file '%s'.\n"
-"Perhaps it's a kind of picture that is not yet supported.\n"
-"\n"
-"Please select a different picture instead."
-msgstr ""
-"ä¸?ç?¥é??æ??æ ·æ??å¼?æ??件â??%sâ??ã??\n"
-"å?¯è?½æ?¯æ?ªæ?¯æ??ç??å?¾ç??ç±»å??ã??\n"
-"\n"
-"请é??æ?©å?¶ä»?å?¾ç??ã??"
+#: ../panels/datetime/datetime.ui.h:13
+msgid "February"
+msgstr "äº?æ??"
 
-#: ../capplets/common/gconf-property-editor.c:1536
-#: ../libgnome-control-center/gconf-property-editor.c:1536
-msgid "Please select an image."
-msgstr "请é??æ?©å?¾ç??ã??"
+#: ../panels/datetime/datetime.ui.h:14
+msgid "January"
+msgstr "ä¸?æ??"
 
-#: ../capplets/common/gconf-property-editor.c:1541
-#: ../libgnome-control-center/gconf-property-editor.c:1541
-msgid "_Select"
-msgstr "é??æ?©(_S)"
+#: ../panels/datetime/datetime.ui.h:15
+msgid "July"
+msgstr "ä¸?æ??"
 
-#: ../capplets/common/gnome-theme-info.c:639
-msgid "Default Pointer - Current"
-msgstr "é»?认æ??é?? - å½?å??"
+#: ../panels/datetime/datetime.ui.h:16
+msgid "June"
+msgstr "å?­æ??"
 
-#: ../capplets/common/gnome-theme-info.c:643
-msgid "White Pointer"
-msgstr "ç?½æ??é??"
+#: ../panels/datetime/datetime.ui.h:17
+msgid "March"
+msgstr "ä¸?æ??"
 
-#: ../capplets/common/gnome-theme-info.c:644
-msgid "White Pointer - Current"
-msgstr "ç?½æ??é?? - å½?å??"
+#: ../panels/datetime/datetime.ui.h:18
+msgid "May"
+msgstr "äº?æ??"
 
-#: ../capplets/common/gnome-theme-info.c:648
-msgid "Large Pointer"
-msgstr "大æ??é??"
+#: ../panels/datetime/datetime.ui.h:19
+msgid "Month:"
+msgstr "æ??ï¼?"
 
-#: ../capplets/common/gnome-theme-info.c:649
-msgid "Large Pointer - Current"
-msgstr "大æ??é?? - å½?å??"
+#: ../panels/datetime/datetime.ui.h:20
+msgid "November"
+msgstr "å??ä¸?æ??"
 
-#: ../capplets/common/gnome-theme-info.c:653
-msgid "Large White Pointer - Current"
-msgstr "大å?·ç??ç?½è?²æ??é?? - å½?å??"
+#: ../panels/datetime/datetime.ui.h:21
+msgid "October"
+msgstr "å??æ??"
 
-#: ../capplets/common/gnome-theme-info.c:654
-msgid "Large White Pointer"
-msgstr "大å?·ç??ç?½è?²æ??é??"
+#: ../panels/datetime/datetime.ui.h:22
+msgid "Region:"
+msgstr "���"
 
-#: ../capplets/common/gnome-theme-info.c:1622
-#, c-format
-msgid ""
-"This theme will not look as intended because the required GTK+ theme '%s' is "
-"not installed."
-msgstr "此主é¢?ç??å¤?è§?å°?ä¸?设计æ?¶ä¸?å??ï¼?å? 为æ??é??ç?? GTK+ 主é¢?â??%sâ??æ?ªå®?è£?ã??"
+#: ../panels/datetime/datetime.ui.h:23
+msgid "September"
+msgstr "ä¹?æ??"
 
-#: ../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â??æ?ªå®?è£?ã??"
+#: ../panels/datetime/datetime.ui.h:24
+msgid "Set time automatically"
+msgstr "��设置��"
 
-#: ../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â??æ?ªå®?è£?ã??"
+#: ../panels/datetime/datetime.ui.h:25
+msgid "Year:"
+msgstr "å¹´ï¼?"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
 msgid "Date And Time"
@@ -1658,7 +419,7 @@ msgid "Date and Time preferences panel"
 msgstr "æ?¥æ??å??æ?¶é?´é¦?é??项é?¢æ?¿"
 
 #: ../panels/default-applications/gnome-default-applications-panel.desktop.in.in.h:1
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:17
+#: ../panels/default-applications/gnome-default-applications-properties.ui.h:11
 msgid "Preferred Applications"
 msgstr "é¦?é??åº?ç?¨ç¨?åº?"
 
@@ -1674,23 +435,33 @@ msgstr "å?¯å?¨é¦?é??ç??è§?è§?è¾?å?©æ??æ?¯"
 msgid "Visual Assistance"
 msgstr "����"
 
-#: ../panels/default-applications/gnome-da-capplet.c:100
-#: ../panels/default-applications/gnome-da-capplet.c:364
-#: ../panels/default-applications/gnome-da-capplet.c:385
+#: ../panels/default-applications/gnome-da-capplet.c:83
 #, c-format
-msgid "Error saving configuration: %s"
-msgstr "ä¿?å­?é??ç½®å?ºé??ï¼?%s"
+msgid "Error setting default browser: %s"
+msgstr "设置é»?认æµ?è§?å?¨å?ºé??ï¼?%s"
+
+#: ../panels/default-applications/gnome-da-capplet.c:106
+#, c-format
+msgid "Error setting default mailer: %s"
+msgstr "设置é»?认ç?µå­?é?®ä»¶ç¨?åº?å?ºé??ï¼?%s"
+
+#: ../panels/default-applications/gnome-da-capplet.c:321
+#: ../panels/sound/gvc-sound-theme-chooser.c:623
+#: ../panels/sound/gvc-sound-theme-editor.c:705
+#: ../panels/sound/gvc-sound-theme-editor.c:759
+#: ../panels/sound/sound-theme-file-utils.c:292
+msgid "Custom"
+msgstr "���"
 
-#: ../panels/default-applications/gnome-da-capplet.c:724
+#: ../panels/default-applications/gnome-da-capplet.c:352
 msgid "Could not load the main interface"
 msgstr "æ? æ³?è£?å?¥ä¸»ç??é?¢"
 
-#: ../panels/default-applications/gnome-da-capplet.c:726
+#: ../panels/default-applications/gnome-da-capplet.c:354
 msgid "Please make sure that the applet is properly installed"
 msgstr "请确����已�正确��"
 
 #: ../panels/default-applications/gnome-default-applications-properties.ui.h:1
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:1
 #: ../panels/mouse/gnome-mouse-properties.ui.h:1
 msgid "Accessibility"
 msgstr "è¾?å?©å??è?½"
@@ -1700,11 +471,8 @@ msgstr "è¾?å?©å??è?½"
 msgid "All %s occurrences will be replaced with actual link"
 msgstr "å?ºç?°ç??å?¨é?¨ %s é?½å°?被æ?¿æ?¢ä¸ºå®?é??é?¾æ?¥"
 
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
 #: ../panels/default-applications/gnome-default-applications-properties.ui.h:4
-#: ../panels/keybindings/gnome-keybinding-properties.ui.h:1
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
 msgid "C_ommand:"
 msgstr "�令(_O)�"
 
@@ -1717,78 +485,50 @@ msgid "E_xecute flag:"
 msgstr "æ?§è¡?æ ?å¿?(_X)ï¼?"
 
 #: ../panels/default-applications/gnome-default-applications-properties.ui.h:7
-msgid "Image Viewer"
-msgstr "å?¾å??æ?¥ç??å?¨"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:8
 msgid "Instant Messenger"
 msgstr "å?³æ?¶é??讯工å?·"
 
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:9
+#: ../panels/default-applications/gnome-default-applications-properties.ui.h:8
 msgid "Internet"
 msgstr "äº?è??ç½?"
 
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:10
+#: ../panels/default-applications/gnome-default-applications-properties.ui.h:9
 msgid "Mail Reader"
 msgstr "é?®ä»¶é??读å?¨"
 
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:11
+#: ../panels/default-applications/gnome-default-applications-properties.ui.h:10
 msgid "Mobility"
 msgstr "移�� "
 
 #: ../panels/default-applications/gnome-default-applications-properties.ui.h:12
-msgid "Multimedia"
-msgstr "���"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:13
-msgid "Multimedia Player"
-msgstr "������"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:14
-msgid "Open link in new _tab"
-msgstr "å?¨æ?°æ ?签中æ??å¼?é?¾æ?¥(_T)"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:15
-msgid "Open link in new _window"
-msgstr "å?¨æ?°çª?å?£ä¸­æ??å¼?é?¾æ?¥(_W)"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:16
-msgid "Open link with web browser _default"
-msgstr "使ç?¨ç½?ç»?æµ?è§?å?¨ç??é»?认设置æ??å¼?é?¾æ?¥(_D)"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:18
 msgid "Run at st_art"
 msgstr "�����(_A)"
 
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:19
+#: ../panels/default-applications/gnome-default-applications-properties.ui.h:13
 msgid "Run in t_erminal"
 msgstr "��端中��(_E)"
 
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:20
+#: ../panels/default-applications/gnome-default-applications-properties.ui.h:14
 msgid "System"
 msgstr "系�"
 
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:21
+#: ../panels/default-applications/gnome-default-applications-properties.ui.h:15
 msgid "Terminal Emulator"
 msgstr "ç»?端模æ??å?¨"
 
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:22
+#: ../panels/default-applications/gnome-default-applications-properties.ui.h:16
 msgid "Text Editor"
 msgstr "æ??æ?¬ç¼?è¾?å?¨"
 
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:23
-msgid "Video Player"
-msgstr "�����"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:24
+#: ../panels/default-applications/gnome-default-applications-properties.ui.h:17
 msgid "Visual"
 msgstr "è§?è§?æ??æ??"
 
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:25
+#: ../panels/default-applications/gnome-default-applications-properties.ui.h:18
 msgid "Web Browser"
 msgstr "�����"
 
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:26
+#: ../panels/default-applications/gnome-default-applications-properties.ui.h:19
 msgid "_Run at start"
 msgstr "�����(_R)"
 
@@ -1805,7 +545,7 @@ msgid "Claws Mail"
 msgstr "Claws Mail"
 
 #: ../panels/default-applications/gnome-default-applications.xml.in.h:4
-#: ../panels/universal-access/uap.ui.h:31
+#: ../panels/universal-access/uap.ui.h:30
 msgid "Dasher"
 msgstr "Dasher"
 
@@ -1946,243 +686,134 @@ msgid "Netscape Communicator"
 msgstr "Netscape Communicator"
 
 #: ../panels/default-applications/gnome-default-applications.xml.in.h:39
-msgid "Opera"
-msgstr "Opera"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:40
 msgid "Orca"
 msgstr "Orca"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:41
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:40
 msgid "Orca with Magnifier"
 msgstr "带æ?¾å¤§é??ç?? Orca"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:42
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:41
 msgid "RXVT"
 msgstr "RXVT"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:43
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:42
 msgid "Rhythmbox Music Player"
 msgstr "Rhythmbox �����"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:44
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:43
 msgid "SeaMonkey"
 msgstr "SeaMonkey"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:45
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:44
 msgid "SeaMonkey Mail"
 msgstr "SeaMonkey �件"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:46
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:45
 msgid "Standard XTerminal"
 msgstr "æ ?å?? X ç»?端"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:47
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:46
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:48
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:47
 msgid "Sylpheed-Claws"
 msgstr "Sylpheed-Claws"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:49
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:48
 msgid "Terminator"
 msgstr "Terminator"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:50
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:49
 msgid "Thunderbird"
 msgstr "Thunderbird"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:51
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:50
 msgid "Totem Movie Player"
 msgstr "Totem �影���"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:52
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:51
 msgid "aterm"
 msgstr "aterm"
 
 #: ../panels/display/display-capplet.ui.h:1
-msgid "Include _panel"
-msgstr "å??å?«é?¢æ?¿(_P)"
+msgid "<i>Note: may limit resolution options</i>"
+msgstr "<i>æ??é??ï¼?å?¯è?½ä¼?é??å?¶å??辨ç??é??项</i>"
 
 #: ../panels/display/display-capplet.ui.h:2
-#: ../panels/display/xrandr-capplet.c:320
+#: ../panels/display/xrandr-capplet.c:316
 msgid "Left"
 msgstr "å·¦"
 
 #: ../panels/display/display-capplet.ui.h:3
-msgid "Make Default"
-msgstr "设为�认"
-
-#: ../panels/display/display-capplet.ui.h:4
-#: ../panels/display/xrandr-capplet.c:523
+#: ../panels/display/xrandr-capplet.c:520
 msgid "Monitor"
 msgstr "�示�"
 
-#: ../panels/display/display-capplet.ui.h:5
-#: ../panels/display/xrandr-capplet.c:319
-#: ../panels/display/xrandr-capplet.c:358
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/display/display-capplet.ui.h:4
+#: ../panels/display/xrandr-capplet.c:315
+#: ../panels/display/xrandr-capplet.c:354
+#: ../panels/universal-access/uap.ui.h:59
 msgid "Normal"
 msgstr "æ?®é??"
 
-#: ../panels/display/display-capplet.ui.h:6
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/display/display-capplet.ui.h:5
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Off"
 msgstr "��"
 
-#: ../panels/display/display-capplet.ui.h:7
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/display/display-capplet.ui.h:6
+#: ../panels/universal-access/uap.ui.h:61
 msgid "On"
 msgstr "å¼?"
 
-#: ../panels/display/display-capplet.ui.h:8
-msgid "Panel icon"
-msgstr "é?¢æ?¿å?¾æ ?"
-
-#: ../panels/display/display-capplet.ui.h:9
+#: ../panels/display/display-capplet.ui.h:7
 msgid "R_otation:"
 msgstr "æ??转(_O)ï¼?"
 
-#: ../panels/display/display-capplet.ui.h:10
+#: ../panels/display/display-capplet.ui.h:8
 msgid "Re_fresh rate:"
 msgstr "å?·æ?°ç??(_F)ï¼?"
 
-#: ../panels/display/display-capplet.ui.h:11
-#: ../panels/display/xrandr-capplet.c:321
+#: ../panels/display/display-capplet.ui.h:9
+#: ../panels/display/xrandr-capplet.c:317
 msgid "Right"
 msgstr "å?³"
 
-#: ../panels/display/display-capplet.ui.h:12
-msgid "Sa_me image in all monitors"
-msgstr "å?¨æ??æ??æ?¾ç¤ºå?¨æ?¾ç¤ºå??æ ·ç??å?¾å??(_M)"
-
-#: ../panels/display/display-capplet.ui.h:13
+#: ../panels/display/display-capplet.ui.h:10
 msgid "Upside-down"
 msgstr "ä¸?ä¸?é¢ å??"
 
-#: ../panels/display/display-capplet.ui.h:14
+#: ../panels/display/display-capplet.ui.h:11
 msgid "_Detect monitors"
 msgstr "���示�(_D)"
 
-#: ../panels/display/display-capplet.ui.h:15
+#: ../panels/display/display-capplet.ui.h:12
+msgid "_Include Top Menu Bar"
+msgstr "å??å?«ç­?ä¸?è??å??æ ?(_I)"
+
+#: ../panels/display/display-capplet.ui.h:13
+msgid "_Mirror Screens"
+msgstr "é??å??å±?å¹?(_M)"
+
+#: ../panels/display/display-capplet.ui.h:14
 msgid "_Resolution:"
 msgstr "å??辨ç??(_R)ï¼?"
 
-#: ../panels/display/display-capplet.ui.h:16
-msgid "_Show monitors in panel"
-msgstr "�����示�示�(_S)"
-
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
-msgid "Change resolution and position of monitors"
-msgstr "æ?´æ?¹æ?¾ç¤ºå?¨ç??å??辨ç??å??ä½?ç½®"
+msgid "Change resolution and position of monitors and projectors"
+msgstr "æ?´æ?¹æ?¾ç¤ºå?¨å??æ??影仪ç??å??辨ç??å??ä½?ç½®"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Monitors"
-msgstr "�示�"
-
-#: ../panels/display/gnome-display-properties-install-systemwide.c:44
-#, c-format
-msgid ""
-"Usage: %s SOURCE_FILE DEST_NAME\n"
-"\n"
-"This program installs a RANDR profile for multi-monitor setups into\n"
-"a systemwide location.  The resulting profile will get used when\n"
-"the RANDR plug-in gets run in gnome-settings-daemon.\n"
-"\n"
-"SOURCE_FILE - a full pathname, typically /home/username/.config/monitors."
-"xml\n"
-"\n"
-"DEST_NAME - relative name for the installed file.  This will get put in\n"
-"            the systemwide directory for RANDR configurations,\n"
-"            so the result will typically be %s/DEST_NAME\n"
-msgstr ""
-"ç?¨æ³?ï¼?%s æº?æ??件 ç?®æ ?å??称\n"
-"\n"
-"æ­¤ç¨?åº?å°?å¤?æ?¾ç¤ºå?¨è®¾ç½®ç?¨å?°ç?? RANDR é??ç½®æ??件å®?è£?å?°ç³»ç»?ä½?置中ã??è??该é??ç½®æ??件\n"
-"å°?å?¨ gnome-settings-daemon 中è¿?è¡? RANDR æ??件æ?¶ç?¨å?°ã??\n"
-"\n"
-"æº?æ??件 - å®?æ?´è·¯å¾?ï¼?é??常æ?¯ /home/username/.config/monitors.xml\n"
-"\n"
-"ç?®æ ?å??称 - æ??å®?è£?ç??æ??件ç??ç?¸å¯¹å??ã??该æ??件å°?被æ?¾ç½®äº? RANDR é??ç½®ç?¨å?°ç??ç³»ç»?ç?®\n"
-"           å½?中ï¼?å? æ­¤ç»?æ??é??常é?½æ?¯ %s/ç?®æ ?å??称\n"
-
-#. Translators: only able to install RANDR profiles as root
-#: ../panels/display/gnome-display-properties-install-systemwide.c:151
-msgid "This program can only be used by the root user"
-msgstr "此����� root ��使�"
-
-#: ../panels/display/gnome-display-properties-install-systemwide.c:168
-msgid "The source filename must be absolute"
-msgstr "æº?æ??件å??å¿?é¡»ç»?对"
-
-#. Translators: first %s is a filename; second %s is an error message
-#: ../panels/display/gnome-display-properties-install-systemwide.c:179
-#, c-format
-msgid "Could not open %s: %s\n"
-msgstr "æ? æ³?æ??å¼? %sï¼?%s\n"
-
-#. Translators: first %s is a filename; second %s is an error message
-#: ../panels/display/gnome-display-properties-install-systemwide.c:188
-#, c-format
-msgid "Could not get information for %s: %s\n"
-msgstr "æ? æ³?è?·å¾? %s ç??ä¿¡æ?¯ï¼?%s\n"
-
-#: ../panels/display/gnome-display-properties-install-systemwide.c:195
-#, c-format
-msgid "%s must be a regular file\n"
-msgstr "%s å¿?é¡»æ?¯æ?®é??æ??件\n"
-
-#: ../panels/display/gnome-display-properties-install-systemwide.c:204
-msgid "This program must only be run through pkexec(1)"
-msgstr "该ç¨?åº?å?ªè?½é??è¿? pkexec(1) è¿?è¡?"
-
-#: ../panels/display/gnome-display-properties-install-systemwide.c:209
-msgid "PKEXEC_UID must be set to an integer value"
-msgstr "PKEXEC_UID �须设�为�个���"
-
-#. Translators: we are complaining that a file must be really owned by the user who called this program
-#: ../panels/display/gnome-display-properties-install-systemwide.c:215
-#, c-format
-msgid "%s must be owned by you\n"
-msgstr "%s å¿?须为æ?¨æ??æ??\n"
-
-#. Translators: here we are saying that a plain filename must look like "filename", not like "some_dir/filename"
-#: ../panels/display/gnome-display-properties-install-systemwide.c:223
-#, c-format
-msgid "%s must not have any directory components\n"
-msgstr "%s ä¸?å®?ä¸?è?½æ??ä»»ä½?ç?®å½?ç»?件\n"
-
-#: ../panels/display/gnome-display-properties-install-systemwide.c:231
-#, c-format
-msgid "%s must be a directory\n"
-msgstr "%s �须�个��\n"
-
-#. Translators: the first %s/%s is a directory/filename; the last %s is an error message
-#: ../panels/display/gnome-display-properties-install-systemwide.c:242
-#, c-format
-msgid "Could not open %s/%s: %s\n"
-msgstr "æ? æ³?æ??å¼? %s/%sï¼?%s\n"
-
-#: ../panels/display/gnome-display-properties-install-systemwide.c:262
-#, c-format
-msgid "Could not rename %s to %s: %s\n"
-msgstr "æ? æ³?å°? %s é??å?½å??为 %sï¼?%s\n"
-
-#: ../panels/display/org.gnome.randr.policy.in.h:1
-msgid ""
-"Authentication is required to install multi-monitor settings for all users"
-msgstr "为æ??æ??ç?¨æ?·å®?è£?å¤?æ?¾ç¤ºå?¨è®¾å®?é??è¦?å¾?å?°æ??æ??"
-
-#: ../panels/display/org.gnome.randr.policy.in.h:2
-msgid "Install multi-monitor settings for the whole system"
-msgstr "为�个系�����示�设置"
+msgid "Displays"
+msgstr "�示"
 
-#: ../panels/display/xrandr-capplet.c:322
+#: ../panels/display/xrandr-capplet.c:318
 msgid "Upside Down"
 msgstr "ä¸?ä¸?é¢ å??"
 
-#: ../panels/display/xrandr-capplet.c:364
+#: ../panels/display/xrandr-capplet.c:360
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
@@ -2192,110 +823,111 @@ msgstr "%d Hz"
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../panels/display/xrandr-capplet.c:512
-#: ../panels/display/xrandr-capplet.c:1658
+#: ../panels/display/xrandr-capplet.c:509
+#: ../panels/display/xrandr-capplet.c:1696
 msgid "Mirror Screens"
 msgstr "é??å??å±?å¹?"
 
-#: ../panels/display/xrandr-capplet.c:514
+#: ../panels/display/xrandr-capplet.c:511
 #, c-format
 msgid "Monitor: %s"
 msgstr "�示��%s"
 
-#: ../panels/display/xrandr-capplet.c:592
+#: ../panels/display/xrandr-capplet.c:625
+#, c-format
+msgid "%d x %d (%s)"
+msgstr "%d x %d (%s)"
+
+#: ../panels/display/xrandr-capplet.c:627
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1514
+#: ../panels/display/xrandr-capplet.c:1551
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "é??æ?©ä¸?个æ?¾ç¤ºå?¨æ?¥æ?´æ?¹å®?ç??å±?æ?§ï¼?æ??å?¨å®?æ?¥æ??å??ä½?ç½®ã??"
 
-#: ../panels/display/xrandr-capplet.c:2079
+#: ../panels/display/xrandr-capplet.c:2119
 msgid "Could not save the monitor configuration"
 msgstr "æ? æ³?ä¿?å­?æ?¾ç¤ºå?¨é??ç½®"
 
-#: ../panels/display/xrandr-capplet.c:2102
+#: ../panels/display/xrandr-capplet.c:2142
 msgid "Could not get session bus while applying display configuration"
 msgstr "åº?ç?¨æ?¾ç¤ºé??ç½®æ?¶æ? æ³?è?·å¾?ä¼?è¯?æ?»çº¿"
 
-#: ../panels/display/xrandr-capplet.c:2147
+#: ../panels/display/xrandr-capplet.c:2187
 msgid "Could not detect displays"
 msgstr "æ? æ³?æ?¢æµ?æ?¾ç¤ºå?¨"
 
-#: ../panels/display/xrandr-capplet.c:2322
-msgid "The monitor configuration has been saved"
-msgstr "æ?¾ç¤ºå?¨é??置已ä¿?å­?"
-
-#: ../panels/display/xrandr-capplet.c:2324
-msgid "This configuration will be used the next time someone logs in."
-msgstr "此设置å°?å?¨ä¸?次ç?»å?¥æ?¶ä½¿ç?¨ã??"
-
-#: ../panels/display/xrandr-capplet.c:2358
-msgid "Could not set the default configuration for monitors"
-msgstr "æ? æ³?为æ?¾ç¤ºå?¨è®¾ç½®é»?认é??ç½®"
-
-#: ../panels/display/xrandr-capplet.c:2414
+#: ../panels/display/xrandr-capplet.c:2394
 msgid "Could not get screen information"
 msgstr "æ? æ³?è?·å¾?å±?å¹?ä¿¡æ?¯"
 
-#: ../panels/keybindings/00-multimedia-key.xml.in.h:1
+#: ../panels/keyboard/00-multimedia-key.xml.in.h:1
+#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
 msgid "Sound"
 msgstr "声�"
 
-#: ../panels/keybindings/01-desktop-key.xml.in.h:1
+#: ../panels/keyboard/01-desktop-key.xml.in.h:1
 msgid "Desktop"
 msgstr "æ¡?é?¢"
 
-#: ../panels/keybindings/eggcellrendererkeys.c:21
+#: ../panels/keyboard/eggcellrendererkeys.c:21
 msgid "New shortcut..."
 msgstr "�建快��..."
 
-#: ../panels/keybindings/eggcellrendererkeys.c:163
-#: ../panels/keybindings/eggcellrendererkeys.c:164
+#: ../panels/keyboard/eggcellrendererkeys.c:164
+#: ../panels/keyboard/eggcellrendererkeys.c:165
 msgid "Accelerator key"
 msgstr "å? é??é?®"
 
-#: ../panels/keybindings/eggcellrendererkeys.c:173
-#: ../panels/keybindings/eggcellrendererkeys.c:174
+#: ../panels/keyboard/eggcellrendererkeys.c:174
+#: ../panels/keyboard/eggcellrendererkeys.c:175
 msgid "Accelerator modifiers"
 msgstr "å? é??é?®ä¿®é¥°é?®"
 
-#: ../panels/keybindings/eggcellrendererkeys.c:182
-#: ../panels/keybindings/eggcellrendererkeys.c:183
+#: ../panels/keyboard/eggcellrendererkeys.c:183
+#: ../panels/keyboard/eggcellrendererkeys.c:184
 msgid "Accelerator keycode"
 msgstr "å? é??é?®é?®ç ?"
 
-#: ../panels/keybindings/eggcellrendererkeys.c:193
+#: ../panels/keyboard/eggcellrendererkeys.c:194
 msgid "Accel Mode"
 msgstr "å? é??模å¼?"
 
-#: ../panels/keybindings/eggcellrendererkeys.c:194
+#: ../panels/keyboard/eggcellrendererkeys.c:195
 msgid "The type of accelerator."
 msgstr "å? é??é?®ç±»å??ã??"
 
-#: ../panels/keybindings/eggcellrendererkeys.c:242
-#: ../panels/keybindings/gnome-keybinding-properties.c:101
-#: ../typing-break/drwright.c:498
+#. translators:
+#. * The device has been disabled
+#: ../panels/keyboard/eggcellrendererkeys.c:243
+#: ../panels/keyboard/gnome-keyboard-panel.c:104
+#: ../panels/sound/gvc-mixer-control.c:1087
+#: ../panels/sound/gvc-sound-theme-editor.c:895
+#: ../panels/sound/gvc-sound-theme-editor.c:991
+#: ../panels/user-accounts/um-fingerprint-dialog.c:177
+#: ../panels/user-accounts/um-fingerprint-dialog.c:178
+#: ../panels/user-accounts/um-login-options.c:354
 msgid "Disabled"
 msgstr "��"
 
-#: ../panels/keybindings/gnome-keybinding-properties.c:182
+#: ../panels/keyboard/gnome-keyboard-panel.c:185
 msgid "<Unknown Action>"
 msgstr "<æ?ªç?¥æ??ä½?>"
 
-#: ../panels/keybindings/gnome-keybinding-properties.c:932
-#: ../panels/keybindings/gnome-keybinding-properties.c:1563
+#: ../panels/keyboard/gnome-keyboard-panel.c:935
+#: ../panels/keyboard/gnome-keyboard-panel.c:1566
 msgid "Custom Shortcuts"
 msgstr "���快��"
 
-#: ../panels/keybindings/gnome-keybinding-properties.c:1074
+#: ../panels/keyboard/gnome-keyboard-panel.c:1077
 msgid "Error saving the new shortcut"
 msgstr "ä¿?å­?æ?°å¿«æ?·é?®å?ºé??"
 
-#: ../panels/keybindings/gnome-keybinding-properties.c:1153
+#: ../panels/keyboard/gnome-keyboard-panel.c:1156
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -2305,7 +937,7 @@ msgstr ""
 "æ? æ³?使ç?¨å¿«æ?·é?®â??%sâ??ï¼?å? 为使ç?¨æ­¤é?®å°?æ? æ³?è¾?å?¥ã??\n"
 "请å??æ?¶ä½¿ç?¨ Ctrlã??Alt æ?? Shift å??è¯?ä¸?次ã??"
 
-#: ../panels/keybindings/gnome-keybinding-properties.c:1183
+#: ../panels/keyboard/gnome-keyboard-panel.c:1186
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -2314,447 +946,336 @@ msgstr ""
 "å¿«æ?·é?®â??%sâ??å·²ç»?ç?¨äº?\n"
 "â??%sâ??"
 
-#: ../panels/keybindings/gnome-keybinding-properties.c:1189
+#: ../panels/keyboard/gnome-keyboard-panel.c:1192
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "å¦?æ??æ?¨å°?å¿«æ?·é?®é??æ?°æ??æ´¾ç»?â??%sâ??ï¼?â??%sâ??ç??å¿«æ?·é?®å°?被ç¦?ç?¨ã??"
 
-#: ../panels/keybindings/gnome-keybinding-properties.c:1197
+#: ../panels/keyboard/gnome-keyboard-panel.c:1200
 msgid "_Reassign"
 msgstr "é??æ?°æ??æ´¾(_R)"
 
-#: ../panels/keybindings/gnome-keybinding-properties.c:1317
+#: ../panels/keyboard/gnome-keyboard-panel.c:1320
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s"
 msgstr "å?¨é??ç½®æ?°æ?®åº?中å??æ¶?设置æ?°å? é??é?®æ?¶å?ºé??ï¼?%s"
 
-#: ../panels/keybindings/gnome-keybinding-properties.c:1518
+#: ../panels/keyboard/gnome-keyboard-panel.c:1521
 msgid "Too many custom shortcuts"
 msgstr "太å¤?ç??è?ªå®?ä¹?å¿«æ?·é?®"
 
-#: ../panels/keybindings/gnome-keybinding-properties.c:1850
+#: ../panels/keyboard/gnome-keyboard-panel.c:1882
 msgid "Action"
 msgstr "��"
 
-#: ../panels/keybindings/gnome-keybinding-properties.c:1872
+#: ../panels/keyboard/gnome-keyboard-panel.c:1904
 msgid "Shortcut"
 msgstr "å¿«æ?·é?®"
 
-#: ../panels/keybindings/gnome-keybinding-properties.ui.h:2
-msgid "Custom Shortcut"
-msgstr "���快��"
-
-#: ../panels/keybindings/gnome-keybinding-properties.ui.h:3
-#: ../panels/keybindings/gnome-keybindings-panel.desktop.in.in.h:2
-msgid "Keyboard Shortcuts"
-msgstr "é?®ç??å¿«æ?·é?®"
-
-#: ../panels/keybindings/gnome-keybinding-properties.ui.h:4
-msgid ""
-"To edit a shortcut key, click on the corresponding row and type a new key "
-"combination, or press backspace to clear."
-msgstr "è¦?ç¼?è¾?å¿«æ?·é?®ï¼?请å??å?»ç?¸åº?ç??è¡?ï¼?ç?¶å??è¾?å?¥æ?°æ??é?®ç»?å??ï¼?æ??æ??é??æ ¼é?®æ¸?é?¤ã??"
-
-#: ../panels/keybindings/gnome-keybindings-panel.desktop.in.in.h:1
-msgid "Assign shortcut keys to commands"
-msgstr "为å?½ä»¤æ??å®?å¿«æ?·é?®"
-
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:1
-msgid "Beep when _accessibility features are turned on or off"
-msgstr "è¾?å?©å??è?½æ??å¼?æ??å?³é?­æ?¶é¸£ç¬?(_A)"
-
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:2
-msgid "Beep when a _modifier key is pressed"
-msgstr "æ??ä¸?修饰é?®æ?¶é¸£ç¬?(_M)"
-
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:3
-msgid "Beep when a _toggle key is pressed"
-msgstr "æ??ä¸?å??æ?¢é?®æ?¶é¸£ç¬?(_T)"
-
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:4
-msgid "Beep when a key is pr_essed"
-msgstr "æ??ä¸?é?®æ?¶é¸£ç¬?(_E)"
+#.
+#. * vim: sw=2 ts=8 cindent noai bs=2
+#.
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
+msgid "Change keyboard settings"
+msgstr "æ?´æ?¹é?®ç??设置"
 
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:5
-msgid "Beep when a key is reje_cted"
-msgstr "æ??ç»?é?®æ?¶é¸£ç¬?(_C)"
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+msgid "Keyboard"
+msgstr "é?®ç??"
 
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:6
-msgid "Beep when key is _accepted"
-msgstr "æ?¥å??é?®é¸£ç¬?(_A)"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+msgid "Cursor Blinking"
+msgstr "å??æ ?é?ªç??"
 
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:7
-msgid "Beep when key is _rejected"
-msgstr "æ??ç»?é?®æ?¶é¸£ç¬?(_R)"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+msgid "Cursor _blinks in text fields"
+msgstr "æ??æ?¬å??中ç??å??æ ?ä¼?é?ªç??(_B)"
 
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:8
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:4
-#: ../panels/universal-access/uap.ui.h:17
-msgid "Bounce Keys"
-msgstr "å??å¼¹é?®"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: ../panels/universal-access/uap.ui.h:28
+msgid "Cursor blinks speed"
+msgstr "å??æ ?é?ªç??é??度"
 
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:9
-msgid "Flash _window titlebar"
-msgstr "é?ªç??çª?å?£æ ?é¢?æ ?(_W)"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+msgid "Custom Shortcut"
+msgstr "���快��"
 
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:10
-msgid "Flash entire _screen"
-msgstr "é?ªç??æ?´ä¸ªå±?å¹?(_S)"
+#. fast acceleration
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+#: ../panels/region/gnome-region-panel.ui.h:1
+#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+msgid "Fast"
+msgstr "å¿«"
 
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:11
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:14
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+#: ../panels/mouse/gnome-mouse-properties.ui.h:18
 msgid "General"
 msgstr "常�"
 
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:12
-msgid "Keyboard Accessibility Audio Feedback"
-msgstr "é?®ç??è¾?å?©å??è?½é?³é¢?å??é¦?"
-
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:13
-msgid "Show _visual feedback for the alert sound"
-msgstr "为警å??声é?³æ?¾ç¤ºè§?è§?å??é¦?(_V)"
-
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:14
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:39
-#: ../panels/universal-access/uap.ui.h:76
-msgid "Slow Keys"
-msgstr "æ?¢é??é?®"
-
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:15
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:40
-#: ../panels/universal-access/uap.ui.h:80
-msgid "Sticky Keys"
-msgstr "ç²?æ»?é?®"
-
-#: ../panels/keyboard/gnome-keyboard-properties-a11y-notifications.ui.h:16
-msgid "Visual cues for sounds"
-msgstr "声é?³å??é¦?"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:2
-msgid "All_ow postponing of breaks"
-msgstr "å??许æ?¨è¿?é?´æ?­(_O)"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:3
-msgid "Audio _Feedback..."
-msgstr "å?¬è§?å??é¦?(_F)..."
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+msgid "Key presses _repeat when key is held down"
+msgstr "æ??ä½?æ??ä¸?é?®æ?¶é??å¤?该é?®(_R)"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:5
-msgid "Check if breaks are allowed to be postponed"
-msgstr "æ£?æ?¥æ?¯å?¦å??许æ?¨è¿?é?´æ?­"
+#. long delay
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+#: ../panels/region/gnome-region-panel.ui.h:5
+#: ../panels/mouse/gnome-mouse-properties.ui.h:25
+#: ../panels/universal-access/uap.ui.h:52
+msgid "Long"
+msgstr "é?¿"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:6
-msgid "Cursor Blinking"
-msgstr "å??æ ?é?ªç??"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+msgid "Repeat Keys"
+msgstr "é??å¤?é?®"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:7
-msgid "Cursor _blinks in text fields"
-msgstr "æ??æ?¬å??中ç??å??æ ?ä¼?é?ªç??(_B)"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+msgid "Repeat keys speed"
+msgstr "é??å¤?é?®é??度"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:8
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
-#: ../panels/universal-access/uap.ui.h:29
-msgid "Cursor blinks speed"
-msgstr "å??æ ?é?ªç??é??度"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+msgid "S_peed:"
+msgstr "é??度(_P)ï¼?"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:9
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
-#: ../panels/universal-access/uap.ui.h:30
-msgid "D_elay:"
-msgstr "延�(_E)�"
+#. short delay
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+#: ../panels/region/gnome-region-panel.ui.h:19
+#: ../panels/mouse/gnome-mouse-properties.ui.h:35
+#: ../panels/universal-access/uap.ui.h:72
+msgid "Short"
+msgstr "ç?­"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:10
-msgid "Disa_ble sticky keys if two keys are pressed together"
-msgstr "è?¥å??æ?¶æ??两个é?®å??ç¦?ç?¨(_B)"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+msgid "Shortcuts"
+msgstr "å¿«æ?·é?®"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:11
-msgid "Duration of the break when typing is disallowed"
-msgstr "ä¸?å??许æ??å­?æ?¶é?´æ?­æ??ç»­æ?¶é?´"
+#. slow acceleration
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+#: ../panels/region/gnome-region-panel.ui.h:20
+#: ../panels/mouse/gnome-mouse-properties.ui.h:39
+msgid "Slow"
+msgstr "æ?¢"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:12
-msgid "Duration of work before forcing a break"
-msgstr "强å?¶é?´æ?­å??ç??å·¥ä½?æ??ç»­æ?¶é?´"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+msgid ""
+"To edit a shortcut key, click on the corresponding row and type a new key "
+"combination, or press backspace to clear."
+msgstr "è¦?ç¼?è¾?å¿«æ?·é?®ï¼?请å??å?»ç?¸åº?ç??è¡?ï¼?ç?¶å??è¾?å?¥æ?°æ??é?®ç»?å??ï¼?æ??æ??é??æ ¼é?®æ¸?é?¤ã??"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:13
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
-msgid "Fast"
-msgstr "å¿«"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+#: ../panels/region/gnome-region-panel.ui.h:24
+#: ../panels/mouse/gnome-mouse-properties.ui.h:49
+msgid "_Delay:"
+msgstr "延�(_D)�"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:15
-msgid "Key presses _repeat when key is held down"
-msgstr "æ??ä½?æ??ä¸?é?®æ?¶é??å¤?该é?®(_R)"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+msgid "_Name:"
+msgstr "å??称(_N)ï¼?"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:16
-msgid "Keyboard Preferences"
-msgstr "é?®ç??é¦?é??项"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+#: ../panels/region/gnome-region-panel.ui.h:28
+msgid "_Speed:"
+msgstr "é??度(_S)ï¼?"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:17
+#: ../panels/region/gnome-region-panel.ui.h:2
 msgid "Keyboard _model:"
 msgstr "é?®ç??å??å?·(_M)ï¼?"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:18
+#: ../panels/region/gnome-region-panel.ui.h:3
 msgid "Layouts"
 msgstr "��"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:19
+#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "List of keyboard layouts selected for usage"
 msgstr "å?¯é??æ?©ä½¿ç?¨ç??é?®ç??å¸?å±?å??表"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:20
-msgid ""
-"Lock screen after a certain duration to help prevent repetitive keyboard use "
-"injuries"
-msgstr "æ¯?é??ä¸?段æ?¶é?´é??å®?å±?å¹?ï¼?以便é??å¤?æ?§ç??é?®ç??å·¥ä½?使æ??è??è¿?度å?³ç´¯"
-
-#. long delay
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:21
-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
-#: ../panels/universal-access/uap.ui.h:53
-msgid "Long"
-msgstr "é?¿"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:22
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/region/gnome-region-panel.ui.h:6
+#: ../panels/universal-access/uap.ui.h:55
 msgid "Mouse Keys"
 msgstr "é¼ æ ?é?®"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:23
+#: ../panels/region/gnome-region-panel.ui.h:7
 msgid "Move _Down"
 msgstr "å??ä¸?移å?¨(_D)"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:24
+#: ../panels/region/gnome-region-panel.ui.h:8
 msgid "Move _Up"
 msgstr "å??ä¸?移å?¨(_U)"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:25
+#: ../panels/region/gnome-region-panel.ui.h:9
 msgid "Move the selected keyboard layout down in the list"
 msgstr "å?¨å??表中ä¸?移é??å®?ç??é?®ç??å¸?å±?"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:26
+#: ../panels/region/gnome-region-panel.ui.h:10
 msgid "Move the selected keyboard layout up in the list"
 msgstr "å?¨å??表中ä¸?移é??å®?ç??é?®ç??å¸?å±?"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:27
+#: ../panels/region/gnome-region-panel.ui.h:11
 msgid "New windows u_se active window's layout"
 msgstr "æ?°çª?å?£ä½¿ç?¨æ´»å?¨çª?å?£ç??å¸?å±?(_S)"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:28
+#: ../panels/region/gnome-region-panel.ui.h:12
 msgid "Print a diagram of the selected keyboard layout"
 msgstr "æ??å?°é??中é?®ç??å¸?å±?ç??ä¸?份å?¾ç¤º"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:29
+#: ../panels/region/gnome-region-panel.ui.h:13
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+msgid "Region and Language"
+msgstr "å?ºå??å??语è¨?"
+
+#: ../panels/region/gnome-region-panel.ui.h:14
 msgid "Remove the selected keyboard layout from the list"
 msgstr "ä»?å??表中å? é?¤é??中ç??é?®ç??å¸?å±?"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:30
-msgid "Repeat Keys"
-msgstr "é??å¤?é?®"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:31
-msgid "Repeat keys speed"
-msgstr "é??å¤?é?®é??度"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:32
+#: ../panels/region/gnome-region-panel.ui.h:15
 msgid ""
 "Replace the current keyboard layout settings with the\n"
 "default settings"
 msgstr "使ç?¨é»?认设å®?æ?¿æ?¢å½?å??é?®ç??å¸?å±?"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:34
+#: ../panels/region/gnome-region-panel.ui.h:17
 msgid "Reset to De_faults"
 msgstr "é??置为é»?认å?¼(_F)"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:35
-msgid "S_peed:"
-msgstr "é??度(_P)ï¼?"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:36
+#: ../panels/region/gnome-region-panel.ui.h:18
 msgid "Select a keyboard layout to be added to the list"
 msgstr "请é??æ?©è¦?æ·»å? å?°å??表ç??é?®ç??å¸?å±?"
 
-#. short delay
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:37
-#: ../panels/mouse/gnome-mouse-properties.ui.h:27
-#: ../panels/universal-access/uap.ui.h:73
-msgid "Short"
-msgstr "ç?­"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:38
-#: ../panels/mouse/gnome-mouse-properties.ui.h:30
-msgid "Slow"
-msgstr "æ?¢"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:41
-msgid "Typing Break"
-msgstr "æ??å­?é?´æ?­"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:42
+#: ../panels/region/gnome-region-panel.ui.h:21
 msgid "View and edit keyboard layout options"
 msgstr "æ?¥ç??并ç¼?è¾?é?®ç??å¸?å±?é??项"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:43
-#: ../panels/mouse/gnome-mouse-properties.ui.h:37
+#: ../panels/region/gnome-region-panel.ui.h:22
+#: ../panels/mouse/gnome-mouse-properties.ui.h:48
 msgid "_Acceleration:"
 msgstr "å? é??(_A)ï¼?"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:44
-msgid "_Accessibility features can be toggled with keyboard shortcuts"
-msgstr "å??许é??è¿?å¿«æ?·é?®æ??å¼?æ??å?³é?­è¾?å?©ç?¹æ?§(_A)"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:46
-msgid "_Break interval lasts:"
-msgstr "é?´æ?­é?´é??æ??ç»­(_B)ï¼?"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:47
-#: ../panels/mouse/gnome-mouse-properties.ui.h:38
-msgid "_Delay:"
-msgstr "延�(_D)�"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:48
-msgid "_Ignore fast duplicate keypresses"
-msgstr "忽ç?¥å¿«é??é??å¤?æ??é?®(_I)"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:49
-msgid "_Lock screen to enforce typing break"
-msgstr "é??å®?å±?å¹?æ?¥å¼ºå?¶æ??å­?é?´æ?­(_L)"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:50
-msgid "_Only accept long keypresses"
-msgstr "ä»?æ?¥å??é?¿æ??é?®(_O)"
+#: ../panels/region/gnome-region-panel.ui.h:23
+msgid "_Add..."
+msgstr "æ·»å? (_A)..."
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:51
+#: ../panels/region/gnome-region-panel.ui.h:25
 msgid "_Options..."
 msgstr "é??项(_O)..."
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:52
+#: ../panels/region/gnome-region-panel.ui.h:26
 msgid "_Pointer can be controlled using the keypad"
 msgstr "å??许使ç?¨é?®ç??æ?§å?¶æ??é??(_P)"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:53
+#: ../panels/region/gnome-region-panel.ui.h:27
 msgid "_Separate layout for each window"
 msgstr "�个������(_S)"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:54
-msgid "_Simulate simultaneous keypresses"
-msgstr "模æ??å??æ?¶æ??é?®(_S)"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:55
-msgid "_Speed:"
-msgstr "é??度(_S)ï¼?"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:56
+#: ../panels/region/gnome-region-panel.ui.h:29
 msgid "_Type to test settings:"
 msgstr "���符���设置(_T)�"
 
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:57
-msgid "_Work interval lasts:"
-msgstr "å·¥ä½?é?´é??æ??ç»­(_W)ï¼?"
-
-#: ../panels/keyboard/gnome-keyboard-properties-dialog.ui.h:58
-msgid "minutes"
-msgstr "å??é??"
-
-#: ../panels/keyboard/gnome-keyboard-properties-layout-chooser.ui.h:1
+#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:1
 msgid "By _country"
 msgstr "æ??å?½å®¶/å?°å?º(_C)"
 
-#: ../panels/keyboard/gnome-keyboard-properties-layout-chooser.ui.h:2
+#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:2
 msgid "By _language"
 msgstr "æ??语è¨?(_L)"
 
-#: ../panels/keyboard/gnome-keyboard-properties-layout-chooser.ui.h:3
+#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:3
 msgid "Choose a Layout"
 msgstr "é??æ?©å¸?å±?"
 
-#: ../panels/keyboard/gnome-keyboard-properties-layout-chooser.ui.h:4
+#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:4
 msgid "Preview:"
 msgstr "���"
 
-#: ../panels/keyboard/gnome-keyboard-properties-layout-chooser.ui.h:5
+#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:5
 msgid "_Country:"
 msgstr "�家/��(_C)�"
 
-#: ../panels/keyboard/gnome-keyboard-properties-layout-chooser.ui.h:6
+#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:6
 msgid "_Language:"
 msgstr "语�(_L)�"
 
-#: ../panels/keyboard/gnome-keyboard-properties-layout-chooser.ui.h:7
+#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:7
 msgid "_Variants:"
 msgstr "å??ä½?(_V)ï¼?"
 
-#: ../panels/keyboard/gnome-keyboard-properties-model-chooser.ui.h:1
+#: ../panels/region/gnome-region-panel-model-chooser.ui.h:1
 msgid "Choose a Keyboard Model"
 msgstr "é??æ?©é?®ç??å??å?·"
 
-#: ../panels/keyboard/gnome-keyboard-properties-model-chooser.ui.h:2
+#: ../panels/region/gnome-region-panel-model-chooser.ui.h:2
 msgid "_Models:"
 msgstr "å??å?·(_M)ï¼?"
 
-#: ../panels/keyboard/gnome-keyboard-properties-model-chooser.ui.h:3
+#: ../panels/region/gnome-region-panel-model-chooser.ui.h:3
 msgid "_Vendors:"
 msgstr "å?¶é? å??(_V)ï¼?"
 
-#: ../panels/keyboard/gnome-keyboard-properties-options-dialog.ui.h:1
+#: ../panels/region/gnome-region-panel-options-dialog.ui.h:1
 msgid "Keyboard Layout Options"
 msgstr "é?®ç??å¸?å±?é??项"
 
-#: ../panels/keyboard/gnome-keyboard-properties-xkb.c:82
+#: ../panels/region/gnome-region-panel-xkb.c:70
 msgid "Unknown"
 msgstr "��"
 
-#: ../panels/keyboard/gnome-keyboard-properties-xkblt.c:242
+#: ../panels/region/gnome-region-panel-xkblt.c:218
 msgid "Layout"
 msgstr "��"
 
-#: ../panels/keyboard/gnome-keyboard-properties-xkbmc.c:168
+#: ../panels/region/gnome-region-panel-xkbmc.c:163
 msgid "Vendors"
 msgstr "å?¶é? å??"
 
-#: ../panels/keyboard/gnome-keyboard-properties-xkbmc.c:234
+#: ../panels/region/gnome-region-panel-xkbmc.c:229
 msgid "Models"
 msgstr "å??å?·"
 
-#: ../panels/keyboard/gnome-keyboard-properties-xkbot.c:235
-#: ../panels/network/gnome-network-properties.c:583
+#: ../panels/region/gnome-region-panel-xkbot.c:227
+#: ../panels/network/gnome-network-properties.c:554
+#: ../panels/sound/gvc-sound-theme-chooser.c:818
+#: ../panels/sound/gvc-sound-theme-editor.c:891
+#: ../panels/sound/gvc-sound-theme-editor.c:995
 msgid "Default"
 msgstr "�认"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-msgid "Keyboard"
-msgstr "é?®ç??"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
+msgid "Change your region and language settings"
+msgstr "æ?´æ?¹æ?¨ç??å?ºå??å??语è¨?设置"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Set your keyboard preferences"
-msgstr "设置é?®ç??é¦?é??项"
+#: ../panels/mouse/capplet-stock-icons.c:66
+#, c-format
+msgid "Unable to load stock icon '%s'\n"
+msgstr "æ? æ³?è£?å?¥å?¾æ ?â??%sâ??\n"
 
 #. Translators: this is the gesture to trigger/choose the click type.
 #. Don't include the prefix "gesture|" in the translation.
-#: ../panels/mouse/gnome-mouse-accessibility.c:89
+#: ../panels/mouse/gnome-mouse-accessibility.c:79
 msgid "gesture|Move left"
 msgstr "左移"
 
 #. Translators: this is the gesture to trigger/choose the click type.
 #. Don't include the prefix "gesture|" in the translation.
-#: ../panels/mouse/gnome-mouse-accessibility.c:94
+#: ../panels/mouse/gnome-mouse-accessibility.c:84
 msgid "gesture|Move right"
 msgstr "�移"
 
 #. Translators: this is the gesture to trigger/choose the click type.
 #. Don't include the prefix "gesture|" in the translation.
-#: ../panels/mouse/gnome-mouse-accessibility.c:99
+#: ../panels/mouse/gnome-mouse-accessibility.c:89
 msgid "gesture|Move up"
 msgstr "�移"
 
 #. Translators: this is the gesture to trigger/choose the click type.
 #. Don't include the prefix "gesture|" in the translation.
-#: ../panels/mouse/gnome-mouse-accessibility.c:104
+#: ../panels/mouse/gnome-mouse-accessibility.c:94
 msgid "gesture|Move down"
 msgstr "�移"
 
 #. Translators: this is the gesture to trigger/choose the click type.
 #. Don't include the prefix "gesture|" in the translation.
-#: ../panels/mouse/gnome-mouse-accessibility.c:109
+#: ../panels/mouse/gnome-mouse-accessibility.c:99
 msgid "gesture|Disabled"
 msgstr "��"
 
@@ -2766,161 +1287,182 @@ msgstr "é??æ?©é¢?设ç??ç?¹å?»ç±»å??(_B)"
 msgid "Choose type of click with mo_use gestures"
 msgstr "é¼ æ ?æ??å?¿é??æ?©å??å?»ç±»å??(_U)"
 
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: ../panels/universal-access/uap.ui.h:29
+msgid "D_elay:"
+msgstr "延�(_E)�"
+
 #: ../panels/mouse/gnome-mouse-properties.ui.h:6
 msgid "D_ouble click:"
 msgstr "å??å?»(_O)ï¼?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#. click to initiate drag-and-drop (like normally click and hold)
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
 msgid "D_rag click:"
 msgstr "æ??æ?³å?»(_R)ï¼?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
 msgid "Disable _touchpad while typing"
 msgstr "æ??å­?æ?¶ç¦?ç?¨è§¦æ?¸æ?¿(_T)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+#: ../panels/mouse/gnome-mouse-properties.ui.h:10
 msgid "Double-Click Timeout"
 msgstr "å??å?»è¶?æ?¶"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
 msgid "Drag and Drop"
 msgstr "æ??æ?¾"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#. Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
 msgid "Dwell Click"
 msgstr "æ?¬å??ç?¹å?»"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgid "Enable _mouse clicks with touchpad"
 msgstr "å?¯ç?¨è§¦æ?¸æ?¿ç??é¼ æ ?ç?¹å?»(_M)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
 msgid "Enable h_orizontal scrolling"
 msgstr "��水平��(_O)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
-#: ../panels/universal-access/uap.ui.h:40
+#. high sensitivity
+#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+#: ../panels/universal-access/uap.ui.h:39
 msgid "High"
 msgstr "é«?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#. large threshold
+#: ../panels/mouse/gnome-mouse-properties.ui.h:22
+#: ../panels/universal-access/uap.ui.h:49
+msgid "Large"
+msgstr "大"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:23
 msgid "Locate Pointer"
 msgstr "å®?ä½?æ??é??"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:20
-#: ../panels/universal-access/uap.ui.h:54
+#. low sensitivity
+#: ../panels/mouse/gnome-mouse-properties.ui.h:27
+#: ../panels/universal-access/uap.ui.h:53
 msgid "Low"
 msgstr "ä½?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
+#: ../panels/mouse/gnome-mouse-properties.ui.h:28
 msgid "Mouse Orientation"
 msgstr "é¼ æ ?æ?¹å??"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:22
+#: ../panels/mouse/gnome-mouse-properties.ui.h:29
 msgid "Mouse Preferences"
 msgstr "é¼ æ ?é¦?é??项"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:23
+#: ../panels/mouse/gnome-mouse-properties.ui.h:30
 msgid "Pointer Speed"
 msgstr "æ??é??é??度"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:24
+#: ../panels/mouse/gnome-mouse-properties.ui.h:31
 msgid "Scrolling"
 msgstr "æ»?å?¨"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:25
+#: ../panels/mouse/gnome-mouse-properties.ui.h:32
 msgid "Seco_ndary click:"
 msgstr "第��(_N)�"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:26
+#: ../panels/mouse/gnome-mouse-properties.ui.h:33
 msgid "Sh_ow position of pointer when the Control key is pressed"
 msgstr "æ??ä½? Ctrl é?®æ?¶æ?¾ç¤ºæ??é??ä½?ç½®(_O)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:28
+#: ../panels/mouse/gnome-mouse-properties.ui.h:36
 msgid "Show click type _window"
 msgstr "æ?¾ç¤ºç?¹å?»ç±»å??çª?å?£(_W)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:29
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/mouse/gnome-mouse-properties.ui.h:37
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Simulated Secondary Click"
 msgstr "模æ??å??次ç?¹å?»"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:32
+#. small threshold
+#: ../panels/mouse/gnome-mouse-properties.ui.h:41
+#: ../panels/universal-access/uap.ui.h:77
+msgid "Small"
+msgstr "å°?"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:42
 msgid "Thr_eshold:"
 msgstr "é??å?¼(_E)ï¼?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:33
+#: ../panels/mouse/gnome-mouse-properties.ui.h:43
 msgid ""
 "To test your double-click settings, try to double-click on the light bulb."
 msgstr "è¦?æµ?è¯?æ?¨ç??å??å?»è®¾ç½®ï¼?请è¯?ç??å??å?»å?³ä¾§ç??ç?¯æ³¡ã??"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:34
+#: ../panels/mouse/gnome-mouse-properties.ui.h:44
 msgid "Touchpad"
 msgstr "触��"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:35
+#: ../panels/mouse/gnome-mouse-properties.ui.h:45
 msgid "Two-_finger scrolling"
 msgstr "å??æ??æ»?å?¨(_F)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:36
+#. Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)
+#: ../panels/mouse/gnome-mouse-properties.ui.h:47
 msgid "You can also use the Dwell Click panel applet to choose the click type."
 msgstr "æ?¨ä¹?å?¯ä»¥ä½¿ç?¨æ?¬å??ç?¹å?»é?¢æ?¿å°?ç¨?åº?æ?¥é??æ?©ç?¹å?»ç??ç±»å??ã??"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:39
+#: ../panels/mouse/gnome-mouse-properties.ui.h:50
 msgid "_Disabled"
 msgstr "��(_D)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:40
+#: ../panels/mouse/gnome-mouse-properties.ui.h:51
 msgid "_Edge scrolling"
 msgstr "è¾¹ç??æ»?å?¨(_E)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:41
+#: ../panels/mouse/gnome-mouse-properties.ui.h:52
 msgid "_Initiate click when stopping pointer movement"
 msgstr "æ??é??å??æ­¢è¿?å?¨æ?¶æ?§è¡?ç?¹å?»(_I)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:42
+#: ../panels/mouse/gnome-mouse-properties.ui.h:53
 msgid "_Left-handed"
 msgstr "æ?¯ç?¨å·¦æ??(_L)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:43
-#: ../panels/universal-access/uap.ui.h:98
+#: ../panels/mouse/gnome-mouse-properties.ui.h:54
+#: ../panels/universal-access/uap.ui.h:97
 msgid "_Motion threshold:"
 msgstr "è¿?å?¨é??å?¼(_M)ï¼?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:44
+#: ../panels/mouse/gnome-mouse-properties.ui.h:55
 msgid "_Right-handed"
 msgstr "æ?¯ç?¨å?³æ??(_R)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:45
+#: ../panels/mouse/gnome-mouse-properties.ui.h:56
 msgid "_Sensitivity:"
 msgstr "ç?µæ??度(_S)ï¼?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:46
+#: ../panels/mouse/gnome-mouse-properties.ui.h:57
 msgid "_Single click:"
 msgstr "å??å?»(_S)ï¼?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:47
+#: ../panels/mouse/gnome-mouse-properties.ui.h:58
 msgid "_Timeout:"
 msgstr "��(_T)�"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:48
+#: ../panels/mouse/gnome-mouse-properties.ui.h:59
 msgid "_Trigger secondary click by holding down the primary button"
 msgstr "æ??ä½?é¼ æ ?主é?®ä¸?æ?¾æ?¶è§¦å??次å?»(_T)"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-msgid "Mouse"
-msgstr "é¼ æ ?"
+msgid "Mouse and Touchpad"
+msgstr "é¼ æ ?å??触æ?¸æ?¿"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Set your mouse preferences"
-msgstr "è®¾ç½®é¼ æ ?é¦?é??项"
+msgid "Set your mouse and touchpad preferences"
+msgstr "设置æ?¨ç??é¼ æ ?å??触æ?¸æ?¿é¦?é??项"
 
-#: ../panels/network/gnome-network-properties.c:701
-#: ../panels/network/gnome-network-properties.c:852
+#: ../panels/network/gnome-network-properties.c:672
 msgid "New Location..."
 msgstr "�建�置..."
 
-#: ../panels/network/gnome-network-properties.c:818
+#: ../panels/network/gnome-network-properties.c:789
 msgid "Location already exists"
 msgstr "�置已��"
 
@@ -2977,6 +1519,7 @@ msgid "Ignored Hosts"
 msgstr "忽ç?¥ç??主æ?º"
 
 #: ../panels/network/gnome-network-properties.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:18
 msgid "Location:"
 msgstr "�置�"
 
@@ -3032,6 +1575,422 @@ msgstr "å®?å?¨ HTTP 代ç??(_S)ï¼?"
 msgid "_Use the same proxy for all protocols"
 msgstr "为æ??æ??å??议使ç?¨ç?¸å??ç??代ç??(_U)"
 
+#: ../panels/sound/applet-main.c:49
+msgid "Enable debugging code"
+msgstr "å?¯ç?¨è°?è¯?代ç ?"
+
+#: ../panels/sound/applet-main.c:50
+msgid "Version of this application"
+msgstr "æ­¤åº?ç?¨ç¨?åº?ç??ç??æ?¬"
+
+#: ../panels/sound/applet-main.c:62
+msgid " â?? GNOME Volume Control Applet"
+msgstr " - GNOME 声������"
+
+#: ../panels/sound/cc-sound-panel.c:107
+msgid "Waiting for sound system to respond"
+msgstr "ç­?å¾?声é?³ç³»ç»?å??åº?"
+
+#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1883
+msgid "Output"
+msgstr "è¾?å?º"
+
+#: ../panels/sound/gvc-applet.c:278
+msgid "Sound Output Volume"
+msgstr "è¾?å?ºé?³é??"
+
+#: ../panels/sound/gvc-applet.c:282 ../panels/sound/gvc-mixer-dialog.c:1797
+msgid "Input"
+msgstr "è¾?å?¥"
+
+#: ../panels/sound/gvc-applet.c:284
+msgid "Microphone Volume"
+msgstr "è¯?ç­?é?³é??"
+
+#: ../panels/sound/gvc-balance-bar.c:111
+msgctxt "balance"
+msgid "Left"
+msgstr "å·¦"
+
+#: ../panels/sound/gvc-balance-bar.c:112
+msgctxt "balance"
+msgid "Right"
+msgstr "å?³"
+
+#: ../panels/sound/gvc-balance-bar.c:115
+msgctxt "balance"
+msgid "Rear"
+msgstr ""
+
+#: ../panels/sound/gvc-balance-bar.c:116
+msgctxt "balance"
+msgid "Front"
+msgstr "å??"
+
+#: ../panels/sound/gvc-balance-bar.c:119
+msgctxt "balance"
+msgid "Minimum"
+msgstr "æ??å°?"
+
+#: ../panels/sound/gvc-balance-bar.c:120
+msgctxt "balance"
+msgid "Maximum"
+msgstr "æ??大"
+
+#: ../panels/sound/gvc-balance-bar.c:296
+msgid "_Balance:"
+msgstr ""
+
+#: ../panels/sound/gvc-balance-bar.c:299
+msgid "_Fade:"
+msgstr "淡�淡�(_F)�"
+
+#: ../panels/sound/gvc-balance-bar.c:302
+msgid "_Subwoofer:"
+msgstr ""
+
+#: ../panels/sound/gvc-channel-bar.c:603 ../panels/sound/gvc-channel-bar.c:612
+msgctxt "volume"
+msgid "100%"
+msgstr "100%"
+
+#: ../panels/sound/gvc-channel-bar.c:607
+msgctxt "volume"
+msgid "Unamplified"
+msgstr ""
+
+#: ../panels/sound/gvc-channel-bar.c:901
+msgid "Mute"
+msgstr "é??é?³"
+
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1588
+msgid "_Profile:"
+msgstr "é??ç½®æ??件(_P)ï¼?"
+
+#. translators:
+#. * The number of sound outputs on a particular device
+#: ../panels/sound/gvc-mixer-control.c:1094
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u 个��"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: ../panels/sound/gvc-mixer-control.c:1104
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u 个��"
+
+#: ../panels/sound/gvc-mixer-control.c:1402
+msgid "System Sounds"
+msgstr "系�声�"
+
+#: ../panels/sound/gvc-mixer-dialog.c:310
+#: ../panels/sound/gvc-mixer-dialog.c:605
+#, fuzzy
+#| msgid "Co_untry:"
+msgid "Co_nnector:"
+msgstr "�家/��(_U)�"
+
+#: ../panels/sound/gvc-mixer-dialog.c:518
+msgid "Peak detect"
+msgstr ""
+
+#: ../panels/sound/gvc-mixer-dialog.c:1478
+#: ../panels/sound/gvc-mixer-dialog.c:1676
+#: ../panels/sound/gvc-sound-theme-chooser.c:828
+msgid "Name"
+msgstr "å??称"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1483
+msgid "Device"
+msgstr "设�"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1531
+#, c-format
+msgid "Speaker Testing for %s"
+msgstr "%s �声���"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1589
+msgid "Test Speakers"
+msgstr "���声�"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1720
+msgid "_Output volume: "
+msgstr "è¾?å?ºé?³é??(_O)ï¼?"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1734
+msgid "Sound Effects"
+msgstr "声é?³æ??æ??..."
+
+#: ../panels/sound/gvc-mixer-dialog.c:1741
+msgid "_Alert volume: "
+msgstr "è­¦å??é?³é??(_A)ï¼?"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1754
+msgid "Hardware"
+msgstr "硬件"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1759
+msgid "C_hoose a device to configure:"
+msgstr "é??æ?©è¦?é??ç½®ç??设å¤?(_H)ï¼?"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1786
+#: ../panels/sound/gvc-mixer-dialog.c:1915
+msgid "Settings for the selected device:"
+msgstr "é??中设å¤?ç??设置ï¼?"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1804
+msgid "_Input volume: "
+msgstr "è¾?å?¥é?³é??(_I)ï¼?"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1827
+msgid "Input level:"
+msgstr "���级�"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1853
+msgid "C_hoose a device for sound input:"
+msgstr "é??æ?©é?³é¢?è¾?å?¥è®¾å¤?(_H)ï¼?"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1888
+msgid "C_hoose a device for sound output:"
+msgstr "é??æ?©é?³é¢?è¾?å?ºè®¾å¤?(_H)ï¼?"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1926
+msgid "Applications"
+msgstr "����"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1930
+msgid "No application is currently playing or recording audio."
+msgstr "没æ??ç¨?åº?æ­£å?¨æ?­æ?¾æ??å½?å?¶é?³é¢?ã??"
+
+#: ../panels/sound/gvc-speaker-test.c:221
+msgid "Stop"
+msgstr "å??æ­¢"
+
+#: ../panels/sound/gvc-speaker-test.c:221
+#: ../panels/sound/gvc-speaker-test.c:333
+msgid "Test"
+msgstr "��"
+
+#: ../panels/sound/gvc-speaker-test.c:229
+msgid "Subwoofer"
+msgstr ""
+
+#: ../panels/sound/gvc-stream-status-icon.c:233
+#, c-format
+msgid "Failed to start Sound Preferences: %s"
+msgstr "å?¯å?¨å£°é?³é¦?é??项失败ï¼?%s"
+
+#: ../panels/sound/gvc-stream-status-icon.c:256
+msgid "_Mute"
+msgstr "é??é?³(_M)"
+
+#: ../panels/sound/gvc-stream-status-icon.c:265
+msgid "_Sound Preferences"
+msgstr "声é?³é¦?é??项(_S)"
+
+#: ../panels/sound/gvc-stream-status-icon.c:449
+msgid "Muted"
+msgstr "å·²é??é?³"
+
+#: ../panels/sound/gvc-sound-theme-chooser.c:321
+#: ../panels/sound/gvc-sound-theme-editor.c:522
+msgid "No sounds"
+msgstr "æ? 声é?³"
+
+#: ../panels/sound/gvc-sound-theme-chooser.c:443
+msgid "Built-in"
+msgstr "å??建"
+
+#: ../panels/sound/gvc-sound-theme-chooser.c:688
+#: ../panels/sound/gvc-sound-theme-chooser.c:700
+#: ../panels/sound/gvc-sound-theme-chooser.c:712
+#: ../panels/sound/gvc-sound-theme-editor.c:560
+#: ../panels/sound/gvc-sound-theme-editor.c:949
+msgid "Sound Preferences"
+msgstr "声é?³é¦?é??项"
+
+#: ../panels/sound/gvc-sound-theme-chooser.c:691
+#: ../panels/sound/gvc-sound-theme-chooser.c:702
+#: ../panels/sound/gvc-sound-theme-chooser.c:714
+#: ../panels/sound/gvc-sound-theme-editor.c:562
+#: ../panels/sound/gvc-sound-theme-editor.c:951
+msgid "Testing event sound"
+msgstr "���件声�"
+
+#: ../panels/sound/gvc-sound-theme-chooser.c:819
+msgid "From theme"
+msgstr "��主�"
+
+#: ../panels/sound/gvc-sound-theme-chooser.c:835
+msgid "Type"
+msgstr "ç±»å??"
+
+#: ../panels/sound/gvc-sound-theme-chooser.c:1039
+msgid "Sound _theme:"
+msgstr "声�主�(_T)�"
+
+#: ../panels/sound/gvc-sound-theme-chooser.c:1047
+msgid "C_hoose an alert sound:"
+msgstr "é??æ?©è­¦å??声é?³(_H)ï¼?"
+
+#: ../panels/sound/gvc-sound-theme-chooser.c:1078
+msgid "Enable _window and button sounds"
+msgstr "å?¯ç?¨çª?å?£å??æ??é?®å£°é?³(_W)"
+
+#. Bell
+#: ../panels/sound/gvc-sound-theme-editor.c:79
+msgctxt "Sound event"
+msgid "Alert sound"
+msgstr "è­¦å??声é?³"
+
+#. Windows and buttons
+#: ../panels/sound/gvc-sound-theme-editor.c:81
+msgctxt "Sound event"
+msgid "Windows and Buttons"
+msgstr "çª?å?£å??æ??é?®"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:82
+msgctxt "Sound event"
+msgid "Button clicked"
+msgstr "æ??ä¸?æ??é?®"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:83
+msgctxt "Sound event"
+msgid "Toggle button clicked"
+msgstr "ç?¹å?»å??æ?¢æ??é?®"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:84
+msgctxt "Sound event"
+msgid "Window maximized"
+msgstr "æ??大å??çª?å?£"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:85
+msgctxt "Sound event"
+msgid "Window unmaximized"
+msgstr "è¿?å??çª?å?£"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:86
+msgctxt "Sound event"
+msgid "Window minimised"
+msgstr "æ??å°?å??çª?å?£"
+
+#. Desktop
+#: ../panels/sound/gvc-sound-theme-editor.c:88
+msgctxt "Sound event"
+msgid "Desktop"
+msgstr "æ¡?é?¢"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:89
+msgctxt "Sound event"
+msgid "Login"
+msgstr "��"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:90
+msgctxt "Sound event"
+msgid "Logout"
+msgstr "注é??"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:91
+msgctxt "Sound event"
+msgid "New e-mail"
+msgstr "��件�达"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:92
+msgctxt "Sound event"
+msgid "Empty trash"
+msgstr "æ¸?空å??æ?¶ç«?"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:93
+msgctxt "Sound event"
+msgid "Long action completed (download, CD burning, etc.)"
+msgstr "é?¿æ??ä½?å®?æ??(ä¸?è½½ã??å?»å½? CD ç­?ã??)"
+
+#. Alerts?
+#: ../panels/sound/gvc-sound-theme-editor.c:95
+msgctxt "Sound event"
+msgid "Alerts"
+msgstr "è§?è§?æ??示"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:96
+msgctxt "Sound event"
+msgid "Information or question"
+msgstr "ä¿¡æ?¯æ??é?®é¢?"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:97
+msgctxt "Sound event"
+msgid "Warning"
+msgstr "è­¦å??"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:98
+msgctxt "Sound event"
+msgid "Error"
+msgstr "é??误"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:99
+msgctxt "Sound event"
+msgid "Battery warning"
+msgstr "ç?µæ± è­¦å??"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:592
+msgid "Select Sound File"
+msgstr "é??æ?©å£°é?³æ??件"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:603
+msgid "Sound files"
+msgstr "声é?³æ??件"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:899
+msgid "Customâ?¦"
+msgstr "���..."
+
+#: ../panels/sound/gvc-sound-theme-editor.c:1302
+msgid "Sound Theme:"
+msgstr "声�主��"
+
+#: ../panels/sound/gvc-sound-theme-editor.c:1330
+msgid "Enable window and button sounds"
+msgstr "å?¯ç?¨çª?å?£å??æ??é?®å£°é?³"
+
+#: ../panels/sound/data/gnome-sound-applet.desktop.in.h:1
+msgid "Show desktop volume control"
+msgstr "æ?¾ç¤ºæ¡?é?¢é?³é??æ?§å?¶"
+
+#: ../panels/sound/data/gnome-sound-applet.desktop.in.h:2
+msgid "Volume Control"
+msgstr "é?³é??æ?§å?¶"
+
+#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
+msgid "Change sound volume and sound events"
+msgstr "æ?´æ?¹é?³é??å??声é?³äº?件"
+
+#. Translators: This is the name of an audio file that sounds like the bark of a dog.
+#. You might want to translate it into the equivalent words of your language.
+#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:3
+msgid "Bark"
+msgstr "ç?¬å? "
+
+#. Translators: This is the name of an audio file that sounds like a water drip.
+#. You might want to translate it into the equivalent words of your language.
+#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:6
+msgid "Drip"
+msgstr "�滴"
+
+#. Translators: This is the name of an audio file that sounds like tapping glass.
+#. You might want to translate it into the equivalent words of your language.
+#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:9
+msgid "Glass"
+msgstr "ç?»ç??"
+
+#. Translators: This is the name of an audio file that sounds sort of like a submarine sonar ping.
+#. You might want to translate it into the equivalent words of your language.
+#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:12
+msgid "Sonar"
+msgstr "声纳"
+
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1
 msgid "Universal Access"
 msgstr "é??ç?¨è¾?å?©å??è?½"
@@ -3076,600 +2035,998 @@ msgid "Acceptance delay:"
 msgstr "å?¯æ?¥å??延è¿?ï¼?"
 
 #: ../panels/universal-access/uap.ui.h:12
-msgid "Accessibility features can be turned on or off with keyboard shortcuts"
-msgstr "å??许é??è¿?é?®ç??å¿«æ?·é?®æ??å¼?æ??å?³é?­è¾?å?©å??è?½ç?¹æ?§"
-
-#: ../panels/universal-access/uap.ui.h:13
 msgid "Beep when Caps and Num Lock are used"
 msgstr "å½?使ç?¨ Caps Lock é?®æ?? Num Lock é?®æ?¶å??å?ºè??鸣声"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: ../panels/universal-access/uap.ui.h:13
 msgid "Beep when a key is"
 msgstr "å??å?ºè??鸣声å½?使ç?¨é?®"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: ../panels/universal-access/uap.ui.h:14
 msgid "Beep when a key is rejected"
 msgstr "å½?æ??个é?®è¢«æ??ç»?æ?¶å??å?ºè??鸣声"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:15
 msgid "Beep when a modifer key is pressed"
 msgstr "å½?æ??ä¸?修饰é?®æ?¶å??å?ºè??鸣声"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: ../panels/universal-access/uap.ui.h:16
+msgid "Bounce Keys"
+msgstr "å??å¼¹é?®"
+
+#: ../panels/universal-access/uap.ui.h:17
 msgid "Caribou"
 msgstr "Caribou"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: ../panels/universal-access/uap.ui.h:18
 msgid "Change constrast:"
 msgstr "æ?¹å??对æ¯?度"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: ../panels/universal-access/uap.ui.h:19
 msgid "Closed Captioning"
 msgstr "é?­å??注é??"
 
-#: ../panels/universal-access/uap.ui.h:21
+#: ../panels/universal-access/uap.ui.h:20
 msgid "Contrast:"
 msgstr "对�度�"
 
-#: ../panels/universal-access/uap.ui.h:22
-msgid "Control the pointer using the keypad."
+#: ../panels/universal-access/uap.ui.h:21
+#| msgid "Control the pointer using the keypad."
+msgid "Control the pointer using the keypad"
 msgstr "使ç?¨å°?é?®ç??æ?§å?¶é¼ æ ?æ??é??ã??"
 
-#: ../panels/universal-access/uap.ui.h:23
+#: ../panels/universal-access/uap.ui.h:22
 msgid "Control the pointer using the video camera."
 msgstr "使ç?¨æ??å??æ?ºæ?§å?¶é¼ æ ?æ??é??"
 
-#: ../panels/universal-access/uap.ui.h:24
+#: ../panels/universal-access/uap.ui.h:23
 msgid "Ctrl+Alt+-"
 msgstr "Ctrl+Alt+-"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: ../panels/universal-access/uap.ui.h:24
 msgid "Ctrl+Alt+0"
 msgstr "Ctrl+Alt+0"
 
-#: ../panels/universal-access/uap.ui.h:26
+#: ../panels/universal-access/uap.ui.h:25
 msgid "Ctrl+Alt+4"
 msgstr "Ctrl+Alt+4"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:26
 msgid "Ctrl+Alt+8"
 msgstr "Ctrl+Alt+8"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:27
 msgid "Ctrl+Alt+="
 msgstr "Ctrl+Alt+="
 
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:31
 msgid "Decrease size:"
 msgstr "å??å°?大å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:33
+#: ../panels/universal-access/uap.ui.h:32
 msgid "Disable if two keys are pressed together"
 msgstr "è?¥å??æ?¶æ??ä¸?两个é?®å??ç¦?ç?¨"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:33
 msgid "Display"
 msgstr "�示"
 
-#: ../panels/universal-access/uap.ui.h:35
-msgid "Display a textual description of speech and sounds."
+#: ../panels/universal-access/uap.ui.h:34
+#| msgid "Display a textual description of speech and sounds."
+msgid "Display a textual description of speech and sounds"
 msgstr "æ?¾ç¤ºè¯­é?³å??声é?³ç??æ??å­?æ??è¿°ã??"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:35
 msgid "Flash the entire screen"
 msgstr "é?ªç??æ?´ä¸ªå±?å¹?"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:36
 msgid "Flash the window title"
 msgstr "é?ªç??çª?å?£æ ?é¢?æ ?"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:37
 msgid "GOK"
 msgstr "GNOME å±?å¹?é?®ç??"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:38
 msgid "Hearing"
 msgstr "��"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: ../panels/universal-access/uap.ui.h:40
 msgid "High/Inverse"
 msgstr "é«?/å??è?²"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:41
 msgid "HighContrast"
 msgstr "�对�度"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:42
 msgid "HighContrastInverse"
 msgstr "é«?对æ¯?å??è?²"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:43
 msgid "Hover Click"
 msgstr "æ?¬å??ç?¹å?»"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: ../panels/universal-access/uap.ui.h:44
 msgid "I need assistance with:"
 msgstr "æ??é??è¦?帮å?©ä½¿ç?¨ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:45
 msgid "Ignores fast duplicate keypresses"
 msgstr "忽ç?¥å¿«é??é??å¤?æ??é?®"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:46
 msgid "Increase size:"
 msgstr "å¢?å? 大å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:47
 msgid "Keyboard Settings..."
 msgstr "é?®ç??设置..."
 
-#: ../panels/universal-access/uap.ui.h:51
+#: ../panels/universal-access/uap.ui.h:50
 msgid "Larger"
 msgstr "�大"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:54
 msgid "LowContrast"
 msgstr "�对�度"
 
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:56
 msgid "Mouse Settings..."
 msgstr "é¼ æ ?设置..."
 
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:57
 msgid "Nomon"
 msgstr "æ?¥å??å®?ä½?"
 
-#: ../panels/universal-access/uap.ui.h:59
-#: ../libwindow-settings/metacity-window-manager.c:409
+#: ../panels/universal-access/uap.ui.h:58
 msgid "None"
 msgstr "æ? "
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:62
 msgid "On screen keyboard"
 msgstr "å±?å¹?é?®ç??"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:63
 msgid "OnBoard"
 msgstr "æ?¿è½½"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Options..."
 msgstr "é??项..."
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Pointing and Clicking"
 msgstr "æ??å??å??å??å?»"
 
-#: ../panels/universal-access/uap.ui.h:67
-msgid "Puts a delay between when a key is pressed and when it is accepted."
+#: ../panels/universal-access/uap.ui.h:66
+msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "å½?æ??é?®æ??ä¸?å??æ?¥æ?¶ä¹?é?´æ?¾ç½®å»¶è¿?"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Screen Reader"
 msgstr "å±?å¹?é??读å?¨"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Seeing"
 msgstr "��"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Shift+Ctrl+Alt+-"
 msgstr "Shift+Ctrl+Alt+-"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Shift+Ctrl+Alt+="
 msgstr "Shift+Ctrl+Alt+="
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Show Universal Access status"
 msgstr "æ?¾ç¤ºé??ç?¨è¾?å?©å??è?½ç?¶æ??"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:75
+msgid "Slow Keys"
+msgstr "æ?¢é??é?®"
+
+#: ../panels/universal-access/uap.ui.h:78
 msgid "Sound Settings..."
 msgstr "声�设置..."
 
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:79
+msgid "Sticky Keys"
+msgstr "ç²?æ»?é?®"
+
+#: ../panels/universal-access/uap.ui.h:80
 msgid "Test flash"
 msgstr "æ??å­?é?ªç??"
 
+#: ../panels/universal-access/uap.ui.h:81
+msgid "Text size:"
+msgstr "æ??å­?大å°?ï¼?"
+
 #: ../panels/universal-access/uap.ui.h:82
-msgid "Test:"
-msgstr "���"
+msgid "Treats a sequence of modifier keys as a key combination"
+msgstr "å°?ä¸?串修æ?¹è¿?ç??é?®å½?ä½?ä¸?个ç»?å??é?®"
 
 #: ../panels/universal-access/uap.ui.h:83
-msgid "Text size:"
-msgstr "æ??å­?大å°?ï¼?"
+msgid "Trigger a click when the pointer hovers"
+msgstr "æ??é??æ?¬å??æ?¶æ?§è¡?ç?¹å?»ã??"
 
 #: ../panels/universal-access/uap.ui.h:84
-msgid "Treats a sequence of modifier keys as a key combination."
-msgstr "å°?ä¸?串修æ?¹è¿?ç??é?®å½?ä½?ä¸?个ç»?å??é?®ã??"
+msgid "Trigger a secondary click by holding down the primary button"
+msgstr "æ??ä½?é¼ æ ?主é?®ä¸?æ?¾æ?¶è§¦å??次å?»"
 
 #: ../panels/universal-access/uap.ui.h:85
-msgid "Trigger a click when the pointer hovers."
-msgstr "æ??é??æ?¬å??æ?¶æ?§è¡?ç?¹å?»"
+msgid "Turn on accessibility features from the keyboard"
+msgstr "æ??å¼?é?®ç??è¾?å?©å??è?½ç?¹æ?§"
 
 #: ../panels/universal-access/uap.ui.h:86
-msgid "Trigger a secondary click by holding down the primary button."
-msgstr "æ??ä½?é¼ æ ?主é?®ä¸?æ?¾æ?¶è§¦å??次å?»"
-
-#: ../panels/universal-access/uap.ui.h:87
 msgid "Turn on or off:"
 msgstr "æ??å¼?æ??å?³é?­ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:88
+#: ../panels/universal-access/uap.ui.h:87
 msgid "Type here to test settings"
 msgstr "�此���符以��设�"
 
-#: ../panels/universal-access/uap.ui.h:89
+#: ../panels/universal-access/uap.ui.h:88
 msgid "Typing"
 msgstr "æ??å­?中"
 
-#: ../panels/universal-access/uap.ui.h:90
+#: ../panels/universal-access/uap.ui.h:89
 msgid "Typing Assistant"
 msgstr "æ??å­?å?©æ??"
 
-#: ../panels/universal-access/uap.ui.h:91
-msgid "Use a visual indication when an alert sound occurs."
+#: ../panels/universal-access/uap.ui.h:90
+msgid "Use a visual indication when an alert sound occurs"
 msgstr "å½?è­¦å??声å??ç??æ?¶ä½¿ç?¨è§?è§?æ??示"
 
-#: ../panels/universal-access/uap.ui.h:92
+#: ../panels/universal-access/uap.ui.h:91
 msgid "Use an alternative form of text input"
 msgstr "使ç?¨å?¦å¤?æ ¼å¼?ç??æ??å­?è¾?å?¥"
 
-#: ../panels/universal-access/uap.ui.h:93
+#: ../panels/universal-access/uap.ui.h:92
 msgid "Video Mouse"
 msgstr "è§?é¢?é¼ æ ?"
 
-#: ../panels/universal-access/uap.ui.h:94
+#: ../panels/universal-access/uap.ui.h:93
 msgid "Visual Alerts"
 msgstr "è§?è§?æ??示"
 
-#: ../panels/universal-access/uap.ui.h:96
+#: ../panels/universal-access/uap.ui.h:95
 msgid "Zoom in:"
 msgstr "�大�"
 
-#: ../panels/universal-access/uap.ui.h:97
+#: ../panels/universal-access/uap.ui.h:96
 msgid "Zoom out:"
 msgstr "缩��"
 
-#: ../panels/universal-access/uap.ui.h:99
+#: ../panels/universal-access/uap.ui.h:98
 msgid "accepted"
 msgstr "å·²æ?¥å??"
 
-#: ../panels/universal-access/uap.ui.h:100
+#: ../panels/universal-access/uap.ui.h:99
 msgid "pressed"
 msgstr "å·²æ??ä¸?"
 
-#: ../panels/universal-access/uap.ui.h:101
+#: ../panels/universal-access/uap.ui.h:100
 msgid "rejected"
 msgstr "å·²æ??ç»?"
 
-#: ../libwindow-settings/gnome-wm-manager.c:316
+#: ../panels/user-accounts/gdm-languages.c:613
+msgid "Unspecified"
+msgstr "æ?ªæ??å®?"
+
+#: ../panels/user-accounts/run-passwd.c:426
+msgid "Authentication failed"
+msgstr "认�失败"
+
+#: ../panels/user-accounts/run-passwd.c:506
+#: ../panels/user-accounts/um-password-dialog.c:384
 #, c-format
-msgid "Window manager \"%s\" has not registered a configuration tool\n"
-msgstr "çª?å?£ç®¡ç??å?¨â??%sâ??没æ??注å??é??置工å?·\n"
+msgid "The new password is too short"
+msgstr "æ?°å¯?ç ?太ç?­"
 
-#: ../libwindow-settings/metacity-window-manager.c:404
-msgid "Maximize"
-msgstr "æ??大å??"
+#: ../panels/user-accounts/run-passwd.c:512
+#, c-format
+msgid "The new password is too simple"
+msgstr "æ?°å¯?ç ?太ç®?å??"
 
-#: ../libwindow-settings/metacity-window-manager.c:405
-msgid "Maximize Vertically"
-msgstr "å??ç?´æ??大å??"
+#: ../panels/user-accounts/run-passwd.c:518
+#, c-format
+msgid "The old and new passwords are too similar"
+msgstr "æ?°å¯?ç ?å??æ?§å¯?ç ?太ç?¸ä¼¼"
 
-#: ../libwindow-settings/metacity-window-manager.c:406
-msgid "Maximize Horizontally"
-msgstr "æ°´å¹³æ??大å??"
+#: ../panels/user-accounts/run-passwd.c:521
+#, c-format
+msgid "The new password has already been used recently."
+msgstr "æ?°å¯?ç ?å?¨æ??è¿?å·²ç»?使ç?¨è¿?ã??"
 
-#: ../libwindow-settings/metacity-window-manager.c:407
-msgid "Minimize"
-msgstr "æ??å°?å??"
+#: ../panels/user-accounts/run-passwd.c:524
+#, c-format
+msgid "The new password must contain numeric or special characters"
+msgstr "æ?°å¯?ç ?å¿?é¡»å??å?«æ?°å­?æ??ç?¹æ®?å­?符"
 
-#: ../libwindow-settings/metacity-window-manager.c:408
-msgid "Roll up"
-msgstr "å?·èµ·"
+#: ../panels/user-accounts/run-passwd.c:528
+#, c-format
+#| msgid "The old and new passwords are the same."
+msgid "The old and new passwords are the same"
+msgstr "æ?°å¯?ç ?å??æ?§å¯?ç ?ç?¸å??"
 
-#: ../shell/control-center.schemas.in.h:1
-msgid "Close the control-center when a task is activated"
-msgstr "�任��活�����中�"
+#: ../panels/user-accounts/run-passwd.c:532
+#, c-format
+msgid "Your password has been changed since you initially authenticated!"
+msgstr "æ?¨ç??å¯?ç ?å?¨æ?¨é¦?次ç?»å½?å??å·²ç»?æ?´æ?¹ï¼?"
 
-#: ../shell/control-center.schemas.in.h:2
-msgid "Exit shell on add or remove action performed"
-msgstr "æ?§è¡?æ·»å? æ??移é?¤æ??ä½?æ?¶é??å?ºå¤?壳"
+#: ../panels/user-accounts/run-passwd.c:536
+#, c-format
+msgid "The new password does not contain enough different characters"
+msgstr "æ?°å¯?ç ?å¿?é¡»å??å?«è¶³å¤?ç??ä¸?å??å­?符"
 
-#: ../shell/control-center.schemas.in.h:3
-msgid "Exit shell on help action performed"
-msgstr "æ?§è¡?帮å?©æ??ä½?æ?¶é??å?ºå¤?壳"
+#: ../panels/user-accounts/run-passwd.c:540
+#, c-format
+msgid "Unknown error"
+msgstr "æ?ªç?¥é??误"
 
-#: ../shell/control-center.schemas.in.h:4
-msgid "Exit shell on start action performed"
-msgstr "æ?§è¡?å?¯å?¨æ??ä½?æ?¶é??å?ºå¤?壳"
+#: ../panels/user-accounts/um-account-dialog.c:78
+msgid "Failed to create user"
+msgstr "å??建ç?¨æ?·å¤±è´¥"
 
-#: ../shell/control-center.schemas.in.h:5
-msgid "Exit shell on upgrade or uninstall action performed"
-msgstr "æ?§è¡?å??级æ??å?¸è½½æ??ä½?æ?¶é??å?ºå¤?壳"
+#: ../panels/user-accounts/um-account-dialog.c:185
+#, c-format
+msgid "A user with the username '%s' already exists"
+msgstr "以 %s 为ç?¨æ?·å??ç??ç?¨æ?·å·²å­?å?¨"
 
-#: ../shell/control-center.schemas.in.h:6
-msgid "Indicates whether to close the shell when a help action is performed."
-msgstr "æ??示å?¨æ?§è¡?帮å?©æ??ä½?æ?¶æ?¯å?¦å?³é?­å¤?壳"
+#: ../panels/user-accounts/um-account-dialog.c:189
+#, c-format
+msgid "The username is too long"
+msgstr "ç?¨æ?·å??太é?¿"
 
-#: ../shell/control-center.schemas.in.h:7
-msgid "Indicates whether to close the shell when a start action is performed."
-msgstr "æ??示å?¨æ?§è¡?å?¯å?¨æ??ä½?æ?¶æ?¯å?¦å?³é?­å¤?壳"
+#: ../panels/user-accounts/um-account-dialog.c:192
+msgid "The username cannot start with a '-'"
+msgstr "ç?¨æ?·å??ä¸?è?½ä»¥â??-â??å¼?头"
 
-#: ../shell/control-center.schemas.in.h:8
+#: ../panels/user-accounts/um-account-dialog.c:195
+msgid ""
+"The username must consist of:\n"
+" â?£ letters from the English alphabet\n"
+" â?£ digits\n"
+" â?£ any of the characters '.', '-' and '_'"
+msgstr ""
+"ç?¨æ?·å??å?ªè?½å??å?«ï¼?\n"
+" â?£ è?±æ??å­?æ¯?\n"
+" â?£ æ?°å­?\n"
+" â?£ â??.â??ã??â??-â??æ??â??_â??"
+
+#: ../panels/user-accounts/um-account-type.c:35
+#: ../panels/user-accounts/data/account-dialog.ui.h:2
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+msgctxt "Account type"
+msgid "Standard"
+msgstr "æ ?å??"
+
+#: ../panels/user-accounts/um-account-type.c:37
+#: ../panels/user-accounts/data/account-dialog.ui.h:1
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+msgctxt "Account type"
+msgid "Administrator"
+msgstr "管ç??å??"
+
+#: ../panels/user-accounts/um-account-type.c:39
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+msgctxt "Account type"
+msgid "Supervised"
+msgstr "ç?¹æ??"
+
+#: ../panels/user-accounts/um-fingerprint-dialog.c:107
 msgid ""
-"Indicates whether to close the shell when an add or remove action is "
-"performed."
-msgstr "æ??示å?¨æ?§è¡?æ·»å? æ??移é?¤æ??ä½?æ?¶æ?¯å?¦å?³é?­å¤?壳"
+"You are not allowed to access the device. Contact your system administrator."
+msgstr "æ?¨æ?ªè¢«å??许访é?®è¯¥è®¾å¤?ã??请è??ç³»æ?¨ç??ç³»ç»?管ç??å??ã??"
 
-#: ../shell/control-center.schemas.in.h:9
+#: ../panels/user-accounts/um-fingerprint-dialog.c:109
+msgid "The device is already in use."
+msgstr "设å¤?使ç?¨ä¸­ã??"
+
+#: ../panels/user-accounts/um-fingerprint-dialog.c:111
+msgid "An internal error occurred."
+msgstr "å??ç??äº?ä¸?个å??é?¨é??误ã??"
+
+#: ../panels/user-accounts/um-fingerprint-dialog.c:181
+#: ../panels/user-accounts/um-fingerprint-dialog.c:182
+msgid "Enabled"
+msgstr "已��"
+
+#: ../panels/user-accounts/um-fingerprint-dialog.c:224
+msgid "Delete registered fingerprints?"
+msgstr "è¦?å? é?¤å·²ç?»è®°ç??æ??纹å??ï¼?"
+
+#: ../panels/user-accounts/um-fingerprint-dialog.c:228
+msgid "_Delete Fingerprints"
+msgstr "å? é?¤æ??纹(_D)"
+
+#: ../panels/user-accounts/um-fingerprint-dialog.c:235
 msgid ""
-"Indicates whether to close the shell when an upgrade or uninstall action is "
-"performed."
-msgstr "æ??示å?¨æ?§è¡?å??级æ??å?¸è½½æ??ä½?æ?¶æ?¯å?¦å?³é?­å¤?壳"
+"Do you want to delete your registered fingerprints so fingerprint login is "
+"disabled?"
+msgstr "ä½ æ?³å? é?¤å·²ç?»è®°ç??æ??纹å??ï¼?è¿?æ ·å??å°?ç¦?ç?¨æ??纹ç?»å½?ã??"
 
-#: ../shell/control-center.schemas.in.h:10
-msgid "Task names and associated .desktop files"
-msgstr "ä»»å?¡å??å??ç?¸å?³ç?? .desktop æ??件"
+#: ../panels/user-accounts/um-fingerprint-dialog.c:363
+msgid "Done!"
+msgstr "æ??å®?ï¼?"
+
+#. translators:
+#. * The variable is the name of the device, for example:
+#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
+#: ../panels/user-accounts/um-fingerprint-dialog.c:409
+#: ../panels/user-accounts/um-fingerprint-dialog.c:431
+#, c-format
+msgid "Could not access '%s' device"
+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
+#: ../panels/user-accounts/um-fingerprint-dialog.c:480
+#, c-format
+msgid "Could not start finger capture on '%s' device"
+msgstr "æ? æ³?å?¨â??%sâ??设å¤?ä¸?å?¯å?¨æ??æ??æ??æ??"
+
+#: ../panels/user-accounts/um-fingerprint-dialog.c:550
+msgid "Could not access any fingerprint readers"
+msgstr "æ? æ³?访é?®æ??纹读å??å?¨"
+
+#: ../panels/user-accounts/um-fingerprint-dialog.c:551
+msgid "Please contact your system administrator for help."
+msgstr "请è??系系ç»?管ç??å??以寻æ±?帮å?©ã??"
 
-#: ../shell/control-center.schemas.in.h:11
+#: ../panels/user-accounts/um-fingerprint-dialog.c:588
+#: ../panels/user-accounts/data/account-fingerprint.ui.h:1
+msgid "Enable Fingerprint Login"
+msgstr "å?¯ç?¨æ??纹ç?»å½?"
+
+#. translators:
+#. * 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."
+#: ../panels/user-accounts/um-fingerprint-dialog.c:625
+#, c-format
+msgid ""
+"To enable fingerprint login, you need to save one of your fingerprints, "
+"using the '%s' device."
+msgstr "è¦?å?¯ç?¨æ??纹ç?»å½?ï¼?ä½ é??è¦?使ç?¨â??%sâ??设å¤?æ?¥ä¿?å­?æ?¨ç??ä¸?个æ??纹ã??"
+
+#: ../panels/user-accounts/um-fingerprint-dialog.c:633
+#, c-format
 msgid ""
-"The task name to be displayed in the control-center followed by a \";\" "
-"separator then the filename of an associated .desktop file to launch for "
-"that task."
+"Enrolling fingerprints for\n"
+"<b><big>%s</big></b>"
 msgstr ""
-"å?¨æ?§å?¶ä¸­å¿?中æ?¾ç¤ºç??ä»»å?¡å??称ï¼?ç´§è·?ç??æ?¯ä¸?个â??;â??å??é??符ï¼?ç?¶å??æ?¯è¯¥ä»»å?¡å?¯å?¨ç??ç?¸åº?ç?? ."
-"desktop æ??件ç??æ??件å??ã??"
 
-#. Translators: The format of this string is the task name to be displayed (translate that part) followed by a ";" separator then the filename (DONT translate the file name) of a .desktop file to launch. Multiple entries are separated by a ","
-#: ../shell/control-center.schemas.in.h:13
+#: ../panels/user-accounts/um-language-dialog.c:328
+msgid "Other..."
+msgstr "��..."
+
+#: ../panels/user-accounts/um-lockbutton.c:343
+msgid "Lock"
+msgstr "é??å®?"
+
+#: ../panels/user-accounts/um-lockbutton.c:352
+msgid "Unlock"
+msgstr "解é??"
+
+#: ../panels/user-accounts/um-lockbutton.c:361
+msgid "Locked"
+msgstr "å·²é??å®?"
+
+#: ../panels/user-accounts/um-lockbutton.c:370
 msgid ""
-"[Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;default-"
-"applications.desktop,Add Printer;gnome-cups-manager.desktop]"
+"Dialog is unlocked.\n"
+"Click to prevent further changes"
 msgstr ""
-"[æ?´æ?¹ä¸»é¢?;gtk-theme-selector.desktop,设å®?é¦?é??åº?ç?¨ç¨?åº?;default-applications."
-"desktop,æ·»å? æ??å?°æ?º;gnome-cups-manager.desktop]"
+"ä¼?è¯?已解é??ã??\n"
+"��以�止����"
 
-#: ../shell/control-center.schemas.in.h:14
+#: ../panels/user-accounts/um-lockbutton.c:379
 msgid ""
-"if true, the control-center will close when a \"Common Task\" is activated."
-msgstr "å¦?æ??为 trueï¼?å?¨ä¸?个â??常è§?ä»»å?¡â??æ¿?æ´»æ?¶ï¼?æ?§å?¶ä¸­å¿?å°?å?³é?­ã??"
+"Dialog is locked.\n"
+"Click to make changes"
+msgstr ""
+"ä¼?è¯?å·²é??å®?ã??\n"
+"��以����"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:1
-#: ../shell/gnomecc.directory.in.h:1
-msgid "Control Center"
-msgstr "��中�"
+#: ../panels/user-accounts/um-lockbutton.c:388
+msgid ""
+"System policy prevents changes.\n"
+"Contact your system administrator"
+msgstr ""
+"ç³»ç»?ç­?ç?¥é?»æ­¢æ?´æ?¹ã??\n"
+"请è??系系ç»?管ç??å??ã??"
+
+#: ../panels/user-accounts/um-password-dialog.c:188
+msgid "More choices..."
+msgstr "æ?´å¤?é??项..."
+
+#: ../panels/user-accounts/um-password-dialog.c:294
+msgid "Please choose another password."
+msgstr "请é??æ?©å?¶ä»?ç??å¯?ç ?ã??"
+
+#: ../panels/user-accounts/um-password-dialog.c:303
+msgid "Please type your current password again."
+msgstr "请å??次è¾?å?¥æ?¨ç??å½?å??å¯?ç ?ã??"
+
+#: ../panels/user-accounts/um-password-dialog.c:309
+msgid "Password could not be changed"
+msgstr "æ? æ³?æ?´æ?¹å¯?ç ?"
+
+#: ../panels/user-accounts/um-password-dialog.c:381
+msgid "You need to enter a new password"
+msgstr "æ?¨é??è¦?è¾?å?¥ä¸?个æ?°å¯?ç ?"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "GNOME é??置工å?·"
+#: ../panels/user-accounts/um-password-dialog.c:390
+msgid "You need to confirm the password"
+msgstr "ä½ é??è¦?é??æ?°è¾?å?¥å¯?ç ?以便确认"
+
+#: ../panels/user-accounts/um-password-dialog.c:393
+msgid "The passwords do not match"
+msgstr "å¯?ç ?ä¸?å?¹é??"
+
+#: ../panels/user-accounts/um-password-dialog.c:399
+msgid "You need to enter your current password"
+msgstr "æ?¨é??è¦?è¾?å?¥å½?å??å¯?ç ?"
+
+#: ../panels/user-accounts/um-password-dialog.c:402
+msgid "The current password is not correct"
+msgstr "å½?å??å¯?ç ?é??误"
+
+#: ../panels/user-accounts/um-password-dialog.c:475
+#: ../panels/user-accounts/um-password-dialog.c:692
+msgctxt "Password strength"
+msgid "Too short"
+msgstr "太�"
+
+#: ../panels/user-accounts/um-password-dialog.c:478
+#: ../panels/user-accounts/um-password-dialog.c:693
+msgctxt "Password strength"
+msgid "Weak"
+msgstr "å¼±"
+
+#: ../panels/user-accounts/um-password-dialog.c:480
+#: ../panels/user-accounts/um-password-dialog.c:694
+msgctxt "Password strength"
+msgid "Fair"
+msgstr "��"
+
+#: ../panels/user-accounts/um-password-dialog.c:482
+#: ../panels/user-accounts/um-password-dialog.c:695
+msgctxt "Password strength"
+msgid "Good"
+msgstr "好"
+
+#: ../panels/user-accounts/um-password-dialog.c:484
+#: ../panels/user-accounts/um-password-dialog.c:696
+msgctxt "Password strength"
+msgid "Strong"
+msgstr "强"
+
+#: ../panels/user-accounts/um-password-dialog.c:523
+msgid "Passwords do not match"
+msgstr "å¯?ç ?ä¸?å?¹é??"
+
+#: ../panels/user-accounts/um-password-dialog.c:549
+msgid "Wrong password"
+msgstr "å¯?ç ?é??误"
+
+#: ../panels/user-accounts/um-photo-dialog.c:97
+#: ../panels/user-accounts/data/language-chooser.ui.h:2
+#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+msgid "Select"
+msgstr "é??æ?©"
+
+#: ../panels/user-accounts/um-photo-dialog.c:212
+#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+msgid "Browse for more pictures"
+msgstr "æµ?è§?æ?´å¤?å?¾ç??"
+
+#: ../panels/user-accounts/um-photo-dialog.c:431
+msgid "Take a photo..."
+msgstr "��..."
+
+#: ../panels/user-accounts/um-photo-dialog.c:449
+msgid "Browse for more pictures..."
+msgstr "æµ?è§?æ?´å¤?å?¾ç??..."
+
+#: ../panels/user-accounts/um-photo-dialog.c:680
+#, c-format
+msgid "Used by %s"
+msgstr "已被 %s 使�"
+
+#: ../panels/user-accounts/um-user-manager.c:430
+#, c-format
+msgid "A user with name '%s' already exists."
+msgstr "å??为 %s ç??ç?¨æ?·å·²å­?å?¨ã??"
 
-#: ../typing-break/drw-break-window.c:194
-msgid "_Postpone Break"
-msgstr "æ?¨è¿?é?´é??(_P)"
+#: ../panels/user-accounts/um-user-manager.c:525
+msgid "This user does not exist."
+msgstr "该ç?¨æ?·ä¸?å­?å?¨ã??"
 
-#: ../typing-break/drw-break-window.c:250
-msgid "Take a break!"
-msgstr "�����"
+#: ../panels/user-accounts/um-user-panel.c:349
+msgid "Failed to delete user"
+msgstr "å? é?¤ç?¨æ?·å¤±è´¥"
 
-#: ../typing-break/drwright.c:136
-msgid "_Take a Break"
-msgstr "����(_T)"
+#: ../panels/user-accounts/um-user-panel.c:409
+msgid "You cannot delete your own account."
+msgstr "æ?¨ä¸?è?½å? é?¤è?ªå·±ç??å¸?æ?·ã??"
 
-#: ../typing-break/drwright.c:507
-#, c-format
-msgid "Take a break now (next in %dm)"
-msgstr "ç?°å?¨ä¼?æ?¯ä¸?ä¸? (ä¸?次å?¨ %d å??é??å??)"
+#: ../panels/user-accounts/um-user-panel.c:418
+#, c-format
+msgid "%s is still logged in"
+msgstr "%s 已���"
 
-#: ../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 å??é??"
+#: ../panels/user-accounts/um-user-panel.c:422
+msgid ""
+"Deleting a user while they are logged in can leave the system in an "
+"inconsistent state."
+msgstr ""
 
-#: ../typing-break/drwright.c:515
+#: ../panels/user-accounts/um-user-panel.c:431
 #, c-format
-msgid "Take a break now (next in less than one minute)"
-msgstr "ç?°å?¨ä¼?æ?¯ä¸?ä¸? (ä¸?次å?¨ä¸?å??é??å??)"
+msgid "Do you want to keep %s's files?"
+msgstr "æ?¨æ?³è¦?ä¿?æ?? %s ç??æ??件å??ï¼?"
 
-#: ../typing-break/drwright.c:517
-#, c-format
-msgid "Less than one minute until the next break"
-msgstr "è·?ä¸?次é?´é??è¿?æ??ä¸?å?°ä¸?å??é??ã??"
+#: ../panels/user-accounts/um-user-panel.c:435
+msgid ""
+"It is possible to keep the home directory, mail spool and temporary files "
+"around when deleting a user account."
+msgstr ""
+"å? é?¤ç?¨æ?·æ?¶å?¯ä»¥ä¿?ç??ç?¨æ?·ä¸»ç?®å½?ã??ç?µå­?é?®ä»¶ç?®å½?å??临æ?¶æ??件ã??"
 
-#: ../typing-break/drwright.c:614
-#, c-format
+#: ../panels/user-accounts/um-user-panel.c:438
+msgid "_Delete Files"
+msgstr "å? é?¤æ??件(_D)"
+
+#: ../panels/user-accounts/um-user-panel.c:439
+msgid "_Keep Files"
+msgstr "ä¿?ç??æ??件(_K)"
+
+#: ../panels/user-accounts/um-user-panel.c:440
+msgid "_Cancel"
+msgstr "å??æ¶?(_C)"
+
+#: ../panels/user-accounts/um-user-panel.c:464
+msgctxt "Password mode"
+msgid "Account disabled"
+msgstr "��已��"
+
+#: ../panels/user-accounts/um-user-panel.c:473
+msgctxt "Password mode"
+msgid "To be set at next login"
+msgstr "�次���设置"
+
+#: ../panels/user-accounts/um-user-panel.c:476
+msgctxt "Password mode"
+msgid "None"
+msgstr "æ? "
+
+#: ../panels/user-accounts/um-user-panel.c:818
+msgid "Failed to contact the accounts service"
+msgstr "è??ç³»å¸?æ?·æ??å?¡å¤±è´¥"
+
+#: ../panels/user-accounts/um-user-panel.c:820
+#| msgid "Please make sure that the applet is properly installed"
+msgid "Please make sure that the AccountService is installed and enabled."
+msgstr "请确å®? AccountService å·²ç»?正确å®?è£?并å?¯ç?¨ã??"
+
+#: ../panels/user-accounts/um-user-panel.c:853
 msgid ""
-"Unable to bring up the typing break properties dialog with the following "
-"error: %s"
-msgstr "æ? æ³?å?¯å?¨æ??å­?é?´é??å±?æ?§å¯¹è¯?æ¡?ï¼?é??误å¦?ä¸?ï¼?%s"
+"To make changes,\n"
+"click the * icon first"
+msgstr ""
+"������\n"
+"请å??ç?¹å?» * å?¾æ ?"
 
-#: ../typing-break/drwright.c:631
-msgid "Written by Richard Hult <richard imendio com>"
-msgstr "ç?± Richard Hult <richard imendio com> ç¼?å??"
+#: ../panels/user-accounts/um-user-panel.c:890
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+msgid "Create a user"
+msgstr "å??建ç?¨æ?·"
 
-#: ../typing-break/drwright.c:632
-msgid "Eye candy added by Anders Carlsson"
-msgstr "ç?«å½©è§?è§?æ??æ??ç?± Anders Carlsson 带æ?¥"
+#: ../panels/user-accounts/um-user-panel.c:901
+#: ../panels/user-accounts/um-user-panel.c:1177
+msgid ""
+"To create a user,\n"
+"click the * icon first"
+msgstr ""
+"è¦?å??建ç?¨æ?·ï¼?\n"
+"请å??ç?¹å?» * å?¾æ ?"
 
-#: ../typing-break/drwright.c:641
-msgid "A computer break reminder."
-msgstr "计ç®?æ?ºé?´é??æ??é??ç¨?åº?ã??"
+#: ../panels/user-accounts/um-user-panel.c:910
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+msgid "Delete the selected user"
+msgstr "å? é?¤é??中ç??ç?¨æ?·"
 
-#: ../typing-break/drwright.c:643
-msgid "translator-credits"
+#: ../panels/user-accounts/um-user-panel.c:922
+#: ../panels/user-accounts/um-user-panel.c:1182
+msgid ""
+"To delete the selected user,\n"
+"click the * icon first"
 msgstr ""
-"å¼?æº?å?½é??å??ä¹? GNOME ç®?ä½?中æ??ç»?\n"
-"Yang Zhang <zyangmath gmail com> (2007)\n"
-"ç??é?²(Gan Lu) <rhythm gan gmail com> (2009)\n"
-"Xhacler Liu <liu dongyuan gmail com> (2010)"
+"è¦?å? é?¤é??中ç??ç?¨æ?·ï¼?\n"
+"请å??ç?¹å?» * å?¾æ ?"
 
-#: ../typing-break/main.c:63
-msgid "Enable debugging code"
-msgstr "å?¯ç?¨è°?è¯?代ç ?"
+#: ../panels/user-accounts/um-user-panel.c:1086
+msgid "My Account"
+msgstr "æ??ç??å¸?æ?·"
+
+#: ../panels/user-accounts/um-user-panel.c:1095
+msgid "Other Accounts"
+msgstr "����"
+
+#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
+msgid "Add or remove users"
+msgstr "æ·»å? æ??å? é?¤ç?¨æ?·"
 
-#: ../typing-break/main.c:65
-msgid "Don't check whether the notification area exists"
-msgstr "ä¸?æ£?æ?¥é??ç?¥å?ºå??æ?¯å?¦å­?å?¨"
+#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
+msgid "User Accounts"
+msgstr "����"
 
-#: ../typing-break/main.c:91
-msgid "Typing Monitor"
-msgstr "æ??å­?æ?¾ç¤ºå?¨"
+#: ../panels/user-accounts/data/account-dialog.ui.h:4
+msgid "Cr_eate"
+msgstr "å??建(_E)"
 
-#: ../typing-break/main.c:108
+#: ../panels/user-accounts/data/account-dialog.ui.h:5
+msgid "Create new account"
+msgstr "å??建æ?°å¸?æ?·"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
+msgid "_Account Type:"
+msgstr "å¸?æ?·ç±»å??(_A)ï¼?"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:7
+msgid "_Full name:"
+msgstr "å?¨å??(_F)ï¼?"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:8
+msgid "_Username:"
+msgstr "ç?¨æ?·å??(_U)ï¼?"
+
+#: ../panels/user-accounts/data/language-chooser.ui.h:1
+#: ../panels/user-accounts/data/photo-dialog.ui.h:3
+msgid "Cancel"
+msgstr "å??æ¶?"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:1
 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'."
+"<a href=\"http://wolfram.org/writing/howto/password.html\";>How to choose a "
+"strong password</a>"
 msgstr ""
-"æ??å­?æ?¾ç¤ºå?¨ä½¿ç?¨é??ç?¥å?ºå??æ?¾ç¤ºä¿¡æ?¯ã??ä¼¼ä¹?æ?¨å¹¶æ²¡æ??å?¨é?¢æ?¿ä¸?æ?¾ç½®é??ç?¥å?ºå??ã??è¦?æ·»å? é??ç?¥"
-"å?ºå??ï¼?å?ªé??ç?¨é¼ æ ?å?³é?®ç?¹å?»é?¢æ?¿ï¼?ç?¶å??é??æ?©â??æ·»å? å?°é?¢æ?¿ -> é??ç?¥å?ºå??â??ã??"
+"<a href=\"http://wolfram.org/writing/howto/password.html\";>å¦?ä½?é??æ?©ä¸?个"
+"好å¯?ç ?</a>"
 
-#: ../font-viewer/fontilus.schemas.in.h:1
-msgid "If set to true, then OpenType fonts will be thumbnailed."
-msgstr "å¦?æ??设å®?为 trueï¼?å°?å?¶ä½? OpenType å­?ä½?缩ç?¥å?¾ã??"
+#: ../panels/user-accounts/data/password-dialog.ui.h:2
+msgid ""
+"<small>This hint may be displayed at the login screen.  It will be visible "
+"to all users of this system.  Do <b>not</b> include the password here.</"
+"small>"
+msgstr ""
+"<small>è¿?个æ??示å?¯è?½æ?¾ç¤ºå?¨ç?»å½?å±?å¹?ã??å®?å°?对此系ç»?ç??æ??æ??ç?¨æ?·å?¯è§?ã??"
+"请 <b>ä¸?è¦?</b> æ??å¯?ç ?å??å?¨è¿?é??ã??</small>"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:3
+msgid "C_onfirm password:"
+msgstr "确认å¯?ç ?(_O)ï¼?"
 
-#: ../font-viewer/fontilus.schemas.in.h:2
-msgid "If set to true, then PCF fonts will be thumbnailed."
-msgstr "å¦?æ??设å®?为 trueï¼?å°?å?¶ä½? PCF å­?ä½?缩ç?¥å?¾ã??"
+#: ../panels/user-accounts/data/password-dialog.ui.h:4
+msgid "Ch_ange"
+msgstr "æ?´æ?¹(_A)"
 
-#: ../font-viewer/fontilus.schemas.in.h:3
-msgid "If set to true, then TrueType fonts will be thumbnailed."
-msgstr "å¦?æ??设å®?为 trueï¼?å°?å?¶ä½? TrueType å­?ä½?缩ç?¥å?¾ã??"
+#: ../panels/user-accounts/data/password-dialog.ui.h:5
+msgid "Changing password for:"
+msgstr "æ?´æ?¹å¯?ç ?ï¼?"
 
-#: ../font-viewer/fontilus.schemas.in.h:4
-msgid "If set to true, then Type1 fonts will be thumbnailed."
-msgstr "å¦?æ??设å®?为 trueï¼?å°?å?¶ä½? Type1 å­?ä½?缩ç?¥å?¾ã??"
+#: ../panels/user-accounts/data/password-dialog.ui.h:6
+msgid "Choose a generated password"
+msgstr "使ç?¨è?ªå?¨ç??æ??ç??å¯?ç ?"
 
-#: ../font-viewer/fontilus.schemas.in.h:5
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
+msgid "Choose password at next login"
+msgstr "ä¸?次ç?»å½?æ?¶æ?´æ?¹å¯?ç ?"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
+msgid "Current _password:"
+msgstr "å½?å??å¯?ç ?(_P)ï¼?"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:9
+msgid "Disable this account"
+msgstr "��此��"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:10
+msgid "Enable this account"
+msgstr "��此��"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:11
+msgid "Fair"
+msgstr "��"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:12
+msgid "Log in without a password"
+msgstr ""
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:13
+msgid "Set a password now"
+msgstr "ç?°å?¨è®¾ç½®å¯?ç ?"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:14
+msgid "_Action:"
+msgstr "��(_A)�"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:15
+msgid "_Hint:"
+msgstr "å¯?ç ?æ??示(_H)ï¼?"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:16
+msgid "_New password:"
+msgstr "æ?°å¯?ç ?(_N)ï¼?"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:17
+msgid "_Show password"
+msgstr "ç?­å¯?ç ?(_S)"
+
+#: ../panels/user-accounts/data/photo-dialog.ui.h:1
+msgid "Browse"
+msgstr "��"
+
+#: ../panels/user-accounts/data/photo-dialog.ui.h:4
+msgid "Changing photo for:"
+msgstr "æ?´æ?¢å?¾æ ?ï¼?"
+
+#: ../panels/user-accounts/data/photo-dialog.ui.h:5
 msgid ""
-"Set this key to the command used to create thumbnails for OpenType fonts."
-msgstr "设置该å?¼å?°ç?¨äº?å??建 OpenType å­?ä½?缩ç?¥å?¾ç??å?½ä»¤ã??"
+"Choose a picture that will be shown at the login screen for this account."
+msgstr ""
+"é??æ?©ä¸?个å?¨ç?»å½?å±?å¹?ä¸?å??æ­¤å¸?æ?·ä¸?å??æ?¾ç¤ºç??å?¾ç??ã??"
+
+#: ../panels/user-accounts/data/photo-dialog.ui.h:6
+msgid "Gallery"
+msgstr "ç?¸å??"
 
-#: ../font-viewer/fontilus.schemas.in.h:6
-msgid "Set this key to the command used to create thumbnails for PCF fonts."
-msgstr "设置该å?¼å?°ç?¨äº?å??建 PCF å­?ä½?缩ç?¥å?¾ç??å?½ä»¤ã??"
+#: ../panels/user-accounts/data/photo-dialog.ui.h:7
+msgid "Photograph"
+msgstr "ç?§ç??"
 
-#: ../font-viewer/fontilus.schemas.in.h:7
+#: ../panels/user-accounts/data/photo-dialog.ui.h:9
+msgid "Take a photograph"
+msgstr "��"
+
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
 msgid ""
-"Set this key to the command used to create thumbnails for TrueType fonts."
-msgstr "设置该å?¼å?°ç?¨äº?å??建 TrueType å­?ä½?缩ç?¥å?¾ç??å?½ä»¤ã??"
+"A guest account will allow anyone to temporarily log in to this computer "
+"without a password.  For security, remote logins to this account are not "
+"allowed.\n"
+"\n"
+"<b>When the guest user logs out, all files and data associated with the "
+"account will be deleted.</b>"
+msgstr ""
+
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+msgid "Account Information"
+msgstr "��信�"
 
-#: ../font-viewer/fontilus.schemas.in.h:8
-msgid "Set this key to the command used to create thumbnails for Type1 fonts."
-msgstr "设置该å?¼å?°ç?¨äº?å??建 Type1 å­?ä½?缩ç?¥å?¾ç??å?½ä»¤ã??"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+msgid "Account type:"
+msgstr "å¸?æ?·ç±»å??ï¼?"
 
-#: ../font-viewer/fontilus.schemas.in.h:9
-msgid "Thumbnail command for OpenType fonts"
-msgstr "OpenType å­?ä½?ç??缩ç?¥å?¾å?½ä»¤"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+msgid "Accounts"
+msgstr "��"
 
-#: ../font-viewer/fontilus.schemas.in.h:10
-msgid "Thumbnail command for PCF fonts"
-msgstr "PCF å­?ä½?ç??缩ç?¥å?¾å?½ä»¤"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+msgid "Address Book Card:"
+msgstr "å?°å??ç°¿å?¡ç??ï¼?"
 
-#: ../font-viewer/fontilus.schemas.in.h:11
-msgid "Thumbnail command for TrueType fonts"
-msgstr "TrueType å­?ä½?ç??缩ç?¥å?¾å?½ä»¤"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+msgid "Allow guests to log in to this computer"
+msgstr "å??许访客ç?»å½?次计ç®?æ?º"
 
-#: ../font-viewer/fontilus.schemas.in.h:12
-msgid "Thumbnail command for Type1 fonts"
-msgstr "Type1 å­?ä½?ç??缩ç?¥å?¾å?½ä»¤"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+msgid "Automatic Login:"
+msgstr "�����"
 
-#: ../font-viewer/fontilus.schemas.in.h:13
-msgid "Whether to thumbnail OpenType fonts"
-msgstr "��为 OpenType ����缩��"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:15
+msgid "E-mail address:"
+msgstr "ç?µå­?é?®ä»¶å?°å??ï¼?"
 
-#: ../font-viewer/fontilus.schemas.in.h:14
-msgid "Whether to thumbnail PCF fonts"
-msgstr "��为 PCF ����缩��"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:16
+msgid "Fingerprint Login:"
+msgstr "æ??纹ç?»å½?ï¼?"
 
-#: ../font-viewer/fontilus.schemas.in.h:15
-msgid "Whether to thumbnail TrueType fonts"
-msgstr "��为 TrueType ����缩��"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:17
+msgid "Language:"
+msgstr "语��"
 
-#: ../font-viewer/fontilus.schemas.in.h:16
-msgid "Whether to thumbnail Type1 fonts"
-msgstr "��为 Type1 ����缩��"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:19
+msgid "Login Options"
+msgstr "ç?»å½?é??项"
 
-#: ../font-viewer/font-view.c:290
-msgid "Name:"
-msgstr "å??称ï¼?"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:20
+msgid "Open"
+msgstr ""
 
-#: ../font-viewer/font-view.c:293
-msgid "Style:"
-msgstr "æ ·å¼?ï¼?"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:21
+msgid "Password:"
+msgstr "å¯?ç ?ï¼?"
 
-#: ../font-viewer/font-view.c:306
-msgid "Type:"
-msgstr "ç±»å??ï¼?"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:22
+msgid "Restrictions:"
+msgstr "é??å?¶ï¼?"
 
-#: ../font-viewer/font-view.c:310
-msgid "Size:"
-msgstr "大��"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:23
+msgid "Show Shutdown, Suspend and Restart actions"
+msgstr "æ?¾ç¤ºå?³é?­ã??ä¼?ç? å??é??å?¯æ??ä½?"
 
-#: ../font-viewer/font-view.c:354 ../font-viewer/font-view.c:367
-msgid "Version:"
-msgstr "ç??æ?¬ï¼?"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:24
+msgid "Show list of users"
+msgstr "æ?¾ç¤ºç?¨æ?·å??表"
 
-#: ../font-viewer/font-view.c:358 ../font-viewer/font-view.c:369
-msgid "Copyright:"
-msgstr "ç??æ??ï¼?"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:25
+msgid "Show password hints"
+msgstr "æ?¾ç¤ºå¯?ç ?æ??示"
 
-#: ../font-viewer/font-view.c:362
-msgid "Description:"
-msgstr "æ??è¿°ï¼?"
+#: ../panels/user-accounts/data/account-fingerprint.ui.h:2
+msgid "Left index finger"
+msgstr "å·¦æ??é£?æ??"
 
-#: ../font-viewer/font-view.c:442
-msgid "Installed"
-msgstr "已��"
+#: ../panels/user-accounts/data/account-fingerprint.ui.h:3
+msgid "Left little finger"
+msgstr "å·¦æ??å°?æ??"
 
-#: ../font-viewer/font-view.c:445
-msgid "Install Failed"
-msgstr "��失败"
+#: ../panels/user-accounts/data/account-fingerprint.ui.h:4
+msgid "Left middle finger"
+msgstr "å·¦æ??中æ??"
 
-#: ../font-viewer/font-view.c:517
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "���%s fontfile\n"
+#: ../panels/user-accounts/data/account-fingerprint.ui.h:5
+msgid "Left ring finger"
+msgstr "å·¦æ??æ? å??æ??"
+
+#: ../panels/user-accounts/data/account-fingerprint.ui.h:6
+msgid "Left thumb"
+msgstr "å·¦æ??æ??æ??"
 
-#: ../font-viewer/font-view.c:592
-msgid "I_nstall Font"
-msgstr "����(_N)"
+#: ../panels/user-accounts/data/account-fingerprint.ui.h:7
+msgid "Other finger: "
+msgstr "å?¶ä»?æ??æ??ï¼?"
 
-#: ../font-viewer/gnome-font-viewer.desktop.in.in.h:1
-msgid "Font Viewer"
-msgstr "å­?ä½?æ?¥ç??å?¨"
+#: ../panels/user-accounts/data/account-fingerprint.ui.h:8
+msgid "Right index finger"
+msgstr "å?³æ??é£?æ??"
 
-#: ../font-viewer/gnome-font-viewer.desktop.in.in.h:2
-msgid "Preview fonts"
-msgstr "����"
+#: ../panels/user-accounts/data/account-fingerprint.ui.h:9
+msgid "Right little finger"
+msgstr "å?³æ??å°?æ??"
 
-#: ../font-viewer/font-thumbnailer.c:245
-msgid "Text to thumbnail (default: Aa)"
-msgstr "缩ç?¥å?¾ä½¿ç?¨æ??å­? (é»?认ï¼?Aa)"
+#: ../panels/user-accounts/data/account-fingerprint.ui.h:10
+msgid "Right middle finger"
+msgstr "å?³æ??中æ??"
 
-#: ../font-viewer/font-thumbnailer.c:245
-msgid "TEXT"
-msgstr "æ??å­?"
+#: ../panels/user-accounts/data/account-fingerprint.ui.h:11
+msgid "Right ring finger"
+msgstr "å?³æ??æ? å??æ??"
 
-#: ../font-viewer/font-thumbnailer.c:247
-msgid "Font size (default: 64)"
-msgstr "��大� (�认�64)"
+#: ../panels/user-accounts/data/account-fingerprint.ui.h:12
+msgid "Right thumb"
+msgstr "å?³æ??æ??æ??"
 
-#: ../font-viewer/font-thumbnailer.c:247
-msgid "SIZE"
-msgstr "大�"
+#: ../panels/user-accounts/data/account-fingerprint.ui.h:13
+msgid ""
+"Your fingerprint was successfully saved. You should now be able to log in "
+"using your fingerprint reader."
+msgstr "æ?¨ç??æ??纹已æ??å??ä¿?å­?ã??æ?¨ç?°å?¨åº?该å?¯ä»¥ä½¿ç?¨æ??纹读å??å?¨ç?»å½?äº?ã??"
 
-#: ../font-viewer/font-thumbnailer.c:249
-msgid "FONT-FILE OUTPUT-FILE"
-msgstr "å­?ä½?-æ??件è¾?å?º-æ??件"
+#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "系�设置"
 
-#: ../font-viewer/font-thumbnailer.c:268
-#, c-format
-msgid "Error parsing arguments: %s\n"
-msgstr "å¤?ç??å??æ?°æ?¶å?ºé??ï¼?%s\n"
+#: ../shell/gnomecc.directory.in.h:1
+msgid "Control Center"
+msgstr "��中�"
 
 #: ../examples/gnome-example-panel.desktop.in.in.h:1
 msgid "Example Panel"
@@ -3679,10 +3036,6 @@ msgstr "示���"
 msgid "Example preferences panel"
 msgstr "示ä¾?é¦?é??项é?¢æ?¿"
 
-#: ../shell/shell.ui.h:1
-msgid "System Settings"
-msgstr "系�设置"
-
 #: ../shell/shell.ui.h:2
 msgid "_All Settings"
 msgstr "��设置(_A)"