[gnome-system-tools/gnome-2-30] Update Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit ba57374ba5e380ddf8ec344efccc4c29df87c2f7
Author: Aron Xu <aronxu gnome org>
Date:   Mon Aug 9 13:40:06 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po |  334 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 164 insertions(+), 170 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 97f65cd..90c48c8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
-# SOME DESCRIPTIVE TITLE.
+# Chinese Simplified Translation for gnome-system-tools
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the gnome-system-tools package.
 # Xun Zhang <zhangxun1977 hotmail com>, 2003.
 # QAed by lark and fundawang, 2004
 #
@@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: gnome-system-tools 2.14\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "system-tools&component=general\n"
-"POT-Creation-Date: 2010-01-31 19:31+0000\n"
-"PO-Revision-Date: 2010-02-02 17:37+0800\n"
-"Last-Translator: Eleanor Chen <chenyueg gmail com>\n"
+"POT-Creation-Date: 2010-06-13 20:42+0000\n"
+"PO-Revision-Date: 2010-08-09 13:39+0800\n"
+"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
 "Language-Team: zh_CN <i18n-translation lists linux net cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -340,7 +340,7 @@ msgid "Share through:"
 msgstr "�享���"
 
 #: ../interfaces/shares.ui.h:21 ../src/shares/shares.desktop.in.in.h:2
-#: ../src/shares/shares-tool.c:240
+#: ../src/shares/shares-tool.c:237
 msgid "Shared Folders"
 msgstr "å?±äº«ç??æ??件夹"
 
@@ -453,19 +453,19 @@ msgid "<span weight=\"bold\">System Defaults</span>"
 msgstr "<span weight=\"bold\">系��认�</span>"
 
 #: ../interfaces/users.ui.h:9
+msgid ""
+"A user with this name already exists. Please choose a different short name "
+"for the new user."
+msgstr "使ç?¨æ­¤ç?¨æ?·å??ç??ç?¨æ?·å·²ç»?å­?å?¨ã??请为æ?°ç?¨æ?·é??æ?©ä¸?个ä¸?å??ç??ç?­å??称ã??"
+
+#: ../interfaces/users.ui.h:10
 msgid "Account _type:"
 msgstr "è´¦æ?·ç±»å??(_T)ï¼?"
 
-#: ../interfaces/users.ui.h:10
+#: ../interfaces/users.ui.h:11
 msgid "Advanced"
 msgstr "�级"
 
-#: ../interfaces/users.ui.h:11
-msgid ""
-"A user with this name already exists. Please choose a different short "
-"name for the new user."
-msgstr "使ç?¨æ­¤ç?¨æ?·å??ç??ç?¨æ?·å·²ç»?å­?å?¨ã??请为æ?°ç?¨æ?·é??æ?©ä¸?个ä¸?å??ç??ç?­å??称ã??"
-
 #: ../interfaces/users.ui.h:12
 msgid "Assign a random password by default"
 msgstr "é»?认å??é??ä¸?个é??æ?ºå¯?ç ?"
@@ -532,7 +532,7 @@ msgstr "é»?认ç?? _shellï¼?"
 
 #: ../interfaces/users.ui.h:28
 msgid "Disable _account"
-msgstr ""
+msgstr "��账�(_A)"
 
 #: ../interfaces/users.ui.h:29
 msgid "Don't ask for password on _login"
@@ -544,6 +544,8 @@ msgid ""
 "from people with physical access to your computer, at the expense of a "
 "slightly reduced performance."
 msgstr ""
+"使ç?¨ç?»å½?å¯?ç ?æ?¥å? å¯?æ?¨ç??æ??æ??æ??件以确ä¿?ä»?们ä¸?被å?¶ä»?使ç?¨è®¡ç®?æ?ºç??äººç ´å??ï¼?ä¸?è¿?代价"
+"æ?¯æ??轻微ç??æ?§è?½æ??失ã??"
 
 #: ../interfaces/users.ui.h:31
 msgid "Full _Name:"
@@ -573,127 +575,121 @@ msgstr "�设置"
 msgid "Ma_ximum days a password may be used:"
 msgstr "ä¸?个å¯?ç ?å?¯ä½¿ç?¨ç??æ??大天æ?°(_X)ï¼?"
 
-#: ../interfaces/users.ui.h:39 ../src/time/time-tool.c:521
-msgid "Manual"
-msgstr "æ??å?¨"
-
-#: ../interfaces/users.ui.h:40
+#: ../interfaces/users.ui.h:39
 msgid "Maximum GID:"
 msgstr "æ??大 GIDï¼?"
 
-#: ../interfaces/users.ui.h:41
+#: ../interfaces/users.ui.h:40
 msgid "Maximum UID:"
 msgstr "æ??大 UIDï¼?"
 
-#: ../interfaces/users.ui.h:42
+#: ../interfaces/users.ui.h:41
 msgid "Mi_nimum days between password changes:"
 msgstr "æ?¹å??å¯?ç ?é?´é??ç??æ??å°?天æ?°(_N)ï¼?"
 
-#: ../interfaces/users.ui.h:43
+#: ../interfaces/users.ui.h:42
 msgid "Minimum GID:"
 msgstr "æ??å°? GIDï¼?"
 
-#: ../interfaces/users.ui.h:44
+#: ../interfaces/users.ui.h:43
 msgid "Minimum UID:"
 msgstr "æ??å°? UIDï¼?"
 
-#: ../interfaces/users.ui.h:45
+#: ../interfaces/users.ui.h:44
 msgid "Minimum days allowed between password changes:"
 msgstr "两次æ?¹å??å¯?ç ?ä¹?é?´å??许ç??æ??å°?天æ?°ï¼?"
 
-#: ../interfaces/users.ui.h:46
-#, fuzzy
-#| msgid "Network _password:"
+#: ../interfaces/users.ui.h:45
 msgid "New _password:"
-msgstr "ç½?ç»?å¯?ç ?(_P)ï¼?"
+msgstr "æ?°å¯?ç ?(_P)ï¼?"
 
-#: ../interfaces/users.ui.h:47
+#: ../interfaces/users.ui.h:46
 msgid "Number of days that a password may be used:"
 msgstr "ä¸?个å¯?ç ?å?¯ä½¿ç?¨ç??天æ?°ï¼?"
 
-#: ../interfaces/users.ui.h:48
+#: ../interfaces/users.ui.h:47
 msgid "O_ffice location:"
 msgstr "å??å?¬å®¤ä½?ç½®(_F)ï¼?"
 
-#: ../interfaces/users.ui.h:49
+#: ../interfaces/users.ui.h:48
 msgid "Password set to: "
 msgstr "å¯?ç ?设å®?为ï¼?"
 
-#: ../interfaces/users.ui.h:50
+#: ../interfaces/users.ui.h:49
 msgid "Privileges"
 msgstr "æ??é??"
 
-#: ../interfaces/users.ui.h:51
+#: ../interfaces/users.ui.h:50
 msgid "Profile _name:"
 msgstr "é??ç½®æ??件å??称(_N)ï¼?"
 
-#: ../interfaces/users.ui.h:52
+#: ../interfaces/users.ui.h:51
 msgid "Set password b_y hand"
 msgstr "æ??å?¨è®¾å®?å¯?ç ?(_Y)"
 
 #. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read!
-#: ../interfaces/users.ui.h:54
+#: ../interfaces/users.ui.h:53
 msgid ""
 "Short name must consist of:\n"
-"  &#x27A3; lower case letters from the English alphabet\n"
-"  &#x27A3; digits\n"
-"  &#x27A3; any of the characters \".\", \"-\" and \"_\""
+"  â?£ lower case letters from the English alphabet\n"
+"  â?£ digits\n"
+"  â?£ any of the characters \".\", \"-\" and \"_\""
 msgstr ""
 "ç?­ç?¨æ?·å??å?ªè?½å??æ?¬ï¼?\n"
-"  &#x27A3;è?±æ??ç??å°?å??å­?æ¯?\n"
-"  &#x27A3;æ?°å­?\n"
-"  &#x27A3;è¿?äº?å­?符中ç??ä»»ä½?ç»?å?? â??.â??â??-â??å??â??_â??ã??"
+" â?£ å°?å??è?±æ??å­?æ¯?\n"
+" â?£ æ?°å­?\n"
+" â?£ å??ä»»æ??ç??â??.â??ã??â??-â??å??â??_â??å­?符ã??"
 
-#: ../interfaces/users.ui.h:58
+#: ../interfaces/users.ui.h:57
 msgid "Short name must start with a letter!"
 msgstr "ç?­ç?¨æ?·å??å¿?须以å­?æ¯?å¼?å§?ï¼?"
 
-#: ../interfaces/users.ui.h:59
-#, fuzzy
-#| msgid "This action is allowed"
+#: ../interfaces/users.ui.h:58
 msgid "This account is disabled."
-msgstr "å??许此å?¨ä½?"
+msgstr "此账æ?·å·²è¢«ç¦?ç?¨ã??"
 
-#: ../interfaces/users.ui.h:60
+#: ../interfaces/users.ui.h:59
 msgid ""
 "This account is using special settings that have been defined manually. Use "
 "the <i>Advanced Settings</i> dialog to tune them."
 msgstr ""
 "此账æ?·ç?¨äº?设å®?å·²ç»?æ??å?¨å®?ä¹?ç??设置ã??使ç?¨ <i>é«?级设置</i> 对è¯?æ¡?å¾®è°?ä»?们ã??"
 
-#: ../interfaces/users.ui.h:61
+#: ../interfaces/users.ui.h:60
 msgid "User ID:"
 msgstr "�� ID�"
 
-#: ../interfaces/users.ui.h:62
+#: ../interfaces/users.ui.h:61
 msgid "User Privileges"
 msgstr "ç?¨æ?·æ??é??"
 
-#: ../interfaces/users.ui.h:63
+#: ../interfaces/users.ui.h:62
 msgid "User profiles"
 msgstr "ç?¨æ?·é??ç½®æ??件"
 
-#: ../interfaces/users.ui.h:64
+#: ../interfaces/users.ui.h:63
 msgid "You can't change user ID while the user is logged in."
 msgstr "æ?¨ä¸?è?½å?¨ç?¨æ?·å·²ç»?ç?»å½?æ?¶æ?´æ?¹ç?¨æ?· IDã??"
 
-#: ../interfaces/users.ui.h:65
+#: ../interfaces/users.ui.h:64
 msgid "_Add Profile"
 msgstr "æ·»å? é??ç½®æ??件(_A)"
 
-#: ../interfaces/users.ui.h:66
+#: ../interfaces/users.ui.h:65
 msgid "_Advanced Settings"
 msgstr "�级设置(_A)�"
 
+#: ../interfaces/users.ui.h:66
+msgid "_Change..."
+msgstr "æ?´æ?¹(_C)..."
+
 #: ../interfaces/users.ui.h:67
 msgid "_Comments"
 msgstr "注é??(_C)"
 
 #: ../interfaces/users.ui.h:68
-#, fuzzy
-#| msgid "Network _password:"
 msgid "_Current password:"
-msgstr "ç½?ç»?å¯?ç ?(_P)ï¼?"
+msgstr "å½?å??å¯?ç ?(_C)ï¼?"
 
 #: ../interfaces/users.ui.h:69
 msgid "_Custom"
@@ -705,11 +701,11 @@ msgstr "è­¦å??å??å¯?ç ?è¿?æ??é?´ç??天æ?°(_D)ï¼?"
 
 #: ../interfaces/users.ui.h:71
 msgid "_Enable Account"
-msgstr ""
+msgstr "��账�(_E)"
 
 #: ../interfaces/users.ui.h:72
 msgid "_Encrypt home folder to protect sensitive data"
-msgstr ""
+msgstr "å? å¯?主ç?®å½?以ä¿?æ?¤æ??æ??æ?°æ?®(_E)"
 
 #: ../interfaces/users.ui.h:73
 msgid "_Generate"
@@ -783,7 +779,7 @@ msgid "You are not allowed to access the system configuration."
 msgstr "ç³»ç»?管ç??å??ä¸?å??许æ?¨è®¿é?®ç³»ç»?é??ç½®ã??"
 
 #. OPERATION_COMMIT
-#: ../src/common/gst-tool.c:198 ../src/common/gst-tool.c:683
+#: ../src/common/gst-tool.c:198 ../src/common/gst-tool.c:690
 msgid "You are not allowed to modify the system configuration."
 msgstr "æ?¨ä¸?被å??许修æ?¹ç³»ç»?é??ç½®ã??"
 
@@ -796,24 +792,26 @@ msgstr "æ? æ??ç??æ?°æ?®è¢«å??ç?°"
 msgid "An unknown error occurred."
 msgstr "å??ç??æ?ªç?¥ç??é??误ã??"
 
-#: ../src/common/gst-tool.c:428
+#: ../src/common/gst-tool.c:427
 msgid "Could not display help"
 msgstr "æ? æ³?æ?¾ç¤ºå¸®å?©"
 
-#: ../src/common/gst-tool.c:622
+#: ../src/common/gst-tool.c:621
 msgid "The system configuration has potentially changed."
 msgstr "ç³»ç»?é??ç½®å?¯è?½å·²æ?´æ?¹ã??"
 
-#: ../src/common/gst-tool.c:624
+#: ../src/common/gst-tool.c:623
 msgid "Update content? This will lose any modification in course."
 msgstr "æ?´æ?°å??容å??ï¼?è¿?å°?ä¼?丢失æ??æ??æ­£è¿?è¡?ç??ä¿®æ?¹ã??"
 
-#: ../src/common/gst-tool.c:685
+#: ../src/common/gst-tool.c:692
 #, c-format
 msgid ""
 "An error occurred while checking for authorizations: %s\n"
 "You may report this as a bug."
 msgstr ""
+"å?¨æ£?æ?¥æ??æ??æ?¶å??ç??äº?ä¸?个é??误ï¼?%s\n"
+"æ?¨å?¯ä»¥æ?¥å??è¿?个缺é?·ã??"
 
 #: ../src/network/address-list.c:76 ../src/network/hosts.c:31
 #: ../src/shares/table.c:38 ../src/users/table.c:40
@@ -1583,11 +1581,11 @@ msgstr "æ??件夹â??%sâ??ç??设置"
 msgid "Share Folder"
 msgstr "å?±äº«æ??件夹"
 
-#: ../src/shares/shares-tool.c:155
+#: ../src/shares/shares-tool.c:152
 msgid "Sharing services are not installed"
 msgstr "å?±äº«æ??å?¡æ?ªå®?è£?"
 
-#: ../src/shares/shares-tool.c:157
+#: ../src/shares/shares-tool.c:154
 msgid ""
 "You need to install at least either Samba or NFS in order to share your "
 "folders."
@@ -1601,11 +1599,11 @@ msgstr "æ?´æ?¹ç³»ç»?æ?¶é?´ã??æ?¥æ??å??æ?¶å?º"
 msgid "Time and Date"
 msgstr "æ?¶é?´å??æ?¥æ??"
 
-#: ../src/time/time-tool.c:397
+#: ../src/time/time-tool.c:402
 msgid "NTP support is not installed"
 msgstr "NTP æ?¯æ??æ?ªå®?è£?"
 
-#: ../src/time/time-tool.c:399
+#: ../src/time/time-tool.c:404
 msgid ""
 "Please install and activate NTP support in the system to enable "
 "synchronization of your local time server with internet time servers."
@@ -1613,23 +1611,27 @@ msgstr ""
 "请å?¨ç³»ç»?中å®?è£?并æ¿?æ´» NTP æ?¯æ??ï¼?以å?¯ç?¨å°?æ?¨ç??æ?¬å?°æ?¶é?´æ??å?¡å?¨ä¸? Internet æ?¶é?´æ??å?¡"
 "å?¨å??æ­¥ç??å??è?½ã??"
 
-#: ../src/time/time-tool.c:428
+#: ../src/time/time-tool.c:433
 msgid "Enabling NTP"
 msgstr "�� NTP"
 
-#: ../src/time/time-tool.c:428
+#: ../src/time/time-tool.c:433
 msgid "Disabling NTP"
 msgstr "�� NTP"
 
-#: ../src/time/time-tool.c:440
+#: ../src/time/time-tool.c:445
 msgid "Synchronizing system clock"
 msgstr "å??步系ç»?æ?¶é??"
 
-#: ../src/time/time-tool.c:520
+#: ../src/time/time-tool.c:525
 msgid "Keep synchronized with Internet servers"
 msgstr "ä¸?äº?è??ç½?æ??å?¡å?¨ä¿?æ??å??æ­¥"
 
-#: ../src/time/time-tool.c:667
+#: ../src/time/time-tool.c:526
+msgid "Manual"
+msgstr "æ??å?¨"
+
+#: ../src/time/time-tool.c:672
 msgid "Time and Date Settings"
 msgstr "æ?¶é?´å??æ?¥æ??设置"
 
@@ -1637,9 +1639,9 @@ msgstr "æ?¶é?´å??æ?¥æ??设置"
 msgid "Administrator group can not be deleted"
 msgstr "æ? æ³?å? é?¤ç®¡ç??å??ç»?"
 
-#: ../src/users/group-settings.c:58 ../src/users/group-settings.c:228
-#: ../src/users/group-settings.c:265 ../src/users/user-settings.c:77
-#: ../src/users/user-settings.c:463
+#: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221
+#: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88
+#: ../src/users/user-settings.c:476
 msgid "This would leave the system unusable."
 msgstr "è¿?å°?使å¾?ç³»ç»?ä¸?å?¯ç?¨ã??"
 
@@ -1652,61 +1654,61 @@ msgstr "æ?¨ç¡®å®?è¦?å? é?¤â??%sâ??ç»?å???"
 msgid "This may leave files with invalid group ID in the filesystem."
 msgstr "è¿?å°?使å¾?æ??件系ç»?中ç??æ??äº?æ??件ç»? ID æ? æ??ã??"
 
-#: ../src/users/group-settings.c:151
+#: ../src/users/group-settings.c:144
 msgid "New group"
 msgstr "æ?°ç??ç»?"
 
-#: ../src/users/group-settings.c:158
+#: ../src/users/group-settings.c:151
 #, c-format
 msgid "Group '%s' Properties"
 msgstr "ç»?â??%sâ??ç??å±?æ?§"
 
-#: ../src/users/group-settings.c:224
+#: ../src/users/group-settings.c:217
 msgid "Group name is empty"
 msgstr "ç»?å??为空"
 
-#: ../src/users/group-settings.c:225
+#: ../src/users/group-settings.c:218
 msgid "A group name must be specified."
 msgstr "å¿?é¡»æ??å®?ç»?å??ã??"
 
-#: ../src/users/group-settings.c:227
+#: ../src/users/group-settings.c:220
 msgid "Group name of the administrator group user should not be modified"
 msgstr "管ç??å??ç?¨æ?·æ??å±?ç??ç»?å??ä¸?åº?ä¿®æ?¹"
 
-#: ../src/users/group-settings.c:230
+#: ../src/users/group-settings.c:223
 msgid "Group name has invalid characters"
 msgstr "ç»?å??å??å?«æ? æ??ç??å­?符"
 
-#: ../src/users/group-settings.c:231
+#: ../src/users/group-settings.c:224
 msgid ""
 "Please set a valid group name consisting of a lower case letter followed by "
 "lower case letters and numbers."
 msgstr "请设å®?ä¸?个æ??æ??ç??ç»?å??ï¼?第ä¸?个å­?æ¯?è¦?å°?å??ï¼?å??é?¢å?¯è·?å°?å??å­?æ¯?å??æ?°å­?ã??"
 
-#: ../src/users/group-settings.c:236
+#: ../src/users/group-settings.c:229
 #, c-format
 msgid "Group \"%s\" already exists"
 msgstr "ç»?â??%sâ??å·²ç»?å­?å?¨"
 
-#: ../src/users/group-settings.c:237
+#: ../src/users/group-settings.c:230
 msgid "Please choose a different group name."
 msgstr "请é??æ?©ä¸?个ä¸?å??ç??å??ç»?å??å­?ã??"
 
-#: ../src/users/group-settings.c:264
+#: ../src/users/group-settings.c:257
 msgid "Group ID of the Administrator account should not be modified"
 msgstr "管ç??å??è´¦æ?·ç??ç»? ID ä¸?åº?ä¿®æ?¹"
 
 #. check that GID is free
-#: ../src/users/group-settings.c:268
+#: ../src/users/group-settings.c:261
 #, c-format
 msgid "Group ID %d is already used by group \"%s\""
 msgstr "ç»? ID %d 已被ç»?â??%sâ??使ç?¨äº?ã??"
 
-#: ../src/users/group-settings.c:271
+#: ../src/users/group-settings.c:264
 msgid "Please choose a different numeric identifier for the new group."
 msgstr "请为æ?°ç»?é??æ?©ä¸?å??ç??æ?°å­?æ ?è¯?符ã??"
 
-#: ../src/users/group-settings.c:273
+#: ../src/users/group-settings.c:266
 #, c-format
 msgid "Please choose a different numeric identifier for group \"%s\"."
 msgstr "请为ç»?â??%sâ??é??æ?©ä¸?å??ç??æ?°å­?æ ?è¯?符ã??"
@@ -1715,6 +1717,15 @@ msgstr "请为ç»?â??%sâ??é??æ?©ä¸?å??ç??æ?°å­?æ ?è¯?符ã??"
 msgid "Group name"
 msgstr "ç»?å??"
 
+#. TRANSLATORS:  This applies to a password. Keep the string short.
+#: ../src/users/main.c:74 ../src/users/user-settings.c:347
+msgid "Not asked on login"
+msgstr "����询�"
+
+#: ../src/users/main.c:74 ../src/users/user-settings.c:349
+msgid "Asked on login"
+msgstr "���询�"
+
 #: ../src/users/privileges-table.c:53
 msgid "Monitor system logs"
 msgstr "ç??è§?ç³»ç»?æ?¥å¿?"
@@ -1820,48 +1831,43 @@ msgid "Desktop user"
 msgstr "����"
 
 #: ../src/users/run-passwd.c:421
-#, fuzzy
-#| msgid "MTA authentication service"
 msgid "Authentication failed"
-msgstr "MTA 身份认è¯?æ??å?¡"
+msgstr "认�失败"
 
-#: ../src/users/run-passwd.c:494
-#, fuzzy, c-format
-#| msgid "Password is too short"
+#: ../src/users/run-passwd.c:496
+#, c-format
 msgid "The new password is too short"
-msgstr "å¯?ç ?太ç?­"
+msgstr "æ?°å¯?ç ?太ç?­"
 
-#: ../src/users/run-passwd.c:499
-#, fuzzy, c-format
-#| msgid "Password is too short"
+#: ../src/users/run-passwd.c:501
+#, c-format
 msgid "The new password is too simple"
-msgstr "å¯?ç ?太ç?­"
+msgstr "æ?°å¯?ç ?太ç®?å??"
 
-#: ../src/users/run-passwd.c:503
+#: ../src/users/run-passwd.c:507
 #, c-format
 msgid "The old and new passwords are too similar"
-msgstr ""
+msgstr "æ?°å¯?ç ?å??æ?§å¯?ç ?è¿?äº?ç?¸ä¼¼"
 
-#: ../src/users/run-passwd.c:506
+#: ../src/users/run-passwd.c:510
 #, c-format
 msgid "The new password must contain numeric or special characters"
-msgstr ""
+msgstr "æ?°å¯?ç ?å¿?é¡»å??å?«æ?°å­?æ??ç?¹æ®?å­?符"
 
-#: ../src/users/run-passwd.c:510
+#: ../src/users/run-passwd.c:514
 #, c-format
 msgid "The old and new passwords are the same"
-msgstr ""
+msgstr "æ?°å¯?ç ?å??æ?§å¯?ç ?ç?¸å??"
 
-#: ../src/users/run-passwd.c:514
+#: ../src/users/run-passwd.c:518
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
-msgstr ""
+msgstr "è?ªä»?æ?¨æ??å??认è¯?å??ï¼?æ?¨ç??å¯?ç ?å·²ç»?å??ç??äº?æ?¹å??ã??"
 
-#: ../src/users/run-passwd.c:518
-#, fuzzy, c-format
-#| msgid "An unknown error occurred."
+#: ../src/users/run-passwd.c:522
+#, c-format
 msgid "Unknown error"
-msgstr "å??ç??æ?ªç?¥ç??é??误ã??"
+msgstr "æ?ªç?¥é??误"
 
 #: ../src/users/users.desktop.in.in.h:1
 msgid "Add or remove users and groups"
@@ -1871,129 +1877,114 @@ msgstr "æ·»å? æ??å? é?¤ç?¨æ?·å??ç»?"
 msgid "Users and Groups"
 msgstr "ç?¨æ?·å??ç»?"
 
-#: ../src/users/user-password.c:99
+#: ../src/users/user-password.c:97
 msgid "Password is too short"
 msgstr "å¯?ç ?太ç?­"
 
-#: ../src/users/user-password.c:100
+#: ../src/users/user-password.c:98
 msgid ""
 "User passwords must be longer than 6 characters and preferably formed by "
 "numbers, letters and special characters."
 msgstr "ç?¨æ?·å¯?ç ?å¿?é¡»å¤?äº? 6 个å­?符ï¼?è??ä¸?åº?该ç?±æ?°å­?ã??å­?æ¯?å??ç?¹æ®?å­?符ç»?æ??ã??"
 
-#: ../src/users/user-password.c:103
+#: ../src/users/user-password.c:101
 msgid "Password confirmation is not correct"
 msgstr "å¯?ç ?确认ä¸?正确"
 
-#: ../src/users/user-password.c:104
+#: ../src/users/user-password.c:102
 msgid "Check that you have provided the same password in both text fields."
 msgstr "请æ£?æ?¥æ?¨å?¨ä¸¤ä¸ªæ??æ?¬æ¡?中è¾?å?¥ç??å¯?ç ?ç?¸å??ã??"
 
-#: ../src/users/user-password.c:419
-#, fuzzy
-#| msgid "Please choose a different user name."
+#: ../src/users/user-password.c:426
 msgid "Please choose another password."
-msgstr "请é??æ?©ä¸?个ä¸?å??ç??ç?¨æ?·å??ã??"
+msgstr "请é??æ?©å?¶å®?å¯?ç ?ã??"
 
-#: ../src/users/user-password.c:430
+#: ../src/users/user-password.c:437
 msgid "Please type again your current password."
-msgstr ""
+msgstr "请å??次è¾?å?¥æ?¨å½?å??ç??å¯?ç ?ã??"
 
-#: ../src/users/user-password.c:437
+#: ../src/users/user-password.c:444
 msgid "Password could not be changed"
-msgstr ""
+msgstr "æ? æ³?æ?´æ?¹å¯?ç ?"
 
-#: ../src/users/user-settings.c:74
+#: ../src/users/user-settings.c:85
 msgid "Administrator account cannot be deleted"
 msgstr "æ? æ³?å? é?¤ç®¡ç??å??è´¦æ?·"
 
-#: ../src/users/user-settings.c:85
+#: ../src/users/user-settings.c:96
 #, c-format
 msgid "%s is currently using this computer"
 msgstr "%s 正�使�此计��"
 
-#: ../src/users/user-settings.c:88
+#: ../src/users/user-settings.c:99
 msgid "Please ensure the user has logged out before deleting this account."
 msgstr "å?¨å? é?¤è´¦æ?·ä¹?å??ï¼?请确认ç?¨æ?·å·²ç»?注é??ã??"
 
-#: ../src/users/user-settings.c:98
+#: ../src/users/user-settings.c:109
 msgid "Can't delete the only administrator account"
 msgstr "ä¸?è?½å? é?¤å?¯ä¸?ç??管ç??å??è´¦æ?·"
 
-#: ../src/users/user-settings.c:100
+#: ../src/users/user-settings.c:111
 #, c-format
 msgid ""
 "%s is the only administrator on this computer. Deleting this account would "
 "lock you out of administrating the system."
 msgstr "%s æ?¯è®¡ç®?æ?ºä¸?å?¯ä¸?ç??管ç??å??ã??å? é?¤æ­¤è´¦æ?·å°?使æ?¨ä¸?è?½ç®¡ç??ç³»ç»?ã??"
 
-#: ../src/users/user-settings.c:110
+#: ../src/users/user-settings.c:121
 #, c-format
 msgid "Remove home folder for %s?"
 msgstr "å? é?¤ %s ç??主ç?®å½?ï¼?"
 
-#: ../src/users/user-settings.c:113
+#: ../src/users/user-settings.c:124
 #, c-format
 msgid ""
 "Files owned by user %s in <tt>%s</tt> can be completely removed if you don't "
 "need them anymore. You may want to back them up before deleting the account, "
-"or keep them so that and administrator can save them later."
+"or keep them so that an administrator can save them later."
 msgstr ""
 "å¦?æ??ä¸?å??é??è¦?ï¼?å±?äº?ç?¨æ?· %s ç??æ??件 <tt>%s</tt> å?¯ä»¥è¢«å®?å?¨å? é?¤ã??æ?¨å?¯è?½å¸?æ??å?¨å? é?¤"
 "ä¹?å??å¤?份å®?们ï¼?æ??è??ä¿?ç??å®?们ï¼?以使管ç??å??å?¯ä»¥ç¨?å??ä¿?å­?å®?们ã??"
 
-#: ../src/users/user-settings.c:121
+#: ../src/users/user-settings.c:132
 msgid "Keep Files"
-msgstr "ä¿?æ??æ??件"
+msgstr "ä¿?ç??æ??件"
 
-#: ../src/users/user-settings.c:122
+#: ../src/users/user-settings.c:133
 msgid "Don't Remove Account"
 msgstr "��移�账�"
 
-#: ../src/users/user-settings.c:123
+#: ../src/users/user-settings.c:134
 msgid "Delete Files"
 msgstr "å? é?¤æ??件"
 
-#: ../src/users/user-settings.c:319
+#: ../src/users/user-settings.c:330
 msgid "Superuser"
 msgstr "�级��"
 
-#: ../src/users/user-settings.c:324
+#: ../src/users/user-settings.c:335
 msgid "Custom"
 msgstr "���"
 
 #. TRANSLATORS: This applies to a password.
-#: ../src/users/user-settings.c:333
-#, fuzzy
-#| msgid "Tones"
+#: ../src/users/user-settings.c:344
 msgid "None"
-msgstr "��"
+msgstr "æ? "
 
-#. TRANSLATORS:  This applies to a password. Keep the string short.
-#: ../src/users/user-settings.c:336
-#, fuzzy
-#| msgid "Don't ask for password on _login"
-msgid "Not asked on login"
-msgstr "ç?»å½?æ?¶ä¸?询é?®å¯?ç ?(_l)"
-
-#: ../src/users/user-settings.c:338
-msgid "Asked on login"
-msgstr ""
-
-#: ../src/users/user-settings.c:380
+#: ../src/users/user-settings.c:393
 #, c-format
 msgid "Invalid character \"%c\" in comment"
 msgstr "注é??中å­?å?¨æ? æ??å­?符â??%câ??"
 
-#: ../src/users/user-settings.c:381
+#: ../src/users/user-settings.c:394
 msgid "Check that this character is not used."
 msgstr "请æ£?æ?¥æ?ªä½¿ç?¨æ­¤å­?符ã??"
 
-#: ../src/users/user-settings.c:404
+#: ../src/users/user-settings.c:417
 msgid "Incomplete path in home directory"
 msgstr "主ç?®å½?ç??è·¯å¾?ä¸?å®?æ?´"
 
-#: ../src/users/user-settings.c:405
+#: ../src/users/user-settings.c:418
 msgid ""
 "Please enter full path for home directory\n"
 "<span size=\"smaller\">i.e.: /home/john</span>."
@@ -2001,11 +1992,11 @@ msgstr ""
 "请è¾?å?¥ä¸»ç?®å½?ç??å®?æ?´è·¯å¾?\n"
 "<span size=\"smaller\">å¦?ï¼?/home/john</span>ã??"
 
-#: ../src/users/user-settings.c:420
+#: ../src/users/user-settings.c:433
 msgid "Home directory already exists"
 msgstr "主��已��"
 
-#: ../src/users/user-settings.c:421
+#: ../src/users/user-settings.c:434
 #, c-format
 msgid ""
 "The directory <tt>%s</tt> already exists. User may not have the permissions "
@@ -2014,30 +2005,30 @@ msgstr ""
 "ç?®å½? <tt>%s</tt> å·²ç»?å­?å?¨ã??ç?¨æ?·å?¯è?½æ²¡æ??å?¨æ­¤ç?®å½?中è¦?æ±?ç??读å??æ??é??ã??ä»?ç?¶è¦?使ç?¨å®?"
 "å??ï¼?"
 
-#: ../src/users/user-settings.c:427
+#: ../src/users/user-settings.c:440
 msgid "Use this directory"
 msgstr "使�此��"
 
-#: ../src/users/user-settings.c:462
+#: ../src/users/user-settings.c:475
 msgid "ID for the root user should not be modified"
 msgstr "root ç?¨æ?·ç?? ID ä¸?åº?ä¿®æ?¹"
 
 #. check that UID is free
-#: ../src/users/user-settings.c:466
+#: ../src/users/user-settings.c:479
 #, c-format
 msgid "User ID %d is already used by user %s"
 msgstr "�� ID %d 已被�� %s 使��"
 
-#: ../src/users/user-settings.c:468
+#: ../src/users/user-settings.c:481
 #, c-format
 msgid "Please choose a different numeric identifier for %s."
 msgstr "请为 %s é??æ?©ä¸?å??ç??æ?°å­?æ ?è¯?符ã??"
 
-#: ../src/users/user-settings.c:486
+#: ../src/users/user-settings.c:499
 msgid "Incomplete path in shell"
 msgstr "shell ç??è·¯å¾?ä¸?å®?æ?´"
 
-#: ../src/users/user-settings.c:487
+#: ../src/users/user-settings.c:500
 msgid ""
 "Please enter full path for shell\n"
 "<span size=\"smaller\">i.e.: /bin/bash</span>."
@@ -2045,36 +2036,39 @@ msgstr ""
 "请è¾?å?¥ shell ç??å®?æ?´è·¯å¾?\n"
 "<span size=\"smaller\">å¦?ï¼?/bin/bash</span>ã??"
 
-#: ../src/users/user-settings.c:521
+#: ../src/users/user-settings.c:534
 msgid "Can't revoke administration rights"
 msgstr "ä¸?è?½æ?¤é??管ç??å??æ??é??"
 
-#: ../src/users/user-settings.c:524
+#: ../src/users/user-settings.c:537
 #, c-format
 msgid ""
 "%s is the only administrator on this computer. Revoking administration "
 "rights for this account would lock you out of administrating the system."
 msgstr "%s æ?¯è®¡ç®?æ?ºä¸?å?¯ä¸?ç??管ç??å??ã??æ?¾å¼?æ­¤ç?¨æ?·ç??管ç??å?¨æ??é??å°?使æ?¨ä¸?è?½ç®¡ç??ç³»ç»?ã??"
 
-#: ../src/users/user-settings.c:541
+#: ../src/users/user-settings.c:554
 msgid "You are about to revoke your own administration rights"
 msgstr "æ?¨å°?æ?¾å¼?è?ªå·±ç??管ç??æ??é??"
 
-#: ../src/users/user-settings.c:544
+#: ../src/users/user-settings.c:557
 #, c-format
 msgid ""
 "%s will no longer be able to perform administrative tasks. This account "
 "won't be allowed to get administration rights back on its own."
 msgstr "%s ä¸?å??è?½æ?§è¡?管ç??ä»»å?¡ã??此账æ?·å°?ä¸?被å??许é??æ?°è?·å¾?管ç??æ??é??ã??"
 
-#: ../src/users/user-settings.c:549
+#: ../src/users/user-settings.c:562
 msgid "Give up administration rights"
 msgstr "æ?¾å¼?管ç??æ??é??"
 
-#: ../src/users/users-tool.c:278
+#: ../src/users/users-tool.c:285
 msgid "Users Settings"
 msgstr "��设置"
 
+#~ msgid "The new password has already been used recently."
+#~ msgstr "æ?°å¯?ç ?æ??è¿?å·²ç»?使ç?¨è¿?äº?ã??"
+
 #~ msgid "Check password _quality"
 #~ msgstr "æ£?æ?¥å¯?ç ?è´¨é??(_Q)"