diff --git a/lam/locale/zh_TW/LC_MESSAGES/messages.mo b/lam/locale/zh_TW/LC_MESSAGES/messages.mo
index 75a4e85b..14782b9b 100644
Binary files a/lam/locale/zh_TW/LC_MESSAGES/messages.mo and b/lam/locale/zh_TW/LC_MESSAGES/messages.mo differ
diff --git a/lam/locale/zh_TW/LC_MESSAGES/messages.po b/lam/locale/zh_TW/LC_MESSAGES/messages.po
index 5d7b6665..346517a0 100644
--- a/lam/locale/zh_TW/LC_MESSAGES/messages.po
+++ b/lam/locale/zh_TW/LC_MESSAGES/messages.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: LAM 1.0.2\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de \n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2006-05-21 11:44+0800\n"
+"PO-Revision-Date: 2007-01-18 21:00+0800\n"
 "Last-Translator: 洪志明(Hung Chih-ming)<imeuimeu@yahoo.com.tw>\n"
 "Language-Team:Chinese(traditional)<imeuimeu@yahoo.com.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/modules/posixAccount.inc:375
+#: ../lib/modules/posixAccount.inc:360
 msgid "$user and $group are replaced with user name or primary group name."
-msgstr "$user和$group會被使用者帳號及主要群組名稱所取代"
+msgstr "$user和$group會被使用者名稱及主要群組名稱所取代"
 
 #: ../lib/types/mailAlias.inc:108
 #, php-format
@@ -65,7 +65,7 @@ msgstr "(這個項目沒有新的屬性)"
 msgid "(no new binary attributes available for this entry)"
 msgstr "(這個項目沒有新的binary屬性)"
 
-#: ../lib/modules/posixAccount.inc:237
+#: ../lib/modules/posixAccount.inc:222
 msgid "/home/smiller"
 msgstr "/home/smiller"
 
@@ -74,22 +74,24 @@ msgid "A required column is missing in your CSV file."
 msgstr "您的CSV檔中缺少一個必要欄位."
 
 #: ../lib/modules/kolabUser.inc:133
-msgid "A user may define who is allowed to act on behalf of herself. This property "
+msgid ""
+"A user may define who is allowed to act on behalf of herself. This property "
 "is checked when using the Kolab smtp daemon (Postfix) to send emails."
-msgstr "使用者可以容許誰來扮演自身的行為,在Kolab smtp 伺服器(Postfix)送出電子郵件時會"
-"檢查這個屬性"
+msgstr ""
+"使用者可以同意由某人來代表自已, 在 Kolab smtp 伺服器(Postfix)寄出電子郵件時會"
+"檢查這個屬性."
 
-#: ../lib/modules/sambaSamAccount.inc:436
+#: ../lib/modules/sambaSamAccount.inc:443
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr "阿布達比, 馬斯喀特, 巴庫"
 
 #: ../lib/modules/account.inc:53
 msgid "Account"
-msgstr "使用者帳號"
+msgstr "帳號"
 
-#: ../templates/massBuildAccounts.php:167 ../lib/modules/account.inc:117
-#: ../lib/modules/ieee802device.inc:85 ../lib/modules/posixGroup.inc:492
-#: ../lib/modules/posixGroup.inc:496 ../lib/modules/posixGroup.inc:497
+#: ../templates/massBuildAccounts.php:167 ../lib/modules/account.inc:131
+#: ../lib/modules/ieee802device.inc:85 ../lib/modules/posixGroup.inc:461
+#: ../lib/modules/posixGroup.inc:465 ../lib/modules/posixGroup.inc:466
 #: ../lib/modules/quota.inc:46 ../lib/modules/quota.inc:48
 #: ../lib/modules/quota.inc:50 ../lib/modules/quota.inc:52
 #: ../lib/modules/quota.inc:54 ../lib/modules/quota.inc:56
@@ -113,13 +115,13 @@ msgstr "使用者帳號"
 #: ../lib/modules/sambaSamAccount.inc:101
 #: ../lib/modules/sambaSamAccount.inc:102
 #: ../lib/modules/sambaSamAccount.inc:104
-#: ../lib/modules/sambaSamAccount.inc:105 ../lib/modules/posixAccount.inc:81
-#: ../lib/modules/posixAccount.inc:85 ../lib/modules/posixAccount.inc:89
-#: ../lib/modules/posixAccount.inc:97 ../lib/modules/posixAccount.inc:98
-#: ../lib/modules/posixAccount.inc:99 ../lib/modules/posixAccount.inc:100
-#: ../lib/modules/posixAccount.inc:101 ../lib/modules/posixAccount.inc:102
-#: ../lib/modules/posixAccount.inc:103 ../lib/modules/posixAccount.inc:104
-#: ../lib/modules/posixAccount.inc:105 ../lib/modules/posixAccount.inc:107
+#: ../lib/modules/sambaSamAccount.inc:105 ../lib/modules/posixAccount.inc:62
+#: ../lib/modules/posixAccount.inc:67 ../lib/modules/posixAccount.inc:71
+#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:81 ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:86 ../lib/modules/posixAccount.inc:87
+#: ../lib/modules/posixAccount.inc:88 ../lib/modules/posixAccount.inc:90
 #: ../lib/modules/kolabUser.inc:225 ../lib/modules/kolabUser.inc:227
 #: ../lib/modules/kolabUser.inc:229 ../lib/modules/kolabUser.inc:231
 #: ../lib/modules/kolabUser.inc:233 ../lib/modules/kolabUser.inc:235
@@ -146,48 +148,55 @@ msgstr "使用者帳號"
 #: ../lib/modules/nisMailAlias.inc:102 ../lib/modules/nisMailAlias.inc:104
 #, php-format
 msgid "Account %s:"
-msgstr "使用者帳號 %s:"
+msgstr "帳號 %s:"
 
 #: ../templates/masscreate.php:83
 msgid "Account creation via file upload"
 msgstr "使用上傳檔案建立帳號"
 
-#: ../lib/modules/posixGroup.inc:416 ../lib/modules/posixAccount.inc:386
+#: ../lib/modules/posixAccount.inc:367
 msgid "Account deactivated"
 msgstr "帳號已停用"
 
-#: ../lib/modules/sambaSamAccount.inc:261
-#: ../lib/modules/sambaSamAccount.inc:339
-#: ../lib/modules/sambaSamAccount.inc:882
-#: ../lib/modules/sambaSamAccount.inc:1103
+#: ../lib/modules/sambaSamAccount.inc:268
+#: ../lib/modules/sambaSamAccount.inc:346
+#: ../lib/modules/sambaSamAccount.inc:932
+#: ../lib/modules/sambaSamAccount.inc:1131
+#: ../lib/modules/sambaSamAccount.inc:1201
 #: ../lib/modules/shadowAccount.inc:104 ../lib/modules/shadowAccount.inc:169
-#: ../lib/modules/shadowAccount.inc:201 ../lib/modules/shadowAccount.inc:303
+#: ../lib/modules/shadowAccount.inc:201 ../lib/modules/shadowAccount.inc:289
+#: ../lib/modules/shadowAccount.inc:334
 msgid "Account expiration date"
 msgstr "帳號過期日期"
 
-#: ../lib/modules/shadowAccount.inc:323
+#: ../lib/modules/shadowAccount.inc:362
 msgid "Account inactive"
 msgstr "帳號停用(inactive)"
 
 #: ../lib/modules/sambaAccount.inc:138 ../lib/modules/sambaAccount.inc:255
 #: ../lib/modules/sambaAccount.inc:367 ../lib/modules/sambaAccount.inc:370
-#: ../lib/modules/sambaAccount.inc:733 ../lib/modules/sambaSamAccount.inc:207
-#: ../lib/modules/sambaSamAccount.inc:210
-#: ../lib/modules/sambaSamAccount.inc:317
-#: ../lib/modules/sambaSamAccount.inc:860
-#: ../lib/modules/sambaSamAccount.inc:1091
+#: ../lib/modules/sambaAccount.inc:732 ../lib/modules/sambaSamAccount.inc:211
+#: ../lib/modules/sambaSamAccount.inc:217
+#: ../lib/modules/sambaSamAccount.inc:324
+#: ../lib/modules/sambaSamAccount.inc:891
+#: ../lib/modules/sambaSamAccount.inc:1189
 msgid "Account is deactivated"
 msgstr "帳號停用"
 
+#: ../lib/modules/sambaSamAccount.inc:214
+#: ../lib/modules/sambaSamAccount.inc:898
+msgid "Account is locked"
+msgstr "帳號鎖住"
+
 #: ../help/help.inc:139
 msgid "Account lists - Filters"
 msgstr "帳號清單 - 搜尋過濾器"
 
-#: ../templates/delete.php:89
+#: ../templates/delete.php:87
 msgid "Account name:"
 msgstr "帳號名稱"
 
-#: ../templates/pdfedit/pdfdelete.php:82
+#: ../templates/pdfedit/pdfdelete.php:82 ../lib/modules/groupOfNames.inc:219
 msgid "Account type"
 msgstr "帳號類型"
 
@@ -200,22 +209,24 @@ msgid "Account types and modules"
 msgstr "帳號類型和模組"
 
 #: ../help/help.inc:114
-msgid "Account types define which sorts of LDAP entries (e.g. users and groups) "
+msgid ""
+"Account types define which sorts of LDAP entries (e.g. users and groups) "
 "should be managed. The account modules define which properties (e.g. Unix "
 "and Samba) can be edited."
-msgstr "帳號類型定義要管理那一類的LDAP項目(如 使用者 和 群組)."
-"帳號模組定義要編修那一些屬性"
+msgstr ""
+"帳號類型定義要管理那一類的LDAP項目(如 users 和 groups). "
+"帳號模組定義要編修那一些屬性 "
 "(如 Unix 和 Samba)"
 
-#: ../lib/modules.inc:1022
+#: ../lib/modules.inc:985
 msgid "Account was created successfully."
 msgstr "帳號新增成功"
 
-#: ../lib/modules.inc:1025
+#: ../lib/modules.inc:988
 msgid "Account was modified successfully."
 msgstr "帳號修改成功"
 
-#: ../lib/modules/posixAccount.inc:358
+#: ../lib/modules/posixAccount.inc:343
 msgid "Activating this checkbox will remove the user's home directory."
 msgstr "設定這個核取方塊將會刪除使用者個人目錄."
 
@@ -229,15 +240,20 @@ msgstr "啟用的(active)帳號類型"
 #: ../templates/tree/add_attr_form.php:130
 #: ../templates/tree/add_attr_form.php:162
 #: ../templates/config/conftypes.php:178 ../templates/pdfedit/pdfpage.php:725
-#: ../lib/modules/ieee802device.inc:107 ../lib/modules/kolabUser.inc:347
-#: ../lib/modules/kolabUser.inc:364 ../lib/modules/kolabUser.inc:390
-#: ../lib/modules/ldapPublicKey.inc:101
-#: ../lib/modules/inetLocalMailRecipient.inc:163
-#: ../lib/modules/nisMailAlias.inc:150
+#: ../lib/modules/ieee802device.inc:106 ../lib/modules/kolabUser.inc:345
+#: ../lib/modules/kolabUser.inc:362 ../lib/modules/kolabUser.inc:388
+#: ../lib/modules/ldapPublicKey.inc:99
+#: ../lib/modules/inetLocalMailRecipient.inc:161
+#: ../lib/modules/groupOfNames.inc:162 ../lib/modules/groupOfNames.inc:304
+#: ../lib/modules/nisMailAlias.inc:148
 msgid "Add"
 msgstr "新增"
 
-#: ../templates/selfService/adminMain.php:445 ../help/help.inc:175
+#: ../lib/modules/groupOfNames.inc:336
+msgid "Add entries of this type:"
+msgstr "新增此類型的項目 ; "
+
+#: ../templates/selfService/adminMain.php:480 ../help/help.inc:175
 msgid "Add input field"
 msgstr "新增設定輸入欄位"
 
@@ -252,12 +268,12 @@ msgstr "新增屬性"
 msgid "Add new binary attribute"
 msgstr "新增binary的屬性."
 
-#: ../templates/selfService/adminMain.php:428 ../help/help.inc:173
+#: ../templates/selfService/adminMain.php:463 ../help/help.inc:173
 msgid "Add new group"
 msgstr "新增群組"
 
-#: ../lib/modules/inetOrgPerson.inc:360 ../lib/modules/inetOrgPerson.inc:713
-#: ../lib/modules/inetOrgPerson.inc:804
+#: ../lib/modules/inetOrgPerson.inc:360 ../lib/modules/inetOrgPerson.inc:712
+#: ../lib/modules/inetOrgPerson.inc:797
 msgid "Add photo"
 msgstr "新增相片"
 
@@ -274,10 +290,10 @@ msgstr "增加區段或靜態文字"
 msgid "Adding attribute failed!"
 msgstr "新增屬性失敗!"
 
-#: ../lib/modules/posixAccount.inc:229 ../lib/modules/posixAccount.inc:349
-#: ../lib/modules/posixAccount.inc:394 ../lib/modules/posixAccount.inc:918
-#: ../lib/modules/posixAccount.inc:998 ../lib/modules/posixAccount.inc:1060
-#: ../lib/modules/posixAccount.inc:1140
+#: ../lib/modules/posixAccount.inc:214 ../lib/modules/posixAccount.inc:334
+#: ../lib/modules/posixAccount.inc:375 ../lib/modules/posixAccount.inc:840
+#: ../lib/modules/posixAccount.inc:918 ../lib/modules/posixAccount.inc:979
+#: ../lib/modules/posixAccount.inc:1037
 msgid "Additional groups"
 msgstr "附加的群組"
 
@@ -289,28 +305,27 @@ msgstr "模組的其他任務:"
 msgid ""
 "Adds a new group element to the list of self service options. Use this to "
 "structure the input fields."
-msgstr "新增一個新的群組元件到self service的選項. 使用這個功能來"
-"建構輸入欄位."
+msgstr "新增一個新的群組元件到self service的選項. 使用這個功能來建構輸入欄位."
 
 #: ../help/help.inc:176
 msgid "Adds a new self service option to the selected group element."
 msgstr "新增一個新的self service選項到所選定的群組元件."
 
-#: ../lib/modules/posixGroup.inc:370
+#: ../lib/modules/posixGroup.inc:348 ../lib/modules/groupOfNames.inc:89
 msgid "Administrators group"
 msgstr "管理者群組"
 
-#: ../lib/modules/sambaSamAccount.inc:423
+#: ../lib/modules/sambaSamAccount.inc:430
 msgid "Alaska"
 msgstr "阿拉斯加"
 
 #: ../lib/modules/sambaDomain.inc:194 ../lib/modules/sambaDomain.inc:195
 msgid "Algorithmic RID base is not a number!"
-msgstr "RID的演算基底不是數字!"
+msgstr "填入RID的演算法基數不是一個數字!"
 
 #: ../lib/types/mailAlias.inc:82 ../lib/modules/nisMailAlias.inc:63
-#: ../lib/modules/nisMailAlias.inc:78 ../lib/modules/nisMailAlias.inc:135
-#: ../lib/modules/nisMailAlias.inc:273
+#: ../lib/modules/nisMailAlias.inc:78 ../lib/modules/nisMailAlias.inc:133
+#: ../lib/modules/nisMailAlias.inc:270
 msgid "Alias name"
 msgstr "別名"
 
@@ -318,30 +333,30 @@ msgstr "別名"
 msgid "Aliases"
 msgstr "別名"
 
-#: ../templates/selfService/selfServiceMain.php:128
+#: ../templates/selfService/selfServiceMain.php:129
 #: ../templates/initsuff.php:156
 msgid "All changes were successful."
 msgstr "更改成功."
 
-#: ../lib/modules/sambaDomain.inc:106 ../lib/modules/sambaDomain.inc:274
-#: ../lib/modules/sambaDomain.inc:622
+#: ../lib/modules/sambaDomain.inc:106 ../lib/modules/sambaDomain.inc:272
+#: ../lib/modules/sambaDomain.inc:619
 msgid "Allow machine password changes"
 msgstr "容許改變主機密碼"
 
 #: ../templates/config/mainmanage.php:180 ../lib/types/user.inc:86
 #: ../help/help.inc:137
 msgid "Allowed hosts"
-msgstr "允許的主機"
+msgstr "允許連線的主機"
 
-#: ../lib/modules/sambaAccount.inc:831 ../lib/modules/sambaAccount.inc:832
-#: ../lib/modules/sambaSamAccount.inc:983
-#: ../lib/modules/sambaSamAccount.inc:984
+#: ../lib/modules/sambaAccount.inc:830 ../lib/modules/sambaAccount.inc:831
+#: ../lib/modules/sambaSamAccount.inc:1031
+#: ../lib/modules/sambaSamAccount.inc:1032
 msgid "Allowed workstations"
 msgstr "允許的工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:438
+#: ../lib/modules/sambaSamAccount.inc:445
 msgid "Almaty, Dhaka, Colombo"
-msgstr "Almaty, Dhaka, 可倫坡"
+msgstr "Almaty(哈薩克首都), 達卡, 可倫坡"
 
 #: ../lib/modules/kolabUser.inc:48
 msgid "Always accept"
@@ -356,7 +371,7 @@ msgstr "都拒絕"
 msgid "An attribute (%s) was modified and is highlighted below."
 msgstr "下列反白的屬性(%s)已被修改."
 
-#: ../lib/modules/kolabUser.inc:329 ../lib/modules/kolabUser.inc:777
+#: ../lib/modules/kolabUser.inc:327 ../lib/modules/kolabUser.inc:770
 msgid "Anyone"
 msgstr "任何人"
 
@@ -368,7 +383,7 @@ msgstr "套用"
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "確定永久刪除這個物件?"
 
-#: ../lib/modules/sambaSamAccount.inc:428
+#: ../lib/modules/sambaSamAccount.inc:435
 msgid "Atlantic time (Canada), Caracas"
 msgstr "大西洋時間(加拿大), 卡拉卡斯"
 
@@ -380,7 +395,7 @@ msgstr "屬性"
 msgid "Attribute types"
 msgstr "屬性類型"
 
-#: ../lib/modules/sambaSamAccount.inc:444
+#: ../lib/modules/sambaSamAccount.inc:451
 msgid "Auckland, Fiji, Kamchatka"
 msgstr "奧克蘭, 斐濟, 堪察加半島"
 
@@ -392,37 +407,37 @@ msgstr "有效的PDF欄位"
 msgid "Available account types"
 msgstr "有效的帳號類型"
 
-#: ../lib/modules/posixAccount.inc:1010
+#: ../lib/modules/posixAccount.inc:930
 msgid "Available groups"
-msgstr "有效的群組"
+msgstr "可選用的群組"
 
 #: ../templates/config/confmodules.php:209
 msgid "Available modules"
-msgstr "有效的模組"
+msgstr "可選用的模組"
 
-#: ../lib/modules/posixGroup.inc:244
+#: ../lib/modules/posixGroup.inc:232
 msgid "Available users"
-msgstr "有效的使用者"
+msgstr "可選的使用者"
 
-#: ../lib/modules/sambaAccount.inc:837 ../lib/modules/sambaSamAccount.inc:989
+#: ../lib/modules/sambaAccount.inc:836 ../lib/modules/sambaSamAccount.inc:1037
 msgid "Available workstations"
-msgstr "有效的工作站"
+msgstr "可選的工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:431
+#: ../lib/modules/sambaSamAccount.inc:438
 msgid "Azores, Cape Verde Islands"
 msgstr "亞速爾群島, 維德角"
 
-#: ../templates/tree/update_confirm.php:252 ../lib/modules/posixGroup.inc:250
-#: ../lib/modules/posixGroup.inc:274 ../lib/modules/sambaAccount.inc:842
-#: ../lib/modules/sambaSamAccount.inc:993 ../lib/modules/posixAccount.inc:1016
-#: ../lib/modules/inetOrgPerson.inc:805
+#: ../templates/tree/update_confirm.php:252 ../lib/modules/posixGroup.inc:238
+#: ../lib/modules/posixGroup.inc:261 ../lib/modules/sambaAccount.inc:841
+#: ../lib/modules/sambaSamAccount.inc:1041 ../lib/modules/posixAccount.inc:936
+#: ../lib/modules/inetOrgPerson.inc:798 ../lib/modules/groupOfNames.inc:346
 msgid "Back"
 msgstr "返回"
 
-#: ../templates/config/index.php:113 ../templates/config/confmain.php:508
+#: ../templates/config/index.php:113 ../templates/config/confmain.php:516
 #: ../templates/config/conflogin.php:152 ../templates/config/mainlogin.php:137
 #: ../templates/selfService/adminLogin.php:149
-#: ../templates/selfService/adminMain.php:78 ../templates/logout.php:78
+#: ../templates/selfService/adminMain.php:113 ../templates/logout.php:78
 msgid "Back to Login"
 msgstr "回登入畫面"
 
@@ -434,7 +449,7 @@ msgstr "返回OU編輯器"
 msgid "Back to PDF Editor"
 msgstr "返回PDF編輯器"
 
-#: ../lib/modules.inc:1034
+#: ../lib/modules.inc:997
 msgid "Back to account list"
 msgstr "返回帳號列表"
 
@@ -442,7 +457,7 @@ msgstr "返回帳號列表"
 msgid "Back to group list"
 msgstr "返回群組列表"
 
-#: ../templates/delete.php:237
+#: ../templates/delete.php:234
 msgid "Back to list"
 msgstr "返叵列表"
 
@@ -462,11 +477,11 @@ msgstr "返回設定檔編輯器"
 msgid "Back to profile login"
 msgstr "回設定檔登入畫面"
 
-#: ../lib/modules/sambaSamAccount.inc:435
+#: ../lib/modules/sambaSamAccount.inc:442
 msgid "Baghdad, Riyadh, Moscow"
 msgstr "巴格達, 利雅德, 莫斯科"
 
-#: ../lib/modules/sambaSamAccount.inc:439
+#: ../lib/modules/sambaSamAccount.inc:446
 msgid "Bangkok, Hanoi, Jakarta"
 msgstr "曼谷, 河內, 雅加達"
 
@@ -486,7 +501,7 @@ msgstr "基本模組"
 msgid "Beginning"
 msgstr "開頭"
 
-#: ../lib/modules/sambaSamAccount.inc:440
+#: ../lib/modules/sambaSamAccount.inc:447
 msgid "Beijing, Perth, Singapore"
 msgstr "北京, 柏斯, 新加坡"
 
@@ -522,32 +537,32 @@ msgstr "區塊軟性配額包含無效字元.只能使用自然數."
 msgid "Block soft quota must be smaller than block hard quota."
 msgstr "區塊軟性配額必須比硬性配額小."
 
-#: ../lib/modules/sambaSamAccount.inc:429
+#: ../lib/modules/sambaSamAccount.inc:436
 msgid "Brazil, Buenos Aires"
 msgstr "巴西, 布宜若斯艾利斯"
 
 #: ../lib/modules/sambaGroupMapping.inc:70
-msgid "Builtin Group"
+msgid "Builtin group"
 msgstr "內建群組"
 
 #: ../templates/masscreate.php:134
 msgid "CSV file:"
-msgstr "CSV檔:"
+msgstr "CSV 檔:"
 
 #: ../templates/config/confmain.php:171 ../help/help.inc:108
 msgid "Cache timeout"
 msgstr "快取期限"
 
-#: ../templates/config/confmain.php:428
+#: ../templates/config/confmain.php:429
 msgid "Cache timeout is invalid!"
 msgstr "快取期限設定錯誤!"
 
 #: ../lib/modules/sambaAccount.inc:382 ../lib/modules/sambaAccount.inc:385
 #: ../lib/modules/sambaAccount.inc:388 ../lib/modules/sambaAccount.inc:394
-#: ../lib/modules/sambaAccount.inc:406 ../lib/modules/sambaSamAccount.inc:222
-#: ../lib/modules/sambaSamAccount.inc:225
-#: ../lib/modules/sambaSamAccount.inc:228
-#: ../lib/modules/sambaSamAccount.inc:234 ../lib/modules/posixAccount.inc:395
+#: ../lib/modules/sambaAccount.inc:406 ../lib/modules/sambaSamAccount.inc:229
+#: ../lib/modules/sambaSamAccount.inc:232
+#: ../lib/modules/sambaSamAccount.inc:235
+#: ../lib/modules/sambaSamAccount.inc:241 ../lib/modules/posixAccount.inc:376
 #: ../lib/modules/sambaGroupMapping.inc:305
 #: ../lib/modules/shadowAccount.inc:154 ../lib/modules/shadowAccount.inc:158
 #: ../lib/modules/shadowAccount.inc:162 ../lib/modules/shadowAccount.inc:166
@@ -557,20 +572,22 @@ msgstr "可以留空白"
 #: ../templates/tree/update_confirm.php:238
 #: ../templates/tree/delete_form.php:119 ../templates/tree/delete_form.php:168
 #: ../templates/ou_edit.php:107 ../templates/config/confmodules.php:115
-#: ../templates/config/confmain.php:387 ../templates/config/conftypes.php:236
-#: ../templates/selfService/adminMain.php:489
+#: ../templates/config/confmain.php:388 ../templates/config/conftypes.php:236
+#: ../templates/selfService/adminMain.php:544
 #: ../templates/pdfedit/pdfdelete.php:92 ../templates/pdfedit/pdfpage.php:773
-#: ../templates/pdfedit/pdfmain.php:153 ../templates/delete.php:112
+#: ../templates/pdfedit/pdfmain.php:153 ../templates/delete.php:110
 #: ../templates/profedit/profiledelete.php:83
 #: ../templates/profedit/profilepage.php:253
 #: ../templates/profedit/profilemain.php:166 ../templates/initsuff.php:189
-#: ../lib/modules/sambaSamAccount.inc:1059
-#: ../lib/modules/posixAccount.inc:1040 ../lib/modules/kolabUser.inc:569
-#: ../lib/modules/inetOrgPerson.inc:765
+#: ../lib/modules/sambaSamAccount.inc:1106
+#: ../lib/modules/sambaSamAccount.inc:1155 ../lib/modules/posixAccount.inc:959
+#: ../lib/modules/kolabUser.inc:564 ../lib/modules/shadowAccount.inc:347
+#: ../lib/modules/inetOrgPerson.inc:761 ../lib/modules/groupOfNames.inc:225
+#: ../lib/modules/groupOfNames.inc:252 ../lib/modules/groupOfNames.inc:305
 msgid "Cancel"
 msgstr "取消"
 
-#: ../templates/login.php:391 ../templates/login.php:396
+#: ../templates/login.php:405 ../templates/login.php:410
 #: ../templates/selfService/selfServiceLogin.php:105
 #: ../templates/selfService/selfServiceLogin.php:109
 msgid "Cannot connect to specified LDAP server. Please try again."
@@ -580,57 +597,69 @@ msgstr "無法連結所指定的LDAP伺服器,請再試一次."
 msgid "Cannot open config file!"
 msgstr "無法開啟設定檔!"
 
-#: ../templates/selfService/adminMain.php:310
+#: ../templates/selfService/adminMain.php:345
 msgid "Captions and labels"
 msgstr "標題和標籤"
 
-#: ../lib/modules/sambaSamAccount.inc:433
+#: ../lib/modules/sambaSamAccount.inc:440
 msgid "Central Europe Time, Paris, Berlin"
 msgstr "歐洲中央時間, 巴黎, 柏林"
 
-#: ../lib/modules/sambaSamAccount.inc:426
+#: ../lib/modules/sambaSamAccount.inc:433
 msgid "Central Time (US & Canada), Mexico City"
 msgstr "中央時間(美國和加拿大), 墨西哥市 "
 
-#: ../templates/selfService/adminMain.php:371
+#: ../templates/selfService/adminMain.php:406
 #: ../templates/pdfedit/pdfpage.php:499 ../templates/pdfedit/pdfpage.php:505
+#: ../lib/modules/sambaSamAccount.inc:911
+#: ../lib/modules/sambaSamAccount.inc:923
+#: ../lib/modules/sambaSamAccount.inc:935
+#: ../lib/modules/sambaSamAccount.inc:1151
+#: ../lib/modules/shadowAccount.inc:292 ../lib/modules/shadowAccount.inc:343
+#: ../lib/modules/groupOfNames.inc:151 ../lib/modules/groupOfNames.inc:168
 msgid "Change"
 msgstr "更改"
 
-#: ../lib/modules/posixGroup.inc:201
+#: ../lib/modules/posixGroup.inc:190
 msgid "Change GID number of users and hosts"
-msgstr "更改使用者和主機的GID編號"
+msgstr "更改使用者和主機的 GIDi編號"
 
 #: ../templates/config/profmanage.php:326 ../help/help.inc:123
 msgid "Change default profile"
-msgstr "變更預設的設定檔"
+msgstr "變更預設的伺服器設定檔"
 
 #: ../templates/config/mainmanage.php:289 ../help/help.inc:125
 msgid "Change master password"
 msgstr "變更系統管理者密碼"
 
-#: ../lib/modules/posixGroup.inc:187 ../lib/modules/posixAccount.inc:944
-#: ../lib/modules/inetOrgPerson.inc:602 ../help/help.inc:106
+#: ../lib/modules/posixGroup.inc:180 ../lib/modules/posixAccount.inc:869
+#: ../lib/modules/inetOrgPerson.inc:601 ../help/help.inc:106
 msgid "Change password"
 msgstr "更改密碼"
 
-#: ../templates/login.php:322
+#: ../templates/login.php:331
 msgid "Change profile"
-msgstr "變更系統設定檔"
+msgstr "變更伺服器設定檔"
 
-#: ../lib/lists.inc:484
+#: ../lib/lists.inc:494
 msgid "Change suffix"
 msgstr "更改尾碼"
 
-#: ../lib/modules/posixAccount.inc:794
+#: ../lib/modules/posixAccount.inc:731
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "值己被改變,因為只能使用ASCII字元."
 
+#: ../templates/tests/index.php:56
+msgid "Check if quotas and homedirectories can be managed."
+msgstr "檢查是否可以管理磁碟配額和家目錄"
+
 #: ../templates/masscreate.php:125
-msgid "Check your input carefully. LAM will only do some basic checks on the upload "
+msgid ""
+"Check your input carefully. LAM will only do some basic checks on the upload "
 "data."
-msgstr "請仔細檢查您的輸入. LAM對上傳的資料只做基本的"
-"檢查."
+msgstr ""
+"請仔細檢查您的輸入. LAM 對上傳的"
+"資料只做基本的檢查."
 
 #: ../templates/tree/create_form.php:76
 msgid "Choose a template"
@@ -648,7 +677,7 @@ msgstr "集合"
 msgid "Columns:"
 msgstr "欄位說明:"
 
-#: ../lib/modules/sambaAccount.inc:394 ../lib/modules/sambaSamAccount.inc:234
+#: ../lib/modules/sambaAccount.inc:394 ../lib/modules/sambaSamAccount.inc:241
 msgid ""
 "Comma separated list of Samba workstations the user is allowed to login. "
 "Empty means every workstation."
@@ -658,11 +687,12 @@ msgstr "使用者可以登入的samba工作站,可逗點分隔.留空白表示
 msgid "Commit"
 msgstr "送出"
 
-#: ../lib/modules/posixAccount.inc:106 ../lib/modules/posixAccount.inc:210
-#: ../lib/modules/posixAccount.inc:398 ../lib/modules/posixAccount.inc:900
-#: ../lib/modules/posixAccount.inc:1135 ../lib/modules/inetOrgPerson.inc:68
-#: ../lib/modules/inetOrgPerson.inc:235 ../lib/modules/inetOrgPerson.inc:344
-#: ../lib/modules/inetOrgPerson.inc:571 ../lib/modules/inetOrgPerson.inc:832
+#: ../lib/modules/posixAccount.inc:89 ../lib/modules/posixAccount.inc:195
+#: ../lib/modules/posixAccount.inc:379 ../lib/modules/posixAccount.inc:401
+#: ../lib/modules/posixAccount.inc:822 ../lib/modules/posixAccount.inc:1032
+#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:235
+#: ../lib/modules/inetOrgPerson.inc:344 ../lib/modules/inetOrgPerson.inc:570
+#: ../lib/modules/inetOrgPerson.inc:825
 msgid "Common name"
 msgstr "使用者全名"
 
@@ -705,8 +735,8 @@ msgid "Could not save PDF profile, access denied."
 msgstr "無法儲存PDF設定檔,拒絕存取."
 
 #: ../lib/modules/kolabUser.inc:85 ../lib/modules/kolabUser.inc:148
-#: ../lib/modules/kolabUser.inc:177 ../lib/modules/kolabUser.inc:289
-#: ../lib/modules/kolabUser.inc:753
+#: ../lib/modules/kolabUser.inc:177 ../lib/modules/kolabUser.inc:287
+#: ../lib/modules/kolabUser.inc:746
 msgid "Country"
 msgstr "國籍"
 
@@ -720,16 +750,12 @@ msgstr "國籍名稱錯誤!"
 msgid "Create"
 msgstr "建立"
 
-#: ../lib/modules.inc:1084
-msgid "Create Account"
-msgstr "建立帳號"
-
 #: ../templates/tree/creation_template.php:85
 #: ../templates/tree/create_form.php:75
 msgid "Create Object"
 msgstr "建立物件"
 
-#: ../lib/modules.inc:1041 ../help/help.inc:156
+#: ../lib/modules.inc:1004 ../help/help.inc:156
 msgid "Create PDF file"
 msgstr "建立PDF檔"
 
@@ -789,18 +815,18 @@ msgstr "為所選的範圍(scope)建立新的PDF架構:"
 msgid "Create a new profile"
 msgstr "建立新的設定檔"
 
-#: ../lib/modules.inc:1033
+#: ../lib/modules.inc:1047
+msgid "Create account"
+msgstr "建立帳號"
+
+#: ../lib/modules.inc:996
 msgid "Create another account"
 msgstr "新增另一個帳號"
 
-#: ../lib/modules/posixAccount.inc:927
+#: ../lib/modules/posixAccount.inc:849
 msgid "Create home directory"
 msgstr "建立個人目錄"
 
-#: ../lib/modules.inc:929
-msgid "Create new Account"
-msgstr "新增帳號"
-
 #: ../templates/tree/edit.php:125 ../templates/tree/tree.php:186
 #: ../templates/tree/tree.php:188 ../templates/tree/tree.php:189
 #: ../lib/tree.inc:66 ../lib/tree.inc:67 ../lib/tree.inc:129
@@ -829,8 +855,8 @@ msgstr "自定"
 #: ../templates/tree/add_oclass_form.php:121
 #: ../templates/tree/update_confirm.php:76
 #: ../templates/tree/add_attr_form.php:73 ../templates/tree/delete_form.php:77
-#: ../templates/tree/delete_form.php:151 ../templates/delete.php:90
-#: ../lib/modules.inc:1541
+#: ../templates/tree/delete_form.php:151 ../templates/delete.php:88
+#: ../lib/modules.inc:1529
 msgid "DN"
 msgstr "DN"
 
@@ -851,11 +877,11 @@ msgstr "DSML輸出 %s"
 msgid "Data field for RDN is empty!"
 msgstr "RDN資料欄位是空的"
 
-#: ../lib/modules/sambaAccount.inc:374 ../lib/modules/sambaSamAccount.inc:214
+#: ../lib/modules/sambaAccount.inc:374 ../lib/modules/sambaSamAccount.inc:221
 msgid "Date after the user is able to change his password. Format: DD-MM-YYYY"
 msgstr "在這個日期之後,使用者才可以更改密碼, 格式: DD-MM-YYYY"
 
-#: ../lib/modules/sambaAccount.inc:376 ../lib/modules/sambaSamAccount.inc:216
+#: ../lib/modules/sambaAccount.inc:376 ../lib/modules/sambaSamAccount.inc:223
 msgid "Date after the user must change his password. Format: DD-MM-YYYY"
 msgstr "在這個日期之前,使用者必須更改密碼.(密碼到期時間) 格式: DD-MM-YYYY"
 
@@ -878,18 +904,18 @@ msgid "Defines if workstations may change their passwords."
 msgstr "定義工作站是否可以更改其密碼."
 
 #: ../lib/modules/kolabUser.inc:132 ../lib/modules/kolabUser.inc:136
-#: ../lib/modules/kolabUser.inc:196 ../lib/modules/kolabUser.inc:393
-#: ../lib/modules/kolabUser.inc:791
+#: ../lib/modules/kolabUser.inc:196 ../lib/modules/kolabUser.inc:391
+#: ../lib/modules/kolabUser.inc:784
 msgid "Delegates"
-msgstr "Delegates"
+msgstr "代理人(Delegates)"
 
 #: ../lib/modules/kolabUser.inc:233
 msgid "Delegates has invalid format!"
-msgstr "Delegates的格式錯誤"
+msgstr "代理人(Delegates)的格式錯誤"
 
 #: ../templates/tree/edit.php:114 ../templates/tree/delete_form.php:159
 #: ../templates/ou_edit.php:106 ../templates/pdfedit/pdfdelete.php:91
-#: ../templates/delete.php:111 ../lib/tree.inc:1149
+#: ../templates/delete.php:109 ../lib/tree.inc:1149
 msgid "Delete"
 msgstr "刪除"
 
@@ -898,11 +924,7 @@ msgstr "刪除"
 msgid "Delete %s"
 msgstr "刪除 %s"
 
-#: ../templates/delete.php:75 ../templates/delete.php:128
-msgid "Delete Account"
-msgstr "刪除帳號"
-
-#: ../lib/modules/kolabUser.inc:402
+#: ../lib/modules/kolabUser.inc:400
 msgid "Delete Kolab account"
 msgstr "刪除Kolab帳號"
 
@@ -927,7 +949,7 @@ msgstr "刪除網域"
 msgid "Delete group"
 msgstr "刪除群組"
 
-#: ../lib/modules/posixAccount.inc:969
+#: ../lib/modules/posixAccount.inc:890
 msgid "Delete home directory"
 msgstr "刪除使用者個人目錄"
 
@@ -948,7 +970,7 @@ msgstr "已取消刪除動作"
 msgid "Delete organizational unit"
 msgstr "刪除organizational unit"
 
-#: ../lib/modules/inetOrgPerson.inc:716
+#: ../lib/modules/inetOrgPerson.inc:715
 msgid "Delete photo"
 msgstr "刪除相片"
 
@@ -961,24 +983,24 @@ msgstr "刪除設定檔"
 
 #: ../lib/types/user.inc:125
 msgid "Delete user"
-msgstr "刪除使用者帳號"
+msgstr "刪除使用者"
 
-#: ../lib/modules/sambaGroupMapping.inc:71
-msgid "Deleted Account"
-msgstr "已刪除的帳號"
-
-#: ../templates/delete.php:225
+#: ../templates/delete.php:222
 #, php-format
 msgid "Deleted DN: %s"
-msgstr "已刪除的DDN: %s"
+msgstr "刪除的 DN: %s"
 
 #: ../templates/pdfedit/pdfdelete.php:60
 msgid "Deleted PDF structure:"
-msgstr "已刪除的PDF架構:"
+msgstr "刪除的 PDF 結構:"
+
+#: ../lib/modules/sambaGroupMapping.inc:71
+msgid "Deleted account"
+msgstr "已刪除的帳號"
 
 #: ../templates/profedit/profiledelete.php:63
 msgid "Deleted profile:"
-msgstr "已刪除的設定檔:"
+msgstr "刪除的設定檔:"
 
 #: ../templates/tree/rdelete.php:71 ../templates/tree/rdelete.php:133
 #: ../templates/tree/rdelete.php:145
@@ -986,26 +1008,28 @@ msgstr "已刪除的設定檔:"
 msgid "Deleting %s"
 msgstr "正在刪除 %s"
 
-#: ../templates/delete.php:135
+#: ../templates/delete.php:131
 msgid "Deleting. Please stand by ..."
 msgstr "正在刪除..."
 
 #: ../templates/tree/add_value_form.php:186 ../templates/schema/schema.php:94
 #: ../templates/schema/schema.php:148 ../templates/schema/schema.php:351
-#: ../lib/types/user.inc:92 ../lib/modules/account.inc:79
-#: ../lib/modules/account.inc:103 ../lib/modules/account.inc:204
-#: ../lib/modules/account.inc:218 ../lib/modules/posixGroup.inc:167
-#: ../lib/modules/posixGroup.inc:396 ../lib/modules/posixGroup.inc:466
-#: ../lib/modules/sambaAccount.inc:862 ../lib/modules/posixAccount.inc:308
-#: ../lib/modules/posixAccount.inc:416
+#: ../lib/types/user.inc:92 ../lib/modules/account.inc:83
+#: ../lib/modules/account.inc:93 ../lib/modules/account.inc:117
+#: ../lib/modules/account.inc:217 ../lib/modules/account.inc:231
+#: ../lib/modules/posixGroup.inc:156 ../lib/modules/posixGroup.inc:374
+#: ../lib/modules/posixGroup.inc:436 ../lib/modules/sambaAccount.inc:861
+#: ../lib/modules/posixAccount.inc:293 ../lib/modules/posixAccount.inc:397
 #: ../lib/modules/sambaGroupMapping.inc:327
 #: ../lib/modules/inetOrgPerson.inc:158 ../lib/modules/inetOrgPerson.inc:288
-#: ../lib/modules/inetOrgPerson.inc:578 ../lib/modules/inetOrgPerson.inc:817
+#: ../lib/modules/inetOrgPerson.inc:577 ../lib/modules/inetOrgPerson.inc:810
+#: ../lib/modules/groupOfNames.inc:60 ../lib/modules/groupOfNames.inc:87
+#: ../lib/modules/groupOfNames.inc:137 ../lib/modules/groupOfNames.inc:437
 msgid "Description"
 msgstr "說明"
 
-#: ../lib/modules/sambaDomain.inc:102 ../lib/modules/sambaDomain.inc:267
-#: ../lib/modules/sambaDomain.inc:617
+#: ../lib/modules/sambaDomain.inc:102 ../lib/modules/sambaDomain.inc:265
+#: ../lib/modules/sambaDomain.inc:614
 msgid "Disconnect users outside logon hours"
 msgstr "超過可登入時間則中斷使用者連結"
 
@@ -1014,23 +1038,23 @@ msgid "Disconnects users if they are loggen in outside logon hours."
 msgstr "如果使用者在可登入時間之外已登入,則中斷其連結."
 
 #: ../lib/modules/sambaAccount.inc:78 ../lib/modules/sambaAccount.inc:219
-#: ../lib/modules/sambaAccount.inc:340 ../lib/modules/sambaAccount.inc:699
-#: ../lib/modules/sambaAccount.inc:855 ../lib/modules/sambaSamAccount.inc:93
-#: ../lib/modules/sambaSamAccount.inc:180
-#: ../lib/modules/sambaSamAccount.inc:281
-#: ../lib/modules/sambaSamAccount.inc:828
-#: ../lib/modules/sambaSamAccount.inc:1287
+#: ../lib/modules/sambaAccount.inc:340 ../lib/modules/sambaAccount.inc:698
+#: ../lib/modules/sambaAccount.inc:854 ../lib/modules/sambaSamAccount.inc:93
+#: ../lib/modules/sambaSamAccount.inc:184
+#: ../lib/modules/sambaSamAccount.inc:288
+#: ../lib/modules/sambaSamAccount.inc:859
+#: ../lib/modules/sambaSamAccount.inc:1385
 #: ../lib/modules/sambaGroupMapping.inc:190
 #: ../lib/modules/sambaGroupMapping.inc:292
 #: ../lib/modules/sambaGroupMapping.inc:325
 msgid "Display name"
 msgstr "顯示名稱"
 
-#: ../lib/modules.inc:473
-msgid "Displayed account numbers start at \"0\". Add 2 to get the row in your "
+#: ../lib/modules.inc:447
+msgid ""
+"Displayed account numbers start at \"0\". Add 2 to get the row in your "
 "spreadsheet."
-msgstr "顯示的帳號編號從\"0\"開始. 要加上2才是您的試算表上的"
-"列數."
+msgstr "顯示的帳號編號從\"0\"開始. 要加上2才是您的試算表上的列數."
 
 #: ../templates/ou_edit.php:99
 msgid "Do you really want to delete this OU?"
@@ -1044,11 +1068,11 @@ msgstr "確定刪除這個PDF架構?"
 msgid "Do you really want to delete this profile?"
 msgstr "確定刪除這個設定檔?"
 
-#: ../lib/modules/kolabUser.inc:564
+#: ../lib/modules/kolabUser.inc:559
 msgid "Do you really want to mark this account for deletion?"
 msgstr "確定將這個帳號標示為刪除?"
 
-#: ../templates/delete.php:84
+#: ../templates/delete.php:82
 msgid "Do you really want to remove the following accounts?"
 msgstr "確定刪除下列帳號?"
 
@@ -1058,14 +1082,14 @@ msgstr "確定更改?"
 
 #: ../lib/modules/sambaAccount.inc:177 ../lib/modules/sambaAccount.inc:321
 #: ../lib/modules/sambaAccount.inc:331 ../lib/modules/sambaAccount.inc:405
-#: ../lib/modules/sambaAccount.inc:804 ../lib/modules/sambaAccount.inc:861
-#: ../lib/modules/sambaSamAccount.inc:252
-#: ../lib/modules/sambaSamAccount.inc:274
-#: ../lib/modules/sambaSamAccount.inc:400
-#: ../lib/modules/sambaSamAccount.inc:948
-#: ../lib/modules/sambaSamAccount.inc:1151
-#: ../lib/modules/sambaSamAccount.inc:1181
-#: ../lib/modules/sambaSamAccount.inc:1293
+#: ../lib/modules/sambaAccount.inc:803 ../lib/modules/sambaAccount.inc:860
+#: ../lib/modules/sambaSamAccount.inc:259
+#: ../lib/modules/sambaSamAccount.inc:281
+#: ../lib/modules/sambaSamAccount.inc:407
+#: ../lib/modules/sambaSamAccount.inc:996
+#: ../lib/modules/sambaSamAccount.inc:1249
+#: ../lib/modules/sambaSamAccount.inc:1279
+#: ../lib/modules/sambaSamAccount.inc:1391
 #: ../lib/modules/sambaGroupMapping.inc:68
 #: ../lib/modules/sambaGroupMapping.inc:220
 #: ../lib/modules/sambaGroupMapping.inc:304
@@ -1073,75 +1097,59 @@ msgstr "確定更改?"
 msgid "Domain"
 msgstr "網域"
 
+#: ../lib/types/smbDomain.inc:82 ../lib/modules/sambaDomain.inc:70
+#: ../lib/modules/sambaDomain.inc:140 ../lib/modules/sambaDomain.inc:224
+#: ../lib/modules/sambaDomain.inc:230 ../lib/modules/sambaDomain.inc:586
+msgid "Domain SID"
+msgstr "網域SID"
+
+#: ../lib/modules/sambaGroupMapping.inc:271
+msgid "Domain administrators"
+msgstr "Domain administrators"
+
 #: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaAccount.inc:316
 #: ../lib/modules/sambaSamAccount.inc:65
 #: ../lib/modules/sambaGroupMapping.inc:55
 #: ../lib/modules/sambaGroupMapping.inc:277
-msgid "Domain Admins"
-msgstr "網域管理者"
+msgid "Domain admins"
+msgstr "Domain admins"
 
 #: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaSamAccount.inc:66
 #: ../lib/modules/sambaGroupMapping.inc:60
-msgid "Domain Certificate Admins"
-msgstr "網域認證管理者"
+msgid "Domain certificate admins"
+msgstr "網域憑證管理者"
 
-#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaAccount.inc:549
+#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaAccount.inc:548
 #: ../lib/modules/sambaSamAccount.inc:66
-#: ../lib/modules/sambaSamAccount.inc:604
+#: ../lib/modules/sambaSamAccount.inc:609
 #: ../lib/modules/sambaGroupMapping.inc:58
-msgid "Domain Computers"
+msgid "Domain computers"
 msgstr "網域電腦"
 
 #: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaSamAccount.inc:66
 #: ../lib/modules/sambaGroupMapping.inc:59
-msgid "Domain Controllers"
+msgid "Domain controllers"
 msgstr "網域控制器"
 
 #: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaSamAccount.inc:67
 #: ../lib/modules/sambaGroupMapping.inc:62
-msgid "Domain Enterprise Admins"
+msgid "Domain enterprise admins"
 msgstr "網域企業管理者"
 
 #: ../lib/modules/sambaGroupMapping.inc:67
 #: ../lib/modules/sambaGroupMapping.inc:210
-msgid "Domain Group"
+msgid "Domain group"
 msgstr "網域群組"
 
 #: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaSamAccount.inc:65
 #: ../lib/modules/sambaGroupMapping.inc:57
-msgid "Domain Guests"
+msgid "Domain guests"
 msgstr "網域來賓"
 
-#: ../lib/modules/sambaAccount.inc:52 ../lib/modules/sambaSamAccount.inc:67
-#: ../lib/modules/sambaGroupMapping.inc:63
-msgid "Domain Policy Admins"
-msgstr "網域原則管理者"
-
-#: ../lib/types/smbDomain.inc:82 ../lib/modules/sambaDomain.inc:70
-#: ../lib/modules/sambaDomain.inc:140 ../lib/modules/sambaDomain.inc:226
-#: ../lib/modules/sambaDomain.inc:232 ../lib/modules/sambaDomain.inc:589
-msgid "Domain SID"
-msgstr "網域SID"
-
-#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaSamAccount.inc:67
-#: ../lib/modules/sambaGroupMapping.inc:61
-msgid "Domain Schema Admins"
-msgstr "網域 Schema 管理者"
-
-#: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaSamAccount.inc:65
-#: ../lib/modules/sambaSamAccount.inc:1550
-#: ../lib/modules/sambaGroupMapping.inc:56
-msgid "Domain Users"
-msgstr "網域使用者"
-
-#: ../lib/modules/sambaGroupMapping.inc:271
-msgid "Domain administrators"
-msgstr "網域管理者"
-
 #: ../lib/types/smbDomain.inc:83 ../lib/modules/sambaAccount.inc:72
 #: ../lib/modules/sambaDomain.inc:66 ../lib/modules/sambaDomain.inc:133
-#: ../lib/modules/sambaDomain.inc:213 ../lib/modules/sambaDomain.inc:219
-#: ../lib/modules/sambaDomain.inc:586
+#: ../lib/modules/sambaDomain.inc:211 ../lib/modules/sambaDomain.inc:217
+#: ../lib/modules/sambaDomain.inc:583
 msgid "Domain name"
 msgstr "網域名稱"
 
@@ -1155,7 +1163,23 @@ msgstr "網域名稱包含無效字元,只能使用 a-z, A-Z, 0-9 和 -"
 msgid "Domain name is invalid!"
 msgstr "網域名稱無效!"
 
-#: ../templates/main_header.php:56
+#: ../lib/modules/sambaAccount.inc:52 ../lib/modules/sambaSamAccount.inc:67
+#: ../lib/modules/sambaGroupMapping.inc:63
+msgid "Domain policy admins"
+msgstr "網域原則管理者"
+
+#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaSamAccount.inc:67
+#: ../lib/modules/sambaGroupMapping.inc:61
+msgid "Domain schema admins"
+msgstr "網域 Schema 管理者"
+
+#: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaSamAccount.inc:65
+#: ../lib/modules/sambaSamAccount.inc:1648
+#: ../lib/modules/sambaGroupMapping.inc:56
+msgid "Domain users"
+msgstr "網域使用者"
+
+#: ../templates/main_header.php:60
 msgid "Donate"
 msgstr "捐 贈"
 
@@ -1167,7 +1191,7 @@ msgstr "往下"
 msgid "Download sample CSV file"
 msgstr "下載CSV檔範例"
 
-#: ../lib/modules/sambaAccount.inc:379 ../lib/modules/sambaSamAccount.inc:219
+#: ../lib/modules/sambaAccount.inc:379 ../lib/modules/sambaSamAccount.inc:226
 msgid "Drive letter assigned on windows workstations as homedirectory."
 msgstr "Windows 分配給使用者個人目錄使用的網路磁碟機編號"
 
@@ -1195,24 +1219,24 @@ msgstr "電子信箱別名清單"
 msgid "EMail alias list has invalid format!"
 msgstr "電子信箱別名清單的格式錯誤!"
 
-#: ../lib/modules/kolabUser.inc:190 ../lib/modules/kolabUser.inc:367
-#: ../lib/modules/kolabUser.inc:787
+#: ../lib/modules/kolabUser.inc:190 ../lib/modules/kolabUser.inc:365
+#: ../lib/modules/kolabUser.inc:780
 msgid "EMail aliases"
 msgstr "電子信箱別名"
 
-#: ../lib/modules/sambaSamAccount.inc:442
+#: ../lib/modules/sambaSamAccount.inc:449
 msgid "East Australian Standard, Guam"
 msgstr "東澳標準時間, 關島"
 
-#: ../lib/modules/sambaSamAccount.inc:434
+#: ../lib/modules/sambaSamAccount.inc:441
 msgid "Eastern Europe Time, South Africa"
 msgstr "東歐時間, 南非"
 
-#: ../lib/modules/sambaSamAccount.inc:427
+#: ../lib/modules/sambaSamAccount.inc:434
 msgid "Eastern Time (US & Canada), Bogota"
 msgstr "美東時間(美國和加拿大), 波哥大"
 
-#: ../lib/types/group.inc:142 ../lib/types/user.inc:193 ../lib/lists.inc:370
+#: ../lib/types/group.inc:142 ../lib/types/user.inc:193 ../lib/lists.inc:380
 msgid "Edit"
 msgstr "編輯"
 
@@ -1220,27 +1244,27 @@ msgstr "編輯"
 msgid "Edit PDF structure"
 msgstr "編輯PDF架構"
 
-#: ../templates/config/confmain.php:200
+#: ../templates/config/confmain.php:202
 msgid "Edit account types"
 msgstr "編輯帳號類型"
 
 #: ../templates/config/mainmanage.php:58 ../templates/config/index.php:76
 msgid "Edit general settings"
-msgstr "編輯一般設定"
+msgstr "編輯一般環境設定"
 
-#: ../lib/modules/posixAccount.inc:919
+#: ../lib/modules/posixAccount.inc:841
 msgid "Edit groups"
 msgstr "設定群組"
 
-#: ../lib/modules/sambaSamAccount.inc:954
+#: ../lib/modules/sambaSamAccount.inc:1002
 msgid "Edit logon hours"
 msgstr "設定可登入時間"
 
-#: ../lib/modules/posixGroup.inc:172
+#: ../lib/modules/posixGroup.inc:161
 msgid "Edit members"
 msgstr "設定成員"
 
-#: ../templates/config/confmain.php:202
+#: ../templates/config/confmain.php:204
 msgid "Edit modules"
 msgstr "編輯模組"
 
@@ -1256,13 +1280,13 @@ msgstr "編修 self service"
 msgid "Edit server profiles"
 msgstr "編輯伺服器設定檔"
 
-#: ../lib/modules/sambaAccount.inc:769 ../lib/modules/sambaSamAccount.inc:910
+#: ../lib/modules/sambaAccount.inc:768 ../lib/modules/sambaSamAccount.inc:958
 msgid "Edit workstations"
 msgstr "設定工作站"
 
 #: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:123
 #: ../lib/modules/inetOrgPerson.inc:170 ../lib/modules/inetOrgPerson.inc:304
-#: ../lib/modules/inetOrgPerson.inc:667 ../lib/modules/inetOrgPerson.inc:822
+#: ../lib/modules/inetOrgPerson.inc:666 ../lib/modules/inetOrgPerson.inc:815
 msgid "Employee type"
 msgstr "受雇類別"
 
@@ -1270,7 +1294,7 @@ msgstr "受雇類別"
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "受雇類別:包商,雇員,實習者,臨時員工..."
 
-#: ../templates/login.php:359
+#: ../templates/login.php:373
 msgid "Empty password submitted. Please try again."
 msgstr "密碼空白,請重試."
 
@@ -1278,7 +1302,7 @@ msgstr "密碼空白,請重試."
 msgid "Encountered an error while performing search."
 msgstr "搜尋時發生錯誤."
 
-#: ../lib/modules/sambaSamAccount.inc:420
+#: ../lib/modules/sambaSamAccount.inc:427
 msgid "Eniwetok, Kwajalein"
 msgstr "埃尼威托克島, 瓜加林島"
 
@@ -1304,20 +1328,28 @@ msgstr "項目 %s 刪除成功"
 msgid "Equality"
 msgstr "相等比對規則"
 
+#: ../templates/tests/lamdaemonTest.php:61
+#: ../templates/tests/lamdaemonTest.php:65
+#: ../templates/tests/lamdaemonTest.php:95
+#: ../templates/tests/lamdaemonTest.php:112
+#: ../templates/tests/lamdaemonTest.php:137
+#: ../templates/tests/lamdaemonTest.php:196
 #: ../templates/config/mainmanage.php:207
 msgid "Error"
 msgstr "錯誤"
 
-#: ../templates/delete.php:230
+#: ../templates/delete.php:227
 #, php-format
 msgid "Error while deleting DN: %s"
 msgstr "刪除DN: %s 時發生錯誤"
 
 #: ../help/help.inc:130
-msgid "Every account type needs exactly one base module. This module provides a "
+msgid ""
+"Every account type needs exactly one base module. This module provides a "
 "structural object class."
-msgstr "每個帳號類型都一定要有一個基本模組.這個模組提供一個結構性(structural)的物件類"
-"別."
+msgstr ""
+"每個帳號類型都一定要有一個基本模組.這個模組提供一個"
+"結構性(structural)的物件類別."
 
 #: ../help/help.inc:73 ../help/help.inc:79 ../help/help.inc:85
 #: ../help/help.inc:90
@@ -1332,6 +1364,10 @@ msgstr "範例值"
 msgid "Examples"
 msgstr "範例"
 
+#: ../templates/tests/lamdaemonTest.php:146
+msgid "Execute lamdaemon"
+msgstr "執行 lamdaemon"
+
 #: ../templates/tree/edit.php:117 ../templates/tree/export_form.php:88
 #: ../templates/tree/export_form.php:96
 msgid "Export"
@@ -1357,8 +1393,8 @@ msgstr "刪除 %s 項目失敗!"
 
 #: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:114
 #: ../lib/modules/inetOrgPerson.inc:218 ../lib/modules/inetOrgPerson.inc:336
-#: ../lib/modules/inetOrgPerson.inc:337 ../lib/modules/inetOrgPerson.inc:646
-#: ../lib/modules/inetOrgPerson.inc:830 ../lib/modules/inetOrgPerson.inc:1106
+#: ../lib/modules/inetOrgPerson.inc:337 ../lib/modules/inetOrgPerson.inc:645
+#: ../lib/modules/inetOrgPerson.inc:823 ../lib/modules/inetOrgPerson.inc:1099
 msgid "Fax number"
 msgstr "傳真號碼"
 
@@ -1366,17 +1402,21 @@ msgstr "傳真號碼"
 msgid "File"
 msgstr "檔案"
 
-#: ../lib/modules/sambaSamAccount.inc:228
-msgid "File name and path relative to netlogon-share which should be executed on "
+#: ../lib/modules/sambaSamAccount.inc:235
+msgid ""
+"File name and path relative to netlogon-share which should be executed on "
 "logon. $user and $group are replaced with user and group name."
-msgstr "在使用者登入時會自動執行的指令檔檔名及其相對路徑. $user 和$group 會以使用者及"
+msgstr ""
+"在使用者登入時會自動執行的指令檔檔名及其相對路徑. $user 和$group 會以使用者及"
 "群組名稱來置換"
 
 #: ../lib/modules/sambaAccount.inc:388
-msgid "File name and path relative to the netlogon-share which should be executed "
+msgid ""
+"File name and path relative to the netlogon-share which should be executed "
 "on logon. $user and $group are replaced with user and group name."
-msgstr "登入時自動執行的檔案名稱及其相對路徑."
-"$user 會$group 會以使用者及群組名稱所置換."
+msgstr ""
+"登入時自動執行的檔案名稱及其相對路徑.$user 會$group 會以使用者及群組名稱所置"
+"換."
 
 #: ../templates/tools.php:62 ../templates/masscreate.php:121
 msgid "File upload"
@@ -1386,14 +1426,14 @@ msgstr "檔案上傳"
 msgid "File upload failed!"
 msgstr "上傳檔案失敗!"
 
-#: ../lib/lists.inc:331
+#: ../lib/lists.inc:338
 msgid "Filter"
 msgstr "搜尋過濾器"
 
 #: ../lib/types/user.inc:87 ../lib/modules/inetOrgPerson.inc:46
 #: ../lib/modules/inetOrgPerson.inc:112 ../lib/modules/inetOrgPerson.inc:145
-#: ../lib/modules/inetOrgPerson.inc:296 ../lib/modules/inetOrgPerson.inc:558
-#: ../lib/modules/inetOrgPerson.inc:820 ../lib/modules/inetOrgPerson.inc:1066
+#: ../lib/modules/inetOrgPerson.inc:296 ../lib/modules/inetOrgPerson.inc:557
+#: ../lib/modules/inetOrgPerson.inc:813 ../lib/modules/inetOrgPerson.inc:1059
 msgid "First name"
 msgstr "名字"
 
@@ -1407,62 +1447,56 @@ msgstr "使用者的名字(first name),只容許使用字母,-(減號)和空白"
 
 #: ../lib/modules/kolabUser.inc:125
 msgid "For automatic invitation handling."
-msgstr "處理自動的invitation"
+msgstr "如何自動化處理邀請事件."
 
 #: ../lib/modules/kolabUser.inc:89 ../lib/modules/kolabUser.inc:156
-#: ../lib/modules/kolabUser.inc:202 ../lib/modules/kolabUser.inc:312
-#: ../lib/modules/kolabUser.inc:765
+#: ../lib/modules/kolabUser.inc:202 ../lib/modules/kolabUser.inc:310
+#: ../lib/modules/kolabUser.inc:758
 msgid "Free/Busy interval"
-msgstr "Free/Busy 間隔時間"
+msgstr "空閒/忙碌 間隔時間"
 
 #: ../lib/modules/kolabUser.inc:234 ../lib/modules/kolabUser.inc:235
 msgid "Free/Busy interval must be a number!"
-msgstr "Free/Busy的間隔必須是時間一個數字!"
+msgstr "空閒/忙碌 間隔時間必須是一個數字!"
 
-#: ../lib/modules/sambaSamAccount.inc:1012
+#: ../lib/modules/sambaSamAccount.inc:1059
 msgid "Friday"
 msgstr "星期五"
 
 #: ../lib/types/host.inc:87 ../lib/types/group.inc:83 ../lib/types/user.inc:84
-#: ../lib/modules/posixGroup.inc:163 ../lib/modules/posixGroup.inc:362
-#: ../lib/modules/posixGroup.inc:392 ../lib/modules/posixGroup.inc:420
-#: ../lib/modules/posixGroup.inc:464 ../lib/modules/posixGroup.inc:485
-#: ../lib/modules/posixAccount.inc:56 ../lib/modules/posixAccount.inc:1137
+#: ../lib/modules/posixGroup.inc:152 ../lib/modules/posixGroup.inc:340
+#: ../lib/modules/posixGroup.inc:370 ../lib/modules/posixGroup.inc:390
+#: ../lib/modules/posixGroup.inc:434 ../lib/modules/posixGroup.inc:454
+#: ../lib/modules/posixAccount.inc:85 ../lib/modules/posixAccount.inc:1034
 #: ../lib/modules/sambaGroupMapping.inc:323
 msgid "GID number"
-msgstr "GID編號"
+msgstr "GID 編號"
 
-#: ../lib/modules/posixGroup.inc:485
+#: ../lib/modules/posixGroup.inc:454
 msgid ""
 "GID number has changed. Please select checkbox to change GID number of users "
 "and hosts."
 msgstr "GID的編號已經更改,請選擇核取方塊來改變使用者帳號和主機帳號的GID"
 
-#: ../lib/modules/posixAccount.inc:56
+#: ../lib/modules/posixAccount.inc:85
 #, php-format
-msgid "GID number has changed. To keep file ownership you have to run the following "
+msgid ""
+"GID number has changed. To keep file ownership you have to run the following "
 "command as root: 'find / -gid %s -uid %s -exec chgrp %s {} \\;'"
-msgstr "GID的編號已經更改,要保持正確的檔案擁有群組,您必須以root的身分執行以下命令: "
+msgstr ""
+"GID的編號已經更改,要保持正確的檔案擁有群組,您必須以root的身分執行以下命令: "
 "'find / -gid %s -uid %s -exec chgrp %s {} \\;'"
 
-#: ../lib/modules/posixGroup.inc:492
+#: ../lib/modules/posixGroup.inc:461
 msgid "GID number has to be a numeric value!"
 msgstr "GID必須使用數字"
 
-#: ../lib/modules/posixGroup.inc:318
-msgid "GID ranges for Unix groups"
-msgstr "unix群組使用的GID範圍"
-
-#: ../lib/modules/posixAccount.inc:264 ../lib/modules/posixAccount.inc:296
-#: ../lib/modules/posixAccount.inc:366 ../lib/modules/posixAccount.inc:408
-#: ../lib/modules/posixAccount.inc:908 ../lib/modules/posixAccount.inc:1138
+#: ../lib/modules/posixAccount.inc:249 ../lib/modules/posixAccount.inc:281
+#: ../lib/modules/posixAccount.inc:351 ../lib/modules/posixAccount.inc:389
+#: ../lib/modules/posixAccount.inc:830 ../lib/modules/posixAccount.inc:1035
 msgid "Gecos"
 msgstr "備註資料(Gecos)"
 
-#: ../lib/modules/posixGroup.inc:178 ../lib/modules/posixAccount.inc:935
-msgid "Generate password"
-msgstr "產生密碼"
-
 #: ../lib/modules/kolabUser.inc:179
 msgid "Germany"
 msgstr "德國"
@@ -1472,25 +1506,26 @@ msgstr "德國"
 msgid "Go"
 msgstr "開始"
 
-#: ../lib/modules/quota.inc:102 ../lib/modules/quota.inc:302
+#: ../lib/modules/quota.inc:102 ../lib/modules/quota.inc:314
 msgid "Grace block period"
 msgstr "區塊配額的寬限期"
 
 #: ../lib/modules/quota.inc:103
-msgid "Grace block period. Most filesystems use a fixed maximum value of 7 days."
+msgid ""
+"Grace block period. Most filesystems use a fixed maximum value of 7 days."
 msgstr "區塊配額的寬限期,大部分的檔案系統都設定最大為7天."
 
 #: ../lib/modules/quota.inc:119
-msgid "Grace inode (files) period. Most filesystems use a fixed maximum value of 7 "
+msgid ""
+"Grace inode (files) period. Most filesystems use a fixed maximum value of 7 "
 "days."
-msgstr "inode(檔案數目)配額的寬限期,大部分的檔案系統都設定最大為7"
-"天."
+msgstr "inode(檔案數目)配額的寬限期,大部分的檔案系統都設定最大為7天."
 
-#: ../lib/modules/quota.inc:118 ../lib/modules/quota.inc:306
+#: ../lib/modules/quota.inc:118 ../lib/modules/quota.inc:318
 msgid "Grace inode period"
-msgstr "inode(檔案數目)配額的寬限期"
+msgstr "檔案數目配額的寬限期"
 
-#: ../templates/selfService/adminMain.php:460
+#: ../templates/selfService/adminMain.php:495
 msgid "Group"
 msgstr "群組"
 
@@ -1498,11 +1533,11 @@ msgstr "群組"
 msgid "Group accounts (e.g. Unix and Samba)"
 msgstr "群組帳號(例如:Unix和Samba)"
 
-#: ../lib/types/group.inc:86 ../lib/modules/posixGroup.inc:368
+#: ../lib/types/group.inc:86 ../lib/modules/posixGroup.inc:346
 msgid "Group description"
 msgstr "群組說明"
 
-#: ../lib/modules/posixGroup.inc:397
+#: ../lib/modules/posixGroup.inc:375
 msgid "Group description. If left empty group name will be used."
 msgstr "群組的說明,若留空白,則預設值是群組名稱."
 
@@ -1510,43 +1545,55 @@ msgstr "群組的說明,若留空白,則預設值是群組名稱."
 msgid "Group member DNs"
 msgstr "群組成員的DN"
 
-#: ../lib/types/group.inc:84 ../lib/modules/posixGroup.inc:171
-#: ../lib/modules/posixGroup.inc:232 ../lib/modules/posixGroup.inc:374
-#: ../lib/modules/posixGroup.inc:400 ../lib/modules/posixGroup.inc:404
-#: ../lib/modules/posixGroup.inc:465
+#: ../lib/types/group.inc:84 ../lib/modules/posixGroup.inc:160
+#: ../lib/modules/posixGroup.inc:220 ../lib/modules/posixGroup.inc:352
+#: ../lib/modules/posixGroup.inc:378 ../lib/modules/posixGroup.inc:382
+#: ../lib/modules/posixGroup.inc:435
 msgid "Group members"
 msgstr "群組成員"
 
-#: ../lib/types/group.inc:82 ../lib/modules/posixGroup.inc:159
-#: ../lib/modules/posixGroup.inc:354 ../lib/modules/posixGroup.inc:388
-#: ../lib/modules/posixGroup.inc:463 ../lib/modules/posixGroup.inc:493
-#: ../lib/modules/posixGroup.inc:494 ../lib/modules/posixGroup.inc:495
+#: ../lib/types/group.inc:82 ../lib/modules/posixGroup.inc:148
+#: ../lib/modules/posixGroup.inc:332 ../lib/modules/posixGroup.inc:366
+#: ../lib/modules/posixGroup.inc:433 ../lib/modules/posixGroup.inc:462
+#: ../lib/modules/posixGroup.inc:463 ../lib/modules/posixGroup.inc:464
+#: ../lib/modules/groupOfNames.inc:56 ../lib/modules/groupOfNames.inc:80
+#: ../lib/modules/groupOfNames.inc:433
 msgid "Group name"
 msgstr "群組名稱"
 
-#: ../lib/modules/posixGroup.inc:495 ../lib/modules/posixGroup.inc:496
-msgid "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
+#: ../lib/modules/posixGroup.inc:464 ../lib/modules/posixGroup.inc:465
+msgid ""
+"Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
-msgstr "群組名稱包含無效字元,可用的字元為: a-z, A-Z, 0-9, 及 "
-"-(減號)_(底線) !"
+msgstr "群組名稱包含無效字元,可用的字元為: a-z, A-Z, 0-9, 及 -(減號)_(底線) !"
 
-#: ../lib/modules/posixGroup.inc:494
+#: ../lib/modules/posixGroup.inc:463
 msgid "Group name in use. Selected next free group name."
 msgstr "群組名稱已被使用,請選擇可用的群組名稱."
 
-#: ../lib/modules/posixGroup.inc:389
-msgid "Group name of the group which should be created. Valid characters are: a-z,0-"
+#: ../lib/modules/posixGroup.inc:367
+msgid ""
+"Group name of the group which should be created. Valid characters are: a-z,0-"
 "9, .-_. LAM does not allow a number as first character because groupadd also "
 "does not allow it. LAM does not allow capital letters A-Z because it can "
 "cause several problems. If group name is already used group name will be "
 "expanded with a number. The next free number will be used."
-msgstr "群組名稱.可用的字元為:a-z,0-9,.-_ ."
-"因為groupadd指令不允許以數字開頭的群組名稱,"
-"所以LAM也不允許."
-"另外也不能使用大寫字母,因為會造成一些問題."
-"如果該群組名稱已經存在,則會在結尾自動加上下一個可用的數字"
+msgstr ""
+"群組名稱.可用的字元為:a-z,0-9,.-_ ."
+"因為groupadd指令不允許以數字開頭的群組名稱, "
+"所以LAM也不允許.另外也不能使用大寫字母, "
+"因為會造成一些問題.如果該群組名稱已經存在, "
+"則會在結尾自動加上下一個可用的數字"
 
-#: ../lib/modules/posixGroup.inc:380 ../lib/modules/posixGroup.inc:408
+#: ../lib/modules/groupOfNames.inc:40
+msgid "Group of names"
+msgstr "名稱的群組"
+
+#: ../lib/modules/groupOfUniqueNames.inc:40
+msgid "Group of unique names"
+msgstr "獨特名稱的群組"
+
+#: ../lib/modules/posixGroup.inc:358 ../lib/modules/posixGroup.inc:386
 msgid "Group password"
 msgstr "群組密碼"
 
@@ -1554,20 +1601,20 @@ msgstr "群組密碼"
 msgid "Group type"
 msgstr "群組類型"
 
-#: ../lib/types/group.inc:44
+#: ../lib/types/group.inc:44 ../lib/modules/posixGroup.inc:296
 msgid "Groups"
 msgstr "群組帳號"
 
-#: ../lib/modules/quota.inc:435
+#: ../lib/modules/quota.inc:443
 msgid "Hard block"
 msgstr "區塊配碩"
 
 #: ../lib/modules/quota.inc:98 ../lib/modules/quota.inc:99
-#: ../lib/modules/quota.inc:301 ../lib/modules/quota.inc:358
+#: ../lib/modules/quota.inc:313 ../lib/modules/quota.inc:366
 msgid "Hard block limit"
 msgstr "硬性區塊配額限制"
 
-#: ../lib/modules/quota.inc:437
+#: ../lib/modules/quota.inc:445
 msgid "Hard inode"
 msgstr "硬性檔案數目"
 
@@ -1575,12 +1622,12 @@ msgstr "硬性檔案數目"
 msgid "Hard inode (files) limit"
 msgstr "硬性檔案數目限制"
 
-#: ../lib/modules/quota.inc:114 ../lib/modules/quota.inc:305
-#: ../lib/modules/quota.inc:360
+#: ../lib/modules/quota.inc:114 ../lib/modules/quota.inc:317
+#: ../lib/modules/quota.inc:368
 msgid "Hard inode limit"
 msgstr "硬性檔案數目限制"
 
-#: ../lib/modules/sambaSamAccount.inc:422
+#: ../lib/modules/sambaSamAccount.inc:429
 msgid "Hawaii"
 msgstr "夏威夷"
 
@@ -1603,10 +1650,10 @@ msgstr "標題"
 #: ../templates/config/mainmanage.php:304
 #: ../templates/config/confmodules.php:122
 #: ../templates/config/confmain.php:147 ../templates/config/confmain.php:161
-#: ../templates/config/confmain.php:183 ../templates/config/confmain.php:204
+#: ../templates/config/confmain.php:183 ../templates/config/confmain.php:206
 #: ../templates/config/confmain.php:261 ../templates/config/confmain.php:306
 #: ../templates/config/confmain.php:325 ../templates/config/confmain.php:334
-#: ../templates/config/confmain.php:352 ../templates/config/confmain.php:366
+#: ../templates/config/confmain.php:353 ../templates/config/confmain.php:367
 #: ../templates/config/conftypes.php:201 ../templates/config/conftypes.php:217
 #: ../templates/config/conflogin.php:128 ../templates/config/mainlogin.php:119
 #: ../templates/selfService/profManage.php:159
@@ -1614,29 +1661,31 @@ msgstr "標題"
 #: ../templates/selfService/profManage.php:234
 #: ../templates/selfService/profManage.php:258
 #: ../templates/selfService/adminLogin.php:125
-#: ../templates/selfService/adminMain.php:235
-#: ../templates/selfService/adminMain.php:249
-#: ../templates/selfService/adminMain.php:263
-#: ../templates/selfService/adminMain.php:277
-#: ../templates/selfService/adminMain.php:300
-#: ../templates/selfService/adminMain.php:320
+#: ../templates/selfService/adminMain.php:270
+#: ../templates/selfService/adminMain.php:284
+#: ../templates/selfService/adminMain.php:298
+#: ../templates/selfService/adminMain.php:312
 #: ../templates/selfService/adminMain.php:335
-#: ../templates/selfService/adminMain.php:350
-#: ../templates/selfService/adminMain.php:434
-#: ../templates/selfService/adminMain.php:468
+#: ../templates/selfService/adminMain.php:355
+#: ../templates/selfService/adminMain.php:370
+#: ../templates/selfService/adminMain.php:385
+#: ../templates/selfService/adminMain.php:469
+#: ../templates/selfService/adminMain.php:503
 #: ../templates/pdfedit/pdfpage.php:750
 #: ../templates/profedit/profilepage.php:195
 #: ../templates/profedit/profilepage.php:215
-#: ../templates/profedit/profilepage.php:246 ../lib/lists.inc:327
-#: ../lib/modules.inc:698
+#: ../templates/profedit/profilepage.php:246 ../lib/lists.inc:334
+#: ../lib/modules.inc:672
 msgid "Help"
 msgstr "說明"
 
 #: ../templates/masscreate.php:142
-msgid "Here is a list of possible columns. The red columns must be included in the "
+msgid ""
+"Here is a list of possible columns. The red columns must be included in the "
 "CSV file and filled with data for all accounts."
-msgstr "這裡有一些可能的欄位.紅色的欄位必須包含在CSV檔內,"
-"而且填上用所有帳號的資料."
+msgstr ""
+"這裡有一些可能的欄位.紅色的欄位必須包含在 "
+"CSV檔內,而且填上用所有帳號的資料."
 
 #: ../templates/tools.php:84
 msgid "Here you can browse LDAP object classes and attributes."
@@ -1650,22 +1699,31 @@ msgstr "您可以上傳CSV檔來建立大量帳號"
 msgid "Here you can define to deactivate accounts after bad logon attempts."
 msgstr "您可以在這裡定義錯誤登入嘗試多次後即停用帳號."
 
-#: ../lib/modules/posixAccount.inc:350
-msgid "Here you can enter a list of additional group memberships. The group names "
+#: ../lib/modules/groupOfNames.inc:61
+msgid "Here you can enter a description for this group."
+msgstr "在此輸入這個群組的說明."
+
+#: ../lib/modules/posixAccount.inc:335
+msgid ""
+"Here you can enter a list of additional group memberships. The group names "
 "are separated by commas."
-msgstr "您可以在此輸入一些額外的群組成員."
-"群組名稱以逗點分隔."
+msgstr "您可以在此輸入一些額外的群組成員.群組名稱以逗點分隔."
 
 #: ../help/help.inc:140
-msgid "Here you can input small filter expressions (e.g. 'value' or 'v*'). LAM will "
+msgid ""
+"Here you can input small filter expressions (e.g. 'value' or 'v*'). LAM will "
 "filter case-insensitive."
-msgstr "您可以在此輸入簡單的過濾搜尋語法(例如:'value'或'v*').在搜尋時不分大小寫."
+msgstr ""
+"在此輸入簡單的過濾語法(例如 'value' 或 'v*'). LAM在"
+"過濾時不分大小寫."
 
 #: ../help/help.inc:153
-msgid "Here you can load an account profile to set default settings for your "
+msgid ""
+"Here you can load an account profile to set default settings for your "
 "account. The \"default\" profile is automatically loaded for new accounts."
-msgstr "您可以指定一個帳號原則的設定檔來設定帳號的預設值.新增的帳號會自動使用"
-"\"default\"設定檔."
+msgstr ""
+"您可以指定一個帳號設定檔來設定此"
+"帳號的預設值.新增的帳號會自動使用\"default\"設定檔."
 
 #: ../templates/tools.php:56
 msgid "Here you can manage your account profiles."
@@ -1677,75 +1735,85 @@ msgid ""
 msgstr "您可以在此選擇一個PDF架構,然後將帳號滙出成PDF檔."
 
 #: ../help/help.inc:136
-msgid "Here you can select where LAM should save its log messages. System logging "
+msgid ""
+"Here you can select where LAM should save its log messages. System logging "
 "will go to Syslog on Unix systems and event log on Windows. You can also "
 "select an extra file."
-msgstr "您可以在此選擇LAM要將記錄的訊息存放在何處."
-"系統記錄在Unix系統上表示Syslog,在Windows系統上表示事件記錄."
-"您也可以選擇一個其他檔案."
+msgstr ""
+"您可以在此選擇 LAM 要將記錄檔存放在何處. \"系統記錄\""
+"在Unix系統上表示Syslog,在Windows系統上表示事件記錄簿.您也可以"
+"選擇一個其他檔案."
 
 #: ../help/help.inc:113
-msgid "Here you can select which plugins you want to use for account management."
+msgid ""
+"Here you can select which plugins you want to use for account management."
 msgstr "您可以選擇一些帳號管理的額外功能(plugins)"
 
 #: ../lib/modules/sambaDomain.inc:91
-msgid "Here you can specify the minimum number of characters for a user password."
+msgid ""
+"Here you can specify the minimum number of characters for a user password."
 msgstr "您可以在此指定使用者密碼的最小長度."
 
+#: ../templates/tools.php:91
+msgid "Here you can test if certain LAM features work on your installation."
+msgstr "測試您所安裝的LAM系統的功能是否正確執行."
+
 #: ../templates/tree/edit.php:104
 msgid "Hide internal attributes"
 msgstr "隱藏內部屬性"
 
 #: ../templates/masscreate.php:127
-msgid "Hint: Format all cells as text in your spreadsheet program and turn off auto "
+msgid ""
+"Hint: Format all cells as text in your spreadsheet program and turn off auto "
 "correction."
-msgstr "提示: 將試算表的表格格式設定為文字,然後關閉"
-"自動修正的功能"
+msgstr "提示: 將試算表的表格格式設定為文字,然後關閉自動修正的功能"
 
 #: ../templates/tree/edit.php:121
 msgid "Hint: To delete an attribute, empty the text field and click save."
 msgstr "提示:要刪除一個屬性,只要將其欄位值清空然後按儲存."
 
-#: ../lib/modules/posixAccount.inc:395
+#: ../lib/modules/posixAccount.inc:376
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr "按CTRL鍵可以複選群組."
 
-#: ../lib/types/user.inc:89 ../lib/modules/posixAccount.inc:51
-#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:80
-#: ../lib/modules/posixAccount.inc:235 ../lib/modules/posixAccount.inc:353
-#: ../lib/modules/posixAccount.inc:357 ../lib/modules/posixAccount.inc:374
-#: ../lib/modules/posixAccount.inc:719 ../lib/modules/posixAccount.inc:922
-#: ../lib/modules/posixAccount.inc:1065 ../lib/modules/posixAccount.inc:1141
+#: ../lib/types/user.inc:89 ../lib/modules/posixAccount.inc:60
+#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:220 ../lib/modules/posixAccount.inc:338
+#: ../lib/modules/posixAccount.inc:342 ../lib/modules/posixAccount.inc:359
+#: ../lib/modules/posixAccount.inc:656 ../lib/modules/posixAccount.inc:844
+#: ../lib/modules/posixAccount.inc:984 ../lib/modules/posixAccount.inc:1038
 msgid "Home directory"
 msgstr "個人目錄"
 
-#: ../lib/modules/posixAccount.inc:51
+#: ../lib/modules/posixAccount.inc:63
 #, php-format
-msgid "Home directory changed. To keep home directory you have to run the following "
+msgid ""
+"Home directory changed. To keep home directory you have to run the following "
 "command as root: 'mv %s %s'"
-msgstr "使用者目錄已被改變. 要維持一致性,您應該以root的身分執行以下命令:"
-"'mv %s %s'"
+msgstr ""
+"使用者目錄已被改變. 要維持一致性, 您應該以root的身分執行以下"
+"命令:'mv %s %s'"
 
 #: ../lib/modules/sambaAccount.inc:146 ../lib/modules/sambaAccount.inc:277
-#: ../lib/modules/sambaAccount.inc:378 ../lib/modules/sambaAccount.inc:756
-#: ../lib/modules/sambaAccount.inc:857 ../lib/modules/sambaSamAccount.inc:218
-#: ../lib/modules/sambaSamAccount.inc:346
-#: ../lib/modules/sambaSamAccount.inc:897
-#: ../lib/modules/sambaSamAccount.inc:1116
-#: ../lib/modules/sambaSamAccount.inc:1289
+#: ../lib/modules/sambaAccount.inc:378 ../lib/modules/sambaAccount.inc:755
+#: ../lib/modules/sambaAccount.inc:856 ../lib/modules/sambaSamAccount.inc:225
+#: ../lib/modules/sambaSamAccount.inc:353
+#: ../lib/modules/sambaSamAccount.inc:945
+#: ../lib/modules/sambaSamAccount.inc:1214
+#: ../lib/modules/sambaSamAccount.inc:1387
 msgid "Home drive"
 msgstr "個人目錄網路磁碟"
 
 #: ../lib/modules/sambaAccount.inc:61 ../lib/modules/sambaAccount.inc:62
 #: ../lib/modules/sambaAccount.inc:152 ../lib/modules/sambaAccount.inc:283
-#: ../lib/modules/sambaAccount.inc:381 ../lib/modules/sambaAccount.inc:759
-#: ../lib/modules/sambaAccount.inc:856 ../lib/modules/sambaSamAccount.inc:76
+#: ../lib/modules/sambaAccount.inc:381 ../lib/modules/sambaAccount.inc:758
+#: ../lib/modules/sambaAccount.inc:855 ../lib/modules/sambaSamAccount.inc:76
 #: ../lib/modules/sambaSamAccount.inc:77
-#: ../lib/modules/sambaSamAccount.inc:221
-#: ../lib/modules/sambaSamAccount.inc:352
-#: ../lib/modules/sambaSamAccount.inc:900
-#: ../lib/modules/sambaSamAccount.inc:1122
-#: ../lib/modules/sambaSamAccount.inc:1288
+#: ../lib/modules/sambaSamAccount.inc:228
+#: ../lib/modules/sambaSamAccount.inc:359
+#: ../lib/modules/sambaSamAccount.inc:948
+#: ../lib/modules/sambaSamAccount.inc:1220
+#: ../lib/modules/sambaSamAccount.inc:1386
 msgid "Home path"
 msgstr "個人目錄的路徑"
 
@@ -1754,7 +1822,7 @@ msgstr "個人目錄的路徑"
 msgid "Home path is invalid."
 msgstr "個人目錄路徑無效"
 
-#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:60 ../lib/modules/posixAccount.inc:62
 msgid "Homedirectory contains invalid characters."
 msgstr "個人目錄包含無效字元"
 
@@ -1766,72 +1834,76 @@ msgstr "主機帳號(例如 Samba)"
 msgid "Host description"
 msgstr "主機說明"
 
-#: ../lib/modules/account.inc:80 ../lib/modules/posixAccount.inc:409
-#: ../lib/modules/posixAccount.inc:417
+#: ../lib/modules/account.inc:84 ../lib/modules/posixAccount.inc:390
+#: ../lib/modules/posixAccount.inc:398
 msgid "Host description. If left empty host name will be used."
-msgstr "主機的說明,若留空白,預設使用主機名稱."
+msgstr "此主機帳號的說明,若留空白,預設使用主機帳號名稱."
 
-#: ../lib/modules/account.inc:89
+#: ../lib/modules/account.inc:103
 msgid "Host list"
 msgstr "主機清單"
 
 #: ../lib/types/host.inc:82 ../lib/types/host.inc:83
-#: ../lib/modules/posixAccount.inc:93 ../lib/modules/posixAccount.inc:94
-#: ../lib/modules/posixAccount.inc:96 ../lib/modules/posixAccount.inc:275
-#: ../lib/modules/posixAccount.inc:404
+#: ../lib/modules/account.inc:79 ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:260 ../lib/modules/posixAccount.inc:385
 msgid "Host name"
-msgstr "主機名稱"
+msgstr "主機帳號名稱"
 
-#: ../lib/modules/posixAccount.inc:100
+#: ../lib/modules/posixAccount.inc:82
 msgid "Host name already exists!"
 msgstr "主機名稱已經存在!"
 
-#: ../lib/modules/posixAccount.inc:98
+#: ../lib/modules/posixAccount.inc:80
 msgid ""
 "Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
 msgstr "主機名稱包含無效字元,可用的字元包含 a-z, A-Z, 0-9 及 .-_"
 
-#: ../lib/modules/posixAccount.inc:94
-msgid "Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
+#: ../lib/modules/posixAccount.inc:76
+msgid ""
+"Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ ! Host name must end with $ !"
-msgstr "主機名稱包含無效字元,可用的字元包含 a-z, A-Z, 0-9 及 .-_ ! "
-"主機名稱必須以 $ 結束!"
+msgstr ""
+"主機名稱包含無效字元,可用的字元包含 a-z, A-Z, 0-9 "
+"及 .-_ ! 主機名稱必須以 $ 結束!"
 
-#: ../lib/modules/posixAccount.inc:96
+#: ../lib/modules/posixAccount.inc:78
 msgid "Host name in use. Selected next free host name."
 msgstr "主機名稱已被使用,請選擇可用的主機名稱."
 
-#: ../lib/modules/posixAccount.inc:405
-msgid "Host name of the host which should be created. Valid characters are: a-z,0-"
+#: ../lib/modules/account.inc:80 ../lib/modules/posixAccount.inc:386
+msgid ""
+"Host name of the host which should be created. Valid characters are: a-z,0-"
 "9, .-_$. LAM does not allow a number as first character because useradd also "
 "does not allow it. LAM does not allow capital letters A-Z because it can "
 "cause several problems. Host names are always ending with $. If last "
 "character is not $ it will be added. If host name is already used host name "
 "will be expanded with a number. The next free number will be used."
-msgstr "主機必須指定主機名稱.可用的字元為:a-z,0-9,.-_$ ."
-"因為useradd指令不允許以數字開頭的名稱,所以LAM也不允許."
-"另外也不能使用大寫字母,因為會造成一些問題.主機名稱必須以$結尾."
-"如果不是,系統會自動加上."
-"如果該主機名稱已經存在,"
-"則會在結尾自動加上下一個可用的數字"
+msgstr ""
+"主機必須指定主機名稱.可用的字元為:a-z,0-9,.-_$ ."
+"因為useradd指令不允許以數字開頭的名稱,所以LAM也不允許. "
+"另外也不能使用大寫字母,因為會造成一些問題. "
+"主機名稱必須以 $ 結尾. "
+"如果不是,系統會自動加上. "
+"如果該主機名稱已經存在,則會在結尾自動加上下一個可用的數字"
 
-#: ../lib/types/host.inc:44 ../lib/modules/posixAccount.inc:74
-#: ../lib/modules/posixAccount.inc:75 ../lib/modules/posixAccount.inc:77
-#: ../lib/modules/posixAccount.inc:167
+#: ../lib/types/host.inc:44 ../lib/modules/posixAccount.inc:55
+#: ../lib/modules/posixAccount.inc:56 ../lib/modules/posixAccount.inc:58
+#: ../lib/modules/posixAccount.inc:163
 msgid "Hosts"
 msgstr "主機帳號"
 
-#: ../lib/modules/posixGroup.inc:488 ../lib/modules/posixGroup.inc:616
-#: ../lib/modules/posixAccount.inc:84 ../lib/modules/posixAccount.inc:675
+#: ../lib/modules/posixGroup.inc:457 ../lib/modules/posixGroup.inc:565
+#: ../lib/modules/posixAccount.inc:66 ../lib/modules/posixAccount.inc:638
 msgid "ID is already in use"
 msgstr "ID已經存在"
 
-#: ../lib/modules/posixGroup.inc:486 ../lib/modules/posixGroup.inc:487
-#: ../lib/modules/posixGroup.inc:488 ../lib/modules/posixGroup.inc:608
-#: ../lib/modules/posixGroup.inc:616 ../lib/modules/posixAccount.inc:82
-#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:84
-#: ../lib/modules/posixAccount.inc:671 ../lib/modules/posixAccount.inc:675
+#: ../lib/modules/posixGroup.inc:455 ../lib/modules/posixGroup.inc:456
+#: ../lib/modules/posixGroup.inc:457 ../lib/modules/posixGroup.inc:557
+#: ../lib/modules/posixGroup.inc:565 ../lib/modules/posixAccount.inc:64
+#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:634 ../lib/modules/posixAccount.inc:638
 msgid "ID-Number"
 msgstr "ID編號"
 
@@ -1840,35 +1912,49 @@ msgstr "ID編號"
 msgid "Identifier"
 msgstr "名稱"
 
-#: ../lib/modules/sambaAccount.inc:350 ../lib/modules/sambaSamAccount.inc:190
+#: ../lib/modules/sambaAccount.inc:350 ../lib/modules/sambaSamAccount.inc:194
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "使用Unix的密碼當smaba的密碼."
 
-#: ../lib/modules/posixGroup.inc:417 ../lib/modules/posixAccount.inc:387
+#: ../lib/modules/posixAccount.inc:368
 msgid ""
 "If checked account will be deactivated by putting a \"!\" before the "
 "encrypted password."
 msgstr "這個帳號將會被停用,就是在加密的密碼前放上!號."
 
-#: ../lib/modules/sambaAccount.inc:368 ../lib/modules/sambaSamAccount.inc:208
+#: ../lib/modules/sambaAccount.inc:368
 msgid "If checked account will be deactivated. (Setting D-Flag)"
 msgstr "帳號會被關閉(設定 D 旗標)"
 
-#: ../lib/modules/sambaAccount.inc:356 ../lib/modules/sambaSamAccount.inc:196
+#: ../lib/modules/sambaAccount.inc:356 ../lib/modules/sambaSamAccount.inc:200
 msgid "If checked no password will be used."
 msgstr "該帳號不需密碼"
 
-#: ../lib/modules/sambaAccount.inc:362 ../lib/modules/sambaSamAccount.inc:202
+#: ../lib/modules/sambaAccount.inc:362 ../lib/modules/sambaSamAccount.inc:206
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "該帳號的密碼不會過期(設定 X 旗標)"
 
-#: ../lib/modules/posixGroup.inc:393
+#: ../lib/modules/sambaSamAccount.inc:212
+msgid "If checked then the account will be deactivated. (Setting D-Flag)"
+msgstr "如果選取的話,帳號會被停用.(被設定 D 旗標)"
+
+#: ../lib/modules/sambaSamAccount.inc:215
+msgid ""
+"If checked then the account will be locked (setting L-Flag). You usually "
+"want to use this setting to unlock user accounts which were locked because "
+"of failed login attempts."
+msgstr ""
+"如果選取的話, 帳號就會被鎖住(被設定 L 旗標)."
+" 通常帳號會因為多次嘗試登入錯誤而被鎖住, "
+"需要在此處解除鎖定. "
+
+#: ../lib/modules/posixGroup.inc:371
 msgid ""
 "If empty GID number will be generated automaticly depending on your "
 "configuration settings."
 msgstr "若留空白,依則會自動產生,端視於您的環境設定."
 
-#: ../lib/modules/posixAccount.inc:342
+#: ../lib/modules/posixAccount.inc:327
 msgid "If empty UID number will be generated automaticly."
 msgstr "若留空白,則會自動產生."
 
@@ -1876,23 +1962,23 @@ msgstr "若留空白,則會自動產生."
 msgid "If set then users need to login to change their password."
 msgstr "若被設定,則使用者必須先更改其密碼才能登入."
 
-#: ../lib/modules/sambaAccount.inc:353 ../lib/modules/sambaSamAccount.inc:193
+#: ../lib/modules/sambaAccount.inc:353 ../lib/modules/sambaSamAccount.inc:197
 msgid "If set to \"true\" Unix password will also be used as Samba password."
 msgstr "如果設為真,則會以Unix的密碼做為Samba的密碼"
 
-#: ../lib/modules/sambaAccount.inc:371 ../lib/modules/sambaSamAccount.inc:211
+#: ../lib/modules/sambaAccount.inc:371 ../lib/modules/sambaSamAccount.inc:218
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr "如果設為真,帳號將會被停用(設定 D 旗標)"
 
-#: ../lib/modules/sambaAccount.inc:359 ../lib/modules/sambaSamAccount.inc:199
+#: ../lib/modules/sambaAccount.inc:359 ../lib/modules/sambaSamAccount.inc:203
 msgid "If set to \"true\" no password will be used."
 msgstr "如果設為真,則不需密碼."
 
-#: ../lib/modules/sambaAccount.inc:365 ../lib/modules/sambaSamAccount.inc:205
+#: ../lib/modules/sambaAccount.inc:365 ../lib/modules/sambaSamAccount.inc:209
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr "如果設為真,則這個密碼不會過期(設定 X 旗標)"
 
-#: ../lib/modules/sambaSamAccount.inc:247
+#: ../lib/modules/sambaSamAccount.inc:254
 msgid ""
 "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr "若留空白,則預設使用的演算法為:uidNumber*2 + sambaAlgorithmicRidBase."
@@ -1906,7 +1992,9 @@ msgstr "您可以在這裡更改這個系統設定檔的管理密碼."
 msgid ""
 "If you want to change your master configuration password, please enter it "
 "here."
-msgstr "變更系統管理者的密碼."
+msgstr ""
+"在此變更系統管理者"
+"的密碼."
 
 #: ../lib/modules/sambaAccount.inc:403
 msgid ""
@@ -1917,7 +2005,7 @@ msgstr "建立網域管理者或其他特殊帳號."
 #: ../lib/modules/sambaAccount.inc:397
 #: ../lib/modules/sambaGroupMapping.inc:297
 msgid "If you want to use a well known RID you can selcet a well known group."
-msgstr "如果您想要使用著名的(well-known)的RID,您可以選擇一個著名的(well-known)群組."
+msgstr "如果您想要使用公開的(well-known)的RID,您可以選擇一個公開的(well-known)群組."
 
 #: ../templates/tree/export_form.php:120
 msgid "Include system attributes"
@@ -1959,56 +2047,58 @@ msgstr "inode軟性配額包含無效字元.只能使用自然數."
 msgid "Inode soft quota must be smaller than inode hard quota."
 msgstr "inode軟性配額必須小於硬性配額."
 
-#: ../templates/selfService/adminMain.php:362
+#: ../templates/selfService/adminMain.php:397
 msgid "Input fields"
 msgstr "輸入欄位"
 
 #: ../lib/modules/sambaAccount.inc:62 ../lib/modules/sambaAccount.inc:63
 #: ../lib/modules/sambaSamAccount.inc:77
 msgid "Inserted user or group name in home path."
-msgstr ""
+msgstr "在 home 路徑中已插入的使用者和和群組名稱."
 
 #: ../lib/modules/sambaAccount.inc:68 ../lib/modules/sambaSamAccount.inc:83
 msgid "Inserted user or group name in logon script."
-msgstr ""
+msgstr "在登入指令檔中已插入的使用者和群組名稱."
 
 #: ../lib/modules/sambaAccount.inc:65 ../lib/modules/sambaAccount.inc:66
 #: ../lib/modules/sambaSamAccount.inc:80
 msgid "Inserted user or group name in profile path."
-msgstr ""
-
-#: ../lib/modules/sambaGroupMapping.inc:72
-msgid "Invalid Account"
-msgstr "無效的帳號"
+msgstr "在原則設定檔路徑中已插入的使用者和群組名稱."
 
 #: ../templates/massBuildAccounts.php:167
 msgid "Invalid RDN attribute!"
-msgstr "無效的RDN屬性!"
+msgstr "錯誤的 RDN 屬性!"
+
+#: ../lib/modules/sambaGroupMapping.inc:72
+msgid "Invalid account"
+msgstr "無效的帳號"
 
 #: ../lib/modules/kolabUser.inc:124 ../lib/modules/kolabUser.inc:171
-#: ../lib/modules/kolabUser.inc:350 ../lib/modules/kolabUser.inc:777
+#: ../lib/modules/kolabUser.inc:348 ../lib/modules/kolabUser.inc:770
 msgid "Invitation policy"
-msgstr "Invitation 原則"
+msgstr "邀請的原則"
 
 #: ../lib/modules/kolabUser.inc:128
 msgid "Invitation policy list"
-msgstr "Invitation 原則列表"
+msgstr "邀請原則列表"
 
-#: ../lib/modules/sambaSamAccount.inc:437
+#: ../lib/modules/sambaSamAccount.inc:444
 msgid "Islamabad, Karachi"
 msgstr "伊斯蘭馬巴德, 喀拉蚩港市"
 
-#: ../lib/modules/posixGroup.inc:486 ../lib/modules/posixAccount.inc:83
-msgid "It is possible that this ID-number is reused. This can cause several "
+#: ../lib/modules/posixGroup.inc:455 ../lib/modules/posixAccount.inc:65
+msgid ""
+"It is possible that this ID-number is reused. This can cause several "
 "problems because files with old permissions might still exist. To avoid this "
 "warning set maxUID to a higher value."
-msgstr "這個UID可能會被重覆使用.這會造成一些問題."
-"因為可能會存在屬於該ID權限的舊檔案.要避免"
-"這個警告訊息,請將最大的UID設高一點."
+msgstr ""
+"這個UID可能會被重覆使用.這會造成一些問題. "
+"因為可能會存在屬於該ID權限的舊檔案."
+"要避免這個警告訊息,請將最大的UID設高一點."
 
 #: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:119
 #: ../lib/modules/inetOrgPerson.inc:164 ../lib/modules/inetOrgPerson.inc:292
-#: ../lib/modules/inetOrgPerson.inc:661 ../lib/modules/inetOrgPerson.inc:819
+#: ../lib/modules/inetOrgPerson.inc:660 ../lib/modules/inetOrgPerson.inc:812
 msgid "Job title"
 msgstr "職稱"
 
@@ -2035,30 +2125,38 @@ msgstr "Kolab"
 
 #: ../templates/tree/delete_form.php:100
 #, php-format
-msgid "LAM can recursively delete this entry and all of its children. See below for "
+msgid ""
+"LAM can recursively delete this entry and all of its children. See below for "
 "a list of all the entries that this action will delete. Do you want to do "
 "this?"
-msgstr "LAM能遞迴地刪除這個項目及其所有子項目檢視下列將被刪除的所有項目. "
-"下列是將被刪除的項目清單."
-" 確定刪除?"
+msgstr ""
+"LAM能遞迴地刪除這個項目及其所有子項目檢視下列將被刪除的所有項目. "
+"下列是將被刪"
+"除的項目清單. 確定刪除?"
 
-#: ../templates/login.php:178 ../templates/config/index.php:60
+#: ../templates/login.php:187 ../templates/config/index.php:60
 msgid "LAM configuration"
-msgstr "LAM系統設定"
+msgstr "LAM 系統設定"
 
 #: ../templates/massBuildAccounts.php:191
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr "LAM已經檢查您的輸入,現在準備建立帳號."
 
-#: ../lib/modules/posixGroup.inc:425 ../lib/modules/posixAccount.inc:338
-msgid "LAM supports CRYPT, SHA, SSHA, MD5 and SMD5 to generate the hash value of "
+#: ../lib/modules/posixGroup.inc:395 ../lib/modules/posixAccount.inc:323
+msgid ""
+"LAM supports CRYPT, SHA, SSHA, MD5 and SMD5 to generate the hash value of "
 "passwords. SSHA and CRYPT are the most common but CRYPT does not support "
 "passwords greater than 8 letters. We do not recommend to use plain text "
 "passwords."
-msgstr "LAM支援CRYPT, SHA, SSHA, MD5 和 SMD5的雜湊演算法,用來產生密碼的雜湊值."
-"SSHA和CRYPT是最常用的."
-"但CRYPT並不支援超過8個字元的密碼. 我們不建議使用明文的"
-"密碼"
+msgstr ""
+"LAM支援 CRYPT, SHA, SSHA, MD5 和 SMD5 的雜湊演算法, "
+"用來產生密碼的雜湊值. "
+"SSHA 和 CRYPT 是最常用的. 但 CRYPT 並不支援超過 8 個字元的密碼. "
+"我們不建議使用明文的密碼."
+
+#: ../templates/tests/index.php:51
+msgid "LAM tests"
+msgstr "LAM 測試"
 
 #: ../templates/tree/create.php:181 ../templates/massDoUpload.php:87
 #, php-format
@@ -2073,11 +2171,11 @@ msgstr "LAM找不到這個名稱的Samba3網域!"
 msgid "LAM was unable to find a domain with this name!"
 msgstr "LAM找不到這個網域!"
 
-#: ../lib/modules/posixAccount.inc:101
+#: ../lib/modules/posixAccount.inc:83
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAM找不到這個群組"
 
-#: ../lib/modules/posixAccount.inc:1500
+#: ../lib/modules/posixAccount.inc:1412
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAM無法修改 %s 群組的成員"
@@ -2087,24 +2185,26 @@ msgid "LAM will search for accounts in this part of the LDAP tree."
 msgstr "LAM將在LDAP樹的此處開始搜尋帳號."
 
 #: ../help/help.inc:164
-msgid "LAM will use this LDAP DN and password to search for accounts. It is "
+msgid ""
+"LAM will use this LDAP DN and password to search for accounts. It is "
 "sufficient to specify an account with read rights. If nothing is inserted "
 "then LAM will try to connect anonymously."
-msgstr "LAM將會使用這個LDAP DN及密碼來搜尋帳號. "
-"這個帳號只需擁有讀取的權限即可. 如果未輸入任何內容,"
-"則LAM將會以匿名的方式連結LDAP."
+msgstr ""
+"LAM將會使用這個LDAP DN及密碼來搜尋帳號. "
+"這個帳號只需擁有讀取的權限即可. 如果"
+"未輸入任何內容,則LAM將會以匿名的方式連結LDAP."
 
 #: ../templates/profedit/profilepage.php:176
 msgid "LDAP"
 msgstr "LDAP"
 
 #: ../templates/config/confmodules.php:76 ../templates/config/confmain.php:120
-#: ../templates/config/confmain.php:501 ../templates/config/conftypes.php:154
-#: ../templates/selfService/adminMain.php:72
+#: ../templates/config/confmain.php:509 ../templates/config/conftypes.php:154
+#: ../templates/selfService/adminMain.php:107
 msgid "LDAP Account Manager Configuration"
 msgstr "LDAP Account Manager設定"
 
-#: ../lib/lists.inc:649
+#: ../lib/lists.inc:659
 msgid "LDAP Search failed! Please check your preferences."
 msgstr "LDAP搜尋失敗! 請檢查您的設定."
 
@@ -2112,32 +2212,32 @@ msgstr "LDAP搜尋失敗! 請檢查您的設定."
 msgid "LDAP Suffix is invalid!"
 msgstr "LDAP的尾碼無效!"
 
-#: ../templates/login.php:406
+#: ../templates/login.php:420
 msgid "LDAP error, server says:"
 msgstr "LDAP錯誤, 伺服器訊息:"
 
-#: ../lib/modules.inc:1028
+#: ../lib/modules.inc:991
 msgid "LDAP operation successful."
 msgstr "LDAP操作成功."
 
-#: ../templates/selfService/adminMain.php:273
+#: ../templates/selfService/adminMain.php:308
 msgid "LDAP password"
 msgstr "LDAP 密碼"
 
-#: ../templates/selfService/adminMain.php:286 ../help/help.inc:165
+#: ../templates/selfService/adminMain.php:321 ../help/help.inc:165
 msgid "LDAP search attribute"
 msgstr "LDAP搜尋屬性"
 
-#: ../templates/login.php:296
+#: ../templates/login.php:305
 msgid "LDAP server"
 msgstr "LDAP伺服器"
 
-#: ../lib/lists.inc:635
+#: ../lib/lists.inc:645
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "超過LDAP限制的大小,無法顯示全部項目."
 
 #: ../templates/config/conftypes.php:197
-#: ../templates/selfService/adminMain.php:245
+#: ../templates/selfService/adminMain.php:280
 #: ../templates/profedit/profilepage.php:180 ../help/help.inc:70
 #: ../help/help.inc:161
 msgid "LDAP suffix"
@@ -2151,7 +2251,7 @@ msgstr "LDAP上載完成"
 msgid "LDAP upload in progress. Please wait."
 msgstr "LDAP上載中,請稍候."
 
-#: ../templates/selfService/adminMain.php:259
+#: ../templates/selfService/adminMain.php:294
 msgid "LDAP user"
 msgstr "LDAP 使用者"
 
@@ -2164,11 +2264,35 @@ msgstr "LDAP 使用者及密碼"
 msgid "LDIF Export for: %s"
 msgstr "匯出節點 %s 的LDIF檔"
 
-#: ../templates/login.php:245
+#: ../templates/tests/lamdaemonTest.php:59
+msgid "Lamdaemon server and path"
+msgstr "Lamdaemon 伺服器和路徑"
+
+#: ../templates/tests/lamdaemonTest.php:193
+msgid "Lamdaemon successfully run."
+msgstr "Lamdaemon成功執行."
+
+#: ../templates/tests/index.php:55 ../templates/tests/lamdaemonTest.php:51
+msgid "Lamdaemon test"
+msgstr "Lamdaemon 測試"
+
+#: ../templates/tests/lamdaemonTest.php:212
+msgid "Lamdaemon test finished."
+msgstr "Lamdaemon 測試結束."
+
+#: ../templates/tests/lamdaemonTest.php:147
+msgid "Lamdaemon: Quota module installed"
+msgstr "Lamdaemon: 磁碟配額模組已安裝"
+
+#: ../templates/tests/lamdaemonTest.php:148
+msgid "Lamdaemon: read quotas"
+msgstr "Lamdaemon: 讀取磁碟配額"
+
+#: ../templates/login.php:254
 msgid "Language"
 msgstr "語言"
 
-#: ../templates/config/confmain.php:440
+#: ../templates/config/confmain.php:448
 msgid "Language is not defined!"
 msgstr "尚未定義語言!"
 
@@ -2178,8 +2302,8 @@ msgstr "語言設定"
 
 #: ../lib/types/user.inc:88 ../lib/modules/inetOrgPerson.inc:48
 #: ../lib/modules/inetOrgPerson.inc:112 ../lib/modules/inetOrgPerson.inc:151
-#: ../lib/modules/inetOrgPerson.inc:300 ../lib/modules/inetOrgPerson.inc:564
-#: ../lib/modules/inetOrgPerson.inc:821 ../lib/modules/inetOrgPerson.inc:1074
+#: ../lib/modules/inetOrgPerson.inc:300 ../lib/modules/inetOrgPerson.inc:563
+#: ../lib/modules/inetOrgPerson.inc:814 ../lib/modules/inetOrgPerson.inc:1067
 msgid "Last name"
 msgstr "姓氏"
 
@@ -2191,7 +2315,7 @@ msgstr "姓氏包含錯誤字元或是空白!"
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "使用者的姓氏,只能使用字母, - 和空白."
 
-#: ../lib/modules/shadowAccount.inc:321
+#: ../lib/modules/shadowAccount.inc:360
 msgid "Last password change"
 msgstr "最後密碼變更"
 
@@ -2199,7 +2323,7 @@ msgstr "最後密碼變更"
 msgid "Line ends"
 msgstr "每一行結尾的格式"
 
-#: ../templates/selfService/adminMain.php:217
+#: ../templates/selfService/adminMain.php:252
 msgid "Link to login page for this self service profile"
 msgstr "連結到此self service設定檔的登入頁面."
 
@@ -2211,13 +2335,13 @@ msgstr "列出屬性"
 msgid "List attributes are invalid!"
 msgstr "清單上的屬性設定錯誤!"
 
-#: ../lib/modules/sambaAccount.inc:391 ../lib/modules/sambaSamAccount.inc:231
+#: ../lib/modules/sambaAccount.inc:391 ../lib/modules/sambaSamAccount.inc:238
 msgid ""
 "List of Samba workstations the user is allowed to login. Empty means every "
 "workstation."
 msgstr "容許這個使用者可登入的Samba工作站清單.空白表示任何工作站都可以登入."
 
-#: ../templates/config/confmain.php:431
+#: ../templates/config/confmain.php:439
 msgid "List of admin users is empty or invalid!"
 msgstr "管理者清單是空的或是無效的."
 
@@ -2225,7 +2349,7 @@ msgstr "管理者清單是空的或是無效的."
 msgid "List of entries to be deleted:"
 msgstr "將被刪除的項目清單:"
 
-#: ../templates/config/confmain.php:348
+#: ../templates/config/confmain.php:349
 msgid "List of valid users"
 msgstr "有效使用者列表"
 
@@ -2233,32 +2357,32 @@ msgstr "有效使用者列表"
 msgid "List settings"
 msgstr "清單設定"
 
-#: ../lib/modules.inc:1074 ../lib/modules.inc:1077 ../help/help.inc:152
+#: ../lib/modules.inc:1037 ../lib/modules.inc:1040 ../help/help.inc:152
 msgid "Load profile"
 msgstr "載入設定檔"
 
-#: ../lib/modules/sambaGroupMapping.inc:69
-msgid "Local Group"
-msgstr "本機群組"
-
 #: ../lib/modules/inetLocalMailRecipient.inc:61
-#: ../lib/modules/inetLocalMailRecipient.inc:154
+#: ../lib/modules/inetLocalMailRecipient.inc:152
 msgid "Local address"
-msgstr "本機地址"
+msgstr "本機郵件信箱"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:65
 #: ../lib/modules/inetLocalMailRecipient.inc:98
-#: ../lib/modules/inetLocalMailRecipient.inc:313
+#: ../lib/modules/inetLocalMailRecipient.inc:310
 msgid "Local address list"
-msgstr "本機地址清單"
+msgstr "本機郵件信箱的清單"
 
-#: ../lib/modules/posixGroup.inc:195 ../lib/modules/posixAccount.inc:256
-#: ../lib/modules/posixAccount.inc:952 ../lib/modules/posixAccount.inc:1077
+#: ../lib/modules/sambaGroupMapping.inc:69
+msgid "Local group"
+msgstr "本機群組"
+
+#: ../lib/modules/posixGroup.inc:170 ../lib/modules/posixAccount.inc:241
+#: ../lib/modules/posixAccount.inc:860
 msgid "Lock password"
 msgstr "鎖定密碼"
 
 #: ../lib/modules/sambaDomain.inc:122 ../lib/modules/sambaDomain.inc:199
-#: ../lib/modules/sambaDomain.inc:298 ../lib/modules/sambaDomain.inc:636
+#: ../lib/modules/sambaDomain.inc:296 ../lib/modules/sambaDomain.inc:633
 msgid "Lockout duration"
 msgstr "帳號鎖住期間"
 
@@ -2266,8 +2390,8 @@ msgstr "帳號鎖住期間"
 msgid "Lockout duration must be are natural number."
 msgstr "帳號鎖住期間必須是自然數."
 
-#: ../lib/modules/sambaDomain.inc:110 ../lib/modules/sambaDomain.inc:281
-#: ../lib/modules/sambaDomain.inc:627
+#: ../lib/modules/sambaDomain.inc:110 ../lib/modules/sambaDomain.inc:279
+#: ../lib/modules/sambaDomain.inc:624
 msgid "Lockout users after bad logon attempts"
 msgstr "在多次錯誤登入嘗試之後鎖住帳號."
 
@@ -2283,25 +2407,25 @@ msgstr "記錄層級"
 msgid "Logging"
 msgstr "記錄"
 
-#: ../templates/login.php:271 ../templates/config/conflogin.php:59
+#: ../templates/login.php:280 ../templates/config/conflogin.php:59
 #: ../templates/config/mainlogin.php:67
 #: ../templates/selfService/selfServiceLogin.php:130
 #: ../templates/selfService/adminLogin.php:61
-#: ../templates/selfService/adminMain.php:218 ../help/help.inc:56
+#: ../templates/selfService/adminMain.php:253 ../help/help.inc:56
 msgid "Login"
 msgstr "登入"
 
-#: ../templates/selfService/adminMain.php:314 ../help/help.inc:167
+#: ../templates/selfService/adminMain.php:349 ../help/help.inc:167
 msgid "Login attribute label"
 msgstr "登入屬性標籤"
 
-#: ../templates/selfService/adminMain.php:329 ../help/help.inc:169
+#: ../templates/selfService/adminMain.php:364 ../help/help.inc:169
 msgid "Login caption"
 msgstr "登入標題"
 
-#: ../lib/types/user.inc:90 ../lib/modules/posixAccount.inc:242
-#: ../lib/modules/posixAccount.inc:390 ../lib/modules/posixAccount.inc:958
-#: ../lib/modules/posixAccount.inc:1069 ../lib/modules/posixAccount.inc:1143
+#: ../lib/types/user.inc:90 ../lib/modules/posixAccount.inc:227
+#: ../lib/modules/posixAccount.inc:371 ../lib/modules/posixAccount.inc:879
+#: ../lib/modules/posixAccount.inc:988 ../lib/modules/posixAccount.inc:1039
 msgid "Login shell"
 msgstr "登入的shell"
 
@@ -2309,30 +2433,30 @@ msgstr "登入的shell"
 msgid "Logo"
 msgstr "標誌"
 
-#: ../lib/modules/sambaDomain.inc:98 ../lib/modules/sambaDomain.inc:260
-#: ../lib/modules/sambaDomain.inc:612
+#: ../lib/modules/sambaDomain.inc:98 ../lib/modules/sambaDomain.inc:258
+#: ../lib/modules/sambaDomain.inc:609
 msgid "Logon for password change"
 msgstr "登入密碼變更"
 
 #: ../lib/modules/sambaSamAccount.inc:103
-#: ../lib/modules/sambaSamAccount.inc:255
-#: ../lib/modules/sambaSamAccount.inc:258
-#: ../lib/modules/sambaSamAccount.inc:390
-#: ../lib/modules/sambaSamAccount.inc:953
-#: ../lib/modules/sambaSamAccount.inc:1168
+#: ../lib/modules/sambaSamAccount.inc:262
+#: ../lib/modules/sambaSamAccount.inc:265
+#: ../lib/modules/sambaSamAccount.inc:397
+#: ../lib/modules/sambaSamAccount.inc:1001
+#: ../lib/modules/sambaSamAccount.inc:1266
 msgid "Logon hours"
 msgstr "可登入時間"
 
 #: ../lib/modules/sambaAccount.inc:67 ../lib/modules/sambaAccount.inc:68
 #: ../lib/modules/sambaAccount.inc:164 ../lib/modules/sambaAccount.inc:295
-#: ../lib/modules/sambaAccount.inc:387 ../lib/modules/sambaAccount.inc:765
-#: ../lib/modules/sambaAccount.inc:858 ../lib/modules/sambaSamAccount.inc:82
+#: ../lib/modules/sambaAccount.inc:387 ../lib/modules/sambaAccount.inc:764
+#: ../lib/modules/sambaAccount.inc:857 ../lib/modules/sambaSamAccount.inc:82
 #: ../lib/modules/sambaSamAccount.inc:83
-#: ../lib/modules/sambaSamAccount.inc:227
-#: ../lib/modules/sambaSamAccount.inc:364
-#: ../lib/modules/sambaSamAccount.inc:906
-#: ../lib/modules/sambaSamAccount.inc:1134
-#: ../lib/modules/sambaSamAccount.inc:1290
+#: ../lib/modules/sambaSamAccount.inc:234
+#: ../lib/modules/sambaSamAccount.inc:371
+#: ../lib/modules/sambaSamAccount.inc:954
+#: ../lib/modules/sambaSamAccount.inc:1232
+#: ../lib/modules/sambaSamAccount.inc:1388
 msgid "Logon script"
 msgstr "登入指令檔"
 
@@ -2341,13 +2465,13 @@ msgstr "登入指令檔"
 msgid "Logon script is invalid!"
 msgstr "登入指令檔無效!"
 
-#: ../templates/selfService/selfServiceMain.php:200
-#: ../templates/main_header.php:63 ../templates/logout.php:67
+#: ../templates/selfService/selfServiceMain.php:201
+#: ../templates/main_header.php:69 ../templates/logout.php:67
 msgid "Logout"
 msgstr "登出"
 
 #: ../lib/modules/ieee802device.inc:47 ../lib/modules/ieee802device.inc:57
-#: ../lib/modules/ieee802device.inc:68 ../lib/modules/ieee802device.inc:98
+#: ../lib/modules/ieee802device.inc:68 ../lib/modules/ieee802device.inc:97
 msgid "MAC address"
 msgstr "MAC位址"
 
@@ -2355,11 +2479,11 @@ msgstr "MAC位址"
 msgid "MAC address list"
 msgstr "MAC位址清單"
 
-#: ../lib/modules/ieee802device.inc:194
+#: ../lib/modules/ieee802device.inc:192
 msgid "MAC address(es)"
 msgstr "MAC位址"
 
-#: ../lib/modules/sambaSamAccount.inc:443
+#: ../lib/modules/sambaSamAccount.inc:450
 msgid "Magadan, Solomon Islands"
 msgstr "馬加丹, 所羅門群島"
 
@@ -2368,8 +2492,8 @@ msgid "Mail aliases"
 msgstr "郵件別名"
 
 #: ../lib/modules/kolabUser.inc:93 ../lib/modules/kolabUser.inc:160
-#: ../lib/modules/kolabUser.inc:208 ../lib/modules/kolabUser.inc:307
-#: ../lib/modules/kolabUser.inc:761
+#: ../lib/modules/kolabUser.inc:208 ../lib/modules/kolabUser.inc:305
+#: ../lib/modules/kolabUser.inc:754
 msgid "Mail quota"
 msgstr "郵件大小限制"
 
@@ -2385,39 +2509,39 @@ msgstr "郵件寄送"
 #: ../lib/modules/inetLocalMailRecipient.inc:69
 #: ../lib/modules/inetLocalMailRecipient.inc:75
 #: ../lib/modules/inetLocalMailRecipient.inc:104
-#: ../lib/modules/inetLocalMailRecipient.inc:146
-#: ../lib/modules/inetLocalMailRecipient.inc:316
+#: ../lib/modules/inetLocalMailRecipient.inc:144
+#: ../lib/modules/inetLocalMailRecipient.inc:313
 msgid "Mail server"
 msgstr "郵件伺服器"
 
 #: ../lib/modules/kolabUser.inc:152 ../lib/modules/kolabUser.inc:183
-#: ../lib/modules/kolabUser.inc:295 ../lib/modules/kolabUser.inc:301
-#: ../lib/modules/kolabUser.inc:757
+#: ../lib/modules/kolabUser.inc:293 ../lib/modules/kolabUser.inc:299
+#: ../lib/modules/kolabUser.inc:750
 msgid "Mailbox home server"
-msgstr ""
+msgstr "郵件檔案(mailbox)伺服器"
 
 #: ../lib/modules/kolabUser.inc:232
 msgid "Mailbox home server name is empty!"
-msgstr "Mailbox home server 名稱是空的"
+msgstr "郵件檔案伺服器的名稱是空的 !"
 
 #: ../lib/modules/kolabUser.inc:230 ../lib/modules/kolabUser.inc:231
 msgid "Mailbox home server name is invalid!"
-msgstr "Mailbox home server名稱無效!"
+msgstr "郵件檔案伺服器名稱錯誤 !"
 
 #: ../lib/types/mailAlias.inc:53
 msgid "Mailing aliases (e.g. NIS mail aliases)"
-msgstr "電子郵件的別名(例如:NIS的郵件別名)"
+msgstr "電子郵件郵寄的別名(例如: NIS 郵件別名)"
 
 #: ../lib/modules/nisMailAlias.inc:64
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "寄到這個名稱的郵件會被轉寄到這些收件人."
 
-#: ../templates/pdfedit/pdfpage.php:617 ../lib/modules.inc:980
-#: ../lib/modules.inc:1008
+#: ../templates/pdfedit/pdfpage.php:617 ../lib/modules.inc:943
+#: ../lib/modules.inc:971
 msgid "Main"
 msgstr "主設定(Main)"
 
-#: ../templates/selfService/adminMain.php:344 ../help/help.inc:171
+#: ../templates/selfService/adminMain.php:379 ../help/help.inc:171
 msgid "Main page caption"
 msgstr "主頁標題"
 
@@ -2430,9 +2554,9 @@ msgid "Manage server profiles"
 msgstr "管理伺服器設定檔"
 
 #: ../lib/modules/inetOrgPerson.inc:176 ../lib/modules/inetOrgPerson.inc:308
-#: ../lib/modules/inetOrgPerson.inc:695 ../lib/modules/inetOrgPerson.inc:823
+#: ../lib/modules/inetOrgPerson.inc:694 ../lib/modules/inetOrgPerson.inc:816
 msgid "Manager"
-msgstr "管理者"
+msgstr "管理者(上司)"
 
 #: ../templates/tools.php:70
 msgid "Manages OU objects in your LDAP tree."
@@ -2446,13 +2570,13 @@ msgstr "手動"
 msgid "Manual if conflicts"
 msgstr "如果衝突的話使用手動"
 
-#: ../lib/modules/kolabUser.inc:399 ../lib/modules/kolabUser.inc:568
+#: ../lib/modules/kolabUser.inc:397 ../lib/modules/kolabUser.inc:563
 msgid "Mark account for deletion"
-msgstr "標示要刪除的帳號"
+msgstr "將此帳號標示為刪除"
 
 #: ../lib/modules/kolabUser.inc:164
 msgid "Mark for deletion"
-msgstr ""
+msgstr "標示為刪除"
 
 #: ../templates/config/profmanage.php:348
 #: ../templates/selfService/profManage.php:248 ../help/help.inc:127
@@ -2462,7 +2586,7 @@ msgstr "系統管理者密碼"
 #: ../templates/config/profmanage.php:68
 #: ../templates/selfService/profManage.php:56
 msgid "Master password is wrong!"
-msgstr "管理者密碼錯誤!"
+msgstr "系統管理者密碼錯誤!"
 
 #: ../templates/config/mainmanage.php:88
 msgid "Master passwords are different or empty!"
@@ -2476,46 +2600,34 @@ msgstr "比對規則的OID代號"
 msgid "Matching rules"
 msgstr "比對規則"
 
-#: ../templates/config/confmain.php:437
+#: ../templates/config/confmain.php:445
 msgid "Max list entries is invalid!"
 msgstr "列出最多項目值無效!"
 
-#: ../lib/modules/posixGroup.inc:312 ../lib/modules/posixGroup.inc:490
-#: ../lib/modules/posixGroup.inc:491
+#: ../lib/modules/posixGroup.inc:299 ../lib/modules/posixGroup.inc:459
+#: ../lib/modules/posixGroup.inc:460
 msgid "Maximum GID number"
 msgstr "最大GID編號"
 
-#: ../lib/modules/posixGroup.inc:321
-msgid "Maximum GID number for Unix groups"
-msgstr "Unix群組的最大GID編號"
-
-#: ../lib/modules/posixGroup.inc:490
+#: ../lib/modules/posixGroup.inc:459
 msgid "Maximum GID number is invalid or empty!"
 msgstr "最大的GID錯誤或空白"
 
-#: ../lib/modules/posixGroup.inc:491
+#: ../lib/modules/posixGroup.inc:460
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "最大的GID必須大於最小的GID!"
 
-#: ../lib/modules/posixAccount.inc:73 ../lib/modules/posixAccount.inc:75
-#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:77
-#: ../lib/modules/posixAccount.inc:161 ../lib/modules/posixAccount.inc:170
+#: ../lib/modules/posixAccount.inc:54 ../lib/modules/posixAccount.inc:56
+#: ../lib/modules/posixAccount.inc:57 ../lib/modules/posixAccount.inc:58
+#: ../lib/modules/posixAccount.inc:157 ../lib/modules/posixAccount.inc:166
 msgid "Maximum UID number"
 msgstr "最大UID編號"
 
-#: ../lib/modules/posixAccount.inc:191
-msgid "Maximum UID number for Unix accounts (hosts)"
-msgstr "Unix帳號(主機)的最大UID編號"
-
-#: ../lib/modules/posixAccount.inc:189
-msgid "Maximum UID number for Unix accounts (users)"
-msgstr "Unix帳號(使用者)的最大UID編號"
-
-#: ../lib/modules/posixAccount.inc:73 ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixAccount.inc:54 ../lib/modules/posixAccount.inc:56
 msgid "Maximum UID number is invalid!"
 msgstr "最大UID錯誤"
 
-#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:57 ../lib/modules/posixAccount.inc:58
 msgid "Maximum UID number must be greater than minimum UID number!"
 msgstr "最大的UID必須大於最小的UID!"
 
@@ -2534,18 +2646,24 @@ msgstr "最大的清單項目"
 
 #: ../lib/modules/shadowAccount.inc:47 ../lib/modules/shadowAccount.inc:53
 #: ../lib/modules/shadowAccount.inc:99 ../lib/modules/shadowAccount.inc:165
-#: ../lib/modules/shadowAccount.inc:195 ../lib/modules/shadowAccount.inc:296
+#: ../lib/modules/shadowAccount.inc:195 ../lib/modules/shadowAccount.inc:278
 #: ../lib/modules/sambaDomain.inc:118 ../lib/modules/sambaDomain.inc:196
-#: ../lib/modules/sambaDomain.inc:198 ../lib/modules/sambaDomain.inc:293
-#: ../lib/modules/sambaDomain.inc:633
+#: ../lib/modules/sambaDomain.inc:198 ../lib/modules/sambaDomain.inc:291
+#: ../lib/modules/sambaDomain.inc:630
 msgid "Maximum password age"
 msgstr "密碼最長生命期"
 
-#: ../lib/modules/sambaSamAccount.inc:430
-msgid "Mid-Atlantic"
-msgstr "Mid-Atlantic"
+#: ../lib/modules/groupOfNames.inc:68 ../lib/modules/groupOfNames.inc:72
+#: ../lib/modules/groupOfNames.inc:99 ../lib/modules/groupOfNames.inc:167
+#: ../lib/modules/groupOfNames.inc:445
+msgid "Members"
+msgstr "群組成員"
 
-#: ../lib/modules/sambaSamAccount.inc:421
+#: ../lib/modules/sambaSamAccount.inc:437
+msgid "Mid-Atlantic"
+msgstr "美國中部大西洋沿岸(Mid-Atlantic)"
+
+#: ../lib/modules/sambaSamAccount.inc:428
 msgid "Midway Island, Samoa"
 msgstr "中途島, 薩摩亞"
 
@@ -2553,77 +2671,65 @@ msgstr "中途島, 薩摩亞"
 msgid "Miller"
 msgstr ""
 
-#: ../lib/modules/sambaDomain.inc:90 ../lib/modules/sambaDomain.inc:246
-#: ../lib/modules/sambaDomain.inc:604
+#: ../lib/modules/sambaDomain.inc:90 ../lib/modules/sambaDomain.inc:244
+#: ../lib/modules/sambaDomain.inc:601
 msgid "Minimal password length"
 msgstr "最短密碼長度"
 
-#: ../lib/modules/posixGroup.inc:309 ../lib/modules/posixGroup.inc:489
+#: ../lib/modules/posixGroup.inc:296 ../lib/modules/posixGroup.inc:458
 msgid "Minimum GID number"
 msgstr "最小的GID編號"
 
-#: ../lib/modules/posixGroup.inc:320
-msgid "Minimum GID number for Unix groups"
-msgstr "Unix群組的最小GID編號"
-
-#: ../lib/modules/posixGroup.inc:489
+#: ../lib/modules/posixGroup.inc:458
 msgid "Minimum GID number is invalid or empty!"
 msgstr "最小GID錯誤或空白!"
 
-#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:74
-#: ../lib/modules/posixAccount.inc:158 ../lib/modules/posixAccount.inc:167
+#: ../lib/modules/posixAccount.inc:53 ../lib/modules/posixAccount.inc:55
+#: ../lib/modules/posixAccount.inc:154 ../lib/modules/posixAccount.inc:163
 msgid "Minimum UID number"
 msgstr "最小UID編號"
 
-#: ../lib/modules/posixAccount.inc:190
-msgid "Minimum UID number for Unix accounts (hosts)"
-msgstr "unix帳號(主機)的最小UID"
-
-#: ../lib/modules/posixAccount.inc:188
-msgid "Minimum UID number for Unix accounts (users)"
-msgstr "unix帳號(使用者)的最小UID"
-
-#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixAccount.inc:53 ../lib/modules/posixAccount.inc:55
 msgid "Minimum UID number is invalid!"
 msgstr "最小UID錯誤!"
 
 #: ../lib/modules/shadowAccount.inc:45 ../lib/modules/shadowAccount.inc:94
 #: ../lib/modules/shadowAccount.inc:161 ../lib/modules/shadowAccount.inc:189
-#: ../lib/modules/shadowAccount.inc:291 ../lib/modules/sambaDomain.inc:114
-#: ../lib/modules/sambaDomain.inc:197 ../lib/modules/sambaDomain.inc:288
-#: ../lib/modules/sambaDomain.inc:630
+#: ../lib/modules/shadowAccount.inc:273 ../lib/modules/sambaDomain.inc:114
+#: ../lib/modules/sambaDomain.inc:197 ../lib/modules/sambaDomain.inc:286
+#: ../lib/modules/sambaDomain.inc:627
 msgid "Minimum password age"
 msgstr "密碼最短的生命期"
 
 #: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:113
 #: ../lib/modules/inetOrgPerson.inc:212 ../lib/modules/inetOrgPerson.inc:332
-#: ../lib/modules/inetOrgPerson.inc:333 ../lib/modules/inetOrgPerson.inc:640
-#: ../lib/modules/inetOrgPerson.inc:829
+#: ../lib/modules/inetOrgPerson.inc:333 ../lib/modules/inetOrgPerson.inc:639
+#: ../lib/modules/inetOrgPerson.inc:822
 msgid "Mobile number"
 msgstr "手機號碼"
 
-#: ../lib/modules/inetOrgPerson.inc:1098
+#: ../lib/modules/inetOrgPerson.inc:1091
 msgid "Mobile telephone number"
 msgstr "手機號碼"
 
-#: ../lib/modules.inc:928 ../lib/modules.inc:1083
-msgid "Modify Account"
+#: ../lib/modules.inc:1046
+msgid "Modify account"
 msgstr "修改帳號"
 
 #: ../templates/config/confmodules.php:87
 msgid "Module selection"
 msgstr "模組選擇"
 
-#: ../lib/modules/sambaSamAccount.inc:1011
+#: ../lib/modules/sambaSamAccount.inc:1058
 msgid "Monday"
 msgstr "星期一"
 
-#: ../lib/modules/sambaSamAccount.inc:425
+#: ../lib/modules/sambaSamAccount.inc:432
 msgid "Mountain Time (US & Canada)"
-msgstr ""
+msgstr "Mountain Time(美國和加拿大)"
 
-#: ../lib/modules/quota.inc:86 ../lib/modules/quota.inc:298
-#: ../lib/modules/quota.inc:356 ../lib/modules/quota.inc:433
+#: ../lib/modules/quota.inc:86 ../lib/modules/quota.inc:310
+#: ../lib/modules/quota.inc:364 ../lib/modules/quota.inc:441
 msgid "Mountpoint"
 msgstr "掛載點"
 
@@ -2643,17 +2749,17 @@ msgstr "居住的街道 42號"
 #: ../templates/tree/templates/creation/new_ou_template.php:104
 #: ../templates/schema/schema.php:273 ../templates/pdfedit/pdfdelete.php:57
 #: ../templates/pdfedit/pdfdelete.php:60 ../templates/pdfedit/pdfdelete.php:85
-#: ../templates/pdfedit/pdfpage.php:669
+#: ../templates/pdfedit/pdfpage.php:669 ../lib/modules/groupOfNames.inc:132
 msgid "Name"
 msgstr "名稱"
 
 #: ../help/help.inc:147
-msgid "Name under which the profile will be saved. If a profile with the same name "
+msgid ""
+"Name under which the profile will be saved. If a profile with the same name "
 "exists, it will be overwritten."
-msgstr "這個設定檔的名稱,如果相同的設定檔名稱已"
-"存在,則會直接覆蓋."
+msgstr "這個設定檔的名稱,如果相同的設定檔名稱已存在,則會直接覆蓋."
 
-#: ../lib/modules/ieee802device.inc:105
+#: ../lib/modules/ieee802device.inc:104
 msgid "New MAC address"
 msgstr "新增MAC位址"
 
@@ -2661,9 +2767,9 @@ msgstr "新增MAC位址"
 msgid "New OU created successfully."
 msgstr "新增OU成功."
 
-#: ../lib/modules/ldapPublicKey.inc:99
+#: ../lib/modules/ldapPublicKey.inc:97
 msgid "New SSH public key"
-msgstr "新增SSH公開金鑰"
+msgstr "新增 SSH 公開金鑰"
 
 #: ../lib/types/mailAlias.inc:110
 msgid "New alias"
@@ -2685,13 +2791,13 @@ msgstr "新增群組"
 msgid "New host"
 msgstr "新增主機"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:161
+#: ../lib/modules/inetLocalMailRecipient.inc:159
 msgid "New local address"
-msgstr "新增本地位址"
+msgstr "新增本機郵件信箱"
 
 #: ../templates/config/mainmanage.php:296
 msgid "New master password"
-msgstr "新的系統管理者密碼"
+msgstr "系統管理者的新密碼"
 
 #: ../templates/config/mainmanage.php:85
 msgid "New master password set successfully."
@@ -2706,7 +2812,11 @@ msgstr "新增物件"
 msgid "New organizational unit"
 msgstr "新增organizational unit物件"
 
-#: ../templates/config/confmain.php:361 ../lib/modules/posixAccount.inc:1608
+#: ../lib/modules/groupOfNames.inc:246
+msgid "New owner"
+msgstr "新增擁有者"
+
+#: ../templates/config/confmain.php:362 ../lib/modules/posixAccount.inc:1520
 msgid "New password"
 msgstr "新密碼"
 
@@ -2714,7 +2824,7 @@ msgstr "新密碼"
 msgid "New password set successfully."
 msgstr "新密碼設定成功."
 
-#: ../lib/modules/nisMailAlias.inc:148
+#: ../lib/modules/nisMailAlias.inc:146
 msgid "New recipient"
 msgstr "新增收信者"
 
@@ -2724,7 +2834,7 @@ msgstr "新增的必要屬性"
 
 #: ../lib/types/user.inc:124
 msgid "New user"
-msgstr "新增使用者帳號"
+msgstr "新增使用者"
 
 #: ../templates/tree/update_confirm.php:151
 msgid "New value"
@@ -2737,13 +2847,13 @@ msgid "Next"
 msgstr "下一步"
 
 #: ../lib/modules/sambaDomain.inc:74 ../lib/modules/sambaDomain.inc:154
-#: ../lib/modules/sambaDomain.inc:316 ../lib/modules/sambaDomain.inc:592
+#: ../lib/modules/sambaDomain.inc:314 ../lib/modules/sambaDomain.inc:589
 msgid "Next RID"
 msgstr "下一個RID"
 
 #: ../lib/modules/sambaDomain.inc:188 ../lib/modules/sambaDomain.inc:189
 msgid "Next RID is not a number!"
-msgstr "下一個RID不是一個數字!"
+msgstr "填入的下一個RID不是一個數字!"
 
 #: ../lib/modules/sambaDomain.inc:75
 msgid "Next RID to use when creating accounts (only used by Winbind)."
@@ -2758,16 +2868,16 @@ msgid "Next RID to use when creating user accounts (only used by Winbind)."
 msgstr "建立使用者帳號時使用的下一個RID(只有Winbind才會用到)."
 
 #: ../lib/modules/sambaDomain.inc:82 ../lib/modules/sambaDomain.inc:166
-#: ../lib/modules/sambaDomain.inc:326 ../lib/modules/sambaDomain.inc:598
+#: ../lib/modules/sambaDomain.inc:324 ../lib/modules/sambaDomain.inc:595
 msgid "Next group RID"
 msgstr "下一個群組的RID"
 
 #: ../lib/modules/sambaDomain.inc:192 ../lib/modules/sambaDomain.inc:193
 msgid "Next group RID is not a number!"
-msgstr "下一個群組RID不是數字!"
+msgstr "下一個群組RID不是一個數字!"
 
 #: ../lib/modules/sambaDomain.inc:78 ../lib/modules/sambaDomain.inc:160
-#: ../lib/modules/sambaDomain.inc:321 ../lib/modules/sambaDomain.inc:595
+#: ../lib/modules/sambaDomain.inc:319 ../lib/modules/sambaDomain.inc:592
 msgid "Next user RID"
 msgstr "下一個使用者的RID"
 
@@ -2780,17 +2890,17 @@ msgstr "下一個使用者RID不是數字!"
 msgid "No"
 msgstr "否"
 
-#: ../lib/modules/sambaSamAccount.inc:469
-#: ../lib/modules/sambaSamAccount.inc:554
-#: ../lib/modules/sambaSamAccount.inc:799
+#: ../lib/modules/sambaSamAccount.inc:474
+#: ../lib/modules/sambaSamAccount.inc:558
+#: ../lib/modules/sambaSamAccount.inc:836
 #: ../lib/modules/sambaGroupMapping.inc:88
 #: ../lib/modules/sambaGroupMapping.inc:173
-#: ../lib/modules/sambaGroupMapping.inc:409
+#: ../lib/modules/sambaGroupMapping.inc:408
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "在LDAP沒有任何Samba 3網域,請先建立一個."
 
-#: ../lib/modules/posixAccount.inc:434 ../lib/modules/posixAccount.inc:595
-#: ../lib/modules/posixAccount.inc:890
+#: ../lib/modules/posixAccount.inc:419 ../lib/modules/posixAccount.inc:540
+#: ../lib/modules/posixAccount.inc:812
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "在LDAP中沒有Unix群組,請先建立."
 
@@ -2814,7 +2924,7 @@ msgstr "找不到網域!"
 msgid "No file selected."
 msgstr "沒有選擇檔案"
 
-#: ../lib/modules/posixGroup.inc:487 ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixGroup.inc:456 ../lib/modules/posixAccount.inc:64
 msgid "No free ID-Number!"
 msgstr "沒有可用的ID編號!"
 
@@ -2830,9 +2940,17 @@ msgstr "找不到主機帳號!"
 msgid "No internal attributes"
 msgstr "沒有隱藏屬性"
 
+#: ../templates/tests/lamdaemonTest.php:66
+msgid "No lamdaemon path set, please update your LAM configuration settings."
+msgstr "沒有設定 lamdaemon 的路徑, 請更新您的 LAM 系統設定."
+
+#: ../templates/tests/lamdaemonTest.php:62
+msgid "No lamdaemon server set, please update your LAM configuration settings."
+msgstr "沒有設定 lamdaemon 伺服器, 請更新您的 LAM 系統設定."
+
 #: ../templates/config/mainmanage.php:252
 msgid "No logging"
-msgstr "沒有記錄"
+msgstr "不記錄"
 
 #: ../templates/pdfedit/pdfpage.php:390
 msgid "No logo"
@@ -2844,7 +2962,7 @@ msgstr "找不到物件!"
 
 #: ../templates/config/confmodules.php:266
 msgid "No or more than one base module selected!"
-msgstr "沒有選擇一個基本模組或選擇超過一個!"
+msgstr "沒有選擇任何一個基本模組或選擇超過一個!"
 
 #: ../templates/config/confmain.php:52
 msgid "No password was entered!"
@@ -2880,16 +2998,18 @@ msgid "Note"
 msgstr "注意"
 
 #: ../templates/tree/add_value_form.php:115
-msgid "Note: You will get an \"inappropriate matching\" error if you have not setup "
+msgid ""
+"Note: You will get an \"inappropriate matching\" error if you have not setup "
 "an EQUALITY rule on your LDAP server for this attribute."
-msgstr "注意:如果您沒有在LDAP伺服器為這個屬性設定一個EQUALITY規則,就會發生"
+msgstr ""
+"注意:如果您沒有在LDAP伺服器為這個屬性設定一個EQUALITY規則,就會發生"
 "\"inappropriate matching\"的錯誤訊息."
 
 #: ../templates/config/mainmanage.php:207
 msgid "Notice"
 msgstr "注意"
 
-#: ../templates/delete.php:93
+#: ../templates/delete.php:91
 msgid "Number of child entries"
 msgstr "子項目的數量"
 
@@ -2915,7 +3035,8 @@ msgid "Number of minutes after which the bad logon attempts are reset."
 msgstr "幾分鐘之後,錯誤登入嘗試次數會被重設."
 
 #: ../lib/modules/sambaDomain.inc:115
-msgid "Number of seconds after the user is allowed to change his password again."
+msgid ""
+"Number of seconds after the user is allowed to change his password again."
 msgstr "容許使用者再度更改密碼的間隔時間,以秒為單位."
 
 #: ../lib/modules/sambaDomain.inc:119
@@ -2959,33 +3080,39 @@ msgstr "物件類別"
 msgid "Obsolete"
 msgstr "已過時"
 
-#: ../lib/modules/sambaDomain.inc:262 ../lib/modules/sambaDomain.inc:269
-#: ../lib/modules/sambaDomain.inc:276 ../lib/modules/sambaDomain.inc:283
-#: ../lib/modules/sambaDomain.inc:610 ../lib/modules/sambaDomain.inc:615
-#: ../lib/modules/sambaDomain.inc:620 ../lib/modules/sambaDomain.inc:625
+#: ../lib/modules/sambaDomain.inc:260 ../lib/modules/sambaDomain.inc:267
+#: ../lib/modules/sambaDomain.inc:274 ../lib/modules/sambaDomain.inc:281
+#: ../lib/modules/sambaDomain.inc:607 ../lib/modules/sambaDomain.inc:612
+#: ../lib/modules/sambaDomain.inc:617 ../lib/modules/sambaDomain.inc:622
 msgid "Off"
 msgstr "Off"
 
-#: ../templates/tree/export_form.php:165 ../templates/ou_edit.php:193
+#: ../templates/tree/export_form.php:165
+#: ../templates/tests/lamdaemonTest.php:70
+#: ../templates/tests/lamdaemonTest.php:91
+#: ../templates/tests/lamdaemonTest.php:108
+#: ../templates/tests/lamdaemonTest.php:133
+#: ../templates/tests/lamdaemonTest.php:192 ../templates/ou_edit.php:193
 #: ../templates/masscreate.php:107 ../templates/config/profmanage.php:353
 #: ../templates/config/mainmanage.php:325
 #: ../templates/config/confmodules.php:109
 #: ../templates/config/confmodules.php:112
-#: ../templates/config/confmain.php:384 ../templates/config/conftypes.php:235
+#: ../templates/config/confmain.php:385 ../templates/config/conftypes.php:235
 #: ../templates/config/conflogin.php:124 ../templates/config/conflogin.php:125
 #: ../templates/config/mainlogin.php:117
 #: ../templates/selfService/selfServiceLogin.php:204
 #: ../templates/selfService/profManage.php:253
 #: ../templates/selfService/adminLogin.php:121
 #: ../templates/selfService/adminLogin.php:122
-#: ../templates/selfService/adminMain.php:432
-#: ../templates/selfService/adminMain.php:466
-#: ../templates/selfService/adminMain.php:486
+#: ../templates/selfService/adminMain.php:467
+#: ../templates/selfService/adminMain.php:501
+#: ../templates/selfService/adminMain.php:541
 #: ../templates/pdfedit/pdfmain.php:152
 #: ../templates/profedit/profiledelete.php:82
-#: ../templates/profedit/profilemain.php:165 ../lib/modules/posixGroup.inc:273
-#: ../lib/modules/sambaSamAccount.inc:1058
-#: ../lib/modules/posixAccount.inc:1039 ../lib/modules/inetOrgPerson.inc:764
+#: ../templates/profedit/profilemain.php:165 ../lib/modules/posixGroup.inc:260
+#: ../lib/modules/sambaSamAccount.inc:1105 ../lib/modules/posixAccount.inc:958
+#: ../lib/modules/inetOrgPerson.inc:760 ../lib/modules/groupOfNames.inc:224
+#: ../lib/modules/groupOfNames.inc:251 ../lib/modules/groupOfNames.inc:338
 msgid "Ok"
 msgstr "確定"
 
@@ -2993,10 +3120,10 @@ msgstr "確定"
 msgid "Old value"
 msgstr "舊的值"
 
-#: ../lib/modules/sambaDomain.inc:262 ../lib/modules/sambaDomain.inc:269
-#: ../lib/modules/sambaDomain.inc:276 ../lib/modules/sambaDomain.inc:283
-#: ../lib/modules/sambaDomain.inc:611 ../lib/modules/sambaDomain.inc:616
-#: ../lib/modules/sambaDomain.inc:621 ../lib/modules/sambaDomain.inc:626
+#: ../lib/modules/sambaDomain.inc:260 ../lib/modules/sambaDomain.inc:267
+#: ../lib/modules/sambaDomain.inc:274 ../lib/modules/sambaDomain.inc:281
+#: ../lib/modules/sambaDomain.inc:608 ../lib/modules/sambaDomain.inc:613
+#: ../lib/modules/sambaDomain.inc:618 ../lib/modules/sambaDomain.inc:623
 msgid "On"
 msgstr "On"
 
@@ -3021,11 +3148,17 @@ msgstr "排序規則"
 msgid "Organizational unit"
 msgstr "Organizational unit"
 
+#: ../lib/modules/groupOfNames.inc:64 ../lib/modules/groupOfNames.inc:93
+#: ../lib/modules/groupOfNames.inc:143 ../lib/modules/groupOfNames.inc:161
+#: ../lib/modules/groupOfNames.inc:441
+msgid "Owner"
+msgstr ""
+
 #: ../templates/tools.php:76
 msgid "PDF editor"
 msgstr "PDF編輯器"
 
-#: ../templates/pdfedit/pdfpage.php:451 ../lib/lists.inc:501
+#: ../templates/pdfedit/pdfpage.php:451 ../lib/lists.inc:511
 msgid "PDF structure"
 msgstr "PDF的架構"
 
@@ -3041,7 +3174,7 @@ msgstr "PDF架構"
 msgid "PDF-structure name not valid"
 msgstr "PDF架構名稱無效"
 
-#: ../lib/modules/sambaSamAccount.inc:424
+#: ../lib/modules/sambaSamAccount.inc:431
 msgid "Pacific Time (US & Canada)"
 msgstr "太平洋時間(美國和加拿大)"
 
@@ -3053,49 +3186,49 @@ msgstr "頁面設定"
 msgid "Parent to"
 msgstr "子代"
 
-#: ../templates/login.php:235
+#: ../templates/login.php:244
 #: ../templates/selfService/selfServiceLogin.php:190
-#: ../lib/modules/posixGroup.inc:176 ../lib/modules/posixGroup.inc:186
-#: ../lib/modules/posixGroup.inc:264 ../lib/modules/posixGroup.inc:482
-#: ../lib/modules/posixGroup.inc:483 ../lib/modules/posixGroup.inc:484
-#: ../lib/modules/sambaAccount.inc:74 ../lib/modules/sambaAccount.inc:75
-#: ../lib/modules/sambaAccount.inc:225 ../lib/modules/sambaSamAccount.inc:87
-#: ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:287 ../lib/modules/posixAccount.inc:86
-#: ../lib/modules/posixAccount.inc:87 ../lib/modules/posixAccount.inc:88
-#: ../lib/modules/posixAccount.inc:146 ../lib/modules/posixAccount.inc:250
-#: ../lib/modules/posixAccount.inc:378 ../lib/modules/posixAccount.inc:933
-#: ../lib/modules/posixAccount.inc:943 ../lib/modules/posixAccount.inc:1030
-#: ../lib/modules/posixAccount.inc:1142 ../lib/modules/inetOrgPerson.inc:74
-#: ../lib/modules/inetOrgPerson.inc:75 ../lib/modules/inetOrgPerson.inc:356
-#: ../lib/modules/inetOrgPerson.inc:590 ../lib/modules/inetOrgPerson.inc:601
-#: ../lib/modules/inetOrgPerson.inc:755
+#: ../lib/modules/posixGroup.inc:165 ../lib/modules/posixGroup.inc:177
+#: ../lib/modules/posixGroup.inc:251 ../lib/modules/posixGroup.inc:452
+#: ../lib/modules/posixGroup.inc:453 ../lib/modules/sambaAccount.inc:74
+#: ../lib/modules/sambaAccount.inc:75 ../lib/modules/sambaAccount.inc:225
+#: ../lib/modules/sambaSamAccount.inc:87 ../lib/modules/sambaSamAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:294 ../lib/modules/posixAccount.inc:69
+#: ../lib/modules/posixAccount.inc:70 ../lib/modules/posixAccount.inc:130
+#: ../lib/modules/posixAccount.inc:235 ../lib/modules/posixAccount.inc:363
+#: ../lib/modules/posixAccount.inc:855 ../lib/modules/posixAccount.inc:866
+#: ../lib/modules/posixAccount.inc:949 ../lib/modules/posixAccount.inc:1042
+#: ../lib/modules/inetOrgPerson.inc:74 ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/inetOrgPerson.inc:356 ../lib/modules/inetOrgPerson.inc:589
+#: ../lib/modules/inetOrgPerson.inc:600 ../lib/modules/inetOrgPerson.inc:751
 msgid "Password"
 msgstr "密碼"
 
-#: ../lib/modules/posixGroup.inc:483 ../lib/modules/sambaAccount.inc:75
+#: ../lib/modules/posixGroup.inc:453 ../lib/modules/sambaAccount.inc:75
 #: ../lib/modules/sambaAccount.inc:76 ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:89 ../lib/modules/posixAccount.inc:87
-#: ../lib/modules/posixAccount.inc:89 ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/sambaSamAccount.inc:89 ../lib/modules/posixAccount.inc:70
+#: ../lib/modules/posixAccount.inc:71 ../lib/modules/inetOrgPerson.inc:75
 #: ../lib/modules/inetOrgPerson.inc:76
-msgid "Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
+msgid ""
+"Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and #*,.;:_-+!$%&/|?{[()]}=@$ !"
-msgstr "密碼包含無效字元,有效的字元包含 a-z, A-Z, 0-9,"
-" 以及 #*,.;:_-+!$%&/|?{[()]}=@$ !"
+msgstr ""
+"密碼包含無效字元,有效的字元包含 a-z, A-Z, 0-9, 以及 #*,.;:_-+!$%&/|?{[()]}=@"
+"$ !"
 
 #: ../lib/modules/sambaAccount.inc:132 ../lib/modules/sambaAccount.inc:247
 #: ../lib/modules/sambaAccount.inc:361 ../lib/modules/sambaAccount.inc:364
-#: ../lib/modules/sambaAccount.inc:730 ../lib/modules/sambaSamAccount.inc:201
-#: ../lib/modules/sambaSamAccount.inc:204
-#: ../lib/modules/sambaSamAccount.inc:309
-#: ../lib/modules/sambaSamAccount.inc:857
-#: ../lib/modules/sambaSamAccount.inc:1097
+#: ../lib/modules/sambaAccount.inc:729 ../lib/modules/sambaSamAccount.inc:205
+#: ../lib/modules/sambaSamAccount.inc:208
+#: ../lib/modules/sambaSamAccount.inc:316
+#: ../lib/modules/sambaSamAccount.inc:888
+#: ../lib/modules/sambaSamAccount.inc:1195
 msgid "Password does not expire"
 msgstr "密碼不會過期"
 
 #: ../lib/modules/shadowAccount.inc:49 ../lib/modules/shadowAccount.inc:89
 #: ../lib/modules/shadowAccount.inc:157 ../lib/modules/shadowAccount.inc:183
-#: ../lib/modules/shadowAccount.inc:286 ../lib/modules/shadowAccount.inc:324
+#: ../lib/modules/shadowAccount.inc:268 ../lib/modules/shadowAccount.inc:363
 msgid "Password expiration"
 msgstr "密碼寬限期"
 
@@ -3103,21 +3236,14 @@ msgstr "密碼寬限期"
 msgid "Password expiration must be are natural number or -1."
 msgstr "密碼寬限期必須是自然數或-1."
 
-#: ../lib/modules/posixGroup.inc:424 ../lib/modules/posixGroup.inc:443
-#: ../lib/modules/posixAccount.inc:176 ../lib/modules/posixAccount.inc:337
+#: ../lib/modules/posixGroup.inc:394 ../lib/modules/posixGroup.inc:413
+#: ../lib/modules/posixAccount.inc:134 ../lib/modules/posixAccount.inc:172
+#: ../lib/modules/posixAccount.inc:322
 msgid "Password hash type"
 msgstr "密碼雜湊類型"
 
-#: ../lib/modules/posixAccount.inc:192
-msgid "Password hash type for Unix accounts"
-msgstr "unix帳號的密碼雜湊類型"
-
-#: ../lib/modules/posixGroup.inc:322
-msgid "Password hash type for Unix groups"
-msgstr "unix群組的密碼雜湊類型"
-
-#: ../lib/modules/sambaDomain.inc:94 ../lib/modules/sambaDomain.inc:253
-#: ../lib/modules/sambaDomain.inc:607
+#: ../lib/modules/sambaDomain.inc:94 ../lib/modules/sambaDomain.inc:251
+#: ../lib/modules/sambaDomain.inc:604
 msgid "Password history length"
 msgstr "歷史密碼的次數"
 
@@ -3138,7 +3264,7 @@ msgstr "密碼最小生命期必須是一個自然數."
 
 #: ../lib/modules/shadowAccount.inc:51 ../lib/modules/shadowAccount.inc:84
 #: ../lib/modules/shadowAccount.inc:153 ../lib/modules/shadowAccount.inc:177
-#: ../lib/modules/shadowAccount.inc:281 ../lib/modules/shadowAccount.inc:322
+#: ../lib/modules/shadowAccount.inc:263 ../lib/modules/shadowAccount.inc:361
 msgid "Password warning"
 msgstr "密碼警告日期"
 
@@ -3146,15 +3272,17 @@ msgstr "密碼警告日期"
 msgid "Password warning must be are natural number."
 msgstr "密碼警告日期必須是自然數."
 
-#: ../templates/config/confmain.php:451
+#: ../templates/config/confmain.php:459
 msgid "Passwords are different!"
 msgstr "密碼不同!"
 
-#: ../lib/modules/sambaAccount.inc:385 ../lib/modules/sambaSamAccount.inc:225
-msgid "Path of the user profile. Can be a local absolute path or a UNC-path (\\"
+#: ../lib/modules/sambaAccount.inc:385 ../lib/modules/sambaSamAccount.inc:232
+msgid ""
+"Path of the user profile. Can be a local absolute path or a UNC-path (\\"
 "\\server\\share). $user and $group are replaced with user and group name."
-msgstr "使用者設定檔的路徑,可以是絕對路徑或UNC路徑"
-"(\\\\server\\share).$user和$group會以使用者及群組名稱來置換."
+msgstr ""
+"使用者設定檔的路徑,可以是絕對路徑或UNC路徑(\\\\server\\share).$user和$group會"
+"以使用者及群組名稱來置換."
 
 #: ../templates/config/confmain.php:329
 msgid "Path to external script"
@@ -3168,11 +3296,11 @@ msgstr "也要刪除所有子項目?"
 msgid "Personal"
 msgstr "個人資訊"
 
-#: ../lib/modules/inetOrgPerson.inc:711
+#: ../lib/modules/inetOrgPerson.inc:710
 msgid "Photo"
 msgstr "相片"
 
-#: ../lib/modules/inetOrgPerson.inc:798
+#: ../lib/modules/inetOrgPerson.inc:791
 msgid "Photo file (JPG format)"
 msgstr "相片檔 (JPG格式)"
 
@@ -3180,7 +3308,7 @@ msgstr "相片檔 (JPG格式)"
 msgid "Please a comma separated list of your public SSH keys."
 msgstr "您的公開ssh金鑰清單,以逗點分隔."
 
-#: ../templates/delete.php:81
+#: ../templates/delete.php:79
 msgid "Please confirm:"
 msgstr "請確認:"
 
@@ -3189,24 +3317,30 @@ msgid "Please enter a RID number or the name of a special account!"
 msgstr "請輸入特殊帳號的名稱或RID!"
 
 #: ../lib/modules/inetOrgPerson.inc:353
-msgid "Please enter a comma separated list of host names where this user is allowed "
+msgid ""
+"Please enter a comma separated list of host names where this user is allowed "
 "to log in. If you enable host restrictions for your servers then \"*\" means "
 "every host and an empty field means no host."
-msgstr "請輸入允許使用者登入的主機清單,以逗點分隔."
-"如果您的伺服器已使用主機限制功能,則星號(*)表示"
-"所有主機,空白表示沒有任何主機."
+msgstr ""
+"請輸入允許使用者登入的主機清單,以逗點分隔. "
+"如果您的伺服器已使用主機限制功能,則"
+"星號(*)表示所有主機,空白表示沒有任何主機."
 
 #: ../lib/modules/sambaAccount.inc:70 ../lib/modules/sambaAccount.inc:71
 #: ../lib/modules/sambaSamAccount.inc:85 ../lib/modules/sambaSamAccount.inc:86
 msgid "Please enter a comma separated list of host names!"
 msgstr "請輸入以逗點分隔的主機清單!"
 
-#: ../lib/modules/kolabUser.inc:268 ../lib/modules/kolabUser.inc:273
+#: ../lib/modules/groupOfNames.inc:116
+msgid "Please enter a group name!"
+msgstr "請輸入一個群組名稱!"
+
+#: ../lib/modules/kolabUser.inc:266 ../lib/modules/kolabUser.inc:271
 #, php-format
 msgid "Please enter a user password on this page: %s"
-msgstr "請在這一頁輸入使用者密碼:%s"
+msgstr "請先在這個頁面輸入使用者密碼: %s"
 
-#: ../lib/modules/posixAccount.inc:106 ../lib/modules/posixAccount.inc:107
+#: ../lib/modules/posixAccount.inc:89 ../lib/modules/posixAccount.inc:90
 #: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:69
 msgid "Please enter a valid common name!"
 msgstr "請輸入有效的全名!"
@@ -3274,35 +3408,39 @@ msgstr "請輸入有效的街道名稱!"
 msgid "Please enter a valid telephone number!"
 msgstr "請輸入有效的電話號碼!"
 
-#: ../lib/modules/posixGroup.inc:608 ../lib/modules/posixAccount.inc:671
+#: ../lib/modules/posixGroup.inc:557 ../lib/modules/posixAccount.inc:634
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "請輸入一個位於 %s 和 %s 之間的值.!"
 
-#: ../lib/modules/kolabUser.inc:278
+#: ../lib/modules/kolabUser.inc:276
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "請在這個頁面輸入電子信箱:%s"
 
-#: ../lib/modules.inc:918
+#: ../lib/modules.inc:886
 msgid "Please enter the account information on the other pages first."
 msgstr "請先在另一頁輸入帳號資訊."
 
 #: ../help/help.inc:57
-msgid "Please enter the configuration password. This is NOT your LDAP password. It "
+msgid ""
+"Please enter the configuration password. This is NOT your LDAP password. It "
 "is stored in your .conf-file. If this is the first time you log in, enter "
 "\"lam\"."
-msgstr "請輸入這個設定檔的密碼.這不是您的LDAP密碼.這個密碼"
-"儲存在您的 .conf檔內.如果您是第一次登入,請輸入"
-"\"lam\"."
+msgstr ""
+"請輸入這個設定檔的密碼.這不是您的LDAP密碼. "
+"這個密碼儲存在您的 .conf檔內.如果您"
+"是第一次登入,請輸入\"lam\"."
 
 #: ../help/help.inc:128
-msgid "Please enter the master configuration password. This is NOT your LDAP "
+msgid ""
+"Please enter the master configuration password. This is NOT your LDAP "
 "password. It is stored in your config.cfg file. If this is the first time "
 "you log in, enter \"lam\"."
-msgstr "請輸入這個系統管理者的密碼.這不是您的LDAP"
-"密碼.這個密碼儲存在您的 config.conf 檔內.如果您是第一次登入,請輸入"
-"\"lam\"."
+msgstr ""
+"請輸入這個系統管理者的密碼.這不是您的LDAP密碼. "
+"這個密碼儲存在您的 config.conf "
+"檔內.如果您是第一次登入,請輸入\"lam\"."
 
 #: ../templates/config/mainlogin.php:97
 msgid "Please enter the master password to change the general preferences:"
@@ -3312,42 +3450,48 @@ msgstr "請輸入管理者密碼以更改一般設定:"
 msgid ""
 "Please enter the name of the new profile and the password to change its "
 "settings. Profile names may contain letters, numbers and -/_."
-msgstr "請輸入新的設定檔名稱和密碼.名稱可以包含字母,數字和 -/_ ."
+msgstr ""
+"請輸入新的設定檔名稱和密碼."
+"名稱可以包含字母,數字和 -/_ ."
 
 #: ../help/help.inc:118
 msgid ""
 "Please enter the new name of the profile. The name may contain letters, "
 "numbers and -/_."
-msgstr "請輸入新的設定檔名稱.可以包含字母,數字和 -/_ ."
+msgstr ""
+"請輸入新的設定檔名稱.可以包含字母,"
+"數字和 -/_ ."
 
-#: ../lib/modules/posixAccount.inc:379 ../lib/modules/inetOrgPerson.inc:357
+#: ../lib/modules/posixAccount.inc:364 ../lib/modules/inetOrgPerson.inc:357
 msgid "Please enter the password which you want to set for this account."
 msgstr "請輸入這個帳號的密碼."
 
-#: ../lib/modules/posixAccount.inc:354
+#: ../lib/modules/posixAccount.inc:339
 msgid "Please enter the path to the user's home directory."
 msgstr "請輸入使用者個人目錄的路徑."
 
 #: ../lib/modules/quota.inc:123
-msgid "Please enter the quota settings for this mount point. The syntax is: {soft "
+msgid ""
+"Please enter the quota settings for this mount point. The syntax is: {soft "
 "block limit},{hard block limit},{soft inode limit},{hard inode limit}"
-msgstr "請設定這個掛載點的磁碟配額.語法是:{軟性區塊配額},{強制區塊配額},{軟性檔案數目配"
-"額},{強制檔案數目配額}"
+msgstr ""
+"請設定這個掛載點的磁碟配額.語法是:{軟性區塊配額},{強制區塊配額},{軟性檔案數目"
+"配額},{強制檔案數目配額}"
 
-#: ../lib/modules/posixAccount.inc:86 ../lib/modules/inetOrgPerson.inc:74
+#: ../lib/modules/posixAccount.inc:69 ../lib/modules/inetOrgPerson.inc:74
 msgid "Please enter the same password in both password fields."
 msgstr "二個密碼欄位請輸入相同的密碼."
 
-#: ../lib/modules/posixGroup.inc:482 ../lib/modules/sambaAccount.inc:74
+#: ../lib/modules/posixGroup.inc:452 ../lib/modules/sambaAccount.inc:74
 #: ../lib/modules/sambaSamAccount.inc:87
 msgid "Please enter the same password in both password-fields."
 msgstr "二個密碼欄位請輸入相同的密碼."
 
 #: ../templates/selfService/adminLogin.php:96
-msgid "Please enter your master configuration password to change the self service "
+msgid ""
+"Please enter your master configuration password to change the self service "
 "profile:"
-msgstr "請輸入您的管理密碼以更改 self service "
-"設定:"
+msgstr "請輸入您的管理密碼以更改 self service 設定:"
 
 #: ../templates/config/conflogin.php:89
 msgid "Please enter your password to change the server preferences:"
@@ -3355,21 +3499,28 @@ msgstr "請輸入您的密碼以更改伺服器的設定:"
 
 #: ../lib/modules/ldapPublicKey.inc:59
 msgid "Please enter your public SSH key."
-msgstr "請輸入您的ssh公開鑰."
+msgstr "請輸入您的 SSH 公開金鑰."
+
+#: ../templates/tests/lamdaemonTest.php:113
+msgid "Please install the SSH2 module for PHP and activate it in your php.ini!"
+msgstr "請安裝 PHP 的 SSH2 模組, 並且在 php.ini 檔中啟動該模組!"
 
 #: ../templates/masscreate.php:123
-msgid "Please provide a CSV formated file with your account data. The cells in the "
+msgid ""
+"Please provide a CSV formated file with your account data. The cells in the "
 "first row must be filled with the column identifiers. The following rows "
 "represent one account for each row."
-msgstr "請上傳一個包含帳號資料的CSV檔,檔案中的"
-"第一列必須是欄位名稱,第二列開始每一列"
+msgstr ""
+"請上傳一個包含帳號資料的 CSV 檔, 檔案中的第一列必須是欄位名稱, "
+"第二列開始每一列"
 "表示一個帳號."
 
 #: ../lib/modules/inetOrgPerson.inc:361
-msgid "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
+msgid ""
+"Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr "請選擇一個圖形檔.它必須是JPG格式(.jpg/.jpeg)."
 
-#: ../lib/modules.inc:969
+#: ../lib/modules.inc:932
 msgid "Please select page:"
 msgstr "請選擇頁面:"
 
@@ -3378,16 +3529,18 @@ msgid "Please select your account type:"
 msgstr "請選擇帳號類型:"
 
 #: ../help/help.inc:134
-msgid "Please select your prefered log level. Messages with a lower level will not "
+msgid ""
+"Please select your prefered log level. Messages with a lower level will not "
 "be logged."
-msgstr "請選擇您喜好的記錄等級. 比此等級低的訊息不會"
+msgstr ""
+"請選擇您喜好的記錄層級. 比此層級低的訊息不會"
 "被記錄."
 
-#: ../templates/login.php:208
+#: ../templates/login.php:217
 msgid "Please select your user name and enter your password to log in."
 msgstr "請選擇使用者帳號並輸入密碼."
 
-#: ../lib/modules.inc:961
+#: ../lib/modules.inc:924
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "請設定好在 %s 頁面的所有必要資訊"
@@ -3412,15 +3565,15 @@ msgstr "可能的值"
 
 #: ../lib/modules/inetOrgPerson.inc:115 ../lib/modules/inetOrgPerson.inc:200
 #: ../lib/modules/inetOrgPerson.inc:316 ../lib/modules/inetOrgPerson.inc:317
-#: ../lib/modules/inetOrgPerson.inc:616 ../lib/modules/inetOrgPerson.inc:825
-#: ../lib/modules/inetOrgPerson.inc:1138
+#: ../lib/modules/inetOrgPerson.inc:615 ../lib/modules/inetOrgPerson.inc:818
+#: ../lib/modules/inetOrgPerson.inc:1131
 msgid "Post office box"
 msgstr "郵政信箱"
 
 #: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:114
 #: ../lib/modules/inetOrgPerson.inc:194 ../lib/modules/inetOrgPerson.inc:324
-#: ../lib/modules/inetOrgPerson.inc:628 ../lib/modules/inetOrgPerson.inc:827
-#: ../lib/modules/inetOrgPerson.inc:1122
+#: ../lib/modules/inetOrgPerson.inc:627 ../lib/modules/inetOrgPerson.inc:820
+#: ../lib/modules/inetOrgPerson.inc:1115
 msgid "Postal address"
 msgstr "居住地址"
 
@@ -3430,8 +3583,8 @@ msgstr "居住地址."
 
 #: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:115
 #: ../lib/modules/inetOrgPerson.inc:188 ../lib/modules/inetOrgPerson.inc:320
-#: ../lib/modules/inetOrgPerson.inc:321 ../lib/modules/inetOrgPerson.inc:622
-#: ../lib/modules/inetOrgPerson.inc:826 ../lib/modules/inetOrgPerson.inc:1130
+#: ../lib/modules/inetOrgPerson.inc:321 ../lib/modules/inetOrgPerson.inc:621
+#: ../lib/modules/inetOrgPerson.inc:819 ../lib/modules/inetOrgPerson.inc:1123
 msgid "Postal code"
 msgstr "郵遞區號"
 
@@ -3443,11 +3596,11 @@ msgstr "已定義的值"
 msgid "President"
 msgstr "President"
 
-#: ../lib/modules/posixGroup.inc:498 ../lib/modules/posixAccount.inc:222
-#: ../lib/modules/posixAccount.inc:289 ../lib/modules/posixAccount.inc:345
-#: ../lib/modules/posixAccount.inc:370 ../lib/modules/posixAccount.inc:412
-#: ../lib/modules/posixAccount.inc:912 ../lib/modules/posixAccount.inc:1056
-#: ../lib/modules/posixAccount.inc:1084 ../lib/modules/posixAccount.inc:1139
+#: ../lib/modules/posixGroup.inc:467 ../lib/modules/posixAccount.inc:207
+#: ../lib/modules/posixAccount.inc:274 ../lib/modules/posixAccount.inc:330
+#: ../lib/modules/posixAccount.inc:355 ../lib/modules/posixAccount.inc:393
+#: ../lib/modules/posixAccount.inc:834 ../lib/modules/posixAccount.inc:975
+#: ../lib/modules/posixAccount.inc:995 ../lib/modules/posixAccount.inc:1036
 msgid "Primary group"
 msgstr "主要群組"
 
@@ -3467,7 +3620,7 @@ msgstr "設定檔編輯器"
 #: ../help/help.inc:117 ../help/help.inc:119 ../help/help.inc:121
 #: ../help/help.inc:123
 msgid "Profile management"
-msgstr "系統設定檔管理"
+msgstr "設定檔管理"
 
 #: ../templates/config/profmanage.php:166
 #: ../templates/config/profmanage.php:218
@@ -3482,7 +3635,7 @@ msgstr "設定檔名稱"
 #: ../templates/selfService/profManage.php:72
 #: ../templates/selfService/profManage.php:87
 msgid "Profile name is invalid!"
-msgstr "設定檔名稱無效!"
+msgstr "設定檔名稱錯誤!"
 
 #: ../templates/config/profmanage.php:182
 #: ../templates/config/profmanage.php:282
@@ -3492,18 +3645,18 @@ msgstr "設定檔密碼"
 #: ../templates/config/profmanage.php:88
 #: ../templates/config/profmanage.php:118
 msgid "Profile passwords are different or empty!"
-msgstr "設定檔的密碼不同或空白!"
+msgstr "設定檔的二次新密碼不同或空白!"
 
 #: ../lib/modules/sambaAccount.inc:64 ../lib/modules/sambaAccount.inc:65
 #: ../lib/modules/sambaAccount.inc:158 ../lib/modules/sambaAccount.inc:289
-#: ../lib/modules/sambaAccount.inc:384 ../lib/modules/sambaAccount.inc:762
-#: ../lib/modules/sambaAccount.inc:859 ../lib/modules/sambaSamAccount.inc:79
+#: ../lib/modules/sambaAccount.inc:384 ../lib/modules/sambaAccount.inc:761
+#: ../lib/modules/sambaAccount.inc:858 ../lib/modules/sambaSamAccount.inc:79
 #: ../lib/modules/sambaSamAccount.inc:80
-#: ../lib/modules/sambaSamAccount.inc:224
-#: ../lib/modules/sambaSamAccount.inc:358
-#: ../lib/modules/sambaSamAccount.inc:903
-#: ../lib/modules/sambaSamAccount.inc:1128
-#: ../lib/modules/sambaSamAccount.inc:1291
+#: ../lib/modules/sambaSamAccount.inc:231
+#: ../lib/modules/sambaSamAccount.inc:365
+#: ../lib/modules/sambaSamAccount.inc:951
+#: ../lib/modules/sambaSamAccount.inc:1226
+#: ../lib/modules/sambaSamAccount.inc:1389
 msgid "Profile path"
 msgstr "設定檔路徑"
 
@@ -3520,7 +3673,7 @@ msgstr "設定檔已儲存."
 msgid "Quota"
 msgstr "磁碟配額"
 
-#: ../lib/modules/quota.inc:481
+#: ../lib/modules/quota.inc:489
 msgid "Quota for:"
 msgstr "配額:"
 
@@ -3533,7 +3686,7 @@ msgid "RDN"
 msgstr "RDN"
 
 #: ../templates/masscreate.php:164 ../templates/profedit/profilepage.php:200
-#: ../lib/modules.inc:1066 ../help/help.inc:144
+#: ../lib/modules.inc:1029 ../help/help.inc:144
 msgid "RDN identifier"
 msgstr "RDN屬性"
 
@@ -3542,10 +3695,10 @@ msgid "RID (Windows UID)"
 msgstr "RID (Windows UID)"
 
 #: ../lib/modules/sambaDomain.inc:86 ../lib/modules/sambaDomain.inc:147
-#: ../lib/modules/sambaDomain.inc:333 ../lib/modules/sambaDomain.inc:339
-#: ../lib/modules/sambaDomain.inc:601
+#: ../lib/modules/sambaDomain.inc:331 ../lib/modules/sambaDomain.inc:337
+#: ../lib/modules/sambaDomain.inc:598
 msgid "RID base"
-msgstr "RID base"
+msgstr "RID 基數"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:99
 msgid "Really create this new OU?"
@@ -3555,12 +3708,12 @@ msgstr "確定新增此OU?"
 msgid "Really delete attribute?"
 msgstr "確定刪除屬性?"
 
-#: ../lib/modules/nisMailAlias.inc:67 ../lib/modules/nisMailAlias.inc:141
+#: ../lib/modules/nisMailAlias.inc:67 ../lib/modules/nisMailAlias.inc:139
 msgid "Recipient"
 msgstr "收件者"
 
 #: ../lib/types/mailAlias.inc:83 ../lib/modules/nisMailAlias.inc:71
-#: ../lib/modules/nisMailAlias.inc:85 ../lib/modules/nisMailAlias.inc:276
+#: ../lib/modules/nisMailAlias.inc:85 ../lib/modules/nisMailAlias.inc:273
 msgid "Recipient list"
 msgstr "收件者清單"
 
@@ -3570,9 +3723,9 @@ msgstr "遞迴刪除"
 
 #: ../templates/config/mainmanage.php:312
 msgid "Reenter new master password"
-msgstr "再次輸入系統管理者密碼"
+msgstr "再次輸入系統管理者新密碼"
 
-#: ../templates/config/confmain.php:371 ../lib/modules/posixAccount.inc:1610
+#: ../templates/config/confmain.php:372 ../lib/modules/posixAccount.inc:1522
 msgid "Reenter password"
 msgstr "確認密碼"
 
@@ -3582,7 +3735,7 @@ msgid "Reenter profile password"
 msgstr "再次輸入設定檔密碼"
 
 #: ../templates/tree/edit.php:101 ../lib/tree.inc:64 ../lib/tree.inc:65
-#: ../lib/lists.inc:271
+#: ../lib/lists.inc:278
 msgid "Refresh"
 msgstr "重新整理"
 
@@ -3594,17 +3747,26 @@ msgstr "如果衝突則拒絕"
 msgid "Relative distinguished name"
 msgstr "相對識別名稱(RDN)"
 
-#: ../templates/pdfedit/pdfpage.php:475 ../lib/modules/ieee802device.inc:100
-#: ../lib/modules/kolabUser.inc:339 ../lib/modules/kolabUser.inc:358
-#: ../lib/modules/kolabUser.inc:384 ../lib/modules/ldapPublicKey.inc:94
-#: ../lib/modules/inetLocalMailRecipient.inc:156
-#: ../lib/modules/nisMailAlias.inc:143
+#: ../templates/pdfedit/pdfpage.php:475 ../lib/modules/ieee802device.inc:99
+#: ../lib/modules/sambaSamAccount.inc:1153 ../lib/modules/kolabUser.inc:337
+#: ../lib/modules/kolabUser.inc:356 ../lib/modules/kolabUser.inc:382
+#: ../lib/modules/shadowAccount.inc:345 ../lib/modules/ldapPublicKey.inc:92
+#: ../lib/modules/inetLocalMailRecipient.inc:154
+#: ../lib/modules/groupOfNames.inc:152 ../lib/modules/nisMailAlias.inc:141
 msgid "Remove"
 msgstr "刪除"
 
+#: ../lib/modules/posixGroup.inc:184 ../lib/modules/posixAccount.inc:873
+msgid "Remove password"
+msgstr "刪除密碼"
+
+#: ../lib/modules/groupOfNames.inc:322
+msgid "Remove selected entries"
+msgstr "刪除所選的項目"
+
 #: ../templates/config/conftypes.php:224
 msgid "Remove this account type"
-msgstr "刪除這個帳號類型:"
+msgstr "刪除這個帳號類型"
 
 #: ../templates/config/profmanage.php:214
 #: ../templates/selfService/profManage.php:188 ../help/help.inc:117
@@ -3614,16 +3776,15 @@ msgstr "更改設定檔名稱"
 #: ../templates/config/profmanage.php:97
 #: ../templates/selfService/profManage.php:83
 msgid "Renamed profile."
-msgstr ""
+msgstr "已更名的設定檔."
 
-#: ../lib/modules/posixGroup.inc:180 ../lib/modules/posixGroup.inc:268
-#: ../lib/modules/sambaAccount.inc:719 ../lib/modules/sambaSamAccount.inc:847
-#: ../lib/modules/posixAccount.inc:937 ../lib/modules/posixAccount.inc:1034
-#: ../lib/modules/inetOrgPerson.inc:594 ../lib/modules/inetOrgPerson.inc:759
+#: ../lib/modules/posixGroup.inc:255 ../lib/modules/sambaAccount.inc:718
+#: ../lib/modules/sambaSamAccount.inc:878 ../lib/modules/posixAccount.inc:953
+#: ../lib/modules/inetOrgPerson.inc:593 ../lib/modules/inetOrgPerson.inc:755
 msgid "Repeat password"
 msgstr "確認密碼"
 
-#: ../lib/modules/posixAccount.inc:80 ../lib/modules/posixAccount.inc:719
+#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:656
 msgid "Replaced $user or $group in homedir."
 msgstr ""
 
@@ -3638,22 +3799,22 @@ msgid "Required attributes"
 msgstr "必要的屬性"
 
 #: ../templates/profedit/profilepage.php:251
-#: ../lib/modules/sambaAccount.inc:810 ../lib/modules/sambaSamAccount.inc:961
+#: ../lib/modules/sambaAccount.inc:809 ../lib/modules/sambaSamAccount.inc:1009
 msgid "Reset"
 msgstr "重設"
 
-#: ../lib/modules.inc:972 ../lib/modules.inc:1000
+#: ../lib/modules.inc:935 ../lib/modules.inc:963
 msgid "Reset changes"
 msgstr "重新設定"
 
-#: ../lib/modules/sambaAccount.inc:346 ../lib/modules/sambaAccount.inc:809
-#: ../lib/modules/sambaSamAccount.inc:186
-#: ../lib/modules/sambaSamAccount.inc:960
+#: ../lib/modules/sambaAccount.inc:346 ../lib/modules/sambaAccount.inc:808
+#: ../lib/modules/sambaSamAccount.inc:190
+#: ../lib/modules/sambaSamAccount.inc:1008
 msgid "Reset password"
 msgstr "重設密碼"
 
 #: ../lib/modules/sambaDomain.inc:126 ../lib/modules/sambaDomain.inc:200
-#: ../lib/modules/sambaDomain.inc:303 ../lib/modules/sambaDomain.inc:639
+#: ../lib/modules/sambaDomain.inc:301 ../lib/modules/sambaDomain.inc:636
 msgid "Reset time after lockout"
 msgstr "停權後重設時間"
 
@@ -3663,21 +3824,37 @@ msgstr "鎖定密碼後的重設時間必須是一個自然數."
 
 #: ../lib/modules/inetLocalMailRecipient.inc:57
 #: ../lib/modules/inetLocalMailRecipient.inc:92
-#: ../lib/modules/inetLocalMailRecipient.inc:139
-#: ../lib/modules/inetLocalMailRecipient.inc:310
+#: ../lib/modules/inetLocalMailRecipient.inc:137
+#: ../lib/modules/inetLocalMailRecipient.inc:307
 msgid "Routing address"
-msgstr "繞送的地址"
+msgstr "寄送的地址"
+
+#: ../templates/tests/lamdaemonTest.php:123
+msgid "SSH connection"
+msgstr "SSH 連結"
+
+#: ../templates/tests/lamdaemonTest.php:134
+msgid "SSH connection could be established."
+msgstr "可以建立 SSH 連結."
 
 #: ../lib/modules/ldapPublicKey.inc:48 ../lib/modules/ldapPublicKey.inc:58
 #: ../lib/modules/ldapPublicKey.inc:62 ../lib/modules/ldapPublicKey.inc:70
-#: ../lib/modules/ldapPublicKey.inc:92
+#: ../lib/modules/ldapPublicKey.inc:90
 msgid "SSH public key"
-msgstr "SSH公開金鑰"
-
-#: ../lib/modules/ldapPublicKey.inc:164
-msgid "SSH public key(s)"
 msgstr "SSH 公開金鑰"
 
+#: ../lib/modules/ldapPublicKey.inc:161
+msgid "SSH public key(s)"
+msgstr "SSH 公開金鑰(組)"
+
+#: ../templates/tests/lamdaemonTest.php:106
+msgid "SSH2 module"
+msgstr "SSH2 模組"
+
+#: ../templates/tests/lamdaemonTest.php:109
+msgid "SSH2 module is installed."
+msgstr ""
+
 #: ../lib/modules/sambaAccount.inc:105
 msgid "Samba 2"
 msgstr "Samba 2"
@@ -3695,14 +3872,10 @@ msgstr "Samba 3 網域 SID 錯誤!"
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 的網域項目"
 
-#: ../lib/modules/sambaSamAccount.inc:451
-msgid "Samba 3 settings"
-msgstr "Samba3的環境設定"
-
-#: ../lib/modules/sambaSamAccount.inc:245
-#: ../lib/modules/sambaSamAccount.inc:249
-#: ../lib/modules/sambaSamAccount.inc:383
-#: ../lib/modules/sambaSamAccount.inc:407
+#: ../lib/modules/sambaSamAccount.inc:252
+#: ../lib/modules/sambaSamAccount.inc:256
+#: ../lib/modules/sambaSamAccount.inc:390
+#: ../lib/modules/sambaSamAccount.inc:414
 msgid "Samba RID"
 msgstr "Samba RID"
 
@@ -3733,31 +3906,31 @@ msgstr "Samba 網域"
 msgid "Samba group type"
 msgstr "Samba 群組類型"
 
-#: ../lib/modules/sambaAccount.inc:343 ../lib/modules/sambaAccount.inc:716
-#: ../lib/modules/sambaSamAccount.inc:183
-#: ../lib/modules/sambaSamAccount.inc:843
+#: ../lib/modules/sambaAccount.inc:343 ../lib/modules/sambaAccount.inc:715
+#: ../lib/modules/sambaSamAccount.inc:187
+#: ../lib/modules/sambaSamAccount.inc:874
 msgid "Samba password"
 msgstr "Samba的密碼"
 
 #: ../lib/modules/sambaAccount.inc:70 ../lib/modules/sambaAccount.inc:170
 #: ../lib/modules/sambaAccount.inc:301 ../lib/modules/sambaAccount.inc:390
-#: ../lib/modules/sambaAccount.inc:393 ../lib/modules/sambaAccount.inc:768
-#: ../lib/modules/sambaAccount.inc:860 ../lib/modules/sambaSamAccount.inc:85
-#: ../lib/modules/sambaSamAccount.inc:230
-#: ../lib/modules/sambaSamAccount.inc:233
-#: ../lib/modules/sambaSamAccount.inc:370
-#: ../lib/modules/sambaSamAccount.inc:909
-#: ../lib/modules/sambaSamAccount.inc:1140
-#: ../lib/modules/sambaSamAccount.inc:1292
+#: ../lib/modules/sambaAccount.inc:393 ../lib/modules/sambaAccount.inc:767
+#: ../lib/modules/sambaAccount.inc:859 ../lib/modules/sambaSamAccount.inc:85
+#: ../lib/modules/sambaSamAccount.inc:237
+#: ../lib/modules/sambaSamAccount.inc:240
+#: ../lib/modules/sambaSamAccount.inc:377
+#: ../lib/modules/sambaSamAccount.inc:957
+#: ../lib/modules/sambaSamAccount.inc:1238
+#: ../lib/modules/sambaSamAccount.inc:1390
 msgid "Samba workstations"
 msgstr "Samba工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:1012
+#: ../lib/modules/sambaSamAccount.inc:1059
 msgid "Saturday"
 msgstr "星期六"
 
 #: ../templates/tree/edit.php:508
-#: ../templates/selfService/selfServiceMain.php:197
+#: ../templates/selfService/selfServiceMain.php:198
 #: ../templates/pdfedit/pdfpage.php:736 ../templates/pdfedit/pdfpage.php:770
 #: ../templates/profedit/profilepage.php:249
 msgid "Save"
@@ -3783,15 +3956,15 @@ msgstr ""
 msgid "Script path"
 msgstr "指令檔的路徑"
 
-#: ../templates/config/confmain.php:443
+#: ../templates/config/confmain.php:451
 msgid "Script path is invalid!"
-msgstr "所指定指令檔路徑無效!"
+msgstr "所指定指令檔路徑錯誤 !"
 
 #: ../help/help.inc:101
 msgid "Script server"
 msgstr "指令檔伺服器"
 
-#: ../templates/config/confmain.php:446
+#: ../templates/config/confmain.php:454
 msgid "Script server is invalid!"
 msgstr "指令檔伺服器無效!"
 
@@ -3817,7 +3990,7 @@ msgstr "區段"
 msgid "Security settings"
 msgstr "安全性設定"
 
-#: ../lib/lists.inc:635
+#: ../lib/lists.inc:645
 msgid "See README.openldap.txt to solve this problem."
 msgstr "參考 README.openldap.txt 來解決此問題."
 
@@ -3829,11 +4002,11 @@ msgstr "也參考"
 msgid "Select a template for the creation process"
 msgstr "為所要新增的物件選擇一種樣版"
 
-#: ../lib/types/group.inc:182 ../lib/types/user.inc:218 ../lib/lists.inc:395
+#: ../lib/types/group.inc:182 ../lib/types/user.inc:218 ../lib/lists.inc:405
 msgid "Select all"
 msgstr "全選"
 
-#: ../lib/modules/posixAccount.inc:1000
+#: ../lib/modules/posixAccount.inc:920
 msgid "Selected groups"
 msgstr "已選擇的群組"
 
@@ -3841,25 +4014,25 @@ msgstr "已選擇的群組"
 msgid "Selected modules"
 msgstr "已選擇的模組"
 
-#: ../lib/modules/posixGroup.inc:234
+#: ../lib/modules/posixGroup.inc:222
 msgid "Selected users"
 msgstr "已選擇的使用者"
 
-#: ../templates/selfService/adminMain.php:189
+#: ../templates/selfService/adminMain.php:224
 msgid "Self service configuration"
 msgstr "Self service 設定"
 
-#: ../templates/selfService/adminMain.php:201
+#: ../templates/selfService/adminMain.php:236
 msgid "Self service configuration editor"
 msgstr "Self service設定編輯器"
 
 #: ../templates/config/confmain.php:141
-#: ../templates/selfService/adminMain.php:229 ../help/help.inc:58
+#: ../templates/selfService/adminMain.php:264 ../help/help.inc:58
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: ../templates/config/confmain.php:425
-#: ../templates/selfService/adminMain.php:53
+#: ../templates/config/confmain.php:426
+#: ../templates/selfService/adminMain.php:60
 msgid "Server address is invalid!"
 msgstr "伺服器位址錯誤!"
 
@@ -3867,29 +4040,28 @@ msgstr "伺服器位址錯誤!"
 msgid "Server of external script"
 msgstr "外部指令檔所在的伺服器位置"
 
-#: ../templates/login.php:304
+#: ../templates/login.php:313
 msgid "Server profile"
 msgstr "伺服器設定檔"
 
 #: ../templates/config/confmain.php:138
-#: ../templates/selfService/adminMain.php:226
+#: ../templates/selfService/adminMain.php:261
 msgid "Server settings"
-msgstr "伺服器環境設定"
+msgstr "伺服器設定"
 
 #: ../templates/config/mainmanage.php:151 ../help/help.inc:131
 msgid "Session timeout"
 msgstr "連結(Session)期限"
 
-#: ../lib/modules/posixGroup.inc:190 ../lib/modules/posixAccount.inc:947
-#: ../lib/modules/posixAccount.inc:1073
-msgid "Set no password"
-msgstr "不設密碼"
+#: ../lib/modules/posixGroup.inc:166 ../lib/modules/posixAccount.inc:856
+msgid "Set password"
+msgstr "設定密碼"
 
 #: ../templates/config/profmanage.php:278 ../help/help.inc:121
 msgid "Set profile password"
-msgstr "更改設定檔密碼"
+msgstr "更改設定檔管理密碼"
 
-#: ../lib/modules/posixGroup.inc:409
+#: ../lib/modules/posixGroup.inc:387
 msgid "Sets the group password."
 msgstr "設定這個群組的密碼."
 
@@ -3909,12 +4081,12 @@ msgstr "顯示內部屬性"
 msgid "Single valued"
 msgstr "只含單一值"
 
-#: ../lib/modules/quota.inc:434
+#: ../lib/modules/quota.inc:442
 msgid "Soft block"
 msgstr "軟性區塊配額"
 
-#: ../lib/modules/quota.inc:94 ../lib/modules/quota.inc:300
-#: ../lib/modules/quota.inc:357
+#: ../lib/modules/quota.inc:94 ../lib/modules/quota.inc:312
+#: ../lib/modules/quota.inc:365
 msgid "Soft block limit"
 msgstr "軟性區塊配額限制"
 
@@ -3922,7 +4094,7 @@ msgstr "軟性區塊配額限制"
 msgid "Soft block limit."
 msgstr "軟性區塊配額限制."
 
-#: ../lib/modules/quota.inc:436
+#: ../lib/modules/quota.inc:444
 msgid "Soft inode"
 msgstr "軟性檔案數目配額"
 
@@ -3930,8 +4102,8 @@ msgstr "軟性檔案數目配額"
 msgid "Soft inode (files) limit."
 msgstr "軟性檔案數目配額限制."
 
-#: ../lib/modules/quota.inc:110 ../lib/modules/quota.inc:304
-#: ../lib/modules/quota.inc:359
+#: ../lib/modules/quota.inc:110 ../lib/modules/quota.inc:316
+#: ../lib/modules/quota.inc:367
 msgid "Soft inode limit"
 msgstr "軟性檔案數目配額限制."
 
@@ -3940,18 +4112,26 @@ msgstr "軟性檔案數目配額限制."
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "以下反白的屬性( %s )已被修改."
 
-#: ../lib/modules.inc:960
+#: ../lib/modules.inc:923
 msgid "Some required information is missing"
 msgstr "缺少一些必要的資訊"
 
+#: ../templates/help.php:142
+msgid ""
+"Sorry this help id ({bold}%s{endbold}) is not available for this module "
+"({bold}%s{endbold})."
+msgstr ""
+"抱歉,這個模組並沒有"
+" ({bold}%d{endbold}) 的說明檔."
+
 #: ../templates/help.php:156
 #, php-format
 msgid "Sorry this help number ({bold}%d{endbold}) is not available."
 msgstr "抱歉,這個說明檔 ({bold}%d{endbold})並不存在."
 
 #: ../lib/modules/sambaAccount.inc:314 ../lib/modules/sambaAccount.inc:402
-#: ../lib/modules/sambaAccount.inc:800 ../lib/modules/sambaSamAccount.inc:242
-#: ../lib/modules/sambaSamAccount.inc:944
+#: ../lib/modules/sambaAccount.inc:799 ../lib/modules/sambaSamAccount.inc:249
+#: ../lib/modules/sambaSamAccount.inc:992
 msgid "Special user"
 msgstr "特殊群組"
 
@@ -3972,19 +4152,19 @@ msgstr "步驟2:指定屬性及屬性值"
 msgid "Steve"
 msgstr "Steve"
 
-#: ../lib/modules/sambaAccount.inc:221 ../lib/modules/sambaSamAccount.inc:283
-#: ../lib/modules/posixAccount.inc:212 ../lib/modules/inetOrgPerson.inc:237
+#: ../lib/modules/sambaAccount.inc:221 ../lib/modules/sambaSamAccount.inc:290
+#: ../lib/modules/posixAccount.inc:197 ../lib/modules/inetOrgPerson.inc:237
 msgid "Steve Miller"
 msgstr "Steve Miller"
 
-#: ../lib/modules/posixAccount.inc:266
+#: ../lib/modules/posixAccount.inc:251
 msgid "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 msgstr "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 
 #: ../lib/modules/inetOrgPerson.inc:58 ../lib/modules/inetOrgPerson.inc:114
 #: ../lib/modules/inetOrgPerson.inc:182 ../lib/modules/inetOrgPerson.inc:312
-#: ../lib/modules/inetOrgPerson.inc:313 ../lib/modules/inetOrgPerson.inc:610
-#: ../lib/modules/inetOrgPerson.inc:824 ../lib/modules/inetOrgPerson.inc:1114
+#: ../lib/modules/inetOrgPerson.inc:313 ../lib/modules/inetOrgPerson.inc:609
+#: ../lib/modules/inetOrgPerson.inc:817 ../lib/modules/inetOrgPerson.inc:1107
 msgid "Street"
 msgstr "街道"
 
@@ -4004,14 +4184,26 @@ msgstr "子字串比對規則"
 msgid "Success"
 msgstr "成功"
 
-#: ../lib/lists.inc:475 ../lib/modules.inc:1053
+#: ../templates/tests/lamdaemonTest.php:186
+msgid "Sudo is not setup correctly!"
+msgstr ""
+
+#: ../lib/lists.inc:485 ../lib/modules.inc:1016
 msgid "Suffix"
 msgstr "尾碼"
 
-#: ../lib/modules/sambaSamAccount.inc:1012
+#: ../lib/modules/sambaSamAccount.inc:1059
 msgid "Sunday"
 msgstr "星期日"
 
+#: ../lib/modules/sambaSamAccount.inc:179
+msgid "Sync Samba LM password with Unix password"
+msgstr ""
+
+#: ../lib/modules/sambaSamAccount.inc:178
+msgid "Sync Samba NT password with Unix password"
+msgstr ""
+
 #: ../templates/tree/add_value_form.php:190 ../templates/schema/schema.php:186
 msgid "Syntax"
 msgstr "語法"
@@ -4034,8 +4226,8 @@ msgstr "?"
 
 #: ../lib/modules/inetOrgPerson.inc:50 ../lib/modules/inetOrgPerson.inc:113
 #: ../lib/modules/inetOrgPerson.inc:206 ../lib/modules/inetOrgPerson.inc:328
-#: ../lib/modules/inetOrgPerson.inc:329 ../lib/modules/inetOrgPerson.inc:634
-#: ../lib/modules/inetOrgPerson.inc:828 ../lib/modules/inetOrgPerson.inc:1090
+#: ../lib/modules/inetOrgPerson.inc:329 ../lib/modules/inetOrgPerson.inc:633
+#: ../lib/modules/inetOrgPerson.inc:821 ../lib/modules/inetOrgPerson.inc:1083
 msgid "Telephone number"
 msgstr "電話號碼"
 
@@ -4051,6 +4243,10 @@ msgstr ""
 msgid "Template"
 msgstr "樣版"
 
+#: ../templates/tools.php:90
+msgid "Tests"
+msgstr "測試"
+
 #: ../help/help.inc:110
 msgid "Text for user PDF"
 msgstr ""
@@ -4058,24 +4254,26 @@ msgstr ""
 #: ../lib/modules/kolabUser.inc:161
 msgid ""
 "The Cyrus mail quota for users in MBytes, leave blank for unlimited space."
-msgstr "使用者的Cyrus郵件空間配額,若留空白表示沒有限制."
+msgstr ""
+"使用者的 Cyrus 郵件空間配額, 以MBytes為單位, 若留空白表示沒有限制."
 
 #: ../templates/config/mainmanage.php:106
 #, php-format
 msgid "The IP address %s is invalid!"
-msgstr "IP位址: %s 無效"
+msgstr "IP位址: %s 錯誤!"
 
 #: ../lib/modules/sambaDomain.inc:71
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "您的Samba伺服器的SID,使用\"net getlocalsid\"指令可以取得."
 
-#: ../lib/modules/posixAccount.inc:78
-msgid "The UID ranges for users and hosts overlap! This is a problem because LAM "
+#: ../lib/modules/posixAccount.inc:59
+msgid ""
+"The UID ranges for users and hosts overlap! This is a problem because LAM "
 "uses the highest UID in use + 1 for new accounts. Please set the minimum UID "
 "to equal values or use independent ranges."
-msgstr "使用者帳號和主機帳號的UID重疊!這個問題是因為 LAM "
-"使用目前被使用的最高UID+1來配發UID給新的帳號.請將最小的UID值"
-"設為相等或使用各自獨立的UID範圍."
+msgstr ""
+"使用者帳號和主機帳號的UID重疊!這個問題是因為 LAM 使用目前被使用的最高UID+1來"
+"配發UID給新的帳號.請將最小的UID值設為相等或使用各自獨立的UID範圍."
 
 #: ../templates/tree/templates/creation/custom.php:99
 #, php-format
@@ -4105,12 +4303,13 @@ msgid "The headline for a new section must contain at least one character."
 msgstr "區段標題不能空白."
 
 #: ../templates/config/mainmanage.php:122
-msgid "The log file is empty or contains invalid characters! Valid characters are: "
+msgid ""
+"The log file is empty or contains invalid characters! Valid characters are: "
 "a-z, A-Z, 0-9, /, \\, ., :, _ and -."
-msgstr "記錄檔是空的或包含無效字元,有效字元包含 "
-"a-z, A-Z, 0-9, /, \\, ., :, _ 和 -."
+msgstr ""
+"記錄檔是空的或包含無效字元,有效字元包含 a-z, A-Z, 0-9, /, \\, ., :, _ 和 -."
 
-#: ../lib/modules.inc:917
+#: ../lib/modules.inc:885
 #, php-format
 msgid "The module %s is not yet ready."
 msgstr "%s模組未啟動."
@@ -4134,22 +4333,26 @@ msgstr "您的windows網域或群組的名稱."
 msgid "The new account will be saved under this LDAP suffix."
 msgstr "該帳號會被儲存在這個LDAP節點之下"
 
+#: ../lib/modules/groupOfNames.inc:65
+msgid "The owner of this group."
+msgstr "這個群組的擁有者."
+
 #: ../templates/config/confmain.php:70 ../templates/config/mainlogin.php:56
 #: ../templates/selfService/adminLogin.php:51
 msgid "The password is invalid! Please try again."
 msgstr "密碼無效,請重試!"
 
-#: ../lib/modules/posixAccount.inc:346
+#: ../lib/modules/posixAccount.inc:331
 msgid ""
 "The primary group for this account. You can insert a GID number or a group "
 "name."
 msgstr "這個帳號所隸屬的主要群組.可以使用群組GID或群組名稱."
 
-#: ../lib/modules/posixAccount.inc:413
+#: ../lib/modules/posixAccount.inc:394
 msgid "The primary group the host should be member of."
 msgstr "該主機所隸屬的主要群組."
 
-#: ../lib/modules/posixAccount.inc:371
+#: ../lib/modules/posixAccount.inc:356
 msgid "The primary group the user should be member of."
 msgstr "該使用者隸屬的主要群組."
 
@@ -4161,7 +4364,7 @@ msgstr "靜態文字至少要包含一個字元."
 msgid "There are new required attributes which need to be set."
 msgstr "必須設定一些新的必要屬性."
 
-#: ../lib/modules/posixGroup.inc:498
+#: ../lib/modules/posixGroup.inc:467
 msgid "There are still users who have this group as their primary group."
 msgstr "仍有使用者以這個群組為其主要群組."
 
@@ -4173,46 +4376,50 @@ msgstr "只能有一個此類型的群組."
 msgid "There were errors while uploading:"
 msgstr "上傳發生錯誤."
 
-#: ../lib/modules/posixGroup.inc:421
-msgid "These are the minimum and maximum numbers to use for group IDs when creating "
+#: ../lib/modules/posixGroup.inc:391
+msgid ""
+"These are the minimum and maximum numbers to use for group IDs when creating "
 "new group accounts. New group accounts will always get the highest number in "
 "use plus one."
-msgstr "當新增群組帳號時,所能配發的最小及最大的GID編號."
-"新的群組帳號會配發目前已被使用"
+msgstr ""
+"當新增群組帳號時,所能配發的最小及最大的GID編號.新的群組帳號會配發目前已被使用"
 "的最大GID編號加1的號碼."
 
-#: ../lib/modules/posixAccount.inc:334
-msgid "These are the minimum and maximum numbers to use for machine IDs when "
+#: ../lib/modules/posixAccount.inc:319
+msgid ""
+"These are the minimum and maximum numbers to use for machine IDs when "
 "creating new accounts for Samba hosts. The range should be different from "
 "that of users. New host accounts will always get the highest number in use "
 "plus one."
-msgstr "當新增Samba主機帳號時,可以配發的最小及最大UID,"
-"這個範圍應該和使用者帳號的UID有所區隔."
-"新的主機帳號會配發目前已被使用的UID編號"
-"加1的號碼."
+msgstr ""
+"當新增 Samba 主機帳號時,可以配發的最小及最大UID,這個範圍應該和使用者帳號的UID有"
+"所區隔.新的主機帳號會配發目前已被使用的UID編號加1的號碼."
 
-#: ../lib/modules/posixAccount.inc:330
-msgid "These are the minimum and maximum numbers to use for user IDs when creating "
+#: ../lib/modules/posixAccount.inc:315
+msgid ""
+"These are the minimum and maximum numbers to use for user IDs when creating "
 "new user accounts. The range should be different from that of machines. New "
 "user accounts will always get the highest number in use plus one."
-msgstr "新增使用者帳號時,所能配發的最小及最大UID,"
-"其範圍應該和主機帳號不同.新的"
-"使用者帳號會配發目前已被使用的最大編號加1的UID號碼."
+msgstr ""
+"新增使用者帳號時,所能配發的最小及最大UID,其範圍應該和主機帳號不同.新的使用者"
+"帳號會配發目前已被使用的最大編號加1的UID號碼."
 
-#: ../lib/modules/posixAccount.inc:102
+#: ../lib/modules/posixAccount.inc:84
 msgid ""
 "This GID number is invalid! Please provide either a number or a group name."
 msgstr "GID無效,請提供編號或群組名稱"
 
-#: ../lib/modules/kolabUser.inc:284
+#: ../lib/modules/kolabUser.inc:282
 msgid "This account is marked for deletion."
 msgstr "這個帳號被標示為刪除."
 
-#: ../lib/modules/sambaSamAccount.inc:243
+#: ../lib/modules/sambaSamAccount.inc:250
 msgid ""
 "This allows you to define this account as a special user like administrator "
 "or guest."
-msgstr "您可以將這個帳號設為特殊的使用者,類似administrator或guest"
+msgstr ""
+"您可以將這個帳號設為特殊的使用者, 類似 administrator "
+"或 guest"
 
 #: ../help/help.inc:122
 msgid "This changes the password of the selected profile."
@@ -4220,7 +4427,7 @@ msgstr "改變設定檔的管理密碼"
 
 #: ../help/help.inc:124
 msgid "This changes the profile which is selected by default at login."
-msgstr "改變登入時預設選定的設定檔."
+msgstr "改變登入時預設選定的伺服器設定檔."
 
 #: ../templates/massBuildAccounts.php:149
 msgid ""
@@ -4246,7 +4453,7 @@ msgstr "這個項目沒有任何屬性"
 msgid "This entry is the root of a sub-tree containing %s entries."
 msgstr "這個項目是一個包含 %s 個項目的子樹的根."
 
-#: ../lib/modules/posixAccount.inc:103
+#: ../lib/modules/posixAccount.inc:86
 msgid "This gecos value is invalid!"
 msgstr "備註(gecos)欄位的內容無效"
 
@@ -4278,14 +4485,29 @@ msgstr "這是以逗點分隔的使用者公開的email清單."
 msgid ""
 "This is a list of IP addresses from hosts who may access LAM. You can use \"*"
 "\" as wildcard (e.g. 192.168.0.*)."
-msgstr "這是一組可以存取LAM的主機位址清單. 可以使用\"*"
-"\" 當萬用字元(例如 192.168.0.*)."
+msgstr ""
+"這是一組可以存取LAM系統的主機位址清單. 可以使用\"*\" 當萬用字元(例如 192.168.0."
+"*)."
+
+#: ../lib/modules/groupOfNames.inc:69
+msgid "This is a list of members of this group."
+msgstr "這是該群組的成員清單."
+
+#: ../lib/modules/groupOfNames.inc:73
+msgid ""
+"This is a list of members of this group. Multiple members are separated by "
+"semicolons."
+msgstr ""
+"這是隸屬於這個群組的成員清單.以"
+"分號隔開."
 
 #: ../help/help.inc:88
-msgid "This is a list of valid DN entries of all users that are allowed to login to "
-"LDAP Account Manager. The user names have to be separated by semicolons."
-msgstr "這是所有可以登入LAM 的使用者DN 列表,"
-"以分號來分隔."
+msgid ""
+"This is a list of valid DN entries of all users that are allowed to login to "
+"LDAP Account Manager. Please enter one DN per line."
+msgstr ""
+"這是所有容許登入 LAM 的使用者的 DN 清單,"
+"每行輸入一個DN."
 
 #: ../templates/masscreate.php:219
 msgid ""
@@ -4294,12 +4516,13 @@ msgid ""
 msgstr "以下是一個未儲存成CSV檔前的試算表可能的樣子:"
 
 #: ../help/help.inc:166
-msgid "This is needed to find the LDAP DNs of your user accounts. E.g. if you use "
+msgid ""
+"This is needed to find the LDAP DNs of your user accounts. E.g. if you use "
 "\"uid\" and your user inputs \"miller\" then LAM will search for an account "
 "with uid=miller."
-msgstr "這是用來搜尋使用者帳號的 LDAP DN. 例如,若您使用"
-"\"uid\" 而使用者輸入 \"miller\" ,則LAM將會"
-"使用 uid=miller 這個條件來搜尋帳號."
+msgstr ""
+"這是用來搜尋使用者帳號的 LDAP DN. 例如,若您使用\"uid\" 而使用者輸入 \"miller"
+"\" ,則LAM將會使用 uid=miller 這個條件來搜尋帳號."
 
 #: ../lib/modules/inetOrgPerson.inc:73
 msgid "This is not a valid DN!"
@@ -4315,7 +4538,7 @@ msgstr "這不是有效的samba 3群組類型!"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:62
 msgid "This is one of the users public email addresses."
-msgstr "這是一個使用者公開的email地址."
+msgstr "這是一個使用者公開的 email信箱."
 
 #: ../lib/modules/nisMailAlias.inc:68
 msgid "This is one recipient for this alias."
@@ -4335,146 +4558,175 @@ msgstr "指網路卡的MAC位址(例如:00:01:02:DE:EF:18)."
 
 #: ../lib/modules/sambaAccount.inc:400
 msgid "This is the RID of the user's primary Windows group."
-msgstr "這是該使用者主要windodws群組的RID."
+msgstr "這是該使用者windows主要群組的RID."
 
-#: ../lib/modules/sambaSamAccount.inc:240
+#: ../lib/modules/sambaSamAccount.inc:247
 msgid "This is the SID of the user's primary Windows group."
-msgstr "這是該使用者主要windodws群組的SID."
+msgstr "這是該使用者windows主要群組的SID."
 
 #: ../help/help.inc:97
-msgid "This is the absolute path to an external script for setting quotas and "
+msgid ""
+"This is the absolute path to an external script for setting quotas and "
 "creating home directories."
-msgstr "這是外部指令檔的絕對路徑,這個指令檔用來設定磁碟配額及"
-"建立使用者個人目錄."
+msgstr ""
+"這是外部指令檔的絕對路徑,這個指令檔用來設定磁碟配額及建立使用者個人目錄."
 
-#: ../lib/modules/sambaAccount.inc:344 ../lib/modules/sambaSamAccount.inc:184
+#: ../lib/modules/sambaAccount.inc:344 ../lib/modules/sambaSamAccount.inc:188
 msgid "This is the account's Windows password."
 msgstr "該帳號在windows系統的密碼"
 
-#: ../lib/modules/sambaAccount.inc:341 ../lib/modules/sambaSamAccount.inc:181
+#: ../lib/modules/sambaAccount.inc:341 ../lib/modules/sambaSamAccount.inc:185
 msgid "This is the account's full name on Windows systems."
 msgstr "該帳號在windows系統的完整名稱"
 
-#: ../lib/modules/sambaSamAccount.inc:262 ../lib/modules/shadowAccount.inc:170
+#: ../lib/modules/sambaSamAccount.inc:269 ../lib/modules/shadowAccount.inc:170
 msgid "This is the date when the account will expire. Format: DD-MM-YYYY"
 msgstr "帳號過期的時間,格式: DD-MM-YYYY"
 
 #: ../lib/modules/sambaGroupMapping.inc:293
 msgid "This is the group name which will be shown in Windows."
-msgstr "會顯示在windows端的群組名稱."
+msgstr "會顯示在windows的群組名稱."
 
 #: ../help/help.inc:145
-msgid "This is the identifier for the relative DN value. It must be one of the "
+msgid ""
+"This is the identifier for the relative DN value. It must be one of the "
 "given allowed LDAP attributes (e.g. user accounts usually use \"uid\" while "
 "groups use \"cn\")."
-msgstr "指定那一個屬性做為該項目的相對識別名稱(RDN).您必需從下拉式表單中選擇其一(例如,使者帳號通常使用\"uid\",而"
-"群組通常使用\"cn\""
+msgstr ""
+"指定那一個屬性做為該項目的相對識別名稱(RDN).您必需從下拉式表單中選擇其一(例"
+"如,使者帳號通常使用\"uid\",而群組通常使用\"cn\"))"
 
 #: ../help/help.inc:83
-msgid "This is the list of attributes to show in the account list. The entries can "
+msgid ""
+"This is the list of attributes to show in the account list. The entries can "
 "either be predefined values, \"#attribute\", or individual ones, \"attribute:"
-"description\". Several entries are seperated by semicolons."
-msgstr "這是要顯示在使用者/群組/主機 清單中的屬性欄位,這些屬性欄位的名稱"
-"可以事先以變數來定義,如\"#屬性名稱變數\",或是是直接指定,如\"attribute:"
+"description\". Several entries are separated by semicolons."
+msgstr ""
+"這是要顯示在使用者/群組/主機帳號列表中的屬性欄位,這些屬性欄位的名稱可以"
+"事先以變數來定義,如\"#屬性名稱變數\",或是是直接指定,如\"attribute:"
 "屬性欄位名稱\".多個屬位欄位要以分號來分隔."
 
 #: ../lib/modules/inetLocalMailRecipient.inc:70
 msgid "This is the mail server for the user."
 msgstr "這是使用者所使用的郵件伺服器."
 
-#: ../lib/modules/inetOrgPerson.inc:345
-msgid "This is the natural name of the user. If empty, the first and last name is "
-"used."
-msgstr "這是使用者的natural name. 若未填寫, 則會"
-"使用first 和 last name."
+#: ../lib/modules/groupOfNames.inc:57
+msgid "This is the name of this group."
+msgstr "這是該群組名稱."
 
-#: ../lib/modules/posixAccount.inc:399
-msgid "This is the natural name of the user. If empty, the first and last name or "
+#: ../lib/modules/posixAccount.inc:402
+msgid ""
+"This is the natural name of the host. If empty, the host name will be used."
+msgstr ""
+"這是主機帳號的全名(natural name). 若未填寫, 則會使用主機名稱(host name)."
+
+#: ../lib/modules/inetOrgPerson.inc:345
+msgid ""
+"This is the natural name of the user. If empty, the first and last name is "
+"used."
+msgstr "這是使用者的natural name. 若未填寫, 則會使用first 和 last name."
+
+#: ../lib/modules/posixAccount.inc:380
+msgid ""
+"This is the natural name of the user. If empty, the first and last name or "
 "user name is used."
-msgstr "這是使用者的natural name.若留空白,會使用first and last name或"
-"user name."
+msgstr ""
+"這是使用者的natural name.若留空白,會使用first and last name或user name."
 
 #: ../lib/modules/sambaDomain.inc:95
-msgid "This is the number of passwords which are saved to prevent that users reuse "
+msgid ""
+"This is the number of passwords which are saved to prevent that users reuse "
 "old passwords."
-msgstr "這是指要儲存歷史密碼的次數,以防止使用者重覆使用"
-"舊密碼."
+msgstr "這是指要儲存歷史密碼的次數,以防止使用者重覆使用舊密碼."
 
 #: ../help/help.inc:93
-msgid "This is the number of rows to show in the user/group/host list. If more "
+msgid ""
+"This is the number of rows to show in the user/group/host list. If more "
 "entries are found the list will be split into several pages."
-msgstr "顯示在每一頁使用者/群組/主機 清單中的列數.搜尋到的"
-"項目超過此數會以分頁來顯示."
+msgstr ""
+"顯示在每一頁使用者/群組/主機 清單中的列數.搜尋到的項目超過此數會以分頁來顯示."
 
 #: ../lib/modules/sambaGroupMapping.inc:301
-msgid "This is the relative ID (similar to UID on Unix) for Windows accounts. If "
+msgid ""
+"This is the relative ID (similar to UID on Unix) for Windows accounts. If "
 "you leave this empty LAM will calculate the RID from the UID. This can be "
 "either a number or the name of a special group:"
-msgstr "這個群組帳號的RID(relative ID,類似於Unix的UID).若"
-"留空白,系統將會依據UID來自動計算出RID.可以"
-"設一個數字或是特殊群組的名稱之一:"
+msgstr ""
+"這個群組帳號的RID(relative ID,類似於Unix的UID).若留空白,系統將會依據UID來自動"
+"計算出RID.可以設一個數字或是特殊群組的名稱之一:"
 
-#: ../lib/modules/sambaSamAccount.inc:246
-msgid "This is the relative ID number for your Windows account. You can either "
+#: ../lib/modules/sambaSamAccount.inc:253
+msgid ""
+"This is the relative ID number for your Windows account. You can either "
 "enter a number or one of these special accounts: "
-msgstr "這是您的windows帳號的RID(relative ID),您可以"
-"輸入數字或者是以下特殊帳號的其中之一:"
+msgstr ""
+"這是您的windows帳號的RID(relative ID),您可以輸入數字或者是以下特殊帳號的其中"
+"之一:"
 
-#: ../lib/modules/sambaSamAccount.inc:250
-msgid "This is the relative ID number for your host account. If you leave this "
+#: ../lib/modules/sambaSamAccount.inc:257
+msgid ""
+"This is the relative ID number for your host account. If you leave this "
 "empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
-msgstr "這個主機帳號的RID,若留"
-"空白,則會使用uidNumber*2 + sambaAlgorithmicRidBase演算法來自動計算."
+msgstr ""
+"這個主機帳號的RID,若留空白,則會使用uidNumber*2 + sambaAlgorithmicRidBase演算"
+"法來自動計算."
 
 #: ../help/help.inc:59
-msgid "This is the server address of your LDAP server. Use ldap:// for standard "
+msgid ""
+"This is the server address of your LDAP server. Use ldap:// for standard "
 "LDAP connections and ldaps:// for encrypted (require server certificates) "
 "connections. The port value is optional."
-msgstr "這是指您的LDAP伺服器位址.ldap:// 的格式表示標準的"
+msgstr ""
+"這是指您的LDAP伺服器位址.ldap:// 的格式表示標準的"
 "LDAP連結, ldaps:// 表示加密(需要伺服器憑證)"
-"連結.這個選項是選填的."
+"連結.連接埠號是選填的."
 
 #: ../help/help.inc:102
-msgid "This is the server where the lamdaemon script is stored. LDAP Account "
+msgid ""
+"This is the server where the lamdaemon script is stored. LDAP Account "
 "Manager will make a SSH connection to this server with user name and "
 "password provided at login."
-msgstr "這是指 lamdaemon 指令檔所在的伺服器."
-"LAM會以SSH來連結這台伺服器,並以使用者登入時所輸入的帳號及"
-"密碼來連結."
+msgstr ""
+"這是指 lamdaemon 指令檔所在的伺服器.LAM會以SSH來連結這台伺服器,並以使用者登入"
+"時所輸入的帳號及密碼來連結."
 
 #: ../help/help.inc:77
 msgid "This is the suffix for the LDAP tree viewer."
-msgstr "設定LDAP樹狀瀏覽器的尾碼."
+msgstr "設定LDAP樹狀瀏覽器的尾碼(根節點)."
 
 #: ../help/help.inc:71
-msgid "This is the suffix of the LDAP tree from where to search for LDAP entries. "
+msgid ""
+"This is the suffix of the LDAP tree from where to search for LDAP entries. "
 "Only entries in this subtree will be displayed in the account list. When "
 "creating a new accont this will be the DN where it is saved."
-msgstr "LDAP會從這個尾碼子樹開始搜尋使用者/群組/主機 項目."
-"只有位於這個尾碼節點以下的項目,才會顯示在使用者/群組/主機 的清單中.在"
-"建立新帳號時,這就是它的DN尾碼,就是它所儲存的位置所在."
+msgstr ""
+"LDAP會從這個尾碼子樹開始搜尋使用者/群組/主機 項目.只有位於這個尾碼節點以下的"
+"項目,才會顯示在使用者/群組/主機 的清單中.在建立新帳號時,這就是它的DN尾碼,就是"
+"它所儲存的位置所在."
 
 #: ../lib/modules/inetLocalMailRecipient.inc:58
 msgid "This is the target email address for the user's mails."
-msgstr "這是使用者的郵件地址."
+msgstr "指定該使用者的電子郵件要送去哪個郵件地址."
 
 #: ../lib/modules/sambaDomain.inc:123
-msgid "This is the time (in minutes) for which the user may not log in after the "
+msgid ""
+"This is the time (in minutes) for which the user may not log in after the "
 "account was locked. -1 means forever."
-msgstr "這是指使用者在停權以後多久時間(分鐘為單位)不能再登入."
-"-1表示永遠."
+msgstr "這是指使用者在停權以後多久時間(分鐘為單位)不能再登入.-1表示永遠."
 
 #: ../help/help.inc:132
-msgid "This is the time (in minutes) of inactivity after which a user is "
+msgid ""
+"This is the time (in minutes) of inactivity after which a user is "
 "automatically logged off."
-msgstr "這是指使用者登入後多久時間(分鐘)沒有動作會被"
-"自動登出."
+msgstr "這是指使用者登入後多久時間(分鐘)沒有動作就會被自動登出."
 
 #: ../help/help.inc:109
-msgid "This is the time in minutes which LAM caches its LDAP searches. Shorter "
+msgid ""
+"This is the time in minutes which LAM caches its LDAP searches. Shorter "
 "times will stress LDAP more but decrease the possibility that changes are "
 "not identified."
-msgstr "LAM會快取LDAP的搜尋結果,這裡設定快取的有效時間,以分為單位,設定較短的"
+msgstr ""
+"LAM會快取LDAP的搜尋結果,這裡設定快取的有效時間,以分為單位,設定較短的"
 "時間,會占用LDAP較多的效能,但能減少因為改變而造成的資料"
 "不一致的問題."
 
@@ -4483,22 +4735,26 @@ msgid ""
 "This is the time limit (in days) for other users who want to check future "
 "appointments. If you leave this blank the default (60 days) will be set."
 msgstr ""
+"對於想要檢查未來約會的其他使用者的時間期限(以日為單位). "
+"如果留空白, 預設值為60天."
 
-#: ../lib/modules/sambaSamAccount.inc:265
-msgid "This is the time zone of your Samba server. LAM needs this information to "
+#: ../lib/modules/sambaSamAccount.inc:272
+msgid ""
+"This is the time zone of your Samba server. LAM needs this information to "
 "display the logon hours correctly."
-msgstr "這是指 Samba 伺服器所在位置的時區. LAM依據此資訊來正確"
-"顯示可登入時間."
+msgstr ""
+"這是指 Samba 伺服器所在位置的時區. LAM依據此資訊來"
+"正確顯示使用者可登入時間."
 
-#: ../lib/modules/sambaSamAccount.inc:237
+#: ../lib/modules/sambaSamAccount.inc:244
 msgid "This is the user's primary Windows group."
 msgstr "這是該使用者隸屬的主要windodws群組."
 
-#: ../lib/modules/posixAccount.inc:104
+#: ../lib/modules/posixAccount.inc:87
 msgid "This login shell is invalid!"
 msgstr "登入shell錯誤!"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:230
+#: ../lib/modules/inetLocalMailRecipient.inc:227
 msgid "This mail address is already in use:"
 msgstr "這個 Email 已經存在: "
 
@@ -4506,18 +4762,19 @@ msgstr "這個 Email 已經存在: "
 msgid "This object class is obsolete."
 msgstr "這個物件類別是舊式的."
 
-#: ../lib/modules/sambaSamAccount.inc:256
+#: ../lib/modules/sambaSamAccount.inc:263
 msgid "This option defines the allowed logon hours for this account."
 msgstr "設定這個帳號可以登入的時間"
 
-#: ../lib/modules/sambaSamAccount.inc:259
-msgid "This option defines the allowed logon hours for this account. The format is "
+#: ../lib/modules/sambaSamAccount.inc:266
+msgid ""
+"This option defines the allowed logon hours for this account. The format is "
 "the same as for the LDAP attribute. The 24*7 hours are represented as 168 "
 "bit which are saved as 21 hex (21*8 = 168) values. The first bit represents "
 "Sunday 0:00 - 0:59 in GMT."
-msgstr "設定這個帳號可以登入的時間.The format is "
-"the same as for the LDAP attribute. 使用168(24*7)個位元來表示,這168個"
-"位元以21個位元組來儲存(21*8=168).第一個位元"
+msgstr ""
+"設定這個帳號可以登入的時間.The format is the same as for the LDAP attribute. "
+"使用168(24*7)個位元來表示,這168個位元以21個位元組來儲存(21*8=168).第一個位元"
 "表示格林威治時間星期日0:00-0:59."
 
 #: ../help/help.inc:155
@@ -4525,23 +4782,22 @@ msgid "This saves your account to the LDAP database."
 msgstr "將帳號的設定儲存到LDAP資料庫中"
 
 #: ../help/help.inc:170
-msgid "This text is displayed on top of the self service login page. You can also "
+msgid ""
+"This text is displayed on top of the self service login page. You can also "
 "input HTML code here."
-msgstr "這些文字會顯示在 self service 登入頁的上方. 您也可以"
-"輸入 HTML 語法."
+msgstr "這些文字會顯示在 self service 登入頁的上方. 您也可以輸入 HTML 語法."
 
 #: ../help/help.inc:172
 msgid ""
 "This text is displayed on top of the self service main page. You can also "
 "input HTML code here."
-msgstr "這些文字會顯示在 self service 主頁的上方. 您也可以"
-"輸入 HTML 語法."
+msgstr "這些文字會顯示在 self service 主頁的上方. 您也可以輸入 HTML 語法."
 
 #: ../help/help.inc:168
-msgid "This text should shortly describe your selected LDAP search attribute (e.g. "
+msgid ""
+"This text should shortly describe your selected LDAP search attribute (e.g. "
 "email or user name)."
-msgstr "這些文字用來簡短描述您所選擇的LDAP搜尋屬性(例如 "
-"email 或 使用者名稱)."
+msgstr "這些文字用來簡短描述您所選擇的LDAP搜尋屬性(例如 email 或 使用者名稱)."
 
 #: ../help/help.inc:111
 msgid "This text will appear on top of every user PDF file."
@@ -4562,11 +4818,11 @@ msgstr "找不到這個使用者!"
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"!"
 msgstr "這個值只能是true或false."
 
-#: ../lib/modules/posixAccount.inc:105
+#: ../lib/modules/posixAccount.inc:88
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"."
 msgstr "這個值只能是true或false."
 
-#: ../lib/modules/posixGroup.inc:497
+#: ../lib/modules/posixGroup.inc:466
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "這個值是以分號分隔的使用者名稱清單."
 
@@ -4583,44 +4839,48 @@ msgstr "刪除所選擇的ou物件,這個ou物件必需是空的."
 msgid "This will delete the selected profile."
 msgstr "刪除選定的設定檔."
 
-#: ../lib/modules/sambaAccount.inc:347 ../lib/modules/sambaSamAccount.inc:187
+#: ../lib/modules/sambaAccount.inc:347 ../lib/modules/sambaSamAccount.inc:191
 msgid "This will reset the host's password to a default value."
 msgstr "會將主機密碼回復為預設值."
 
 #: ../lib/modules/kolabUser.inc:165
-msgid "This will set a special flag on the account which tells Kolabd to remove it. "
+msgid ""
+"This will set a special flag on the account which tells Kolabd to remove it. "
 "Use this to cleanly delete Kolab accounts (e.g. this removes mail boxes)."
-msgstr "這會在這個帳號設定一些特殊旗標.以通知Kolabd刪除這個帳號."
-"這麼做可以完全刪除 Kolab帳號 (包含其郵件檔案)."
+msgstr ""
+"這會在這個帳號設定一些特殊旗標.以通知Kolabd刪除這個帳號.這麼做可以完全刪除 "
+"Kolab帳號 (包含其郵件檔案)."
 
-#: ../lib/modules/posixGroup.inc:413 ../lib/modules/posixAccount.inc:383
-msgid "This will set no password which prevents logins with this account."
-msgstr "這不會設定密碼,以防止這個帳號登入."
-
-#: ../lib/modules/sambaSamAccount.inc:1011
+#: ../lib/modules/sambaSamAccount.inc:1058
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../lib/modules/sambaSamAccount.inc:1052
+#: ../lib/modules/sambaSamAccount.inc:1099
 msgid "Time"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:264
-#: ../lib/modules/sambaSamAccount.inc:417
+#: ../lib/modules/sambaSamAccount.inc:271
+#: ../lib/modules/sambaSamAccount.inc:424
 msgid "Time zone"
 msgstr "時區"
 
-#: ../lib/modules/posixAccount.inc:391
-msgid "To disable login use /bin/false. The list of shells is read from lam/config/"
+#: ../templates/tests/lamdaemonTest.php:174 ../lib/lamdaemon.inc:133
+msgid "Timeout while executing lamdaemon commands!"
+msgstr ""
+
+#: ../lib/modules/posixAccount.inc:372
+msgid ""
+"To disable login use /bin/false. The list of shells is read from lam/config/"
 "shells"
-msgstr "設定為/bin/false表示該使用者無法使用shell登入,這裡的shell清單取自lam/config/"
+msgstr ""
+"設定為/bin/false表示該使用者無法使用shell登入. 這裡的shell清單取自lam/config/"
 "shells檔案中."
 
-#: ../lib/modules/sambaSamAccount.inc:441
+#: ../lib/modules/sambaSamAccount.inc:448
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "東京, 首爾, 大阪, 亞庫次克"
 
-#: ../templates/main_header.php:58
+#: ../templates/main_header.php:64
 msgid "Tools"
 msgstr "工具"
 
@@ -4636,15 +4896,15 @@ msgstr "將GID編號轉換為群組名稱"
 msgid "Tree suffix"
 msgstr "樹狀結構的尾碼"
 
-#: ../templates/main_header.php:70
+#: ../templates/main_header.php:76
 msgid "Tree view"
 msgstr "樹狀結構"
 
-#: ../templates/config/confmain.php:434
+#: ../templates/config/confmain.php:442
 msgid "TreeSuffix is invalid!"
 msgstr "樹狀結構的尾碼無效!"
 
-#: ../lib/modules/sambaSamAccount.inc:1011
+#: ../lib/modules/sambaSamAccount.inc:1058
 msgid "Tuesday"
 msgstr "星期二"
 
@@ -4653,50 +4913,59 @@ msgstr "星期二"
 msgid "Type"
 msgstr "類型"
 
-#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:72
 msgid "UID"
 msgstr "UID"
 
-#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:72
 msgid "UID has changed. Do you want to change home directory?"
 msgstr "UID已經改變,要改變個人目錄嗎?"
 
-#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/posixAccount.inc:67
 msgid ""
 "UID must be a number. It has to be inside the UID range which is defined in "
 "your configuration profile."
 msgstr "UID必須是一個數字,位於您所設定的範圍內."
 
 #: ../lib/types/host.inc:86 ../lib/types/user.inc:83
-#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:216
-#: ../lib/modules/posixAccount.inc:283 ../lib/modules/posixAccount.inc:329
-#: ../lib/modules/posixAccount.inc:333 ../lib/modules/posixAccount.inc:341
-#: ../lib/modules/posixAccount.inc:904 ../lib/modules/posixAccount.inc:1136
+#: ../lib/modules/posixAccount.inc:68 ../lib/modules/posixAccount.inc:201
+#: ../lib/modules/posixAccount.inc:268 ../lib/modules/posixAccount.inc:314
+#: ../lib/modules/posixAccount.inc:318 ../lib/modules/posixAccount.inc:326
+#: ../lib/modules/posixAccount.inc:826 ../lib/modules/posixAccount.inc:1033
 msgid "UID number"
 msgstr "UID編號"
 
-#: ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:68
 #, php-format
-msgid "UID number has changed. To keep file ownership you have to run the following "
+msgid ""
+"UID number has changed. To keep file ownership you have to run the following "
 "command as root: 'find / -uid %s -exec chown %s {} \\;'"
-msgstr "使用者的UID已經變更.要維持所屬檔案的使用者,您必須以root的身分執行以下"
-"命令: 'find / -uid %s -exec chown %s {} \\;'"
+msgstr ""
+"使用者的UID已經變更.要維持所屬檔案的使用者,您必須以root的身分執行以下命令: "
+"'find / -uid %s -exec chown %s {} \\;'"
 
-#: ../lib/modules/posixAccount.inc:78 ../lib/modules/posixAccount.inc:186
+#: ../lib/modules/posixAccount.inc:59
 msgid "UID ranges for Unix accounts"
 msgstr "Unix帳號使用的的UID範圍"
 
-#: ../lib/modules/sambaAccount.inc:382 ../lib/modules/sambaSamAccount.inc:222
-msgid "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced "
+#: ../lib/modules/sambaAccount.inc:382 ../lib/modules/sambaSamAccount.inc:229
+msgid ""
+"UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced "
 "with user and group name."
-msgstr "使用者個人目錄的UNC路徑(\\\\server\\share).$user和$group會"
-"以使用者及群組名稱來置換."
+msgstr ""
+"使用者個人目錄的UNC路徑(\\\\server\\share).$user和$group會以使用者及群組名稱"
+"來置換."
 
-#: ../templates/selfService/selfServiceMain.php:118
-msgid "Unable to change your account. Maybe you do not have enough rights to change "
+#: ../templates/selfService/selfServiceMain.php:119
+msgid ""
+"Unable to change your account. Maybe you do not have enough rights to change "
 "the settings."
-msgstr "無法改變您的帳號. 可能是因為您沒有足夠的權限更改"
-"這些設定."
+msgstr "無法改變您的帳號. 可能是因為您沒有足夠的權限更改這些設定."
+
+#: ../templates/tests/lamdaemonTest.php:138 ../lib/lamdaemon.inc:146
+#: ../lib/lamdaemon.inc:151
+msgid "Unable to connect to remote server!"
+msgstr "無法連結遠端伺服器 !"
 
 #: ../templates/ou_edit.php:67
 msgid "Unable to create new OU!"
@@ -4721,18 +4990,23 @@ msgstr "無法刪除PDF架構!"
 msgid "Unable to delete profile!"
 msgstr "無法刪除設定檔!"
 
-#: ../lib/modules/posixAccount.inc:1300 ../lib/modules/posixAccount.inc:1517
+#: ../lib/modules/posixAccount.inc:1212 ../lib/modules/posixAccount.inc:1429
 msgid "Unable to find group in LDAP."
 msgstr "LDAP中找不到群組."
 
-#: ../templates/config/confmain.php:301
-msgid "Unable to load available languages. Setting English as default language. For "
-"further instructions please contact the Admin of this site."
-msgstr "無法載入語言設定檔,將使用英語為預設語言.請洽網站管理員取得更"
-"進一步的訊息."
+#: ../lib/modules.inc:1154 ../lib/modules.inc:1158
+msgid "Unable to load LDAP entry:"
+msgstr "無法載入 LDAP 項目 :"
 
-#: ../lib/profiles.inc:91 ../lib/profiles.inc:95 ../lib/selfService.inc:160
-#: ../lib/selfService.inc:164
+#: ../templates/config/confmain.php:301
+msgid ""
+"Unable to load available languages. Setting English as default language. For "
+"further instructions please contact the Admin of this site."
+msgstr ""
+"無法載入語言設定檔,將使用英語為預設語言.請洽網站管理員取得更進一步的訊息."
+
+#: ../lib/profiles.inc:91 ../lib/profiles.inc:95 ../lib/selfService.inc:174
+#: ../lib/selfService.inc:178
 msgid "Unable to load profile!"
 msgstr "無法載入設定檔!"
 
@@ -4741,18 +5015,22 @@ msgstr "無法載入設定檔!"
 msgid "Unable to retrieve schema!"
 msgstr "無法取得shcema資料!"
 
-#: ../templates/selfService/adminMain.php:88
+#: ../templates/selfService/adminMain.php:123
 #: ../templates/profedit/profilepage.php:127
 msgid "Unable to save profile!"
 msgstr "無法儲存設定檔!"
 
-#: ../lib/modules/posixGroup.inc:295 ../lib/modules/posixAccount.inc:131
+#: ../lib/modules/posixGroup.inc:282 ../lib/modules/posixAccount.inc:114
 msgid "Unix"
 msgstr "unix"
 
+#: ../templates/tests/lamdaemonTest.php:79
+msgid "Unix account"
+msgstr "Unix 帳號"
+
 #: ../lib/modules/inetOrgPerson.inc:44 ../lib/modules/inetOrgPerson.inc:254
-#: ../lib/modules/inetOrgPerson.inc:352 ../lib/modules/inetOrgPerson.inc:676
-#: ../lib/modules/inetOrgPerson.inc:818
+#: ../lib/modules/inetOrgPerson.inc:352 ../lib/modules/inetOrgPerson.inc:675
+#: ../lib/modules/inetOrgPerson.inc:811
 msgid "Unix workstations"
 msgstr "unix工作站"
 
@@ -4760,6 +5038,10 @@ msgstr "unix工作站"
 msgid "Unix workstations are invalid!"
 msgstr "unix工作站無效!"
 
+#: ../lib/modules/posixGroup.inc:173 ../lib/modules/posixAccount.inc:863
+msgid "Unlock password"
+msgstr "解除密碼鎖定"
+
 #: ../templates/config/confmodules.php:238
 msgid "Unsolved dependency:"
 msgstr "未解決的相依性問題:"
@@ -4776,7 +5058,7 @@ msgstr "上傳帳號至LDAP"
 msgid "Upload file and create accounts"
 msgstr "開始上傳"
 
-#: ../lib/modules.inc:474
+#: ../lib/modules.inc:448
 #, php-format
 msgid "Upload was stopped after errors in %s module!"
 msgstr "因為 %s 模組錯誤,上傳停止."
@@ -4787,9 +5069,11 @@ msgstr "用法"
 
 #: ../lib/modules/sambaAccount.inc:120 ../lib/modules/sambaAccount.inc:231
 #: ../lib/modules/sambaAccount.inc:349 ../lib/modules/sambaAccount.inc:352
-#: ../lib/modules/sambaSamAccount.inc:189
-#: ../lib/modules/sambaSamAccount.inc:192
-#: ../lib/modules/sambaSamAccount.inc:293
+#: ../lib/modules/sambaAccount.inc:722 ../lib/modules/sambaSamAccount.inc:193
+#: ../lib/modules/sambaSamAccount.inc:196
+#: ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/sambaSamAccount.inc:881
+#: ../lib/modules/sambaSamAccount.inc:1177
 msgid "Use Unix password"
 msgstr "使用unix的密碼"
 
@@ -4803,23 +5087,17 @@ msgid ""
 "use it!"
 msgstr "在使用之前要讀取lamdaemon的說明文件,並且後果自負!"
 
-#: ../lib/modules/posixGroup.inc:412 ../lib/modules/sambaAccount.inc:126
-#: ../lib/modules/sambaAccount.inc:239 ../lib/modules/sambaAccount.inc:355
-#: ../lib/modules/sambaAccount.inc:358 ../lib/modules/sambaAccount.inc:727
-#: ../lib/modules/sambaSamAccount.inc:195
-#: ../lib/modules/sambaSamAccount.inc:198
-#: ../lib/modules/sambaSamAccount.inc:301
-#: ../lib/modules/sambaSamAccount.inc:854
-#: ../lib/modules/sambaSamAccount.inc:1085 ../lib/modules/posixAccount.inc:382
+#: ../lib/modules/sambaAccount.inc:126 ../lib/modules/sambaAccount.inc:239
+#: ../lib/modules/sambaAccount.inc:355 ../lib/modules/sambaAccount.inc:358
+#: ../lib/modules/sambaAccount.inc:726 ../lib/modules/sambaSamAccount.inc:199
+#: ../lib/modules/sambaSamAccount.inc:202
+#: ../lib/modules/sambaSamAccount.inc:308
+#: ../lib/modules/sambaSamAccount.inc:885
+#: ../lib/modules/sambaSamAccount.inc:1183
 msgid "Use no password"
 msgstr "不需密碼"
 
-#: ../lib/modules/sambaAccount.inc:723 ../lib/modules/sambaSamAccount.inc:850
-#: ../lib/modules/sambaSamAccount.inc:1079
-msgid "Use unix password"
-msgstr "使用unix的密碼"
-
-#: ../lib/modules/quota.inc:90 ../lib/modules/quota.inc:299
+#: ../lib/modules/quota.inc:90 ../lib/modules/quota.inc:311
 msgid "Used blocks"
 msgstr "已使用的區塊"
 
@@ -4837,11 +5115,11 @@ msgstr "有使用的物件類別"
 
 #: ../lib/modules/sambaDomain.inc:87
 msgid "Used for calculating RIDs from UID/GID. Do not change if unsure."
-msgstr "從UID/GID來計算RID的基底,不了解的話請不要更動."
+msgstr "利用此基數,可以由UID/GID來計算RID,不了解的話請不要更動."
 
-#: ../lib/modules/quota.inc:106 ../lib/modules/quota.inc:303
+#: ../lib/modules/quota.inc:106 ../lib/modules/quota.inc:315
 msgid "Used inodes"
-msgstr "已使用的inodes"
+msgstr "已使用的檔案數目"
 
 #: ../lib/modules/quota.inc:107
 msgid "Used inodes (files)"
@@ -4853,20 +5131,21 @@ msgstr "使用者"
 
 #: ../lib/types/user.inc:82
 msgid "User ID"
-msgstr "使用者帳號"
+msgstr "使用者登入帳號"
 
 #: ../lib/types/user.inc:53
 msgid "User accounts (e.g. Unix, Samba and Kolab)"
 msgstr "使用者帳號(例如 Unix, Samba及Kolab)"
 
 #: ../lib/modules/sambaAccount.inc:263 ../lib/modules/sambaAccount.inc:373
-#: ../lib/modules/sambaAccount.inc:739 ../lib/modules/sambaSamAccount.inc:213
-#: ../lib/modules/sambaSamAccount.inc:325
-#: ../lib/modules/sambaSamAccount.inc:866
+#: ../lib/modules/sambaAccount.inc:738 ../lib/modules/sambaSamAccount.inc:220
+#: ../lib/modules/sambaSamAccount.inc:332
+#: ../lib/modules/sambaSamAccount.inc:908
+#: ../lib/modules/sambaSamAccount.inc:1121
 msgid "User can change password"
 msgstr "使用者可以更改密碼的日期"
 
-#: ../lib/modules/posixAccount.inc:367
+#: ../lib/modules/posixAccount.inc:352
 msgid "User description. If left empty first and last name will be used."
 msgstr "該使用者的描述,若留空白則使用姓氏 名字."
 
@@ -4874,81 +5153,97 @@ msgstr "該使用者的描述,若留空白則使用姓氏 名字."
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "該使用者的描述,若留空白則使用姓氏 名字"
 
+#: ../lib/modules/account.inc:94
+msgid "User description. If left empty user name will be used."
+msgstr "關於使用者的描述, 若留空白,預設為使用者姓名."
+
 #: ../templates/schema/schema.php:209
 msgid "User modification"
-msgstr ""
+msgstr "使用者修正"
 
 #: ../lib/modules/sambaAccount.inc:270 ../lib/modules/sambaAccount.inc:375
-#: ../lib/modules/sambaAccount.inc:747 ../lib/modules/sambaSamAccount.inc:215
-#: ../lib/modules/sambaSamAccount.inc:332
-#: ../lib/modules/sambaSamAccount.inc:874
+#: ../lib/modules/sambaAccount.inc:746 ../lib/modules/sambaSamAccount.inc:222
+#: ../lib/modules/sambaSamAccount.inc:339
+#: ../lib/modules/sambaSamAccount.inc:920
+#: ../lib/modules/sambaSamAccount.inc:1126
 msgid "User must change password"
 msgstr "使用者必須更改密碼的日期"
 
-#: ../templates/login.php:214 ../lib/types/user.inc:85
-#: ../lib/modules/account.inc:96 ../lib/modules/account.inc:116
-#: ../lib/modules/account.inc:118 ../lib/modules/account.inc:119
-#: ../lib/modules/account.inc:198 ../lib/modules/account.inc:219
-#: ../lib/modules/posixAccount.inc:91 ../lib/modules/posixAccount.inc:92
-#: ../lib/modules/posixAccount.inc:95 ../lib/modules/posixAccount.inc:202
-#: ../lib/modules/posixAccount.inc:362 ../lib/modules/posixAccount.inc:896
-#: ../lib/modules/posixAccount.inc:1134 ../lib/modules/inetOrgPerson.inc:70
-#: ../lib/modules/inetOrgPerson.inc:242 ../lib/modules/inetOrgPerson.inc:348
-#: ../lib/modules/inetOrgPerson.inc:551 ../lib/modules/inetOrgPerson.inc:833
+#: ../templates/login.php:223 ../lib/types/user.inc:85
+#: ../lib/modules/account.inc:89 ../lib/modules/account.inc:110
+#: ../lib/modules/account.inc:130 ../lib/modules/account.inc:132
+#: ../lib/modules/account.inc:133 ../lib/modules/account.inc:211
+#: ../lib/modules/account.inc:232 ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:74 ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:187 ../lib/modules/posixAccount.inc:347
+#: ../lib/modules/posixAccount.inc:818 ../lib/modules/posixAccount.inc:1031
+#: ../lib/modules/inetOrgPerson.inc:70 ../lib/modules/inetOrgPerson.inc:242
+#: ../lib/modules/inetOrgPerson.inc:348 ../lib/modules/inetOrgPerson.inc:550
+#: ../lib/modules/inetOrgPerson.inc:826
 msgid "User name"
-msgstr "使用者帳號"
+msgstr "使用者名稱"
 
-#: ../lib/modules/posixAccount.inc:99 ../lib/modules/inetOrgPerson.inc:72
+#: ../lib/modules/posixAccount.inc:81 ../lib/modules/inetOrgPerson.inc:72
 msgid "User name already exists!"
 msgstr "使用者名稱已經存在!"
 
-#: ../lib/modules/account.inc:116 ../lib/modules/account.inc:117
-#: ../lib/modules/account.inc:119 ../lib/modules/posixAccount.inc:92
-#: ../lib/modules/posixAccount.inc:97 ../lib/modules/inetOrgPerson.inc:70
+#: ../lib/modules/account.inc:130 ../lib/modules/account.inc:131
+#: ../lib/modules/account.inc:133 ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixAccount.inc:79 ../lib/modules/inetOrgPerson.inc:70
 #: ../lib/modules/inetOrgPerson.inc:71
 msgid ""
 "User name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
 msgstr "使用者名稱包含無效字元.只能使用a-z,A-Z,0-9,及 .-_!"
 
-#: ../lib/modules/posixAccount.inc:95
+#: ../lib/modules/posixAccount.inc:77
 msgid "User name in use. Selected next free user name."
 msgstr "使用者名稱已存在,請選擇可用的名稱."
 
-#: ../lib/modules/posixAccount.inc:363 ../lib/modules/inetOrgPerson.inc:349
-msgid "User name of the user who should be created. Valid characters are: a-z,0-"
+#: ../lib/modules/account.inc:90 ../lib/modules/posixAccount.inc:348
+#: ../lib/modules/inetOrgPerson.inc:349
+msgid ""
+"User name of the user who should be created. Valid characters are: a-z,0-"
 "9, .-_. LAM does not allow a number as first character because useradd also "
 "does not allow it. LAM does not allow capital letters A-Z because it can "
 "cause several problems. If user name is already used user name will be "
 "expanded with a number. The next free number will be used. Warning: Older "
 "systems have problems with user names longer than 8 characters. You can not "
 "log in to Windows if user name is longer than 16 characters."
-msgstr "該使用者的帳號.有效的字元為:a-z,0-"
-"9.-_. LAM和useradd命令一樣都不容許以數字開頭的帳號."
-" LAM也不容許含大寫字元的帳號,因為會"
-"造成一些問題.如果指定的帳號已經存在,則會自動在帳號後面"
-"加上下一個可用的數字. 警告:超過8個字元的帳號在舊的"
-"系統上會造成問題.如果超過16個字元就不能"
-"登入windows."
+msgstr ""
+"該使用者的帳號.有效的字元為:a-z,0-9.-_. LAM和useradd命令一樣都不容許以數字開"
+"頭的帳號. LAM也不容許含大寫字元的帳號,因為會造成一些問題.如果指定的帳號已經存"
+"在,則會自動在帳號後面加上下一個可用的數字. 警告:超過8個字元的帳號在舊的系統上"
+"會造成問題.如果超過16個字元就不能登入windows."
 
-#: ../lib/types/user.inc:44 ../lib/modules/posixAccount.inc:72
-#: ../lib/modules/posixAccount.inc:73 ../lib/modules/posixAccount.inc:76
-#: ../lib/modules/posixAccount.inc:158
+#: ../lib/types/user.inc:44 ../lib/modules/posixAccount.inc:53
+#: ../lib/modules/posixAccount.inc:54 ../lib/modules/posixAccount.inc:57
+#: ../lib/modules/posixAccount.inc:154
 msgid "Users"
-msgstr "使用者帳號"
+msgstr "使用者"
 
-#: ../lib/modules/posixGroup.inc:401
+#: ../lib/modules/posixGroup.inc:379
 msgid ""
 "Users who are member of the current group. Users who have set their primary "
 "group to this group will not be shown."
 msgstr "目前群組的成員. 這裡不會顯示將此群組設為主要群組的使用者"
 
-#: ../lib/modules/posixGroup.inc:405
+#: ../lib/modules/posixGroup.inc:383
 msgid ""
 "Users who will become member of the current group. User names are separated "
 "by semicolons."
 msgstr "隸屬於這個群組的使用者.以分號隔開."
 
+#: ../templates/tests/lamdaemonTest.php:71
+#, php-format
+msgid "Using %s as lamdaemon remote server."
+msgstr ""
+
+#: ../templates/tests/lamdaemonTest.php:92
+#, php-format
+msgid "Using %s to connect to remote server."
+msgstr ""
+
 #: ../templates/tree/creation_template.php:86
 msgid "Using template:"
 msgstr "套用的樣版:"
@@ -4957,61 +5252,65 @@ msgstr "套用的樣版:"
 msgid "Valid users"
 msgstr "有效的使用者"
 
+#: ../templates/login.php:182
+msgid "Want more features? Get LAM Pro!"
+msgstr "需要更多的功能嗎 ? 參考 LAM 專業版 ! "
+
 #: ../templates/config/mainmanage.php:207
 msgid "Warning"
 msgstr "警告"
 
-#: ../templates/delete.php:188 ../lib/modules.inc:1484
+#: ../templates/delete.php:184 ../lib/modules.inc:1470
 #, php-format
 msgid "Was unable to add attribtues to DN: %s."
 msgstr "無法增加屬性到 %s 這個DN中."
 
-#: ../lib/modules.inc:1425 ../lib/modules.inc:1438
+#: ../lib/modules.inc:1406 ../lib/modules.inc:1419
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "無法建立這個DN: %s."
 
-#: ../templates/tree/delete.php:110 ../templates/delete.php:279
-#: ../templates/delete.php:287 ../lib/modules.inc:1416
+#: ../templates/tree/delete.php:110 ../templates/delete.php:276
+#: ../templates/delete.php:284 ../lib/modules.inc:1397
 #, php-format
 msgid "Was unable to delete DN: %s."
 msgstr "無法刪除DN: %s."
 
 #: ../templates/tree/update.php:106 ../templates/tree/add_oclass.php:90
-#: ../templates/tree/add_oclass_form.php:159 ../templates/delete.php:180
-#: ../lib/modules.inc:1472
+#: ../templates/tree/add_oclass_form.php:159 ../templates/delete.php:176
+#: ../lib/modules.inc:1458
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "無法變更DN: %s 的屬性"
 
-#: ../templates/delete.php:196 ../lib/modules.inc:1496
+#: ../templates/delete.php:192 ../lib/modules.inc:1482
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "無法刪除DN: %s 的屬性."
 
-#: ../lib/modules/sambaSamAccount.inc:1011
+#: ../lib/modules/sambaSamAccount.inc:1058
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../lib/modules/sambaSamAccount.inc:432
+#: ../lib/modules/sambaSamAccount.inc:439
 msgid "Western Europe Time, London, Lisbon"
 msgstr "西歐時間, 倫敦, 里斯本"
 
 #: ../help/help.inc:69
-msgid "When using ldaps:// be sure to use exactly the same IP/domain name as in "
+msgid ""
+"When using ldaps:// be sure to use exactly the same IP/domain name as in "
 "your certificate!"
-msgstr "當您使用ldaps:// 時必須使用和"
-"您的憑證完全相同的 ip/domain!"
+msgstr "當您使用ldaps:// 時必須使用和您的憑證完全相同的 ip/domain!"
 
-#: ../lib/modules/sambaAccount.inc:406 ../lib/modules/sambaSamAccount.inc:253
+#: ../lib/modules/sambaAccount.inc:406 ../lib/modules/sambaSamAccount.inc:260
 msgid "Windows domain name of account."
 msgstr "帳號所屬的windows網域"
 
-#: ../lib/modules/sambaAccount.inc:307 ../lib/modules/sambaAccount.inc:785
-#: ../lib/modules/sambaSamAccount.inc:376
-#: ../lib/modules/sambaSamAccount.inc:926
-#: ../lib/modules/sambaSamAccount.inc:1162
-#: ../lib/modules/sambaSamAccount.inc:1294
+#: ../lib/modules/sambaAccount.inc:307 ../lib/modules/sambaAccount.inc:784
+#: ../lib/modules/sambaSamAccount.inc:383
+#: ../lib/modules/sambaSamAccount.inc:974
+#: ../lib/modules/sambaSamAccount.inc:1260
+#: ../lib/modules/sambaSamAccount.inc:1392
 #: ../lib/modules/sambaGroupMapping.inc:205
 #: ../lib/modules/sambaGroupMapping.inc:324
 msgid "Windows group"
@@ -5019,7 +5318,7 @@ msgstr "Windows群組"
 
 #: ../lib/modules/sambaAccount.inc:399
 msgid "Windows group RID"
-msgstr "Windows group RID"
+msgstr "Windows 群組的 RID"
 
 #: ../lib/modules/sambaAccount.inc:396
 #: ../lib/modules/sambaGroupMapping.inc:296
@@ -5030,11 +5329,11 @@ msgstr "Windows群組名稱"
 msgid "Windows group type."
 msgstr "Windows群組類型"
 
-#: ../lib/modules/sambaSamAccount.inc:236
+#: ../lib/modules/sambaSamAccount.inc:243
 msgid "Windows primary group"
 msgstr "Windows主群組"
 
-#: ../lib/modules/sambaSamAccount.inc:239
+#: ../lib/modules/sambaSamAccount.inc:246
 msgid "Windows primary group SID"
 msgstr "Windows主群組的SID"
 
@@ -5046,7 +5345,7 @@ msgstr "這個群組所屬的windows網域名稱."
 msgid "Workgroup"
 msgstr "工作群組"
 
-#: ../templates/login.php:401 ../templates/selfService/selfServiceLogin.php:89
+#: ../templates/login.php:415 ../templates/selfService/selfServiceLogin.php:89
 #: ../templates/selfService/selfServiceLogin.php:101
 msgid "Wrong password/user name combination. Please try again."
 msgstr "密碼/使用者 錯誤,請重試!"
@@ -5056,27 +5355,19 @@ msgstr "密碼/使用者 錯誤,請重試!"
 msgid "Yes"
 msgstr "是"
 
-#: ../lib/modules/posixGroup.inc:493
+#: ../lib/modules/posixGroup.inc:462
 msgid ""
 "You are using a capital letters. This can cause problems because Windows "
 "isn't case-sensitive."
 msgstr "您使用了大寫字元,這會造成一些問題,因為windows不區分大小寫."
 
-#: ../lib/modules/account.inc:118 ../lib/modules/posixAccount.inc:91
-#: ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/account.inc:132 ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:75
 msgid ""
 "You are using a capital letters. This can cause problems because windows "
 "isn't case-sensitive."
 msgstr "您使用了大寫字元,這會造成一些問題,因為windows不區分大小寫."
 
-#: ../lib/modules/posixAccount.inc:88
-msgid "You cannot use these password options at the same time."
-msgstr "無法同時使用這些密碼選項."
-
-#: ../lib/modules/posixGroup.inc:484
-msgid "You cannot use this password options at the same time."
-msgstr "無法同時使用這些密碼選項."
-
 #: ../templates/tree/templates/creation/custom.php:106
 msgid ""
 "You did not select any object classes for this object. Please go back and do "
@@ -5100,6 +5391,23 @@ msgstr "%s必要屬性,值不能空白."
 msgid "You made no changes."
 msgstr "沒有做任何修改."
 
+#: ../lib/modules/groupOfNames.inc:117 ../lib/modules/groupOfNames.inc:118
+msgid "You need to add at least one member to this group."
+msgstr "您至少需要加入一個成員到這個群組中."
+
+#: ../templates/tests/lamdaemonTest.php:96
+#, php-format
+msgid ""
+"Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"
+msgstr ""
+"LAM 系統管理者 (%s) 必須是一個有效的 Unix 帳號, 才能執行 lamdaemon !"
+
+#: ../lib/lamdaemon.inc:117 ../lib/lamdaemon.inc:123
+msgid ""
+"Your LAM admin user must be a valid Unix account to work with lamdaemon!"
+msgstr ""
+"LAM 系統管理者必須是一個有效的 Unix 帳號, 才能執行 lamdaemon !"
+
 #: ../templates/tree/add_attr_form.php:165
 msgid ""
 "Your PHP configuration has disabled file uploads. Please check php.ini "
@@ -5110,12 +5418,12 @@ msgstr "PHP設定無法上傳檔案,請檢查php.ini ."
 msgid "Your session expired, click here to go back to the login page."
 msgstr "您的連線已過期, 請按此重新登入."
 
-#: ../templates/login.php:194
+#: ../templates/login.php:203
 msgid "Your session expired, please log in again."
 msgstr "您的連線已過期, 請重新登入."
 
 #: ../templates/config/mainmanage.php:131
-#: ../templates/selfService/adminMain.php:77 ../lib/config.inc:339
+#: ../templates/selfService/adminMain.php:112 ../lib/config.inc:339
 msgid "Your settings were successfully saved."
 msgstr "設定儲存成功."
 
@@ -5124,11 +5432,11 @@ msgstr "設定儲存成功."
 msgid "[attribute deleted]"
 msgstr "[屬性刪除]"
 
-#: ../lib/modules/sambaAccount.inc:285 ../lib/modules/sambaSamAccount.inc:354
+#: ../lib/modules/sambaAccount.inc:285 ../lib/modules/sambaSamAccount.inc:361
 msgid "\\\\server\\homes\\smiller"
 msgstr "\\\\server\\homes\\smiller"
 
-#: ../lib/modules/sambaAccount.inc:291 ../lib/modules/sambaSamAccount.inc:360
+#: ../lib/modules/sambaAccount.inc:291 ../lib/modules/sambaSamAccount.inc:367
 msgid "\\\\server\\profiles\\smiller"
 msgstr "\\\\server\\profiles\\smiller"
 
@@ -5136,17 +5444,17 @@ msgstr "\\\\server\\profiles\\smiller"
 msgid "add value"
 msgstr "新增屬性值"
 
-#: ../lib/modules/posixGroup.inc:356
+#: ../lib/modules/posixGroup.inc:334 ../lib/modules/groupOfNames.inc:82
 msgid "adminstrators"
-msgstr ""
+msgstr "管理者"
 
 #: ../templates/schema/schema.php:225
 msgid "character"
-msgstr ""
+msgstr "字元"
 
 #: ../templates/schema/schema.php:224
 msgid "characters"
-msgstr ""
+msgstr "字元"
 
 #: ../help/help.inc:81
 msgid "dc=yourcompany,dc=com"
@@ -5165,8 +5473,8 @@ msgstr "下載值"
 
 #: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:113
 #: ../lib/modules/inetOrgPerson.inc:224 ../lib/modules/inetOrgPerson.inc:340
-#: ../lib/modules/inetOrgPerson.inc:341 ../lib/modules/inetOrgPerson.inc:652
-#: ../lib/modules/inetOrgPerson.inc:831 ../lib/modules/inetOrgPerson.inc:1082
+#: ../lib/modules/inetOrgPerson.inc:341 ../lib/modules/inetOrgPerson.inc:651
+#: ../lib/modules/inetOrgPerson.inc:824 ../lib/modules/inetOrgPerson.inc:1075
 msgid "eMail address"
 msgstr "電子郵件地址"
 
@@ -5174,12 +5482,12 @@ msgstr "電子郵件地址"
 msgid "false"
 msgstr "失敗"
 
-#: ../lib/modules/posixAccount.inc:231
+#: ../lib/modules/posixAccount.inc:216
 msgid "group01,group02"
 msgstr "group01,group02"
 
-#: ../lib/modules/quota.inc:146 ../lib/modules/quota.inc:148
-#: ../lib/modules/quota.inc:197 ../lib/modules/quota.inc:199
+#: ../lib/modules/quota.inc:157 ../lib/modules/quota.inc:159
+#: ../lib/modules/quota.inc:208 ../lib/modules/quota.inc:210
 msgid "hours"
 msgstr ""
 
@@ -5199,17 +5507,17 @@ msgid ""
 "connection."
 msgstr "ldaps://141.40.146.133 表示使用加密的LDAP連結到141.40.146.133"
 
-#: ../lib/modules/posixAccount.inc:291
+#: ../lib/modules/posixAccount.inc:276
 msgid "machines"
 msgstr ""
 
 #: ../lib/modules/sambaAccount.inc:323 ../lib/modules/sambaAccount.inc:333
-#: ../lib/modules/sambaSamAccount.inc:277
-#: ../lib/modules/sambaSamAccount.inc:403
+#: ../lib/modules/sambaSamAccount.inc:284
+#: ../lib/modules/sambaSamAccount.inc:410
 msgid "mydomain"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:378
+#: ../lib/modules/sambaSamAccount.inc:385
 msgid "mygroup"
 msgstr ""
 
@@ -5236,16 +5544,18 @@ msgid "not specified"
 msgstr "未指定"
 
 #: ../help/help.inc:75
-msgid "ou=People,dc=yourcompany,dc=com will read and store all accounts in this "
+msgid ""
+"ou=People,dc=yourcompany,dc=com will read and store all accounts in this "
 "subtree."
-msgstr "ou=People,dc=yourcompany,dc=com 表示將會讀取這個子樹下的帳號或將帳號儲存在這"
+msgstr ""
+"ou=People,dc=yourcompany,dc=com 表示將會讀取這個子樹下的帳號或將帳號儲存在這"
 "個子樹下."
 
-#: ../lib/modules/posixAccount.inc:277
+#: ../lib/modules/posixAccount.inc:262
 msgid "pc01$"
 msgstr "pc01$"
 
-#: ../lib/modules/posixAccount.inc:298
+#: ../lib/modules/posixAccount.inc:283
 msgid "pc01,Room 2.34"
 msgstr "pc01,Room 2.34"
 
@@ -5253,21 +5563,21 @@ msgstr "pc01,Room 2.34"
 msgid "pc01,pc02"
 msgstr "pc01,pc02"
 
-#: ../templates/tree/edit.php:242 ../templates/config/confmain.php:396
-#: ../templates/selfService/adminMain.php:498 ../lib/modules.inc:1096
+#: ../templates/tree/edit.php:242 ../templates/config/confmain.php:397
+#: ../templates/selfService/adminMain.php:553 ../lib/modules.inc:1059
 msgid "required"
-msgstr "必要的選項"
+msgstr "是必填的選項"
 
-#: ../templates/config/confmain.php:397
+#: ../templates/config/confmain.php:398
 msgid "required for Samba 3 accounts"
 msgstr "對Samba 3的帳號來說是必要的選項"
 
-#: ../lib/modules/posixGroup.inc:382 ../lib/modules/sambaAccount.inc:227
-#: ../lib/modules/sambaSamAccount.inc:289 ../lib/modules/posixAccount.inc:252
+#: ../lib/modules/posixGroup.inc:360 ../lib/modules/sambaAccount.inc:227
+#: ../lib/modules/sambaSamAccount.inc:296 ../lib/modules/posixAccount.inc:237
 msgid "secret"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:204 ../lib/modules/inetOrgPerson.inc:244
+#: ../lib/modules/posixAccount.inc:189 ../lib/modules/inetOrgPerson.inc:244
 #: ../lib/modules/nisMailAlias.inc:87
 msgid "smiller"
 msgstr ""
@@ -5280,7 +5590,7 @@ msgstr ""
 msgid "true"
 msgstr ""
 
-#: ../lib/modules/posixGroup.inc:376
+#: ../lib/modules/posixGroup.inc:354
 msgid "user01,user02,user03"
 msgstr "user01,user02,user03"
 
@@ -5288,10 +5598,61 @@ msgstr "user01,user02,user03"
 msgid "user@company.com"
 msgstr "user@company.com"
 
-#: ../lib/modules/posixAccount.inc:224
+#: ../lib/modules/posixAccount.inc:209
 msgid "users"
 msgstr ""
 
+#~ msgid "Create new Account"
+#~ msgstr "新增帳號"
+
+#~ msgid "Delete Account"
+#~ msgstr "刪除帳號"
+
+#~ msgid "GID ranges for Unix groups"
+#~ msgstr "unix群組使用的GID範圍"
+
+#~ msgid "Generate password"
+#~ msgstr "產生密碼"
+
+#~ msgid "Maximum GID number for Unix groups"
+#~ msgstr "Unix群組的最大GID編號"
+
+#~ msgid "Maximum UID number for Unix accounts (hosts)"
+#~ msgstr "Unix帳號(主機)的最大UID編號"
+
+#~ msgid "Maximum UID number for Unix accounts (users)"
+#~ msgstr "Unix帳號(使用者)的最大UID編號"
+
+#~ msgid "Minimum GID number for Unix groups"
+#~ msgstr "Unix群組的最小GID編號"
+
+#~ msgid "Minimum UID number for Unix accounts (hosts)"
+#~ msgstr "unix帳號(主機)的最小UID"
+
+#~ msgid "Minimum UID number for Unix accounts (users)"
+#~ msgstr "unix帳號(使用者)的最小UID"
+
+#~ msgid "Password hash type for Unix accounts"
+#~ msgstr "unix帳號的密碼雜湊類型"
+
+#~ msgid "Password hash type for Unix groups"
+#~ msgstr "unix群組的密碼雜湊類型"
+
+#~ msgid "Samba 3 settings"
+#~ msgstr "Samba3的環境設定"
+
+#~ msgid "This will set no password which prevents logins with this account."
+#~ msgstr "這不會設定密碼,以防止這個帳號登入."
+
+#~ msgid "Use unix password"
+#~ msgstr "使用unix的密碼"
+
+#~ msgid "You cannot use these password options at the same time."
+#~ msgstr "無法同時使用這些密碼選項."
+
+#~ msgid "You cannot use this password options at the same time."
+#~ msgstr "無法同時使用這些密碼選項."
+
 #~ msgid "A required PHP extension is missing!"
 #~ msgstr "缺少一些必要的php延伸功能模組"
 
@@ -5347,7 +5708,7 @@ msgstr ""
 #~ msgstr "目前群組的成員."
 
 #~ msgid "Algorithmic RID Base"
-#~ msgstr "RID的演算基底"
+#~ msgstr "RID的演算法基數"
 
 #~ msgid "Attributes in Group List"
 #~ msgstr "群組清單的屬性"
@@ -5412,9 +5773,6 @@ msgstr ""
 #~ msgid "GroupSuffix is invalid!"
 #~ msgstr "群組尾碼無效!"
 
-#~ msgid "Host modules"
-#~ msgstr "主機模組"
-
 #~ msgid "Host profiles"
 #~ msgstr "主機設定檔"