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

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

commit 791d16862db165316ccde645395daac321028bfb
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Aug 21 20:48:43 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  810 ++++++++++++++++++++++++++++++++++-------------------------
 po/zh_TW.po |  812 ++++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 933 insertions(+), 689 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index ca02f86..7c454b5 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -10,190 +10,181 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-system-tools 2.29.92\n"
+"Project-Id-Version: gnome-system-tools 2.31.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-27 21:00+0800\n"
-"PO-Revision-Date: 2010-03-27 21:00+0800\n"
-"Last-Translator: Kevin_Wei_2 <kevin_wei3 yahoo com tw>\n"
+"POT-Creation-Date: 2010-08-21 20:47+0800\n"
+"PO-Revision-Date: 2010-08-21 20:48+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gnome-system-tools.schemas.in.h:1
-msgid "Whether the users-admin tool should show system users in the users list"
-msgstr "ã??使ç?¨è??-管ç??ã??å·¥å?·æ??å?¦é¡¯ç¤ºå?¨ä½¿ç?¨è??æ¸?å?®ä¸­ç??系統使ç?¨è??"
-
-#: ../gnome-system-tools.schemas.in.h:2
-msgid ""
-"Whether the users-admin tool should show the root user in the users list"
-msgstr "ã??使ç?¨è??-管ç??ã??å·¥å?·æ??å?¦é¡¯ç¤ºå?¨ä½¿ç?¨è??æ¸?å?®ä¸­ç?? root 使ç?¨è??"
+#: ../interfaces/network.ui.h:1 ../src/network/ifaces-list.c:326
+msgid "Access point name:"
+msgstr "ç?¡ç·?網絡å­?å??é»?å??稱ï¼?"
 
-#: ../interfaces/network.ui.h:1
+#: ../interfaces/network.ui.h:2
 msgid "Account data"
 msgstr "帳è??è³?æ??"
 
-#: ../interfaces/network.ui.h:2
-msgid "Connection Settings"
-msgstr "��設��"
-
 #: ../interfaces/network.ui.h:3
-msgid "DNS Servers"
-msgstr "DNS 伺æ??å?¨"
-
-#: ../interfaces/network.ui.h:4
-msgid "Host Settings"
-msgstr "主�設�"
-
-#: ../interfaces/network.ui.h:5
-msgid "Internet service provider data"
-msgstr "網絡æ??å??ä¾?æ??å??è³?æ??"
-
-#: ../interfaces/network.ui.h:6
-msgid "Modem Settings"
-msgstr "æ?¸æ??æ©?設å®?å?¼"
-
-#: ../interfaces/network.ui.h:7
-msgid "Search Domains"
-msgstr "æ??å°?網å??"
-
-#: ../interfaces/network.ui.h:8
-msgid "Wireless Settings"
-msgstr "��網絡設��"
-
-#: ../interfaces/network.ui.h:9
-msgid "Access point name:"
-msgstr "ç?¡ç·?網絡å­?å??é»?å??稱ï¼?"
-
-#: ../interfaces/network.ui.h:10
 msgid "Aliases:"
 msgstr "å?¥å??ï¼?"
 
-#: ../interfaces/network.ui.h:11
+#: ../interfaces/network.ui.h:4
 msgid "Con_figuration:"
 msgstr "設�(_F):"
 
-#: ../interfaces/network.ui.h:12
+#: ../interfaces/network.ui.h:5
+msgid "Connection Settings"
+msgstr "��設��"
+
+#: ../interfaces/network.ui.h:6
 msgid "Connection type:"
 msgstr "é?£ç·?é¡?å??ï¼?"
 
-#: ../interfaces/network.ui.h:13
+#: ../interfaces/network.ui.h:7
 msgid "Connections"
 msgstr "��"
 
-#: ../interfaces/network.ui.h:14
+#: ../interfaces/network.ui.h:8
 msgid "DNS"
 msgstr "DNS"
 
-#: ../interfaces/network.ui.h:15
+#: ../interfaces/network.ui.h:9
+msgid "DNS Servers"
+msgstr "DNS 伺æ??å?¨"
+
+#: ../interfaces/network.ui.h:10
 msgid "D_omain name:"
 msgstr "網å??å??稱(_O):"
 
-#: ../interfaces/network.ui.h:16
+#: ../interfaces/network.ui.h:11
 msgid "Delete current location"
 msgstr "å?ªé?¤ç?®å??ç??ä½?ç½®"
 
-#: ../interfaces/network.ui.h:17
+#: ../interfaces/network.ui.h:12
 msgid "E_nable roaming mode"
 msgstr "å??ç?¨æ¼«é??模å¼?(_N)"
 
-#: ../interfaces/network.ui.h:18
+#: ../interfaces/network.ui.h:13
 msgid "E_nable this connection"
 msgstr "å??ç?¨é??å??é?£ç·?(_N)"
 
-#: ../interfaces/network.ui.h:19
+#: ../interfaces/network.ui.h:14 ../src/network/ifaces-list.c:335
 msgid "Ethernet interface:"
 msgstr "�太網絡���"
 
-#: ../interfaces/network.ui.h:20 ../interfaces/users.ui.h:32
+#: ../interfaces/network.ui.h:15 ../interfaces/users.ui.h:27
 msgid "General"
 msgstr "��"
 
-#: ../interfaces/network.ui.h:21
+#: ../interfaces/network.ui.h:16
 msgid "Hexadecimal"
 msgstr "16 ����"
 
-#: ../interfaces/network.ui.h:22
+#: ../interfaces/network.ui.h:17
 msgid "Host Alias Properties"
 msgstr "主æ©?å?¥å??屬æ?§"
 
-#: ../interfaces/network.ui.h:23
+#: ../interfaces/network.ui.h:18
+msgid "Host Settings"
+msgstr "主�設�"
+
+#: ../interfaces/network.ui.h:19
 msgid "Hosts"
 msgstr "主�"
 
-#: ../interfaces/network.ui.h:24 ../interfaces/shares.ui.h:14
+#: ../interfaces/network.ui.h:20 ../interfaces/shares.ui.h:11
 msgid "IP address:"
 msgstr "IP å?°å??ï¼?"
 
-#: ../interfaces/network.ui.h:25
+#: ../interfaces/network.ui.h:21
 msgid "Interface properties"
 msgstr "��屬�"
 
-#: ../interfaces/network.ui.h:26
+#: ../interfaces/network.ui.h:22
+msgid "Internet service provider data"
+msgstr "網絡æ??å??ä¾?æ??å??è³?æ??"
+
+#: ../interfaces/network.ui.h:23
 msgid "Location:"
 msgstr "�置�"
 
-#: ../interfaces/network.ui.h:27
+#: ../interfaces/network.ui.h:24
 msgid "Loud"
 msgstr "é«?"
 
-#: ../interfaces/network.ui.h:28
+#: ../interfaces/network.ui.h:25
 msgid "Low"
 msgstr "ä½?"
 
-#: ../interfaces/network.ui.h:29
+#: ../interfaces/network.ui.h:26
 msgid "Medium"
 msgstr "中"
 
-#: ../interfaces/network.ui.h:30
+#: ../interfaces/network.ui.h:27
 msgid "Modem"
 msgstr "æ?¸æ??æ©?"
 
-#: ../interfaces/network.ui.h:31
+#: ../interfaces/network.ui.h:28
+msgid "Modem Settings"
+msgstr "æ?¸æ??æ©?設å®?å?¼"
+
+#: ../interfaces/network.ui.h:29
 msgid "Network _password:"
 msgstr "網絡�碼(_P):"
 
-#: ../interfaces/network.ui.h:32
+#: ../interfaces/network.ui.h:30
 msgid "Network name (_ESSID):"
 msgstr "網絡å??稱(_ESSID):"
 
-#: ../interfaces/network.ui.h:33
+#: ../interfaces/network.ui.h:31
 msgid "Off"
 msgstr "é??é??"
 
-#: ../interfaces/network.ui.h:34
+#: ../interfaces/network.ui.h:32
 msgid "Options"
 msgstr "é?¸é ?"
 
-#: ../interfaces/network.ui.h:35
+#: ../interfaces/network.ui.h:33
 msgid "P_assword"
 msgstr "�碼(_A)"
 
-#: ../interfaces/network.ui.h:36
+#: ../interfaces/network.ui.h:34
 msgid "Password _type:"
 msgstr "å¯?碼é¡?å??(_T):"
 
-#: ../interfaces/network.ui.h:37
+#: ../interfaces/network.ui.h:35
 msgid "Plain (ASCII)"
 msgstr "ç´?æ??å­? (ASCII)"
 
-#: ../interfaces/network.ui.h:38
+#: ../interfaces/network.ui.h:36
 msgid "Pulses"
 msgstr "è??è¡?"
 
-#: ../interfaces/network.ui.h:39
+#: ../interfaces/network.ui.h:37
 msgid "Save current network configuration as a location"
 msgstr "å°?ç?¾å?¨ç??網絡çµ?æ??å?²å­?æ??ä¸?å??ä½?ç½®"
 
-#: ../interfaces/network.ui.h:40
+#: ../interfaces/network.ui.h:38
+msgid "Search Domains"
+msgstr "æ??å°?網å??"
+
+#: ../interfaces/network.ui.h:39
 msgid "Tones"
 msgstr "�調"
 
-#: ../interfaces/network.ui.h:41
+#: ../interfaces/network.ui.h:40
 msgid "Use the Internet service provider nameservers"
 msgstr "使ç?¨ç¶²çµ¡æ??å??ä¾?æ??å??å??稱伺æ??å?¨"
 
+#: ../interfaces/network.ui.h:41
+msgid "Wireless Settings"
+msgstr "��網絡設��"
+
 #: ../interfaces/network.ui.h:42
 msgid "_Autodetect"
 msgstr "è?ªå??å?µæ¸¬(_A)"
@@ -246,7 +237,7 @@ msgstr "設å®?æ?¸æ??æ©?ç?ºé ?設路ç?±(_S)"
 msgid "_Subnet mask:"
 msgstr "�網絡�罩(_S):"
 
-#: ../interfaces/network.ui.h:55
+#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82
 msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
@@ -264,98 +255,98 @@ msgid "Select the services that you wish to activate:"
 msgstr "é?¸æ??ä½ æ?³è¦?使ç?¨ç??æ??å??ï¼?"
 
 #: ../interfaces/shares.ui.h:1
-msgid "Allowed Hosts"
-msgstr "å??許ç??主æ©?"
+msgid "Add allowed hosts"
+msgstr "å? å?¥å??許ç??主æ©?"
 
 #: ../interfaces/shares.ui.h:2
-msgid "Hosts Settings"
-msgstr "主�設�"
+msgid "Allowed Hosts"
+msgstr "å??許ç??主æ©?"
 
 #: ../interfaces/shares.ui.h:3
-msgid "Share Properties"
-msgstr "�享屬�"
-
-#: ../interfaces/shares.ui.h:4
-msgid "Shared Folder"
-msgstr "å?±äº«è³?æ??夾"
-
-#: ../interfaces/shares.ui.h:5
-msgid "Windows sharing"
-msgstr "Windows �享"
-
-#: ../interfaces/shares.ui.h:6
-msgid "Enter password for user:"
-msgstr "輸å?¥ä½¿ç?¨è??ç??å¯?碼:"
-
-#: ../interfaces/shares.ui.h:7
-msgid "Add allowed hosts"
-msgstr "å? å?¥å??許ç??主æ©?"
-
-#: ../interfaces/shares.ui.h:8
 msgid "Allowed hosts:"
 msgstr "å??許ç??主æ©?ï¼?"
 
-#: ../interfaces/shares.ui.h:9
+#: ../interfaces/shares.ui.h:4
 msgid "Comment:"
 msgstr "註解:"
 
-#: ../interfaces/shares.ui.h:10
+#: ../interfaces/shares.ui.h:5
 msgid "Domain / _Workgroup:"
 msgstr "網å??/å·¥ä½?ç¾£çµ?(_W)"
 
-#: ../interfaces/shares.ui.h:11
+#: ../interfaces/shares.ui.h:6
 msgid "Enter password for user"
 msgstr "輸å?¥ä½¿ç?¨è??ç??å¯?碼"
 
-#: ../interfaces/shares.ui.h:12
+#: ../interfaces/shares.ui.h:7
+msgid "Enter password for user:"
+msgstr "輸å?¥ä½¿ç?¨è??ç??å¯?碼:"
+
+#: ../interfaces/shares.ui.h:8
 msgid "General Properties"
 msgstr "��屬�"
 
-#: ../interfaces/shares.ui.h:13
+#: ../interfaces/shares.ui.h:9
 msgid "Host name:"
 msgstr "主æ©?å??稱ï¼?"
 
-#: ../interfaces/shares.ui.h:15
+#: ../interfaces/shares.ui.h:10
+msgid "Hosts Settings"
+msgstr "主�設�"
+
+#: ../interfaces/shares.ui.h:12
 msgid "Name:"
 msgstr "å??稱ï¼?"
 
-#: ../interfaces/shares.ui.h:16
+#: ../interfaces/shares.ui.h:13
 msgid "Netmask:"
 msgstr "�網絡�罩:"
 
-#: ../interfaces/shares.ui.h:17
+#: ../interfaces/shares.ui.h:14
 msgid "Network:"
 msgstr "網絡:"
 
-#: ../interfaces/shares.ui.h:18 ../src/shares/nfs-acl-table.c:56
+#: ../interfaces/shares.ui.h:15 ../src/shares/nfs-acl-table.c:56
 msgid "Read only"
 msgstr "��"
 
-#: ../interfaces/shares.ui.h:19
+#: ../interfaces/shares.ui.h:16
 msgid "Share"
 msgstr "å??享"
 
-#: ../interfaces/shares.ui.h:20
+#: ../interfaces/shares.ui.h:17
+msgid "Share Properties"
+msgstr "�享屬�"
+
+#: ../interfaces/shares.ui.h:18
 msgid "Share through:"
 msgstr "�享��"
 
-#: ../interfaces/shares.ui.h:21 ../src/shares/shares.desktop.in.in.h:2
+#: ../interfaces/shares.ui.h:19
+msgid "Shared Folder"
+msgstr "å?±äº«è³?æ??夾"
+
+#: ../interfaces/shares.ui.h:20 ../src/shares/shares.desktop.in.in.h:2
 #: ../src/shares/shares-tool.c:237
 msgid "Shared Folders"
 msgstr "å?±äº«ç??è³?æ??夾"
 
-#: ../interfaces/shares.ui.h:22
+#: ../interfaces/shares.ui.h:21
 msgid "This computer is a _WINS server"
 msgstr "æ?¬é?»è?¦æ?¯ _WINS 伺æ??å?¨"
 
-#: ../interfaces/shares.ui.h:23
+#: ../interfaces/shares.ui.h:22
 msgid "Users"
 msgstr "使ç?¨è??"
 
-#: ../interfaces/shares.ui.h:24
+#: ../interfaces/shares.ui.h:23
 msgid "WINS _server:"
 msgstr "WINS 伺æ??å?¨(_S)"
 
+#: ../interfaces/shares.ui.h:24
+msgid "Windows sharing"
+msgstr "Windows �享"
+
 #: ../interfaces/shares.ui.h:25
 msgid "_Path:"
 msgstr "路�(_P):"
@@ -365,29 +356,29 @@ msgid "_Read only"
 msgstr "��(_R)"
 
 #: ../interfaces/time.ui.h:1
-msgid "Selection"
-msgstr "é?¸æ??å??"
-
-#: ../interfaces/time.ui.h:2
-msgid "Time Zone"
-msgstr "æ??å??"
-
-#: ../interfaces/time.ui.h:3
 msgid "Add NTP Server"
 msgstr "å? å?¥ NTP 伺æ??å?¨"
 
-#: ../interfaces/time.ui.h:4
+#: ../interfaces/time.ui.h:2
 msgid "NTP server"
 msgstr "NTP 伺æ??å?¨"
 
-#: ../interfaces/time.ui.h:5
+#: ../interfaces/time.ui.h:3
 msgid "Se_lect Servers"
 msgstr "é?¸å??伺æ??å?¨(_L)"
 
-#: ../interfaces/time.ui.h:6
+#: ../interfaces/time.ui.h:4
+msgid "Selection"
+msgstr "é?¸æ??å??"
+
+#: ../interfaces/time.ui.h:5
 msgid "Synchronize now"
 msgstr "ç«?å?»å??æ­¥"
 
+#: ../interfaces/time.ui.h:6
+msgid "Time Zone"
+msgstr "æ??å??"
+
 #: ../interfaces/time.ui.h:7
 msgid "Time servers"
 msgstr "æ??é??æ ¡å°?伺æ??å?¨"
@@ -421,196 +412,202 @@ msgid "_Time:"
 msgstr "æ??å?»(_T):"
 
 #: ../interfaces/users.ui.h:1
-msgid "Advanced Settings"
-msgstr "é?²é??設å®?"
+msgid ""
+"A user with this name already exists. Please choose a different name for the "
+"new user."
+msgstr "å·²ç¶?æ??å??樣å??稱ç??使ç?¨è??å­?å?¨ã??è«?ç?ºæ?°ç??使ç?¨è??é?¸æ??ä¸?å??ç??å??稱ã??"
 
 #: ../interfaces/users.ui.h:2
-msgid "Automatic UID/GID"
-msgstr "è?ªå??å®?æ?? UID/GID"
+msgid "Account _type:"
+msgstr "帳è??é¡?å??(_T):"
 
 #: ../interfaces/users.ui.h:3
-msgid "Basic Settings"
-msgstr "��設�"
+msgid "Advanced"
+msgstr "é?²é??"
 
 #: ../interfaces/users.ui.h:4
-msgid "Group Members"
-msgstr "ç¾£çµ?æ??å?¡"
+msgid "Advanced Settings"
+msgstr "é?²é??設å®?"
 
 #: ../interfaces/users.ui.h:5
-msgid "Optional Settings"
-msgstr "é?¸æ??æ?§è¨­å®?"
+msgid "Assign a random password by default"
+msgstr "é ?設å??é??é?¨æ©?ç??å¯?碼"
 
 #: ../interfaces/users.ui.h:6
-msgid "Password Settings"
-msgstr "�碼設�"
+msgid "Automatic UID/GID"
+msgstr "è?ªå??å®?æ?? UID/GID"
 
+#: ../interfaces/users.ui.h:7
+msgid "Basic Settings"
+msgstr "��設�"
 
 #: ../interfaces/users.ui.h:8
-msgid "System Defaults"
-msgstr "系統é ?設å?¼"
-
-#: ../interfaces/users.ui.h:9
-msgid "Account _type:"
-msgstr "帳è??é¡?å??(_T):"
-
-#: ../interfaces/users.ui.h:10
-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 "é ?設å??é??é?¨æ©?ç??å¯?碼"
-
-#: ../interfaces/users.ui.h:13
 msgid "Change Advanced User Settings"
 msgstr "æ?¹è®?é?²é??ç??使ç?¨è??設å®?å?¼"
 
-#: ../interfaces/users.ui.h:14
+#: ../interfaces/users.ui.h:9
 msgid "Change User Account Type"
 msgstr "æ?¹è®?使ç?¨è??帳è??é¡?å??"
 
-#: ../interfaces/users.ui.h:15
-msgid "Change User Name and Login"
-msgstr "æ?¹è®?使ç?¨è??å??稱並ç?»å?¥"
+#: ../interfaces/users.ui.h:10
+msgid "Change User Name"
+msgstr "æ?¹è®?使ç?¨è??å??稱"
 
-#: ../interfaces/users.ui.h:16
+#: ../interfaces/users.ui.h:11
 msgid "Change User Password"
 msgstr "æ?¹è®?使ç?¨è??å¯?碼"
 
-#: ../interfaces/users.ui.h:17
+#: ../interfaces/users.ui.h:12
 msgid "Changing advanced settings for:"
 msgstr "æ­£å?¨æ?¹è®?此人ç??é?²é??設å®?å?¼ï¼?"
 
-#: ../interfaces/users.ui.h:18
+#: ../interfaces/users.ui.h:13
 msgid "Changing user account type for:"
 msgstr "æ?¹è®?使ç?¨è??帳è??é¡?å??ï¼?"
 
-#: ../interfaces/users.ui.h:19
+#: ../interfaces/users.ui.h:14
 msgid "Changing user name for:"
 msgstr "æ­£å?¨æ?¹è®?使ç?¨è??å??稱ï¼?"
 
-#: ../interfaces/users.ui.h:20
+#: ../interfaces/users.ui.h:15
 msgid "Changing user password for:"
 msgstr "æ­£å?¨æ?¹è®?使ç?¨è??å¯?碼ï¼?"
 
-#: ../interfaces/users.ui.h:21
+#: ../interfaces/users.ui.h:16
 msgid "Con_firmation:"
 msgstr "確��碼(_F):"
 
+#: ../interfaces/users.ui.h:17
+msgid "Contact Information"
+msgstr "�絡人��"
 
-#: ../interfaces/users.ui.h:23
+#: ../interfaces/users.ui.h:18
 msgid "Create New User"
 msgstr "建ç«?æ?°ç??使ç?¨è??"
 
-#: ../interfaces/users.ui.h:24
+#: ../interfaces/users.ui.h:19
 msgid "Create a new user"
 msgstr "建ç«?ä¸?å??æ?°ç??使ç?¨è??"
 
-#: ../interfaces/users.ui.h:25
+#: ../interfaces/users.ui.h:20
 msgid "Days between warning and password expiration:"
 msgstr "å¯?碼é??æ??å??ï¼?æ?¼æ??å®?æ?¥æ?¸ç?¼å?ºè­¦å??ï¼?"
 
-#: ../interfaces/users.ui.h:26
+#: ../interfaces/users.ui.h:21
 msgid "Default _group:"
 msgstr "é ?設羣çµ?(_G):"
 
-#: ../interfaces/users.ui.h:27
+#: ../interfaces/users.ui.h:22
 msgid "Default _shell:"
 msgstr "é ?設 _Shellï¼?"
 
-#: ../interfaces/users.ui.h:28
+#: ../interfaces/users.ui.h:23
 msgid "Disable _account"
 msgstr "å??ç?¨å¸³è??(_A)"
 
-#: ../interfaces/users.ui.h:29
+#: ../interfaces/users.ui.h:24
 msgid "Don't ask for password on _login"
 msgstr "ç?»å?¥æ??ä¸?è©¢å??å¯?碼(_L)"
 
-#: ../interfaces/users.ui.h:30
+#: ../interfaces/users.ui.h:25
 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
+#: ../interfaces/users.ui.h:26
 msgid "Full _Name:"
 msgstr "å?¨å??(_N):"
 
-#: ../interfaces/users.ui.h:33
+#: ../interfaces/users.ui.h:28
 msgid "Generate _random password"
 msgstr "ç?¢ç??é?¨æ©?å¯?碼(_R)"
 
-#: ../interfaces/users.ui.h:34
+#: ../interfaces/users.ui.h:29
+msgid "Group Members"
+msgstr "ç¾£çµ?æ??å?¡"
+
+#: ../interfaces/users.ui.h:30
 msgid "Group _ID:"
 msgstr "羣� _ID�"
 
-#: ../interfaces/users.ui.h:35
+#: ../interfaces/users.ui.h:31
 msgid "Group _name:"
 msgstr "ç¾£çµ?å??稱(_N):"
 
-#: ../interfaces/users.ui.h:36
+#: ../interfaces/users.ui.h:32
 msgid "Group properties"
 msgstr "羣�屬�"
 
-#: ../interfaces/users.ui.h:37
+#: ../interfaces/users.ui.h:33
+msgid "Groups available on the system:"
+msgstr "系統中å?¯ç?¨ç??ç¾£çµ?ï¼?"
+
+#: ../interfaces/users.ui.h:34
 msgid "Groups settings"
 msgstr "羣�設��"
 
-#: ../interfaces/users.ui.h:38
+#: ../interfaces/users.ui.h:35
 msgid "Ma_ximum days a password may be used:"
 msgstr "å¯?碼å?¯ä½¿ç?¨ç??æ?¥æ?¸ä¸?é??(_X):"
 
-#: ../interfaces/users.ui.h:39
+#: ../interfaces/users.ui.h:36
 msgid "Maximum GID:"
 msgstr "GID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:40
+#: ../interfaces/users.ui.h:37
 msgid "Maximum UID:"
 msgstr "UID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:41
+#: ../interfaces/users.ui.h:38
 msgid "Mi_nimum days between password changes:"
 msgstr "å¯?碼使ç?¨äº?æ??å®?ç??æ?¥æ?¸å¾?æ?¹å?¯ä¿®æ?¹(_N):"
 
-#: ../interfaces/users.ui.h:42
+#: ../interfaces/users.ui.h:39
 msgid "Minimum GID:"
 msgstr "GID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:43
+#: ../interfaces/users.ui.h:40
 msgid "Minimum UID:"
 msgstr "UID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:44
+#: ../interfaces/users.ui.h:41
 msgid "Minimum days allowed between password changes:"
 msgstr "å¯?碼使ç?¨äº?æ??å®?ç??æ?¥æ?¸å¾?æ?¹å?¯ä¿®æ?¹ï¼?"
 
-#: ../interfaces/users.ui.h:45
+#: ../interfaces/users.ui.h:42
 msgid "New _password:"
 msgstr "æ?°ç??å¯?碼(_P):"
 
-#: ../interfaces/users.ui.h:46
+#: ../interfaces/users.ui.h:43
 msgid "Number of days that a password may be used:"
 msgstr "å¯?碼å?¯ä½¿ç?¨ç??æ?¥æ?¸ï¼?"
 
-#: ../interfaces/users.ui.h:47
+#: ../interfaces/users.ui.h:44
 msgid "O_ffice location:"
 msgstr "���置(_F):"
 
-#: ../interfaces/users.ui.h:48
+#: ../interfaces/users.ui.h:45
+msgid "Optional Settings"
+msgstr "é?¸æ??æ?§è¨­å®?"
+
+#: ../interfaces/users.ui.h:46
+msgid "Password Settings"
+msgstr "�碼設�"
+
+#: ../interfaces/users.ui.h:47
 msgid "Password set to: "
 msgstr "�碼設���"
 
-#: ../interfaces/users.ui.h:49
+#: ../interfaces/users.ui.h:48
 msgid "Privileges"
 msgstr "æ¬?é??"
 
+#: ../interfaces/users.ui.h:49
+msgid "Profile Settings"
+msgstr "設å®?çµ?å??設å®?å?¼"
+
 #: ../interfaces/users.ui.h:50
 msgid "Profile _name:"
 msgstr "設å®?çµ?å??å??稱(_N):"
@@ -619,125 +616,143 @@ msgstr "設å®?çµ?å??å??稱(_N):"
 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:53
-msgid ""
-"Short name must consist of:\n"
-"  â?£ lower case letters from the English alphabet\n"
-"  â?£ digits\n"
-"  â?£ any of the characters \".\", \"-\" and \"_\""
-msgstr ""
-"ç?­å¼?å??稱å¿?é ?ç?±é??äº?å­?çµ?æ??ï¼?\n"
-"  â?£ å°?寫è?±æ??å­?æ¯?\n"
-"  � ��\n"
-"  â?£ å?¶ä»?å­?符å¦? \".\"ã?? \"-\" å?? \"_\""
-
-#: ../interfaces/users.ui.h:57
-msgid "Short name must start with a letter!"
-msgstr "ç?­å¼?å??稱å¿?é ?以è?±æ??å­?æ¯?é??é ­ï¼?"
+#: ../interfaces/users.ui.h:52
+msgid "System Defaults"
+msgstr "系統é ?設å?¼"
 
-#: ../interfaces/users.ui.h:58
+#: ../interfaces/users.ui.h:53
 msgid "This account is disabled."
 msgstr "é??å??帳è??å·²å??ç?¨ã??"
 
-#: ../interfaces/users.ui.h:59
+#: ../interfaces/users.ui.h:54
 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:60
+#: ../interfaces/users.ui.h:55
 msgid "User ID:"
 msgstr "使ç?¨è??IDï¼?"
 
-#: ../interfaces/users.ui.h:61
+#: ../interfaces/users.ui.h:56
 msgid "User Privileges"
 msgstr "使ç?¨è??æ¬?é??"
 
-#: ../interfaces/users.ui.h:62
+#: ../interfaces/users.ui.h:57
 msgid "User profiles"
 msgstr "使ç?¨è??設å®?æª?"
 
+#. 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:59
+msgid ""
+"Username must consist of:\n"
+"  â?£ lower case letters from the English alphabet\n"
+"  â?£ digits\n"
+"  â?£ any of the characters \".\", \"-\" and \"_\""
+msgstr ""
+"使ç?¨è??å??稱å¿?é ?ç?±é??äº?å­?çµ?æ??ï¼?\n"
+"  â?£ å°?寫è?±æ??å­?æ¯?\n"
+"  � ��\n"
+"  â?£ å?¶ä»?å­?符å¦? \".\"ã?? \"-\" å?? \"_\""
+
 #: ../interfaces/users.ui.h:63
+msgid "Username must start with a letter!"
+msgstr "使ç?¨è??å??稱å¿?é ?以å­?æ¯?é??é ­ï¼?"
+
+#: ../interfaces/users.ui.h:64
 msgid "You can't change user ID while the user is logged in."
 msgstr "ä½ ä¸?è?½å?¨ä½¿ç?¨è??è??æ?¼ç?»å?¥ç??æ??æ??æ?¹è®?使ç?¨è?? IDã??"
 
-#: ../interfaces/users.ui.h:64
+#: ../interfaces/users.ui.h:65
 msgid "_Add Profile"
 msgstr "��設��(_A)"
 
-#: ../interfaces/users.ui.h:65
+#: ../interfaces/users.ui.h:66
 msgid "_Advanced Settings"
 msgstr "é?²é??設å®?(_A)"
 
-#: ../interfaces/users.ui.h:66
+#: ../interfaces/users.ui.h:67
 msgid "_Change..."
 msgstr "��(_C)..."
 
-#: ../interfaces/users.ui.h:67
+#: ../interfaces/users.ui.h:68
 msgid "_Comments"
 msgstr "å??註(_C)"
 
-#: ../interfaces/users.ui.h:68
+#: ../interfaces/users.ui.h:69
 msgid "_Current password:"
 msgstr "ç?®å??ç??å¯?碼(_C):"
 
-#: ../interfaces/users.ui.h:69
+#: ../interfaces/users.ui.h:70
 msgid "_Custom"
 msgstr "��(_C)"
 
-#: ../interfaces/users.ui.h:70
+#: ../interfaces/users.ui.h:71
 msgid "_Days between warning and password expiration:"
 msgstr "å¯?碼é??æ??å??ï¼?æ?¼æ??å®?æ?¥æ?¸ç?¼å?ºè­¦å??(_D):"
 
-#: ../interfaces/users.ui.h:71
+#: ../interfaces/users.ui.h:72
 msgid "_Enable Account"
 msgstr "å??ç?¨å¸³è??(_E)"
 
-#: ../interfaces/users.ui.h:72
+#: ../interfaces/users.ui.h:73
 msgid "_Encrypt home folder to protect sensitive data"
 msgstr "å? å¯?家ç?®é??以ä¿?è­·æ??æ??è³?æ??(_E)"
 
-#: ../interfaces/users.ui.h:73
+#: ../interfaces/users.ui.h:74
 msgid "_Generate"
 msgstr "ç?¢ç??(_G)"
 
-#: ../interfaces/users.ui.h:74
+#: ../interfaces/users.ui.h:75
 msgid "_Home directory:"
 msgstr "å??人ç?®é??(_H):"
 
-#: ../interfaces/users.ui.h:75
+#: ../interfaces/users.ui.h:76
 msgid "_Home phone:"
 msgstr "家��話(_H):"
 
-#: ../interfaces/users.ui.h:76
+#: ../interfaces/users.ui.h:77
 msgid "_Main group:"
 msgstr "主�羣�(_M):"
 
-#: ../interfaces/users.ui.h:77
+#: ../interfaces/users.ui.h:78
 msgid "_Manage Groups"
 msgstr "管ç??ç¾£çµ?(_M):"
 
-#: ../interfaces/users.ui.h:78
+#: ../interfaces/users.ui.h:79
 msgid "_Name:"
 msgstr "å??稱(_N):"
 
-#: ../interfaces/users.ui.h:79
+#: ../interfaces/users.ui.h:80
 msgid "_Password:"
 msgstr "�碼(_P):"
 
-#: ../interfaces/users.ui.h:80
+#: ../interfaces/users.ui.h:81
 msgid "_Shell:"
 msgstr "_Shell:"
 
-#: ../interfaces/users.ui.h:81
-msgid "_Short Name:"
-msgstr "ç?­å¼?å??稱(_S):"
-
-#: ../interfaces/users.ui.h:82
+#: ../interfaces/users.ui.h:83
 msgid "_Work phone:"
 msgstr "工��話(_W):"
 
+#: ../org.gnome.system-tools.gschema.xml.in.h:1
+msgid "Show root user"
+msgstr "顯示 root 使ç?¨è??"
+
+#: ../org.gnome.system-tools.gschema.xml.in.h:2
+msgid "Show system users"
+msgstr "顯示系統使ç?¨è??"
+
+#: ../org.gnome.system-tools.gschema.xml.in.h:3
+msgid ""
+"Whether the users-admin tool should show system users in the users list."
+msgstr "ã??使ç?¨è??-管ç??ã??å·¥å?·æ??å?¦é¡¯ç¤ºå?¨ä½¿ç?¨è??æ¸?å?®ä¸­ç??系統使ç?¨è??ã??"
+
+#: ../org.gnome.system-tools.gschema.xml.in.h:4
+msgid ""
+"Whether the users-admin tool should show the root user in the users list."
+msgstr "ã??使ç?¨è??-管ç??ã??å·¥å?·æ??å?¦é¡¯ç¤ºå?¨ä½¿ç?¨è??æ¸?å?®ä¸­ç?? root 使ç?¨è??ã??"
+
 #: ../src/common/gst-platform-dialog.c:179
 msgid "The platform you are running is not supported by this tool"
 msgstr "ä½ æ??å?·è¡?ç??å¹³è?ºå°?æ?ªè¢«æ?¬å·¥å?·æ?¯æ?´"
@@ -754,46 +769,46 @@ msgstr "å¦?æ??ä½ è?¯å®?æ?¬ç³»çµ±å??以ä¸?å??å?ºç??å?¶ä¸­ä¸?種ä½?業平å?°é??ä½?
 msgid "Unsupported platform"
 msgstr "ä¸?æ?¯æ?´ç??å¹³å?°"
 
-#: ../src/common/gst-tool.c:190
+#: ../src/common/gst-tool.c:188
 msgid "The configuration could not be loaded"
 msgstr "����設�"
 
 #. OPERATION_COMMIT
-#: ../src/common/gst-tool.c:192
+#: ../src/common/gst-tool.c:190
 msgid "The configuration could not be saved"
 msgstr "ç?¡æ³?å?²å­?çµ?æ??設å®?"
 
-#: ../src/common/gst-tool.c:196
+#: ../src/common/gst-tool.c:194
 msgid "You are not allowed to access the system configuration."
 msgstr "ä½ ä¸?å??許å­?å??系統設å®?ã??"
 
 #. OPERATION_COMMIT
-#: ../src/common/gst-tool.c:198 ../src/common/gst-tool.c:690
+#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685
 msgid "You are not allowed to modify the system configuration."
 msgstr "ä½ ä¸?被å??許修æ?¹ç³»çµ±çµ?æ??ã??"
 
-#: ../src/common/gst-tool.c:201
+#: ../src/common/gst-tool.c:199
 msgid "Invalid data was found."
 msgstr "æ?¾ä¸?å?°ç?¡æ??ç??è³?æ??ã??"
 
 #. OOBS_RESULT_ERROR
-#: ../src/common/gst-tool.c:203
+#: ../src/common/gst-tool.c:201
 msgid "An unknown error occurred."
 msgstr "ç?¼ç??ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../src/common/gst-tool.c:427
+#: ../src/common/gst-tool.c:422
 msgid "Could not display help"
 msgstr "ç?¡æ³?顯示說æ??æ??件"
 
-#: ../src/common/gst-tool.c:621
+#: ../src/common/gst-tool.c:616
 msgid "The system configuration has potentially changed."
 msgstr "系統çµ?æ??å?¯è?½è¢«æ?´æ?¹äº?ã??"
 
-#: ../src/common/gst-tool.c:623
+#: ../src/common/gst-tool.c:618
 msgid "Update content? This will lose any modification in course."
 msgstr "æ?¯å?¦è¦?æ?´æ?°å?§å®¹ï¼?é??樣æ??失å?»ä»»ä½?å?¨å??å??é??ç¨?中ç??ä¿®æ?¹ã??"
 
-#: ../src/common/gst-tool.c:692
+#: ../src/common/gst-tool.c:687
 #, c-format
 msgid ""
 "An error occurred while checking for authorizations: %s\n"
@@ -812,7 +827,7 @@ msgstr "å? å?¥(_A)"
 msgid "_Delete"
 msgstr "��(_D)"
 
-#: ../src/network/address-list.c:486
+#: ../src/network/address-list.c:485
 msgid "Type address"
 msgstr "輸å?¥å?°å??"
 
@@ -916,61 +931,48 @@ msgstr "å·²å??ç?¨æ¼«é??模å¼?"
 
 #: ../src/network/ifaces-list.c:289
 #, c-format
-msgid "Essid: %s "
-msgstr "Essid: %s "
+msgid "<b>Essid:</b> %s "
+msgstr "<b>Essidï¼?</b> %s "
 
-#: ../src/network/ifaces-list.c:295
-#, c-format
-msgid "Address: %s Subnet mask: %s"
-msgstr "ä½?å??ï¼? %s å­?網絡é?®ç½©ï¼? %s"
+#: ../src/network/ifaces-list.c:296 ../src/network/ifaces-list.c:301
+#: ../src/network/ifaces-list.c:306
+msgid "Address:"
+msgstr "ä½?å??ï¼?"
 
-#: ../src/network/ifaces-list.c:299
-#, c-format
-msgid "Address: %s"
-msgstr "ä½?å??ï¼? %s"
+#: ../src/network/ifaces-list.c:298
+msgid "Subnet mask:"
+msgstr "�網絡�罩�"
 
-#: ../src/network/ifaces-list.c:303
-#, c-format
-msgid "Address: %s Remote address: %s"
-msgstr "ä½?å??ï¼? %s é? 端ä½?å??ï¼? %s"
+#: ../src/network/ifaces-list.c:308
+msgid "Remote address:"
+msgstr "é? 端ä½?å??ï¼?"
 
-#: ../src/network/ifaces-list.c:315
-#, c-format
-msgid "Type: %s Phone number: %s"
-msgstr "é¡?å??ï¼? %s é?»è©±è??碼ï¼? %s"
-
-#: ../src/network/ifaces-list.c:318
-#, c-format
-msgid "Type: %s Access point name: %s"
-msgstr "é¡?å??ï¼? %s ç?¡ç·?網絡å­?å??é»?ï¼? %s"
+#: ../src/network/ifaces-list.c:320 ../src/network/ifaces-list.c:325
+#: ../src/network/ifaces-list.c:334 ../src/network/ifaces-list.c:339
+msgid "Type:"
+msgstr "é¡?å??ï¼?"
 
-#: ../src/network/ifaces-list.c:325
-#, c-format
-msgid "Type: %s Ethernet interface: %s"
-msgstr "é¡?å??ï¼? %s ä¹?太網絡ä»?é?¢ï¼? %s"
+#: ../src/network/ifaces-list.c:321
+msgid "Phone number:"
+msgstr "é?»è©±è??碼ï¼?"
 
-#: ../src/network/ifaces-list.c:329
-#, c-format
-msgid "Type: %s"
-msgstr "é¡?å??ï¼? %s"
-
-#: ../src/network/ifaces-list.c:346
+#: ../src/network/ifaces-list.c:356
 msgid "Wireless connection"
 msgstr "��網絡��"
 
-#: ../src/network/ifaces-list.c:348
+#: ../src/network/ifaces-list.c:358
 msgid "Infrared connection"
 msgstr "�����"
 
-#: ../src/network/ifaces-list.c:350
+#: ../src/network/ifaces-list.c:360
 msgid "Wired connection"
 msgstr "��網絡��"
 
-#: ../src/network/ifaces-list.c:352
+#: ../src/network/ifaces-list.c:362
 msgid "Parallel port connection"
 msgstr "並å??å? é?£ç·?"
 
-#: ../src/network/ifaces-list.c:354
+#: ../src/network/ifaces-list.c:364
 msgid "Point to point connection"
 msgstr "�����"
 
@@ -1042,12 +1044,12 @@ msgstr "網絡設�"
 msgid "Settings for service \"%s\""
 msgstr "æ??å??â??%sâ??ç??設å®?"
 
-#: ../src/services/callbacks.c:125
+#: ../src/services/callbacks.c:122
 #, c-format
 msgid "Are you sure you want to deactivate %s?"
 msgstr "ä½ ç¢ºå®?è¦?å??ç?¨ %sï¼?"
 
-#: ../src/services/callbacks.c:129
+#: ../src/services/callbacks.c:126
 msgid ""
 "This may affect your system behavior in several ways, possibly leading to "
 "data loss."
@@ -1517,11 +1519,11 @@ msgstr "å? å?¥å?±äº«ç??è·¯å¾?ï¼?å¦?æ??å®?å·²å­?å?¨è«?ä¿®æ?¹å®?"
 msgid "PATH"
 msgstr "路�"
 
-#: ../src/shares/nautilus/nautilus-shares.c:152
+#: ../src/shares/nautilus/nautilus-shares.c:151
 msgid "_Share Folder..."
 msgstr "å?±äº«è³?æ??夾(_S)..."
 
-#: ../src/shares/nautilus/nautilus-shares.c:153
+#: ../src/shares/nautilus/nautilus-shares.c:152
 msgid "Share this folder with other computers"
 msgstr "è??å?¶å®?é?»è?¦å?±äº«æ­¤è³?æ??夾"
 
@@ -1580,6 +1582,16 @@ msgid ""
 "folders."
 msgstr "ä½ è?³å°?è¦?å®?è£? Samba æ?? NFS ä¾?å??享ç??è³?æ??夾ã??"
 
+#: ../src/time/e-map/e-map.c:620
+msgid "World Map"
+msgstr "ä¸?ç??å?°å??"
+
+#: ../src/time/e-map/e-map.c:622
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr "ç?¨ä¾?é?¸æ??æ??å??ç??æ»?é¼ äº?å??å¼?å?°å??å??件ã??使ç?¨é?µç?¤ç??使ç?¨è??æ??該使ç?¨ä¸?æ?¹ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?ä¾?é?¸æ??æ??å??ã??"
+
 #: ../src/time/time.desktop.in.in.h:1
 msgid "Change system time, date, and timezone"
 msgstr "æ?¹è®?系統æ??é??ã??æ?¥æ??å??æ??å??"
@@ -1588,37 +1600,37 @@ msgstr "æ?¹è®?系統æ??é??ã??æ?¥æ??å??æ??å??"
 msgid "Time and Date"
 msgstr "æ??é??å??æ?¥æ??設å®?"
 
-#: ../src/time/time-tool.c:402
+#: ../src/time/time-tool.c:398
 msgid "NTP support is not installed"
 msgstr "æ²?æ??å®?è£? NTP æ?¯æ?´"
 
-#: ../src/time/time-tool.c:404
+#: ../src/time/time-tool.c:400
 msgid ""
 "Please install and activate NTP support in the system to enable "
 "synchronization of your local time server with internet time servers."
 msgstr "è«?å?¨ç³»çµ±å®?è£?並å??ç?¨ NTP æ?¯æ?´ï¼?ä»¤ä½ ç??æ?¬å?°æ??é??伺æ??å?¨è?½è??網絡æ??é??伺æ??å?¨é?²è¡?å??æ­¥ã??"
 
-#: ../src/time/time-tool.c:433
+#: ../src/time/time-tool.c:429
 msgid "Enabling NTP"
 msgstr "å??ç?¨ NTP"
 
-#: ../src/time/time-tool.c:433
+#: ../src/time/time-tool.c:429
 msgid "Disabling NTP"
 msgstr "å??ç?¨ NTP"
 
-#: ../src/time/time-tool.c:445
+#: ../src/time/time-tool.c:441
 msgid "Synchronizing system clock"
 msgstr "系統æ??é??å??æ­¥"
 
-#: ../src/time/time-tool.c:525
+#: ../src/time/time-tool.c:521
 msgid "Keep synchronized with Internet servers"
 msgstr "è??網絡伺æ??å?¨ä¿?æ??å??æ­¥"
 
-#: ../src/time/time-tool.c:526
+#: ../src/time/time-tool.c:522
 msgid "Manual"
 msgstr "æ??å??"
 
-#: ../src/time/time-tool.c:672
+#: ../src/time/time-tool.c:665
 msgid "Time and Date Settings"
 msgstr "æ??é??å??æ?¥æ??設å®?"
 
@@ -1628,7 +1640,7 @@ msgstr "管ç??å?¡ç¾£çµ?ç?¡æ³?被å?ªé?¤"
 
 #: ../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
+#: ../src/users/user-settings.c:605
 msgid "This would leave the system unusable."
 msgstr "é??樣æ??è®?系統å??ç??å?¨ç?¡æ³?使ç?¨ç??ç??æ??ã??"
 
@@ -1704,6 +1716,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 "��系統��"
@@ -1812,37 +1833,42 @@ msgstr "æ¡?é?¢ä½¿ç?¨è??"
 msgid "Authentication failed"
 msgstr "é©?è­?失æ??"
 
-#: ../src/users/run-passwd.c:495
+#: ../src/users/run-passwd.c:498
 #, c-format
 msgid "The new password is too short"
 msgstr "æ?°ç??å¯?碼太ç?­"
 
-#: ../src/users/run-passwd.c:500
+#: ../src/users/run-passwd.c:504
 #, c-format
 msgid "The new password is too simple"
 msgstr "æ?°ç??å¯?碼太簡å?®"
 
-#: ../src/users/run-passwd.c:505
+#: ../src/users/run-passwd.c:510
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "è??å¯?碼è??æ?°å¯?碼太ç?¸ä¼¼äº?"
 
-#: ../src/users/run-passwd.c:508
+#: ../src/users/run-passwd.c:513
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "æ?°ç??å¯?碼å¿?é ?å??å?«æ?¸å­?æ??ç?¹æ®?å­?符"
 
-#: ../src/users/run-passwd.c:512
+#: ../src/users/run-passwd.c:517
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "è??å¯?碼è??æ?°å¯?碼æ?¯ç?¸å??ç??"
 
-#: ../src/users/run-passwd.c:516
+#: ../src/users/run-passwd.c:520
+#, c-format
+msgid "The new password has already been used recently."
+msgstr "æ?°ç??å¯?碼已ç¶?å?¨æ??è¿?使ç?¨é??äº?ã??"
+
+#: ../src/users/run-passwd.c:524
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "ä½ ç??å¯?碼å?¨ç¬¬ä¸?次é©?è­?å¾?å·²ç¶?æ?¹è®?é??äº?ï¼?"
 
-#: ../src/users/run-passwd.c:520
+#: ../src/users/run-passwd.c:528
 #, c-format
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
@@ -1861,9 +1887,9 @@ msgstr "�碼太�"
 
 #: ../src/users/user-password.c:98
 msgid ""
-"User passwords must be longer than 6 characters and preferably formed by "
+"User passwords must be longer than 5 characters and preferably formed by "
 "numbers, letters and special characters."
-msgstr "使ç?¨è??å¯?碼é ?ç?º 6 å??å­?符以ä¸?ï¼?å??æ??好ç?±æ?¸å­?ã??å­?符å??ç?¹æ®?å­?符æ??çµ?æ??ã??"
+msgstr "使ç?¨è??å¯?碼é ?ç?º 5 å??å­?符以ä¸?ï¼?å??æ??好ç?±æ?¸å­?ã??å­?æ¯?å??ç?¹æ®?å­?符æ??çµ?æ??ã??"
 
 #: ../src/users/user-password.c:101
 msgid "Password confirmation is not correct"
@@ -1947,15 +1973,6 @@ msgstr "��"
 msgid "None"
 msgstr "æ²?æ??"
 
-#. TRANSLATORS:  This applies to a password. Keep the string short.
-#: ../src/users/user-settings.c:347
-msgid "Not asked on login"
-msgstr "ä¸?å?¨ç?»å?¥æ??è©¢å??"
-
-#: ../src/users/user-settings.c:349
-msgid "Asked on login"
-msgstr "ç?»å?¥æ??è©¢å??"
-
 #: ../src/users/user-settings.c:393
 #, c-format
 msgid "Invalid character \"%c\" in comment"
@@ -1965,91 +1982,196 @@ msgstr "å??註中å?ºç?¾ç?¡æ??ç??å­?符â??%câ??"
 msgid "Check that this character is not used."
 msgstr "è«?檢æ?¥æ??ç?¡ä½¿ç?¨æ­¤ä¸?正確ç??å­?符ã??"
 
-#: ../src/users/user-settings.c:417
+#: ../src/users/user-settings.c:426
 msgid "Incomplete path in home directory"
 msgstr "å??人ç?®é??å?«æ??ä¸?å®?æ?´ç??è·¯å¾?"
 
-#: ../src/users/user-settings.c:418
+#: ../src/users/user-settings.c:427
 msgid ""
 "Please enter full path for home directory\n"
-"i.e.: /home/john."
+"<span size=\"smaller\">i.e.: /home/john</span>."
 msgstr ""
 "è«?輸å?¥å®¶ç?®é??ç??å®?æ?´è·¯å¾?\n"
-"ä¾?å¦?ï¼?/home/johnã??"
+"<span size=\"smaller\">ä¾?å¦?ï¼?/home/john</span>ã??"
 
-#: ../src/users/user-settings.c:433
-msgid "Home directory already exists"
+#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491
+#, fuzzy
+#| msgid "Home directory already exists"
+msgid "New home directory already exists, use it?"
 msgstr "家ç?®é??å·²ç¶?å­?å?¨"
 
-#: ../src/users/user-settings.c:434
+#: ../src/users/user-settings.c:449
+#, c-format
+msgid ""
+"The home directory for %s has been set to <tt>%s</tt>, which already exists. "
+"Do you want to use files from this directory, or copy the contents of <tt>%"
+"s</tt> to the new home, overwriting it?\n"
+"\n"
+"In doubt, use the new directory to avoid losing data, and copy files from "
+"the old directory later."
+msgstr ""
+
+#: ../src/users/user-settings.c:461
+msgid "_Replace With Old Files"
+msgstr ""
+
+#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504
+#: ../src/users/user-settings.c:540
+msgid "_Cancel Change"
+msgstr ""
+
+#. TRANSLATORS: This means "use the files from the new location",
+#. * as opposed to those from the old location.
+#: ../src/users/user-settings.c:465
+#, fuzzy
+#| msgid "Keep Files"
+msgid "_Use New Files"
+msgstr "ä¿?ç??æª?æ¡?"
+
+#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510
+msgid "Make user the _owner of the new home directory"
+msgstr ""
+
+#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547
+#, fuzzy
+#| msgid "Incomplete path in home directory"
+msgid "_Delete old home directory"
+msgstr "å??人ç?®é??å?«æ??ä¸?å®?æ?´ç??è·¯å¾?"
+
+#: ../src/users/user-settings.c:493
+#, c-format
+msgid ""
+"The home directory for %s has been set to <tt>%s</tt>, which already exists. "
+"Do you want to use files from this directory, or delete all its contents and "
+"use a completely empty home directory?\n"
+"\n"
+"In doubt, keep the files, and remove them later if needed."
+msgstr ""
+
+#: ../src/users/user-settings.c:503
+#, fuzzy
+#| msgid "Delete Files"
+msgid "_Delete Files"
+msgstr "����"
+
+#: ../src/users/user-settings.c:505
+msgid "_Use Existing Files"
+msgstr ""
+
+#: ../src/users/user-settings.c:526
+msgid "Copy old home directory to new location?"
+msgstr ""
+
+#: ../src/users/user-settings.c:528
 #, 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> å·²å­?å?¨ã??使ç?¨è??å?¯è?½æ??æ²?æ??è®?寫該ç?®é??å¿?é ?ç??æ¬?é??ã??ä½ ä»?ç?¶è¦?使ç?¨å®?å??ï¼?"
+"The home directory for %s has been set to <tt>%s</tt>, which doesn't exist. "
+"Do you want to copy the contents of the old home directory (<tt>%s</tt>), or "
+"use a completely empty home directory?\n"
+"\n"
+"If you choose to copy the files to the new location, it's safe to delete the "
+"old directory."
+msgstr ""
 
-#: ../src/users/user-settings.c:440
-msgid "Use this directory"
+#: ../src/users/user-settings.c:539
+#, fuzzy
+#| msgid "Use this directory"
+msgid "_Use Empty Directory"
 msgstr "使ç?¨é??å??ç?®é??"
 
-#: ../src/users/user-settings.c:475
+#. TRANSLATORS: This means "copy files from the old home directory".
+#: ../src/users/user-settings.c:542
+msgid "Co_py Old Files"
+msgstr ""
+
+#: ../src/users/user-settings.c:604
 msgid "ID for the root user should not be modified"
 msgstr "ä¸?æ??ä¿®æ?¹ root 使ç?¨è??ç?? ID"
 
 #. check that UID is free
-#: ../src/users/user-settings.c:479
+#: ../src/users/user-settings.c:608
 #, c-format
 msgid "User ID %d is already used by user %s"
 msgstr "使ç?¨è?? ID %d å·²ç¶?被使ç?¨è?? %s æ??ç?¨"
 
-#: ../src/users/user-settings.c:481
+#: ../src/users/user-settings.c:610
 #, c-format
 msgid "Please choose a different numeric identifier for %s."
 msgstr "è«?ç?º %s é?¸æ??ä¸?å??ç??æ?¸å­?è­?å?¥ç¢¼ã??"
 
-#: ../src/users/user-settings.c:499
+#: ../src/users/user-settings.c:628
 msgid "Incomplete path in shell"
 msgstr "shell å?«æ??ä¸?å®?æ?´ç??è·¯å¾?"
 
-#: ../src/users/user-settings.c:500
+#: ../src/users/user-settings.c:629
 msgid ""
 "Please enter full path for shell\n"
-"i.e.: /bin/bash."
+"<span size=\"smaller\">i.e.: /bin/bash</span>."
 msgstr ""
 "è«?輸å?¥ shell ç??å®?æ?´è·¯å¾?\n"
-"ä¾?å¦?ï¼?/bin/bashã??"
+"<span size=\"smaller\">ä¾?å¦?ï¼?/bin/bash</span>ã??"
 
-#: ../src/users/user-settings.c:534
+#: ../src/users/user-settings.c:663
 msgid "Can't revoke administration rights"
 msgstr "ä¸?è?½è¨»é?·ç³»çµ±ç®¡ç??è??æ¬?é??"
 
-#: ../src/users/user-settings.c:537
+#: ../src/users/user-settings.c:666
 #, 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:554
+#: ../src/users/user-settings.c:683
 msgid "You are about to revoke your own administration rights"
 msgstr "ä½ å?³å°?註é?·è?ªå·±ç??系統管ç??è??æ¬?é??"
 
-#: ../src/users/user-settings.c:557
+#: ../src/users/user-settings.c:686
 #, 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:562
+#: ../src/users/user-settings.c:691
 msgid "Give up administration rights"
 msgstr "æ?¾æ£?系統管ç??è??æ¬?é??"
 
-#: ../src/users/users-tool.c:284
+#: ../src/users/user-settings.c:1459
+msgid "Applying changes to user settings..."
+msgstr ""
+
+#: ../src/users/users-tool.c:288
 msgid "Users Settings"
 msgstr "使ç?¨è??設å®?å?¼"
 
 #~ 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> å·²å­?å?¨ã??使ç?¨è??å?¯è?½æ??æ²?æ??è®?寫該ç?®é??å¿?é ?ç??æ¬?é??ã??æ?¨ä»?ç?¶è¦?使"
+#~ "ç?¨å®?å??ï¼?"
+
+#~ msgid "_Short Name:"
+#~ msgstr "ç?­å¼?å??稱(_S):"
+
+#~ msgid "Address: %s Subnet mask: %s"
+#~ msgstr "ä½?å??ï¼? %s å­?網路é?®ç½©ï¼? %s"
+
+#~ msgid "Address: %s Remote address: %s"
+#~ msgstr "ä½?å??ï¼? %s é? 端ä½?å??ï¼? %s"
+
+#~ msgid "Type: %s Phone number: %s"
+#~ msgstr "é¡?å??ï¼? %s é?»è©±è??碼ï¼? %s"
+
+#~ msgid "Type: %s Access point name: %s"
+#~ msgstr "é¡?å??ï¼? %s ç?¡ç·?網路å­?å??é»?ï¼? %s"
+
+#~ msgid "Type: %s Ethernet interface: %s"
+#~ msgstr "é¡?å??ï¼? %s ä¹?太網路ä»?é?¢ï¼? %s"
+
+#~ msgid ""
 #~ "Allow this user to open a local session without entering his password. "
 #~ "The password will still be required to perform administrative tasks."
 #~ msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0dc481d..bd64ee0 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,190 +10,181 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-system-tools 2.29.92\n"
+"Project-Id-Version: gnome-system-tools 2.31.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-27 21:00+0800\n"
-"PO-Revision-Date: 2010-03-27 14:46+0800\n"
-"Last-Translator: Kevin_Wei_2 <kevin_wei3 yahoo com tw>\n"
+"POT-Creation-Date: 2010-08-21 20:47+0800\n"
+"PO-Revision-Date: 2010-08-20 13:45+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gnome-system-tools.schemas.in.h:1
-msgid "Whether the users-admin tool should show system users in the users list"
-msgstr "ã??使ç?¨è??-管ç??ã??å·¥å?·æ??å?¦é¡¯ç¤ºå?¨ä½¿ç?¨è??æ¸?å?®ä¸­ç??系統使ç?¨è??"
-
-#: ../gnome-system-tools.schemas.in.h:2
-msgid ""
-"Whether the users-admin tool should show the root user in the users list"
-msgstr "ã??使ç?¨è??-管ç??ã??å·¥å?·æ??å?¦é¡¯ç¤ºå?¨ä½¿ç?¨è??æ¸?å?®ä¸­ç?? root 使ç?¨è??"
+#: ../interfaces/network.ui.h:1 ../src/network/ifaces-list.c:326
+msgid "Access point name:"
+msgstr "ç?¡ç·?網路å­?å??é»?å??稱ï¼?"
 
-#: ../interfaces/network.ui.h:1
+#: ../interfaces/network.ui.h:2
 msgid "Account data"
 msgstr "帳è??è³?æ??"
 
-#: ../interfaces/network.ui.h:2
-msgid "Connection Settings"
-msgstr "��設��"
-
 #: ../interfaces/network.ui.h:3
-msgid "DNS Servers"
-msgstr "DNS 伺æ??å?¨"
-
-#: ../interfaces/network.ui.h:4
-msgid "Host Settings"
-msgstr "主�設�"
-
-#: ../interfaces/network.ui.h:5
-msgid "Internet service provider data"
-msgstr "網路æ??å??ä¾?æ??å??è³?æ??"
-
-#: ../interfaces/network.ui.h:6
-msgid "Modem Settings"
-msgstr "æ?¸æ??æ©?設å®?å?¼"
-
-#: ../interfaces/network.ui.h:7
-msgid "Search Domains"
-msgstr "æ??å°?網å??"
-
-#: ../interfaces/network.ui.h:8
-msgid "Wireless Settings"
-msgstr "��網路設��"
-
-#: ../interfaces/network.ui.h:9
-msgid "Access point name:"
-msgstr "ç?¡ç·?網路å­?å??é»?å??稱ï¼?"
-
-#: ../interfaces/network.ui.h:10
 msgid "Aliases:"
 msgstr "å?¥å??ï¼?"
 
-#: ../interfaces/network.ui.h:11
+#: ../interfaces/network.ui.h:4
 msgid "Con_figuration:"
 msgstr "設�(_F):"
 
-#: ../interfaces/network.ui.h:12
+#: ../interfaces/network.ui.h:5
+msgid "Connection Settings"
+msgstr "��設��"
+
+#: ../interfaces/network.ui.h:6
 msgid "Connection type:"
 msgstr "é?£ç·?é¡?å??ï¼?"
 
-#: ../interfaces/network.ui.h:13
+#: ../interfaces/network.ui.h:7
 msgid "Connections"
 msgstr "��"
 
-#: ../interfaces/network.ui.h:14
+#: ../interfaces/network.ui.h:8
 msgid "DNS"
 msgstr "DNS"
 
-#: ../interfaces/network.ui.h:15
+#: ../interfaces/network.ui.h:9
+msgid "DNS Servers"
+msgstr "DNS 伺æ??å?¨"
+
+#: ../interfaces/network.ui.h:10
 msgid "D_omain name:"
 msgstr "網å??å??稱(_O):"
 
-#: ../interfaces/network.ui.h:16
+#: ../interfaces/network.ui.h:11
 msgid "Delete current location"
 msgstr "å?ªé?¤ç?®å??ç??ä½?ç½®"
 
-#: ../interfaces/network.ui.h:17
+#: ../interfaces/network.ui.h:12
 msgid "E_nable roaming mode"
 msgstr "å??ç?¨æ¼«é??模å¼?(_N)"
 
-#: ../interfaces/network.ui.h:18
+#: ../interfaces/network.ui.h:13
 msgid "E_nable this connection"
 msgstr "å??ç?¨é??å??é?£ç·?(_N)"
 
-#: ../interfaces/network.ui.h:19
+#: ../interfaces/network.ui.h:14 ../src/network/ifaces-list.c:335
 msgid "Ethernet interface:"
 msgstr "�太網路���"
 
-#: ../interfaces/network.ui.h:20 ../interfaces/users.ui.h:32
+#: ../interfaces/network.ui.h:15 ../interfaces/users.ui.h:27
 msgid "General"
 msgstr "��"
 
-#: ../interfaces/network.ui.h:21
+#: ../interfaces/network.ui.h:16
 msgid "Hexadecimal"
 msgstr "16 ����"
 
-#: ../interfaces/network.ui.h:22
+#: ../interfaces/network.ui.h:17
 msgid "Host Alias Properties"
 msgstr "主æ©?å?¥å??屬æ?§"
 
-#: ../interfaces/network.ui.h:23
+#: ../interfaces/network.ui.h:18
+msgid "Host Settings"
+msgstr "主�設�"
+
+#: ../interfaces/network.ui.h:19
 msgid "Hosts"
 msgstr "主�"
 
-#: ../interfaces/network.ui.h:24 ../interfaces/shares.ui.h:14
+#: ../interfaces/network.ui.h:20 ../interfaces/shares.ui.h:11
 msgid "IP address:"
 msgstr "IP å?°å??ï¼?"
 
-#: ../interfaces/network.ui.h:25
+#: ../interfaces/network.ui.h:21
 msgid "Interface properties"
 msgstr "��屬�"
 
-#: ../interfaces/network.ui.h:26
+#: ../interfaces/network.ui.h:22
+msgid "Internet service provider data"
+msgstr "網路æ??å??ä¾?æ??å??è³?æ??"
+
+#: ../interfaces/network.ui.h:23
 msgid "Location:"
 msgstr "�置�"
 
-#: ../interfaces/network.ui.h:27
+#: ../interfaces/network.ui.h:24
 msgid "Loud"
 msgstr "é«?"
 
-#: ../interfaces/network.ui.h:28
+#: ../interfaces/network.ui.h:25
 msgid "Low"
 msgstr "ä½?"
 
-#: ../interfaces/network.ui.h:29
+#: ../interfaces/network.ui.h:26
 msgid "Medium"
 msgstr "中"
 
-#: ../interfaces/network.ui.h:30
+#: ../interfaces/network.ui.h:27
 msgid "Modem"
 msgstr "æ?¸æ??æ©?"
 
-#: ../interfaces/network.ui.h:31
+#: ../interfaces/network.ui.h:28
+msgid "Modem Settings"
+msgstr "æ?¸æ??æ©?設å®?å?¼"
+
+#: ../interfaces/network.ui.h:29
 msgid "Network _password:"
 msgstr "網路�碼(_P):"
 
-#: ../interfaces/network.ui.h:32
+#: ../interfaces/network.ui.h:30
 msgid "Network name (_ESSID):"
 msgstr "網路å??稱(_ESSID):"
 
-#: ../interfaces/network.ui.h:33
+#: ../interfaces/network.ui.h:31
 msgid "Off"
 msgstr "é??é??"
 
-#: ../interfaces/network.ui.h:34
+#: ../interfaces/network.ui.h:32
 msgid "Options"
 msgstr "é?¸é ?"
 
-#: ../interfaces/network.ui.h:35
+#: ../interfaces/network.ui.h:33
 msgid "P_assword"
 msgstr "�碼(_A)"
 
-#: ../interfaces/network.ui.h:36
+#: ../interfaces/network.ui.h:34
 msgid "Password _type:"
 msgstr "å¯?碼é¡?å??(_T):"
 
-#: ../interfaces/network.ui.h:37
+#: ../interfaces/network.ui.h:35
 msgid "Plain (ASCII)"
 msgstr "ç´?æ??å­? (ASCII)"
 
-#: ../interfaces/network.ui.h:38
+#: ../interfaces/network.ui.h:36
 msgid "Pulses"
 msgstr "è??è¡?"
 
-#: ../interfaces/network.ui.h:39
+#: ../interfaces/network.ui.h:37
 msgid "Save current network configuration as a location"
 msgstr "å°?ç?¾å?¨ç??網路çµ?æ??å?²å­?æ??ä¸?å??ä½?ç½®"
 
-#: ../interfaces/network.ui.h:40
+#: ../interfaces/network.ui.h:38
+msgid "Search Domains"
+msgstr "æ??å°?網å??"
+
+#: ../interfaces/network.ui.h:39
 msgid "Tones"
 msgstr "�調"
 
-#: ../interfaces/network.ui.h:41
+#: ../interfaces/network.ui.h:40
 msgid "Use the Internet service provider nameservers"
 msgstr "使ç?¨ç¶²è·¯æ??å??ä¾?æ??å??å??稱伺æ??å?¨"
 
+#: ../interfaces/network.ui.h:41
+msgid "Wireless Settings"
+msgstr "��網路設��"
+
 #: ../interfaces/network.ui.h:42
 msgid "_Autodetect"
 msgstr "è?ªå??å?µæ¸¬(_A)"
@@ -246,7 +237,7 @@ msgstr "設å®?æ?¸æ??æ©?ç?ºé ?設路ç?±(_S)"
 msgid "_Subnet mask:"
 msgstr "�網路�罩(_S):"
 
-#: ../interfaces/network.ui.h:55
+#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82
 msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
@@ -264,98 +255,98 @@ msgid "Select the services that you wish to activate:"
 msgstr "é?¸æ??æ?¨æ?³è¦?使ç?¨ç??æ??å??ï¼?"
 
 #: ../interfaces/shares.ui.h:1
-msgid "Allowed Hosts"
-msgstr "å??許ç??主æ©?"
+msgid "Add allowed hosts"
+msgstr "å? å?¥å??許ç??主æ©?"
 
 #: ../interfaces/shares.ui.h:2
-msgid "Hosts Settings"
-msgstr "主�設�"
+msgid "Allowed Hosts"
+msgstr "å??許ç??主æ©?"
 
 #: ../interfaces/shares.ui.h:3
-msgid "Share Properties"
-msgstr "�享屬�"
-
-#: ../interfaces/shares.ui.h:4
-msgid "Shared Folder"
-msgstr "å?±äº«è³?æ??夾"
-
-#: ../interfaces/shares.ui.h:5
-msgid "Windows sharing"
-msgstr "Windows �享"
-
-#: ../interfaces/shares.ui.h:6
-msgid "Enter password for user:"
-msgstr "輸å?¥ä½¿ç?¨è??ç??å¯?碼:"
-
-#: ../interfaces/shares.ui.h:7
-msgid "Add allowed hosts"
-msgstr "å? å?¥å??許ç??主æ©?"
-
-#: ../interfaces/shares.ui.h:8
 msgid "Allowed hosts:"
 msgstr "å??許ç??主æ©?ï¼?"
 
-#: ../interfaces/shares.ui.h:9
+#: ../interfaces/shares.ui.h:4
 msgid "Comment:"
 msgstr "註解:"
 
-#: ../interfaces/shares.ui.h:10
+#: ../interfaces/shares.ui.h:5
 msgid "Domain / _Workgroup:"
 msgstr "網å??/å·¥ä½?群çµ?(_W)"
 
-#: ../interfaces/shares.ui.h:11
+#: ../interfaces/shares.ui.h:6
 msgid "Enter password for user"
 msgstr "輸å?¥ä½¿ç?¨è??ç??å¯?碼"
 
-#: ../interfaces/shares.ui.h:12
+#: ../interfaces/shares.ui.h:7
+msgid "Enter password for user:"
+msgstr "輸å?¥ä½¿ç?¨è??ç??å¯?碼:"
+
+#: ../interfaces/shares.ui.h:8
 msgid "General Properties"
 msgstr "��屬�"
 
-#: ../interfaces/shares.ui.h:13
+#: ../interfaces/shares.ui.h:9
 msgid "Host name:"
 msgstr "主æ©?å??稱ï¼?"
 
-#: ../interfaces/shares.ui.h:15
+#: ../interfaces/shares.ui.h:10
+msgid "Hosts Settings"
+msgstr "主�設�"
+
+#: ../interfaces/shares.ui.h:12
 msgid "Name:"
 msgstr "å??稱ï¼?"
 
-#: ../interfaces/shares.ui.h:16
+#: ../interfaces/shares.ui.h:13
 msgid "Netmask:"
 msgstr "�網路�罩:"
 
-#: ../interfaces/shares.ui.h:17
+#: ../interfaces/shares.ui.h:14
 msgid "Network:"
 msgstr "網路:"
 
-#: ../interfaces/shares.ui.h:18 ../src/shares/nfs-acl-table.c:56
+#: ../interfaces/shares.ui.h:15 ../src/shares/nfs-acl-table.c:56
 msgid "Read only"
 msgstr "��"
 
-#: ../interfaces/shares.ui.h:19
+#: ../interfaces/shares.ui.h:16
 msgid "Share"
 msgstr "å??享"
 
-#: ../interfaces/shares.ui.h:20
+#: ../interfaces/shares.ui.h:17
+msgid "Share Properties"
+msgstr "�享屬�"
+
+#: ../interfaces/shares.ui.h:18
 msgid "Share through:"
 msgstr "�享��"
 
-#: ../interfaces/shares.ui.h:21 ../src/shares/shares.desktop.in.in.h:2
+#: ../interfaces/shares.ui.h:19
+msgid "Shared Folder"
+msgstr "å?±äº«è³?æ??夾"
+
+#: ../interfaces/shares.ui.h:20 ../src/shares/shares.desktop.in.in.h:2
 #: ../src/shares/shares-tool.c:237
 msgid "Shared Folders"
 msgstr "å?±äº«ç??è³?æ??夾"
 
-#: ../interfaces/shares.ui.h:22
+#: ../interfaces/shares.ui.h:21
 msgid "This computer is a _WINS server"
 msgstr "æ?¬é?»è?¦æ?¯ _WINS 伺æ??å?¨"
 
-#: ../interfaces/shares.ui.h:23
+#: ../interfaces/shares.ui.h:22
 msgid "Users"
 msgstr "使ç?¨è??"
 
-#: ../interfaces/shares.ui.h:24
+#: ../interfaces/shares.ui.h:23
 msgid "WINS _server:"
 msgstr "WINS 伺æ??å?¨(_S)"
 
+#: ../interfaces/shares.ui.h:24
+msgid "Windows sharing"
+msgstr "Windows �享"
+
 #: ../interfaces/shares.ui.h:25
 msgid "_Path:"
 msgstr "路�(_P):"
@@ -365,29 +356,29 @@ msgid "_Read only"
 msgstr "��(_R)"
 
 #: ../interfaces/time.ui.h:1
-msgid "Selection"
-msgstr "é?¸æ??å??"
-
-#: ../interfaces/time.ui.h:2
-msgid "Time Zone"
-msgstr "æ??å??"
-
-#: ../interfaces/time.ui.h:3
 msgid "Add NTP Server"
 msgstr "å? å?¥ NTP 伺æ??å?¨"
 
-#: ../interfaces/time.ui.h:4
+#: ../interfaces/time.ui.h:2
 msgid "NTP server"
 msgstr "NTP 伺æ??å?¨"
 
-#: ../interfaces/time.ui.h:5
+#: ../interfaces/time.ui.h:3
 msgid "Se_lect Servers"
 msgstr "é?¸å??伺æ??å?¨(_L)"
 
-#: ../interfaces/time.ui.h:6
+#: ../interfaces/time.ui.h:4
+msgid "Selection"
+msgstr "é?¸æ??å??"
+
+#: ../interfaces/time.ui.h:5
 msgid "Synchronize now"
 msgstr "ç«?å?»å??æ­¥"
 
+#: ../interfaces/time.ui.h:6
+msgid "Time Zone"
+msgstr "æ??å??"
+
 #: ../interfaces/time.ui.h:7
 msgid "Time servers"
 msgstr "æ??é??æ ¡å°?伺æ??å?¨"
@@ -421,118 +412,104 @@ msgid "_Time:"
 msgstr "æ??å?»(_T):"
 
 #: ../interfaces/users.ui.h:1
-msgid "Advanced Settings"
-msgstr "é?²é??設å®?"
+msgid ""
+"A user with this name already exists. Please choose a different name for the "
+"new user."
+msgstr "å·²ç¶?æ??å??樣å??稱ç??使ç?¨è??å­?å?¨ã??è«?ç?ºæ?°ç??使ç?¨è??é?¸æ??ä¸?å??ç??å??稱ã??"
 
 #: ../interfaces/users.ui.h:2
-msgid "Automatic UID/GID"
-msgstr "è?ªå??å®?æ?? UID/GID"
+msgid "Account _type:"
+msgstr "帳è??é¡?å??(_T):"
 
 #: ../interfaces/users.ui.h:3
-msgid "Basic Settings"
-msgstr "��設�"
+msgid "Advanced"
+msgstr "é?²é??"
 
 #: ../interfaces/users.ui.h:4
-msgid "Group Members"
-msgstr "群çµ?æ??å?¡"
+msgid "Advanced Settings"
+msgstr "é?²é??設å®?"
 
 #: ../interfaces/users.ui.h:5
-msgid "Optional Settings"
-msgstr "é?¸æ??æ?§è¨­å®?"
+msgid "Assign a random password by default"
+msgstr "é ?設å??é??é?¨æ©?ç??å¯?碼"
 
 #: ../interfaces/users.ui.h:6
-msgid "Password Settings"
-msgstr "�碼設�"
+msgid "Automatic UID/GID"
+msgstr "è?ªå??å®?æ?? UID/GID"
 
+#: ../interfaces/users.ui.h:7
+msgid "Basic Settings"
+msgstr "��設�"
 
 #: ../interfaces/users.ui.h:8
-msgid "System Defaults"
-msgstr "系統é ?設å?¼"
-
-#: ../interfaces/users.ui.h:9
-msgid "Account _type:"
-msgstr "帳è??é¡?å??(_T):"
-
-#: ../interfaces/users.ui.h:10
-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 "é ?設å??é??é?¨æ©?ç??å¯?碼"
-
-#: ../interfaces/users.ui.h:13
 msgid "Change Advanced User Settings"
 msgstr "æ?¹è®?é?²é??ç??使ç?¨è??設å®?å?¼"
 
-#: ../interfaces/users.ui.h:14
+#: ../interfaces/users.ui.h:9
 msgid "Change User Account Type"
 msgstr "æ?¹è®?使ç?¨è??帳è??é¡?å??"
 
-#: ../interfaces/users.ui.h:15
-msgid "Change User Name and Login"
-msgstr "æ?¹è®?使ç?¨è??å??稱並ç?»å?¥"
+#: ../interfaces/users.ui.h:10
+msgid "Change User Name"
+msgstr "æ?¹è®?使ç?¨è??å??稱"
 
-#: ../interfaces/users.ui.h:16
+#: ../interfaces/users.ui.h:11
 msgid "Change User Password"
 msgstr "æ?¹è®?使ç?¨è??å¯?碼"
 
-#: ../interfaces/users.ui.h:17
+#: ../interfaces/users.ui.h:12
 msgid "Changing advanced settings for:"
 msgstr "æ­£å?¨æ?¹è®?此人ç??é?²é??設å®?å?¼ï¼?"
 
-#: ../interfaces/users.ui.h:18
+#: ../interfaces/users.ui.h:13
 msgid "Changing user account type for:"
 msgstr "æ?¹è®?使ç?¨è??帳è??é¡?å??ï¼?"
 
-#: ../interfaces/users.ui.h:19
+#: ../interfaces/users.ui.h:14
 msgid "Changing user name for:"
 msgstr "æ­£å?¨æ?¹è®?使ç?¨è??å??稱ï¼?"
 
-#: ../interfaces/users.ui.h:20
+#: ../interfaces/users.ui.h:15
 msgid "Changing user password for:"
 msgstr "æ­£å?¨æ?¹è®?使ç?¨è??å¯?碼ï¼?"
 
-#: ../interfaces/users.ui.h:21
+#: ../interfaces/users.ui.h:16
 msgid "Con_firmation:"
 msgstr "確��碼(_F):"
 
+#: ../interfaces/users.ui.h:17
+msgid "Contact Information"
+msgstr "�絡人��"
 
-#: ../interfaces/users.ui.h:23
+#: ../interfaces/users.ui.h:18
 msgid "Create New User"
 msgstr "建ç«?æ?°ç??使ç?¨è??"
 
-#: ../interfaces/users.ui.h:24
+#: ../interfaces/users.ui.h:19
 msgid "Create a new user"
 msgstr "建ç«?ä¸?å??æ?°ç??使ç?¨è??"
 
-#: ../interfaces/users.ui.h:25
+#: ../interfaces/users.ui.h:20
 msgid "Days between warning and password expiration:"
 msgstr "å¯?碼é??æ??å??ï¼?æ?¼æ??å®?æ?¥æ?¸ç?¼å?ºè­¦å??ï¼?"
 
-#: ../interfaces/users.ui.h:26
+#: ../interfaces/users.ui.h:21
 msgid "Default _group:"
 msgstr "é ?設群çµ?(_G):"
 
-#: ../interfaces/users.ui.h:27
+#: ../interfaces/users.ui.h:22
 msgid "Default _shell:"
 msgstr "é ?設 _Shellï¼?"
 
-#: ../interfaces/users.ui.h:28
+#: ../interfaces/users.ui.h:23
 msgid "Disable _account"
 msgstr "å??ç?¨å¸³è??(_A)"
 
-#: ../interfaces/users.ui.h:29
+#: ../interfaces/users.ui.h:24
 msgid "Don't ask for password on _login"
 msgstr "ç?»å?¥æ??ä¸?è©¢å??å¯?碼(_L)"
 
-#: ../interfaces/users.ui.h:30
+#: ../interfaces/users.ui.h:25
 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 "
@@ -541,78 +518,98 @@ msgstr ""
 "使ç?¨æ?¨ç?»å?¥ç??å¯?碼ä¾?å? å¯?æ?¨æ??æ??ç??æª?æ¡?ï¼?以便é?²æ­¢è?½ç?´æ?¥ç¢°è§¸æ?¨ç??é?»è?¦ç??人å??å¾?å®?å??ï¼?"
 "ä¸?é??å? å¯?æ??ç¨?ç¨?æ¸?å°?系統ç??æ??è?½ã??"
 
-#: ../interfaces/users.ui.h:31
+#: ../interfaces/users.ui.h:26
 msgid "Full _Name:"
 msgstr "å?¨å??(_N):"
 
-#: ../interfaces/users.ui.h:33
+#: ../interfaces/users.ui.h:28
 msgid "Generate _random password"
 msgstr "ç?¢ç??é?¨æ©?å¯?碼(_R)"
 
-#: ../interfaces/users.ui.h:34
+#: ../interfaces/users.ui.h:29
+msgid "Group Members"
+msgstr "群çµ?æ??å?¡"
+
+#: ../interfaces/users.ui.h:30
 msgid "Group _ID:"
 msgstr "群� _ID�"
 
-#: ../interfaces/users.ui.h:35
+#: ../interfaces/users.ui.h:31
 msgid "Group _name:"
 msgstr "群çµ?å??稱(_N):"
 
-#: ../interfaces/users.ui.h:36
+#: ../interfaces/users.ui.h:32
 msgid "Group properties"
 msgstr "群�屬�"
 
-#: ../interfaces/users.ui.h:37
+#: ../interfaces/users.ui.h:33
+msgid "Groups available on the system:"
+msgstr "系統中å?¯ç?¨ç??群çµ?ï¼?"
+
+#: ../interfaces/users.ui.h:34
 msgid "Groups settings"
 msgstr "群�設��"
 
-#: ../interfaces/users.ui.h:38
+#: ../interfaces/users.ui.h:35
 msgid "Ma_ximum days a password may be used:"
 msgstr "å¯?碼å?¯ä½¿ç?¨ç??æ?¥æ?¸ä¸?é??(_X):"
 
-#: ../interfaces/users.ui.h:39
+#: ../interfaces/users.ui.h:36
 msgid "Maximum GID:"
 msgstr "GID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:40
+#: ../interfaces/users.ui.h:37
 msgid "Maximum UID:"
 msgstr "UID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:41
+#: ../interfaces/users.ui.h:38
 msgid "Mi_nimum days between password changes:"
 msgstr "å¯?碼使ç?¨äº?æ??å®?ç??æ?¥æ?¸å¾?æ?¹å?¯ä¿®æ?¹(_N):"
 
-#: ../interfaces/users.ui.h:42
+#: ../interfaces/users.ui.h:39
 msgid "Minimum GID:"
 msgstr "GID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:43
+#: ../interfaces/users.ui.h:40
 msgid "Minimum UID:"
 msgstr "UID å?¼ä¸?é??ï¼?"
 
-#: ../interfaces/users.ui.h:44
+#: ../interfaces/users.ui.h:41
 msgid "Minimum days allowed between password changes:"
 msgstr "å¯?碼使ç?¨äº?æ??å®?ç??æ?¥æ?¸å¾?æ?¹å?¯ä¿®æ?¹ï¼?"
 
-#: ../interfaces/users.ui.h:45
+#: ../interfaces/users.ui.h:42
 msgid "New _password:"
 msgstr "æ?°ç??å¯?碼(_P):"
 
-#: ../interfaces/users.ui.h:46
+#: ../interfaces/users.ui.h:43
 msgid "Number of days that a password may be used:"
 msgstr "å¯?碼å?¯ä½¿ç?¨ç??æ?¥æ?¸ï¼?"
 
-#: ../interfaces/users.ui.h:47
+#: ../interfaces/users.ui.h:44
 msgid "O_ffice location:"
 msgstr "���置(_F):"
 
-#: ../interfaces/users.ui.h:48
+#: ../interfaces/users.ui.h:45
+msgid "Optional Settings"
+msgstr "é?¸æ??æ?§è¨­å®?"
+
+#: ../interfaces/users.ui.h:46
+msgid "Password Settings"
+msgstr "�碼設�"
+
+#: ../interfaces/users.ui.h:47
 msgid "Password set to: "
 msgstr "�碼設���"
 
-#: ../interfaces/users.ui.h:49
+#: ../interfaces/users.ui.h:48
 msgid "Privileges"
 msgstr "æ¬?é??"
 
+#: ../interfaces/users.ui.h:49
+msgid "Profile Settings"
+msgstr "設å®?çµ?å??設å®?å?¼"
+
 #: ../interfaces/users.ui.h:50
 msgid "Profile _name:"
 msgstr "設å®?çµ?å??å??稱(_N):"
@@ -621,28 +618,15 @@ msgstr "設å®?çµ?å??å??稱(_N):"
 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:53
-msgid ""
-"Short name must consist of:\n"
-"  â?£ lower case letters from the English alphabet\n"
-"  â?£ digits\n"
-"  â?£ any of the characters \".\", \"-\" and \"_\""
-msgstr ""
-"ç?­å¼?å??稱å¿?é ?ç?±é??äº?å­?çµ?æ??ï¼?\n"
-"  â?£ å°?寫è?±æ??å­?æ¯?\n"
-"  � ��\n"
-"  â?£ å?¶ä»?å­?å??å¦? \".\"ã?? \"-\" å?? \"_\""
-
-#: ../interfaces/users.ui.h:57
-msgid "Short name must start with a letter!"
-msgstr "ç?­å¼?å??稱å¿?é ?以è?±æ??å­?æ¯?é??é ­ï¼?"
+#: ../interfaces/users.ui.h:52
+msgid "System Defaults"
+msgstr "系統é ?設å?¼"
 
-#: ../interfaces/users.ui.h:58
+#: ../interfaces/users.ui.h:53
 msgid "This account is disabled."
 msgstr "é??å??帳è??å·²å??ç?¨ã??"
 
-#: ../interfaces/users.ui.h:59
+#: ../interfaces/users.ui.h:54
 msgid ""
 "This account is using special settings that have been defined manually. Use "
 "the <i>Advanced Settings</i> dialog to tune them."
@@ -650,98 +634,129 @@ msgstr ""
 "é??å??帳è??使ç?¨äº?以æ??å??設å®?ç??ç?¹æ®?設å®?å?¼ã??è«?使ç?¨ <i>é?²é??設å®?</i> å°?話ç??ä¾?調æ?´ä»?"
 "å??ã??"
 
-#: ../interfaces/users.ui.h:60
+#: ../interfaces/users.ui.h:55
 msgid "User ID:"
 msgstr "使ç?¨è??IDï¼?"
 
-#: ../interfaces/users.ui.h:61
+#: ../interfaces/users.ui.h:56
 msgid "User Privileges"
 msgstr "使ç?¨è??æ¬?é??"
 
-#: ../interfaces/users.ui.h:62
+#: ../interfaces/users.ui.h:57
 msgid "User profiles"
 msgstr "使ç?¨è??設å®?æª?"
 
+#. 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:59
+msgid ""
+"Username must consist of:\n"
+"  â?£ lower case letters from the English alphabet\n"
+"  â?£ digits\n"
+"  â?£ any of the characters \".\", \"-\" and \"_\""
+msgstr ""
+"使ç?¨è??å??稱å¿?é ?ç?±é??äº?å­?çµ?æ??ï¼?\n"
+"  â?£ å°?寫è?±æ??å­?æ¯?\n"
+"  � ��\n"
+"  â?£ å?¶ä»?å­?å??å¦? \".\"ã?? \"-\" å?? \"_\""
+
 #: ../interfaces/users.ui.h:63
+msgid "Username must start with a letter!"
+msgstr "使ç?¨è??å??稱å¿?é ?以å­?æ¯?é??é ­ï¼?"
+
+#: ../interfaces/users.ui.h:64
 msgid "You can't change user ID while the user is logged in."
 msgstr "æ?¨ä¸?è?½å?¨ä½¿ç?¨è??è??æ?¼ç?»å?¥ç??æ??æ??æ?¹è®?使ç?¨è?? IDã??"
 
-#: ../interfaces/users.ui.h:64
+#: ../interfaces/users.ui.h:65
 msgid "_Add Profile"
 msgstr "��設��(_A)"
 
-#: ../interfaces/users.ui.h:65
+#: ../interfaces/users.ui.h:66
 msgid "_Advanced Settings"
 msgstr "é?²é??設å®?(_A)"
 
-#: ../interfaces/users.ui.h:66
+#: ../interfaces/users.ui.h:67
 msgid "_Change..."
 msgstr "��(_C)..."
 
-#: ../interfaces/users.ui.h:67
+#: ../interfaces/users.ui.h:68
 msgid "_Comments"
 msgstr "å??註(_C)"
 
-#: ../interfaces/users.ui.h:68
+#: ../interfaces/users.ui.h:69
 msgid "_Current password:"
 msgstr "ç?®å??ç??å¯?碼(_C):"
 
-#: ../interfaces/users.ui.h:69
+#: ../interfaces/users.ui.h:70
 msgid "_Custom"
 msgstr "��(_C)"
 
-#: ../interfaces/users.ui.h:70
+#: ../interfaces/users.ui.h:71
 msgid "_Days between warning and password expiration:"
 msgstr "å¯?碼é??æ??å??ï¼?æ?¼æ??å®?æ?¥æ?¸ç?¼å?ºè­¦å??(_D):"
 
-#: ../interfaces/users.ui.h:71
+#: ../interfaces/users.ui.h:72
 msgid "_Enable Account"
 msgstr "å??ç?¨å¸³è??(_E)"
 
-#: ../interfaces/users.ui.h:72
+#: ../interfaces/users.ui.h:73
 msgid "_Encrypt home folder to protect sensitive data"
 msgstr "å? å¯?家ç?®é??以ä¿?è­·æ??æ??è³?æ??(_E)"
 
-#: ../interfaces/users.ui.h:73
+#: ../interfaces/users.ui.h:74
 msgid "_Generate"
 msgstr "ç?¢ç??(_G)"
 
-#: ../interfaces/users.ui.h:74
+#: ../interfaces/users.ui.h:75
 msgid "_Home directory:"
 msgstr "å??人ç?®é??(_H):"
 
-#: ../interfaces/users.ui.h:75
+#: ../interfaces/users.ui.h:76
 msgid "_Home phone:"
 msgstr "�家�話(_H):"
 
-#: ../interfaces/users.ui.h:76
+#: ../interfaces/users.ui.h:77
 msgid "_Main group:"
 msgstr "主�群�(_M):"
 
-#: ../interfaces/users.ui.h:77
+#: ../interfaces/users.ui.h:78
 msgid "_Manage Groups"
 msgstr "管ç??群çµ?(_M):"
 
-#: ../interfaces/users.ui.h:78
+#: ../interfaces/users.ui.h:79
 msgid "_Name:"
 msgstr "å??稱(_N):"
 
-#: ../interfaces/users.ui.h:79
+#: ../interfaces/users.ui.h:80
 msgid "_Password:"
 msgstr "�碼(_P):"
 
-#: ../interfaces/users.ui.h:80
+#: ../interfaces/users.ui.h:81
 msgid "_Shell:"
 msgstr "_Shell:"
 
-#: ../interfaces/users.ui.h:81
-msgid "_Short Name:"
-msgstr "ç?­å¼?å??稱(_S):"
-
-#: ../interfaces/users.ui.h:82
+#: ../interfaces/users.ui.h:83
 msgid "_Work phone:"
 msgstr "工��話(_W):"
 
+#: ../org.gnome.system-tools.gschema.xml.in.h:1
+msgid "Show root user"
+msgstr "顯示 root 使ç?¨è??"
+
+#: ../org.gnome.system-tools.gschema.xml.in.h:2
+msgid "Show system users"
+msgstr "顯示系統使ç?¨è??"
+
+#: ../org.gnome.system-tools.gschema.xml.in.h:3
+msgid ""
+"Whether the users-admin tool should show system users in the users list."
+msgstr "ã??使ç?¨è??-管ç??ã??å·¥å?·æ??å?¦é¡¯ç¤ºå?¨ä½¿ç?¨è??æ¸?å?®ä¸­ç??系統使ç?¨è??ã??"
+
+#: ../org.gnome.system-tools.gschema.xml.in.h:4
+msgid ""
+"Whether the users-admin tool should show the root user in the users list."
+msgstr "ã??使ç?¨è??-管ç??ã??å·¥å?·æ??å?¦é¡¯ç¤ºå?¨ä½¿ç?¨è??æ¸?å?®ä¸­ç?? root 使ç?¨è??ã??"
+
 #: ../src/common/gst-platform-dialog.c:179
 msgid "The platform you are running is not supported by this tool"
 msgstr "æ?¨æ??å?·è¡?ç??å¹³è?ºå°?æ?ªè¢«æ?¬å·¥å?·æ?¯æ?´"
@@ -760,46 +775,46 @@ msgstr ""
 msgid "Unsupported platform"
 msgstr "ä¸?æ?¯æ?´ç??å¹³å?°"
 
-#: ../src/common/gst-tool.c:190
+#: ../src/common/gst-tool.c:188
 msgid "The configuration could not be loaded"
 msgstr "����設�"
 
 #. OPERATION_COMMIT
-#: ../src/common/gst-tool.c:192
+#: ../src/common/gst-tool.c:190
 msgid "The configuration could not be saved"
 msgstr "ç?¡æ³?å?²å­?çµ?æ??設å®?"
 
-#: ../src/common/gst-tool.c:196
+#: ../src/common/gst-tool.c:194
 msgid "You are not allowed to access the system configuration."
 msgstr "æ?¨ä¸?å??許å­?å??系統設å®?ã??"
 
 #. OPERATION_COMMIT
-#: ../src/common/gst-tool.c:198 ../src/common/gst-tool.c:690
+#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685
 msgid "You are not allowed to modify the system configuration."
 msgstr "æ?¨ä¸?被å??許修æ?¹ç³»çµ±çµ?æ??ã??"
 
-#: ../src/common/gst-tool.c:201
+#: ../src/common/gst-tool.c:199
 msgid "Invalid data was found."
 msgstr "æ?¾ä¸?å?°ç?¡æ??ç??è³?æ??ã??"
 
 #. OOBS_RESULT_ERROR
-#: ../src/common/gst-tool.c:203
+#: ../src/common/gst-tool.c:201
 msgid "An unknown error occurred."
 msgstr "ç?¼ç??ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../src/common/gst-tool.c:427
+#: ../src/common/gst-tool.c:422
 msgid "Could not display help"
 msgstr "ç?¡æ³?顯示說æ??æ??件"
 
-#: ../src/common/gst-tool.c:621
+#: ../src/common/gst-tool.c:616
 msgid "The system configuration has potentially changed."
 msgstr "系統çµ?æ??å?¯è?½è¢«æ?´æ?¹äº?ã??"
 
-#: ../src/common/gst-tool.c:623
+#: ../src/common/gst-tool.c:618
 msgid "Update content? This will lose any modification in course."
 msgstr "æ?¯å?¦è¦?æ?´æ?°å?§å®¹ï¼?é??樣æ??失å?»ä»»ä½?å?¨å??å??é??ç¨?中ç??ä¿®æ?¹ã??"
 
-#: ../src/common/gst-tool.c:692
+#: ../src/common/gst-tool.c:687
 #, c-format
 msgid ""
 "An error occurred while checking for authorizations: %s\n"
@@ -818,7 +833,7 @@ msgstr "å? å?¥(_A)"
 msgid "_Delete"
 msgstr "��(_D)"
 
-#: ../src/network/address-list.c:486
+#: ../src/network/address-list.c:485
 msgid "Type address"
 msgstr "輸å?¥å?°å??"
 
@@ -922,61 +937,48 @@ msgstr "å·²å??ç?¨æ¼«é??模å¼?"
 
 #: ../src/network/ifaces-list.c:289
 #, c-format
-msgid "Essid: %s "
-msgstr "Essid: %s "
+msgid "<b>Essid:</b> %s "
+msgstr "<b>Essidï¼?</b> %s "
 
-#: ../src/network/ifaces-list.c:295
-#, c-format
-msgid "Address: %s Subnet mask: %s"
-msgstr "ä½?å??ï¼? %s å­?網路é?®ç½©ï¼? %s"
+#: ../src/network/ifaces-list.c:296 ../src/network/ifaces-list.c:301
+#: ../src/network/ifaces-list.c:306
+msgid "Address:"
+msgstr "ä½?å??ï¼?"
 
-#: ../src/network/ifaces-list.c:299
-#, c-format
-msgid "Address: %s"
-msgstr "ä½?å??ï¼? %s"
+#: ../src/network/ifaces-list.c:298
+msgid "Subnet mask:"
+msgstr "�網路�罩�"
 
-#: ../src/network/ifaces-list.c:303
-#, c-format
-msgid "Address: %s Remote address: %s"
-msgstr "ä½?å??ï¼? %s é? 端ä½?å??ï¼? %s"
+#: ../src/network/ifaces-list.c:308
+msgid "Remote address:"
+msgstr "é? 端ä½?å??ï¼?"
 
-#: ../src/network/ifaces-list.c:315
-#, c-format
-msgid "Type: %s Phone number: %s"
-msgstr "é¡?å??ï¼? %s é?»è©±è??碼ï¼? %s"
-
-#: ../src/network/ifaces-list.c:318
-#, c-format
-msgid "Type: %s Access point name: %s"
-msgstr "é¡?å??ï¼? %s ç?¡ç·?網路å­?å??é»?ï¼? %s"
+#: ../src/network/ifaces-list.c:320 ../src/network/ifaces-list.c:325
+#: ../src/network/ifaces-list.c:334 ../src/network/ifaces-list.c:339
+msgid "Type:"
+msgstr "é¡?å??ï¼?"
 
-#: ../src/network/ifaces-list.c:325
-#, c-format
-msgid "Type: %s Ethernet interface: %s"
-msgstr "é¡?å??ï¼? %s ä¹?太網路ä»?é?¢ï¼? %s"
+#: ../src/network/ifaces-list.c:321
+msgid "Phone number:"
+msgstr "é?»è©±è??碼ï¼?"
 
-#: ../src/network/ifaces-list.c:329
-#, c-format
-msgid "Type: %s"
-msgstr "é¡?å??ï¼? %s"
-
-#: ../src/network/ifaces-list.c:346
+#: ../src/network/ifaces-list.c:356
 msgid "Wireless connection"
 msgstr "��網路��"
 
-#: ../src/network/ifaces-list.c:348
+#: ../src/network/ifaces-list.c:358
 msgid "Infrared connection"
 msgstr "�����"
 
-#: ../src/network/ifaces-list.c:350
+#: ../src/network/ifaces-list.c:360
 msgid "Wired connection"
 msgstr "��網路��"
 
-#: ../src/network/ifaces-list.c:352
+#: ../src/network/ifaces-list.c:362
 msgid "Parallel port connection"
 msgstr "並å??å? é?£ç·?"
 
-#: ../src/network/ifaces-list.c:354
+#: ../src/network/ifaces-list.c:364
 msgid "Point to point connection"
 msgstr "�����"
 
@@ -1048,12 +1050,12 @@ msgstr "網路設�"
 msgid "Settings for service \"%s\""
 msgstr "æ??å??â??%sâ??ç??設å®?"
 
-#: ../src/services/callbacks.c:125
+#: ../src/services/callbacks.c:122
 #, c-format
 msgid "Are you sure you want to deactivate %s?"
 msgstr "æ?¨ç¢ºå®?è¦?å??ç?¨ %sï¼?"
 
-#: ../src/services/callbacks.c:129
+#: ../src/services/callbacks.c:126
 msgid ""
 "This may affect your system behavior in several ways, possibly leading to "
 "data loss."
@@ -1523,11 +1525,11 @@ msgstr "å? å?¥å?±äº«ç??è·¯å¾?ï¼?å¦?æ??å®?å·²å­?å?¨è«?ä¿®æ?¹å®?"
 msgid "PATH"
 msgstr "路�"
 
-#: ../src/shares/nautilus/nautilus-shares.c:152
+#: ../src/shares/nautilus/nautilus-shares.c:151
 msgid "_Share Folder..."
 msgstr "å?±äº«è³?æ??夾(_S)..."
 
-#: ../src/shares/nautilus/nautilus-shares.c:153
+#: ../src/shares/nautilus/nautilus-shares.c:152
 msgid "Share this folder with other computers"
 msgstr "è??å?¶å®?é?»è?¦å?±äº«æ­¤è³?æ??夾"
 
@@ -1586,6 +1588,18 @@ msgid ""
 "folders."
 msgstr "æ?¨è?³å°?è¦?å®?è£? Samba æ?? NFS ä¾?å??享ç??è³?æ??夾ã??"
 
+#: ../src/time/e-map/e-map.c:620
+msgid "World Map"
+msgstr "ä¸?ç??å?°å??"
+
+#: ../src/time/e-map/e-map.c:622
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"ç?¨ä¾?é?¸æ??æ??å??ç??æ»?é¼ äº?å??å¼?å?°å??å??件ã??使ç?¨é?µç?¤ç??使ç?¨è??æ??該使ç?¨ä¸?æ?¹ç??ä¸?æ??å¼?çµ?å??æ?¹"
+"å¡?ä¾?é?¸æ??æ??å??ã??"
+
 #: ../src/time/time.desktop.in.in.h:1
 msgid "Change system time, date, and timezone"
 msgstr "æ?¹è®?系統æ??é??ã??æ?¥æ??å??æ??å??"
@@ -1594,38 +1608,38 @@ msgstr "æ?¹è®?系統æ??é??ã??æ?¥æ??å??æ??å??"
 msgid "Time and Date"
 msgstr "æ??é??å??æ?¥æ??設å®?"
 
-#: ../src/time/time-tool.c:402
+#: ../src/time/time-tool.c:398
 msgid "NTP support is not installed"
 msgstr "æ²?æ??å®?è£? NTP æ?¯æ?´"
 
-#: ../src/time/time-tool.c:404
+#: ../src/time/time-tool.c:400
 msgid ""
 "Please install and activate NTP support in the system to enable "
 "synchronization of your local time server with internet time servers."
 msgstr ""
 "è«?å?¨ç³»çµ±å®?è£?並å??ç?¨ NTP æ?¯æ?´ï¼?令æ?¨ç??æ?¬å?°æ??é??伺æ??å?¨è?½è??網路æ??é??伺æ??å?¨é?²è¡?å??æ­¥ã??"
 
-#: ../src/time/time-tool.c:433
+#: ../src/time/time-tool.c:429
 msgid "Enabling NTP"
 msgstr "å??ç?¨ NTP"
 
-#: ../src/time/time-tool.c:433
+#: ../src/time/time-tool.c:429
 msgid "Disabling NTP"
 msgstr "å??ç?¨ NTP"
 
-#: ../src/time/time-tool.c:445
+#: ../src/time/time-tool.c:441
 msgid "Synchronizing system clock"
 msgstr "系統æ??é??å??æ­¥"
 
-#: ../src/time/time-tool.c:525
+#: ../src/time/time-tool.c:521
 msgid "Keep synchronized with Internet servers"
 msgstr "è??網路伺æ??å?¨ä¿?æ??å??æ­¥"
 
-#: ../src/time/time-tool.c:526
+#: ../src/time/time-tool.c:522
 msgid "Manual"
 msgstr "æ??å??"
 
-#: ../src/time/time-tool.c:672
+#: ../src/time/time-tool.c:665
 msgid "Time and Date Settings"
 msgstr "æ??é??å??æ?¥æ??設å®?"
 
@@ -1635,7 +1649,7 @@ msgstr "管ç??å?¡ç¾¤çµ?ç?¡æ³?被å?ªé?¤"
 
 #: ../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
+#: ../src/users/user-settings.c:605
 msgid "This would leave the system unusable."
 msgstr "é??樣æ??è®?系統å??ç??å?¨ç?¡æ³?使ç?¨ç??ç??æ??ã??"
 
@@ -1713,6 +1727,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 "��系統��"
@@ -1821,37 +1844,42 @@ msgstr "æ¡?é?¢ä½¿ç?¨è??"
 msgid "Authentication failed"
 msgstr "é©?è­?失æ??"
 
-#: ../src/users/run-passwd.c:495
+#: ../src/users/run-passwd.c:498
 #, c-format
 msgid "The new password is too short"
 msgstr "æ?°ç??å¯?碼太ç?­"
 
-#: ../src/users/run-passwd.c:500
+#: ../src/users/run-passwd.c:504
 #, c-format
 msgid "The new password is too simple"
 msgstr "æ?°ç??å¯?碼太簡å?®"
 
-#: ../src/users/run-passwd.c:505
+#: ../src/users/run-passwd.c:510
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "è??å¯?碼è??æ?°å¯?碼太ç?¸ä¼¼äº?"
 
-#: ../src/users/run-passwd.c:508
+#: ../src/users/run-passwd.c:513
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "æ?°ç??å¯?碼å¿?é ?å??å?«æ?¸å­?æ??ç?¹æ®?å­?å??"
 
-#: ../src/users/run-passwd.c:512
+#: ../src/users/run-passwd.c:517
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "è??å¯?碼è??æ?°å¯?碼æ?¯ç?¸å??ç??"
 
-#: ../src/users/run-passwd.c:516
+#: ../src/users/run-passwd.c:520
+#, c-format
+msgid "The new password has already been used recently."
+msgstr "æ?°ç??å¯?碼已ç¶?å?¨æ??è¿?使ç?¨é??äº?ã??"
+
+#: ../src/users/run-passwd.c:524
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "æ?¨ç??å¯?碼å?¨ç¬¬ä¸?次é©?è­?å¾?å·²ç¶?æ?¹è®?é??äº?ï¼?"
 
-#: ../src/users/run-passwd.c:520
+#: ../src/users/run-passwd.c:528
 #, c-format
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
@@ -1870,9 +1898,9 @@ msgstr "�碼太�"
 
 #: ../src/users/user-password.c:98
 msgid ""
-"User passwords must be longer than 6 characters and preferably formed by "
+"User passwords must be longer than 5 characters and preferably formed by "
 "numbers, letters and special characters."
-msgstr "使ç?¨è??å¯?碼é ?ç?º 6 å??å­?å??以ä¸?ï¼?å??æ??好ç?±æ?¸å­?ã??å­?å??å??ç?¹æ®?å­?å??æ??çµ?æ??ã??"
+msgstr "使ç?¨è??å¯?碼é ?ç?º 5 å??å­?å??以ä¸?ï¼?å??æ??好ç?±æ?¸å­?ã??å­?æ¯?å??ç?¹æ®?å­?å??æ??çµ?æ??ã??"
 
 #: ../src/users/user-password.c:101
 msgid "Password confirmation is not correct"
@@ -1959,15 +1987,6 @@ msgstr "��"
 msgid "None"
 msgstr "æ²?æ??"
 
-#. TRANSLATORS:  This applies to a password. Keep the string short.
-#: ../src/users/user-settings.c:347
-msgid "Not asked on login"
-msgstr "ä¸?å?¨ç?»å?¥æ??è©¢å??"
-
-#: ../src/users/user-settings.c:349
-msgid "Asked on login"
-msgstr "ç?»å?¥æ??è©¢å??"
-
 #: ../src/users/user-settings.c:393
 #, c-format
 msgid "Invalid character \"%c\" in comment"
@@ -1977,67 +1996,140 @@ msgstr "å??註中å?ºç?¾ç?¡æ??ç??å­?å??â??%câ??"
 msgid "Check that this character is not used."
 msgstr "è«?檢æ?¥æ??ç?¡ä½¿ç?¨æ­¤ä¸?正確ç??å­?å??ã??"
 
-#: ../src/users/user-settings.c:417
+#: ../src/users/user-settings.c:426
 msgid "Incomplete path in home directory"
 msgstr "å??人ç?®é??å?«æ??ä¸?å®?æ?´ç??è·¯å¾?"
 
-#: ../src/users/user-settings.c:418
+#: ../src/users/user-settings.c:427
 msgid ""
 "Please enter full path for home directory\n"
-"i.e.: /home/john."
+"<span size=\"smaller\">i.e.: /home/john</span>."
 msgstr ""
 "è«?輸å?¥å®¶ç?®é??ç??å®?æ?´è·¯å¾?\n"
-"ä¾?å¦?ï¼?/home/johnã??"
+"<span size=\"smaller\">ä¾?å¦?ï¼?/home/john</span>ã??"
 
-#: ../src/users/user-settings.c:433
-msgid "Home directory already exists"
+#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491
+#, fuzzy
+#| msgid "Home directory already exists"
+msgid "New home directory already exists, use it?"
 msgstr "家ç?®é??å·²ç¶?å­?å?¨"
 
-#: ../src/users/user-settings.c:434
+#: ../src/users/user-settings.c:449
+#, c-format
+msgid ""
+"The home directory for %s has been set to <tt>%s</tt>, which already exists. "
+"Do you want to use files from this directory, or copy the contents of <tt>%"
+"s</tt> to the new home, overwriting it?\n"
+"\n"
+"In doubt, use the new directory to avoid losing data, and copy files from "
+"the old directory later."
+msgstr ""
+
+#: ../src/users/user-settings.c:461
+msgid "_Replace With Old Files"
+msgstr ""
+
+#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504
+#: ../src/users/user-settings.c:540
+msgid "_Cancel Change"
+msgstr ""
+
+#. TRANSLATORS: This means "use the files from the new location",
+#. * as opposed to those from the old location.
+#: ../src/users/user-settings.c:465
+#, fuzzy
+#| msgid "Keep Files"
+msgid "_Use New Files"
+msgstr "ä¿?ç??æª?æ¡?"
+
+#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510
+msgid "Make user the _owner of the new home directory"
+msgstr ""
+
+#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547
+#, fuzzy
+#| msgid "Incomplete path in home directory"
+msgid "_Delete old home directory"
+msgstr "å??人ç?®é??å?«æ??ä¸?å®?æ?´ç??è·¯å¾?"
+
+#: ../src/users/user-settings.c:493
+#, c-format
+msgid ""
+"The home directory for %s has been set to <tt>%s</tt>, which already exists. "
+"Do you want to use files from this directory, or delete all its contents and "
+"use a completely empty home directory?\n"
+"\n"
+"In doubt, keep the files, and remove them later if needed."
+msgstr ""
+
+#: ../src/users/user-settings.c:503
+#, fuzzy
+#| msgid "Delete Files"
+msgid "_Delete Files"
+msgstr "����"
+
+#: ../src/users/user-settings.c:505
+msgid "_Use Existing Files"
+msgstr ""
+
+#: ../src/users/user-settings.c:526
+msgid "Copy old home directory to new location?"
+msgstr ""
+
+#: ../src/users/user-settings.c:528
 #, 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?"
+"The home directory for %s has been set to <tt>%s</tt>, which doesn't exist. "
+"Do you want to copy the contents of the old home directory (<tt>%s</tt>), or "
+"use a completely empty home directory?\n"
+"\n"
+"If you choose to copy the files to the new location, it's safe to delete the "
+"old directory."
 msgstr ""
-"ç?®é?? <tt>%s</tt> å·²å­?å?¨ã??使ç?¨è??å?¯è?½æ??æ²?æ??è®?寫該ç?®é??å¿?é ?ç??æ¬?é??ã??æ?¨ä»?ç?¶è¦?使ç?¨å®?"
-"å??ï¼?"
 
-#: ../src/users/user-settings.c:440
-msgid "Use this directory"
+#: ../src/users/user-settings.c:539
+#, fuzzy
+#| msgid "Use this directory"
+msgid "_Use Empty Directory"
 msgstr "使ç?¨é??å??ç?®é??"
 
-#: ../src/users/user-settings.c:475
+#. TRANSLATORS: This means "copy files from the old home directory".
+#: ../src/users/user-settings.c:542
+msgid "Co_py Old Files"
+msgstr ""
+
+#: ../src/users/user-settings.c:604
 msgid "ID for the root user should not be modified"
 msgstr "ä¸?æ??ä¿®æ?¹ root 使ç?¨è??ç?? ID"
 
 #. check that UID is free
-#: ../src/users/user-settings.c:479
+#: ../src/users/user-settings.c:608
 #, c-format
 msgid "User ID %d is already used by user %s"
 msgstr "使ç?¨è?? ID %d å·²ç¶?被使ç?¨è?? %s æ??ç?¨"
 
-#: ../src/users/user-settings.c:481
+#: ../src/users/user-settings.c:610
 #, c-format
 msgid "Please choose a different numeric identifier for %s."
 msgstr "è«?ç?º %s é?¸æ??ä¸?å??ç??æ?¸å­?è­?å?¥ç¢¼ã??"
 
-#: ../src/users/user-settings.c:499
+#: ../src/users/user-settings.c:628
 msgid "Incomplete path in shell"
 msgstr "shell å?«æ??ä¸?å®?æ?´ç??è·¯å¾?"
 
-#: ../src/users/user-settings.c:500
+#: ../src/users/user-settings.c:629
 msgid ""
 "Please enter full path for shell\n"
-"i.e.: /bin/bash."
+"<span size=\"smaller\">i.e.: /bin/bash</span>."
 msgstr ""
 "è«?輸å?¥ shell ç??å®?æ?´è·¯å¾?\n"
-"ä¾?å¦?ï¼?/bin/bashã??"
+"<span size=\"smaller\">ä¾?å¦?ï¼?/bin/bash</span>ã??"
 
-#: ../src/users/user-settings.c:534
+#: ../src/users/user-settings.c:663
 msgid "Can't revoke administration rights"
 msgstr "ä¸?è?½è¨»é?·ç³»çµ±ç®¡ç??è??æ¬?é??"
 
-#: ../src/users/user-settings.c:537
+#: ../src/users/user-settings.c:666
 #, c-format
 msgid ""
 "%s is the only administrator on this computer. Revoking administration "
@@ -2046,11 +2138,11 @@ msgstr ""
 "%s æ?¯é??å?°é?»è?¦ä¸?å?¯ä¸?ç??系統管ç??è??ã??註é?·é??å??帳è??ç??系統管ç??è??æ¬?é??æ??å°?è?´æ?¨ç?¡æ³?管ç??"
 "é??å??系統ã??"
 
-#: ../src/users/user-settings.c:554
+#: ../src/users/user-settings.c:683
 msgid "You are about to revoke your own administration rights"
 msgstr "æ?¨å?³å°?註é?·è?ªå·±ç??系統管ç??è??æ¬?é??"
 
-#: ../src/users/user-settings.c:557
+#: ../src/users/user-settings.c:686
 #, c-format
 msgid ""
 "%s will no longer be able to perform administrative tasks. This account "
@@ -2058,15 +2150,45 @@ msgid ""
 msgstr ""
 "%s å°?ä¸?å??è?½é?²è¡?管ç??層ç´?ç??å·¥ä½?ã??å¾?å¾?é??å??帳è??ç?¡æ³?è?ªè¡?å??å??系統管ç??è??æ¬?é??ã??"
 
-#: ../src/users/user-settings.c:562
+#: ../src/users/user-settings.c:691
 msgid "Give up administration rights"
 msgstr "æ?¾æ£?系統管ç??è??æ¬?é??"
 
-#: ../src/users/users-tool.c:284
+#: ../src/users/user-settings.c:1459
+msgid "Applying changes to user settings..."
+msgstr ""
+
+#: ../src/users/users-tool.c:288
 msgid "Users Settings"
 msgstr "使ç?¨è??設å®?å?¼"
 
 #~ 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> å·²å­?å?¨ã??使ç?¨è??å?¯è?½æ??æ²?æ??è®?寫該ç?®é??å¿?é ?ç??æ¬?é??ã??æ?¨ä»?ç?¶è¦?使"
+#~ "ç?¨å®?å??ï¼?"
+
+#~ msgid "_Short Name:"
+#~ msgstr "ç?­å¼?å??稱(_S):"
+
+#~ msgid "Address: %s Subnet mask: %s"
+#~ msgstr "ä½?å??ï¼? %s å­?網路é?®ç½©ï¼? %s"
+
+#~ msgid "Address: %s Remote address: %s"
+#~ msgstr "ä½?å??ï¼? %s é? 端ä½?å??ï¼? %s"
+
+#~ msgid "Type: %s Phone number: %s"
+#~ msgstr "é¡?å??ï¼? %s é?»è©±è??碼ï¼? %s"
+
+#~ msgid "Type: %s Access point name: %s"
+#~ msgstr "é¡?å??ï¼? %s ç?¡ç·?網路å­?å??é»?ï¼? %s"
+
+#~ msgid "Type: %s Ethernet interface: %s"
+#~ msgstr "é¡?å??ï¼? %s ä¹?太網路ä»?é?¢ï¼? %s"
+
+#~ msgid ""
 #~ "Allow this user to open a local session without entering his password. "
 #~ "The password will still be required to perform administrative tasks."
 #~ msgstr ""