[gnome-system-tools] Updated Traditional Chinese translation(Hong Kong and Taiwan)

[Chao-Hsiung Liao <chliao src gnome org>]

commit b2716be554720c19ad7672e45f748a24868a5573
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Thu Feb 4 20:40:57 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  791 +++++++++++++++++++++++++++++++++++++++++------------------
 po/zh_TW.po |  801 +++++++++++++++++++++++++++++++++++++++++------------------
 2 files changed, 1119 insertions(+), 473 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index ac48238..7349759 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-system-tools 2.27.92\n"
+"Project-Id-Version: gnome-system-tools 2.29.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-19 20:43+0800\n"
-"PO-Revision-Date: 2009-09-19 20:43+0800\n"
+"POT-Creation-Date: 2010-02-04 20:40+0800\n"
+"PO-Revision-Date: 2010-02-04 20:40+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,16 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../gnome-system-tools.schemas.in.h:1
-msgid "Whether the users-admin tool should show all users and groups or not"
+#, fuzzy
+#| msgid "Whether the users-admin tool should show all users and groups or not"
+msgid "Whether the users-admin tool should show system users in the users list"
+msgstr "ã??使ç?¨è??å??ç¾£çµ?ã??å·¥å?·æ??å?¦é¡¯ç¤ºæ??æ??帳è??å??ç¾£çµ?"
+
+#: ../gnome-system-tools.schemas.in.h:2
+#, fuzzy
+#| msgid "Whether the users-admin tool should show all users and groups or not"
+msgid ""
+"Whether the users-admin tool should show the root user in the users list"
 msgstr "ã??使ç?¨è??å??ç¾£çµ?ã??å·¥å?·æ??å?¦é¡¯ç¤ºæ??æ??帳è??å??ç¾£çµ?"
 
 #: ../interfaces/network.ui.h:1
@@ -100,7 +109,7 @@ msgstr "å??ç?¨é??å??é?£ç·?(_N)"
 msgid "Ethernet interface:"
 msgstr "�太網絡��:"
 
-#: ../interfaces/network.ui.h:20 ../interfaces/users.ui.h:21
+#: ../interfaces/network.ui.h:20 ../interfaces/users.ui.h:32
 msgid "General"
 msgstr "��"
 
@@ -240,7 +249,7 @@ msgstr "設å®?æ?¸æ??æ©?ç?ºé ?設路ç?±(_S)"
 msgid "_Subnet mask:"
 msgstr "�網絡�罩(_S):"
 
-#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:59
+#: ../interfaces/network.ui.h:55
 msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
@@ -334,7 +343,7 @@ msgid "Share through:"
 msgstr "�享��"
 
 #: ../interfaces/shares.ui.h:21 ../src/shares/shares.desktop.in.in.h:2
-#: ../src/shares/shares-tool.c:239
+#: ../src/shares/shares-tool.c:240
 msgid "Shared Folders"
 msgstr "å?±äº«ç??è³?æ??夾"
 
@@ -439,213 +448,303 @@ msgid "<span weight=\"bold\">Password Settings</span>"
 msgstr "<span weight=\"bold\">�碼設�</span>"
 
 #: ../interfaces/users.ui.h:7
-msgid "<span weight=\"bold\">Password</span>"
-msgstr "<span weight=\"bold\">�碼</span>"
-
-#: ../interfaces/users.ui.h:8
 msgid "<span weight=\"bold\">Profile Settings</span>"
 msgstr "<span weight=\"bold\">設���容</span>"
 
-#: ../interfaces/users.ui.h:9
+#: ../interfaces/users.ui.h:8
 msgid "<span weight=\"bold\">System Defaults</span>"
 msgstr "<span weight=\"bold\">系統é ?設å?¼</span>"
 
-#: ../interfaces/users.ui.h:10
-msgid "Account"
-msgstr "帳è??"
+#: ../interfaces/users.ui.h:9
+msgid "Account _type:"
+msgstr "帳è??é¡?å??(_T):"
 
-#: ../interfaces/users.ui.h:11
+#: ../interfaces/users.ui.h:10
 msgid "Advanced"
 msgstr "é?²é??"
 
-#: ../interfaces/users.ui.h:12
+#: ../interfaces/users.ui.h:11
 msgid ""
-"Allow this user to open a local session without entering his password. The "
-"password will still be required to perform administrative tasks."
-msgstr "å??許é??å??使ç?¨è??ä¸?é??輸å?¥å¯?碼就è?½é??å??æ?¬å?°ç«¯ä½?業é??段ã??å¦?æ??è¦?é?²è¡?系統管ç??å·¥ä½?æ??ä»?é??å¯?碼ã??"
+"An user with such a name already exists. Please choose a different short "
+"name for the new user."
+msgstr "å·²ç¶?æ??å??樣å??稱ç??使ç?¨è??å­?å?¨ã??è«?ç?ºæ?°ç??使ç?¨è??é?¸æ??ä¸?å??ç??ç?­å¼?å??稱ã??"
 
-#: ../interfaces/users.ui.h:13
+#: ../interfaces/users.ui.h:12
 msgid "Assign a random password by default"
 msgstr "é ?設å??é??é?¨æ©?ç??å¯?碼"
 
+#: ../interfaces/users.ui.h:13
+msgid "Change Advanced User Settings"
+msgstr "æ?¹è®?é?²é??ç??使ç?¨è??設å®?å?¼"
+
 #: ../interfaces/users.ui.h:14
-msgid "Check password _quality"
-msgstr "檢æ?¥å¯?碼å??質(_Q)"
+msgid "Change User Account Type"
+msgstr "æ?¹è®?使ç?¨è??帳è??é¡?å??"
 
 #: ../interfaces/users.ui.h:15
+#, fuzzy
+msgid "Change User Name and Login"
+msgstr "æ?¹è®?便ç?¨è??å??稱並ç?»å?¥"
+
+#: ../interfaces/users.ui.h:16
+msgid "Change User Password"
+msgstr "æ?¹è®?使ç?¨è??å¯?碼"
+
+#: ../interfaces/users.ui.h:17
+msgid "Changing advanced settings for:"
+msgstr "æ­£å?¨æ?¹è®?此人ç??é?²é??設å®?å?¼ï¼?"
+
+#: ../interfaces/users.ui.h:18
+msgid "Changing user account type for:"
+msgstr "æ?¹è®?使ç?¨è??帳è??é¡?å??ï¼?"
+
+#: ../interfaces/users.ui.h:19
+msgid "Changing user name for:"
+msgstr "æ­£å?¨æ?¹è®?使ç?¨è??å??稱ï¼?"
+
+#: ../interfaces/users.ui.h:20
+msgid "Changing user password for:"
+msgstr "æ­£å?¨æ?¹è®?使ç?¨è??å¯?碼ï¼?"
+
+#: ../interfaces/users.ui.h:21
 msgid "Con_firmation:"
 msgstr "確��碼(_F):"
 
-#: ../interfaces/users.ui.h:16
+#: ../interfaces/users.ui.h:22
 msgid "Contact Information"
 msgstr "�絡人��"
 
-#: ../interfaces/users.ui.h:17
+#: ../interfaces/users.ui.h:23
+msgid "Create New User"
+msgstr "建ç«?æ?°ç??使ç?¨è??"
+
+#: ../interfaces/users.ui.h:24
+msgid "Create a new user"
+msgstr "建ç«?ä¸?å??æ?°ç??使ç?¨è??"
+
+#: ../interfaces/users.ui.h:25
 msgid "Days between warning and password expiration:"
 msgstr "å¯?碼é??æ??å??ï¼?æ?¼æ??å®?æ?¥æ?¸ç?¼å?ºè­¦å??ï¼?"
 
-#: ../interfaces/users.ui.h:18
+#: ../interfaces/users.ui.h:26
 msgid "Default _group:"
 msgstr "é ?設羣çµ?(_G):"
 
-#: ../interfaces/users.ui.h:19
+#: ../interfaces/users.ui.h:27
 msgid "Default _shell:"
 msgstr "é ?設 _Shellï¼?"
 
-#: ../interfaces/users.ui.h:20
+#: ../interfaces/users.ui.h:28
+msgid "Disable _account"
+msgstr "å??ç?¨å¸³è??(_A)"
+
+#: ../interfaces/users.ui.h:29
 msgid "Don't ask for password on _login"
 msgstr "ç?»å?¥æ??ä¸?è©¢å??å¯?碼(_L)"
 
-#: ../interfaces/users.ui.h:22
+#: ../interfaces/users.ui.h:30
+msgid ""
+"Encrypt all your files with your login password to strongly protect them "
+"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:"
+msgstr "å?¨å??(_N):"
+
+#: ../interfaces/users.ui.h:33
 msgid "Generate _random password"
 msgstr "ç?¢ç??é?¨æ©?å¯?碼(_R)"
 
-#: ../interfaces/users.ui.h:23
+#: ../interfaces/users.ui.h:34
 msgid "Group _ID:"
 msgstr "羣� _ID�"
 
-#: ../interfaces/users.ui.h:24
+#: ../interfaces/users.ui.h:35
 msgid "Group _name:"
 msgstr "ç¾£çµ?å??稱(_N):"
 
-#: ../interfaces/users.ui.h:25
+#: ../interfaces/users.ui.h:36
 msgid "Group properties"
 msgstr "羣�屬�"
 
-#: ../interfaces/users.ui.h:26
+#: ../interfaces/users.ui.h:37
 msgid "Groups settings"
 msgstr "羣�設��"
 
-#: ../interfaces/users.ui.h:27
+#: ../interfaces/users.ui.h:38
 msgid "Ma_ximum days a password may be used:"
 msgstr "å¯?碼å?¯ä½¿ç?¨ç??æ?¥æ?¸ä¸?é??(_X):"
 
-#: ../interfaces/users.ui.h:28
+#: ../interfaces/users.ui.h:39 ../src/time/time-tool.c:521
+msgid "Manual"
+msgstr "æ??å??"
+
+#: ../interfaces/users.ui.h:40
 msgid "Maximum GID:"
 msgstr "GID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:29
+#: ../interfaces/users.ui.h:41
 msgid "Maximum UID:"
 msgstr "UID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:30
+#: ../interfaces/users.ui.h:42
 msgid "Mi_nimum days between password changes:"
 msgstr "å¯?碼使ç?¨äº?æ??å®?ç??æ?¥æ?¸å¾?æ?¹å?¯ä¿®æ?¹(_N):"
 
-#: ../interfaces/users.ui.h:31
+#: ../interfaces/users.ui.h:43
 msgid "Minimum GID:"
 msgstr "GID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:32
+#: ../interfaces/users.ui.h:44
 msgid "Minimum UID:"
 msgstr "UID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:33
+#: ../interfaces/users.ui.h:45
 msgid "Minimum days allowed between password changes:"
 msgstr "å¯?碼使ç?¨äº?æ??å®?ç??æ?¥æ?¸å¾?æ?¹å?¯ä¿®æ?¹ï¼?"
 
-#: ../interfaces/users.ui.h:34
+#: ../interfaces/users.ui.h:46
+msgid "New _password:"
+msgstr "æ?°ç??å¯?碼(_P):"
+
+#: ../interfaces/users.ui.h:47
 msgid "Number of days that a password may be used:"
 msgstr "å¯?碼å?¯ä½¿ç?¨ç??æ?¥æ?¸ï¼?"
 
-#: ../interfaces/users.ui.h:35
+#: ../interfaces/users.ui.h:48
 msgid "O_ffice location:"
 msgstr "���置(_F):"
 
-#: ../interfaces/users.ui.h:36
+#: ../interfaces/users.ui.h:49
 msgid "Password set to: "
 msgstr "�碼設���"
 
-#: ../interfaces/users.ui.h:37
+#: ../interfaces/users.ui.h:50
 msgid "Privileges"
 msgstr "æ¬?é??"
 
-#: ../interfaces/users.ui.h:38
+#: ../interfaces/users.ui.h:51
 msgid "Profile _name:"
 msgstr "設å®?çµ?å??å??稱(_N):"
 
-#: ../interfaces/users.ui.h:39
+#: ../interfaces/users.ui.h:52
 msgid "Set password b_y hand"
 msgstr "��設��碼(_Y)"
 
-#: ../interfaces/users.ui.h:40
+#. 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
+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 \"_\""
+msgstr ""
+"ç?­å¼?å??稱å¿?é ?ç?±é??äº?å­?çµ?æ??ï¼?\n"
+"  &#x27A3; å°?寫è?±æ??å­?æ¯?\n"
+"  &#x27A3; ��\n"
+"  &#x27A3; å?¶ä»?å­?符å¦? \".\"ã?? \"-\" å?? \"_\""
+
+#: ../interfaces/users.ui.h:58
+msgid "Short name must start with a letter!"
+msgstr "ç?­å¼?å??稱å¿?é ?以è?±æ??å­?æ¯?é??é ­ï¼?"
+
+#: ../interfaces/users.ui.h:59
+msgid "This account is disabled."
+msgstr "é??å??帳è??å·²å??ç?¨ã??"
+
+#: ../interfaces/users.ui.h:60
+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
 msgid "User ID:"
 msgstr "使ç?¨è??IDï¼?"
 
-#: ../interfaces/users.ui.h:41
+#: ../interfaces/users.ui.h:62
 msgid "User Privileges"
 msgstr "使ç?¨è??æ¬?é??"
 
-#: ../interfaces/users.ui.h:42
-msgid "User _password:"
-msgstr "使ç?¨è??å¯?碼(_P):"
-
-#: ../interfaces/users.ui.h:43
-msgid "User must log out before you can change his ID."
-msgstr "å?¨ä½ æ?¹è®?使ç?¨è??ç?? ID å??ä»?å¿?é ?å??ç?»å?ºã??"
-
-#: ../interfaces/users.ui.h:44
+#: ../interfaces/users.ui.h:63
 msgid "User profiles"
 msgstr "使ç?¨è??設å®?æª?"
 
-#: ../interfaces/users.ui.h:45
-msgid "_Add Group"
-msgstr "å? å?¥ç¾£çµ?(_A)"
+#: ../interfaces/users.ui.h:64
+msgid "You can't change user ID while the user is logged in."
+msgstr "ä½ ä¸?è?½å?¨ä½¿ç?¨è??è??æ?¼ç?»å?¥ç??æ??æ??æ?¹è®?使ç?¨è?? IDã??"
 
-#: ../interfaces/users.ui.h:46
+#: ../interfaces/users.ui.h:65
 msgid "_Add Profile"
 msgstr "��設��(_A)"
 
-#: ../interfaces/users.ui.h:47
-msgid "_Add User"
-msgstr "æ?°å¢?使ç?¨è??(_A)"
+#: ../interfaces/users.ui.h:66
+msgid "_Advanced Settings"
+msgstr "é?²é??設å®?(_A)"
 
-#: ../interfaces/users.ui.h:48
+#: ../interfaces/users.ui.h:67
 msgid "_Comments"
 msgstr "å??註(_C)"
 
-#: ../interfaces/users.ui.h:49
+#: ../interfaces/users.ui.h:68
+msgid "_Current password:"
+msgstr "ç?®å??ç??å¯?碼(_C):"
+
+#: ../interfaces/users.ui.h:69
+msgid "_Custom"
+msgstr "��(_C)"
+
+#: ../interfaces/users.ui.h:70
 msgid "_Days between warning and password expiration:"
 msgstr "å¯?碼é??æ??å??ï¼?æ?¼æ??å®?æ?¥æ?¸ç?¼å?ºè­¦å??(_D):"
 
-#: ../interfaces/users.ui.h:50 ../src/network/address-list.c:77
-#: ../src/network/hosts.c:33 ../src/shares/table.c:40 ../src/users/table.c:40
-msgid "_Delete"
-msgstr "��(_D)"
+#: ../interfaces/users.ui.h:71
+msgid "_Enable Account"
+msgstr "å??ç?¨å¸³è??(_E)"
 
-#: ../interfaces/users.ui.h:51
+#: ../interfaces/users.ui.h:72
+msgid "_Encrypt home folder to protect sensitive data"
+msgstr "å? å¯?家ç?®é??以ä¿?è­·æ??æ??è³?æ??(_E)"
+
+#: ../interfaces/users.ui.h:73
 msgid "_Generate"
 msgstr "ç?¢ç??(_G)"
 
-#: ../interfaces/users.ui.h:52
+#: ../interfaces/users.ui.h:74
 msgid "_Home directory:"
 msgstr "å??人ç?®é??(_H):"
 
-#: ../interfaces/users.ui.h:53
+#: ../interfaces/users.ui.h:75
 msgid "_Home phone:"
 msgstr "家��話(_H):"
 
-#: ../interfaces/users.ui.h:54
+#: ../interfaces/users.ui.h:76
 msgid "_Main group:"
 msgstr "主�羣�(_M):"
 
-#: ../interfaces/users.ui.h:55
+#: ../interfaces/users.ui.h:77
 msgid "_Manage Groups"
 msgstr "管ç??ç¾£çµ?(_M):"
 
-#: ../interfaces/users.ui.h:56
-msgid "_Profile:"
-msgstr "設å®?çµ?å??(_P):"
+#: ../interfaces/users.ui.h:78
+msgid "_Name:"
+msgstr "å??稱(_N):"
 
-#: ../interfaces/users.ui.h:57
-msgid "_Real name:"
-msgstr "ç??實å§?å??(_R):"
+#: ../interfaces/users.ui.h:79
+msgid "_Password:"
+msgstr "�碼(_P):"
 
-#: ../interfaces/users.ui.h:58
+#: ../interfaces/users.ui.h:80
 msgid "_Shell:"
 msgstr "_Shell:"
 
-#: ../interfaces/users.ui.h:60
+#: ../interfaces/users.ui.h:81
+msgid "_Short Name:"
+msgstr "ç?­å¼?å??稱(_S):"
+
+#: ../interfaces/users.ui.h:82
 msgid "_Work phone:"
 msgstr "工��話(_W):"
 
@@ -665,50 +764,64 @@ msgstr "å¦?æ??ä½ è?¯å®?æ?¬ç³»çµ±å??以ä¸?å??å?ºç??å?¶ä¸­ä¸?種ä½?業平å?°é??ä½?
 msgid "Unsupported platform"
 msgstr "ä¸?æ?¯æ?´ç??å¹³å?°"
 
-#: ../src/common/gst-tool.c:181
+#: ../src/common/gst-tool.c:190
 msgid "The configuration could not be loaded"
 msgstr "����設�"
 
 #. OPERATION_COMMIT
-#: ../src/common/gst-tool.c:183
+#: ../src/common/gst-tool.c:192
 msgid "The configuration could not be saved"
 msgstr "ç?¡æ³?å?²å­?çµ?æ??設å®?"
 
-#: ../src/common/gst-tool.c:187
+#: ../src/common/gst-tool.c:196
 msgid "You are not allowed to access the system configuration."
 msgstr "ä½ ä¸?å??許å­?å??系統設å®?ã??"
 
 #. OPERATION_COMMIT
-#: ../src/common/gst-tool.c:189
+#: ../src/common/gst-tool.c:198 ../src/common/gst-tool.c:683
 msgid "You are not allowed to modify the system configuration."
 msgstr "ä½ ä¸?被å??許修æ?¹ç³»çµ±çµ?æ??ã??"
 
-#: ../src/common/gst-tool.c:192
+#: ../src/common/gst-tool.c:201
 msgid "Invalid data was found."
 msgstr "æ?¾ä¸?å?°ç?¡æ??ç??è³?æ??ã??"
 
 #. OOBS_RESULT_ERROR
-#: ../src/common/gst-tool.c:194
+#: ../src/common/gst-tool.c:203
 msgid "An unknown error occurred."
 msgstr "ç?¼ç??ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../src/common/gst-tool.c:416
+#: ../src/common/gst-tool.c:428
 msgid "Could not display help"
 msgstr "ç?¡æ³?顯示說æ??æ??件"
 
-#: ../src/common/gst-tool.c:600
+#: ../src/common/gst-tool.c:622
 msgid "The system configuration has potentially changed."
 msgstr "系統çµ?æ??å?¯è?½è¢«æ?´æ?¹äº?ã??"
 
-#: ../src/common/gst-tool.c:602
+#: ../src/common/gst-tool.c:624
 msgid "Update content? This will lose any modification in course."
 msgstr "æ?¯å?¦è¦?æ?´æ?°å?§å®¹ï¼?é??樣æ??失å?»ä»»ä½?å?¨å??å??é??ç¨?中ç??ä¿®æ?¹ã??"
 
+#: ../src/common/gst-tool.c:685
+#, 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:38
+#: ../src/shares/table.c:38 ../src/users/table.c:40
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
+#: ../src/network/address-list.c:77 ../src/network/hosts.c:33
+#: ../src/shares/table.c:40 ../src/users/table.c:42
+msgid "_Delete"
+msgstr "��(_D)"
+
 #: ../src/network/address-list.c:486
 msgid "Type address"
 msgstr "輸å?¥å?°å??"
@@ -791,7 +904,7 @@ msgid "%s Properties"
 msgstr "%s 屬�"
 
 #: ../src/network/hosts.c:32 ../src/network/ifaces-list.c:33
-#: ../src/shares/table.c:39 ../src/users/table.c:39
+#: ../src/shares/table.c:39 ../src/users/table.c:41
 msgid "_Properties"
 msgstr "屬�(_P)"
 
@@ -934,17 +1047,17 @@ msgstr "網絡"
 msgid "Network Settings"
 msgstr "網絡設�"
 
-#: ../src/services/callbacks.c:59
+#: ../src/services/callbacks.c:65
 #, c-format
 msgid "Settings for service \"%s\""
 msgstr "æ??å??â??%sâ??ç??設å®?"
 
-#: ../src/services/callbacks.c:119
+#: ../src/services/callbacks.c:125
 #, c-format
 msgid "Are you sure you want to deactivate %s?"
 msgstr "ä½ ç¢ºå®?è¦?å??ç?¨ %sï¼?"
 
-#: ../src/services/callbacks.c:123
+#: ../src/services/callbacks.c:129
 msgid ""
 "This may affect your system behavior in several ways, possibly leading to "
 "data loss."
@@ -1394,7 +1507,7 @@ msgstr "ç??æ??"
 msgid "Priority"
 msgstr "å?ªå??ç­?ç´?"
 
-#: ../src/services/services-tool.c:99
+#: ../src/services/services-tool.c:106
 msgid "Services Settings"
 msgstr "æ??å??設å®?å?¼"
 
@@ -1495,161 +1608,252 @@ msgid ""
 "synchronization of your local time server with internet time servers."
 msgstr "è«?å?¨ç³»çµ±å®?è£?並å??ç?¨ NTP æ?¯æ?´ï¼?ä»¤ä½ ç??æ?¬å?°æ??é??伺æ??å?¨è?½è??網絡æ??é??伺æ??å?¨é?²è¡?å??æ­¥ã??"
 
-#: ../src/time/time-tool.c:429
+#: ../src/time/time-tool.c:428
 msgid "Enabling NTP"
 msgstr "å??ç?¨ NTP"
 
-#: ../src/time/time-tool.c:429
+#: ../src/time/time-tool.c:428
 msgid "Disabling NTP"
 msgstr "å??ç?¨ NTP"
 
-#: ../src/time/time-tool.c:441
+#: ../src/time/time-tool.c:440
 msgid "Synchronizing system clock"
 msgstr "系統æ??é??å??æ­¥"
 
-#: ../src/time/time-tool.c:521
+#: ../src/time/time-tool.c:520
 msgid "Keep synchronized with Internet servers"
 msgstr "è??網絡伺æ??å?¨ä¿?æ??å??æ­¥"
 
-#: ../src/time/time-tool.c:522
-msgid "Manual"
-msgstr "æ??å??"
-
-#: ../src/time/time-tool.c:668
+#: ../src/time/time-tool.c:667
 msgid "Time and Date Settings"
 msgstr "æ??é??å??æ?¥æ??設å®?"
 
-#: ../src/users/group-settings.c:52
+#: ../src/users/group-settings.c:55
 msgid "Administrator group can not be deleted"
 msgstr "管ç??å?¡ç¾£çµ?ç?¡æ³?被å?ªé?¤"
 
-#: ../src/users/group-settings.c:55 ../src/users/group-settings.c:295
-#: ../src/users/group-settings.c:319 ../src/users/user-settings.c:61
-#: ../src/users/user-settings.c:702
+#: ../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
 msgid "This would leave the system unusable."
 msgstr "é??樣æ??è®?系統å??ç??å?¨ç?¡æ³?使ç?¨ç??ç??æ??ã??"
 
-#: ../src/users/group-settings.c:68
+#: ../src/users/group-settings.c:71
 #, c-format
 msgid "Are you sure you want to delete group \"%s\"?"
 msgstr "æ?¯å?¦ç¢ºå®?å?ªé?¤ç¾£çµ?â??%sâ??ï¼?"
 
-#: ../src/users/group-settings.c:71
+#: ../src/users/group-settings.c:74
 msgid "This may leave files with invalid group ID in the filesystem."
 msgstr "é??樣å?¯è?½æ??å?¨æª?æ¡?系統中ç??ä¸?å?·æ??ç?¡æ??ç??ç¾£çµ? ID ç??æª?æ¡?ã??"
 
-#: ../src/users/group-settings.c:167
+#: ../src/users/group-settings.c:151
 msgid "New group"
 msgstr "建��羣�"
 
-#: ../src/users/group-settings.c:175
+#: ../src/users/group-settings.c:158
 #, c-format
 msgid "Group '%s' Properties"
 msgstr "ç¾£çµ?â??%sâ??屬æ?§"
 
-#: ../src/users/group-settings.c:291
+#: ../src/users/group-settings.c:224
 msgid "Group name is empty"
 msgstr "ç¾£çµ?å??稱æ?¯ç©ºç??"
 
-#: ../src/users/group-settings.c:292
+#: ../src/users/group-settings.c:225
 msgid "A group name must be specified."
 msgstr "å¿?é ?æ??å®?ç¾£çµ?å??稱ã??"
 
-#: ../src/users/group-settings.c:294
+#: ../src/users/group-settings.c:227
 msgid "Group name of the administrator group user should not be modified"
 msgstr "ä¸?æ??ä¿®æ?¹å±¬æ?¼ç®¡ç??å?¡ç¾£çµ?使ç?¨è??ç??ç¾£çµ?å??稱"
 
-#: ../src/users/group-settings.c:297
+#: ../src/users/group-settings.c:230
 msgid "Group name has invalid characters"
 msgstr "ç¾£çµ?å??稱å?«æ??ä¸?正確ç??å­?符"
 
-#: ../src/users/group-settings.c:298
+#: ../src/users/group-settings.c:231
 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:302 ../src/users/user-settings.c:635
+#: ../src/users/group-settings.c:236
 #, c-format
 msgid "Group \"%s\" already exists"
 msgstr "ç¾£çµ?â??%sâ??å·²ç¶?å­?å?¨"
 
-#: ../src/users/group-settings.c:303
+#: ../src/users/group-settings.c:237
 msgid "Please choose a different group name."
 msgstr "è«?使ç?¨å?¦å¤?ä¸?å??ç¾£çµ?å??稱ã??"
 
-#: ../src/users/group-settings.c:318
+#: ../src/users/group-settings.c:264
 msgid "Group ID of the Administrator account should not be modified"
 msgstr "ä¸?æ??ä¿®æ?¹ç®¡ç??å?¡å¸³è??æ??屬ç??ç¾£çµ? ID"
 
-#: ../src/users/groups-table.c:45
+#. check that GID is free
+#: ../src/users/group-settings.c:268
+#, c-format
+msgid "Group ID %d is already used by group \"%s\""
+msgstr "ç¾£çµ? ID %d 已被羣çµ?ã??%sã??æ??使ç?¨"
+
+#: ../src/users/group-settings.c:271
+msgid "Please choose a different numeric identifier for the new group."
+msgstr "è«?ç?ºé??å??æ?°ç¾£çµ?é?¸æ??ä¸?å??ç??æ?¸å­?è­?å?¥ç¢¼ã??"
+
+#: ../src/users/group-settings.c:273
+#, c-format
+msgid "Please choose a different numeric identifier for group \"%s\"."
+msgstr "è«?ç?ºç¾£çµ?ã??%sã??é?¸æ??ä¸?å??ç??æ?¸å­?è­?å?¥ç¢¼ã??"
+
+#: ../src/users/groups-table.c:44
 msgid "Group name"
 msgstr "ç¾£çµ?å??稱"
 
-#: ../src/users/privileges-table.c:49
+#: ../src/users/privileges-table.c:53
 msgid "Monitor system logs"
 msgstr "��系統��"
 
-#: ../src/users/privileges-table.c:50
+#: ../src/users/privileges-table.c:54
 msgid "Administer the system"
 msgstr "管ç??此系統"
 
-#: ../src/users/privileges-table.c:51
+#: ../src/users/privileges-table.c:55
 msgid "Use audio devices"
 msgstr "使ç?¨é?³æ??è£?ç½®"
 
-#: ../src/users/privileges-table.c:52
+#: ../src/users/privileges-table.c:56
 msgid "Use CD-ROM drives"
 msgstr "使ç?¨å??ç¢?æ©?"
 
-#: ../src/users/privileges-table.c:53
+#: ../src/users/privileges-table.c:57
 msgid "Burn CDs / DVDs"
 msgstr "ç??é?? CD / DVD"
 
-#: ../src/users/privileges-table.c:54
+#: ../src/users/privileges-table.c:58
 msgid "Use modems"
 msgstr "使ç?¨æ?¸æ??æ©?"
 
-#: ../src/users/privileges-table.c:55
+#: ../src/users/privileges-table.c:59
 msgid "Connect to Internet using a modem"
 msgstr "ç¶?ç?±æ?¸æ??æ©?é?£ç·?å?°äº?è?¯ç¶²"
 
-#: ../src/users/privileges-table.c:56
+#: ../src/users/privileges-table.c:60
 msgid "Send and receive faxes"
 msgstr "å?³é??è??æ?¥æ?¶å?³ç??"
 
-#: ../src/users/privileges-table.c:57
+#: ../src/users/privileges-table.c:61
 msgid "Use floppy drives"
 msgstr "使����"
 
-#: ../src/users/privileges-table.c:58
+#: ../src/users/privileges-table.c:62
+#, fuzzy
+msgid "Mount user-space filesystems (FUSE)"
+msgstr "æ??è¼?使ç?¨è??層ç´?æª?æ¡?系統 (FUSE)"
+
+#: ../src/users/privileges-table.c:63
+msgid "Configure printers"
+msgstr "設å®?æ??å?°æ©?"
+
+#: ../src/users/privileges-table.c:64
+msgid "Connect to wireless and ethernet networks"
+msgstr "é?£ç·?å?°ç?¡ç·?å??ä¹?太網絡"
+
+#: ../src/users/privileges-table.c:65
 msgid "Access external storage devices automatically"
 msgstr "è?ªå??å­?å??å¤?é?¨ç??å?²å­?è£?ç½®"
 
-#: ../src/users/privileges-table.c:59
+#: ../src/users/privileges-table.c:66
+msgid "Suspend and hibernate the computer"
+msgstr "å°?é?»è?¦æ?«å??è??ä¼?ç? "
+
+#: ../src/users/privileges-table.c:67
 msgid "Access /proc filesystem"
 msgstr "å­?å?? /proc æª?æ¡?系統"
 
-#: ../src/users/privileges-table.c:60
+#: ../src/users/privileges-table.c:68
 msgid "Use scanners"
 msgstr "使ç?¨æ??æ??å?¨"
 
-#: ../src/users/privileges-table.c:61
+#: ../src/users/privileges-table.c:69
 msgid "Use tape drives"
 msgstr "使��帶�"
 
-#: ../src/users/privileges-table.c:62
+#: ../src/users/privileges-table.c:70
 msgid "Use USB devices"
 msgstr "使� USB �置"
 
-#: ../src/users/privileges-table.c:63
+#: ../src/users/privileges-table.c:71
+msgid "Use VirtualBox virtualization solution"
+msgstr "使ç?¨ VirtualBox è??æ?¬å??解決æ?¹æ¡?"
+
+#: ../src/users/privileges-table.c:72
 msgid "Use video devices"
 msgstr "使ç?¨è¦?å??è£?ç½®"
 
-#: ../src/users/privileges-table.c:64
+#: ../src/users/privileges-table.c:73
 msgid "Be able to get administrator privileges"
 msgstr "å?¯ä»¥å¾?å?°ç®¡ç??è??æ¬?é??"
 
+#: ../src/users/user-profiles.conf.in.h:1
+msgid "Administrator"
+msgstr "系統管ç??è??"
+
+#: ../src/users/user-profiles.conf.in.h:2
+msgid ""
+"Can change anything on the system, including installing and upgrading "
+"software."
+msgstr "å?¯ä»¥æ?¹è®?系統中ç??ä»»ä½?äº?ï¼?å??æ?¬å®?è£?å??å??ç´?è»?件ã??"
+
+#: ../src/users/user-profiles.conf.in.h:3
+msgid ""
+"Can perform common tasks. Can't install software or change settings "
+"affecting all users."
+msgstr "å?¯ä»¥é?²è¡?ä¸?è?¬å·¥ä½?ã??ä¸?è?½å®?è£?è»?件æ??æ?¹è®?æ??å½±é?¿æ??æ??使ç?¨è??ç??設å®?å?¼ã??"
+
+#: ../src/users/user-profiles.conf.in.h:4
+msgid "Desktop user"
+msgstr "æ¡?é?¢ä½¿ç?¨è??"
+
+#: ../src/users/run-passwd.c:421
+msgid "Authentication failed"
+msgstr "é©?è­?失æ??"
+
+#: ../src/users/run-passwd.c:494
+#, c-format
+msgid "The new password is too short"
+msgstr "æ?°ç??å¯?碼太ç?­"
+
+#: ../src/users/run-passwd.c:499
+#, c-format
+msgid "The new password is too simple"
+msgstr "æ?°ç??å¯?碼太簡å?®"
+
+#: ../src/users/run-passwd.c:503
+#, c-format
+msgid "The old and new passwords are too similar"
+msgstr "è??å¯?碼è??æ?°å¯?碼太ç?¸ä¼¼äº?"
+
+#: ../src/users/run-passwd.c:506
+#, c-format
+msgid "The new password must contain numeric or special characters"
+msgstr "æ?°ç??å¯?碼å¿?é ?å??å?«æ?¸å­?æ??ç?¹æ®?å­?符"
+
+#: ../src/users/run-passwd.c:510
+#, c-format
+msgid "The old and new passwords are the same"
+msgstr "è??å¯?碼è??æ?°å¯?碼æ?¯ç?¸å??ç??"
+
+#: ../src/users/run-passwd.c:514
+#, c-format
+msgid "Your password has been changed since you initially authenticated!"
+msgstr ""
+
+#: ../src/users/run-passwd.c:518
+#, c-format
+msgid "Unknown error"
+msgstr "ä¸?æ??ç??é?¯èª¤"
+
 #: ../src/users/users.desktop.in.in.h:1
 msgid "Add or remove users and groups"
 msgstr "å? å?¥æ??移é?¤ä½¿ç?¨è??å??ç¾£çµ?"
@@ -1658,75 +1862,121 @@ msgstr "å? å?¥æ??移é?¤ä½¿ç?¨è??å??ç¾£çµ?"
 msgid "Users and Groups"
 msgstr "使ç?¨è??å??ç¾£çµ?"
 
-#: ../src/users/user-settings.c:58
-msgid "Administrator account cannot be deleted"
-msgstr "管ç??å?¡å¸³è??ç?¡æ³?被å?ªé?¤"
-
-#: ../src/users/user-settings.c:72
-#, c-format
-msgid "Are you sure you want to delete account \"%s\"?"
-msgstr "ä½ æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å¸³è??â??%sâ??ï¼?"
+#: ../src/users/user-password.c:99
+msgid "Password is too short"
+msgstr "�碼太�"
 
-#: ../src/users/user-settings.c:75
+#: ../src/users/user-password.c:100
 msgid ""
-"This will disable this user's access to the system without deleting the "
-"user's home directory."
-msgstr "é??æ??å??止該使ç?¨è??å­?å??系統ï¼?ä½?ä»?ç??家ç?®é??ä¸?æ??被å?ªé?¤ã??"
+"User passwords must be longer than 6 characters and preferably formed by "
+"numbers, letters and special characters."
+msgstr "使ç?¨è??å¯?碼é ?ç?º 6 å??å­?符以ä¸?ï¼?å??æ??好ç?±æ?¸å­?ã??å­?符å??ç?¹æ®?å­?符æ??çµ?æ??ã??"
 
-#: ../src/users/user-settings.c:85
-msgid "This user is currently using this computer"
-msgstr "該使ç?¨è??ç?®å??æ­£å?¨ä½¿ç?¨é??é?¨é?»è?¦"
+#: ../src/users/user-password.c:103
+msgid "Password confirmation is not correct"
+msgstr "�碼確�並�正確"
 
-#: ../src/users/user-settings.c:439
-msgid "New user account"
-msgstr "æ?°ä½¿ç?¨è??帳è??"
+#: ../src/users/user-password.c:104
+msgid "Check that you have provided the same password in both text fields."
+msgstr "è«?檢æ?¥ä½ æ?¯å?¦å?¨å?©å??æ??å­?æ¬?ä½?中æ??ä¾?ç?¸å??ç??å¯?碼ã??"
 
-#: ../src/users/user-settings.c:460
-#, c-format
-msgid "Account '%s' Properties"
-msgstr "帳è??â??%sâ??屬æ?§"
+#: ../src/users/user-password.c:419
+msgid "Please choose another password."
+msgstr "è«?é?¸æ??å?¶ä»?å¯?碼ã??"
 
-#: ../src/users/user-settings.c:621
-msgid "User name is empty"
-msgstr "使ç?¨è??å??稱æ?¯ç©ºç??"
+#: ../src/users/user-password.c:430
+msgid "Please type again your current password."
+msgstr "è«?å??次輸å?¥ä½ ç?®å??ç??å¯?碼ã??"
 
-#: ../src/users/user-settings.c:622
-msgid "A user name must be specified."
-msgstr "å¿?é ?æ??å®?使ç?¨è??å??稱ã??"
+#: ../src/users/user-password.c:437
+msgid "Password could not be changed"
+msgstr "�碼����"
 
-#: ../src/users/user-settings.c:624
-msgid "User name has invalid characters"
-msgstr "使ç?¨è??å??稱å?«æ??ç?¡æ??ç??å­?"
+#: ../src/users/user-settings.c:74
+msgid "Administrator account cannot be deleted"
+msgstr "管ç??å?¡å¸³è??ç?¡æ³?被å?ªé?¤"
 
-#: ../src/users/user-settings.c:625
-msgid ""
-"Please set a valid user name consisting of a lower case letter followed by "
-"lower case letters and numbers."
-msgstr "è«?設å®?æ??æ??ç??使ç?¨è??å??稱ï¼?第ä¸?å??å­?符å?ªå?¯ä»¥æ?¯å°?寫å­?æ¯?ï¼?å?¶å®?ç??å¿?é ?æ?¯å°?寫å­?æ¯?æ??æ?¸å­?ã??"
+#: ../src/users/user-settings.c:85
+#, c-format
+msgid "%s is currently using this computer"
+msgstr "%s ç?®å??æ­£å?¨ä½¿ç?¨é??é?¨é?»è?¦"
+
+#: ../src/users/user-settings.c:88
+msgid "Please ensure the user has logged out before deleting this account."
+msgstr "å?¨å?ªé?¤é??å??帳è??ä¹?å??è«?確å®?該使ç?¨è??å·²ç¶?ç?»å?ºã??"
 
-#: ../src/users/user-settings.c:629
+#: ../src/users/user-settings.c:98
+msgid "Can't delete the only administrator account"
+msgstr "ä¸?è?½å?ªé?¤å?¯ä¸?ç??系統管ç??è??帳è??"
+
+#: ../src/users/user-settings.c:100
 #, c-format
-msgid "User name \"%s\" already exists"
-msgstr "該使ç?¨è??å??稱â??%sâ??å·²ç¶?å­?å?¨"
+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:630 ../src/users/user-settings.c:636
-msgid "Please choose a different user name."
-msgstr "è«?é?¸æ??ä¸?å??ç??使ç?¨è??å??稱ã??"
+#: ../src/users/user-settings.c:110
+#, c-format
+msgid "Remove home folder for %s?"
+msgstr "æ?¯å?¦ç§»é?¤ %s ç??家ç?®é??ï¼?"
 
-#: ../src/users/user-settings.c:661
+#: ../src/users/user-settings.c:113
+#, 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."
+msgstr "å¦?æ??å·²ç?¡é??è¦?ï¼?ä½ å?¯ä»¥å®?å?¨ç§»é?¤ä½¿ç?¨è?? %s å?¨ <tt>%s</tt> 中æ??æ??æ??ç??æª?æ¡?ã??ä½ å?¯è?½æ??æ?³å?¨å?ªé?¤é??å??帳è??å??å??æ??å®?å??å??份ï¼?æ??æ?¯ä¿?ç??å®?å??以便系統管ç??è??è?½å?¨ç¨?å¾?ä¿?å­?å®?å??ã??"
+
+#: ../src/users/user-settings.c:121
+msgid "Keep Files"
+msgstr "ä¿?ç??æª?æ¡?"
+
+#: ../src/users/user-settings.c:122
+msgid "Don't Remove Account"
+msgstr "ä¸?移é?¤å¸³è??"
+
+#: ../src/users/user-settings.c:123
+msgid "Delete Files"
+msgstr "����"
+
+#: ../src/users/user-settings.c:319
+msgid "Superuser"
+msgstr "è¶?ç´?使ç?¨è??"
+
+#: ../src/users/user-settings.c:324
+msgid "Custom"
+msgstr "��"
+
+#. TRANSLATORS: This applies to a password.
+#: ../src/users/user-settings.c:333
+msgid "None"
+msgstr "æ²?æ??"
+
+#. TRANSLATORS:  This applies to a password. Keep the string short.
+#: ../src/users/user-settings.c:336
+msgid "Not asked on login"
+msgstr "ä¸?å?¨ç?»å?¥æ??è©¢å??"
+
+#: ../src/users/user-settings.c:338
+msgid "Asked on login"
+msgstr "ç?»å?¥æ??è©¢å??"
+
+#: ../src/users/user-settings.c:380
 #, c-format
 msgid "Invalid character \"%c\" in comment"
 msgstr "å??註中å?ºç?¾ç?¡æ??ç??å­?符â??%câ??"
 
-#: ../src/users/user-settings.c:662
+#: ../src/users/user-settings.c:381
 msgid "Check that this character is not used."
 msgstr "è«?檢æ?¥æ??ç?¡ä½¿ç?¨æ­¤ä¸?正確ç??å­?符ã??"
 
-#: ../src/users/user-settings.c:680
+#: ../src/users/user-settings.c:404
 msgid "Incomplete path in home directory"
 msgstr "å??人ç?®é??å?«æ??ä¸?å®?æ?´ç??è·¯å¾?"
 
-#: ../src/users/user-settings.c:681
+#: ../src/users/user-settings.c:405
 msgid ""
 "Please enter full path for home directory\n"
 "<span size=\"smaller\">i.e.: /home/john</span>."
@@ -1734,35 +1984,41 @@ msgstr ""
 "è«?輸å?¥å®¶ç?®é??ç??å®?æ?´è·¯å¾?\n"
 "<span size=\"smaller\">ä¾?å¦?ï¼?/home/john</span>ã??"
 
-#: ../src/users/user-settings.c:684
+#: ../src/users/user-settings.c:420
 msgid "Home directory already exists"
 msgstr "家ç?®é??å·²ç¶?å­?å?¨"
 
-#: ../src/users/user-settings.c:685
-msgid "Please enter a different home directory path."
-msgstr "è«?é?¸æ??ä¸?å??ç??家ç?®é??è·¯å¾?ã??"
+#: ../src/users/user-settings.c:421
+#, c-format
+msgid ""
+"The directory <tt>%s</tt> already exists. User may not have the permissions "
+"required to read or write in that directory. Do you want to use it anyway?"
+msgstr "ç?®é?? <tt>%s</tt> å·²å­?å?¨ã??使ç?¨è??å?¯è?½æ??æ²?æ??è®?寫該ç?®é??å¿?é ?ç??æ¬?é??ã??ä½ ä»?ç?¶è¦?使ç?¨å®?å??ï¼?"
+
+#: ../src/users/user-settings.c:427
+msgid "Use this directory"
+msgstr "使ç?¨é??å??ç?®é??"
 
-#: ../src/users/user-settings.c:701
-msgid "Administrator account's user ID should not be modified"
-msgstr "ä¸?æ??ä¿®æ?¹ç®¡ç??å?¡å¸³è??ç??使ç?¨è?? ID"
+#: ../src/users/user-settings.c:462
+msgid "ID for the root user should not be modified"
+msgstr "ä¸?æ??ä¿®æ?¹ root 使ç?¨è??ç?? ID"
 
-#: ../src/users/user-settings.c:706
-#, fuzzy, c-format
-#| msgid "User name \"%s\" already exists"
-msgid "User ID %d is already used"
-msgstr "該使ç?¨è??å??稱â??%sâ??å·²ç¶?å­?å?¨"
+#. check that UID is free
+#: ../src/users/user-settings.c:466
+#, c-format
+msgid "User ID %d is already used by user %s"
+msgstr "使ç?¨è?? ID %d å·²ç¶?被使ç?¨è?? %s æ??ç?¨"
 
-#: ../src/users/user-settings.c:707
-#, fuzzy
-#| msgid "Please choose a different user name."
-msgid "Please choose a different numeric identifier for the new user."
-msgstr "è«?é?¸æ??ä¸?å??ç??使ç?¨è??å??稱ã??"
+#: ../src/users/user-settings.c:468
+#, c-format
+msgid "Please choose a different numeric identifier for %s."
+msgstr "è«?ç?º %s é?¸æ??ä¸?å??ç??æ?¸å­?è­?å?¥ç¢¼ã??"
 
-#: ../src/users/user-settings.c:721
+#: ../src/users/user-settings.c:486
 msgid "Incomplete path in shell"
 msgstr "shell å?«æ??ä¸?å®?æ?´ç??è·¯å¾?"
 
-#: ../src/users/user-settings.c:722
+#: ../src/users/user-settings.c:487
 msgid ""
 "Please enter full path for shell\n"
 "<span size=\"smaller\">i.e.: /bin/bash</span>."
@@ -1770,53 +2026,116 @@ msgstr ""
 "è«?輸å?¥ shell ç??å®?æ?´è·¯å¾?\n"
 "<span size=\"smaller\">ä¾?å¦?ï¼?/bin/bash</span>ã??"
 
-#: ../src/users/user-settings.c:755
-msgid "Password is too short"
-msgstr "�碼太�"
+#: ../src/users/user-settings.c:521
+msgid "Can't revoke administration rights"
+msgstr "ä¸?è?½è¨»é?·ç³»çµ±ç®¡ç??è??æ¬?é??"
 
-#: ../src/users/user-settings.c:756
+#: ../src/users/user-settings.c:524
+#, c-format
 msgid ""
-"User passwords must be longer than 6 characters and preferably formed by "
-"numbers, letters and special characters."
-msgstr "使ç?¨è??å¯?碼é ?ç?º 6 å??å­?符以ä¸?ï¼?å??æ??好ç?±æ?¸å­?ã??å­?符å??ç?¹æ®?å­?符æ??çµ?æ??ã??"
-
-#: ../src/users/user-settings.c:759
-msgid "Password confirmation is not correct"
-msgstr "�碼確�並�正確"
-
-#: ../src/users/user-settings.c:760
-msgid "Check that you have provided the same password in both text fields."
-msgstr "è«?檢æ?¥ä½ æ?¯å?¦å?¨å?©å??æ??å­?æ¬?ä½?中æ??ä¾?ç?¸å??ç??å¯?碼ã??"
+"%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/users-table.c:44
-msgid "Name"
-msgstr "å??稱"
+#: ../src/users/user-settings.c:541
+msgid "You are about to revoke your own administration rights"
+msgstr "ä½ å?³å°?註é?·è?ªå·±ç??系統管ç??è??æ¬?é??"
 
-#: ../src/users/users-table.c:67
-msgid "Login name"
-msgstr "ç?»å?¥å??稱"
+#: ../src/users/user-settings.c:544
+#, 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/users-table.c:77
-msgid "Home directory"
-msgstr "å??人ç?®é??"
+#: ../src/users/user-settings.c:549
+msgid "Give up administration rights"
+msgstr "æ?¾æ£?系統管ç??è??æ¬?é??"
 
-#: ../src/users/users-tool.c:216
+#: ../src/users/users-tool.c:278
 msgid "Users Settings"
 msgstr "使ç?¨è??設å®?å?¼"
 
+#~ msgid "<span weight=\"bold\">Password</span>"
+#~ msgstr "<span weight=\"bold\">�碼</span>"
+
+#~ msgid ""
+#~ "Allow this user to open a local session without entering his password. "
+#~ "The password will still be required to perform administrative tasks."
+#~ msgstr ""
+#~ "å??許é??å??使ç?¨è??ä¸?é??輸å?¥å¯?碼就è?½é??å??æ?¬å?°ç«¯ä½?業é??段ã??å¦?æ??è¦?é?²è¡?系統管ç??å·¥ä½?æ??"
+#~ "ä»?é??å¯?碼ã??"
+
+#~ msgid "Check password _quality"
+#~ msgstr "檢æ?¥å¯?碼å??質(_Q)"
+
+#~ msgid "User _password:"
+#~ msgstr "使ç?¨è??å¯?碼(_P):"
+
+#~ msgid "User must log out before you can change his ID."
+#~ msgstr "å?¨æ?¨æ?¹è®?使ç?¨è??ç?? ID å??ä»?å¿?é ?å??ç?»å?ºã??"
+
+#~ msgid "_Add Group"
+#~ msgstr "å? å?¥ç¾¤çµ?(_A)"
+
+#~ msgid "_Add User"
+#~ msgstr "æ?°å¢?使ç?¨è??(_A)"
+
+#~ msgid "_Profile:"
+#~ msgstr "設å®?çµ?å??(_P):"
+
+#~ msgid "_Real name:"
+#~ msgstr "ç??實å§?å??(_R):"
+
+#~ msgid "Are you sure you want to delete account \"%s\"?"
+#~ msgstr "æ?¨æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å¸³è??â??%sâ??ï¼?"
+
+#~ msgid ""
+#~ "This will disable this user's access to the system without deleting the "
+#~ "user's home directory."
+#~ msgstr "é??æ??å??止該使ç?¨è??å­?å??系統ï¼?ä½?ä»?ç??家ç?®é??ä¸?æ??被å?ªé?¤ã??"
+
+#~ msgid "Account '%s' Properties"
+#~ msgstr "帳è??â??%sâ??屬æ?§"
+
+#~ msgid "User name is empty"
+#~ msgstr "使ç?¨è??å??稱æ?¯ç©ºç??"
+
+#~ msgid "A user name must be specified."
+#~ msgstr "å¿?é ?æ??å®?使ç?¨è??å??稱ã??"
+
+#~ msgid "User name has invalid characters"
+#~ msgstr "使ç?¨è??å??稱å?«æ??ç?¡æ??ç??å­?"
+
+#~ msgid ""
+#~ "Please set a valid user name consisting of a lower case letter followed "
+#~ "by lower case letters and numbers."
+#~ msgstr ""
+#~ "è«?設å®?æ??æ??ç??使ç?¨è??å??稱ï¼?第ä¸?å??å­?å??å?ªå?¯ä»¥æ?¯å°?寫å­?æ¯?ï¼?å?¶å®?ç??å¿?é ?æ?¯å°?寫å­?æ¯?æ??"
+#~ "æ?¸å­?ã??"
+
+#~ msgid "User name \"%s\" already exists"
+#~ msgstr "該使ç?¨è??å??稱â??%sâ??å·²ç¶?å­?å?¨"
+
+#~ msgid "Please enter a different home directory path."
+#~ msgstr "è«?é?¸æ??ä¸?å??ç??家ç?®é??è·¯å¾?ã??"
+
+#~ msgid "Administrator account's user ID should not be modified"
+#~ msgstr "ä¸?æ??ä¿®æ?¹ç®¡ç??å?¡å¸³è??ç??使ç?¨è?? ID"
+
+#~ msgid "Name"
+#~ msgstr "å??稱"
+
+#~ msgid "Login name"
+#~ msgstr "ç?»å?¥å??稱"
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Please enter your root password</"
 #~ "span>"
 #~ msgstr "<span weight=\"bold\" size=\"larger\">�輸� root �碼</span>"
 
-#~ msgid "Enter Password"
-#~ msgstr "輸��碼"
-
 #~ msgid ""
 #~ "You need administrator privileges to use this tool. Enter a password to "
 #~ "modify\n"
 #~ "your system configuration."
 #~ msgstr "æ?¨é??è¦?æ??系統管ç??å?¡ç??æ¬?é??ä¾?使ç?¨æ­¤å·¥å?·ã??輸å?¥å¯?碼以修æ?¹æ?¨ç??系統çµ?æ??ã??"
-
-#~ msgid "_Password:"
-#~ msgstr "�碼(_P):"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0472491..8d0cc27 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-system-tools 2.27.92\n"
+"Project-Id-Version: gnome-system-tools 2.29.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-19 20:43+0800\n"
-"PO-Revision-Date: 2009-09-15 20:55+0800\n"
+"POT-Creation-Date: 2010-02-04 20:40+0800\n"
+"PO-Revision-Date: 2010-02-04 13:22+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,16 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../gnome-system-tools.schemas.in.h:1
-msgid "Whether the users-admin tool should show all users and groups or not"
+#, fuzzy
+#| msgid "Whether the users-admin tool should show all users and groups or not"
+msgid "Whether the users-admin tool should show system users in the users list"
+msgstr "ã??使ç?¨è??å??群çµ?ã??å·¥å?·æ??å?¦é¡¯ç¤ºæ??æ??帳è??å??群çµ?"
+
+#: ../gnome-system-tools.schemas.in.h:2
+#, fuzzy
+#| msgid "Whether the users-admin tool should show all users and groups or not"
+msgid ""
+"Whether the users-admin tool should show the root user in the users list"
 msgstr "ã??使ç?¨è??å??群çµ?ã??å·¥å?·æ??å?¦é¡¯ç¤ºæ??æ??帳è??å??群çµ?"
 
 #: ../interfaces/network.ui.h:1
@@ -100,7 +109,7 @@ msgstr "å??ç?¨é??å??é?£ç·?(_N)"
 msgid "Ethernet interface:"
 msgstr "�太網路��:"
 
-#: ../interfaces/network.ui.h:20 ../interfaces/users.ui.h:21
+#: ../interfaces/network.ui.h:20 ../interfaces/users.ui.h:32
 msgid "General"
 msgstr "��"
 
@@ -240,7 +249,7 @@ msgstr "設å®?æ?¸æ??æ©?ç?ºé ?設路ç?±(_S)"
 msgid "_Subnet mask:"
 msgstr "�網路�罩(_S):"
 
-#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:59
+#: ../interfaces/network.ui.h:55
 msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
@@ -334,7 +343,7 @@ msgid "Share through:"
 msgstr "�享��"
 
 #: ../interfaces/shares.ui.h:21 ../src/shares/shares.desktop.in.in.h:2
-#: ../src/shares/shares-tool.c:239
+#: ../src/shares/shares-tool.c:240
 msgid "Shared Folders"
 msgstr "å?±äº«ç??è³?æ??夾"
 
@@ -439,215 +448,307 @@ msgid "<span weight=\"bold\">Password Settings</span>"
 msgstr "<span weight=\"bold\">�碼設�</span>"
 
 #: ../interfaces/users.ui.h:7
-msgid "<span weight=\"bold\">Password</span>"
-msgstr "<span weight=\"bold\">�碼</span>"
-
-#: ../interfaces/users.ui.h:8
 msgid "<span weight=\"bold\">Profile Settings</span>"
 msgstr "<span weight=\"bold\">設���容</span>"
 
-#: ../interfaces/users.ui.h:9
+#: ../interfaces/users.ui.h:8
 msgid "<span weight=\"bold\">System Defaults</span>"
 msgstr "<span weight=\"bold\">系統é ?設å?¼</span>"
 
-#: ../interfaces/users.ui.h:10
-msgid "Account"
-msgstr "帳è??"
+#: ../interfaces/users.ui.h:9
+msgid "Account _type:"
+msgstr "帳è??é¡?å??(_T):"
 
-#: ../interfaces/users.ui.h:11
+#: ../interfaces/users.ui.h:10
 msgid "Advanced"
 msgstr "é?²é??"
 
-#: ../interfaces/users.ui.h:12
+#: ../interfaces/users.ui.h:11
 msgid ""
-"Allow this user to open a local session without entering his password. The "
-"password will still be required to perform administrative tasks."
-msgstr ""
-"å??許é??å??使ç?¨è??ä¸?é??輸å?¥å¯?碼就è?½é??å??æ?¬å?°ç«¯ä½?業é??段ã??å¦?æ??è¦?é?²è¡?系統管ç??å·¥ä½?æ??ä»?"
-"é??å¯?碼ã??"
+"An user with such a name already exists. Please choose a different short "
+"name for the new user."
+msgstr "å·²ç¶?æ??å??樣å??稱ç??使ç?¨è??å­?å?¨ã??è«?ç?ºæ?°ç??使ç?¨è??é?¸æ??ä¸?å??ç??ç?­å¼?å??稱ã??"
 
-#: ../interfaces/users.ui.h:13
+#: ../interfaces/users.ui.h:12
 msgid "Assign a random password by default"
 msgstr "é ?設å??é??é?¨æ©?ç??å¯?碼"
 
+#: ../interfaces/users.ui.h:13
+msgid "Change Advanced User Settings"
+msgstr "æ?¹è®?é?²é??ç??使ç?¨è??設å®?å?¼"
+
 #: ../interfaces/users.ui.h:14
-msgid "Check password _quality"
-msgstr "檢æ?¥å¯?碼å??質(_Q)"
+msgid "Change User Account Type"
+msgstr "æ?¹è®?使ç?¨è??帳è??é¡?å??"
 
 #: ../interfaces/users.ui.h:15
+#, fuzzy
+msgid "Change User Name and Login"
+msgstr "æ?¹è®?便ç?¨è??å??稱並ç?»å?¥"
+
+#: ../interfaces/users.ui.h:16
+msgid "Change User Password"
+msgstr "æ?¹è®?使ç?¨è??å¯?碼"
+
+#: ../interfaces/users.ui.h:17
+msgid "Changing advanced settings for:"
+msgstr "æ­£å?¨æ?¹è®?此人ç??é?²é??設å®?å?¼ï¼?"
+
+#: ../interfaces/users.ui.h:18
+msgid "Changing user account type for:"
+msgstr "æ?¹è®?使ç?¨è??帳è??é¡?å??ï¼?"
+
+#: ../interfaces/users.ui.h:19
+msgid "Changing user name for:"
+msgstr "æ­£å?¨æ?¹è®?使ç?¨è??å??稱ï¼?"
+
+#: ../interfaces/users.ui.h:20
+msgid "Changing user password for:"
+msgstr "æ­£å?¨æ?¹è®?使ç?¨è??å¯?碼ï¼?"
+
+#: ../interfaces/users.ui.h:21
 msgid "Con_firmation:"
 msgstr "確��碼(_F):"
 
-#: ../interfaces/users.ui.h:16
+#: ../interfaces/users.ui.h:22
 msgid "Contact Information"
 msgstr "�絡人��"
 
-#: ../interfaces/users.ui.h:17
+#: ../interfaces/users.ui.h:23
+msgid "Create New User"
+msgstr "建ç«?æ?°ç??使ç?¨è??"
+
+#: ../interfaces/users.ui.h:24
+msgid "Create a new user"
+msgstr "建ç«?ä¸?å??æ?°ç??使ç?¨è??"
+
+#: ../interfaces/users.ui.h:25
 msgid "Days between warning and password expiration:"
 msgstr "å¯?碼é??æ??å??ï¼?æ?¼æ??å®?æ?¥æ?¸ç?¼å?ºè­¦å??ï¼?"
 
-#: ../interfaces/users.ui.h:18
+#: ../interfaces/users.ui.h:26
 msgid "Default _group:"
 msgstr "é ?設群çµ?(_G):"
 
-#: ../interfaces/users.ui.h:19
+#: ../interfaces/users.ui.h:27
 msgid "Default _shell:"
 msgstr "é ?設 _Shellï¼?"
 
-#: ../interfaces/users.ui.h:20
+#: ../interfaces/users.ui.h:28
+msgid "Disable _account"
+msgstr "å??ç?¨å¸³è??(_A)"
+
+#: ../interfaces/users.ui.h:29
 msgid "Don't ask for password on _login"
 msgstr "ç?»å?¥æ??ä¸?è©¢å??å¯?碼(_L)"
 
-#: ../interfaces/users.ui.h:22
+#: ../interfaces/users.ui.h:30
+msgid ""
+"Encrypt all your files with your login password to strongly protect them "
+"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:"
+msgstr "å?¨å??(_N):"
+
+#: ../interfaces/users.ui.h:33
 msgid "Generate _random password"
 msgstr "ç?¢ç??é?¨æ©?å¯?碼(_R)"
 
-#: ../interfaces/users.ui.h:23
+#: ../interfaces/users.ui.h:34
 msgid "Group _ID:"
 msgstr "群� _ID�"
 
-#: ../interfaces/users.ui.h:24
+#: ../interfaces/users.ui.h:35
 msgid "Group _name:"
 msgstr "群çµ?å??稱(_N):"
 
-#: ../interfaces/users.ui.h:25
+#: ../interfaces/users.ui.h:36
 msgid "Group properties"
 msgstr "群�屬�"
 
-#: ../interfaces/users.ui.h:26
+#: ../interfaces/users.ui.h:37
 msgid "Groups settings"
 msgstr "群�設��"
 
-#: ../interfaces/users.ui.h:27
+#: ../interfaces/users.ui.h:38
 msgid "Ma_ximum days a password may be used:"
 msgstr "å¯?碼å?¯ä½¿ç?¨ç??æ?¥æ?¸ä¸?é??(_X):"
 
-#: ../interfaces/users.ui.h:28
+#: ../interfaces/users.ui.h:39 ../src/time/time-tool.c:521
+msgid "Manual"
+msgstr "æ??å??"
+
+#: ../interfaces/users.ui.h:40
 msgid "Maximum GID:"
 msgstr "GID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:29
+#: ../interfaces/users.ui.h:41
 msgid "Maximum UID:"
 msgstr "UID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:30
+#: ../interfaces/users.ui.h:42
 msgid "Mi_nimum days between password changes:"
 msgstr "å¯?碼使ç?¨äº?æ??å®?ç??æ?¥æ?¸å¾?æ?¹å?¯ä¿®æ?¹(_N):"
 
-#: ../interfaces/users.ui.h:31
+#: ../interfaces/users.ui.h:43
 msgid "Minimum GID:"
 msgstr "GID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:32
+#: ../interfaces/users.ui.h:44
 msgid "Minimum UID:"
 msgstr "UID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:33
+#: ../interfaces/users.ui.h:45
 msgid "Minimum days allowed between password changes:"
 msgstr "å¯?碼使ç?¨äº?æ??å®?ç??æ?¥æ?¸å¾?æ?¹å?¯ä¿®æ?¹ï¼?"
 
-#: ../interfaces/users.ui.h:34
+#: ../interfaces/users.ui.h:46
+msgid "New _password:"
+msgstr "æ?°ç??å¯?碼(_P):"
+
+#: ../interfaces/users.ui.h:47
 msgid "Number of days that a password may be used:"
 msgstr "å¯?碼å?¯ä½¿ç?¨ç??æ?¥æ?¸ï¼?"
 
-#: ../interfaces/users.ui.h:35
+#: ../interfaces/users.ui.h:48
 msgid "O_ffice location:"
 msgstr "���置(_F):"
 
-#: ../interfaces/users.ui.h:36
+#: ../interfaces/users.ui.h:49
 msgid "Password set to: "
 msgstr "�碼設���"
 
-#: ../interfaces/users.ui.h:37
+#: ../interfaces/users.ui.h:50
 msgid "Privileges"
 msgstr "æ¬?é??"
 
-#: ../interfaces/users.ui.h:38
+#: ../interfaces/users.ui.h:51
 msgid "Profile _name:"
 msgstr "設å®?çµ?å??å??稱(_N):"
 
-#: ../interfaces/users.ui.h:39
+#: ../interfaces/users.ui.h:52
 msgid "Set password b_y hand"
 msgstr "��設��碼(_Y)"
 
-#: ../interfaces/users.ui.h:40
+#. 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
+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 \"_\""
+msgstr ""
+"ç?­å¼?å??稱å¿?é ?ç?±é??äº?å­?çµ?æ??ï¼?\n"
+"  &#x27A3; å°?寫è?±æ??å­?æ¯?\n"
+"  &#x27A3; ��\n"
+"  &#x27A3; å?¶ä»?å­?å??å¦? \".\"ã?? \"-\" å?? \"_\""
+
+#: ../interfaces/users.ui.h:58
+msgid "Short name must start with a letter!"
+msgstr "ç?­å¼?å??稱å¿?é ?以è?±æ??å­?æ¯?é??é ­ï¼?"
+
+#: ../interfaces/users.ui.h:59
+msgid "This account is disabled."
+msgstr "é??å??帳è??å·²å??ç?¨ã??"
+
+#: ../interfaces/users.ui.h:60
+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
 msgid "User ID:"
 msgstr "使ç?¨è??IDï¼?"
 
-#: ../interfaces/users.ui.h:41
+#: ../interfaces/users.ui.h:62
 msgid "User Privileges"
 msgstr "使ç?¨è??æ¬?é??"
 
-#: ../interfaces/users.ui.h:42
-msgid "User _password:"
-msgstr "使ç?¨è??å¯?碼(_P):"
-
-#: ../interfaces/users.ui.h:43
-msgid "User must log out before you can change his ID."
-msgstr "å?¨æ?¨æ?¹è®?使ç?¨è??ç?? ID å??ä»?å¿?é ?å??ç?»å?ºã??"
-
-#: ../interfaces/users.ui.h:44
+#: ../interfaces/users.ui.h:63
 msgid "User profiles"
 msgstr "使ç?¨è??設å®?æª?"
 
-#: ../interfaces/users.ui.h:45
-msgid "_Add Group"
-msgstr "å? å?¥ç¾¤çµ?(_A)"
+#: ../interfaces/users.ui.h:64
+msgid "You can't change user ID while the user is logged in."
+msgstr "æ?¨ä¸?è?½å?¨ä½¿ç?¨è??è??æ?¼ç?»å?¥ç??æ??æ??æ?¹è®?使ç?¨è?? IDã??"
 
-#: ../interfaces/users.ui.h:46
+#: ../interfaces/users.ui.h:65
 msgid "_Add Profile"
 msgstr "��設��(_A)"
 
-#: ../interfaces/users.ui.h:47
-msgid "_Add User"
-msgstr "æ?°å¢?使ç?¨è??(_A)"
+#: ../interfaces/users.ui.h:66
+msgid "_Advanced Settings"
+msgstr "é?²é??設å®?(_A)"
 
-#: ../interfaces/users.ui.h:48
+#: ../interfaces/users.ui.h:67
 msgid "_Comments"
 msgstr "å??註(_C)"
 
-#: ../interfaces/users.ui.h:49
+#: ../interfaces/users.ui.h:68
+msgid "_Current password:"
+msgstr "ç?®å??ç??å¯?碼(_C):"
+
+#: ../interfaces/users.ui.h:69
+msgid "_Custom"
+msgstr "��(_C)"
+
+#: ../interfaces/users.ui.h:70
 msgid "_Days between warning and password expiration:"
 msgstr "å¯?碼é??æ??å??ï¼?æ?¼æ??å®?æ?¥æ?¸ç?¼å?ºè­¦å??(_D):"
 
-#: ../interfaces/users.ui.h:50 ../src/network/address-list.c:77
-#: ../src/network/hosts.c:33 ../src/shares/table.c:40 ../src/users/table.c:40
-msgid "_Delete"
-msgstr "��(_D)"
+#: ../interfaces/users.ui.h:71
+msgid "_Enable Account"
+msgstr "å??ç?¨å¸³è??(_E)"
 
-#: ../interfaces/users.ui.h:51
+#: ../interfaces/users.ui.h:72
+msgid "_Encrypt home folder to protect sensitive data"
+msgstr "å? å¯?家ç?®é??以ä¿?è­·æ??æ??è³?æ??(_E)"
+
+#: ../interfaces/users.ui.h:73
 msgid "_Generate"
 msgstr "ç?¢ç??(_G)"
 
-#: ../interfaces/users.ui.h:52
+#: ../interfaces/users.ui.h:74
 msgid "_Home directory:"
 msgstr "å??人ç?®é??(_H):"
 
-#: ../interfaces/users.ui.h:53
+#: ../interfaces/users.ui.h:75
 msgid "_Home phone:"
 msgstr "�家�話(_H):"
 
-#: ../interfaces/users.ui.h:54
+#: ../interfaces/users.ui.h:76
 msgid "_Main group:"
 msgstr "主�群�(_M):"
 
-#: ../interfaces/users.ui.h:55
+#: ../interfaces/users.ui.h:77
 msgid "_Manage Groups"
 msgstr "管ç??群çµ?(_M):"
 
-#: ../interfaces/users.ui.h:56
-msgid "_Profile:"
-msgstr "設å®?çµ?å??(_P):"
+#: ../interfaces/users.ui.h:78
+msgid "_Name:"
+msgstr "å??稱(_N):"
 
-#: ../interfaces/users.ui.h:57
-msgid "_Real name:"
-msgstr "ç??實å§?å??(_R):"
+#: ../interfaces/users.ui.h:79
+msgid "_Password:"
+msgstr "�碼(_P):"
 
-#: ../interfaces/users.ui.h:58
+#: ../interfaces/users.ui.h:80
 msgid "_Shell:"
 msgstr "_Shell:"
 
-#: ../interfaces/users.ui.h:60
+#: ../interfaces/users.ui.h:81
+msgid "_Short Name:"
+msgstr "ç?­å¼?å??稱(_S):"
+
+#: ../interfaces/users.ui.h:82
 msgid "_Work phone:"
 msgstr "工��話(_W):"
 
@@ -669,50 +770,64 @@ msgstr ""
 msgid "Unsupported platform"
 msgstr "ä¸?æ?¯æ?´ç??å¹³å?°"
 
-#: ../src/common/gst-tool.c:181
+#: ../src/common/gst-tool.c:190
 msgid "The configuration could not be loaded"
 msgstr "����設�"
 
 #. OPERATION_COMMIT
-#: ../src/common/gst-tool.c:183
+#: ../src/common/gst-tool.c:192
 msgid "The configuration could not be saved"
 msgstr "ç?¡æ³?å?²å­?çµ?æ??設å®?"
 
-#: ../src/common/gst-tool.c:187
+#: ../src/common/gst-tool.c:196
 msgid "You are not allowed to access the system configuration."
 msgstr "æ?¨ä¸?å??許å­?å??系統設å®?ã??"
 
 #. OPERATION_COMMIT
-#: ../src/common/gst-tool.c:189
+#: ../src/common/gst-tool.c:198 ../src/common/gst-tool.c:683
 msgid "You are not allowed to modify the system configuration."
 msgstr "æ?¨ä¸?被å??許修æ?¹ç³»çµ±çµ?æ??ã??"
 
-#: ../src/common/gst-tool.c:192
+#: ../src/common/gst-tool.c:201
 msgid "Invalid data was found."
 msgstr "æ?¾ä¸?å?°ç?¡æ??ç??è³?æ??ã??"
 
 #. OOBS_RESULT_ERROR
-#: ../src/common/gst-tool.c:194
+#: ../src/common/gst-tool.c:203
 msgid "An unknown error occurred."
 msgstr "ç?¼ç??ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../src/common/gst-tool.c:416
+#: ../src/common/gst-tool.c:428
 msgid "Could not display help"
 msgstr "ç?¡æ³?顯示說æ??æ??件"
 
-#: ../src/common/gst-tool.c:600
+#: ../src/common/gst-tool.c:622
 msgid "The system configuration has potentially changed."
 msgstr "系統çµ?æ??å?¯è?½è¢«æ?´æ?¹äº?ã??"
 
-#: ../src/common/gst-tool.c:602
+#: ../src/common/gst-tool.c:624
 msgid "Update content? This will lose any modification in course."
 msgstr "æ?¯å?¦è¦?æ?´æ?°å?§å®¹ï¼?é??樣æ??失å?»ä»»ä½?å?¨å??å??é??ç¨?中ç??ä¿®æ?¹ã??"
 
+#: ../src/common/gst-tool.c:685
+#, 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:38
+#: ../src/shares/table.c:38 ../src/users/table.c:40
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
+#: ../src/network/address-list.c:77 ../src/network/hosts.c:33
+#: ../src/shares/table.c:40 ../src/users/table.c:42
+msgid "_Delete"
+msgstr "��(_D)"
+
 #: ../src/network/address-list.c:486
 msgid "Type address"
 msgstr "輸å?¥å?°å??"
@@ -795,7 +910,7 @@ msgid "%s Properties"
 msgstr "%s 屬�"
 
 #: ../src/network/hosts.c:32 ../src/network/ifaces-list.c:33
-#: ../src/shares/table.c:39 ../src/users/table.c:39
+#: ../src/shares/table.c:39 ../src/users/table.c:41
 msgid "_Properties"
 msgstr "屬�(_P)"
 
@@ -938,17 +1053,17 @@ msgstr "網路"
 msgid "Network Settings"
 msgstr "網路設�"
 
-#: ../src/services/callbacks.c:59
+#: ../src/services/callbacks.c:65
 #, c-format
 msgid "Settings for service \"%s\""
 msgstr "æ??å??â??%sâ??ç??設å®?"
 
-#: ../src/services/callbacks.c:119
+#: ../src/services/callbacks.c:125
 #, c-format
 msgid "Are you sure you want to deactivate %s?"
 msgstr "æ?¨ç¢ºå®?è¦?å??ç?¨ %sï¼?"
 
-#: ../src/services/callbacks.c:123
+#: ../src/services/callbacks.c:129
 msgid ""
 "This may affect your system behavior in several ways, possibly leading to "
 "data loss."
@@ -1398,7 +1513,7 @@ msgstr "ç??æ??"
 msgid "Priority"
 msgstr "å?ªå??ç­?ç´?"
 
-#: ../src/services/services-tool.c:99
+#: ../src/services/services-tool.c:106
 msgid "Services Settings"
 msgstr "æ??å??設å®?å?¼"
 
@@ -1500,75 +1615,71 @@ msgid ""
 msgstr ""
 "è«?å?¨ç³»çµ±å®?è£?並å??ç?¨ NTP æ?¯æ?´ï¼?令æ?¨ç??æ?¬å?°æ??é??伺æ??å?¨è?½è??網路æ??é??伺æ??å?¨é?²è¡?å??æ­¥ã??"
 
-#: ../src/time/time-tool.c:429
+#: ../src/time/time-tool.c:428
 msgid "Enabling NTP"
 msgstr "å??ç?¨ NTP"
 
-#: ../src/time/time-tool.c:429
+#: ../src/time/time-tool.c:428
 msgid "Disabling NTP"
 msgstr "å??ç?¨ NTP"
 
-#: ../src/time/time-tool.c:441
+#: ../src/time/time-tool.c:440
 msgid "Synchronizing system clock"
 msgstr "系統æ??é??å??æ­¥"
 
-#: ../src/time/time-tool.c:521
+#: ../src/time/time-tool.c:520
 msgid "Keep synchronized with Internet servers"
 msgstr "è??網路伺æ??å?¨ä¿?æ??å??æ­¥"
 
-#: ../src/time/time-tool.c:522
-msgid "Manual"
-msgstr "æ??å??"
-
-#: ../src/time/time-tool.c:668
+#: ../src/time/time-tool.c:667
 msgid "Time and Date Settings"
 msgstr "æ??é??å??æ?¥æ??設å®?"
 
-#: ../src/users/group-settings.c:52
+#: ../src/users/group-settings.c:55
 msgid "Administrator group can not be deleted"
 msgstr "管ç??å?¡ç¾¤çµ?ç?¡æ³?被å?ªé?¤"
 
-#: ../src/users/group-settings.c:55 ../src/users/group-settings.c:295
-#: ../src/users/group-settings.c:319 ../src/users/user-settings.c:61
-#: ../src/users/user-settings.c:702
+#: ../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
 msgid "This would leave the system unusable."
 msgstr "é??樣æ??è®?系統å??ç??å?¨ç?¡æ³?使ç?¨ç??ç??æ??ã??"
 
-#: ../src/users/group-settings.c:68
+#: ../src/users/group-settings.c:71
 #, c-format
 msgid "Are you sure you want to delete group \"%s\"?"
 msgstr "æ?¯å?¦ç¢ºå®?å?ªé?¤ç¾¤çµ?â??%sâ??ï¼?"
 
-#: ../src/users/group-settings.c:71
+#: ../src/users/group-settings.c:74
 msgid "This may leave files with invalid group ID in the filesystem."
 msgstr "é??樣å?¯è?½æ??å?¨æª?æ¡?系統中ç??ä¸?å?·æ??ç?¡æ??ç??群çµ? ID ç??æª?æ¡?ã??"
 
-#: ../src/users/group-settings.c:167
+#: ../src/users/group-settings.c:151
 msgid "New group"
 msgstr "建��群�"
 
-#: ../src/users/group-settings.c:175
+#: ../src/users/group-settings.c:158
 #, c-format
 msgid "Group '%s' Properties"
 msgstr "群çµ?â??%sâ??屬æ?§"
 
-#: ../src/users/group-settings.c:291
+#: ../src/users/group-settings.c:224
 msgid "Group name is empty"
 msgstr "群çµ?å??稱æ?¯ç©ºç??"
 
-#: ../src/users/group-settings.c:292
+#: ../src/users/group-settings.c:225
 msgid "A group name must be specified."
 msgstr "å¿?é ?æ??å®?群çµ?å??稱ã??"
 
-#: ../src/users/group-settings.c:294
+#: ../src/users/group-settings.c:227
 msgid "Group name of the administrator group user should not be modified"
 msgstr "ä¸?æ??ä¿®æ?¹å±¬æ?¼ç®¡ç??å?¡ç¾¤çµ?使ç?¨è??ç??群çµ?å??稱"
 
-#: ../src/users/group-settings.c:297
+#: ../src/users/group-settings.c:230
 msgid "Group name has invalid characters"
 msgstr "群çµ?å??稱å?«æ??ä¸?正確ç??å­?å??"
 
-#: ../src/users/group-settings.c:298
+#: ../src/users/group-settings.c:231
 msgid ""
 "Please set a valid group name consisting of a lower case letter followed by "
 "lower case letters and numbers."
@@ -1576,87 +1687,182 @@ msgstr ""
 "è«?設å®?æ??æ??ç??群çµ?å??稱ï¼?第ä¸?å??å­?å??å?ªå?¯ä»¥æ?¯å°?寫å­?æ¯?ï¼?å?¶å®?ç??å¿?é ?æ?¯å°?寫å­?æ¯?æ??æ?¸"
 "å­?ã??"
 
-#: ../src/users/group-settings.c:302 ../src/users/user-settings.c:635
+#: ../src/users/group-settings.c:236
 #, c-format
 msgid "Group \"%s\" already exists"
 msgstr "群çµ?â??%sâ??å·²ç¶?å­?å?¨"
 
-#: ../src/users/group-settings.c:303
+#: ../src/users/group-settings.c:237
 msgid "Please choose a different group name."
 msgstr "è«?使ç?¨å?¦å¤?ä¸?å??群çµ?å??稱ã??"
 
-#: ../src/users/group-settings.c:318
+#: ../src/users/group-settings.c:264
 msgid "Group ID of the Administrator account should not be modified"
 msgstr "ä¸?æ??ä¿®æ?¹ç®¡ç??å?¡å¸³è??æ??屬ç??群çµ? ID"
 
-#: ../src/users/groups-table.c:45
+#. check that GID is free
+#: ../src/users/group-settings.c:268
+#, c-format
+msgid "Group ID %d is already used by group \"%s\""
+msgstr "群çµ? ID %d 已被群çµ?ã??%sã??æ??使ç?¨"
+
+#: ../src/users/group-settings.c:271
+msgid "Please choose a different numeric identifier for the new group."
+msgstr "è«?ç?ºé??å??æ?°ç¾¤çµ?é?¸æ??ä¸?å??ç??æ?¸å­?è­?å?¥ç¢¼ã??"
+
+#: ../src/users/group-settings.c:273
+#, c-format
+msgid "Please choose a different numeric identifier for group \"%s\"."
+msgstr "è«?ç?ºç¾¤çµ?ã??%sã??é?¸æ??ä¸?å??ç??æ?¸å­?è­?å?¥ç¢¼ã??"
+
+#: ../src/users/groups-table.c:44
 msgid "Group name"
 msgstr "群çµ?å??稱"
 
-#: ../src/users/privileges-table.c:49
+#: ../src/users/privileges-table.c:53
 msgid "Monitor system logs"
 msgstr "��系統��"
 
-#: ../src/users/privileges-table.c:50
+#: ../src/users/privileges-table.c:54
 msgid "Administer the system"
 msgstr "管ç??此系統"
 
-#: ../src/users/privileges-table.c:51
+#: ../src/users/privileges-table.c:55
 msgid "Use audio devices"
 msgstr "使ç?¨é?³æ??è£?ç½®"
 
-#: ../src/users/privileges-table.c:52
+#: ../src/users/privileges-table.c:56
 msgid "Use CD-ROM drives"
 msgstr "使ç?¨å??ç¢?æ©?"
 
-#: ../src/users/privileges-table.c:53
+#: ../src/users/privileges-table.c:57
 msgid "Burn CDs / DVDs"
 msgstr "ç??é?? CD / DVD"
 
-#: ../src/users/privileges-table.c:54
+#: ../src/users/privileges-table.c:58
 msgid "Use modems"
 msgstr "使ç?¨æ?¸æ??æ©?"
 
-#: ../src/users/privileges-table.c:55
+#: ../src/users/privileges-table.c:59
 msgid "Connect to Internet using a modem"
 msgstr "ç¶?ç?±æ?¸æ??æ©?é?£ç·?å?°ç¶²é??網路"
 
-#: ../src/users/privileges-table.c:56
+#: ../src/users/privileges-table.c:60
 msgid "Send and receive faxes"
 msgstr "å?³é??è??æ?¥æ?¶å?³ç??"
 
-#: ../src/users/privileges-table.c:57
+#: ../src/users/privileges-table.c:61
 msgid "Use floppy drives"
 msgstr "使����"
 
-#: ../src/users/privileges-table.c:58
+#: ../src/users/privileges-table.c:62
+#, fuzzy
+msgid "Mount user-space filesystems (FUSE)"
+msgstr "æ??è¼?使ç?¨è??層ç´?æª?æ¡?系統 (FUSE)"
+
+#: ../src/users/privileges-table.c:63
+msgid "Configure printers"
+msgstr "設��表�"
+
+#: ../src/users/privileges-table.c:64
+msgid "Connect to wireless and ethernet networks"
+msgstr "é?£ç·?å?°ç?¡ç·?å??ä¹?太網路"
+
+#: ../src/users/privileges-table.c:65
 msgid "Access external storage devices automatically"
 msgstr "è?ªå??å­?å??å¤?é?¨ç??å?²å­?è£?ç½®"
 
-#: ../src/users/privileges-table.c:59
+#: ../src/users/privileges-table.c:66
+msgid "Suspend and hibernate the computer"
+msgstr "å°?é?»è?¦æ?«å??è??ä¼?ç? "
+
+#: ../src/users/privileges-table.c:67
 msgid "Access /proc filesystem"
 msgstr "å­?å?? /proc æª?æ¡?系統"
 
-#: ../src/users/privileges-table.c:60
+#: ../src/users/privileges-table.c:68
 msgid "Use scanners"
 msgstr "使ç?¨æ??æ??å?¨"
 
-#: ../src/users/privileges-table.c:61
+#: ../src/users/privileges-table.c:69
 msgid "Use tape drives"
 msgstr "使��帶�"
 
-#: ../src/users/privileges-table.c:62
+#: ../src/users/privileges-table.c:70
 msgid "Use USB devices"
 msgstr "使� USB �置"
 
-#: ../src/users/privileges-table.c:63
+#: ../src/users/privileges-table.c:71
+msgid "Use VirtualBox virtualization solution"
+msgstr "使ç?¨ VirtualBox è??æ?¬å??解決æ?¹æ¡?"
+
+#: ../src/users/privileges-table.c:72
 msgid "Use video devices"
 msgstr "使����置"
 
-#: ../src/users/privileges-table.c:64
+#: ../src/users/privileges-table.c:73
 msgid "Be able to get administrator privileges"
 msgstr "å?¯ä»¥å¾?å?°ç®¡ç??è??æ¬?é??"
 
+#: ../src/users/user-profiles.conf.in.h:1
+msgid "Administrator"
+msgstr "系統管ç??è??"
+
+#: ../src/users/user-profiles.conf.in.h:2
+msgid ""
+"Can change anything on the system, including installing and upgrading "
+"software."
+msgstr "å?¯ä»¥æ?¹è®?系統中ç??ä»»ä½?äº?ï¼?å??æ?¬å®?è£?å??å??ç´?è»?é«?ã??"
+
+#: ../src/users/user-profiles.conf.in.h:3
+msgid ""
+"Can perform common tasks. Can't install software or change settings "
+"affecting all users."
+msgstr "å?¯ä»¥é?²è¡?ä¸?è?¬å·¥ä½?ã??ä¸?è?½å®?è£?è»?é«?æ??æ?¹è®?æ??å½±é?¿æ??æ??使ç?¨è??ç??設å®?å?¼ã??"
+
+#: ../src/users/user-profiles.conf.in.h:4
+msgid "Desktop user"
+msgstr "æ¡?é?¢ä½¿ç?¨è??"
+
+#: ../src/users/run-passwd.c:421
+msgid "Authentication failed"
+msgstr "é©?è­?失æ??"
+
+#: ../src/users/run-passwd.c:494
+#, c-format
+msgid "The new password is too short"
+msgstr "æ?°ç??å¯?碼太ç?­"
+
+#: ../src/users/run-passwd.c:499
+#, c-format
+msgid "The new password is too simple"
+msgstr "æ?°ç??å¯?碼太簡å?®"
+
+#: ../src/users/run-passwd.c:503
+#, c-format
+msgid "The old and new passwords are too similar"
+msgstr "è??å¯?碼è??æ?°å¯?碼太ç?¸ä¼¼äº?"
+
+#: ../src/users/run-passwd.c:506
+#, c-format
+msgid "The new password must contain numeric or special characters"
+msgstr "æ?°ç??å¯?碼å¿?é ?å??å?«æ?¸å­?æ??ç?¹æ®?å­?å??"
+
+#: ../src/users/run-passwd.c:510
+#, c-format
+msgid "The old and new passwords are the same"
+msgstr "è??å¯?碼è??æ?°å¯?碼æ?¯ç?¸å??ç??"
+
+#: ../src/users/run-passwd.c:514
+#, c-format
+msgid "Your password has been changed since you initially authenticated!"
+msgstr ""
+
+#: ../src/users/run-passwd.c:518
+#, c-format
+msgid "Unknown error"
+msgstr "ä¸?æ??ç??é?¯èª¤"
+
 #: ../src/users/users.desktop.in.in.h:1
 msgid "Add or remove users and groups"
 msgstr "å? å?¥æ??移é?¤ä½¿ç?¨è??å??群çµ?"
@@ -1665,77 +1871,124 @@ msgstr "å? å?¥æ??移é?¤ä½¿ç?¨è??å??群çµ?"
 msgid "Users and Groups"
 msgstr "使ç?¨è??å??群çµ?"
 
-#: ../src/users/user-settings.c:58
+#: ../src/users/user-password.c:99
+msgid "Password is too short"
+msgstr "�碼太�"
+
+#: ../src/users/user-password.c:100
+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
+msgid "Password confirmation is not correct"
+msgstr "�碼確�並�正確"
+
+#: ../src/users/user-password.c:104
+msgid "Check that you have provided the same password in both text fields."
+msgstr "è«?檢æ?¥æ?¨æ?¯å?¦å?¨å?©å??æ??å­?æ¬?ä½?中æ??ä¾?ç?¸å??ç??å¯?碼ã??"
+
+#: ../src/users/user-password.c:419
+msgid "Please choose another password."
+msgstr "è«?é?¸æ??å?¶ä»?å¯?碼ã??"
+
+#: ../src/users/user-password.c:430
+msgid "Please type again your current password."
+msgstr "è«?å??次輸å?¥æ?¨ç?®å??ç??å¯?碼ã??"
+
+#: ../src/users/user-password.c:437
+msgid "Password could not be changed"
+msgstr "�碼����"
+
+#: ../src/users/user-settings.c:74
 msgid "Administrator account cannot be deleted"
 msgstr "管ç??å?¡å¸³è??ç?¡æ³?被å?ªé?¤"
 
-#: ../src/users/user-settings.c:72
+#: ../src/users/user-settings.c:85
 #, c-format
-msgid "Are you sure you want to delete account \"%s\"?"
-msgstr "æ?¨æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å¸³è??â??%sâ??ï¼?"
+msgid "%s is currently using this computer"
+msgstr "%s ç?®å??æ­£å?¨ä½¿ç?¨é??é?¨é?»è?¦"
 
-#: ../src/users/user-settings.c:75
-msgid ""
-"This will disable this user's access to the system without deleting the "
-"user's home directory."
-msgstr "é??æ??å??止該使ç?¨è??å­?å??系統ï¼?ä½?ä»?ç??家ç?®é??ä¸?æ??被å?ªé?¤ã??"
+#: ../src/users/user-settings.c:88
+msgid "Please ensure the user has logged out before deleting this account."
+msgstr "å?¨å?ªé?¤é??å??帳è??ä¹?å??è«?確å®?該使ç?¨è??å·²ç¶?ç?»å?ºã??"
 
-#: ../src/users/user-settings.c:85
-msgid "This user is currently using this computer"
-msgstr "該使ç?¨è??ç?®å??æ­£å?¨ä½¿ç?¨é??é?¨é?»è?¦"
+#: ../src/users/user-settings.c:98
+msgid "Can't delete the only administrator account"
+msgstr "ä¸?è?½å?ªé?¤å?¯ä¸?ç??系統管ç??è??帳è??"
 
-#: ../src/users/user-settings.c:439
-msgid "New user account"
-msgstr "æ?°ä½¿ç?¨è??帳è??"
+#: ../src/users/user-settings.c:100
+#, 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:460
+#: ../src/users/user-settings.c:110
 #, c-format
-msgid "Account '%s' Properties"
-msgstr "帳è??â??%sâ??屬æ?§"
+msgid "Remove home folder for %s?"
+msgstr "æ?¯å?¦ç§»é?¤ %s ç??家ç?®é??ï¼?"
 
-#: ../src/users/user-settings.c:621
-msgid "User name is empty"
-msgstr "使ç?¨è??å??稱æ?¯ç©ºç??"
+#: ../src/users/user-settings.c:113
+#, 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."
+msgstr ""
+"å¦?æ??å·²ç?¡é??è¦?ï¼?æ?¨å?¯ä»¥å®?å?¨ç§»é?¤ä½¿ç?¨è?? %s å?¨ <tt>%s</tt> 中æ??æ??æ??ç??æª?æ¡?ã??æ?¨å?¯è?½æ??"
+"æ?³å?¨å?ªé?¤é??å??帳è??å??å??æ??å®?å??å??份ï¼?æ??æ?¯ä¿?ç??å®?å??以便系統管ç??è??è?½å?¨ç¨?å¾?ä¿?å­?å®?å??ã??"
 
-#: ../src/users/user-settings.c:622
-msgid "A user name must be specified."
-msgstr "å¿?é ?æ??å®?使ç?¨è??å??稱ã??"
+#: ../src/users/user-settings.c:121
+msgid "Keep Files"
+msgstr "ä¿?ç??æª?æ¡?"
 
-#: ../src/users/user-settings.c:624
-msgid "User name has invalid characters"
-msgstr "使ç?¨è??å??稱å?«æ??ç?¡æ??ç??å­?"
+#: ../src/users/user-settings.c:122
+msgid "Don't Remove Account"
+msgstr "ä¸?移é?¤å¸³è??"
 
-#: ../src/users/user-settings.c:625
-msgid ""
-"Please set a valid user name consisting of a lower case letter followed by "
-"lower case letters and numbers."
-msgstr ""
-"è«?設å®?æ??æ??ç??使ç?¨è??å??稱ï¼?第ä¸?å??å­?å??å?ªå?¯ä»¥æ?¯å°?寫å­?æ¯?ï¼?å?¶å®?ç??å¿?é ?æ?¯å°?寫å­?æ¯?æ??æ?¸"
-"å­?ã??"
+#: ../src/users/user-settings.c:123
+msgid "Delete Files"
+msgstr "����"
 
-#: ../src/users/user-settings.c:629
-#, c-format
-msgid "User name \"%s\" already exists"
-msgstr "該使ç?¨è??å??稱â??%sâ??å·²ç¶?å­?å?¨"
+#: ../src/users/user-settings.c:319
+msgid "Superuser"
+msgstr "è¶?ç´?使ç?¨è??"
 
-#: ../src/users/user-settings.c:630 ../src/users/user-settings.c:636
-msgid "Please choose a different user name."
-msgstr "è«?é?¸æ??ä¸?å??ç??使ç?¨è??å??稱ã??"
+#: ../src/users/user-settings.c:324
+msgid "Custom"
+msgstr "��"
 
-#: ../src/users/user-settings.c:661
+#. TRANSLATORS: This applies to a password.
+#: ../src/users/user-settings.c:333
+msgid "None"
+msgstr "æ²?æ??"
+
+#. TRANSLATORS:  This applies to a password. Keep the string short.
+#: ../src/users/user-settings.c:336
+msgid "Not asked on login"
+msgstr "ä¸?å?¨ç?»å?¥æ??è©¢å??"
+
+#: ../src/users/user-settings.c:338
+msgid "Asked on login"
+msgstr "ç?»å?¥æ??è©¢å??"
+
+#: ../src/users/user-settings.c:380
 #, c-format
 msgid "Invalid character \"%c\" in comment"
 msgstr "å??註中å?ºç?¾ç?¡æ??ç??å­?å??â??%câ??"
 
-#: ../src/users/user-settings.c:662
+#: ../src/users/user-settings.c:381
 msgid "Check that this character is not used."
 msgstr "è«?檢æ?¥æ??ç?¡ä½¿ç?¨æ­¤ä¸?正確ç??å­?å??ã??"
 
-#: ../src/users/user-settings.c:680
+#: ../src/users/user-settings.c:404
 msgid "Incomplete path in home directory"
 msgstr "å??人ç?®é??å?«æ??ä¸?å®?æ?´ç??è·¯å¾?"
 
-#: ../src/users/user-settings.c:681
+#: ../src/users/user-settings.c:405
 msgid ""
 "Please enter full path for home directory\n"
 "<span size=\"smaller\">i.e.: /home/john</span>."
@@ -1743,35 +1996,43 @@ msgstr ""
 "è«?輸å?¥å®¶ç?®é??ç??å®?æ?´è·¯å¾?\n"
 "<span size=\"smaller\">ä¾?å¦?ï¼?/home/john</span>ã??"
 
-#: ../src/users/user-settings.c:684
+#: ../src/users/user-settings.c:420
 msgid "Home directory already exists"
 msgstr "家ç?®é??å·²ç¶?å­?å?¨"
 
-#: ../src/users/user-settings.c:685
-msgid "Please enter a different home directory path."
-msgstr "è«?é?¸æ??ä¸?å??ç??家ç?®é??è·¯å¾?ã??"
+#: ../src/users/user-settings.c:421
+#, c-format
+msgid ""
+"The directory <tt>%s</tt> already exists. User may not have the permissions "
+"required to read or write in that directory. Do you want to use it anyway?"
+msgstr ""
+"ç?®é?? <tt>%s</tt> å·²å­?å?¨ã??使ç?¨è??å?¯è?½æ??æ²?æ??è®?寫該ç?®é??å¿?é ?ç??æ¬?é??ã??æ?¨ä»?ç?¶è¦?使ç?¨å®?"
+"å??ï¼?"
 
-#: ../src/users/user-settings.c:701
-msgid "Administrator account's user ID should not be modified"
-msgstr "ä¸?æ??ä¿®æ?¹ç®¡ç??å?¡å¸³è??ç??使ç?¨è?? ID"
+#: ../src/users/user-settings.c:427
+msgid "Use this directory"
+msgstr "使ç?¨é??å??ç?®é??"
 
-#: ../src/users/user-settings.c:706
-#, fuzzy, c-format
-#| msgid "User name \"%s\" already exists"
-msgid "User ID %d is already used"
-msgstr "該使ç?¨è??å??稱â??%sâ??å·²ç¶?å­?å?¨"
+#: ../src/users/user-settings.c:462
+msgid "ID for the root user should not be modified"
+msgstr "ä¸?æ??ä¿®æ?¹ root 使ç?¨è??ç?? ID"
 
-#: ../src/users/user-settings.c:707
-#, fuzzy
-#| msgid "Please choose a different user name."
-msgid "Please choose a different numeric identifier for the new user."
-msgstr "è«?é?¸æ??ä¸?å??ç??使ç?¨è??å??稱ã??"
+#. check that UID is free
+#: ../src/users/user-settings.c:466
+#, c-format
+msgid "User ID %d is already used by user %s"
+msgstr "使ç?¨è?? ID %d å·²ç¶?被使ç?¨è?? %s æ??ç?¨"
 
-#: ../src/users/user-settings.c:721
+#: ../src/users/user-settings.c:468
+#, c-format
+msgid "Please choose a different numeric identifier for %s."
+msgstr "è«?ç?º %s é?¸æ??ä¸?å??ç??æ?¸å­?è­?å?¥ç¢¼ã??"
+
+#: ../src/users/user-settings.c:486
 msgid "Incomplete path in shell"
 msgstr "shell å?«æ??ä¸?å®?æ?´ç??è·¯å¾?"
 
-#: ../src/users/user-settings.c:722
+#: ../src/users/user-settings.c:487
 msgid ""
 "Please enter full path for shell\n"
 "<span size=\"smaller\">i.e.: /bin/bash</span>."
@@ -1779,53 +2040,119 @@ msgstr ""
 "è«?輸å?¥ shell ç??å®?æ?´è·¯å¾?\n"
 "<span size=\"smaller\">ä¾?å¦?ï¼?/bin/bash</span>ã??"
 
-#: ../src/users/user-settings.c:755
-msgid "Password is too short"
-msgstr "�碼太�"
+#: ../src/users/user-settings.c:521
+msgid "Can't revoke administration rights"
+msgstr "ä¸?è?½è¨»é?·ç³»çµ±ç®¡ç??è??æ¬?é??"
 
-#: ../src/users/user-settings.c:756
+#: ../src/users/user-settings.c:524
+#, c-format
 msgid ""
-"User passwords must be longer than 6 characters and preferably formed by "
-"numbers, letters and special characters."
-msgstr "使ç?¨è??å¯?碼é ?ç?º 6 å??å­?å??以ä¸?ï¼?å??æ??好ç?±æ?¸å­?ã??å­?å??å??ç?¹æ®?å­?å??æ??çµ?æ??ã??"
-
-#: ../src/users/user-settings.c:759
-msgid "Password confirmation is not correct"
-msgstr "�碼確�並�正確"
-
-#: ../src/users/user-settings.c:760
-msgid "Check that you have provided the same password in both text fields."
-msgstr "è«?檢æ?¥æ?¨æ?¯å?¦å?¨å?©å??æ??å­?æ¬?ä½?中æ??ä¾?ç?¸å??ç??å¯?碼ã??"
+"%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/users-table.c:44
-msgid "Name"
-msgstr "å??稱"
+#: ../src/users/user-settings.c:541
+msgid "You are about to revoke your own administration rights"
+msgstr "æ?¨å?³å°?註é?·è?ªå·±ç??系統管ç??è??æ¬?é??"
 
-#: ../src/users/users-table.c:67
-msgid "Login name"
-msgstr "ç?»å?¥å??稱"
+#: ../src/users/user-settings.c:544
+#, 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/users-table.c:77
-msgid "Home directory"
-msgstr "å??人ç?®é??"
+#: ../src/users/user-settings.c:549
+msgid "Give up administration rights"
+msgstr "æ?¾æ£?系統管ç??è??æ¬?é??"
 
-#: ../src/users/users-tool.c:216
+#: ../src/users/users-tool.c:278
 msgid "Users Settings"
 msgstr "使ç?¨è??設å®?å?¼"
 
+#~ msgid "<span weight=\"bold\">Password</span>"
+#~ msgstr "<span weight=\"bold\">�碼</span>"
+
+#~ msgid ""
+#~ "Allow this user to open a local session without entering his password. "
+#~ "The password will still be required to perform administrative tasks."
+#~ msgstr ""
+#~ "å??許é??å??使ç?¨è??ä¸?é??輸å?¥å¯?碼就è?½é??å??æ?¬å?°ç«¯ä½?業é??段ã??å¦?æ??è¦?é?²è¡?系統管ç??å·¥ä½?æ??"
+#~ "ä»?é??å¯?碼ã??"
+
+#~ msgid "Check password _quality"
+#~ msgstr "檢æ?¥å¯?碼å??質(_Q)"
+
+#~ msgid "User _password:"
+#~ msgstr "使ç?¨è??å¯?碼(_P):"
+
+#~ msgid "User must log out before you can change his ID."
+#~ msgstr "å?¨æ?¨æ?¹è®?使ç?¨è??ç?? ID å??ä»?å¿?é ?å??ç?»å?ºã??"
+
+#~ msgid "_Add Group"
+#~ msgstr "å? å?¥ç¾¤çµ?(_A)"
+
+#~ msgid "_Add User"
+#~ msgstr "æ?°å¢?使ç?¨è??(_A)"
+
+#~ msgid "_Profile:"
+#~ msgstr "設å®?çµ?å??(_P):"
+
+#~ msgid "_Real name:"
+#~ msgstr "ç??實å§?å??(_R):"
+
+#~ msgid "Are you sure you want to delete account \"%s\"?"
+#~ msgstr "æ?¨æ?¯å?¦ç¢ºå®?è¦?å?ªé?¤å¸³è??â??%sâ??ï¼?"
+
+#~ msgid ""
+#~ "This will disable this user's access to the system without deleting the "
+#~ "user's home directory."
+#~ msgstr "é??æ??å??止該使ç?¨è??å­?å??系統ï¼?ä½?ä»?ç??家ç?®é??ä¸?æ??被å?ªé?¤ã??"
+
+#~ msgid "Account '%s' Properties"
+#~ msgstr "帳è??â??%sâ??屬æ?§"
+
+#~ msgid "User name is empty"
+#~ msgstr "使ç?¨è??å??稱æ?¯ç©ºç??"
+
+#~ msgid "A user name must be specified."
+#~ msgstr "å¿?é ?æ??å®?使ç?¨è??å??稱ã??"
+
+#~ msgid "User name has invalid characters"
+#~ msgstr "使ç?¨è??å??稱å?«æ??ç?¡æ??ç??å­?"
+
+#~ msgid ""
+#~ "Please set a valid user name consisting of a lower case letter followed "
+#~ "by lower case letters and numbers."
+#~ msgstr ""
+#~ "è«?設å®?æ??æ??ç??使ç?¨è??å??稱ï¼?第ä¸?å??å­?å??å?ªå?¯ä»¥æ?¯å°?寫å­?æ¯?ï¼?å?¶å®?ç??å¿?é ?æ?¯å°?寫å­?æ¯?æ??"
+#~ "æ?¸å­?ã??"
+
+#~ msgid "User name \"%s\" already exists"
+#~ msgstr "該使ç?¨è??å??稱â??%sâ??å·²ç¶?å­?å?¨"
+
+#~ msgid "Please enter a different home directory path."
+#~ msgstr "è«?é?¸æ??ä¸?å??ç??家ç?®é??è·¯å¾?ã??"
+
+#~ msgid "Administrator account's user ID should not be modified"
+#~ msgstr "ä¸?æ??ä¿®æ?¹ç®¡ç??å?¡å¸³è??ç??使ç?¨è?? ID"
+
+#~ msgid "Name"
+#~ msgstr "å??稱"
+
+#~ msgid "Login name"
+#~ msgstr "ç?»å?¥å??稱"
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Please enter your root password</"
 #~ "span>"
 #~ msgstr "<span weight=\"bold\" size=\"larger\">�輸� root �碼</span>"
 
-#~ msgid "Enter Password"
-#~ msgstr "輸��碼"
-
 #~ msgid ""
 #~ "You need administrator privileges to use this tool. Enter a password to "
 #~ "modify\n"
 #~ "your system configuration."
 #~ msgstr "æ?¨é??è¦?æ??系統管ç??å?¡ç??æ¬?é??ä¾?使ç?¨æ­¤å·¥å?·ã??輸å?¥å¯?碼以修æ?¹æ?¨ç??系統çµ?æ??ã??"
-
-#~ msgid "_Password:"
-#~ msgstr "�碼(_P):"