diff --git a/lam/locale/zh_CN/LC_MESSAGES/messages.mo b/lam/locale/zh_CN/LC_MESSAGES/messages.mo
index fb92e1d8..7d79d67f 100644
Binary files a/lam/locale/zh_CN/LC_MESSAGES/messages.mo and b/lam/locale/zh_CN/LC_MESSAGES/messages.mo differ
diff --git a/lam/locale/zh_CN/LC_MESSAGES/messages.po b/lam/locale/zh_CN/LC_MESSAGES/messages.po
index e5c1f43e..8080af77 100644
--- a/lam/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/lam/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: LAM 1.3\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de\n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2008-10-01 19:44+0800\n"
+"PO-Revision-Date: 2009-01-07 09:32+0800\n"
 "Last-Translator: Alan Needham <needham@sina.com>\n"
 "Language-Team: Chinese(Simplified) <needham@sina.com>\n"
 "MIME-Version: 1.0\n"
@@ -28,6 +28,7 @@ msgid "%s DHCP(s) found"
 msgstr "发现 %s DHCP"
 
 #: ../lib/types/mailAlias.inc:108
+#: ../lib/types/alias.inc:108
 #, php-format
 msgid "%s alias(es) found"
 msgstr "找到 %s 个別名"
@@ -37,8 +38,8 @@ msgstr "找到 %s 个別名"
 msgid "%s domain(s) found"
 msgstr "找到 %s 个 Samba 域"
 
-#: ../lib/types/gon.inc:110
 #: ../lib/types/group.inc:122
+#: ../lib/types/gon.inc:110
 #, php-format
 msgid "%s group(s) found"
 msgstr "找到 %s 个组"
@@ -98,7 +99,7 @@ msgstr "123-124-1234"
 msgid "12345"
 msgstr "12345"
 
-#: ../lib/modules/dhcp_settings.inc:151
+#: ../lib/modules/dhcp_settings.inc:149
 msgid ""
 "<b>B-Node (0x01): Broadcast.</b><br/>The client tries to find other workstations via broadcasting\n"
 "(works only inside the same collision domain, viz. the same subnet).<br/><br/>\n"
@@ -132,11 +133,11 @@ msgstr ""
 msgid "A required column is missing in your CSV file."
 msgstr "您的CSV文件中缺少一个必要的列."
 
-#: ../lib/modules/kolabUser.inc:154
+#: ../lib/modules/kolabUser.inc:144
 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)发送电子邮件时会检查这个属性."
 
-#: ../lib/modules/sambaSamAccount.inc:494
+#: ../lib/modules/sambaSamAccount.inc:514
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr "阿布达比, 马斯凯特, 巴库"
 
@@ -149,89 +150,9 @@ msgid "Account"
 msgstr "帐号"
 
 #: ../templates/massBuildAccounts.php:170
+#: ../lib/modules/nisMailAlias.inc:106
+#: ../lib/modules/nisMailAlias.inc:108
 #: ../lib/modules/account.inc:136
-#: ../lib/modules/ieee802device.inc:89
-#: ../lib/modules/posixGroup.inc:477
-#: ../lib/modules/posixGroup.inc:481
-#: ../lib/modules/posixGroup.inc:482
-#: ../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
-#: ../lib/modules/quota.inc:57
-#: ../lib/modules/sambaAccount.inc:63
-#: ../lib/modules/sambaAccount.inc:66
-#: ../lib/modules/sambaAccount.inc:69
-#: ../lib/modules/sambaAccount.inc:71
-#: ../lib/modules/sambaAccount.inc:73
-#: ../lib/modules/sambaAccount.inc:76
-#: ../lib/modules/sambaAccount.inc:77
-#: ../lib/modules/sambaAccount.inc:79
-#: ../lib/modules/sambaAccount.inc:80
-#: ../lib/modules/sambaAccount.inc:81
-#: ../lib/modules/sambaAccount.inc:82
-#: ../lib/modules/sambaAccount.inc:83
-#: ../lib/modules/sambaAccount.inc:84
-#: ../lib/modules/sambaAccount.inc:85
-#: ../lib/modules/sambaAccount.inc:86
-#: ../lib/modules/sambaAccount.inc:87
-#: ../lib/modules/sambaSamAccount.inc:83
-#: ../lib/modules/sambaSamAccount.inc:86
-#: ../lib/modules/sambaSamAccount.inc:89
-#: ../lib/modules/sambaSamAccount.inc:91
-#: ../lib/modules/sambaSamAccount.inc:94
-#: ../lib/modules/sambaSamAccount.inc:95
-#: ../lib/modules/sambaSamAccount.inc:96
-#: ../lib/modules/sambaSamAccount.inc:97
-#: ../lib/modules/sambaSamAccount.inc:99
-#: ../lib/modules/sambaSamAccount.inc:100
-#: ../lib/modules/sambaSamAccount.inc:101
-#: ../lib/modules/sambaSamAccount.inc:102
-#: ../lib/modules/sambaSamAccount.inc:103
-#: ../lib/modules/sambaSamAccount.inc:104
-#: ../lib/modules/sambaSamAccount.inc:105
-#: ../lib/modules/sambaSamAccount.inc:106
-#: ../lib/modules/sambaSamAccount.inc:107
-#: ../lib/modules/sambaSamAccount.inc:109
-#: ../lib/modules/sambaSamAccount.inc:110
-#: ../lib/modules/posixAccount.inc:65
-#: ../lib/modules/posixAccount.inc:70
-#: ../lib/modules/posixAccount.inc:74
-#: ../lib/modules/posixAccount.inc:82
-#: ../lib/modules/posixAccount.inc:83
-#: ../lib/modules/posixAccount.inc:84
-#: ../lib/modules/posixAccount.inc:85
-#: ../lib/modules/posixAccount.inc:86
-#: ../lib/modules/posixAccount.inc:87
-#: ../lib/modules/posixAccount.inc:89
-#: ../lib/modules/posixAccount.inc:90
-#: ../lib/modules/posixAccount.inc:91
-#: ../lib/modules/posixAccount.inc:93
-#: ../lib/modules/kolabUser.inc:246
-#: ../lib/modules/kolabUser.inc:248
-#: ../lib/modules/kolabUser.inc:250
-#: ../lib/modules/kolabUser.inc:252
-#: ../lib/modules/kolabUser.inc:254
-#: ../lib/modules/kolabUser.inc:256
-#: ../lib/modules/kolabUser.inc:258
-#: ../lib/modules/phpGroupwareUser.inc:124
-#: ../lib/modules/phpGroupwareUser.inc:125
-#: ../lib/modules/sambaGroupMapping.inc:398
-#: ../lib/modules/sambaGroupMapping.inc:399
-#: ../lib/modules/shadowAccount.inc:47
-#: ../lib/modules/shadowAccount.inc:49
-#: ../lib/modules/shadowAccount.inc:51
-#: ../lib/modules/shadowAccount.inc:53
-#: ../lib/modules/shadowAccount.inc:55
-#: ../lib/modules/shadowAccount.inc:56
-#: ../lib/modules/sambaDomain.inc:189
-#: ../lib/modules/sambaDomain.inc:191
-#: ../lib/modules/sambaDomain.inc:193
-#: ../lib/modules/sambaDomain.inc:195
-#: ../lib/modules/sambaDomain.inc:197
-#: ../lib/modules/sambaDomain.inc:199
 #: ../lib/modules/inetOrgPerson.inc:72
 #: ../lib/modules/inetOrgPerson.inc:74
 #: ../lib/modules/inetOrgPerson.inc:76
@@ -251,11 +172,92 @@ msgstr "帐号"
 #: ../lib/modules/inetOrgPerson.inc:102
 #: ../lib/modules/inetOrgPerson.inc:105
 #: ../lib/modules/inetOrgPerson.inc:108
+#: ../lib/modules/ieee802device.inc:89
+#: ../lib/modules/sambaAccount.inc:63
+#: ../lib/modules/sambaAccount.inc:66
+#: ../lib/modules/sambaAccount.inc:69
+#: ../lib/modules/sambaAccount.inc:71
+#: ../lib/modules/sambaAccount.inc:73
+#: ../lib/modules/sambaAccount.inc:76
+#: ../lib/modules/sambaAccount.inc:77
+#: ../lib/modules/sambaAccount.inc:79
+#: ../lib/modules/sambaAccount.inc:80
+#: ../lib/modules/sambaAccount.inc:81
+#: ../lib/modules/sambaAccount.inc:82
+#: ../lib/modules/sambaAccount.inc:83
+#: ../lib/modules/sambaAccount.inc:84
+#: ../lib/modules/sambaAccount.inc:85
+#: ../lib/modules/sambaAccount.inc:86
+#: ../lib/modules/sambaAccount.inc:87
+#: ../lib/modules/sambaGroupMapping.inc:438
+#: ../lib/modules/sambaGroupMapping.inc:439
+#: ../lib/modules/posixGroup.inc:503
+#: ../lib/modules/posixGroup.inc:507
+#: ../lib/modules/posixGroup.inc:508
+#: ../lib/modules/posixAccount.inc:65
+#: ../lib/modules/posixAccount.inc:70
+#: ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixAccount.inc:83
+#: ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixAccount.inc:87
+#: ../lib/modules/posixAccount.inc:89
+#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:91
+#: ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/kolabUser.inc:236
+#: ../lib/modules/kolabUser.inc:238
+#: ../lib/modules/kolabUser.inc:240
+#: ../lib/modules/kolabUser.inc:242
+#: ../lib/modules/kolabUser.inc:244
+#: ../lib/modules/kolabUser.inc:246
+#: ../lib/modules/kolabUser.inc:248
 #: ../lib/modules/inetLocalMailRecipient.inc:125
 #: ../lib/modules/inetLocalMailRecipient.inc:127
 #: ../lib/modules/inetLocalMailRecipient.inc:129
-#: ../lib/modules/nisMailAlias.inc:106
-#: ../lib/modules/nisMailAlias.inc:108
+#: ../lib/modules/sambaSamAccount.inc:85
+#: ../lib/modules/sambaSamAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:91
+#: ../lib/modules/sambaSamAccount.inc:93
+#: ../lib/modules/sambaSamAccount.inc:96
+#: ../lib/modules/sambaSamAccount.inc:97
+#: ../lib/modules/sambaSamAccount.inc:98
+#: ../lib/modules/sambaSamAccount.inc:99
+#: ../lib/modules/sambaSamAccount.inc:101
+#: ../lib/modules/sambaSamAccount.inc:102
+#: ../lib/modules/sambaSamAccount.inc:103
+#: ../lib/modules/sambaSamAccount.inc:104
+#: ../lib/modules/sambaSamAccount.inc:105
+#: ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/sambaSamAccount.inc:107
+#: ../lib/modules/sambaSamAccount.inc:108
+#: ../lib/modules/sambaSamAccount.inc:109
+#: ../lib/modules/sambaSamAccount.inc:111
+#: ../lib/modules/sambaSamAccount.inc:112
+#: ../lib/modules/quota.inc:47
+#: ../lib/modules/quota.inc:49
+#: ../lib/modules/quota.inc:51
+#: ../lib/modules/quota.inc:53
+#: ../lib/modules/quota.inc:55
+#: ../lib/modules/quota.inc:57
+#: ../lib/modules/quota.inc:58
+#: ../lib/modules/shadowAccount.inc:58
+#: ../lib/modules/shadowAccount.inc:60
+#: ../lib/modules/shadowAccount.inc:62
+#: ../lib/modules/shadowAccount.inc:64
+#: ../lib/modules/shadowAccount.inc:66
+#: ../lib/modules/shadowAccount.inc:67
+#: ../lib/modules/phpGroupwareUser.inc:124
+#: ../lib/modules/phpGroupwareUser.inc:125
+#: ../lib/modules/sambaDomain.inc:189
+#: ../lib/modules/sambaDomain.inc:191
+#: ../lib/modules/sambaDomain.inc:193
+#: ../lib/modules/sambaDomain.inc:195
+#: ../lib/modules/sambaDomain.inc:197
+#: ../lib/modules/sambaDomain.inc:199
+#: ../lib/modules/aliasEntry.inc:79
 #, php-format
 msgid "Account %s:"
 msgstr "帐号 %s:"
@@ -268,29 +270,29 @@ msgstr "通过上传文件建立帐号"
 msgid "Account deactivated"
 msgstr "帐号已停用"
 
-#: ../templates/lists/changePassword.php:125
+#: ../templates/lists/changePassword.php:128
 msgid "Account details"
 msgstr "帐号详细信息"
 
-#: ../lib/modules/sambaSamAccount.inc:277
-#: ../lib/modules/sambaSamAccount.inc:397
-#: ../lib/modules/sambaSamAccount.inc:1029
-#: ../lib/modules/sambaSamAccount.inc:1262
-#: ../lib/modules/sambaSamAccount.inc:1452
+#: ../lib/modules/sambaSamAccount.inc:294
+#: ../lib/modules/sambaSamAccount.inc:417
+#: ../lib/modules/sambaSamAccount.inc:1069
+#: ../lib/modules/sambaSamAccount.inc:1302
+#: ../lib/modules/sambaSamAccount.inc:1492
+#: ../lib/modules/shadowAccount.inc:120
+#: ../lib/modules/shadowAccount.inc:185
+#: ../lib/modules/shadowAccount.inc:217
+#: ../lib/modules/shadowAccount.inc:321
+#: ../lib/modules/shadowAccount.inc:373
 #: ../lib/modules/phpGroupwareUser.inc:82
 #: ../lib/modules/phpGroupwareUser.inc:111
 #: ../lib/modules/phpGroupwareUser.inc:142
 #: ../lib/modules/phpGroupwareUser.inc:225
 #: ../lib/modules/phpGroupwareUser.inc:378
-#: ../lib/modules/shadowAccount.inc:109
-#: ../lib/modules/shadowAccount.inc:174
-#: ../lib/modules/shadowAccount.inc:206
-#: ../lib/modules/shadowAccount.inc:299
-#: ../lib/modules/shadowAccount.inc:345
 msgid "Account expiration date"
 msgstr "帐号过期日期"
 
-#: ../lib/modules/shadowAccount.inc:372
+#: ../lib/modules/shadowAccount.inc:400
 msgid "Account inactive"
 msgstr "帐号停用(inactive)"
 
@@ -299,16 +301,16 @@ msgstr "帐号停用(inactive)"
 #: ../lib/modules/sambaAccount.inc:371
 #: ../lib/modules/sambaAccount.inc:374
 #: ../lib/modules/sambaAccount.inc:762
-#: ../lib/modules/sambaSamAccount.inc:220
-#: ../lib/modules/sambaSamAccount.inc:226
-#: ../lib/modules/sambaSamAccount.inc:375
-#: ../lib/modules/sambaSamAccount.inc:972
-#: ../lib/modules/sambaSamAccount.inc:1440
+#: ../lib/modules/sambaSamAccount.inc:234
+#: ../lib/modules/sambaSamAccount.inc:240
+#: ../lib/modules/sambaSamAccount.inc:395
+#: ../lib/modules/sambaSamAccount.inc:1007
+#: ../lib/modules/sambaSamAccount.inc:1480
 msgid "Account is deactivated"
 msgstr "帐号已经停用"
 
-#: ../lib/modules/sambaSamAccount.inc:223
-#: ../lib/modules/sambaSamAccount.inc:980
+#: ../lib/modules/sambaSamAccount.inc:237
+#: ../lib/modules/sambaSamAccount.inc:1015
 msgid "Account is locked"
 msgstr "帐号锁定"
 
@@ -327,13 +329,9 @@ msgstr "帐号名"
 msgid "Account status"
 msgstr "帐号状态"
 
-#: ../lib/modules/kolabUser.inc:134
-#: ../lib/modules/kolabUser.inc:141
-msgid "Account suffix"
-msgstr "帐号后缀"
-
 #: ../templates/pdfedit/pdfdelete.php:87
 #: ../lib/modules/groupOfNames.inc:225
+#: ../lib/modules/aliasEntry.inc:141
 msgid "Account type"
 msgstr "帐号类型"
 
@@ -354,33 +352,33 @@ msgstr "LDAP条目类型中的帐号类型定义必须是可管理的（比如us
 msgid "Account was created successfully."
 msgstr "新增帐号成功"
 
-#: ../templates/lists/changePassword.php:374
+#: ../templates/lists/changePassword.php:413
 #: ../lib/modules.inc:1208
 msgid "Account was modified successfully."
 msgstr "帐号修改成功"
 
-#: ../lib/modules/ddns.inc:64
-#: ../lib/modules/ddns.inc:428
+#: ../lib/modules/ddns.inc:81
+#: ../lib/modules/ddns.inc:287
 msgid "Activate DynDNS"
 msgstr "活动的动态DNS"
 
-#: ../lib/modules/sambaSamAccount.inc:284
+#: ../lib/modules/sambaSamAccount.inc:301
 msgid "Activate this checkbox to allow this user to use the terminal service."
 msgstr "激活这个选项允许用户使用终端服务。"
 
-#: ../lib/modules/sambaSamAccount.inc:305
+#: ../lib/modules/sambaSamAccount.inc:322
 msgid "Activate this checkbox to connect drives from the client machine."
 msgstr "激活这个选项将从客户机上连接驱动器。"
 
-#: ../lib/modules/sambaSamAccount.inc:308
+#: ../lib/modules/sambaSamAccount.inc:325
 msgid "Activate this checkbox to connect printers from the client machine."
 msgstr "激活这个选项将从客户机上连接打印机。"
 
-#: ../lib/modules/sambaSamAccount.inc:293
+#: ../lib/modules/sambaSamAccount.inc:310
 msgid "Activate this checkbox to inherit the initial program and working directory from the client machine."
 msgstr "激活这个选项将从客户机上继承初始化程序和工作目录。"
 
-#: ../lib/modules/sambaSamAccount.inc:311
+#: ../lib/modules/sambaSamAccount.inc:328
 msgid "Activate this checkbox to set the client's printer as default printer."
 msgstr "激活这个选项将会设置客户打印机为缺省打印机。"
 
@@ -397,41 +395,49 @@ msgstr "激活帐号类型"
 #: ../templates/tree/add_oclass_form.php:144
 #: ../templates/tree/add_attr_form.php:130
 #: ../templates/tree/add_attr_form.php:162
-#: ../templates/config/conftypes.php:180
 #: ../templates/pdfedit/pdfpage.php:574
 #: ../templates/pdfedit/pdfpage.php:591
 #: ../templates/pdfedit/pdfpage.php:621
 #: ../templates/pdfedit/pdfpage.php:662
+#: ../templates/config/conftypes.php:180
+#: ../lib/modules/nisMailAlias.inc:154
 #: ../lib/modules/ieee802device.inc:111
-#: ../lib/modules/kolabUser.inc:370
-#: ../lib/modules/kolabUser.inc:387
-#: ../lib/modules/kolabUser.inc:413
-#: ../lib/modules/kolabUser.inc:878
-#: ../lib/modules/kolabUser.inc:918
-#: ../lib/modules/ldapPublicKey.inc:105
-#: ../lib/modules/inetLocalMailRecipient.inc:167
 #: ../lib/modules/groupOfNames.inc:168
 #: ../lib/modules/groupOfNames.inc:310
-#: ../lib/modules/nisMailAlias.inc:154
+#: ../lib/modules/kolabUser.inc:342
+#: ../lib/modules/kolabUser.inc:359
+#: ../lib/modules/kolabUser.inc:385
+#: ../lib/modules/kolabUser.inc:863
+#: ../lib/modules/kolabUser.inc:903
+#: ../lib/modules/ldapPublicKey.inc:105
+#: ../lib/modules/inetLocalMailRecipient.inc:167
 msgid "Add"
 msgstr "增加"
 
-#: ../lib/modules/fixed_ip.inc:87
-#: ../lib/modules/fixed_ip.inc:414
-#: ../lib/modules/fixed_ip.inc:415
+#: ../lib/modules/fixed_ip.inc:91
+#: ../lib/modules/fixed_ip.inc:422
+#: ../lib/modules/fixed_ip.inc:423
 msgid "Add IP"
 msgstr "增加IP"
 
-#: ../lib/modules/sambaSamAccount.inc:1139
-#: ../lib/modules/sambaGroupMapping.inc:239
+#: ../lib/modules/kolabUser.inc:403
+msgid "Add Kolab extension"
+msgstr "增加 Kolab 扩展"
+
+#: ../lib/modules/sambaGroupMapping.inc:279
+#: ../lib/modules/sambaSamAccount.inc:1179
 msgid "Add Samba 3 account"
 msgstr "增加Samba3帐号"
 
+#: ../lib/modules/shadowAccount.inc:331
+msgid "Add Shadow account"
+msgstr "增加 Shadow 帐号"
+
 #: ../lib/modules/groupOfNames.inc:342
 msgid "Add entries of this type:"
 msgstr "增加类型条目"
 
-#: ../lib/modules/ddns.inc:434
+#: ../lib/modules/ddns.inc:292
 msgid "Add fix IP addresses to DNS"
 msgstr "为DNS增加一个固定的IP地址"
 
@@ -440,10 +446,10 @@ msgstr "为DNS增加一个固定的IP地址"
 msgid "Add input field"
 msgstr "增加输入栏目"
 
-#: ../templates/tree/edit.php:130
 #: ../templates/tree/add_value_form.php:95
 #: ../templates/tree/add_attr_form.php:72
 #: ../templates/tree/add_attr_form.php:109
+#: ../templates/tree/edit.php:130
 #, php-format
 msgid "Add new attribute"
 msgstr "新增属性"
@@ -473,8 +479,8 @@ msgstr "新增照片"
 msgid "Add phpGroupWare extension"
 msgstr "增加 phpGroupWare 扩展"
 
-#: ../templates/config/profmanage.php:169
 #: ../templates/selfService/profManage.php:138
+#: ../templates/config/profmanage.php:169
 #: ../help/help.inc:114
 msgid "Add profile"
 msgstr "增加配置文件"
@@ -483,11 +489,11 @@ msgstr "增加配置文件"
 msgid "Adding attribute failed!"
 msgstr "增加属性失败！"
 
-#: ../lib/modules/fixed_ip.inc:98
+#: ../lib/modules/fixed_ip.inc:101
 msgid "Adding of a fixed IP failed because of errors."
 msgstr "因为发生了错误致使增加固定IP失败"
 
-#: ../lib/modules/range.inc:98
+#: ../lib/modules/range.inc:100
 msgid "Adding the range failed because errors occured."
 msgstr "因为发生了错误致使增加范围失败"
 
@@ -513,11 +519,11 @@ msgstr "为自助服务选项列表新增组元素.利用它建立输入栏目."
 msgid "Adds a new self service option to the selected group element."
 msgstr "为选定的组元素增加新的自助服务选项."
 
-#: ../lib/modules/range.inc:88
+#: ../lib/modules/range.inc:90
 msgid "Adds input fields for a new IP range."
 msgstr "为新IP范围增加输入域"
 
-#: ../lib/modules/fixed_ip.inc:88
+#: ../lib/modules/fixed_ip.inc:92
 msgid "Adds input fields for a new fixed IP address."
 msgstr "为新IP地址增加新输入域"
 
@@ -525,12 +531,12 @@ msgstr "为新IP地址增加新输入域"
 msgid "Administration"
 msgstr "管理者"
 
-#: ../lib/modules/posixGroup.inc:364
 #: ../lib/modules/groupOfNames.inc:93
+#: ../lib/modules/posixGroup.inc:401
 msgid "Administrators group"
 msgstr "管理员组"
 
-#: ../lib/modules/sambaSamAccount.inc:481
+#: ../lib/modules/sambaSamAccount.inc:501
 msgid "Alaska"
 msgstr "阿拉斯加"
 
@@ -539,15 +545,35 @@ msgstr "阿拉斯加"
 msgid "Algorithmic RID base is not a number!"
 msgstr "RID算法的基数不是一个数字!"
 
-#: ../lib/types/mailAlias.inc:82
+#: ../lib/modules/aliasEntry.inc:38
+msgid "Alias"
+msgstr "别名"
+
+#: ../lib/types/alias.inc:53
+msgid "Alias entries"
+msgstr "别名条目"
+
 #: ../lib/modules/nisMailAlias.inc:67
 #: ../lib/modules/nisMailAlias.inc:82
 #: ../lib/modules/nisMailAlias.inc:139
 #: ../lib/modules/nisMailAlias.inc:276
+#: ../lib/types/mailAlias.inc:82
 msgid "Alias name"
 msgstr "别名"
 
+#: ../lib/modules/uidObject.inc:52
+#: ../lib/modules/aliasEntry.inc:54
+#: ../lib/modules/aliasEntry.inc:62
+#: ../lib/modules/aliasEntry.inc:92
+#: ../lib/modules/aliasEntry.inc:109
+#: ../lib/modules/aliasEntry.inc:167
+#: ../lib/modules/aliasEntry.inc:242
+#: ../lib/types/alias.inc:83
+msgid "Aliased entry"
+msgstr "已有别名条目"
+
 #: ../templates/schema/schema.php:231
+#: ../lib/types/alias.inc:44
 msgid "Aliases"
 msgstr "别名"
 
@@ -556,7 +582,7 @@ msgstr "别名"
 msgid "All accounts (%s)"
 msgstr "所有帐号 %s:"
 
-#: ../templates/selfService/selfServiceMain.php:178
+#: ../templates/selfService/selfServiceMain.php:186
 #: ../templates/initsuff.php:160
 msgid "All changes were successful."
 msgstr "修改成功."
@@ -576,9 +602,9 @@ msgstr "所有选中的帐号(%s)"
 msgid "Allow machine password changes"
 msgstr "允许改变主机密码"
 
-#: ../lib/modules/sambaSamAccount.inc:283
-#: ../lib/modules/sambaSamAccount.inc:1305
-#: ../lib/modules/sambaSamAccount.inc:1669
+#: ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/sambaSamAccount.inc:1345
+#: ../lib/modules/sambaSamAccount.inc:1726
 msgid "Allow terminal server login"
 msgstr "允许终端服务登录"
 
@@ -590,20 +616,20 @@ msgstr "允许的主机"
 
 #: ../lib/modules/sambaAccount.inc:867
 #: ../lib/modules/sambaAccount.inc:868
-#: ../lib/modules/sambaSamAccount.inc:1162
-#: ../lib/modules/sambaSamAccount.inc:1163
+#: ../lib/modules/sambaSamAccount.inc:1202
+#: ../lib/modules/sambaSamAccount.inc:1203
 msgid "Allowed workstations"
 msgstr "允许的工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:496
+#: ../lib/modules/sambaSamAccount.inc:516
 msgid "Almaty, Dhaka, Colombo"
 msgstr "阿尔迈迪，达卡，科伦坡"
 
-#: ../lib/modules/kolabUser.inc:48
+#: ../lib/modules/kolabUser.inc:50
 msgid "Always accept"
 msgstr "总会接受"
 
-#: ../lib/modules/kolabUser.inc:49
+#: ../lib/modules/kolabUser.inc:51
 msgid "Always reject"
 msgstr "总是拒绝"
 
@@ -612,9 +638,9 @@ msgstr "总是拒绝"
 msgid "An attribute (%s) was modified and is highlighted below."
 msgstr "下面高亮的属性(%s)已经被修改."
 
-#: ../lib/modules/kolabUser.inc:352
-#: ../lib/modules/kolabUser.inc:797
-#: ../lib/modules/kolabUser.inc:899
+#: ../lib/modules/kolabUser.inc:324
+#: ../lib/modules/kolabUser.inc:782
+#: ../lib/modules/kolabUser.inc:884
 msgid "Anyone"
 msgstr "任何人"
 
@@ -622,11 +648,11 @@ msgstr "任何人"
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "确认永久删除这个对象?"
 
-#: ../lib/modules/sambaSamAccount.inc:486
+#: ../lib/modules/sambaSamAccount.inc:506
 msgid "Atlantic time (Canada), Caracas"
 msgstr "大西洋时间(加拿大),卡拉卡斯"
 
-#: ../lib/modules/ddns.inc:480
+#: ../lib/modules/ddns.inc:339
 msgid "Attention: The DHCP service needs to be restarted after changes in DDNS."
 msgstr "注意:如果DDNS发生改变,DHCP服务需要重启."
 
@@ -639,7 +665,7 @@ msgstr "属性"
 msgid "Attribute types"
 msgstr "属性类型"
 
-#: ../lib/modules/sambaSamAccount.inc:502
+#: ../lib/modules/sambaSamAccount.inc:522
 msgid "Auckland, Fiji, Kamchatka"
 msgstr "奥克兰,斐济,堪察加"
 
@@ -655,52 +681,52 @@ msgstr "可选组"
 msgid "Available modules"
 msgstr "可选模块"
 
-#: ../lib/modules/posixGroup.inc:246
+#: ../lib/modules/posixGroup.inc:260
 msgid "Available users"
 msgstr "可选用户"
 
 #: ../lib/modules/sambaAccount.inc:873
-#: ../lib/modules/sambaSamAccount.inc:1168
+#: ../lib/modules/sambaSamAccount.inc:1208
 msgid "Available workstations"
 msgstr "可选工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:489
+#: ../lib/modules/sambaSamAccount.inc:509
 msgid "Azores, Cape Verde Islands"
 msgstr "亚速尔,维德角岛"
 
-#: ../lib/modules/dhcp_settings.inc:98
+#: ../lib/modules/dhcp_settings.inc:96
 msgid "B-Node (0x01)"
 msgstr "B-节点 (0x01)"
 
 #: ../templates/tree/update_confirm.php:255
-#: ../lib/modules/posixGroup.inc:252
-#: ../lib/modules/posixGroup.inc:275
-#: ../lib/modules/sambaAccount.inc:878
-#: ../lib/modules/sambaSamAccount.inc:1172
-#: ../lib/modules/posixAccount.inc:1108
 #: ../lib/modules/inetOrgPerson.inc:1033
 #: ../lib/modules/groupOfNames.inc:352
+#: ../lib/modules/sambaAccount.inc:878
+#: ../lib/modules/posixGroup.inc:266
+#: ../lib/modules/posixGroup.inc:289
+#: ../lib/modules/posixAccount.inc:1108
+#: ../lib/modules/sambaSamAccount.inc:1212
 msgid "Back"
 msgstr "返回"
 
-#: ../templates/config/index.php:114
-#: ../templates/config/confmain.php:602
-#: ../templates/config/conflogin.php:153
-#: ../templates/config/mainlogin.php:138
-#: ../templates/selfService/adminLogin.php:150
-#: ../templates/selfService/adminMain.php:114
 #: ../templates/logout.php:78
+#: ../templates/selfService/adminMain.php:114
+#: ../templates/selfService/adminLogin.php:150
+#: ../templates/config/index.php:114
+#: ../templates/config/conflogin.php:153
+#: ../templates/config/confmain.php:602
+#: ../templates/config/mainlogin.php:138
 msgid "Back to Login"
 msgstr "返回到登录界面"
 
+#: ../templates/ou_edit.php:127
 #: ../templates/ou_edit.php:131
-#: ../templates/ou_edit.php:135
 msgid "Back to OU-Editor"
 msgstr "返回到OU编辑器"
 
+#: ../templates/pdfedit/pdfpage.php:106
 #: ../templates/pdfedit/pdfdelete.php:67
 #: ../templates/pdfedit/pdfdelete.php:75
-#: ../templates/pdfedit/pdfpage.php:106
 msgid "Back to PDF Editor"
 msgstr "返回到PDF编辑器"
 
@@ -721,22 +747,22 @@ msgstr "返回列表"
 msgid "Back to login"
 msgstr "返回到登录界面"
 
+#: ../templates/profedit/profilepage.php:126
 #: ../templates/profedit/profiledelete.php:67
 #: ../templates/profedit/profiledelete.php:75
-#: ../templates/profedit/profilepage.php:126
 msgid "Back to profile editor"
 msgstr "返回到配置文件编辑器"
 
-#: ../templates/config/profmanage.php:374
 #: ../templates/selfService/profManage.php:268
+#: ../templates/config/profmanage.php:374
 msgid "Back to profile login"
 msgstr "返回到配置文件登录"
 
-#: ../lib/modules/sambaSamAccount.inc:493
+#: ../lib/modules/sambaSamAccount.inc:513
 msgid "Baghdad, Riyadh, Moscow"
 msgstr "巴格达,利雅得,莫斯科"
 
-#: ../lib/modules/sambaSamAccount.inc:497
+#: ../lib/modules/sambaSamAccount.inc:517
 msgid "Bangkok, Hanoi, Jakarta"
 msgstr "曼谷,河内,安卡拉"
 
@@ -757,7 +783,7 @@ msgstr "基本模块"
 msgid "Beginning"
 msgstr "开始"
 
-#: ../lib/modules/sambaSamAccount.inc:498
+#: ../lib/modules/sambaSamAccount.inc:518
 msgid "Beijing, Perth, Singapore"
 msgstr "北京,佩斯,新加坡"
 
@@ -766,38 +792,38 @@ msgstr "北京,佩斯,新加坡"
 msgid "Binary value"
 msgstr "二进制值"
 
-#: ../lib/modules/quota.inc:47
+#: ../lib/modules/quota.inc:48
 msgid "Block hard quota"
 msgstr "块数硬性限额"
 
-#: ../lib/modules/quota.inc:47
 #: ../lib/modules/quota.inc:48
+#: ../lib/modules/quota.inc:49
 msgid "Block hard quota contains invalid characters. Only natural numbers are allowed."
 msgstr "块数硬性限额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:53
+#: ../lib/modules/quota.inc:54
 msgid "Block quota"
 msgstr "块数限额"
 
-#: ../lib/modules/quota.inc:45
+#: ../lib/modules/quota.inc:46
 msgid "Block soft quota"
 msgstr "块数软性限额"
 
-#: ../lib/modules/quota.inc:45
 #: ../lib/modules/quota.inc:46
+#: ../lib/modules/quota.inc:47
 msgid "Block soft quota contains invalid characters. Only natural numbers are allowed."
 msgstr "块数软性限额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:53
 #: ../lib/modules/quota.inc:54
+#: ../lib/modules/quota.inc:55
 msgid "Block soft quota must be smaller than block hard quota."
 msgstr "块数软性限额必须小于硬性限额."
 
-#: ../lib/modules/sambaSamAccount.inc:487
+#: ../lib/modules/sambaSamAccount.inc:507
 msgid "Brazil, Buenos Aires"
 msgstr "巴西,布宜诺斯艾利斯"
 
-#: ../lib/modules/sambaGroupMapping.inc:70
+#: ../lib/modules/sambaGroupMapping.inc:71
 msgid "Builtin group"
 msgstr "内置组"
 
@@ -813,7 +839,7 @@ msgstr "商业种类"
 msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 msgstr "商业种类(比如:行政部门,IT服务部门,管理部门,...)"
 
-#: ../templates/masscreate.php:137
+#: ../templates/masscreate.php:141
 msgid "CSV file:"
 msgstr "CSV 文件:"
 
@@ -831,56 +857,56 @@ msgstr "缓存超时非法"
 #: ../lib/modules/sambaAccount.inc:392
 #: ../lib/modules/sambaAccount.inc:398
 #: ../lib/modules/sambaAccount.inc:410
-#: ../lib/modules/sambaSamAccount.inc:238
-#: ../lib/modules/sambaSamAccount.inc:241
-#: ../lib/modules/sambaSamAccount.inc:244
-#: ../lib/modules/sambaSamAccount.inc:250
+#: ../lib/modules/sambaGroupMapping.inc:367
 #: ../lib/modules/posixAccount.inc:401
-#: ../lib/modules/sambaGroupMapping.inc:327
-#: ../lib/modules/shadowAccount.inc:159
-#: ../lib/modules/shadowAccount.inc:163
-#: ../lib/modules/shadowAccount.inc:167
-#: ../lib/modules/shadowAccount.inc:171
+#: ../lib/modules/sambaSamAccount.inc:255
+#: ../lib/modules/sambaSamAccount.inc:258
+#: ../lib/modules/sambaSamAccount.inc:261
+#: ../lib/modules/sambaSamAccount.inc:267
+#: ../lib/modules/shadowAccount.inc:170
+#: ../lib/modules/shadowAccount.inc:174
+#: ../lib/modules/shadowAccount.inc:178
+#: ../lib/modules/shadowAccount.inc:182
 msgid "Can be left empty."
 msgstr "可以置空"
 
-#: ../templates/tree/update_confirm.php:241
 #: ../templates/tree/delete_form.php:119
 #: ../templates/tree/delete_form.php:168
-#: ../templates/ou_edit.php:110
-#: ../templates/config/confmodules.php:116
-#: ../templates/config/confmain.php:457
-#: ../templates/config/conftypes.php:239
+#: ../templates/tree/update_confirm.php:241
 #: ../templates/selfService/adminMain.php:547
-#: ../templates/pdfedit/pdfdelete.php:97
 #: ../templates/pdfedit/pdfpage.php:708
-#: ../templates/pdfedit/pdfmain.php:156
+#: ../templates/pdfedit/pdfdelete.php:97
 #: ../templates/delete.php:117
+#: ../templates/ou_edit.php:108
+#: ../templates/profedit/profilepage.php:263
 #: ../templates/profedit/profiledelete.php:86
-#: ../templates/profedit/profilepage.php:262
-#: ../templates/profedit/profilemain.php:169
+#: ../templates/config/conftypes.php:239
+#: ../templates/config/confmain.php:457
+#: ../templates/config/confmodules.php:116
 #: ../templates/initsuff.php:193
-#: ../lib/modules/sambaSamAccount.inc:1237
-#: ../lib/modules/sambaSamAccount.inc:1285
-#: ../lib/modules/sambaSamAccount.inc:1408
-#: ../lib/modules/posixAccount.inc:1137
-#: ../lib/modules/kolabUser.inc:589
-#: ../lib/modules/phpGroupwareUser.inc:248
-#: ../lib/modules/shadowAccount.inc:357
 #: ../lib/modules/inetOrgPerson.inc:996
 #: ../lib/modules/groupOfNames.inc:231
 #: ../lib/modules/groupOfNames.inc:258
 #: ../lib/modules/groupOfNames.inc:311
+#: ../lib/modules/posixAccount.inc:1137
+#: ../lib/modules/kolabUser.inc:572
+#: ../lib/modules/sambaSamAccount.inc:1277
+#: ../lib/modules/sambaSamAccount.inc:1325
+#: ../lib/modules/sambaSamAccount.inc:1448
+#: ../lib/modules/shadowAccount.inc:385
+#: ../lib/modules/phpGroupwareUser.inc:248
+#: ../lib/modules/aliasEntry.inc:147
+#: ../lib/modules/aliasEntry.inc:173
 #: ../lib/lists.inc:667
 #: ../lib/lists.inc:898
 msgid "Cancel"
 msgstr "取消"
 
-#: ../templates/login.php:437
-#: ../templates/login.php:442
 #: ../templates/selfService/selfServiceLogin.php:111
 #: ../templates/selfService/selfServiceLogin.php:115
 #: ../templates/selfService/selfServiceMain.php:86
+#: ../templates/login.php:437
+#: ../templates/login.php:442
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "无法连接指定的LDAP服务器,请再试一次."
 
@@ -902,31 +928,32 @@ msgstr "标题和标签"
 msgid "Car license"
 msgstr "汽车执照"
 
-#: ../lib/modules/sambaSamAccount.inc:491
+#: ../lib/modules/sambaSamAccount.inc:511
 msgid "Central Europe Time, Paris, Berlin"
 msgstr "欧洲中央时间,巴黎,柏林"
 
-#: ../lib/modules/sambaSamAccount.inc:484
+#: ../lib/modules/sambaSamAccount.inc:504
 msgid "Central Time (US & Canada), Mexico City"
 msgstr "中央时间(美国和加拿大),墨西哥市 "
 
 #: ../templates/selfService/adminMain.php:409
 #: ../templates/pdfedit/pdfpage.php:453
 #: ../templates/pdfedit/pdfpage.php:459
-#: ../lib/modules/sambaSamAccount.inc:998
-#: ../lib/modules/sambaSamAccount.inc:1015
-#: ../lib/modules/sambaSamAccount.inc:1032
-#: ../lib/modules/sambaSamAccount.inc:1281
-#: ../lib/modules/phpGroupwareUser.inc:145
-#: ../lib/modules/phpGroupwareUser.inc:244
-#: ../lib/modules/shadowAccount.inc:302
-#: ../lib/modules/shadowAccount.inc:353
 #: ../lib/modules/groupOfNames.inc:157
 #: ../lib/modules/groupOfNames.inc:174
+#: ../lib/modules/sambaSamAccount.inc:1038
+#: ../lib/modules/sambaSamAccount.inc:1055
+#: ../lib/modules/sambaSamAccount.inc:1072
+#: ../lib/modules/sambaSamAccount.inc:1321
+#: ../lib/modules/shadowAccount.inc:324
+#: ../lib/modules/shadowAccount.inc:381
+#: ../lib/modules/phpGroupwareUser.inc:145
+#: ../lib/modules/phpGroupwareUser.inc:244
+#: ../lib/modules/aliasEntry.inc:100
 msgid "Change"
 msgstr "更改"
 
-#: ../lib/modules/posixGroup.inc:198
+#: ../lib/modules/posixGroup.inc:212
 msgid "Change GID number of users and hosts"
 msgstr "更改用户和主机的GID号"
 
@@ -944,13 +971,13 @@ msgstr "改变列表设置"
 msgid "Change master password"
 msgstr "更改管理员密码"
 
-#: ../templates/lists/changePassword.php:118
-#: ../templates/lists/changePassword.php:190
-#: ../templates/lists/changePassword.php:217
-#: ../lib/types/user.inc:234
-#: ../lib/modules/posixGroup.inc:188
-#: ../lib/modules/posixAccount.inc:1043
+#: ../templates/lists/changePassword.php:121
+#: ../templates/lists/changePassword.php:193
+#: ../templates/lists/changePassword.php:220
 #: ../lib/modules/inetOrgPerson.inc:767
+#: ../lib/modules/posixGroup.inc:202
+#: ../lib/modules/posixAccount.inc:1043
+#: ../lib/types/user.inc:234
 #: ../help/help.inc:99
 msgid "Change password"
 msgstr "更改密码"
@@ -989,7 +1016,7 @@ msgstr "检查LDAP的架构是否符合选中的帐号模块需求"
 msgid "Check quotas"
 msgstr "检查限额"
 
-#: ../templates/masscreate.php:128
+#: ../templates/masscreate.php:132
 msgid "Check your input carefully. LAM will only do some basic checks on the upload data."
 msgstr "请仔细检查输入,上传前程序仅做基本检查."
 
@@ -1006,9 +1033,9 @@ msgstr "选择一个模板"
 msgid "Click here if you are not directed to the next page."
 msgstr "如果没有自动跳转到下一页请点此处."
 
-#: ../lib/modules/sambaSamAccount.inc:310
-#: ../lib/modules/sambaSamAccount.inc:1371
-#: ../lib/modules/sambaSamAccount.inc:1697
+#: ../lib/modules/sambaSamAccount.inc:327
+#: ../lib/modules/sambaSamAccount.inc:1411
+#: ../lib/modules/sambaSamAccount.inc:1754
 msgid "Client printer is default"
 msgstr "缺省为客户打印机"
 
@@ -1016,12 +1043,12 @@ msgstr "缺省为客户打印机"
 msgid "Collective"
 msgstr "集合(Collective)"
 
-#: ../templates/masscreate.php:147
+#: ../templates/masscreate.php:151
 msgid "Columns:"
 msgstr "列:"
 
 #: ../lib/modules/sambaAccount.inc:398
-#: ../lib/modules/sambaSamAccount.inc:250
+#: ../lib/modules/sambaSamAccount.inc:267
 msgid "Comma separated list of Samba workstations the user is allowed to login. Empty means every workstation."
 msgstr "用户可以登录的Samba工作站,用逗号分隔,空值表示所有工作站."
 
@@ -1029,17 +1056,17 @@ msgstr "用户可以登录的Samba工作站,用逗号分隔,空值表示所有
 msgid "Commit"
 msgstr "提交"
 
+#: ../lib/modules/inetOrgPerson.inc:97
+#: ../lib/modules/inetOrgPerson.inc:328
+#: ../lib/modules/inetOrgPerson.inc:446
+#: ../lib/modules/inetOrgPerson.inc:735
+#: ../lib/modules/inetOrgPerson.inc:1061
 #: ../lib/modules/posixAccount.inc:92
 #: ../lib/modules/posixAccount.inc:205
 #: ../lib/modules/posixAccount.inc:404
 #: ../lib/modules/posixAccount.inc:426
 #: ../lib/modules/posixAccount.inc:970
 #: ../lib/modules/posixAccount.inc:1243
-#: ../lib/modules/inetOrgPerson.inc:97
-#: ../lib/modules/inetOrgPerson.inc:328
-#: ../lib/modules/inetOrgPerson.inc:446
-#: ../lib/modules/inetOrgPerson.inc:735
-#: ../lib/modules/inetOrgPerson.inc:1061
 msgid "Common name"
 msgstr "全名"
 
@@ -1069,25 +1096,25 @@ msgstr "配置向导"
 msgid "Conflicting module:"
 msgstr "冲突的模块:"
 
-#: ../lib/modules/sambaSamAccount.inc:304
-#: ../lib/modules/sambaSamAccount.inc:1361
-#: ../lib/modules/sambaSamAccount.inc:1687
+#: ../lib/modules/sambaSamAccount.inc:321
+#: ../lib/modules/sambaSamAccount.inc:1401
+#: ../lib/modules/sambaSamAccount.inc:1744
 msgid "Connect client drives"
 msgstr "连接客户驱动器"
 
-#: ../lib/modules/sambaSamAccount.inc:307
-#: ../lib/modules/sambaSamAccount.inc:1366
-#: ../lib/modules/sambaSamAccount.inc:1692
+#: ../lib/modules/sambaSamAccount.inc:324
+#: ../lib/modules/sambaSamAccount.inc:1406
+#: ../lib/modules/sambaSamAccount.inc:1749
 msgid "Connect client printers"
 msgstr "连接客户打印机"
 
-#: ../lib/modules/sambaSamAccount.inc:1346
-#: ../lib/modules/sambaSamAccount.inc:1680
+#: ../lib/modules/sambaSamAccount.inc:1386
+#: ../lib/modules/sambaSamAccount.inc:1737
 msgid "Connection time limit"
 msgstr "连接时间限制"
 
-#: ../templates/tree/templates/creation/custom.php:66
 #: ../templates/tree/templates/creation/new_ou_template.php:105
+#: ../templates/tree/templates/creation/custom.php:66
 msgid "Container"
 msgstr "容器"
 
@@ -1099,8 +1126,8 @@ msgstr "容器的DN"
 msgid "Could not perform ldap_modify operation."
 msgstr "无法执行ldap_modify命令"
 
-#: ../templates/config/profmanage.php:100
 #: ../templates/selfService/profManage.php:86
+#: ../templates/config/profmanage.php:100
 msgid "Could not rename file!"
 msgstr "不能更改文件名"
 
@@ -1108,21 +1135,23 @@ msgstr "不能更改文件名"
 msgid "Could not save PDF profile, access denied."
 msgstr "无法保存PDF文件,存取拒绝."
 
-#: ../lib/modules/kolabUser.inc:89
-#: ../lib/modules/kolabUser.inc:169
-#: ../lib/modules/kolabUser.inc:198
-#: ../lib/modules/kolabUser.inc:312
-#: ../lib/modules/kolabUser.inc:773
+#: ../lib/modules/kolabUser.inc:90
+#: ../lib/modules/kolabUser.inc:159
+#: ../lib/modules/kolabUser.inc:188
+#: ../lib/modules/kolabUser.inc:284
+#: ../lib/modules/kolabUser.inc:758
 msgid "Country"
 msgstr "国家"
 
-#: ../lib/modules/kolabUser.inc:249
-#: ../lib/modules/kolabUser.inc:250
+#: ../lib/modules/kolabUser.inc:239
+#: ../lib/modules/kolabUser.inc:240
 msgid "Country name is invalid!"
 msgstr "国家名称非法!"
 
-#: ../templates/tree/templates/creation/custom.php:234
 #: ../templates/tree/templates/creation/new_ou_template.php:107
+#: ../templates/tree/templates/creation/custom.php:234
+#: ../templates/pdfedit/pdfmain.php:134
+#: ../templates/profedit/profilemain.php:127
 #: ../templates/initsuff.php:192
 msgid "Create"
 msgstr "建立"
@@ -1132,18 +1161,18 @@ msgstr "建立"
 msgid "Create Object"
 msgstr "对立对象"
 
+#: ../lib/modules.inc:1223
 #: ../lib/lists.inc:469
 #: ../lib/lists.inc:631
-#: ../lib/modules.inc:1223
 #: ../help/help.inc:155
 msgid "Create PDF file"
 msgstr "建立PDF文件"
 
-#: ../templates/pdfedit/pdfmain.php:123
-msgid "Create a new PDF structure for scope: "
-msgstr "为此范围建立新的PDF架构:"
+#: ../templates/pdfedit/pdfmain.php:125
+msgid "Create a new PDF structure"
+msgstr "建立新的PDF架构"
 
-#: ../templates/profedit/profilemain.php:131
+#: ../templates/profedit/profilemain.php:116
 msgid "Create a new profile"
 msgstr "建立新的配置文件"
 
@@ -1161,10 +1190,10 @@ msgstr "建立"
 msgid "Create home directory"
 msgstr "建立主目录"
 
-#: ../templates/tree/edit.php:128
 #: ../templates/tree/tree.php:189
 #: ../templates/tree/tree.php:191
 #: ../templates/tree/tree.php:192
+#: ../templates/tree/edit.php:128
 #: ../lib/tree.inc:92
 #: ../lib/tree.inc:93
 #: ../lib/tree.inc:157
@@ -1173,8 +1202,8 @@ msgstr "建立主目录"
 msgid "Create new entry"
 msgstr "新建条目"
 
-#: ../templates/config/profmanage.php:85
 #: ../templates/selfService/profManage.php:69
+#: ../templates/config/profmanage.php:85
 msgid "Created new profile."
 msgstr "新增配置文件"
 
@@ -1190,11 +1219,11 @@ msgstr "当前属性所有值: "
 msgid "Custom"
 msgstr "自定义"
 
-#: ../lib/modules/ddns.inc:50
+#: ../lib/modules/ddns.inc:65
 msgid "DDNS"
 msgstr "DDNS"
 
-#: ../lib/modules/ddns.inc:456
+#: ../lib/modules/ddns.inc:309
 msgid "DDNS ist not activated. You can activate it in the DHCP settings (DDNS)."
 msgstr "DDNS没有激活.可以DHCP设置中激活(DDNS)"
 
@@ -1206,39 +1235,40 @@ msgstr "DHCP"
 msgid "DHCP administration"
 msgstr "DHCP管理者"
 
+#: ../lib/modules/dhcp_settings.inc:111
 #: ../lib/types/dhcp.inc:115
-#: ../lib/modules/dhcp_settings.inc:113
 msgid "DHCP settings"
 msgstr "DHCP 设置"
 
-#: ../templates/tree/edit.php:92
 #: ../templates/tree/add_value_form.php:99
-#: ../templates/tree/add_oclass_form.php:124
-#: ../templates/tree/update_confirm.php:79
-#: ../templates/tree/add_attr_form.php:73
 #: ../templates/tree/delete_form.php:77
 #: ../templates/tree/delete_form.php:151
+#: ../templates/tree/update_confirm.php:79
+#: ../templates/tree/add_oclass_form.php:124
+#: ../templates/tree/add_attr_form.php:73
+#: ../templates/tree/edit.php:92
 #: ../templates/delete.php:95
 #: ../lib/modules.inc:1308
 #: ../lib/modules.inc:1748
 msgid "DN"
 msgstr "DN"
 
-#: ../templates/masscreate.php:150
+#: ../templates/masscreate.php:154
 msgid "DN settings"
 msgstr "DN 设置"
 
-#: ../templates/masscreate.php:154
+#: ../templates/masscreate.php:158
 #: ../help/help.inc:149
 msgid "DN suffix"
 msgstr "DN 后缀"
 
-#: ../lib/modules/dhcp_settings.inc:722
-#: ../lib/modules/dhcp_settings.inc:798
+#: ../lib/modules/dhcp_settings.inc:206
+#: ../lib/modules/dhcp_settings.inc:681
+#: ../lib/modules/dhcp_settings.inc:777
 msgid "DNS"
 msgstr "DNS"
 
-#: ../lib/modules/dhcp_settings.inc:141
+#: ../lib/modules/dhcp_settings.inc:139
 msgid "DNS (Domain Name System)"
 msgstr "DNS(域名解析系统)"
 
@@ -1252,22 +1282,23 @@ msgid "Data field for RDN is empty!"
 msgstr "RDN数据文件是空的"
 
 #: ../lib/modules/sambaAccount.inc:378
-#: ../lib/modules/sambaSamAccount.inc:230
+#: ../lib/modules/sambaSamAccount.inc:247
 msgid "Date after the user is able to change his password. Format: DD-MM-YYYY"
 msgstr "在这个日期后,用户才可以修改密码,格式:DD-MM-YYYY"
 
 #: ../lib/modules/sambaAccount.inc:380
-#: ../lib/modules/sambaSamAccount.inc:232
+#: ../lib/modules/sambaSamAccount.inc:249
 msgid "Date after the user must change his password. Format: DD-MM-YYYY"
 msgstr "在这个日期之前,用户必须修改密码,格式:DD-MM-YYYY"
 
-#: ../lib/modules/shadowAccount.inc:159
+#: ../lib/modules/shadowAccount.inc:170
 msgid "Days before password is to expire that user is warned of pending password expiration. If set value must be >0."
 msgstr "在密码过期前提醒用户的天数,若设其值,必大于0."
 
-#: ../lib/modules/dhcp_settings.inc:144
-#: ../lib/modules/dhcp_settings.inc:728
-#: ../lib/modules/dhcp_settings.inc:804
+#: ../lib/modules/dhcp_settings.inc:142
+#: ../lib/modules/dhcp_settings.inc:211
+#: ../lib/modules/dhcp_settings.inc:687
+#: ../lib/modules/dhcp_settings.inc:778
 msgid "Default gateway"
 msgstr "缺省网关"
 
@@ -1276,8 +1307,8 @@ msgstr "缺省网关"
 msgid "Default language"
 msgstr "缺省语言"
 
-#: ../templates/masscreate.php:163
-#: ../templates/masscreate.php:325
+#: ../templates/masscreate.php:167
+#: ../templates/masscreate.php:329
 msgid "Default value"
 msgstr "缺省值"
 
@@ -1285,28 +1316,30 @@ msgstr "缺省值"
 msgid "Defines if workstations may change their passwords."
 msgstr "定义工作站是否更改密码."
 
-#: ../lib/modules/kolabUser.inc:128
-#: ../lib/modules/kolabUser.inc:153
-#: ../lib/modules/kolabUser.inc:157
-#: ../lib/modules/kolabUser.inc:217
-#: ../lib/modules/kolabUser.inc:416
-#: ../lib/modules/kolabUser.inc:811
-#: ../lib/modules/kolabUser.inc:881
+#: ../lib/modules/kolabUser.inc:129
+#: ../lib/modules/kolabUser.inc:143
+#: ../lib/modules/kolabUser.inc:147
+#: ../lib/modules/kolabUser.inc:207
+#: ../lib/modules/kolabUser.inc:388
+#: ../lib/modules/kolabUser.inc:796
+#: ../lib/modules/kolabUser.inc:866
 msgid "Delegates"
 msgstr "代理(Delegates)"
 
-#: ../lib/modules/kolabUser.inc:254
+#: ../lib/modules/kolabUser.inc:244
 msgid "Delegates has invalid format!"
 msgstr "代理(Delegates)格式错误"
 
-#: ../templates/tree/edit.php:115
 #: ../templates/tree/delete_form.php:159
-#: ../templates/ou_edit.php:109
+#: ../templates/tree/edit.php:115
 #: ../templates/pdfedit/pdfdelete.php:96
+#: ../templates/pdfedit/pdfmain.php:168
 #: ../templates/delete.php:116
-#: ../lib/tree.inc:1178
-#: ../lib/modules/kolabUser.inc:872
+#: ../templates/ou_edit.php:107
+#: ../templates/profedit/profilemain.php:158
+#: ../lib/modules/kolabUser.inc:857
 #: ../lib/lists.inc:465
+#: ../lib/tree.inc:1178
 msgid "Delete"
 msgstr "删除"
 
@@ -1319,22 +1352,22 @@ msgstr "删除 %s"
 msgid "Delete DHCP(s)"
 msgstr "删除DHCP"
 
-#: ../lib/modules/fixed_ip.inc:84
-#: ../lib/modules/fixed_ip.inc:405
-#: ../lib/modules/fixed_ip.inc:406
+#: ../lib/modules/fixed_ip.inc:88
+#: ../lib/modules/fixed_ip.inc:413
+#: ../lib/modules/fixed_ip.inc:414
 msgid "Delete IP"
 msgstr "删除IP"
 
-#: ../lib/modules/kolabUser.inc:425
+#: ../lib/modules/kolabUser.inc:397
 msgid "Delete Kolab account"
 msgstr "删除Kolab帐号"
 
 #: ../templates/pdfedit/pdfdelete.php:53
-#: ../templates/pdfedit/pdfmain.php:145
 msgid "Delete PDF structure"
 msgstr "删除PDF结构"
 
 #: ../lib/types/mailAlias.inc:111
+#: ../lib/types/alias.inc:111
 msgid "Delete alias(es)"
 msgstr "删除别名"
 
@@ -1347,8 +1380,8 @@ msgstr "删除全部 %s 个对象"
 msgid "Delete domain(s)"
 msgstr "删除域"
 
-#: ../lib/types/gon.inc:113
 #: ../lib/types/group.inc:125
+#: ../lib/types/gon.inc:113
 msgid "Delete group(s)"
 msgstr "删除组"
 
@@ -1369,7 +1402,7 @@ msgstr "删除对象"
 msgid "Delete operation canceled."
 msgstr "取消删除动作"
 
-#: ../templates/ou_edit.php:183
+#: ../templates/ou_edit.php:189
 #: ../help/help.inc:189
 msgid "Delete organizational unit"
 msgstr "删除组织单元"
@@ -1378,16 +1411,15 @@ msgstr "删除组织单元"
 msgid "Delete photo"
 msgstr "删除照片"
 
-#: ../templates/config/profmanage.php:255
 #: ../templates/selfService/profManage.php:228
 #: ../templates/profedit/profiledelete.php:56
-#: ../templates/profedit/profilemain.php:157
+#: ../templates/config/profmanage.php:255
 #: ../help/help.inc:118
 msgid "Delete profile"
 msgstr "删除配置文件"
 
-#: ../lib/modules/range.inc:84
-#: ../lib/modules/range.inc:99
+#: ../lib/modules/range.inc:86
+#: ../lib/modules/range.inc:101
 #: ../lib/modules/range.inc:441
 #: ../lib/modules/range.inc:442
 msgid "Delete range"
@@ -1406,7 +1438,7 @@ msgstr "删除的DN: %s"
 msgid "Deleted PDF structure:"
 msgstr "删除的PDF结构:"
 
-#: ../lib/modules/sambaGroupMapping.inc:71
+#: ../lib/modules/sambaGroupMapping.inc:72
 msgid "Deleted account"
 msgstr "已删除的帐号"
 
@@ -1414,11 +1446,11 @@ msgstr "已删除的帐号"
 msgid "Deleted profile:"
 msgstr "已删除的配置文件:"
 
-#: ../lib/modules/fixed_ip.inc:85
+#: ../lib/modules/fixed_ip.inc:89
 msgid "Deletes a fixed IP address."
 msgstr "删除一个固定的IP地址."
 
-#: ../lib/modules/range.inc:85
+#: ../lib/modules/range.inc:87
 msgid "Deletes an IP range."
 msgstr "删除一个IP范围"
 
@@ -1433,23 +1465,15 @@ msgstr "正在删除%s"
 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
+#: ../templates/tree/add_value_form.php:186
 #: ../lib/modules/account.inc:88
 #: ../lib/modules/account.inc:98
 #: ../lib/modules/account.inc:122
 #: ../lib/modules/account.inc:226
 #: ../lib/modules/account.inc:240
-#: ../lib/modules/posixGroup.inc:164
-#: ../lib/modules/posixGroup.inc:390
-#: ../lib/modules/posixGroup.inc:452
-#: ../lib/modules/sambaAccount.inc:898
-#: ../lib/modules/posixAccount.inc:310
-#: ../lib/modules/posixAccount.inc:422
-#: ../lib/modules/sambaGroupMapping.inc:349
 #: ../lib/modules/inetOrgPerson.inc:209
 #: ../lib/modules/inetOrgPerson.inc:390
 #: ../lib/modules/inetOrgPerson.inc:743
@@ -1458,15 +1482,23 @@ msgstr "正在删除,请稍等..."
 #: ../lib/modules/groupOfNames.inc:91
 #: ../lib/modules/groupOfNames.inc:143
 #: ../lib/modules/groupOfNames.inc:443
+#: ../lib/modules/sambaAccount.inc:898
+#: ../lib/modules/sambaGroupMapping.inc:389
+#: ../lib/modules/posixGroup.inc:177
+#: ../lib/modules/posixGroup.inc:412
+#: ../lib/modules/posixGroup.inc:478
+#: ../lib/modules/posixAccount.inc:310
+#: ../lib/modules/posixAccount.inc:422
+#: ../lib/types/user.inc:92
 msgid "Description"
 msgstr "描述"
 
-#: ../lib/modules/ddns.inc:70
-#: ../lib/modules/ddns.inc:440
+#: ../lib/modules/ddns.inc:87
+#: ../lib/modules/ddns.inc:297
 msgid "Disable client updates"
 msgstr "禁止客户端更新"
 
-#: ../lib/modules/ddns.inc:71
+#: ../lib/modules/ddns.inc:88
 msgid "Disables the client to update DNS entries."
 msgstr "禁止客户端更新DNS条目."
 
@@ -1476,8 +1508,8 @@ msgstr "禁止客户端更新DNS条目."
 msgid "Disconnect users outside logon hours"
 msgstr "切断连接前用户登录小时数"
 
-#: ../lib/modules/sambaSamAccount.inc:1351
-#: ../lib/modules/sambaSamAccount.inc:1681
+#: ../lib/modules/sambaSamAccount.inc:1391
+#: ../lib/modules/sambaSamAccount.inc:1738
 msgid "Disconnection time limit"
 msgstr "断开连接时间限制"
 
@@ -1490,14 +1522,14 @@ msgstr "如果用户登录限制时间到则断开连接."
 #: ../lib/modules/sambaAccount.inc:344
 #: ../lib/modules/sambaAccount.inc:728
 #: ../lib/modules/sambaAccount.inc:891
-#: ../lib/modules/sambaSamAccount.inc:98
-#: ../lib/modules/sambaSamAccount.inc:193
-#: ../lib/modules/sambaSamAccount.inc:339
-#: ../lib/modules/sambaSamAccount.inc:944
-#: ../lib/modules/sambaSamAccount.inc:1638
-#: ../lib/modules/sambaGroupMapping.inc:197
-#: ../lib/modules/sambaGroupMapping.inc:314
-#: ../lib/modules/sambaGroupMapping.inc:347
+#: ../lib/modules/sambaGroupMapping.inc:235
+#: ../lib/modules/sambaGroupMapping.inc:354
+#: ../lib/modules/sambaGroupMapping.inc:387
+#: ../lib/modules/sambaSamAccount.inc:100
+#: ../lib/modules/sambaSamAccount.inc:207
+#: ../lib/modules/sambaSamAccount.inc:359
+#: ../lib/modules/sambaSamAccount.inc:979
+#: ../lib/modules/sambaSamAccount.inc:1695
 msgid "Display name"
 msgstr "显示名"
 
@@ -1505,7 +1537,7 @@ msgstr "显示名"
 msgid "Displayed account numbers start at \"0\". Add 2 to get the row in your spreadsheet."
 msgstr "显示的帐号数以\"0\"开始,加2才是您的电子表格的行数."
 
-#: ../templates/ou_edit.php:102
+#: ../templates/ou_edit.php:101
 msgid "Do you really want to delete this OU?"
 msgstr "确认删除这个OU?"
 
@@ -1517,7 +1549,7 @@ msgstr "确认删除这个PDF结构?"
 msgid "Do you really want to delete this profile?"
 msgstr "确认删除这个配置文件?"
 
-#: ../lib/modules/kolabUser.inc:584
+#: ../lib/modules/kolabUser.inc:567
 msgid "Do you really want to mark this account for deletion?"
 msgstr "确认将此帐号打上删除标记?"
 
@@ -1535,88 +1567,89 @@ msgstr "确认如下更改?"
 #: ../lib/modules/sambaAccount.inc:409
 #: ../lib/modules/sambaAccount.inc:839
 #: ../lib/modules/sambaAccount.inc:897
-#: ../lib/modules/sambaSamAccount.inc:268
-#: ../lib/modules/sambaSamAccount.inc:332
-#: ../lib/modules/sambaSamAccount.inc:458
-#: ../lib/modules/sambaSamAccount.inc:1113
-#: ../lib/modules/sambaSamAccount.inc:1500
-#: ../lib/modules/sambaSamAccount.inc:1530
-#: ../lib/modules/sambaSamAccount.inc:1656
-#: ../lib/modules/sambaGroupMapping.inc:68
-#: ../lib/modules/sambaGroupMapping.inc:232
-#: ../lib/modules/sambaGroupMapping.inc:326
-#: ../lib/modules/sambaGroupMapping.inc:369
+#: ../lib/modules/sambaGroupMapping.inc:69
+#: ../lib/modules/sambaGroupMapping.inc:272
+#: ../lib/modules/sambaGroupMapping.inc:366
+#: ../lib/modules/sambaGroupMapping.inc:409
+#: ../lib/modules/sambaSamAccount.inc:285
+#: ../lib/modules/sambaSamAccount.inc:352
+#: ../lib/modules/sambaSamAccount.inc:478
+#: ../lib/modules/sambaSamAccount.inc:1153
+#: ../lib/modules/sambaSamAccount.inc:1550
+#: ../lib/modules/sambaSamAccount.inc:1580
+#: ../lib/modules/sambaSamAccount.inc:1713
 msgid "Domain"
 msgstr "域"
 
-#: ../lib/types/smbDomain.inc:82
 #: ../lib/modules/sambaDomain.inc:74
 #: ../lib/modules/sambaDomain.inc:144
 #: ../lib/modules/sambaDomain.inc:231
 #: ../lib/modules/sambaDomain.inc:237
 #: ../lib/modules/sambaDomain.inc:636
+#: ../lib/types/smbDomain.inc:82
 msgid "Domain SID"
 msgstr "域SID"
 
-#: ../lib/modules/sambaGroupMapping.inc:293
+#: ../lib/modules/sambaGroupMapping.inc:333
 msgid "Domain administrators"
 msgstr "域管理员"
 
 #: ../lib/modules/sambaAccount.inc:48
 #: ../lib/modules/sambaAccount.inc:320
-#: ../lib/modules/sambaSamAccount.inc:69
-#: ../lib/modules/sambaGroupMapping.inc:55
-#: ../lib/modules/sambaGroupMapping.inc:299
+#: ../lib/modules/sambaGroupMapping.inc:56
+#: ../lib/modules/sambaGroupMapping.inc:339
+#: ../lib/modules/sambaSamAccount.inc:71
 msgid "Domain admins"
 msgstr "域管理员"
 
 #: ../lib/modules/sambaAccount.inc:50
-#: ../lib/modules/sambaSamAccount.inc:70
-#: ../lib/modules/sambaGroupMapping.inc:60
+#: ../lib/modules/sambaGroupMapping.inc:61
+#: ../lib/modules/sambaSamAccount.inc:72
 msgid "Domain certificate admins"
 msgstr "域认证管理员"
 
 #: ../lib/modules/sambaAccount.inc:49
 #: ../lib/modules/sambaAccount.inc:570
-#: ../lib/modules/sambaSamAccount.inc:70
-#: ../lib/modules/sambaSamAccount.inc:646
-#: ../lib/modules/sambaGroupMapping.inc:58
+#: ../lib/modules/sambaGroupMapping.inc:59
+#: ../lib/modules/sambaSamAccount.inc:72
+#: ../lib/modules/sambaSamAccount.inc:675
 msgid "Domain computers"
 msgstr "域内计算机"
 
 #: ../lib/modules/sambaAccount.inc:50
-#: ../lib/modules/sambaSamAccount.inc:70
-#: ../lib/modules/sambaGroupMapping.inc:59
+#: ../lib/modules/sambaGroupMapping.inc:60
+#: ../lib/modules/sambaSamAccount.inc:72
 msgid "Domain controllers"
 msgstr "域控制器"
 
 #: ../lib/modules/sambaAccount.inc:51
-#: ../lib/modules/sambaSamAccount.inc:71
-#: ../lib/modules/sambaGroupMapping.inc:62
+#: ../lib/modules/sambaGroupMapping.inc:63
+#: ../lib/modules/sambaSamAccount.inc:73
 msgid "Domain enterprise admins"
 msgstr "域企业管理员"
 
-#: ../lib/modules/sambaGroupMapping.inc:67
-#: ../lib/modules/sambaGroupMapping.inc:222
+#: ../lib/modules/sambaGroupMapping.inc:68
+#: ../lib/modules/sambaGroupMapping.inc:260
 msgid "Domain group"
 msgstr "域内组"
 
 #: ../lib/modules/sambaAccount.inc:49
-#: ../lib/modules/sambaSamAccount.inc:69
-#: ../lib/modules/sambaGroupMapping.inc:57
+#: ../lib/modules/sambaGroupMapping.inc:58
+#: ../lib/modules/sambaSamAccount.inc:71
 msgid "Domain guests"
 msgstr "域内来宾"
 
-#: ../lib/types/smbDomain.inc:83
-#: ../lib/modules/dhcp_settings.inc:129
-#: ../lib/modules/dhcp_settings.inc:704
-#: ../lib/modules/dhcp_settings.inc:780
+#: ../lib/modules/dhcp_settings.inc:127
+#: ../lib/modules/dhcp_settings.inc:191
+#: ../lib/modules/dhcp_settings.inc:663
+#: ../lib/modules/dhcp_settings.inc:774
 #: ../lib/modules/sambaAccount.inc:72
 #: ../lib/modules/sambaDomain.inc:70
 #: ../lib/modules/sambaDomain.inc:137
 #: ../lib/modules/sambaDomain.inc:218
 #: ../lib/modules/sambaDomain.inc:224
 #: ../lib/modules/sambaDomain.inc:633
+#: ../lib/types/smbDomain.inc:83
 msgid "Domain name"
 msgstr "域名"
 
@@ -1631,21 +1664,21 @@ msgid "Domain name is invalid!"
 msgstr "域名非法!"
 
 #: ../lib/modules/sambaAccount.inc:52
-#: ../lib/modules/sambaSamAccount.inc:71
-#: ../lib/modules/sambaGroupMapping.inc:63
+#: ../lib/modules/sambaGroupMapping.inc:64
+#: ../lib/modules/sambaSamAccount.inc:73
 msgid "Domain policy admins"
 msgstr "域策略管理员"
 
 #: ../lib/modules/sambaAccount.inc:51
-#: ../lib/modules/sambaSamAccount.inc:71
-#: ../lib/modules/sambaGroupMapping.inc:61
+#: ../lib/modules/sambaGroupMapping.inc:62
+#: ../lib/modules/sambaSamAccount.inc:73
 msgid "Domain schema admins"
 msgstr "域架构管理员"
 
 #: ../lib/modules/sambaAccount.inc:48
-#: ../lib/modules/sambaSamAccount.inc:69
-#: ../lib/modules/sambaSamAccount.inc:1982
-#: ../lib/modules/sambaGroupMapping.inc:56
+#: ../lib/modules/sambaGroupMapping.inc:57
+#: ../lib/modules/sambaSamAccount.inc:71
+#: ../lib/modules/sambaSamAccount.inc:2039
 msgid "Domain users"
 msgstr "域内用户"
 
@@ -1657,7 +1690,7 @@ msgstr "捐赠"
 msgid "Down"
 msgstr "向下"
 
-#: ../templates/masscreate.php:280
+#: ../templates/masscreate.php:284
 msgid "Download sample CSV file"
 msgstr "下载CSV示例文件"
 
@@ -1669,60 +1702,58 @@ msgstr "Windows分配给用户个人目录的网络驱动器号."
 msgid "E-Mail"
 msgstr "电子邮件"
 
-#: ../lib/modules/kolabUser.inc:161
+#: ../lib/modules/kolabUser.inc:151
 msgid "EMail alias"
 msgstr "电子邮件别名"
 
-#: ../lib/modules/kolabUser.inc:162
+#: ../lib/modules/kolabUser.inc:152
 msgid "EMail alias for this account."
 msgstr "此帐号的电子邮件别名"
 
-#: ../lib/modules/kolabUser.inc:247
+#: ../lib/modules/kolabUser.inc:237
 msgid "EMail alias is invalid!"
 msgstr "电子邮件别名非法!"
 
-#: ../lib/modules/kolabUser.inc:165
+#: ../lib/modules/kolabUser.inc:155
 msgid "EMail alias list"
 msgstr "电子邮件别名列表"
 
-#: ../lib/modules/kolabUser.inc:248
+#: ../lib/modules/kolabUser.inc:238
 msgid "EMail alias list has invalid format!"
 msgstr "电子邮件别名列表格式非法!"
 
-#: ../lib/modules/kolabUser.inc:211
-#: ../lib/modules/kolabUser.inc:390
-#: ../lib/modules/kolabUser.inc:807
+#: ../lib/modules/kolabUser.inc:201
+#: ../lib/modules/kolabUser.inc:362
+#: ../lib/modules/kolabUser.inc:792
 msgid "EMail aliases"
 msgstr "电子邮件别名"
 
-#: ../lib/modules/sambaSamAccount.inc:500
+#: ../lib/modules/sambaSamAccount.inc:520
 msgid "East Australian Standard, Guam"
 msgstr "澳东标准时间,关岛"
 
-#: ../lib/modules/sambaSamAccount.inc:492
+#: ../lib/modules/sambaSamAccount.inc:512
 msgid "Eastern Europe Time, South Africa"
 msgstr "东欧时间,南非"
 
-#: ../lib/modules/sambaSamAccount.inc:485
+#: ../lib/modules/sambaSamAccount.inc:505
 msgid "Eastern Time (US & Canada), Bogota"
 msgstr "美国东部时间(美国和加拿大),波哥大"
 
-#: ../lib/modules/sambaSamAccount.inc:1120
-#: ../lib/modules/sambaSamAccount.inc:1124
+#: ../templates/pdfedit/pdfmain.php:165
+#: ../templates/profedit/profilemain.php:155
+#: ../lib/modules/sambaSamAccount.inc:1160
+#: ../lib/modules/sambaSamAccount.inc:1164
 #: ../lib/lists.inc:460
 msgid "Edit"
 msgstr "编辑"
 
-#: ../templates/pdfedit/pdfmain.php:134
-msgid "Edit PDF structure"
-msgstr "编辑PDF结构"
-
 #: ../templates/config/confmain.php:245
 msgid "Edit account types"
 msgstr "编辑帐号类型"
 
-#: ../templates/config/mainmanage.php:58
 #: ../templates/config/index.php:77
+#: ../templates/config/mainmanage.php:58
 msgid "Edit general settings"
 msgstr "编辑通用设置"
 
@@ -1730,7 +1761,7 @@ msgstr "编辑通用设置"
 msgid "Edit groups"
 msgstr "编辑组"
 
-#: ../lib/modules/posixGroup.inc:169
+#: ../lib/modules/posixGroup.inc:183
 msgid "Edit members"
 msgstr "编辑成员"
 
@@ -1738,10 +1769,6 @@ msgstr "编辑成员"
 msgid "Edit modules"
 msgstr "编辑模块"
 
-#: ../templates/profedit/profilemain.php:144
-msgid "Edit profile"
-msgstr "编辑配置文件"
-
 #: ../templates/config/index.php:103
 msgid "Edit self service"
 msgstr "编辑自动服务功能"
@@ -1751,7 +1778,7 @@ msgid "Edit server profiles"
 msgstr "编辑服务器配置文件"
 
 #: ../lib/modules/sambaAccount.inc:798
-#: ../lib/modules/sambaSamAccount.inc:1072
+#: ../lib/modules/sambaSamAccount.inc:1112
 msgid "Edit workstations"
 msgstr "编辑工作站"
 
@@ -1768,8 +1795,8 @@ msgstr "雇员类型"
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇员类型: 承包商,雇员,实习生,临时工,外部员工,..."
 
-#: ../templates/lists/changePassword.php:255
-#: ../templates/lists/changePassword.php:261
+#: ../templates/lists/changePassword.php:258
+#: ../templates/lists/changePassword.php:264
 #: ../templates/login.php:405
 msgid "Empty password submitted. Please try again."
 msgstr "提交了空密码,请重试."
@@ -1778,7 +1805,7 @@ msgstr "提交了空密码,请重试."
 msgid "Encountered an error while performing search."
 msgstr "检索时发生错误."
 
-#: ../lib/modules/sambaSamAccount.inc:478
+#: ../lib/modules/sambaSamAccount.inc:498
 msgid "Eniwetok, Kwajalein"
 msgstr "埃尼威托克,瓜加林"
 
@@ -1817,7 +1844,7 @@ msgstr "删除DN: %s时发生错误"
 msgid "Every account type needs exactly one base module. This module provides a structural object class."
 msgstr "每个帐号类型都需要一个基本模块,这个模块提供一个结构化对象类"
 
-#: ../lib/modules/dhcp_settings.inc:699
+#: ../lib/modules/dhcp_settings.inc:658
 #: ../help/help.inc:74
 #: ../help/help.inc:80
 #: ../help/help.inc:86
@@ -1826,8 +1853,8 @@ msgstr "每个帐号类型都需要一个基本模块,这个模块提供一个
 msgid "Example"
 msgstr "示例"
 
-#: ../templates/masscreate.php:162
-#: ../templates/masscreate.php:321
+#: ../templates/masscreate.php:166
+#: ../templates/masscreate.php:325
 msgid "Example value"
 msgstr "示例值"
 
@@ -1839,13 +1866,13 @@ msgstr "示例"
 msgid "Execute"
 msgstr "运行"
 
-#: ../templates/tests/lamdaemonTest.php:298
+#: ../templates/tests/lamdaemonTest.php:307
 msgid "Execute lamdaemon"
 msgstr "运行 lamdaemon"
 
-#: ../templates/tree/edit.php:119
 #: ../templates/tree/export_form.php:88
 #: ../templates/tree/export_form.php:96
+#: ../templates/tree/edit.php:119
 msgid "Export"
 msgstr "导出"
 
@@ -1883,7 +1910,7 @@ msgstr "传真号"
 msgid "File"
 msgstr "文件"
 
-#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/sambaSamAccount.inc:261
 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会被用户名和组名替换"
 
@@ -1891,8 +1918,8 @@ msgstr "用户登录时自动运行的文件名和网络登录共享相对路径
 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会被用户名和组名替换."
 
+#: ../templates/masscreate.php:128
 #: ../templates/tools.php:64
-#: ../templates/masscreate.php:124
 msgid "File upload"
 msgstr "文件上传"
 
@@ -1904,7 +1931,6 @@ msgstr "文件上传失败!"
 msgid "Filter"
 msgstr "过滤器"
 
-#: ../lib/types/user.inc:87
 #: ../lib/modules/inetOrgPerson.inc:73
 #: ../lib/modules/inetOrgPerson.inc:151
 #: ../lib/modules/inetOrgPerson.inc:196
@@ -1912,6 +1938,7 @@ msgstr "过滤器"
 #: ../lib/modules/inetOrgPerson.inc:720
 #: ../lib/modules/inetOrgPerson.inc:1048
 #: ../lib/modules/inetOrgPerson.inc:1343
+#: ../lib/types/user.inc:87
 msgid "First name"
 msgstr "名字"
 
@@ -1924,16 +1951,16 @@ msgstr "名字包含非法字符"
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "用户名字只允许字母,-和空格"
 
-#: ../lib/modules/ddns.inc:67
+#: ../lib/modules/ddns.inc:84
 msgid "Fix IP addresses"
 msgstr "固定IP地址"
 
-#: ../lib/modules/dhcp_settings.inc:753
-#: ../lib/modules/fixed_ip.inc:61
+#: ../lib/modules/dhcp_settings.inc:712
+#: ../lib/modules/fixed_ip.inc:63
 msgid "Fixed IP"
 msgstr "固定IP"
 
-#: ../lib/modules/kolabUser.inc:146
+#: ../lib/modules/kolabUser.inc:136
 msgid "For automatic invitation handling."
 msgstr "自动处理邀请."
 
@@ -1941,26 +1968,26 @@ msgstr "自动处理邀请."
 msgid "Format"
 msgstr "格式"
 
-#: ../lib/modules/kolabUser.inc:93
-#: ../lib/modules/kolabUser.inc:127
-#: ../lib/modules/kolabUser.inc:177
-#: ../lib/modules/kolabUser.inc:223
-#: ../lib/modules/kolabUser.inc:335
-#: ../lib/modules/kolabUser.inc:785
-#: ../lib/modules/kolabUser.inc:837
+#: ../lib/modules/kolabUser.inc:94
+#: ../lib/modules/kolabUser.inc:128
+#: ../lib/modules/kolabUser.inc:167
+#: ../lib/modules/kolabUser.inc:213
+#: ../lib/modules/kolabUser.inc:307
+#: ../lib/modules/kolabUser.inc:770
+#: ../lib/modules/kolabUser.inc:822
 msgid "Free/Busy interval"
 msgstr "空闲/忙碌 间隔"
 
-#: ../lib/modules/kolabUser.inc:255
-#: ../lib/modules/kolabUser.inc:256
+#: ../lib/modules/kolabUser.inc:245
+#: ../lib/modules/kolabUser.inc:246
 msgid "Free/Busy interval must be a number!"
 msgstr "空闲/忙碌间隔必须是一个数字!"
 
-#: ../lib/modules/sambaSamAccount.inc:1190
+#: ../lib/modules/sambaSamAccount.inc:1230
 msgid "Friday"
 msgstr "星期五"
 
-#: ../templates/lists/changePassword.php:144
+#: ../templates/lists/changePassword.php:147
 msgid "Full name"
 msgstr "全名"
 
@@ -1968,22 +1995,22 @@ msgstr "全名"
 msgid "GB-12345"
 msgstr "GB-12345"
 
-#: ../lib/types/host.inc:87
-#: ../lib/types/group.inc:84
-#: ../lib/types/user.inc:84
-#: ../lib/modules/posixGroup.inc:160
-#: ../lib/modules/posixGroup.inc:356
-#: ../lib/modules/posixGroup.inc:386
-#: ../lib/modules/posixGroup.inc:406
-#: ../lib/modules/posixGroup.inc:450
-#: ../lib/modules/posixGroup.inc:470
+#: ../lib/modules/sambaGroupMapping.inc:385
+#: ../lib/modules/posixGroup.inc:172
+#: ../lib/modules/posixGroup.inc:366
+#: ../lib/modules/posixGroup.inc:408
+#: ../lib/modules/posixGroup.inc:428
+#: ../lib/modules/posixGroup.inc:476
+#: ../lib/modules/posixGroup.inc:496
 #: ../lib/modules/posixAccount.inc:88
 #: ../lib/modules/posixAccount.inc:1245
-#: ../lib/modules/sambaGroupMapping.inc:345
+#: ../lib/types/group.inc:84
+#: ../lib/types/user.inc:84
+#: ../lib/types/host.inc:87
 msgid "GID number"
 msgstr "GID编号"
 
-#: ../lib/modules/posixGroup.inc:470
+#: ../lib/modules/posixGroup.inc:496
 msgid "GID number has changed. Please select checkbox to change GID number of users and hosts."
 msgstr "GID的编号已经更改,请点击选择框来改变用户GID号"
 
@@ -1992,7 +2019,7 @@ msgstr "GID的编号已经更改,请点击选择框来改变用户GID号"
 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身份运行以下命令: 'find / -gid %s -uid %s -exec chgrp %s {} \\;'"
 
-#: ../lib/modules/posixGroup.inc:477
+#: ../lib/modules/posixGroup.inc:503
 msgid "GID number has to be a numeric value!"
 msgstr "GID号必须使用数字"
 
@@ -2005,12 +2032,12 @@ msgstr "GID号必须使用数字"
 msgid "Gecos"
 msgstr "备注(Gecos)"
 
-#: ../templates/lists/changePassword.php:175
+#: ../templates/lists/changePassword.php:178
 #: ../help/help.inc:176
 msgid "Generate random password"
 msgstr "生成随机密码"
 
-#: ../lib/modules/kolabUser.inc:200
+#: ../lib/modules/kolabUser.inc:190
 msgid "Germany"
 msgstr "德国"
 
@@ -2021,26 +2048,26 @@ msgstr "德国"
 msgid "Go"
 msgstr "开始"
 
-#: ../lib/modules/quota.inc:112
-#: ../lib/modules/quota.inc:360
+#: ../lib/modules/quota.inc:113
+#: ../lib/modules/quota.inc:378
 msgid "Grace block period"
 msgstr "块限制宽限周期"
 
-#: ../lib/modules/quota.inc:113
+#: ../lib/modules/quota.inc:114
 msgid "Grace block period. Most filesystems use a fixed maximum value of 7 days."
 msgstr "块限制宽限周期,大部分文件系统都使用最大值7天."
 
-#: ../lib/modules/quota.inc:135
+#: ../lib/modules/quota.inc:136
 msgid "Grace inode (files) period. Most filesystems use a fixed maximum value of 7 days."
 msgstr "节点限制的宽限期,大部分文件系统都使用最大值7天."
 
-#: ../lib/modules/quota.inc:134
-#: ../lib/modules/quota.inc:364
+#: ../lib/modules/quota.inc:135
+#: ../lib/modules/quota.inc:382
 msgid "Grace inode period"
 msgstr "节点限制宽限期"
 
-#: ../templates/config/confmain.php:391
 #: ../templates/selfService/adminMain.php:498
+#: ../templates/config/confmain.php:391
 msgid "Group"
 msgstr "组"
 
@@ -2048,61 +2075,61 @@ msgstr "组"
 msgid "Group accounts (e.g. Unix and Samba)"
 msgstr "组帐号(比如unix和samba)"
 
+#: ../lib/modules/posixGroup.inc:399
 #: ../lib/types/group.inc:87
-#: ../lib/modules/posixGroup.inc:362
 msgid "Group description"
 msgstr "组说明"
 
-#: ../lib/modules/posixGroup.inc:391
+#: ../lib/modules/posixGroup.inc:413
 msgid "Group description. If left empty group name will be used."
 msgstr "组说明,若空则会使用组名来替代."
 
+#: ../lib/types/group.inc:86
 #: ../lib/types/gon.inc:83
 #: ../lib/types/gon.inc:84
-#: ../lib/types/group.inc:86
 msgid "Group member DNs"
 msgstr "组成员DN"
 
+#: ../lib/modules/posixGroup.inc:182
+#: ../lib/modules/posixGroup.inc:248
+#: ../lib/modules/posixGroup.inc:372
+#: ../lib/modules/posixGroup.inc:416
+#: ../lib/modules/posixGroup.inc:420
+#: ../lib/modules/posixGroup.inc:477
 #: ../lib/types/group.inc:85
-#: ../lib/modules/posixGroup.inc:168
-#: ../lib/modules/posixGroup.inc:234
-#: ../lib/modules/posixGroup.inc:368
-#: ../lib/modules/posixGroup.inc:394
-#: ../lib/modules/posixGroup.inc:398
-#: ../lib/modules/posixGroup.inc:451
 msgid "Group members"
 msgstr "组成员"
 
-#: ../lib/types/gon.inc:82
-#: ../lib/types/group.inc:83
-#: ../lib/modules/posixGroup.inc:156
-#: ../lib/modules/posixGroup.inc:348
-#: ../lib/modules/posixGroup.inc:382
-#: ../lib/modules/posixGroup.inc:449
-#: ../lib/modules/posixGroup.inc:478
-#: ../lib/modules/posixGroup.inc:479
-#: ../lib/modules/posixGroup.inc:480
 #: ../lib/modules/groupOfNames.inc:60
 #: ../lib/modules/groupOfNames.inc:84
 #: ../lib/modules/groupOfNames.inc:439
+#: ../lib/modules/posixGroup.inc:167
+#: ../lib/modules/posixGroup.inc:387
+#: ../lib/modules/posixGroup.inc:436
+#: ../lib/modules/posixGroup.inc:475
+#: ../lib/modules/posixGroup.inc:504
+#: ../lib/modules/posixGroup.inc:505
+#: ../lib/modules/posixGroup.inc:506
+#: ../lib/types/group.inc:83
+#: ../lib/types/gon.inc:82
 msgid "Group name"
 msgstr "组名"
 
-#: ../lib/modules/posixGroup.inc:480
-#: ../lib/modules/posixGroup.inc:481
+#: ../lib/modules/posixGroup.inc:506
+#: ../lib/modules/posixGroup.inc:507
 msgid "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !"
 msgstr "组名包含非法字符,可用字符为: a-z, A-Z, 0-9,及 -或_ !"
 
-#: ../lib/modules/posixGroup.inc:479
+#: ../lib/modules/posixGroup.inc:505
 msgid "Group name in use. Selected next free group name."
 msgstr "组名已被使用,请选择可用的组名."
 
-#: ../lib/modules/posixGroup.inc:383
+#: ../lib/modules/posixGroup.inc:437
 msgid "Group name of the group which should be created. Valid characters are: a-z, A-Z, 0-9 and .-_ . LAM does not allow a number as first character because groupadd also does not allow it. If group name is already used group name will be expanded with a number. The next free number will be used."
 msgstr "将要建立的组名,可用字符为:a-z,A-Z,0-9,.-_ .因为groupadd不允许以数字开头的组名,所以本系统也不允许.如果该组名存在,会在组名末尾增加下一个可以使用的数字。"
 
-#: ../lib/types/gon.inc:44
 #: ../lib/modules/groupOfNames.inc:44
+#: ../lib/types/gon.inc:44
 msgid "Group of names"
 msgstr "组名"
 
@@ -2114,51 +2141,51 @@ msgstr "帐号的组名"
 msgid "Group of unique names"
 msgstr "组的唯一名"
 
-#: ../lib/modules/posixGroup.inc:374
-#: ../lib/modules/posixGroup.inc:402
+#: ../lib/modules/posixGroup.inc:378
+#: ../lib/modules/posixGroup.inc:424
 msgid "Group password"
 msgstr "组密码"
 
-#: ../lib/modules/sambaGroupMapping.inc:227
+#: ../lib/modules/sambaGroupMapping.inc:266
 msgid "Group type"
 msgstr "组类型"
 
+#: ../lib/modules/posixGroup.inc:326
 #: ../lib/types/group.inc:45
-#: ../lib/modules/posixGroup.inc:312
 msgid "Groups"
 msgstr "组"
 
-#: ../lib/modules/dhcp_settings.inc:101
-#: ../lib/modules/dhcp_settings.inc:739
+#: ../lib/modules/dhcp_settings.inc:99
+#: ../lib/modules/dhcp_settings.inc:698
 msgid "H-Node (0x08)"
 msgstr "H-节点 (0x08)"
 
-#: ../lib/modules/quota.inc:553
+#: ../lib/modules/quota.inc:571
 msgid "Hard block"
 msgstr "块的硬性限制"
 
-#: ../lib/modules/quota.inc:106
 #: ../lib/modules/quota.inc:107
-#: ../lib/modules/quota.inc:359
-#: ../lib/modules/quota.inc:444
+#: ../lib/modules/quota.inc:108
+#: ../lib/modules/quota.inc:377
+#: ../lib/modules/quota.inc:462
 msgid "Hard block limit"
 msgstr "块的硬性限制"
 
-#: ../lib/modules/quota.inc:555
+#: ../lib/modules/quota.inc:573
 msgid "Hard inode"
 msgstr "节点的硬性限制"
 
-#: ../lib/modules/quota.inc:129
+#: ../lib/modules/quota.inc:130
 msgid "Hard inode (files) limit"
 msgstr "节点的硬性限制"
 
-#: ../lib/modules/quota.inc:128
-#: ../lib/modules/quota.inc:363
-#: ../lib/modules/quota.inc:446
+#: ../lib/modules/quota.inc:129
+#: ../lib/modules/quota.inc:381
+#: ../lib/modules/quota.inc:464
 msgid "Hard inode limit"
 msgstr "节点硬性限制"
 
-#: ../lib/modules/sambaSamAccount.inc:480
+#: ../lib/modules/sambaSamAccount.inc:500
 msgid "Hawaii"
 msgstr "夏威夷"
 
@@ -2168,25 +2195,40 @@ msgstr "夏威夷"
 msgid "Headline"
 msgstr "标题"
 
-#: ../templates/lists/changePassword.php:187
-#: ../templates/ou_edit.php:177
-#: ../templates/ou_edit.php:192
-#: ../templates/masscreate.php:157
-#: ../templates/masscreate.php:170
-#: ../templates/masscreate.php:308
-#: ../templates/config/profmanage.php:180
-#: ../templates/config/profmanage.php:232
-#: ../templates/config/profmanage.php:262
-#: ../templates/config/profmanage.php:296
-#: ../templates/config/profmanage.php:341
-#: ../templates/config/profmanage.php:365
+#: ../templates/selfService/profManage.php:160
+#: ../templates/selfService/profManage.php:200
+#: ../templates/selfService/profManage.php:235
+#: ../templates/selfService/profManage.php:259
+#: ../templates/selfService/adminMain.php:273
+#: ../templates/selfService/adminMain.php:287
+#: ../templates/selfService/adminMain.php:301
+#: ../templates/selfService/adminMain.php:315
+#: ../templates/selfService/adminMain.php:338
+#: ../templates/selfService/adminMain.php:358
+#: ../templates/selfService/adminMain.php:373
+#: ../templates/selfService/adminMain.php:388
+#: ../templates/selfService/adminMain.php:472
+#: ../templates/selfService/adminMain.php:506
+#: ../templates/selfService/adminLogin.php:126
+#: ../templates/pdfedit/pdfpage.php:685
+#: ../templates/lists/changePassword.php:190
+#: ../templates/masscreate.php:161
+#: ../templates/masscreate.php:174
+#: ../templates/masscreate.php:312
+#: ../templates/ou_edit.php:183
+#: ../templates/ou_edit.php:199
+#: ../templates/profedit/profilepage.php:199
+#: ../templates/profedit/profilepage.php:219
+#: ../templates/profedit/profilepage.php:256
+#: ../templates/config/conftypes.php:204
+#: ../templates/config/conftypes.php:220
+#: ../templates/config/conflogin.php:129
 #: ../templates/config/mainmanage.php:180
 #: ../templates/config/mainmanage.php:197
 #: ../templates/config/mainmanage.php:236
 #: ../templates/config/mainmanage.php:273
 #: ../templates/config/mainmanage.php:289
 #: ../templates/config/mainmanage.php:353
-#: ../templates/config/confmodules.php:123
 #: ../templates/config/confmain.php:154
 #: ../templates/config/confmain.php:168
 #: ../templates/config/confmain.php:190
@@ -2198,38 +2240,23 @@ msgstr "标题"
 #: ../templates/config/confmain.php:403
 #: ../templates/config/confmain.php:422
 #: ../templates/config/confmain.php:436
-#: ../templates/config/conftypes.php:204
-#: ../templates/config/conftypes.php:220
-#: ../templates/config/conflogin.php:129
+#: ../templates/config/profmanage.php:180
+#: ../templates/config/profmanage.php:232
+#: ../templates/config/profmanage.php:262
+#: ../templates/config/profmanage.php:296
+#: ../templates/config/profmanage.php:341
+#: ../templates/config/profmanage.php:365
+#: ../templates/config/confmodules.php:123
 #: ../templates/config/mainlogin.php:120
-#: ../templates/selfService/profManage.php:160
-#: ../templates/selfService/profManage.php:200
-#: ../templates/selfService/profManage.php:235
-#: ../templates/selfService/profManage.php:259
-#: ../templates/selfService/adminLogin.php:126
-#: ../templates/selfService/adminMain.php:273
-#: ../templates/selfService/adminMain.php:287
-#: ../templates/selfService/adminMain.php:301
-#: ../templates/selfService/adminMain.php:315
-#: ../templates/selfService/adminMain.php:338
-#: ../templates/selfService/adminMain.php:358
-#: ../templates/selfService/adminMain.php:373
-#: ../templates/selfService/adminMain.php:388
-#: ../templates/selfService/adminMain.php:472
-#: ../templates/selfService/adminMain.php:506
-#: ../templates/pdfedit/pdfpage.php:685
-#: ../templates/profedit/profilepage.php:198
-#: ../templates/profedit/profilepage.php:218
-#: ../templates/profedit/profilepage.php:255
-#: ../lib/lists.inc:383
 #: ../lib/modules.inc:831
 #: ../lib/modules.inc:1168
 #: ../lib/modules.inc:1224
 #: ../lib/modules.inc:1341
+#: ../lib/lists.inc:383
 msgid "Help"
 msgstr "帮助"
 
-#: ../templates/masscreate.php:145
+#: ../templates/masscreate.php:149
 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文件中,在帐号中属于必填项目."
 
@@ -2237,7 +2264,7 @@ msgstr "这是可能的列的列表,红色的列必须包含在CSV文件中,在
 msgid "Here you can browse LDAP object classes and attributes."
 msgstr "这是你可浏览的LDAP对象类和属性."
 
-#: ../lib/modules/sambaSamAccount.inc:323
+#: ../lib/modules/sambaSamAccount.inc:340
 msgid "Here you can change the settings for the terminal server access."
 msgstr "这里可以改变终端服务访问的设置。"
 
@@ -2289,11 +2316,11 @@ msgstr "在此指定用户密码的最小需求.字符类别包括:小写,大写
 msgid "Here you can specify the minimum number of characters for a user password."
 msgstr "在此指定用户密码的最小长度."
 
-#: ../templates/lists/changePassword.php:197
+#: ../templates/lists/changePassword.php:200
 msgid "Here you can specify the new password yourself."
 msgstr "这里可以设置自己的新密码。"
 
-#: ../lib/modules/sambaSamAccount.inc:314
+#: ../lib/modules/sambaSamAccount.inc:331
 msgid "Here you can specify the shadowing mode."
 msgstr "这里可以指定遮蔽(shadow)模型。"
 
@@ -2305,7 +2332,7 @@ msgstr "测试您安装的系统功能是否正确."
 msgid "Hide internal attributes"
 msgstr "隐藏内部属性"
 
-#: ../templates/masscreate.php:130
+#: ../templates/masscreate.php:134
 msgid "Hint: Format all cells as text in your spreadsheet program and turn off auto correction."
 msgstr "提示:将电子表格的格式设定为文字,然后关闭自动更正功能"
 
@@ -2317,10 +2344,6 @@ msgstr "提示:要删除一个属性,先清空文本区然后保存."
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr "按住CTRL键可以多选组."
 
-#: ../lib/types/user.inc:89
-#: ../lib/modules/sambaSamAccount.inc:286
-#: ../lib/modules/sambaSamAccount.inc:1310
-#: ../lib/modules/sambaSamAccount.inc:1670
 #: ../lib/modules/posixAccount.inc:63
 #: ../lib/modules/posixAccount.inc:64
 #: ../lib/modules/posixAccount.inc:66
@@ -2334,6 +2357,10 @@ msgstr "按住CTRL键可以多选组."
 #: ../lib/modules/posixAccount.inc:1001
 #: ../lib/modules/posixAccount.inc:1168
 #: ../lib/modules/posixAccount.inc:1249
+#: ../lib/modules/sambaSamAccount.inc:303
+#: ../lib/modules/sambaSamAccount.inc:1350
+#: ../lib/modules/sambaSamAccount.inc:1727
+#: ../lib/types/user.inc:89
 msgid "Home directory"
 msgstr "个人目录"
 
@@ -2351,13 +2378,13 @@ msgstr "主目录服务器"
 #: ../lib/modules/sambaAccount.inc:382
 #: ../lib/modules/sambaAccount.inc:785
 #: ../lib/modules/sambaAccount.inc:893
-#: ../lib/modules/sambaSamAccount.inc:234
-#: ../lib/modules/sambaSamAccount.inc:404
-#: ../lib/modules/sambaSamAccount.inc:1043
-#: ../lib/modules/sambaSamAccount.inc:1321
-#: ../lib/modules/sambaSamAccount.inc:1465
-#: ../lib/modules/sambaSamAccount.inc:1644
-#: ../lib/modules/sambaSamAccount.inc:1671
+#: ../lib/modules/sambaSamAccount.inc:251
+#: ../lib/modules/sambaSamAccount.inc:424
+#: ../lib/modules/sambaSamAccount.inc:1083
+#: ../lib/modules/sambaSamAccount.inc:1361
+#: ../lib/modules/sambaSamAccount.inc:1515
+#: ../lib/modules/sambaSamAccount.inc:1701
+#: ../lib/modules/sambaSamAccount.inc:1728
 msgid "Home drive"
 msgstr "个人驱动器"
 
@@ -2368,19 +2395,19 @@ msgstr "个人驱动器"
 #: ../lib/modules/sambaAccount.inc:385
 #: ../lib/modules/sambaAccount.inc:788
 #: ../lib/modules/sambaAccount.inc:892
-#: ../lib/modules/sambaSamAccount.inc:81
-#: ../lib/modules/sambaSamAccount.inc:82
-#: ../lib/modules/sambaSamAccount.inc:237
-#: ../lib/modules/sambaSamAccount.inc:410
-#: ../lib/modules/sambaSamAccount.inc:1051
-#: ../lib/modules/sambaSamAccount.inc:1471
-#: ../lib/modules/sambaSamAccount.inc:1641
+#: ../lib/modules/sambaSamAccount.inc:83
+#: ../lib/modules/sambaSamAccount.inc:84
+#: ../lib/modules/sambaSamAccount.inc:254
+#: ../lib/modules/sambaSamAccount.inc:430
+#: ../lib/modules/sambaSamAccount.inc:1091
+#: ../lib/modules/sambaSamAccount.inc:1521
+#: ../lib/modules/sambaSamAccount.inc:1698
 msgid "Home path"
 msgstr "个人目录路径"
 
 #: ../lib/modules/sambaAccount.inc:61
-#: ../lib/modules/sambaSamAccount.inc:81
 #: ../lib/modules/sambaSamAccount.inc:83
+#: ../lib/modules/sambaSamAccount.inc:85
 msgid "Home path is invalid."
 msgstr "个人目录路径无效"
 
@@ -2417,14 +2444,14 @@ msgstr "主机描述.如果留空会使用主机名."
 msgid "Host list"
 msgstr "主机列表"
 
-#: ../lib/types/host.inc:82
-#: ../lib/types/host.inc:83
 #: ../lib/modules/account.inc:84
 #: ../lib/modules/posixAccount.inc:78
 #: ../lib/modules/posixAccount.inc:79
 #: ../lib/modules/posixAccount.inc:81
 #: ../lib/modules/posixAccount.inc:277
 #: ../lib/modules/posixAccount.inc:410
+#: ../lib/types/host.inc:82
+#: ../lib/types/host.inc:83
 msgid "Host name"
 msgstr "主机名"
 
@@ -2449,30 +2476,30 @@ msgstr "主机名已被使用, 请选择其它的主机名."
 msgid "Host name of the host which should be created. Valid characters are: a-z,A-Z,0-9, .-_$. LAM does not allow a number as first character because useradd also does not allow it. 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,A-Z,0-9,_$.因为useradd不允许第一个字符为数字,所以LAM也不允许.主机名总是以$结尾.如果最后一个字符不是$,会自动填加.如果主机名已经存在,会在主机名后自动增加下一个可用的数字."
 
-#: ../lib/types/host.inc:44
 #: ../lib/modules/posixAccount.inc:58
 #: ../lib/modules/posixAccount.inc:59
 #: ../lib/modules/posixAccount.inc:61
 #: ../lib/modules/posixAccount.inc:166
+#: ../lib/types/host.inc:44
 msgid "Hosts"
 msgstr "主机"
 
-#: ../templates/lists/changePassword.php:184
+#: ../templates/lists/changePassword.php:187
 msgid "I am sure"
 msgstr "确认"
 
-#: ../lib/modules/posixGroup.inc:473
-#: ../lib/modules/posixGroup.inc:582
+#: ../lib/modules/posixGroup.inc:499
+#: ../lib/modules/posixGroup.inc:610
 #: ../lib/modules/posixAccount.inc:69
 #: ../lib/modules/posixAccount.inc:768
 msgid "ID is already in use"
 msgstr "ID已经被使用"
 
-#: ../lib/modules/posixGroup.inc:471
-#: ../lib/modules/posixGroup.inc:472
-#: ../lib/modules/posixGroup.inc:473
-#: ../lib/modules/posixGroup.inc:574
-#: ../lib/modules/posixGroup.inc:582
+#: ../lib/modules/posixGroup.inc:497
+#: ../lib/modules/posixGroup.inc:498
+#: ../lib/modules/posixGroup.inc:499
+#: ../lib/modules/posixGroup.inc:602
+#: ../lib/modules/posixGroup.inc:610
 #: ../lib/modules/posixAccount.inc:67
 #: ../lib/modules/posixAccount.inc:68
 #: ../lib/modules/posixAccount.inc:69
@@ -2481,29 +2508,31 @@ msgstr "ID已经被使用"
 msgid "ID-Number"
 msgstr "ID号"
 
-#: ../lib/modules/fixed_ip.inc:81
-#: ../lib/modules/fixed_ip.inc:398
+#: ../lib/modules/fixed_ip.inc:85
+#: ../lib/modules/fixed_ip.inc:406
+#: ../lib/modules/fixed_ip.inc:511
 msgid "IP address"
 msgstr "IP地址"
 
-#: ../lib/modules/ddns.inc:77
-#: ../lib/modules/ddns.inc:461
+#: ../lib/modules/ddns.inc:94
+#: ../lib/modules/ddns.inc:313
+#: ../lib/modules/ddns.inc:360
 msgid "IP address of the DNS server"
 msgstr "DNS服务器IP地址"
 
-#: ../templates/masscreate.php:161
-#: ../templates/masscreate.php:174
-#: ../templates/masscreate.php:313
+#: ../templates/masscreate.php:165
+#: ../templates/masscreate.php:178
+#: ../templates/masscreate.php:317
 msgid "Identifier"
 msgstr "标识"
 
-#: ../lib/modules/sambaSamAccount.inc:1356
-#: ../lib/modules/sambaSamAccount.inc:1682
+#: ../lib/modules/sambaSamAccount.inc:1396
+#: ../lib/modules/sambaSamAccount.inc:1739
 msgid "Idle time limit"
 msgstr "空闲时间限制"
 
 #: ../lib/modules/sambaAccount.inc:354
-#: ../lib/modules/sambaSamAccount.inc:203
+#: ../lib/modules/sambaSamAccount.inc:217
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "如果选中将使用UNIX密码作为SAMBA密码."
 
@@ -2516,24 +2545,24 @@ msgid "If checked account will be deactivated. (Setting D-Flag)"
 msgstr "如果选中,帐号会停用(设定D标志)"
 
 #: ../lib/modules/sambaAccount.inc:360
-#: ../lib/modules/sambaSamAccount.inc:209
+#: ../lib/modules/sambaSamAccount.inc:223
 msgid "If checked no password will be used."
 msgstr "如果选中,不需要密码."
 
 #: ../lib/modules/sambaAccount.inc:366
-#: ../lib/modules/sambaSamAccount.inc:215
+#: ../lib/modules/sambaSamAccount.inc:229
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "密码不过期.(设置X标志)"
 
-#: ../lib/modules/sambaSamAccount.inc:221
+#: ../lib/modules/sambaSamAccount.inc:235
 msgid "If checked then the account will be deactivated. (Setting D-Flag)"
 msgstr "密码停用(设置D标志)"
 
-#: ../lib/modules/sambaSamAccount.inc:224
+#: ../lib/modules/sambaSamAccount.inc:238
 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:387
+#: ../lib/modules/posixGroup.inc:409
 msgid "If empty GID number will be generated automaticly depending on your configuration settings."
 msgstr "如果为空,视配置而定,GID号自动产生."
 
@@ -2546,22 +2575,22 @@ msgid "If set then users need to login to change their password."
 msgstr "如果设置,用户需要密码才能登录."
 
 #: ../lib/modules/sambaAccount.inc:357
-#: ../lib/modules/sambaSamAccount.inc:206
+#: ../lib/modules/sambaSamAccount.inc:220
 msgid "If set to \"true\" Unix password will also be used as Samba password."
 msgstr "如果设为\"true\",会用UNIX用户密码做为SAMBA密码."
 
 #: ../lib/modules/sambaAccount.inc:375
-#: ../lib/modules/sambaSamAccount.inc:227
+#: ../lib/modules/sambaSamAccount.inc:241
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr "如果设为\"true\",帐号会被停用(设置D标志)."
 
 #: ../lib/modules/sambaAccount.inc:363
-#: ../lib/modules/sambaSamAccount.inc:212
+#: ../lib/modules/sambaSamAccount.inc:226
 msgid "If set to \"true\" no password will be used."
 msgstr "如果设为\"true\",则不需要密码."
 
 #: ../lib/modules/sambaAccount.inc:369
-#: ../lib/modules/sambaSamAccount.inc:218
+#: ../lib/modules/sambaSamAccount.inc:232
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr "如果设为\"true\",密码不会过期(设为X标志)."
 
@@ -2569,10 +2598,14 @@ msgstr "如果设为\"true\",密码不会过期(设为X标志)."
 msgid "If you decide to send the password via mail then the mail template \"config/passwordMailTemplate.txt\" will be used."
 msgstr "如果您决定通过邮件发送密码，将会使用\"config/passwordMailTemplate.txt\"邮件模板。"
 
-#: ../lib/modules/sambaSamAccount.inc:263
+#: ../lib/modules/sambaSamAccount.inc:280
 msgid "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr "如果留空,LAM会用如下算法:uidNumber*2 + sambaAlgorithmicRidBase."
 
+#: ../lib/modules/sambaSamAccount.inc:244
+msgid "If you set this option then the user has to change his password at the next login."
+msgstr "如果您选中此项，用户在下次登录时必须修改密码。"
+
 #: ../lib/modules/phpGroupwareGroup.inc:74
 #: ../lib/modules/phpGroupwareUser.inc:75
 msgid "If you set this to \"true\" then the phpGroupware extension will be added."
@@ -2591,7 +2624,7 @@ msgid "If you want to create domain administrators or other special users use th
 msgstr "使用这个选项,建立域管理员或其它特殊帐号."
 
 #: ../lib/modules/sambaAccount.inc:401
-#: ../lib/modules/sambaGroupMapping.inc:319
+#: ../lib/modules/sambaGroupMapping.inc:359
 msgid "If you want to use a well known RID you can selcet a well known group."
 msgstr "如果想用知名的RID,需要选择知名的组。"
 
@@ -2603,9 +2636,9 @@ msgstr "如果服务器运行在其它端口,需要在服务器后加一个逗
 msgid "Include system attributes"
 msgstr "包括系统属性"
 
-#: ../lib/modules/sambaSamAccount.inc:292
-#: ../lib/modules/sambaSamAccount.inc:1331
-#: ../lib/modules/sambaSamAccount.inc:1677
+#: ../lib/modules/sambaSamAccount.inc:309
+#: ../lib/modules/sambaSamAccount.inc:1371
+#: ../lib/modules/sambaSamAccount.inc:1734
 msgid "Inherit client startup configuration"
 msgstr "继承客户初始配置"
 
@@ -2619,36 +2652,36 @@ msgstr "继承自"
 msgid "Inherits from"
 msgstr "继承自"
 
-#: ../lib/modules/sambaSamAccount.inc:295
-#: ../lib/modules/sambaSamAccount.inc:1336
-#: ../lib/modules/sambaSamAccount.inc:1678
+#: ../lib/modules/sambaSamAccount.inc:312
+#: ../lib/modules/sambaSamAccount.inc:1376
+#: ../lib/modules/sambaSamAccount.inc:1735
 msgid "Initial program"
 msgstr "初始化程序"
 
-#: ../lib/modules/quota.inc:51
+#: ../lib/modules/quota.inc:52
 msgid "Inode hard quota"
 msgstr "inode硬配额"
 
-#: ../lib/modules/quota.inc:51
 #: ../lib/modules/quota.inc:52
+#: ../lib/modules/quota.inc:53
 msgid "Inode hard quota contains invalid characters. Only natural numbers are allowed."
 msgstr "inode硬配额包含非法字符,只允许使用自然数."
 
-#: ../lib/modules/quota.inc:55
+#: ../lib/modules/quota.inc:56
 msgid "Inode quota"
 msgstr "inode配额"
 
-#: ../lib/modules/quota.inc:49
+#: ../lib/modules/quota.inc:50
 msgid "Inode soft quota"
 msgstr "inode软配额"
 
-#: ../lib/modules/quota.inc:49
 #: ../lib/modules/quota.inc:50
+#: ../lib/modules/quota.inc:51
 msgid "Inode soft quota contains invalid characters. Only natural numbers are allowed."
 msgstr "inode软配额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:55
 #: ../lib/modules/quota.inc:56
+#: ../lib/modules/quota.inc:57
 msgid "Inode soft quota must be smaller than inode hard quota."
 msgstr "inode软配额必须小于硬配额."
 
@@ -2658,22 +2691,22 @@ msgstr "输入框"
 
 #: ../lib/modules/sambaAccount.inc:62
 #: ../lib/modules/sambaAccount.inc:63
-#: ../lib/modules/sambaSamAccount.inc:82
+#: ../lib/modules/sambaSamAccount.inc:84
 msgid "Inserted user or group name in home path."
 msgstr "在主目录中插入用户名或组名."
 
 #: ../lib/modules/sambaAccount.inc:68
-#: ../lib/modules/sambaSamAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:90
 msgid "Inserted user or group name in logon script."
 msgstr "在登录脚本中插入用户名或组名."
 
 #: ../lib/modules/sambaAccount.inc:65
 #: ../lib/modules/sambaAccount.inc:66
-#: ../lib/modules/sambaSamAccount.inc:85
+#: ../lib/modules/sambaSamAccount.inc:87
 msgid "Inserted user or group name in profile path."
 msgstr "在配置路径中插入用户名或组名."
 
-#: ../lib/modules/fixed_ip.inc:380
+#: ../lib/modules/fixed_ip.inc:386
 msgid "Invalid MAC address."
 msgstr "非法的MAC地址"
 
@@ -2681,32 +2714,32 @@ msgstr "非法的MAC地址"
 msgid "Invalid RDN attribute!"
 msgstr "错误的RDN属性!"
 
-#: ../lib/modules/sambaGroupMapping.inc:72
+#: ../lib/modules/sambaGroupMapping.inc:73
 msgid "Invalid account"
 msgstr "无效的帐号"
 
-#: ../lib/modules/kolabUser.inc:129
-#: ../lib/modules/kolabUser.inc:145
-#: ../lib/modules/kolabUser.inc:192
-#: ../lib/modules/kolabUser.inc:373
-#: ../lib/modules/kolabUser.inc:797
-#: ../lib/modules/kolabUser.inc:920
+#: ../lib/modules/kolabUser.inc:130
+#: ../lib/modules/kolabUser.inc:135
+#: ../lib/modules/kolabUser.inc:182
+#: ../lib/modules/kolabUser.inc:345
+#: ../lib/modules/kolabUser.inc:782
+#: ../lib/modules/kolabUser.inc:905
 msgid "Invitation policy"
 msgstr "邀请原则"
 
-#: ../lib/modules/kolabUser.inc:149
+#: ../lib/modules/kolabUser.inc:139
 msgid "Invitation policy list"
 msgstr "邀请原则列表"
 
-#: ../lib/modules/sambaSamAccount.inc:495
+#: ../lib/modules/sambaSamAccount.inc:515
 msgid "Islamabad, Karachi"
 msgstr "伊斯兰堡,卡拉奇"
 
-#: ../lib/modules/range.inc:99
+#: ../lib/modules/range.inc:101
 msgid "It is not possible to delete all ranges."
 msgstr "不能删除所有范围"
 
-#: ../lib/modules/posixGroup.inc:471
+#: ../lib/modules/posixGroup.inc:497
 #: ../lib/modules/posixAccount.inc:68
 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可能被重用,因为旧的权限有可能仍然存在,所以会带来一些问题.要避免本警告消息,请把最大UID设得高一点."
@@ -2738,7 +2771,7 @@ msgstr "选择一个属性类型"
 msgid "Jump to an object class"
 msgstr "选择一个目标类"
 
-#: ../lib/modules/kolabUser.inc:72
+#: ../lib/modules/kolabUser.inc:73
 msgid "Kolab"
 msgstr "Kolab"
 
@@ -2756,7 +2789,7 @@ msgstr "LAM 配置"
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr "您的输入检查完毕,即将建立帐号"
 
-#: ../lib/modules/posixGroup.inc:411
+#: ../lib/modules/posixGroup.inc:433
 #: ../lib/modules/posixAccount.inc:344
 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 "系统支持CRYPT, SHA, SSHA, MD5 和 SMD5等HASH算法,用来产生密码的HASH值.SSHA 和 CRYPT是最常用的,但CRYPT 不支持8个字符以上的密码.不建议使用明文密码."
@@ -2771,11 +2804,11 @@ msgstr "LAM 测试"
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAM无法建立%s帐号,LDAP发生错误."
 
-#: ../lib/modules/sambaGroupMapping.inc:398
+#: ../lib/modules/sambaGroupMapping.inc:438
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "系统找不到这个Samba域!"
 
-#: ../lib/modules/sambaSamAccount.inc:107
+#: ../lib/modules/sambaSamAccount.inc:109
 msgid "LAM was unable to find a domain with this name!"
 msgstr "LAM找不到这个域!"
 
@@ -2796,26 +2829,18 @@ msgstr "LAM将在这部分LDAP树搜索帐号."
 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."
 
-#: ../templates/profedit/profilepage.php:179
+#: ../templates/profedit/profilepage.php:180
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../templates/config/confmodules.php:76
+#: ../templates/selfService/adminMain.php:107
+#: ../templates/config/conftypes.php:154
 #: ../templates/config/confmain.php:121
 #: ../templates/config/confmain.php:594
-#: ../templates/config/conftypes.php:154
-#: ../templates/selfService/adminMain.php:107
+#: ../templates/config/confmodules.php:76
 msgid "LDAP Account Manager Configuration"
 msgstr "LDAP帐号管理配置"
 
-#: ../lib/modules/kolabUser.inc:142
-msgid "LDAP DN (e.g. dc=company,dc=com) of accounts. This is used to find possible delegation candidates."
-msgstr "帐号的LDAP DN(比如: dc=complay,dc=com).用来查找可能的委托候选人."
-
-#: ../lib/lists.inc:852
-msgid "LDAP Search failed! Please check your preferences."
-msgstr "LDAP搜索失败,请检查配置."
-
 #: ../templates/config/conftypes.php:79
 msgid "LDAP Suffix is invalid!"
 msgstr "LDAP后缀无效!"
@@ -2837,18 +2862,22 @@ msgstr "LDAP 密码"
 msgid "LDAP search attribute"
 msgstr "LDAP搜索属性"
 
+#: ../lib/lists.inc:852
+msgid "LDAP search failed! Please check your preferences."
+msgstr "LDAP搜索失败，请检查配置。"
+
 #: ../templates/login.php:336
 msgid "LDAP server"
 msgstr "LDAP服务器"
 
-#: ../lib/types/group.inc:238
 #: ../lib/lists.inc:835
+#: ../lib/types/group.inc:238
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "超过LDAP限制的大小,无法显示所有条目."
 
-#: ../templates/config/conftypes.php:200
 #: ../templates/selfService/adminMain.php:283
-#: ../templates/profedit/profilepage.php:183
+#: ../templates/profedit/profilepage.php:184
+#: ../templates/config/conftypes.php:200
 #: ../help/help.inc:71
 #: ../help/help.inc:160
 msgid "LDAP suffix"
@@ -2875,11 +2904,11 @@ msgstr "LDAP用户名和密码"
 msgid "LDIF Export for: %s"
 msgstr "输出到LDIF文件名:%s"
 
-#: ../templates/tests/lamdaemonTest.php:205
+#: ../templates/tests/lamdaemonTest.php:214
 msgid "Lamdaemon server and path"
 msgstr "Lamdaemon 服务器和路径"
 
-#: ../templates/tests/lamdaemonTest.php:169
+#: ../templates/tests/lamdaemonTest.php:178
 msgid "Lamdaemon successfully run."
 msgstr "Lamdaemon成功执行."
 
@@ -2889,15 +2918,15 @@ msgstr "Lamdaemon成功执行."
 msgid "Lamdaemon test"
 msgstr "Lamdaemon测试"
 
-#: ../templates/tests/lamdaemonTest.php:306
+#: ../templates/tests/lamdaemonTest.php:319
 msgid "Lamdaemon test finished."
 msgstr "Lamdaemon 测试结束."
 
-#: ../templates/tests/lamdaemonTest.php:300
+#: ../templates/tests/lamdaemonTest.php:311
 msgid "Lamdaemon: Quota module installed"
 msgstr "Lamdaemon: 配额模块已安装."
 
-#: ../templates/tests/lamdaemonTest.php:301
+#: ../templates/tests/lamdaemonTest.php:314
 msgid "Lamdaemon: read quotas"
 msgstr "Lamdaemon: 读取配额"
 
@@ -2923,7 +2952,6 @@ msgstr "上次登录"
 msgid "Last login from"
 msgstr "上一次登录地"
 
-#: ../lib/types/user.inc:88
 #: ../lib/modules/inetOrgPerson.inc:75
 #: ../lib/modules/inetOrgPerson.inc:151
 #: ../lib/modules/inetOrgPerson.inc:202
@@ -2931,6 +2959,7 @@ msgstr "上一次登录地"
 #: ../lib/modules/inetOrgPerson.inc:727
 #: ../lib/modules/inetOrgPerson.inc:1049
 #: ../lib/modules/inetOrgPerson.inc:1351
+#: ../lib/types/user.inc:88
 msgid "Last name"
 msgstr "姓"
 
@@ -2943,13 +2972,14 @@ msgstr "姓包含非法字符或为空!"
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "用户姓.只允许字符,-和空格."
 
-#: ../lib/modules/shadowAccount.inc:370
+#: ../lib/modules/shadowAccount.inc:398
 msgid "Last password change"
 msgstr "最后密码变更"
 
-#: ../lib/modules/dhcp_settings.inc:135
-#: ../lib/modules/dhcp_settings.inc:710
-#: ../lib/modules/dhcp_settings.inc:786
+#: ../lib/modules/dhcp_settings.inc:133
+#: ../lib/modules/dhcp_settings.inc:196
+#: ../lib/modules/dhcp_settings.inc:669
+#: ../lib/modules/dhcp_settings.inc:775
 msgid "Lease time"
 msgstr "释放时间"
 
@@ -2971,7 +3001,7 @@ msgid "List attributes are invalid!"
 msgstr "属性列表非法!"
 
 #: ../lib/modules/sambaAccount.inc:395
-#: ../lib/modules/sambaSamAccount.inc:247
+#: ../lib/modules/sambaSamAccount.inc:264
 msgid "List of Samba workstations the user is allowed to login. Empty means every workstation."
 msgstr "允许用户登录的Samba工作站,留空表示所有工作站."
 
@@ -3003,7 +3033,7 @@ msgstr "本机邮件"
 msgid "Local address list"
 msgstr "本机邮递列表"
 
-#: ../lib/modules/sambaGroupMapping.inc:69
+#: ../lib/modules/sambaGroupMapping.inc:70
 msgid "Local group"
 msgstr "本地组"
 
@@ -3017,7 +3047,7 @@ msgstr "本地组"
 msgid "Location"
 msgstr "地点"
 
-#: ../lib/modules/posixGroup.inc:178
+#: ../lib/modules/posixGroup.inc:192
 #: ../lib/modules/posixAccount.inc:258
 #: ../lib/modules/posixAccount.inc:1034
 msgid "Lock password"
@@ -3059,12 +3089,12 @@ msgstr "日志等级"
 msgid "Logging"
 msgstr "日志"
 
+#: ../templates/selfService/adminMain.php:255
+#: ../templates/selfService/adminLogin.php:61
+#: ../templates/selfService/selfServiceLogin.php:135
 #: ../templates/login.php:311
 #: ../templates/config/conflogin.php:59
 #: ../templates/config/mainlogin.php:67
-#: ../templates/selfService/selfServiceLogin.php:135
-#: ../templates/selfService/adminLogin.php:61
-#: ../templates/selfService/adminMain.php:255
 #: ../help/help.inc:57
 msgid "Login"
 msgstr "登录"
@@ -3079,12 +3109,12 @@ msgstr "登录属性标签"
 msgid "Login caption"
 msgstr "登录标题"
 
-#: ../lib/types/user.inc:90
 #: ../lib/modules/posixAccount.inc:244
 #: ../lib/modules/posixAccount.inc:396
 #: ../lib/modules/posixAccount.inc:1022
 #: ../lib/modules/posixAccount.inc:1173
 #: ../lib/modules/posixAccount.inc:1250
+#: ../lib/types/user.inc:90
 msgid "Login shell"
 msgstr "登录shell"
 
@@ -3098,12 +3128,12 @@ msgstr "标志"
 msgid "Logon for password change"
 msgstr "密码修改登录"
 
-#: ../lib/modules/sambaSamAccount.inc:108
-#: ../lib/modules/sambaSamAccount.inc:271
-#: ../lib/modules/sambaSamAccount.inc:274
-#: ../lib/modules/sambaSamAccount.inc:448
-#: ../lib/modules/sambaSamAccount.inc:1119
-#: ../lib/modules/sambaSamAccount.inc:1517
+#: ../lib/modules/sambaSamAccount.inc:110
+#: ../lib/modules/sambaSamAccount.inc:288
+#: ../lib/modules/sambaSamAccount.inc:291
+#: ../lib/modules/sambaSamAccount.inc:468
+#: ../lib/modules/sambaSamAccount.inc:1159
+#: ../lib/modules/sambaSamAccount.inc:1567
 msgid "Logon hours"
 msgstr "可登录时间"
 
@@ -3114,31 +3144,31 @@ msgstr "可登录时间"
 #: ../lib/modules/sambaAccount.inc:391
 #: ../lib/modules/sambaAccount.inc:794
 #: ../lib/modules/sambaAccount.inc:894
-#: ../lib/modules/sambaSamAccount.inc:87
-#: ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:243
-#: ../lib/modules/sambaSamAccount.inc:422
-#: ../lib/modules/sambaSamAccount.inc:1067
-#: ../lib/modules/sambaSamAccount.inc:1483
-#: ../lib/modules/sambaSamAccount.inc:1647
+#: ../lib/modules/sambaSamAccount.inc:89
+#: ../lib/modules/sambaSamAccount.inc:90
+#: ../lib/modules/sambaSamAccount.inc:260
+#: ../lib/modules/sambaSamAccount.inc:442
+#: ../lib/modules/sambaSamAccount.inc:1107
+#: ../lib/modules/sambaSamAccount.inc:1533
+#: ../lib/modules/sambaSamAccount.inc:1704
 msgid "Logon script"
 msgstr "登录脚本"
 
 #: ../lib/modules/sambaAccount.inc:67
 #: ../lib/modules/sambaAccount.inc:69
-#: ../lib/modules/sambaSamAccount.inc:87
 #: ../lib/modules/sambaSamAccount.inc:89
+#: ../lib/modules/sambaSamAccount.inc:91
 msgid "Logon script is invalid!"
 msgstr "登录脚本非法!"
 
-#: ../templates/selfService/selfServiceMain.php:43
-#: ../templates/selfService/selfServiceMain.php:265
-#: ../templates/main_header.php:69
 #: ../templates/logout.php:67
+#: ../templates/selfService/selfServiceMain.php:43
+#: ../templates/selfService/selfServiceMain.php:273
+#: ../templates/main_header.php:69
 msgid "Logout"
 msgstr "退出"
 
-#: ../lib/modules/dhcp_settings.inc:100
+#: ../lib/modules/dhcp_settings.inc:98
 msgid "M-Node (0x04)"
 msgstr "M-节点 (0x04)"
 
@@ -3146,8 +3176,9 @@ msgstr "M-节点 (0x04)"
 #: ../lib/modules/ieee802device.inc:61
 #: ../lib/modules/ieee802device.inc:72
 #: ../lib/modules/ieee802device.inc:102
-#: ../lib/modules/fixed_ip.inc:78
-#: ../lib/modules/fixed_ip.inc:382
+#: ../lib/modules/fixed_ip.inc:82
+#: ../lib/modules/fixed_ip.inc:389
+#: ../lib/modules/fixed_ip.inc:511
 msgid "MAC address"
 msgstr "MAC地址"
 
@@ -3159,25 +3190,25 @@ msgstr "MAC地址列表"
 msgid "MAC address(es)"
 msgstr "MAC地址"
 
-#: ../lib/modules/sambaSamAccount.inc:501
+#: ../lib/modules/sambaSamAccount.inc:521
 msgid "Magadan, Solomon Islands"
 msgstr "马加丹,所罗门群岛"
 
-#: ../lib/types/mailAlias.inc:44
 #: ../lib/modules/nisMailAlias.inc:55
+#: ../lib/types/mailAlias.inc:44
 msgid "Mail aliases"
 msgstr "邮件别名"
 
-#: ../lib/modules/kolabUser.inc:97
-#: ../lib/modules/kolabUser.inc:181
-#: ../lib/modules/kolabUser.inc:229
-#: ../lib/modules/kolabUser.inc:330
-#: ../lib/modules/kolabUser.inc:781
+#: ../lib/modules/kolabUser.inc:98
+#: ../lib/modules/kolabUser.inc:171
+#: ../lib/modules/kolabUser.inc:219
+#: ../lib/modules/kolabUser.inc:302
+#: ../lib/modules/kolabUser.inc:766
 msgid "Mail quota"
 msgstr "邮件限额"
 
-#: ../lib/modules/kolabUser.inc:257
-#: ../lib/modules/kolabUser.inc:258
+#: ../lib/modules/kolabUser.inc:247
+#: ../lib/modules/kolabUser.inc:248
 msgid "Mail quota must be a number!"
 msgstr "邮件限额必须是数字!"
 
@@ -3185,7 +3216,7 @@ msgstr "邮件限额必须是数字!"
 msgid "Mail routing"
 msgstr "邮件路由"
 
-#: ../lib/modules/kolabUser.inc:85
+#: ../lib/modules/kolabUser.inc:86
 #: ../lib/modules/inetLocalMailRecipient.inc:73
 #: ../lib/modules/inetLocalMailRecipient.inc:79
 #: ../lib/modules/inetLocalMailRecipient.inc:108
@@ -3194,25 +3225,25 @@ msgstr "邮件路由"
 msgid "Mail server"
 msgstr "邮件服务器"
 
-#: ../templates/lists/changePassword.php:325
+#: ../templates/lists/changePassword.php:328
 #, php-format
 msgid "Mail successfully sent to %s."
 msgstr "邮件已经成功发送到%s."
 
-#: ../lib/modules/kolabUser.inc:173
-#: ../lib/modules/kolabUser.inc:204
-#: ../lib/modules/kolabUser.inc:318
-#: ../lib/modules/kolabUser.inc:324
-#: ../lib/modules/kolabUser.inc:777
+#: ../lib/modules/kolabUser.inc:163
+#: ../lib/modules/kolabUser.inc:194
+#: ../lib/modules/kolabUser.inc:290
+#: ../lib/modules/kolabUser.inc:296
+#: ../lib/modules/kolabUser.inc:762
 msgid "Mailbox home server"
 msgstr "邮件宿主服务器"
 
-#: ../lib/modules/kolabUser.inc:253
+#: ../lib/modules/kolabUser.inc:243
 msgid "Mailbox home server name is empty!"
 msgstr "邮件宿主服务器为空 !"
 
-#: ../lib/modules/kolabUser.inc:251
-#: ../lib/modules/kolabUser.inc:252
+#: ../lib/modules/kolabUser.inc:241
+#: ../lib/modules/kolabUser.inc:242
 msgid "Mailbox home server name is invalid!"
 msgstr "邮件宿主服务器非法!"
 
@@ -3233,6 +3264,14 @@ msgstr "主要设置"
 msgid "Main page caption"
 msgstr "主页标题"
 
+#: ../templates/pdfedit/pdfmain.php:145
+msgid "Manage existing PDF structures"
+msgstr "管理已有的PDF架构"
+
+#: ../templates/profedit/profilemain.php:136
+msgid "Manage existing profiles"
+msgstr "管理已有的设置"
+
 #: ../templates/selfService/adminLogin.php:137
 msgid "Manage self service profiles"
 msgstr "管理自助服务设置"
@@ -3252,31 +3291,31 @@ msgstr "管理员"
 msgid "Manages OU objects in your LDAP tree."
 msgstr "管理LDAP树OU对象."
 
-#: ../lib/modules/kolabUser.inc:50
+#: ../lib/modules/kolabUser.inc:52
 msgid "Manual"
 msgstr "手动"
 
-#: ../lib/modules/kolabUser.inc:52
+#: ../lib/modules/kolabUser.inc:54
 msgid "Manual if conflicts"
 msgstr "如果冲突使用手动"
 
-#: ../lib/modules/kolabUser.inc:422
-#: ../lib/modules/kolabUser.inc:588
+#: ../lib/modules/kolabUser.inc:394
+#: ../lib/modules/kolabUser.inc:571
 msgid "Mark account for deletion"
 msgstr "将此帐号标记为删除"
 
-#: ../lib/modules/kolabUser.inc:185
+#: ../lib/modules/kolabUser.inc:175
 msgid "Mark for deletion"
 msgstr "标记为删除"
 
-#: ../templates/config/profmanage.php:355
 #: ../templates/selfService/profManage.php:249
+#: ../templates/config/profmanage.php:355
 #: ../help/help.inc:126
 msgid "Master password"
 msgstr "管理员密码"
 
-#: ../templates/config/profmanage.php:69
 #: ../templates/selfService/profManage.php:57
+#: ../templates/config/profmanage.php:69
 msgid "Master password is wrong!"
 msgstr "系统管理员密码错误!"
 
@@ -3293,17 +3332,17 @@ msgstr "匹配规则OID"
 msgid "Matching rules"
 msgstr "匹配规则"
 
-#: ../lib/modules/posixGroup.inc:315
-#: ../lib/modules/posixGroup.inc:475
-#: ../lib/modules/posixGroup.inc:476
+#: ../lib/modules/posixGroup.inc:329
+#: ../lib/modules/posixGroup.inc:501
+#: ../lib/modules/posixGroup.inc:502
 msgid "Maximum GID number"
 msgstr "最大GID号"
 
-#: ../lib/modules/posixGroup.inc:475
+#: ../lib/modules/posixGroup.inc:501
 msgid "Maximum GID number is invalid or empty!"
 msgstr "最大的GID非法或为空!"
 
-#: ../lib/modules/posixGroup.inc:476
+#: ../lib/modules/posixGroup.inc:502
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "最大GID必须大于最小GID!"
 
@@ -3331,14 +3370,15 @@ msgstr "最大UID号必须大于最小UID号!"
 msgid "Maximum file size: %s"
 msgstr "最大文件大小: %s"
 
-#: ../lib/modules/dhcp_settings.inc:138
-#: ../lib/modules/dhcp_settings.inc:716
-#: ../lib/modules/dhcp_settings.inc:792
+#: ../lib/modules/dhcp_settings.inc:136
+#: ../lib/modules/dhcp_settings.inc:201
+#: ../lib/modules/dhcp_settings.inc:675
+#: ../lib/modules/dhcp_settings.inc:776
 msgid "Maximum lease time"
 msgstr "最大释放时间"
 
-#: ../templates/tree/add_value_form.php:194
 #: ../templates/schema/schema.php:219
+#: ../templates/tree/add_value_form.php:194
 msgid "Maximum length"
 msgstr "最大长度"
 
@@ -3347,12 +3387,12 @@ msgstr "最大长度"
 msgid "Maximum list entries"
 msgstr "最大列表条目"
 
-#: ../lib/modules/shadowAccount.inc:48
-#: ../lib/modules/shadowAccount.inc:54
-#: ../lib/modules/shadowAccount.inc:104
-#: ../lib/modules/shadowAccount.inc:170
-#: ../lib/modules/shadowAccount.inc:200
-#: ../lib/modules/shadowAccount.inc:288
+#: ../lib/modules/shadowAccount.inc:59
+#: ../lib/modules/shadowAccount.inc:65
+#: ../lib/modules/shadowAccount.inc:115
+#: ../lib/modules/shadowAccount.inc:181
+#: ../lib/modules/shadowAccount.inc:211
+#: ../lib/modules/shadowAccount.inc:310
 #: ../lib/modules/sambaDomain.inc:122
 #: ../lib/modules/sambaDomain.inc:200
 #: ../lib/modules/sambaDomain.inc:202
@@ -3369,11 +3409,11 @@ msgstr "密码最长生命"
 msgid "Members"
 msgstr "组成员"
 
-#: ../lib/modules/sambaSamAccount.inc:488
+#: ../lib/modules/sambaSamAccount.inc:508
 msgid "Mid-Atlantic"
 msgstr "大西洋地区中部"
 
-#: ../lib/modules/sambaSamAccount.inc:479
+#: ../lib/modules/sambaSamAccount.inc:499
 msgid "Midway Island, Samoa"
 msgstr "中途岛,萨摩亚"
 
@@ -3387,12 +3427,12 @@ msgstr "米勒"
 msgid "Minimal password length"
 msgstr "最短密码长度"
 
-#: ../lib/modules/posixGroup.inc:312
-#: ../lib/modules/posixGroup.inc:474
+#: ../lib/modules/posixGroup.inc:326
+#: ../lib/modules/posixGroup.inc:500
 msgid "Minimum GID number"
 msgstr "最小GID号"
 
-#: ../lib/modules/posixGroup.inc:474
+#: ../lib/modules/posixGroup.inc:500
 msgid "Minimum GID number is invalid or empty!"
 msgstr "最小GID错误或为空"
 
@@ -3420,11 +3460,11 @@ msgstr "最少小写字母字符数"
 msgid "Minimum numeric characters"
 msgstr "最少数字字符数"
 
-#: ../lib/modules/shadowAccount.inc:46
-#: ../lib/modules/shadowAccount.inc:99
-#: ../lib/modules/shadowAccount.inc:166
-#: ../lib/modules/shadowAccount.inc:194
-#: ../lib/modules/shadowAccount.inc:282
+#: ../lib/modules/shadowAccount.inc:57
+#: ../lib/modules/shadowAccount.inc:110
+#: ../lib/modules/shadowAccount.inc:177
+#: ../lib/modules/shadowAccount.inc:205
+#: ../lib/modules/shadowAccount.inc:304
 #: ../lib/modules/sambaDomain.inc:118
 #: ../lib/modules/sambaDomain.inc:201
 #: ../lib/modules/sambaDomain.inc:319
@@ -3458,7 +3498,7 @@ msgstr "手机号码"
 msgid "Mobile telephone number"
 msgstr "手机号码"
 
-#: ../templates/lists/changePassword.php:177
+#: ../templates/lists/changePassword.php:180
 msgid "Mode"
 msgstr "模式"
 
@@ -3466,22 +3506,22 @@ msgstr "模式"
 msgid "Module selection"
 msgstr "模块选择"
 
-#: ../lib/modules/sambaSamAccount.inc:1189
+#: ../lib/modules/sambaSamAccount.inc:1229
 msgid "Monday"
 msgstr "星期一"
 
-#: ../lib/modules/sambaSamAccount.inc:483
+#: ../lib/modules/sambaSamAccount.inc:503
 msgid "Mountain Time (US & Canada)"
 msgstr "时区(美国和加拿大)"
 
-#: ../lib/modules/quota.inc:92
-#: ../lib/modules/quota.inc:356
-#: ../lib/modules/quota.inc:442
-#: ../lib/modules/quota.inc:551
+#: ../lib/modules/quota.inc:93
+#: ../lib/modules/quota.inc:374
+#: ../lib/modules/quota.inc:460
+#: ../lib/modules/quota.inc:569
 msgid "Mountpoint"
 msgstr "挂接点"
 
-#: ../lib/modules/quota.inc:93
+#: ../lib/modules/quota.inc:94
 msgid "Mountpoint of device with enabled quotas."
 msgstr "可限制配额设备挂接点"
 
@@ -3497,9 +3537,9 @@ msgstr "城市"
 msgid "Mystreetname 42"
 msgstr "街道42号"
 
+#: ../templates/schema/schema.php:273
 #: ../templates/tree/templates/creation/new_ou_template.php:59
 #: ../templates/tree/templates/creation/new_ou_template.php:104
-#: ../templates/schema/schema.php:273
 #: ../templates/pdfedit/pdfdelete.php:62
 #: ../templates/pdfedit/pdfdelete.php:65
 #: ../templates/pdfedit/pdfdelete.php:90
@@ -3511,20 +3551,23 @@ msgstr "名"
 msgid "Name under which the profile will be saved. If a profile with the same name exists, it will be overwritten."
 msgstr "将来保存的配置名,如果配置名存在,会被覆盖."
 
-#: ../lib/modules/dhcp_settings.inc:168
-#: ../lib/modules/dhcp_settings.inc:755
+#: ../lib/modules/dhcp_settings.inc:166
+#: ../lib/modules/dhcp_settings.inc:714
+#: ../lib/modules/dhcp_settings.inc:782
 msgid "Net mask"
 msgstr "子网掩码"
 
-#: ../lib/modules/dhcp_settings.inc:147
-#: ../lib/modules/dhcp_settings.inc:734
-#: ../lib/modules/dhcp_settings.inc:810
-msgid "Netbios name server"
+#: ../lib/modules/dhcp_settings.inc:145
+#: ../lib/modules/dhcp_settings.inc:216
+#: ../lib/modules/dhcp_settings.inc:693
+#: ../lib/modules/dhcp_settings.inc:779
+msgid "Netbios name servers"
 msgstr "Netbios命名服务器"
 
-#: ../lib/modules/dhcp_settings.inc:150
-#: ../lib/modules/dhcp_settings.inc:741
-#: ../lib/modules/dhcp_settings.inc:816
+#: ../lib/modules/dhcp_settings.inc:148
+#: ../lib/modules/dhcp_settings.inc:221
+#: ../lib/modules/dhcp_settings.inc:700
+#: ../lib/modules/dhcp_settings.inc:780
 msgid "Netbios node type"
 msgstr "Netbios 节点类型"
 
@@ -3536,7 +3579,7 @@ msgstr "新DHCP"
 msgid "New MAC address"
 msgstr "新MAC地址"
 
-#: ../templates/ou_edit.php:67
+#: ../templates/ou_edit.php:71
 msgid "New OU created successfully."
 msgstr "新OU建立成功."
 
@@ -3549,6 +3592,7 @@ msgid "New York"
 msgstr "纽约"
 
 #: ../lib/types/mailAlias.inc:110
+#: ../lib/types/alias.inc:110
 msgid "New alias"
 msgstr "新别名"
 
@@ -3564,8 +3608,8 @@ msgstr "新域"
 msgid "New field"
 msgstr "新字段"
 
-#: ../lib/types/gon.inc:112
 #: ../lib/types/group.inc:124
+#: ../lib/types/gon.inc:112
 msgid "New group"
 msgstr "新组"
 
@@ -3590,7 +3634,7 @@ msgid "New object"
 msgstr "新对象"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:47
-#: ../templates/ou_edit.php:168
+#: ../templates/ou_edit.php:173
 #: ../help/help.inc:187
 msgid "New organizational unit"
 msgstr "新组织单元"
@@ -3608,8 +3652,8 @@ msgstr "新密码"
 msgid "New password set successfully."
 msgstr "新密码设置成功."
 
-#: ../lib/modules/range.inc:87
-#: ../lib/modules/range.inc:98
+#: ../lib/modules/range.inc:89
+#: ../lib/modules/range.inc:100
 #: ../lib/modules/range.inc:451
 #: ../lib/modules/range.inc:452
 msgid "New range"
@@ -3635,9 +3679,9 @@ msgstr "新用户"
 msgid "New value"
 msgstr "新值"
 
-#: ../templates/tree/create_form.php:138
-#: ../templates/tree/templates/creation/custom.php:86
 #: ../templates/tree/templates/creation/new_ou_template.php:69
+#: ../templates/tree/templates/creation/custom.php:86
+#: ../templates/tree/create_form.php:138
 msgid "Next"
 msgstr "下一步"
 
@@ -3700,12 +3744,12 @@ msgstr "否"
 msgid "No DHCPs found!"
 msgstr "没有发现DHCP主机!"
 
-#: ../lib/modules/sambaSamAccount.inc:525
-#: ../lib/modules/sambaSamAccount.inc:593
-#: ../lib/modules/sambaSamAccount.inc:918
-#: ../lib/modules/sambaGroupMapping.inc:89
-#: ../lib/modules/sambaGroupMapping.inc:180
-#: ../lib/modules/sambaGroupMapping.inc:429
+#: ../lib/modules/sambaGroupMapping.inc:90
+#: ../lib/modules/sambaGroupMapping.inc:217
+#: ../lib/modules/sambaGroupMapping.inc:470
+#: ../lib/modules/sambaSamAccount.inc:545
+#: ../lib/modules/sambaSamAccount.inc:622
+#: ../lib/modules/sambaSamAccount.inc:953
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "在LDAP中没有发现Samba域,请先建立一个."
 
@@ -3716,6 +3760,7 @@ msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "在LDAP中没有发现Unix组,请先建立一个."
 
 #: ../lib/types/mailAlias.inc:109
+#: ../lib/types/alias.inc:109
 msgid "No aliases found!"
 msgstr "没有发现别名!"
 
@@ -3735,13 +3780,13 @@ msgstr "没有发现域!"
 msgid "No file selected."
 msgstr "没有选择文件!"
 
-#: ../lib/modules/posixGroup.inc:472
+#: ../lib/modules/posixGroup.inc:498
 #: ../lib/modules/posixAccount.inc:67
 msgid "No free ID-Number!"
 msgstr "没有可用的ID号!"
 
-#: ../lib/types/gon.inc:111
 #: ../lib/types/group.inc:123
+#: ../lib/types/gon.inc:111
 msgid "No groups found!"
 msgstr "没有发现组!"
 
@@ -3753,12 +3798,12 @@ msgstr "没有发现主机!"
 msgid "No internal attributes"
 msgstr "没有内部属性"
 
-#: ../templates/tests/lamdaemonTest.php:212
+#: ../templates/tests/lamdaemonTest.php:221
 msgid "No lamdaemon path set, please update your LAM configuration settings."
 msgstr "没有设定lamdaemon路径设置,请更改LAM配置."
 
 #: ../templates/tests/lamdaemonTest.php:113
-#: ../templates/tests/lamdaemonTest.php:208
+#: ../templates/tests/lamdaemonTest.php:217
 msgid "No lamdaemon server set, please update your LAM configuration settings."
 msgstr "没有设置lamdaemon服务器,请先设置LAM配置."
 
@@ -3798,7 +3843,7 @@ msgstr "没有服务器设置,请先建立一个."
 msgid "No static text specified"
 msgstr "没有指定静态文本"
 
-#: ../lib/modules/dhcp_settings.inc:178
+#: ../lib/modules/dhcp_settings.inc:237
 msgid "No subnet entered."
 msgstr "没有输入子网掩码!"
 
@@ -3831,15 +3876,15 @@ msgstr "注意"
 msgid "Number of child entries"
 msgstr "子条目的数量"
 
-#: ../lib/modules/shadowAccount.inc:163
+#: ../lib/modules/shadowAccount.inc:174
 msgid "Number of days a user can login even his password has expired. -1=always."
 msgstr "用户密码过期后允许登录的天数,-1为不限制."
 
-#: ../lib/modules/shadowAccount.inc:167
+#: ../lib/modules/shadowAccount.inc:178
 msgid "Number of days a user has to wait until he is allowed to change his password again. If set value must be >0."
 msgstr "允许用户修改密码的最短间隔天数,如果设置一定要大于0."
 
-#: ../lib/modules/shadowAccount.inc:171
+#: ../lib/modules/shadowAccount.inc:182
 msgid "Number of days after a user has to change his password again. If set value must be >0."
 msgstr "用户必须再次修改密码的天数.如果设置一定要大于0."
 
@@ -3860,24 +3905,25 @@ msgstr "多後之後使用者必須更改密碼.(密碼到期),以秒為單位"
 msgid "OID"
 msgstr "OID"
 
-#: ../templates/ou_edit.php:73
+#: ../templates/ou_edit.php:77
 msgid "OU already exists!"
 msgstr "OU已经存在!"
 
-#: ../templates/ou_edit.php:84
+#: ../templates/ou_edit.php:88
 msgid "OU deleted successfully."
 msgstr "OU删除成功."
 
 #: ../templates/ou_edit.php:155
+#: ../templates/ou_edit.php:169
 #: ../templates/tools.php:72
 msgid "OU editor"
 msgstr "OU编辑器"
 
-#: ../templates/ou_edit.php:77
+#: ../templates/ou_edit.php:81
 msgid "OU is invalid!"
 msgstr "OU无效!"
 
-#: ../templates/ou_edit.php:114
+#: ../templates/ou_edit.php:112
 msgid "OU is not empty or invalid!"
 msgstr "OU不为空或非法!"
 
@@ -3886,9 +3932,9 @@ msgstr "OU不为空或非法!"
 msgid "OU-Editor"
 msgstr "OU编辑器"
 
-#: ../templates/tree/templates/creation/custom.php:70
 #: ../templates/schema/schema.php:70
 #: ../templates/schema/schema.php:71
+#: ../templates/tree/templates/creation/custom.php:70
 msgid "Object classes"
 msgstr "对象类"
 
@@ -3916,36 +3962,37 @@ msgid "Office name"
 msgstr "办公室名"
 
 #: ../templates/tree/export_form.php:165
-#: ../templates/tests/lamdaemonTest.php:108
-#: ../templates/ou_edit.php:200
-#: ../templates/masscreate.php:110
-#: ../templates/config/profmanage.php:360
-#: ../templates/config/mainmanage.php:374
-#: ../templates/config/confmodules.php:110
-#: ../templates/config/confmodules.php:113
-#: ../templates/config/confmain.php:454
-#: ../templates/config/conftypes.php:238
-#: ../templates/config/conflogin.php:125
-#: ../templates/config/conflogin.php:126
-#: ../templates/config/mainlogin.php:118
-#: ../templates/selfService/selfServiceLogin.php:209
 #: ../templates/selfService/profManage.php:254
-#: ../templates/selfService/adminLogin.php:122
-#: ../templates/selfService/adminLogin.php:123
 #: ../templates/selfService/adminMain.php:470
 #: ../templates/selfService/adminMain.php:504
 #: ../templates/selfService/adminMain.php:544
-#: ../templates/pdfedit/pdfmain.php:155
+#: ../templates/selfService/adminLogin.php:122
+#: ../templates/selfService/adminLogin.php:123
+#: ../templates/selfService/selfServiceLogin.php:209
+#: ../templates/tests/lamdaemonTest.php:108
+#: ../templates/masscreate.php:112
+#: ../templates/ou_edit.php:180
+#: ../templates/ou_edit.php:196
 #: ../templates/profedit/profiledelete.php:85
-#: ../templates/profedit/profilemain.php:168
-#: ../lib/modules/posixGroup.inc:274
-#: ../lib/modules/sambaSamAccount.inc:1236
-#: ../lib/modules/sambaSamAccount.inc:1407
-#: ../lib/modules/posixAccount.inc:1136
+#: ../templates/config/conftypes.php:238
+#: ../templates/config/conflogin.php:125
+#: ../templates/config/conflogin.php:126
+#: ../templates/config/mainmanage.php:374
+#: ../templates/config/confmain.php:454
+#: ../templates/config/profmanage.php:360
+#: ../templates/config/confmodules.php:110
+#: ../templates/config/confmodules.php:113
+#: ../templates/config/mainlogin.php:118
 #: ../lib/modules/inetOrgPerson.inc:995
 #: ../lib/modules/groupOfNames.inc:230
 #: ../lib/modules/groupOfNames.inc:257
 #: ../lib/modules/groupOfNames.inc:344
+#: ../lib/modules/posixGroup.inc:288
+#: ../lib/modules/posixAccount.inc:1136
+#: ../lib/modules/sambaSamAccount.inc:1276
+#: ../lib/modules/sambaSamAccount.inc:1447
+#: ../lib/modules/aliasEntry.inc:146
+#: ../lib/modules/aliasEntry.inc:172
 #: ../lib/lists.inc:666
 #: ../lib/lists.inc:897
 msgid "Ok"
@@ -3964,9 +4011,9 @@ msgstr "旧值"
 msgid "On"
 msgstr "On"
 
-#: ../lib/modules/sambaSamAccount.inc:316
-#: ../lib/modules/sambaSamAccount.inc:1392
-#: ../lib/modules/sambaSamAccount.inc:1716
+#: ../lib/modules/sambaSamAccount.inc:333
+#: ../lib/modules/sambaSamAccount.inc:1432
+#: ../lib/modules/sambaSamAccount.inc:1773
 msgid "On broken or timed out connection"
 msgstr "中断或超时连接"
 
@@ -3974,13 +4021,13 @@ msgstr "中断或超时连接"
 msgid "One (one level beneath base)"
 msgstr "One (基类下第一层)"
 
-#: ../lib/modules/range.inc:97
-#: ../lib/modules/fixed_ip.inc:97
+#: ../lib/modules/range.inc:99
+#: ../lib/modules/fixed_ip.inc:100
 msgid "One or more errors occured. The invalid fields are marked."
 msgstr "发生了错误,非法域已经被标记."
 
-#: ../templates/tree/templates/creation/custom.php:209
 #: ../templates/schema/schema.php:389
+#: ../templates/tree/templates/creation/custom.php:209
 msgid "Optional attributes"
 msgstr "可选属性"
 
@@ -3988,7 +4035,7 @@ msgstr "可选属性"
 msgid "Optional binary attributes"
 msgstr "可选二进制属性"
 
-#: ../templates/lists/changePassword.php:129
+#: ../templates/lists/changePassword.php:132
 msgid "Options"
 msgstr "选项"
 
@@ -4005,24 +4052,26 @@ msgid "Other"
 msgstr "其它"
 
 #: ../templates/config/confmain.php:387
-#: ../lib/types/gon.inc:85
 #: ../lib/modules/groupOfNames.inc:68
 #: ../lib/modules/groupOfNames.inc:97
 #: ../lib/modules/groupOfNames.inc:149
 #: ../lib/modules/groupOfNames.inc:167
 #: ../lib/modules/groupOfNames.inc:447
+#: ../lib/types/gon.inc:85
 msgid "Owner"
 msgstr "拥有者"
 
-#: ../lib/modules/dhcp_settings.inc:99
+#: ../lib/modules/dhcp_settings.inc:97
 msgid "P-Node (0x02)"
 msgstr "P-节点 (0x02)"
 
-#: ../lib/modules/fixed_ip.inc:75
-#: ../lib/modules/fixed_ip.inc:369
+#: ../lib/modules/fixed_ip.inc:79
+#: ../lib/modules/fixed_ip.inc:375
+#: ../lib/modules/fixed_ip.inc:511
 msgid "PC name"
 msgstr "PC机器名"
 
+#: ../templates/pdfedit/pdfmain.php:118
 #: ../templates/tools.php:80
 msgid "PDF editor"
 msgstr "PDF编辑器"
@@ -4035,19 +4084,15 @@ msgstr "PDF架构"
 msgid "PDF structure was successfully saved."
 msgstr "PDF架构成功保存."
 
-#: ../templates/pdfedit/pdfmain.php:115
-msgid "PDF structures"
-msgstr "PDF架构"
-
 #: ../templates/pdfedit/pdfpage.php:95
 msgid "PDF-structure name not valid"
 msgstr "PDF架构名无效"
 
-#: ../lib/modules/sambaSamAccount.inc:482
+#: ../lib/modules/sambaSamAccount.inc:502
 msgid "Pacific Time (US & Canada)"
 msgstr "太平洋时间(美国和加拿大)"
 
-#: ../lib/modules/dhcp_settings.inc:145
+#: ../lib/modules/dhcp_settings.inc:143
 msgid "Packets are sent to the default gateway if the receiver does not reside in the same network. The default gateway routes them to the target network."
 msgstr "如果数据包的接收者不在同一个网络,数据包将会发往缺省网关.缺省网关将数据包转向目标网络."
 
@@ -4055,20 +4100,23 @@ msgstr "如果数据包的接收者不在同一个网络,数据包将会发往
 msgid "Parent to"
 msgstr "继承于"
 
-#: ../templates/lists/changePassword.php:201
-#: ../templates/login.php:275
 #: ../templates/selfService/selfServiceLogin.php:195
-#: ../lib/modules/posixGroup.inc:173
-#: ../lib/modules/posixGroup.inc:185
-#: ../lib/modules/posixGroup.inc:265
-#: ../lib/modules/posixGroup.inc:468
-#: ../lib/modules/posixGroup.inc:469
+#: ../templates/lists/changePassword.php:204
+#: ../templates/login.php:275
+#: ../lib/modules/inetOrgPerson.inc:103
+#: ../lib/modules/inetOrgPerson.inc:104
+#: ../lib/modules/inetOrgPerson.inc:458
+#: ../lib/modules/inetOrgPerson.inc:755
+#: ../lib/modules/inetOrgPerson.inc:766
+#: ../lib/modules/inetOrgPerson.inc:986
 #: ../lib/modules/sambaAccount.inc:74
 #: ../lib/modules/sambaAccount.inc:75
 #: ../lib/modules/sambaAccount.inc:229
-#: ../lib/modules/sambaSamAccount.inc:92
-#: ../lib/modules/sambaSamAccount.inc:93
-#: ../lib/modules/sambaSamAccount.inc:345
+#: ../lib/modules/posixGroup.inc:187
+#: ../lib/modules/posixGroup.inc:199
+#: ../lib/modules/posixGroup.inc:279
+#: ../lib/modules/posixGroup.inc:494
+#: ../lib/modules/posixGroup.inc:495
 #: ../lib/modules/posixAccount.inc:72
 #: ../lib/modules/posixAccount.inc:73
 #: ../lib/modules/posixAccount.inc:136
@@ -4078,24 +4126,26 @@ msgstr "继承于"
 #: ../lib/modules/posixAccount.inc:1040
 #: ../lib/modules/posixAccount.inc:1121
 #: ../lib/modules/posixAccount.inc:1253
-#: ../lib/modules/inetOrgPerson.inc:103
-#: ../lib/modules/inetOrgPerson.inc:104
-#: ../lib/modules/inetOrgPerson.inc:458
-#: ../lib/modules/inetOrgPerson.inc:755
-#: ../lib/modules/inetOrgPerson.inc:766
-#: ../lib/modules/inetOrgPerson.inc:986
+#: ../lib/modules/sambaSamAccount.inc:94
+#: ../lib/modules/sambaSamAccount.inc:95
+#: ../lib/modules/sambaSamAccount.inc:365
 msgid "Password"
 msgstr "密码"
 
-#: ../lib/modules/posixGroup.inc:469
-#: ../lib/modules/sambaAccount.inc:75
-#: ../lib/modules/sambaAccount.inc:76
-#: ../lib/modules/sambaSamAccount.inc:93
-#: ../lib/modules/sambaSamAccount.inc:94
-#: ../lib/modules/posixAccount.inc:73
-#: ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/sambaSamAccount.inc:243
+#: ../lib/modules/sambaSamAccount.inc:1020
+msgid "Password change at next login"
+msgstr "下次登录时修改密码"
+
 #: ../lib/modules/inetOrgPerson.inc:104
 #: ../lib/modules/inetOrgPerson.inc:105
+#: ../lib/modules/sambaAccount.inc:75
+#: ../lib/modules/sambaAccount.inc:76
+#: ../lib/modules/posixGroup.inc:495
+#: ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/sambaSamAccount.inc:95
+#: ../lib/modules/sambaSamAccount.inc:96
 msgid "Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!%&/|?{[()]}=@$ !"
 msgstr "密码包括无效字符,合法字符为a-z, A-Z, 0-9 和 #*,.;:_-+!%&/|?{[()]}=@$ !"
 
@@ -4104,30 +4154,30 @@ msgstr "密码包括无效字符,合法字符为a-z, A-Z, 0-9 和 #*,.;:_-+!%&/|
 #: ../lib/modules/sambaAccount.inc:365
 #: ../lib/modules/sambaAccount.inc:368
 #: ../lib/modules/sambaAccount.inc:759
-#: ../lib/modules/sambaSamAccount.inc:214
-#: ../lib/modules/sambaSamAccount.inc:217
-#: ../lib/modules/sambaSamAccount.inc:367
-#: ../lib/modules/sambaSamAccount.inc:968
-#: ../lib/modules/sambaSamAccount.inc:1446
+#: ../lib/modules/sambaSamAccount.inc:228
+#: ../lib/modules/sambaSamAccount.inc:231
+#: ../lib/modules/sambaSamAccount.inc:387
+#: ../lib/modules/sambaSamAccount.inc:1003
+#: ../lib/modules/sambaSamAccount.inc:1486
 msgid "Password does not expire"
 msgstr "密码永不过期"
 
-#: ../lib/modules/shadowAccount.inc:50
-#: ../lib/modules/shadowAccount.inc:94
-#: ../lib/modules/shadowAccount.inc:162
-#: ../lib/modules/shadowAccount.inc:188
-#: ../lib/modules/shadowAccount.inc:276
-#: ../lib/modules/shadowAccount.inc:373
+#: ../lib/modules/shadowAccount.inc:61
+#: ../lib/modules/shadowAccount.inc:105
+#: ../lib/modules/shadowAccount.inc:173
+#: ../lib/modules/shadowAccount.inc:199
+#: ../lib/modules/shadowAccount.inc:298
+#: ../lib/modules/shadowAccount.inc:401
 msgid "Password expiration"
 msgstr "密码超期"
 
-#: ../lib/modules/shadowAccount.inc:50
-#: ../lib/modules/shadowAccount.inc:51
+#: ../lib/modules/shadowAccount.inc:61
+#: ../lib/modules/shadowAccount.inc:62
 msgid "Password expiration must be are natural number or -1."
 msgstr "密码超期必须是自然数或-1."
 
-#: ../lib/modules/posixGroup.inc:410
-#: ../lib/modules/posixGroup.inc:429
+#: ../lib/modules/posixGroup.inc:432
+#: ../lib/modules/posixGroup.inc:455
 #: ../lib/modules/posixAccount.inc:140
 #: ../lib/modules/posixAccount.inc:175
 #: ../lib/modules/posixAccount.inc:343
@@ -4140,20 +4190,20 @@ msgstr "密码哈希类型"
 msgid "Password history length"
 msgstr "历史密码长度"
 
-#: ../lib/modules/shadowAccount.inc:48
-#: ../lib/modules/shadowAccount.inc:49
+#: ../lib/modules/shadowAccount.inc:59
+#: ../lib/modules/shadowAccount.inc:60
 #: ../lib/modules/sambaDomain.inc:202
 msgid "Password maximum age must be are natural number."
 msgstr "密码最长生命期必须是自然数."
 
-#: ../lib/modules/shadowAccount.inc:54
-#: ../lib/modules/shadowAccount.inc:55
+#: ../lib/modules/shadowAccount.inc:65
+#: ../lib/modules/shadowAccount.inc:66
 #: ../lib/modules/sambaDomain.inc:200
 msgid "Password maximum age must be bigger as password minimum age."
 msgstr "密码最长生命期必须小于最短生命期."
 
-#: ../lib/modules/shadowAccount.inc:46
-#: ../lib/modules/shadowAccount.inc:47
+#: ../lib/modules/shadowAccount.inc:57
+#: ../lib/modules/shadowAccount.inc:58
 #: ../lib/modules/sambaDomain.inc:201
 msgid "Password minimum age must be are natural number."
 msgstr "密码最短生命期必须是自然数."
@@ -4163,17 +4213,17 @@ msgstr "密码最短生命期必须是自然数."
 msgid "Password policy"
 msgstr "密码策略"
 
-#: ../lib/modules/shadowAccount.inc:52
-#: ../lib/modules/shadowAccount.inc:89
-#: ../lib/modules/shadowAccount.inc:158
-#: ../lib/modules/shadowAccount.inc:182
-#: ../lib/modules/shadowAccount.inc:270
-#: ../lib/modules/shadowAccount.inc:371
+#: ../lib/modules/shadowAccount.inc:63
+#: ../lib/modules/shadowAccount.inc:100
+#: ../lib/modules/shadowAccount.inc:169
+#: ../lib/modules/shadowAccount.inc:193
+#: ../lib/modules/shadowAccount.inc:292
+#: ../lib/modules/shadowAccount.inc:399
 msgid "Password warning"
 msgstr "密码提醒日期"
 
-#: ../lib/modules/shadowAccount.inc:52
-#: ../lib/modules/shadowAccount.inc:53
+#: ../lib/modules/shadowAccount.inc:63
+#: ../lib/modules/shadowAccount.inc:64
 msgid "Password warning must be are natural number."
 msgstr "密码提醒日期必须是自然数."
 
@@ -4181,12 +4231,12 @@ msgstr "密码提醒日期必须是自然数."
 msgid "Passwords are different!"
 msgstr "密码不同!"
 
-#: ../lib/modules/sambaSamAccount.inc:290
+#: ../lib/modules/sambaSamAccount.inc:307
 msgid "Path of the user profile."
 msgstr "用户配置文件所在路径。"
 
 #: ../lib/modules/sambaAccount.inc:389
-#: ../lib/modules/sambaSamAccount.inc:241
+#: ../lib/modules/sambaSamAccount.inc:258
 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会被用户名和组名代替."
 
@@ -4194,8 +4244,8 @@ msgstr "用户配置文件路径. 可以是本地绝对路径或UNC路径(\\\\se
 msgid "Path to external script"
 msgstr "外部脚本路径"
 
-#: ../lib/modules/ddns.inc:73
-#: ../lib/modules/ddns.inc:446
+#: ../lib/modules/ddns.inc:90
+#: ../lib/modules/ddns.inc:302
 msgid "Path to key for DNS updates"
 msgstr "DNS更新的KEY文件所有路径"
 
@@ -4207,13 +4257,13 @@ msgstr "也要永久删除所有子集?"
 msgid "Personal"
 msgstr "个人信息"
 
-#: ../lib/types/user.inc:93
-#: ../lib/types/user.inc:209
 #: ../lib/modules/inetOrgPerson.inc:154
 #: ../lib/modules/inetOrgPerson.inc:939
 #: ../lib/modules/inetOrgPerson.inc:1475
 #: ../lib/modules/inetOrgPerson.inc:1478
 #: ../lib/modules/inetOrgPerson.inc:1492
+#: ../lib/types/user.inc:93
+#: ../lib/types/user.inc:209
 msgid "Photo"
 msgstr "照片"
 
@@ -4233,7 +4283,7 @@ msgstr "请确认:"
 msgid "Please enter \"active\" or \"inactive\"."
 msgstr "请输入 \"active\" 或 \"inactive\"."
 
-#: ../lib/modules/sambaSamAccount.inc:95
+#: ../lib/modules/sambaSamAccount.inc:97
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "请输入RID或特殊账号名!"
 
@@ -4243,8 +4293,8 @@ msgstr "请输入允许用户登录的主机名(以逗号分隔).如果已经启
 
 #: ../lib/modules/sambaAccount.inc:70
 #: ../lib/modules/sambaAccount.inc:71
-#: ../lib/modules/sambaSamAccount.inc:90
-#: ../lib/modules/sambaSamAccount.inc:91
+#: ../lib/modules/sambaSamAccount.inc:92
+#: ../lib/modules/sambaSamAccount.inc:93
 msgid "Please enter a comma separated list of host names!"
 msgstr "请输入以逗号分隔的主机名!"
 
@@ -4252,8 +4302,8 @@ msgstr "请输入以逗号分隔的主机名!"
 msgid "Please enter a group name!"
 msgstr "请输入组名!"
 
-#: ../lib/modules/kolabUser.inc:291
-#: ../lib/modules/kolabUser.inc:296
+#: ../lib/modules/kolabUser.inc:264
+#: ../lib/modules/kolabUser.inc:269
 #, php-format
 msgid "Please enter a user password on this page: %s"
 msgstr "请在此页输入用户密码: %s"
@@ -4263,30 +4313,30 @@ msgstr "请在此页输入用户密码: %s"
 msgid "Please enter a valid business category!"
 msgstr "请输入有效的商业种类!"
 
-#: ../lib/modules/posixAccount.inc:92
-#: ../lib/modules/posixAccount.inc:93
 #: ../lib/modules/inetOrgPerson.inc:97
 #: ../lib/modules/inetOrgPerson.inc:98
+#: ../lib/modules/posixAccount.inc:92
+#: ../lib/modules/posixAccount.inc:93
 msgid "Please enter a valid common name!"
 msgstr "请输入有效的全名!"
 
 #: ../lib/modules/sambaAccount.inc:83
 #: ../lib/modules/sambaAccount.inc:84
-#: ../lib/modules/sambaSamAccount.inc:103
-#: ../lib/modules/sambaSamAccount.inc:104
 #: ../lib/modules/sambaSamAccount.inc:105
+#: ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/sambaSamAccount.inc:107
 msgid "Please enter a valid date in format DD-MM-YYYY."
 msgstr "请输入日期,格式为(DD-MM-YYYY)."
 
 #: ../lib/modules/sambaAccount.inc:77
 #: ../lib/modules/sambaAccount.inc:78
-#: ../lib/modules/sambaSamAccount.inc:97
-#: ../lib/modules/sambaSamAccount.inc:98
+#: ../lib/modules/sambaSamAccount.inc:99
+#: ../lib/modules/sambaSamAccount.inc:100
 msgid "Please enter a valid display name!"
 msgstr "请输入有效的显示名!"
 
 #: ../lib/modules/sambaAccount.inc:85
-#: ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/sambaSamAccount.inc:108
 msgid "Please enter a valid drive letter."
 msgstr "请输入有效的盘符."
 
@@ -4309,7 +4359,7 @@ msgstr "请输入有效的传真号!"
 msgid "Please enter a valid group RID."
 msgstr "请输入有效的组RID."
 
-#: ../lib/modules/sambaSamAccount.inc:110
+#: ../lib/modules/sambaSamAccount.inc:112
 msgid "Please enter a valid group name!"
 msgstr "请输入有效的组名!"
 
@@ -4349,18 +4399,18 @@ msgstr "请输入有效的街道名!"
 msgid "Please enter a valid telephone number!"
 msgstr "请输入有效的电话号码!"
 
-#: ../lib/modules/posixGroup.inc:574
+#: ../lib/modules/posixGroup.inc:602
 #: ../lib/modules/posixAccount.inc:764
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "请输入有效值(介于%s和%s之间)!"
 
-#: ../lib/modules/kolabUser.inc:301
+#: ../lib/modules/kolabUser.inc:274
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "请在本页面输入邮件地址:%s"
 
-#: ../lib/modules/ddns.inc:78
+#: ../lib/modules/ddns.inc:95
 msgid "Please enter the IP address of your DNS server."
 msgstr "请输入DNS服务器IP地址"
 
@@ -4388,8 +4438,8 @@ msgstr "请输入新配置文件名和密码.配置文件名可以包含字符
 msgid "Please enter the new name of the profile. The name may contain letters, numbers and -/_."
 msgstr "請輸入新的設定檔名稱.可以包含字母,數字和 -/_ ."
 
-#: ../lib/modules/posixAccount.inc:389
 #: ../lib/modules/inetOrgPerson.inc:459
+#: ../lib/modules/posixAccount.inc:389
 msgid "Please enter the password which you want to set for this account."
 msgstr "请输入这个帐号的密码."
 
@@ -4397,23 +4447,23 @@ msgstr "请输入这个帐号的密码."
 msgid "Please enter the path to the user's home directory."
 msgstr "请输入用户主目录路径."
 
-#: ../lib/modules/quota.inc:141
+#: ../lib/modules/quota.inc:142
 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 "请输入本挂接点的配额设置.语法为:(软块限制},{硬块限制},{软件节点限制},{硬节点限制}."
 
-#: ../lib/modules/posixAccount.inc:72
 #: ../lib/modules/inetOrgPerson.inc:103
+#: ../lib/modules/posixAccount.inc:72
 msgid "Please enter the same password in both password fields."
 msgstr "在两个密码输入框请输入相同的密码."
 
-#: ../templates/lists/changePassword.php:265
-#: ../lib/modules/posixGroup.inc:468
+#: ../templates/lists/changePassword.php:268
 #: ../lib/modules/sambaAccount.inc:74
-#: ../lib/modules/sambaSamAccount.inc:92
+#: ../lib/modules/posixGroup.inc:494
+#: ../lib/modules/sambaSamAccount.inc:94
 msgid "Please enter the same password in both password-fields."
 msgstr "请在两个密码输入框输入相同的密码."
 
-#: ../lib/modules/sambaSamAccount.inc:302
+#: ../lib/modules/sambaSamAccount.inc:319
 msgid "Please enter the time limit in minutes. 0 means unlimited."
 msgstr "请输入时间限制（分钟）。0代表不限制。"
 
@@ -4429,16 +4479,16 @@ msgstr "改变服务器配置,请输入密码:"
 msgid "Please enter your public SSH key."
 msgstr "请输入您的SSH公钥."
 
-#: ../lib/modules/range.inc:397
-#: ../lib/modules/fixed_ip.inc:336
+#: ../lib/modules/range.inc:395
+#: ../lib/modules/fixed_ip.inc:341
 msgid "Please fill out the DHCP settings first."
 msgstr "请先填写DHCP设置"
 
-#: ../templates/tests/lamdaemonTest.php:259
+#: ../templates/tests/lamdaemonTest.php:268
 msgid "Please install the SSH2 module for PHP and activate it in your php.ini!"
 msgstr "请在PHP中安装SSH2模块并在php.ini中启用!"
 
-#: ../templates/masscreate.php:126
+#: ../templates/masscreate.php:130
 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格式文件.第一行必须为栏目标识,以下每行表示一个帐号."
 
@@ -4463,12 +4513,12 @@ msgstr "请输入用户名和密码登录."
 msgid "Please set up all required attributes on page: %s"
 msgstr "请在页面%s上输入必须的属性."
 
-#: ../templates/config/profmanage.php:145
 #: ../templates/selfService/profManage.php:114
+#: ../templates/config/profmanage.php:145
 msgid "Please set up your master configuration file (config/config.cfg) first!"
 msgstr "请先主配置文件(config/config.cfg)!"
 
-#: ../lib/modules/kolabUser.inc:246
+#: ../lib/modules/kolabUser.inc:236
 msgid "Policy list has invalid format!"
 msgstr "策略列表含有非法格式!"
 
@@ -4479,9 +4529,9 @@ msgstr "策略列表含有非法格式!"
 msgid "Position"
 msgstr "位置"
 
-#: ../templates/masscreate.php:175
-#: ../templates/masscreate.php:317
-#: ../lib/modules/sambaGroupMapping.inc:399
+#: ../templates/masscreate.php:179
+#: ../templates/masscreate.php:321
+#: ../lib/modules/sambaGroupMapping.inc:439
 msgid "Possible values"
 msgstr "可能的值"
 
@@ -4528,7 +4578,7 @@ msgstr "预订值"
 msgid "President"
 msgstr "总裁"
 
-#: ../lib/modules/posixGroup.inc:483
+#: ../lib/modules/posixGroup.inc:509
 #: ../lib/modules/posixAccount.inc:217
 #: ../lib/modules/posixAccount.inc:291
 #: ../lib/modules/posixAccount.inc:351
@@ -4545,19 +4595,20 @@ msgstr "主要组"
 msgid "Private telephone number"
 msgstr "个人电话号码"
 
-#: ../templates/config/profmanage.php:107
 #: ../templates/selfService/profManage.php:97
+#: ../templates/config/profmanage.php:107
 msgid "Profile deleted."
 msgstr "配置文件被删除."
 
+#: ../templates/profedit/profilemain.php:108
 #: ../templates/tools.php:56
 msgid "Profile editor"
 msgstr "配置文件编辑器"
 
-#: ../templates/config/profmanage.php:50
-#: ../templates/config/profmanage.php:158
 #: ../templates/selfService/profManage.php:36
 #: ../templates/selfService/profManage.php:127
+#: ../templates/config/profmanage.php:50
+#: ../templates/config/profmanage.php:158
 #: ../help/help.inc:114
 #: ../help/help.inc:116
 #: ../help/help.inc:118
@@ -4566,19 +4617,19 @@ msgstr "配置文件编辑器"
 msgid "Profile management"
 msgstr "配置文件管理"
 
-#: ../templates/config/profmanage.php:173
-#: ../templates/config/profmanage.php:225
 #: ../templates/selfService/profManage.php:142
 #: ../templates/selfService/profManage.php:193
-#: ../templates/profedit/profilepage.php:250
+#: ../templates/profedit/profilepage.php:251
+#: ../templates/config/profmanage.php:173
+#: ../templates/config/profmanage.php:225
 #: ../help/help.inc:147
 msgid "Profile name"
 msgstr "配置文件名"
 
-#: ../templates/config/profmanage.php:91
-#: ../templates/config/profmanage.php:102
 #: ../templates/selfService/profManage.php:73
 #: ../templates/selfService/profManage.php:88
+#: ../templates/config/profmanage.php:91
+#: ../templates/config/profmanage.php:102
 msgid "Profile name is invalid!"
 msgstr "配置文件名非法!"
 
@@ -4599,22 +4650,22 @@ msgstr "配置文件密码不同或为空!"
 #: ../lib/modules/sambaAccount.inc:388
 #: ../lib/modules/sambaAccount.inc:791
 #: ../lib/modules/sambaAccount.inc:895
-#: ../lib/modules/sambaSamAccount.inc:84
-#: ../lib/modules/sambaSamAccount.inc:85
-#: ../lib/modules/sambaSamAccount.inc:240
-#: ../lib/modules/sambaSamAccount.inc:289
-#: ../lib/modules/sambaSamAccount.inc:416
-#: ../lib/modules/sambaSamAccount.inc:1059
-#: ../lib/modules/sambaSamAccount.inc:1326
-#: ../lib/modules/sambaSamAccount.inc:1477
-#: ../lib/modules/sambaSamAccount.inc:1650
-#: ../lib/modules/sambaSamAccount.inc:1672
+#: ../lib/modules/sambaSamAccount.inc:86
+#: ../lib/modules/sambaSamAccount.inc:87
+#: ../lib/modules/sambaSamAccount.inc:257
+#: ../lib/modules/sambaSamAccount.inc:306
+#: ../lib/modules/sambaSamAccount.inc:436
+#: ../lib/modules/sambaSamAccount.inc:1099
+#: ../lib/modules/sambaSamAccount.inc:1366
+#: ../lib/modules/sambaSamAccount.inc:1527
+#: ../lib/modules/sambaSamAccount.inc:1707
+#: ../lib/modules/sambaSamAccount.inc:1729
 msgid "Profile path"
 msgstr "配置文件路径"
 
 #: ../lib/modules/sambaAccount.inc:64
-#: ../lib/modules/sambaSamAccount.inc:84
 #: ../lib/modules/sambaSamAccount.inc:86
+#: ../lib/modules/sambaSamAccount.inc:88
 msgid "Profile path is invalid!"
 msgstr "配置文件路径非法!"
 
@@ -4622,17 +4673,17 @@ msgstr "配置文件路径非法!"
 msgid "Profile was saved."
 msgstr "配置文件已保存."
 
-#: ../lib/modules/quota.inc:74
-#: ../lib/modules/quota.inc:140
+#: ../lib/modules/quota.inc:75
+#: ../lib/modules/quota.inc:141
 msgid "Quota"
 msgstr "配额"
 
-#: ../lib/modules/quota.inc:608
+#: ../lib/modules/quota.inc:626
 #, php-format
 msgid "Quota for %s on %s"
 msgstr "%s 在 %s 的硬盘配额:"
 
-#: ../lib/modules/quota.inc:57
+#: ../lib/modules/quota.inc:58
 msgid "Quota has wrong format!"
 msgstr "磁盘配额格式错误!"
 
@@ -4640,8 +4691,8 @@ msgstr "磁盘配额格式错误!"
 msgid "RDN"
 msgstr "RDN"
 
-#: ../templates/masscreate.php:167
-#: ../templates/profedit/profilepage.php:203
+#: ../templates/masscreate.php:171
+#: ../templates/profedit/profilepage.php:204
 #: ../lib/modules.inc:1330
 #: ../help/help.inc:145
 msgid "RDN identifier"
@@ -4659,17 +4710,18 @@ msgstr "RID (Windows UID)"
 msgid "RID base"
 msgstr "RID 基类"
 
-#: ../lib/modules/range.inc:78
-#: ../lib/modules/range.inc:421
+#: ../lib/modules/range.inc:80
+#: ../lib/modules/range.inc:420
 msgid "Range from"
 msgstr "范围起始自"
 
-#: ../lib/modules/range.inc:81
+#: ../lib/modules/range.inc:83
 #: ../lib/modules/range.inc:434
 msgid "Range to"
 msgstr "范围到"
 
-#: ../lib/modules/range.inc:62
+#: ../lib/modules/range.inc:64
+#: ../lib/modules/range.inc:487
 msgid "Ranges"
 msgstr "范围"
 
@@ -4695,16 +4747,16 @@ msgstr "确定删除属性?"
 msgid "Recipient"
 msgstr "收件人"
 
-#: ../lib/types/mailAlias.inc:83
 #: ../lib/modules/nisMailAlias.inc:75
 #: ../lib/modules/nisMailAlias.inc:89
 #: ../lib/modules/nisMailAlias.inc:279
+#: ../lib/types/mailAlias.inc:83
 msgid "Recipient list"
 msgstr "收件人列表"
 
-#: ../lib/modules/sambaSamAccount.inc:319
-#: ../lib/modules/sambaSamAccount.inc:1401
-#: ../lib/modules/sambaSamAccount.inc:1724
+#: ../lib/modules/sambaSamAccount.inc:336
+#: ../lib/modules/sambaSamAccount.inc:1441
+#: ../lib/modules/sambaSamAccount.inc:1781
 msgid "Reconnect if disconnected"
 msgstr "如果中断重新连接"
 
@@ -4727,13 +4779,13 @@ msgid "Reenter profile password"
 msgstr "再次输入配置文件密码"
 
 #: ../templates/tree/edit.php:101
+#: ../lib/lists.inc:323
 #: ../lib/tree.inc:88
 #: ../lib/tree.inc:89
-#: ../lib/lists.inc:323
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../lib/modules/kolabUser.inc:51
+#: ../lib/modules/kolabUser.inc:53
 msgid "Reject if conflicts"
 msgstr "如果冲突会被拒绝"
 
@@ -4742,22 +4794,22 @@ msgid "Relative distinguished name"
 msgstr "相对区别名称(RDN)"
 
 #: ../templates/pdfedit/pdfpage.php:425
+#: ../lib/modules/nisMailAlias.inc:147
 #: ../lib/modules/ieee802device.inc:104
-#: ../lib/modules/sambaSamAccount.inc:1283
-#: ../lib/modules/kolabUser.inc:362
-#: ../lib/modules/kolabUser.inc:381
-#: ../lib/modules/kolabUser.inc:407
-#: ../lib/modules/kolabUser.inc:910
-#: ../lib/modules/phpGroupwareUser.inc:246
-#: ../lib/modules/shadowAccount.inc:355
+#: ../lib/modules/groupOfNames.inc:158
+#: ../lib/modules/kolabUser.inc:334
+#: ../lib/modules/kolabUser.inc:353
+#: ../lib/modules/kolabUser.inc:379
+#: ../lib/modules/kolabUser.inc:895
 #: ../lib/modules/ldapPublicKey.inc:98
 #: ../lib/modules/inetLocalMailRecipient.inc:160
-#: ../lib/modules/groupOfNames.inc:158
-#: ../lib/modules/nisMailAlias.inc:147
+#: ../lib/modules/sambaSamAccount.inc:1323
+#: ../lib/modules/shadowAccount.inc:383
+#: ../lib/modules/phpGroupwareUser.inc:246
 msgid "Remove"
 msgstr "删除"
 
-#: ../lib/modules/posixGroup.inc:192
+#: ../lib/modules/posixGroup.inc:206
 #: ../lib/modules/posixAccount.inc:1047
 msgid "Remove password"
 msgstr "删除密码"
@@ -4779,24 +4831,24 @@ msgstr "删除这个帐号类型"
 msgid "Remove/replace photo"
 msgstr "删除/更改照片"
 
-#: ../templates/config/profmanage.php:221
 #: ../templates/selfService/profManage.php:189
+#: ../templates/config/profmanage.php:221
 #: ../help/help.inc:116
 msgid "Rename profile"
 msgstr "配置文件重命名"
 
-#: ../templates/config/profmanage.php:98
 #: ../templates/selfService/profManage.php:84
+#: ../templates/config/profmanage.php:98
 msgid "Renamed profile."
 msgstr "已更名的配置文件."
 
-#: ../templates/lists/changePassword.php:209
-#: ../lib/modules/posixGroup.inc:269
-#: ../lib/modules/sambaAccount.inc:748
-#: ../lib/modules/sambaSamAccount.inc:955
-#: ../lib/modules/posixAccount.inc:1125
+#: ../templates/lists/changePassword.php:212
 #: ../lib/modules/inetOrgPerson.inc:759
 #: ../lib/modules/inetOrgPerson.inc:990
+#: ../lib/modules/sambaAccount.inc:748
+#: ../lib/modules/posixGroup.inc:283
+#: ../lib/modules/posixAccount.inc:1125
+#: ../lib/modules/sambaSamAccount.inc:990
 msgid "Repeat password"
 msgstr "确认密码"
 
@@ -4810,14 +4862,14 @@ msgstr "在homedir中已更改$user和$group. "
 msgid "Required attribute for objectClass(es) %s"
 msgstr "%s 对象类的必选属性"
 
-#: ../templates/tree/templates/creation/custom.php:187
 #: ../templates/schema/schema.php:388
+#: ../templates/tree/templates/creation/custom.php:187
 msgid "Required attributes"
 msgstr "必选属性"
 
-#: ../templates/profedit/profilepage.php:260
+#: ../templates/profedit/profilepage.php:261
 #: ../lib/modules/sambaAccount.inc:845
-#: ../lib/modules/sambaSamAccount.inc:1132
+#: ../lib/modules/sambaSamAccount.inc:1172
 msgid "Reset"
 msgstr "复位"
 
@@ -4827,8 +4879,8 @@ msgstr "复位设定"
 
 #: ../lib/modules/sambaAccount.inc:350
 #: ../lib/modules/sambaAccount.inc:844
-#: ../lib/modules/sambaSamAccount.inc:199
-#: ../lib/modules/sambaSamAccount.inc:1131
+#: ../lib/modules/sambaSamAccount.inc:213
+#: ../lib/modules/sambaSamAccount.inc:1171
 msgid "Reset password"
 msgstr "复位密码"
 
@@ -4843,8 +4895,9 @@ msgstr "在锁定后复位时间"
 msgid "Reset time after lockout must be are natural number."
 msgstr "锁定帐号后复位时间必须是自然数."
 
-#: ../lib/modules/ddns.inc:83
-#: ../lib/modules/ddns.inc:474
+#: ../lib/modules/ddns.inc:100
+#: ../lib/modules/ddns.inc:333
+#: ../lib/modules/ddns.inc:362
 msgid "Reverse zone names"
 msgstr "反向域名"
 
@@ -4869,11 +4922,11 @@ msgstr "房间号"
 msgid "Routing address"
 msgstr "邮寄地址"
 
-#: ../templates/tests/lamdaemonTest.php:269
+#: ../templates/tests/lamdaemonTest.php:278
 msgid "SSH connection"
 msgstr "SSH连接"
 
-#: ../templates/tests/lamdaemonTest.php:286
+#: ../templates/tests/lamdaemonTest.php:295
 msgid "SSH connection could be established."
 msgstr "SSH连接可以建立."
 
@@ -4889,11 +4942,11 @@ msgstr "SSH公钥"
 msgid "SSH public key(s)"
 msgstr "SSH 公钥"
 
-#: ../templates/tests/lamdaemonTest.php:252
+#: ../templates/tests/lamdaemonTest.php:261
 msgid "SSH2 module"
 msgstr "SSH2模块"
 
-#: ../templates/tests/lamdaemonTest.php:255
+#: ../templates/tests/lamdaemonTest.php:264
 msgid "SSH2 module is installed."
 msgstr "SSH2模块已安装."
 
@@ -4901,8 +4954,8 @@ msgstr "SSH2模块已安装."
 msgid "Samba 2"
 msgstr "Samba 2"
 
-#: ../lib/modules/sambaSamAccount.inc:131
-#: ../lib/modules/sambaGroupMapping.inc:259
+#: ../lib/modules/sambaGroupMapping.inc:299
+#: ../lib/modules/sambaSamAccount.inc:134
 msgid "Samba 3"
 msgstr "Samba 3"
 
@@ -4915,19 +4968,19 @@ msgstr "Samba 3 域SID非法!"
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 域条目"
 
-#: ../lib/modules/sambaSamAccount.inc:261
-#: ../lib/modules/sambaSamAccount.inc:265
-#: ../lib/modules/sambaSamAccount.inc:441
-#: ../lib/modules/sambaSamAccount.inc:465
+#: ../lib/modules/sambaSamAccount.inc:278
+#: ../lib/modules/sambaSamAccount.inc:282
+#: ../lib/modules/sambaSamAccount.inc:461
+#: ../lib/modules/sambaSamAccount.inc:485
 msgid "Samba RID"
 msgstr "Samba RID"
 
-#: ../lib/modules/sambaGroupMapping.inc:297
-#: ../lib/modules/sambaGroupMapping.inc:322
+#: ../lib/modules/sambaGroupMapping.inc:337
+#: ../lib/modules/sambaGroupMapping.inc:362
 msgid "Samba RID number"
 msgstr "Samba RID号"
 
-#: ../lib/modules/sambaGroupMapping.inc:291
+#: ../lib/modules/sambaGroupMapping.inc:331
 msgid "Samba display name"
 msgstr "Samba 显示名"
 
@@ -4935,7 +4988,7 @@ msgstr "Samba 显示名"
 msgid "Samba domain"
 msgstr "Samba 域"
 
-#: ../lib/modules/sambaGroupMapping.inc:283
+#: ../lib/modules/sambaGroupMapping.inc:323
 msgid "Samba domain name"
 msgstr "Samba 域名"
 
@@ -4943,16 +4996,16 @@ msgstr "Samba 域名"
 msgid "Samba domains"
 msgstr "Samba 域"
 
-#: ../lib/modules/sambaGroupMapping.inc:303
-#: ../lib/modules/sambaGroupMapping.inc:330
-#: ../lib/modules/sambaGroupMapping.inc:348
+#: ../lib/modules/sambaGroupMapping.inc:343
+#: ../lib/modules/sambaGroupMapping.inc:370
+#: ../lib/modules/sambaGroupMapping.inc:388
 msgid "Samba group type"
 msgstr "Samba 组类型"
 
 #: ../lib/modules/sambaAccount.inc:347
 #: ../lib/modules/sambaAccount.inc:745
-#: ../lib/modules/sambaSamAccount.inc:196
-#: ../lib/modules/sambaSamAccount.inc:951
+#: ../lib/modules/sambaSamAccount.inc:210
+#: ../lib/modules/sambaSamAccount.inc:986
 msgid "Samba password"
 msgstr "Samba密码"
 
@@ -4963,25 +5016,25 @@ msgstr "Samba密码"
 #: ../lib/modules/sambaAccount.inc:397
 #: ../lib/modules/sambaAccount.inc:797
 #: ../lib/modules/sambaAccount.inc:896
-#: ../lib/modules/sambaSamAccount.inc:90
-#: ../lib/modules/sambaSamAccount.inc:246
-#: ../lib/modules/sambaSamAccount.inc:249
-#: ../lib/modules/sambaSamAccount.inc:428
-#: ../lib/modules/sambaSamAccount.inc:1071
-#: ../lib/modules/sambaSamAccount.inc:1489
-#: ../lib/modules/sambaSamAccount.inc:1653
+#: ../lib/modules/sambaSamAccount.inc:92
+#: ../lib/modules/sambaSamAccount.inc:263
+#: ../lib/modules/sambaSamAccount.inc:266
+#: ../lib/modules/sambaSamAccount.inc:448
+#: ../lib/modules/sambaSamAccount.inc:1111
+#: ../lib/modules/sambaSamAccount.inc:1539
+#: ../lib/modules/sambaSamAccount.inc:1710
 msgid "Samba workstations"
 msgstr "Samba工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:1190
+#: ../lib/modules/sambaSamAccount.inc:1230
 msgid "Saturday"
 msgstr "星期六"
 
 #: ../templates/tree/edit.php:512
-#: ../templates/selfService/selfServiceMain.php:262
+#: ../templates/selfService/selfServiceMain.php:270
 #: ../templates/pdfedit/pdfpage.php:671
 #: ../templates/pdfedit/pdfpage.php:705
-#: ../templates/profedit/profilepage.php:258
+#: ../templates/profedit/profilepage.php:259
 #: ../lib/modules.inc:1146
 msgid "Save"
 msgstr "保存"
@@ -4994,8 +5047,8 @@ msgstr "保存为文件"
 msgid "Schema browser"
 msgstr "Schema浏览器"
 
-#: ../templates/tests/schemaTest.php:61
 #: ../templates/tests/index.php:61
+#: ../templates/tests/schemaTest.php:61
 msgid "Schema test"
 msgstr "Schema测试"
 
@@ -5049,8 +5102,8 @@ msgstr "节"
 msgid "Security settings"
 msgstr "安全设定"
 
-#: ../lib/types/group.inc:238
 #: ../lib/lists.inc:835
+#: ../lib/types/group.inc:238
 msgid "See README.openldap.txt to solve this problem."
 msgstr "参考README.openldap.txt解决本问题."
 
@@ -5074,7 +5127,7 @@ msgstr "已选择的组"
 msgid "Selected modules"
 msgstr "已选择的模块"
 
-#: ../lib/modules/posixGroup.inc:236
+#: ../lib/modules/posixGroup.inc:250
 msgid "Selected users"
 msgstr "已选择的用户"
 
@@ -5090,14 +5143,14 @@ msgstr "自助服务配置编辑器"
 msgid "Server"
 msgstr "服务器"
 
-#: ../templates/config/confmain.php:148
 #: ../templates/selfService/adminMain.php:267
+#: ../templates/config/confmain.php:148
 #: ../help/help.inc:59
 msgid "Server address"
 msgstr "服务器地址"
 
-#: ../templates/config/confmain.php:491
 #: ../templates/selfService/adminMain.php:60
+#: ../templates/config/confmain.php:491
 msgid "Server address is invalid!"
 msgstr "服务器地址非法!"
 
@@ -5109,8 +5162,8 @@ msgstr "服务器列表"
 msgid "Server profile"
 msgstr "服务器设置文件"
 
-#: ../templates/config/confmain.php:145
 #: ../templates/selfService/adminMain.php:264
+#: ../templates/config/confmain.php:145
 msgid "Server settings"
 msgstr "服务器设置"
 
@@ -5119,7 +5172,11 @@ msgstr "服务器设置"
 msgid "Session timeout"
 msgstr "会话超时"
 
-#: ../lib/modules/posixGroup.inc:174
+#: ../lib/modules/aliasEntry.inc:110
+msgid "Set"
+msgstr "设置"
+
+#: ../lib/modules/posixGroup.inc:188
 #: ../lib/modules/posixAccount.inc:1030
 msgid "Set password"
 msgstr "设置密码"
@@ -5138,29 +5195,29 @@ msgstr "设置文件密码"
 msgid "Set random password"
 msgstr "设置随机密码"
 
-#: ../templates/lists/changePassword.php:196
+#: ../templates/lists/changePassword.php:199
 msgid "Set specific password"
 msgstr "设置特定的密码"
 
-#: ../lib/modules/posixGroup.inc:403
+#: ../lib/modules/posixGroup.inc:425
 msgid "Sets the group password."
 msgstr "设置组密码"
 
-#: ../lib/modules/shadowAccount.inc:73
+#: ../lib/modules/shadowAccount.inc:84
 msgid "Shadow"
 msgstr "Shadow"
 
-#: ../lib/modules/sambaSamAccount.inc:313
-#: ../lib/modules/sambaSamAccount.inc:1383
-#: ../lib/modules/sambaSamAccount.inc:1708
+#: ../lib/modules/sambaSamAccount.inc:330
+#: ../lib/modules/sambaSamAccount.inc:1423
+#: ../lib/modules/sambaSamAccount.inc:1765
 msgid "Shadowing"
 msgstr "遮蔽化(shadow)"
 
-#: ../lib/modules/ddns.inc:65
+#: ../lib/modules/ddns.inc:82
 msgid "Should DDNS (Dynamic DNS) be activated?"
 msgstr "DDNS(动态DNS)是否已经激活?"
 
-#: ../lib/modules/ddns.inc:68
+#: ../lib/modules/ddns.inc:85
 msgid "Should fix IP addresses be added to the DNS server?"
 msgstr "增加一个固定IP地址到DNS服务器吗?"
 
@@ -5180,31 +5237,31 @@ msgstr "主组用户显示为普通组用户"
 msgid "Single valued"
 msgstr "单值"
 
-#: ../lib/modules/quota.inc:552
+#: ../lib/modules/quota.inc:570
 msgid "Soft block"
 msgstr "软块"
 
-#: ../lib/modules/quota.inc:100
-#: ../lib/modules/quota.inc:358
-#: ../lib/modules/quota.inc:443
+#: ../lib/modules/quota.inc:101
+#: ../lib/modules/quota.inc:376
+#: ../lib/modules/quota.inc:461
 msgid "Soft block limit"
 msgstr "软块限制"
 
-#: ../lib/modules/quota.inc:101
+#: ../lib/modules/quota.inc:102
 msgid "Soft block limit."
 msgstr "软块限制."
 
-#: ../lib/modules/quota.inc:554
+#: ../lib/modules/quota.inc:572
 msgid "Soft inode"
 msgstr "软节点"
 
-#: ../lib/modules/quota.inc:123
+#: ../lib/modules/quota.inc:124
 msgid "Soft inode (files) limit."
 msgstr "软节点限制."
 
-#: ../lib/modules/quota.inc:122
-#: ../lib/modules/quota.inc:362
-#: ../lib/modules/quota.inc:445
+#: ../lib/modules/quota.inc:123
+#: ../lib/modules/quota.inc:380
+#: ../lib/modules/quota.inc:463
 msgid "Soft inode limit"
 msgstr "软节点限制."
 
@@ -5230,8 +5287,8 @@ msgstr "对不起,本帮助号({bold}%d{endbold})并不存在."
 #: ../lib/modules/sambaAccount.inc:318
 #: ../lib/modules/sambaAccount.inc:406
 #: ../lib/modules/sambaAccount.inc:835
-#: ../lib/modules/sambaSamAccount.inc:258
-#: ../lib/modules/sambaSamAccount.inc:1108
+#: ../lib/modules/sambaSamAccount.inc:275
+#: ../lib/modules/sambaSamAccount.inc:1148
 msgid "Special user"
 msgstr "特殊用户"
 
@@ -5262,10 +5319,10 @@ msgstr "步骤2/2:指定的属性和属性值"
 msgid "Steve"
 msgstr "Steve"
 
-#: ../lib/modules/sambaAccount.inc:225
-#: ../lib/modules/sambaSamAccount.inc:341
-#: ../lib/modules/posixAccount.inc:207
 #: ../lib/modules/inetOrgPerson.inc:330
+#: ../lib/modules/sambaAccount.inc:225
+#: ../lib/modules/posixAccount.inc:207
+#: ../lib/modules/sambaSamAccount.inc:361
 msgid "Steve Miller"
 msgstr "Steve Miller"
 
@@ -5292,17 +5349,18 @@ msgstr "结构名"
 msgid "Sub (entire subtree)"
 msgstr "Sub (条目的子树)"
 
-#: ../lib/modules/dhcp_settings.inc:132
-#: ../lib/modules/dhcp_settings.inc:689
-#: ../lib/modules/dhcp_settings.inc:696
-#: ../lib/modules/dhcp_settings.inc:774
-#: ../lib/modules/ddns.inc:495
+#: ../lib/modules/dhcp_settings.inc:130
+#: ../lib/modules/dhcp_settings.inc:186
+#: ../lib/modules/dhcp_settings.inc:648
+#: ../lib/modules/dhcp_settings.inc:655
+#: ../lib/modules/dhcp_settings.inc:773
 msgid "Subnet"
 msgstr "子网"
 
-#: ../lib/modules/dhcp_settings.inc:165
-#: ../lib/modules/dhcp_settings.inc:748
-#: ../lib/modules/dhcp_settings.inc:821
+#: ../lib/modules/dhcp_settings.inc:163
+#: ../lib/modules/dhcp_settings.inc:226
+#: ../lib/modules/dhcp_settings.inc:707
+#: ../lib/modules/dhcp_settings.inc:781
 msgid "Subnet mask"
 msgstr "子网掩码"
 
@@ -5315,31 +5373,31 @@ msgstr "子字符串规则"
 msgid "Success"
 msgstr "成功"
 
-#: ../templates/tests/lamdaemonTest.php:159
+#: ../templates/tests/lamdaemonTest.php:166
 msgid "Sudo is not setup correctly!"
 msgstr "Sudo的设置不正确 !"
 
-#: ../lib/lists.inc:687
 #: ../lib/modules.inc:1312
+#: ../lib/lists.inc:687
 msgid "Suffix"
 msgstr "后缀"
 
-#: ../lib/modules/sambaSamAccount.inc:1190
+#: ../lib/modules/sambaSamAccount.inc:1230
 msgid "Sunday"
 msgstr "星期日"
 
 #: ../templates/lists/changePassword.php:112
-#: ../lib/modules/sambaSamAccount.inc:188
+#: ../lib/modules/sambaSamAccount.inc:199
 msgid "Sync Samba LM password with Unix password"
 msgstr "同步 Samba LM 密码和Unix的密码"
 
 #: ../templates/lists/changePassword.php:111
-#: ../lib/modules/sambaSamAccount.inc:187
+#: ../lib/modules/sambaSamAccount.inc:198
 msgid "Sync Samba NT password with Unix password"
 msgstr "同步Samba NT的密码和 Unix的密码"
 
-#: ../templates/tree/add_value_form.php:190
 #: ../templates/schema/schema.php:186
+#: ../templates/tree/add_value_form.php:190
 msgid "Syntax"
 msgstr "语法"
 
@@ -5356,11 +5414,11 @@ msgstr "语法"
 msgid "System logging"
 msgstr "系统日志"
 
-#: ../lib/modules/kolabUser.inc:245
+#: ../lib/modules/kolabUser.inc:235
 msgid "Target of invitation policy is invalid!"
 msgstr "邀请策略的目标非法 !"
 
-#: ../templates/lists/changePassword.php:162
+#: ../templates/lists/changePassword.php:165
 #: ../lib/modules/inetOrgPerson.inc:77
 #: ../lib/modules/inetOrgPerson.inc:152
 #: ../lib/modules/inetOrgPerson.inc:263
@@ -5384,8 +5442,8 @@ msgstr "临时,合同到年底"
 msgid "Template"
 msgstr "模板"
 
-#: ../lib/modules/sambaSamAccount.inc:322
-#: ../lib/modules/sambaSamAccount.inc:1123
+#: ../lib/modules/sambaSamAccount.inc:339
+#: ../lib/modules/sambaSamAccount.inc:1163
 msgid "Terminal server options"
 msgstr "终端服务选项"
 
@@ -5401,11 +5459,11 @@ msgstr "输入框"
 msgid "Text for user PDF"
 msgstr "用户PDF的文本"
 
-#: ../lib/modules/kolabUser.inc:182
+#: ../lib/modules/kolabUser.inc:172
 msgid "The Cyrus mail quota for users in MBytes, leave blank for unlimited space."
 msgstr "用户Cyrus邮件限制(MB),留空意味着不限制."
 
-#: ../lib/modules/dhcp_settings.inc:190
+#: ../lib/modules/dhcp_settings.inc:249
 msgid "The DHCP ranges were changed to fit for the new subnet."
 msgstr "为适应新子网的变化,DHCP范围已经更改."
 
@@ -5414,53 +5472,53 @@ msgstr "为适应新子网的变化,DHCP范围已经更改."
 msgid "The IP address %s is invalid!"
 msgstr "IP地址 %s非法 !"
 
-#: ../lib/modules/fixed_ip.inc:393
+#: ../lib/modules/fixed_ip.inc:400
 msgid "The IP address does not match the subnet."
 msgstr "IP地址与子网不匹配."
 
-#: ../lib/modules/fixed_ip.inc:396
+#: ../lib/modules/fixed_ip.inc:403
 msgid "The IP address is already in use."
 msgstr "IP地址已被使用: "
 
-#: ../lib/modules/range.inc:411
-#: ../lib/modules/range.inc:428
+#: ../lib/modules/range.inc:409
+#: ../lib/modules/range.inc:427
 msgid "The IP address is invalid."
 msgstr "IP地址非法 !"
 
-#: ../lib/modules/dhcp_settings.inc:148
-msgid "The IP address of the Netbios name server."
-msgstr "Netbios命名服务器的IP地址"
-
-#: ../lib/modules/fixed_ip.inc:82
+#: ../lib/modules/fixed_ip.inc:86
 msgid "The IP address of the PC."
 msgstr "PC机的IP地址."
 
-#: ../lib/modules/dhcp_settings.inc:142
+#: ../lib/modules/dhcp_settings.inc:140
 msgid "The IP address(es) of the DNS servers. Multiple addresses are separated by \",\". Example: 192.168.0.10, 192.168.0.11"
 msgstr "DNS服务器IP地址,多地址用\",\"隔离. 例如: 192.168.0.10, 192.168.0.11"
 
-#: ../lib/modules/range.inc:415
-#: ../lib/modules/range.inc:430
+#: ../lib/modules/dhcp_settings.inc:146
+msgid "The IP addresses of the Netbios name servers (e.g. \"123.123.123.123, 123.123.123.124\")."
+msgstr "Netbios命名服务器的IP地址(比如: \"123.123.123.123, 123.123.123.124\")."
+
+#: ../lib/modules/range.inc:413
+#: ../lib/modules/range.inc:429
 msgid "The IP does not match the subnet."
 msgstr "IP与子网掩码不匹配."
 
-#: ../lib/modules/fixed_ip.inc:79
+#: ../lib/modules/fixed_ip.inc:83
 msgid "The MAC address of the PC. Example: 11:22:33:44:55:aa"
 msgstr "PC机的 MAC 地址.比如: 11:22:33:44:55:aa"
 
-#: ../lib/modules/dhcp_settings.inc:184
+#: ../lib/modules/dhcp_settings.inc:243
 msgid "The Netbios server is invalid."
 msgstr "Netbios服务器非法."
 
-#: ../lib/modules/fixed_ip.inc:357
+#: ../lib/modules/fixed_ip.inc:362
 msgid "The PC name may not be longer than 20 characters."
 msgstr "PC机器名的长度不能超过20个字符."
 
-#: ../lib/modules/fixed_ip.inc:366
+#: ../lib/modules/fixed_ip.inc:371
 msgid "The PC name may only contain A-Z, a-z and 0-9."
 msgstr "PC机的机器名只能包含 A-Z, a-z 和 0-9."
 
-#: ../lib/modules/fixed_ip.inc:360
+#: ../lib/modules/fixed_ip.inc:365
 msgid "The PC name needs to be at least 2 characters long."
 msgstr "PC机器名的长度最短需要两个字符."
 
@@ -5486,40 +5544,40 @@ msgstr "在你的LDAP服务器中%s属性(属于%s对象类)不被支持。"
 msgid "The container you specified (%s) does not exist. Please try again."
 msgstr "您指定的容器%s不存在,请重试."
 
-#: ../lib/modules/kolabUser.inc:170
+#: ../lib/modules/kolabUser.inc:160
 msgid "The country name of the user."
 msgstr "用户国籍."
 
-#: ../lib/modules/dhcp_settings.inc:183
+#: ../lib/modules/dhcp_settings.inc:242
 msgid "The default gateway is invalid."
 msgstr "缺省网关非法."
 
-#: ../lib/modules/dhcp_settings.inc:194
+#: ../lib/modules/dhcp_settings.inc:253
 msgid "The domain name includes invalid characters. Valid characters are A-Z, a-z, 0-9, \".\", \"_\",\"-\"."
 msgstr "域名包含非法字符,只能使用A-Z, a-z, 0-9, \".\", \"_\",\"-\"."
 
-#: ../lib/modules/dhcp_settings.inc:192
+#: ../lib/modules/dhcp_settings.inc:251
 msgid "The domain name needs to be shorter than 15 characters."
 msgstr "域名的长度不能超过15个字符."
 
-#: ../lib/modules/dhcp_settings.inc:193
+#: ../lib/modules/dhcp_settings.inc:252
 msgid "The domain name needs to have at least 3 characters."
 msgstr "域名最少需要3个字符."
 
-#: ../lib/modules/dhcp_settings.inc:130
+#: ../lib/modules/dhcp_settings.inc:128
 msgid "The domain name of the subnet."
 msgstr "域名的子网掩码."
 
-#: ../lib/modules/range.inc:82
+#: ../lib/modules/range.inc:84
 msgid "The ending IP address of the range."
 msgstr "范围的最高IP地址."
 
-#: ../lib/modules/dhcp_settings.inc:185
+#: ../lib/modules/dhcp_settings.inc:244
 msgid "The entered Netbios node type does not exist."
 msgstr "输入的Netbios节点类型不存在."
 
+#: ../lib/modules/shadowAccount.inc:67
 #: ../lib/modules/phpGroupwareUser.inc:125
-#: ../lib/modules/shadowAccount.inc:56
 msgid "The expiration date is invalid."
 msgstr "过期日期非法."
 
@@ -5531,8 +5589,8 @@ msgstr "第一行是对象。"
 msgid "The following suffix(es) are missing in LDAP. LAM can create them for you."
 msgstr "LDAP中没有下列后缀,LAM会自动建立."
 
-#: ../lib/modules/sambaSamAccount.inc:108
-#: ../lib/modules/sambaSamAccount.inc:109
+#: ../lib/modules/sambaSamAccount.inc:110
+#: ../lib/modules/sambaSamAccount.inc:111
 msgid "The format of the logon hours field is invalid!"
 msgstr "登录时间列的格式非法!"
 
@@ -5540,19 +5598,19 @@ msgstr "登录时间列的格式非法!"
 msgid "The headline for a new section must contain at least one character."
 msgstr "新段的标题最少要有一个字符."
 
-#: ../lib/modules/sambaSamAccount.inc:235
+#: ../lib/modules/sambaSamAccount.inc:252
 msgid "The home directory will be connected under this drive letter."
 msgstr "将会从这个驱动器号上连接用户目录。"
 
-#: ../lib/modules/ddns.inc:74
+#: ../lib/modules/ddns.inc:91
 msgid "The key enables the DHCP server to perform DNS updates. The key is generated with \"genDDNSkey\"."
 msgstr "使DHCP服务器能够进行DNS更新的KEY. 产生KEY的命令是 \"genDDNSkey\"."
 
-#: ../lib/modules/dhcp_settings.inc:182
+#: ../lib/modules/dhcp_settings.inc:241
 msgid "The lease time is invalid."
 msgstr "释放时间非法."
 
-#: ../lib/modules/dhcp_settings.inc:136
+#: ../lib/modules/dhcp_settings.inc:134
 msgid "The lease time specifies after how many seconds the client should request a new IP address."
 msgstr "指定客户端必须重新申请新IP地址的释放时间(秒数)."
 
@@ -5560,11 +5618,11 @@ msgstr "指定客户端必须重新申请新IP地址的释放时间(秒数)."
 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, /, \\, ., :, _和-."
 
-#: ../lib/modules/dhcp_settings.inc:186
+#: ../lib/modules/dhcp_settings.inc:245
 msgid "The maximum lease time is invalid."
 msgstr "最长释放时间非法."
 
-#: ../lib/modules/dhcp_settings.inc:139
+#: ../lib/modules/dhcp_settings.inc:137
 msgid "The maximum lease time specifies after how many seconds the client must request a new IP address."
 msgstr "指定客户端必须重新申请新IP地址的最长释放时间."
 
@@ -5577,15 +5635,15 @@ msgstr "%s模块未启动."
 msgid "The name for that PDF-structure you submitted is not valid. A valid name must constist at least of one of the following characters 'a-z','A-Z','0-9','_','-','.'."
 msgstr "您提供的PDF架构名非法,合法字符为a-z,A-Z,0-9,_,- ."
 
-#: ../lib/modules/fixed_ip.inc:76
+#: ../lib/modules/fixed_ip.inc:80
 msgid "The name of the PC."
 msgstr "PC机器名."
 
-#: ../lib/modules/kolabUser.inc:174
+#: ../lib/modules/kolabUser.inc:164
 msgid "The name of the server where the mailbox is located."
 msgstr "邮箱所在服务器名."
 
-#: ../lib/modules/dhcp_settings.inc:133
+#: ../lib/modules/dhcp_settings.inc:131
 msgid "The name of the subnet. Example: 192.168.10.0"
 msgstr "子网名称.比如: 192.168.10.0"
 
@@ -5593,15 +5651,15 @@ msgstr "子网名称.比如: 192.168.10.0"
 msgid "The name of your Windows domain or workgroup."
 msgstr "WINDOWS域名或工作组名."
 
-#: ../lib/modules/dhcp_settings.inc:169
+#: ../lib/modules/dhcp_settings.inc:167
 msgid "The net mask is derived from the subnet mask. If you leave this field empty then LAM will calculate it for you."
 msgstr "网络掩码源自子网掩码,如果留空LAM将会计算得出."
 
-#: ../lib/modules/dhcp_settings.inc:189
+#: ../lib/modules/dhcp_settings.inc:248
 msgid "The net mask was invalid and was corrected."
 msgstr "网络掩码非法,已经进行修正."
 
-#: ../lib/modules/dhcp_settings.inc:188
+#: ../lib/modules/dhcp_settings.inc:247
 msgid "The netmask was set."
 msgstr "网络掩码已经设置."
 
@@ -5618,9 +5676,9 @@ msgstr "用户的办公室名(比如:某某公司,人力资源部)"
 msgid "The owner of this group."
 msgstr "此组的拥有者."
 
+#: ../templates/selfService/adminLogin.php:51
 #: ../templates/config/confmain.php:70
 #: ../templates/config/mainlogin.php:56
-#: ../templates/selfService/adminLogin.php:51
 msgid "The password is invalid! Please try again."
 msgstr "密码无效,请重试!"
 
@@ -5654,7 +5712,7 @@ msgstr "密码强度不够.最少需要%s个标点符号字符."
 msgid "The password is too weak. You have to enter at least %s upper case characters."
 msgstr "密码强度不够.最少需要%s个大写字母字符."
 
-#: ../templates/lists/changePassword.php:332
+#: ../templates/lists/changePassword.php:335
 msgid "The password(s) were set to:"
 msgstr "密码被设置为:"
 
@@ -5670,11 +5728,11 @@ msgstr "该主机所属的主组名."
 msgid "The primary group the user should be member of."
 msgstr "该用户所属的主组名."
 
-#: ../lib/modules/range.inc:417
+#: ../lib/modules/range.inc:415
 msgid "The range conflicts with another range."
 msgstr "此范围与其它范围冲突."
 
-#: ../lib/modules/range.inc:413
+#: ../lib/modules/range.inc:411
 msgid "The range end needs to be greater than the range start."
 msgstr "范围的终止地址需要大于起始地址."
 
@@ -5682,7 +5740,7 @@ msgstr "范围的终止地址需要大于起始地址."
 msgid "The room number of the employee's office."
 msgstr "雇员办公室房间号码"
 
-#: ../lib/modules/range.inc:79
+#: ../lib/modules/range.inc:81
 msgid "The starting IP address of the range."
 msgstr "范围的起始IP地址."
 
@@ -5694,22 +5752,26 @@ msgstr "用户居住或工作地点."
 msgid "The static text must contain at least one character."
 msgstr "静态文本至少包含一个字符."
 
-#: ../lib/modules/dhcp_settings.inc:179
+#: ../lib/modules/dhcp_settings.inc:238
 msgid "The subnet is already in use."
 msgstr "子网掩码已经被占用."
 
-#: ../lib/modules/dhcp_settings.inc:180
+#: ../lib/modules/dhcp_settings.inc:239
 msgid "The subnet is invalid."
 msgstr "子网非法"
 
-#: ../lib/modules/dhcp_settings.inc:187
+#: ../lib/modules/dhcp_settings.inc:246
 msgid "The subnet mask is invalid."
 msgstr "子网掩码非法"
 
-#: ../lib/modules/dhcp_settings.inc:166
+#: ../lib/modules/dhcp_settings.inc:164
 msgid "The subnet mask of the network."
 msgstr "网络的子网掩码."
 
+#: ../lib/modules/sambaSamAccount.inc:113
+msgid "The value for the Samba 3 field \"User can/must change password\" needs to be a number."
+msgstr "Samba 3 的 \"用户可以/必须修改密码\" 的取值必须是一个数字."
+
 #: ../help/help.inc:183
 msgid "The wildcard for the new password is @@newPassword@@."
 msgstr "新密码的通配符为@@newPassword@@."
@@ -5718,11 +5780,11 @@ msgstr "新密码的通配符为@@newPassword@@."
 msgid "There are new required attributes which need to be set."
 msgstr "必须设置的新属性"
 
-#: ../lib/modules/posixGroup.inc:483
+#: ../lib/modules/posixGroup.inc:509
 msgid "There are still users who have this group as their primary group."
 msgstr "仍有用户的主组为本组."
 
-#: ../lib/modules/sambaGroupMapping.inc:397
+#: ../lib/modules/sambaGroupMapping.inc:437
 msgid "There can be only one group of this type."
 msgstr "只能有一种本类型组."
 
@@ -5730,7 +5792,7 @@ msgstr "只能有一种本类型组."
 msgid "There were errors while uploading:"
 msgstr "上传时发生错误."
 
-#: ../lib/modules/posixGroup.inc:407
+#: ../lib/modules/posixGroup.inc:429
 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号.新组号自动在已用最大号加1."
 
@@ -5746,15 +5808,15 @@ msgstr "建立新用户帐号时所使用的最大和最小UID号,UID范围不
 msgid "This GID number is invalid! Please provide either a number or a group name."
 msgstr "GID号非法!请提供新号或组名."
 
-#: ../lib/modules/fixed_ip.inc:363
+#: ../lib/modules/fixed_ip.inc:368
 msgid "This PC name already exists."
 msgstr "PC机器名已经存在!"
 
-#: ../lib/modules/kolabUser.inc:307
+#: ../lib/modules/kolabUser.inc:279
 msgid "This account is marked for deletion."
 msgstr "本帐号标记为删除."
 
-#: ../lib/modules/sambaSamAccount.inc:259
+#: ../lib/modules/sambaSamAccount.inc:276
 msgid "This allows you to define this account as a special user like administrator or guest."
 msgstr "您可以指定本帐号为特殊帐号,比如管理员或来宾."
 
@@ -5807,15 +5869,15 @@ msgstr "备注值非法!"
 msgid "This is a comma separated list of MAC addresses."
 msgstr "这是以逗号分隔的MAC地址列表."
 
-#: ../lib/modules/kolabUser.inc:158
+#: ../lib/modules/kolabUser.inc:148
 msgid "This is a comma separated list of delegates."
 msgstr "这是以逗号分隔的代表列表."
 
-#: ../lib/modules/kolabUser.inc:166
+#: ../lib/modules/kolabUser.inc:156
 msgid "This is a comma separated list of eMail aliases."
 msgstr "这是以逗号分隔的电子邮件别名列表."
 
-#: ../lib/modules/kolabUser.inc:150
+#: ../lib/modules/kolabUser.inc:140
 msgid "This is a comma separated list of invitation policies."
 msgstr "这是逗号分隔的约会策略列表."
 
@@ -5847,7 +5909,7 @@ msgstr "这是lamdaemon指令所在的服务器列表.本系统将用户登录
 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 "这是允许登录本系统的DN列表,每行输入一个DN."
 
-#: ../templates/masscreate.php:227
+#: ../templates/masscreate.php:231
 msgid "This is an example how it would look in your spreadsheet program before you convert to CSV:"
 msgstr "电子表格未存成CSV格式的样例:"
 
@@ -5856,14 +5918,15 @@ msgid "This is needed to find the LDAP DNs of your user accounts. E.g. if you us
 msgstr "用于搜索用户帐号的LDAP DN.比如您输入\"uid\" 而用户输入\"miller\" ,系统会使用uid=miller这个条件来搜索帐号."
 
 #: ../lib/modules/inetOrgPerson.inc:102
+#: ../lib/modules/aliasEntry.inc:79
 msgid "This is not a valid DN!"
 msgstr "不是一个有效的DN!"
 
-#: ../lib/modules/sambaSamAccount.inc:96
+#: ../lib/modules/sambaSamAccount.inc:98
 msgid "This is not a valid RID number!"
 msgstr "不是一个有效的RID号!"
 
-#: ../lib/modules/sambaGroupMapping.inc:399
+#: ../lib/modules/sambaGroupMapping.inc:439
 msgid "This is not a valid Samba 3 group type!"
 msgstr "不是一个有效的Samba 3 组类型!"
 
@@ -5887,7 +5950,7 @@ msgstr "网卡的MAC地址(比如:00:01:02:DE:EF:18)."
 msgid "This is the RID of the user's primary Windows group."
 msgstr "用户主Windows组的RID号."
 
-#: ../lib/modules/sambaSamAccount.inc:256
+#: ../lib/modules/sambaSamAccount.inc:273
 msgid "This is the SID of the user's primary Windows group."
 msgstr "用户Windows主组的SID."
 
@@ -5896,22 +5959,22 @@ msgid "This is the absolute path to an external script for setting quotas and cr
 msgstr "这是设置硬盘配额和建立主目录的外部脚本所在的绝对路径."
 
 #: ../lib/modules/sambaAccount.inc:348
-#: ../lib/modules/sambaSamAccount.inc:197
+#: ../lib/modules/sambaSamAccount.inc:211
 msgid "This is the account's Windows password."
 msgstr "帐号在Windows中的密码."
 
 #: ../lib/modules/sambaAccount.inc:345
-#: ../lib/modules/sambaSamAccount.inc:194
+#: ../lib/modules/sambaSamAccount.inc:208
 msgid "This is the account's full name on Windows systems."
 msgstr "用户在Windows系统中的全名."
 
-#: ../lib/modules/sambaSamAccount.inc:278
+#: ../lib/modules/sambaSamAccount.inc:295
+#: ../lib/modules/shadowAccount.inc:186
 #: ../lib/modules/phpGroupwareUser.inc:83
-#: ../lib/modules/shadowAccount.inc:175
 msgid "This is the date when the account will expire. Format: DD-MM-YYYY"
 msgstr "帐号过期日期: DD-MM-YYYY"
 
-#: ../lib/modules/sambaGroupMapping.inc:315
+#: ../lib/modules/sambaGroupMapping.inc:355
 msgid "This is the group name which will be shown in Windows."
 msgstr "显示在Windows系统中的组名."
 
@@ -5955,19 +6018,23 @@ msgstr "为防止用户使用旧的密码而保存的历史密码数量."
 msgid "This is the number of rows to show in the account list. If more entries are found the list will be split into several pages."
 msgstr "显示帐号中的行数，如果搜索到更多的行数会分页显示."
 
-#: ../lib/modules/sambaSamAccount.inc:287
+#: ../lib/modules/sambaSamAccount.inc:343
+msgid "This is the number of seconds after when the user may or has to change his password."
+msgstr "用户再次修改密码的时间(秒数)."
+
+#: ../lib/modules/sambaSamAccount.inc:304
 msgid "This is the path to the user's home directory."
 msgstr "这是用户的主目录路径."
 
-#: ../lib/modules/sambaGroupMapping.inc:323
+#: ../lib/modules/sambaGroupMapping.inc:363
 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 "Windows帐号的关联ID(有点象Unix中的UID).留空系统会从UID计算RID.可以是一个数字或一个特殊组名."
 
-#: ../lib/modules/sambaSamAccount.inc:262
+#: ../lib/modules/sambaSamAccount.inc:279
 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帐号的关联ID.可以输入一个数字或以下特殊帐号:"
 
-#: ../lib/modules/sambaSamAccount.inc:266
+#: ../lib/modules/sambaSamAccount.inc:283
 msgid "This is the relative ID number for your host account. If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr "主机帐号的关联ID号.留空系统使用:uidNumber*2 + sambaAlgorithmicRidBase."
 
@@ -5987,6 +6054,11 @@ msgstr "搜索LDAP时的LDAP树后缀.只有在这个子树下的条目被显示
 msgid "This is the target email address for the user's mails."
 msgstr "用户邮件的最终地址."
 
+#: ../lib/modules/uidObject.inc:53
+#: ../lib/modules/aliasEntry.inc:55
+msgid "This is the target of this alias entry."
+msgstr "此别名条件的实际名."
+
 #: ../lib/modules/sambaDomain.inc:127
 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表示永久."
@@ -5999,15 +6071,15 @@ msgstr "在自动退出前,用户不活动时间(分钟)."
 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压力,但减少了数据不一致的可能."
 
-#: ../lib/modules/kolabUser.inc:178
+#: ../lib/modules/kolabUser.inc:168
 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:281
+#: ../lib/modules/sambaSamAccount.inc:298
 msgid "This is the time zone of your Samba server. LAM needs this information to display the logon hours correctly."
 msgstr "这是Samba服务器的时区.LAM用此信息显示正确的登录时间."
 
-#: ../lib/modules/sambaSamAccount.inc:253
+#: ../lib/modules/sambaSamAccount.inc:270
 msgid "This is the user's primary Windows group."
 msgstr "用户的Windows主要组."
 
@@ -6023,23 +6095,23 @@ msgstr "邮件地址已被使用: "
 msgid "This object class is obsolete."
 msgstr "这个对象类是陈旧的."
 
-#: ../lib/modules/sambaSamAccount.inc:272
+#: ../lib/modules/sambaSamAccount.inc:289
 msgid "This option defines the allowed logon hours for this account."
 msgstr "允许帐号登录的时间."
 
-#: ../lib/modules/sambaSamAccount.inc:275
+#: ../lib/modules/sambaSamAccount.inc:292
 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 "帐号可以登录的时间.格式与LDAP属性一致.使用168位代理24*7,168位以21个16进制字节表示.第一位代表GMT时间星期天0:00-0.59."
 
-#: ../lib/modules/sambaSamAccount.inc:296
+#: ../lib/modules/sambaSamAccount.inc:313
 msgid "This program is run after the login."
 msgstr "登录后运行的程序。"
 
-#: ../lib/modules/sambaSamAccount.inc:320
+#: ../lib/modules/sambaSamAccount.inc:337
 msgid "This specifies the reconnect policy."
 msgstr "这里指定断开连接的策略。"
 
-#: ../lib/modules/sambaSamAccount.inc:317
+#: ../lib/modules/sambaSamAccount.inc:334
 msgid "This specifies what to do when the client connection is broken."
 msgstr "这里指定客户连接中断的动作。"
 
@@ -6072,10 +6144,10 @@ msgstr "用户未找到!"
 #: ../lib/modules/sambaAccount.inc:80
 #: ../lib/modules/sambaAccount.inc:81
 #: ../lib/modules/sambaAccount.inc:82
-#: ../lib/modules/sambaSamAccount.inc:99
-#: ../lib/modules/sambaSamAccount.inc:100
 #: ../lib/modules/sambaSamAccount.inc:101
 #: ../lib/modules/sambaSamAccount.inc:102
+#: ../lib/modules/sambaSamAccount.inc:103
+#: ../lib/modules/sambaSamAccount.inc:104
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"!"
 msgstr "此值只能设为 \\\"true\\\" 或 \\\"false\\\"!"
 
@@ -6083,7 +6155,7 @@ msgstr "此值只能设为 \\\"true\\\" 或 \\\"false\\\"!"
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"."
 msgstr "此值只能设为 \\\"true\\\" 或 \\\"false\\\"."
 
-#: ../lib/modules/posixGroup.inc:482
+#: ../lib/modules/posixGroup.inc:508
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "此值必须是用分号分开的用户名列表."
 
@@ -6104,37 +6176,37 @@ msgid "This will delete the selected profile."
 msgstr "将删除所选的配置文件."
 
 #: ../lib/modules/sambaAccount.inc:351
-#: ../lib/modules/sambaSamAccount.inc:200
+#: ../lib/modules/sambaSamAccount.inc:214
 msgid "This will reset the host's password to a default value."
 msgstr "将主机密码复位到缺省值."
 
-#: ../templates/lists/changePassword.php:176
+#: ../templates/lists/changePassword.php:179
 #: ../help/help.inc:177
 msgid "This will set a random password and display it on the screen or send it the user via mail."
 msgstr "将会生成一个随机的密码并在屏幕上显示或通过邮件发送给用户。"
 
-#: ../lib/modules/kolabUser.inc:186
+#: ../lib/modules/kolabUser.inc:176
 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帐号(比如删除邮箱)."
 
-#: ../lib/modules/sambaSamAccount.inc:1189
+#: ../lib/modules/sambaSamAccount.inc:1229
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../lib/modules/sambaSamAccount.inc:1230
+#: ../lib/modules/sambaSamAccount.inc:1270
 msgid "Time"
 msgstr "时间"
 
-#: ../lib/modules/sambaSamAccount.inc:301
+#: ../lib/modules/sambaSamAccount.inc:318
 msgid "Time limit"
 msgstr "时间限制"
 
-#: ../lib/modules/sambaSamAccount.inc:280
-#: ../lib/modules/sambaSamAccount.inc:475
+#: ../lib/modules/sambaSamAccount.inc:297
+#: ../lib/modules/sambaSamAccount.inc:495
 msgid "Time zone"
 msgstr "时区"
 
-#: ../templates/tests/lamdaemonTest.php:147
+#: ../templates/tests/lamdaemonTest.php:154
 #: ../lib/lamdaemon.inc:127
 msgid "Timeout while executing lamdaemon commands!"
 msgstr "运行lamdaemon命令超时!"
@@ -6143,7 +6215,7 @@ msgstr "运行lamdaemon命令超时!"
 msgid "To disable login use /bin/false. The list of shells is read from lam/config/shells"
 msgstr "使用/bin/false来禁止用户登录.shells列表来自/lam/config/shells."
 
-#: ../lib/modules/sambaSamAccount.inc:499
+#: ../lib/modules/sambaSamAccount.inc:519
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "东京,首尔,大孤,雅库茨克"
 
@@ -6173,12 +6245,12 @@ msgstr "树状结构"
 msgid "TreeSuffix is invalid!"
 msgstr "树状结构后缀非法!"
 
-#: ../lib/modules/sambaSamAccount.inc:1189
+#: ../lib/modules/sambaSamAccount.inc:1229
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../templates/selfService/profManage.php:145
 #: ../templates/schema/schema.php:353
+#: ../templates/selfService/profManage.php:145
 msgid "Type"
 msgstr "类型"
 
@@ -6194,8 +6266,6 @@ msgstr "UID已经改变,想改变主目录吗?"
 msgid "UID must be a number. It has to be inside the UID range which is defined in your configuration profile."
 msgstr "UID必须是一个数字,必须在配置文件中所定的UID范围内."
 
-#: ../lib/types/host.inc:86
-#: ../lib/types/user.inc:83
 #: ../lib/modules/posixAccount.inc:71
 #: ../lib/modules/posixAccount.inc:211
 #: ../lib/modules/posixAccount.inc:285
@@ -6204,6 +6274,8 @@ msgstr "UID必须是一个数字,必须在配置文件中所定的UID范围内."
 #: ../lib/modules/posixAccount.inc:347
 #: ../lib/modules/posixAccount.inc:976
 #: ../lib/modules/posixAccount.inc:1244
+#: ../lib/types/user.inc:83
+#: ../lib/types/host.inc:86
 msgid "UID number"
 msgstr "UID编号"
 
@@ -6217,30 +6289,31 @@ msgid "UID ranges for Unix accounts"
 msgstr "Unix帐号的UID范围"
 
 #: ../lib/modules/sambaAccount.inc:386
-#: ../lib/modules/sambaSamAccount.inc:238
+#: ../lib/modules/sambaSamAccount.inc:255
 msgid "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced with user and group name."
 msgstr "用户主目录(\\\\server\\share).$user和$group会使用用户和组名来替代."
 
-#: ../templates/selfService/selfServiceMain.php:168
+#: ../templates/selfService/selfServiceMain.php:176
 msgid "Unable to change your account. Maybe you do not have enough rights to change the settings."
 msgstr "无法改变您的帐号,可以没有足够的权限改变设置."
 
-#: ../templates/tests/lamdaemonTest.php:290
+#: ../templates/tests/lamdaemonTest.php:143
+#: ../templates/tests/lamdaemonTest.php:299
 #: ../lib/lamdaemon.inc:140
 #: ../lib/lamdaemon.inc:145
 msgid "Unable to connect to remote server!"
 msgstr "无法连接远端服务器 !"
 
-#: ../templates/ou_edit.php:70
+#: ../templates/ou_edit.php:74
 msgid "Unable to create new OU!"
 msgstr "无法建立新OU!"
 
-#: ../templates/config/profmanage.php:87
 #: ../templates/selfService/profManage.php:71
+#: ../templates/config/profmanage.php:87
 msgid "Unable to create new profile!"
 msgstr "无法建立新的配置文件!"
 
-#: ../templates/ou_edit.php:87
+#: ../templates/ou_edit.php:91
 msgid "Unable to delete OU!"
 msgstr "无法删除OU!"
 
@@ -6248,9 +6321,9 @@ msgstr "无法删除OU!"
 msgid "Unable to delete PDF structure!"
 msgstr "无法删除PDF结构!"
 
-#: ../templates/config/profmanage.php:109
 #: ../templates/selfService/profManage.php:99
 #: ../templates/profedit/profiledelete.php:64
+#: ../templates/config/profmanage.php:109
 msgid "Unable to delete profile!"
 msgstr "无法删除配置文件!"
 
@@ -6268,18 +6341,23 @@ msgstr "无法调入LDAP条目:"
 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
+#: ../lib/profiles.inc:91
+#: ../lib/profiles.inc:95
 msgid "Unable to load profile!"
 msgstr "无法调入配置文件!"
 
-#: ../templates/tests/schemaTest.php:67
+#: ../templates/lists/changePassword.php:379
+#: ../lib/modules/sambaSamAccount.inc:2165
+msgid "Unable to read sambaSID attribute."
+msgstr "读取sambaSID属性失败."
+
 #: ../templates/schema/schema.php:98
 #: ../templates/schema/schema.php:116
 #: ../templates/schema/schema.php:277
 #: ../templates/schema/schema.php:311
+#: ../templates/tests/schemaTest.php:67
 msgid "Unable to retrieve schema!"
 msgstr "无法获取schema!"
 
@@ -6288,16 +6366,23 @@ msgstr "无法获取schema!"
 msgid "Unable to save profile!"
 msgstr "无法存储配置文件!"
 
-#: ../templates/lists/changePassword.php:328
+#: ../templates/lists/changePassword.php:331
 msgid "Unable to send mail!"
 msgstr "无法发送邮件!"
 
-#: ../lib/modules/posixGroup.inc:298
+#: ../templates/lists/changePassword.php:375
+#: ../templates/lists/changePassword.php:390
+#: ../lib/modules/sambaSamAccount.inc:2161
+#: ../lib/modules/sambaSamAccount.inc:2176
+msgid "Unable to sync the time when the user can/must change his password because no domain was found."
+msgstr "用户可以/必须修改密码时,因域名未发现而不能同步时间."
+
+#: ../lib/modules/posixGroup.inc:312
 #: ../lib/modules/posixAccount.inc:122
 msgid "Unix"
 msgstr "unix"
 
-#: ../templates/tests/lamdaemonTest.php:225
+#: ../templates/tests/lamdaemonTest.php:234
 msgid "Unix account"
 msgstr "Unix帐号"
 
@@ -6314,7 +6399,7 @@ msgstr "unix工作站"
 msgid "Unix workstations are invalid!"
 msgstr "unix工作站无效!"
 
-#: ../templates/tests/lamdaemonTest.php:162
+#: ../templates/tests/lamdaemonTest.php:169
 msgid "Unknown error"
 msgstr "未知错误"
 
@@ -6322,7 +6407,7 @@ msgstr "未知错误"
 msgid "Unlock Samba account"
 msgstr "解锁Samba账号."
 
-#: ../lib/modules/posixGroup.inc:181
+#: ../lib/modules/posixGroup.inc:195
 #: ../lib/modules/posixAccount.inc:1037
 msgid "Unlock password"
 msgstr "解除密码锁定"
@@ -6335,11 +6420,27 @@ msgstr "未解决的依赖性问题:"
 msgid "Up"
 msgstr "向上"
 
+#: ../templates/lists/changePassword.php:118
+msgid "Update Samba password timestamps"
+msgstr "修改 Samba 密码时间戳."
+
+#: ../lib/modules/sambaSamAccount.inc:202
+msgid "Update attribute \"sambaPwdCanChange\" on password change"
+msgstr "在密码修改时修改 \"sambaPwdCanChange\"属性"
+
+#: ../lib/modules/sambaSamAccount.inc:200
+msgid "Update attribute \"sambaPwdLastSet\" on password change"
+msgstr "在密码修改时修改 \"sambaPwdLastSet\"属性"
+
+#: ../lib/modules/sambaSamAccount.inc:201
+msgid "Update attribute \"sambaPwdMustChange\" on password change"
+msgstr "在密码修改时修改 \"sambaPwdMustChange\"属性"
+
 #: ../templates/massBuildAccounts.php:199
 msgid "Upload accounts to LDAP"
 msgstr "上传帐号到LDAP"
 
-#: ../templates/masscreate.php:138
+#: ../templates/masscreate.php:142
 msgid "Upload file and create accounts"
 msgstr "开始上传,建立帐号"
 
@@ -6357,11 +6458,11 @@ msgstr "用法"
 #: ../lib/modules/sambaAccount.inc:353
 #: ../lib/modules/sambaAccount.inc:356
 #: ../lib/modules/sambaAccount.inc:752
-#: ../lib/modules/sambaSamAccount.inc:202
-#: ../lib/modules/sambaSamAccount.inc:205
-#: ../lib/modules/sambaSamAccount.inc:351
-#: ../lib/modules/sambaSamAccount.inc:959
-#: ../lib/modules/sambaSamAccount.inc:1428
+#: ../lib/modules/sambaSamAccount.inc:216
+#: ../lib/modules/sambaSamAccount.inc:219
+#: ../lib/modules/sambaSamAccount.inc:371
+#: ../lib/modules/sambaSamAccount.inc:994
+#: ../lib/modules/sambaSamAccount.inc:1468
 msgid "Use Unix password"
 msgstr "使用unix的密码"
 
@@ -6370,20 +6471,20 @@ msgstr "使用unix的密码"
 #: ../lib/modules/sambaAccount.inc:359
 #: ../lib/modules/sambaAccount.inc:362
 #: ../lib/modules/sambaAccount.inc:756
-#: ../lib/modules/sambaSamAccount.inc:208
-#: ../lib/modules/sambaSamAccount.inc:211
-#: ../lib/modules/sambaSamAccount.inc:359
-#: ../lib/modules/sambaSamAccount.inc:964
-#: ../lib/modules/sambaSamAccount.inc:1434
+#: ../lib/modules/sambaSamAccount.inc:222
+#: ../lib/modules/sambaSamAccount.inc:225
+#: ../lib/modules/sambaSamAccount.inc:379
+#: ../lib/modules/sambaSamAccount.inc:999
+#: ../lib/modules/sambaSamAccount.inc:1474
 msgid "Use no password"
 msgstr "无需密码"
 
-#: ../lib/modules/quota.inc:96
-#: ../lib/modules/quota.inc:357
+#: ../lib/modules/quota.inc:97
+#: ../lib/modules/quota.inc:375
 msgid "Used blocks"
 msgstr "已使用的块数"
 
-#: ../lib/modules/quota.inc:97
+#: ../lib/modules/quota.inc:98
 msgid "Used blocks. 1000 blocks are usually 1MB"
 msgstr "已经使用的块数,1000块约等于1MB"
 
@@ -6399,16 +6500,16 @@ msgstr "被对象类使用"
 msgid "Used for calculating RIDs from UID/GID. Do not change if unsure."
 msgstr "用来从UID/GID计算RID,不确定的话请不用修改."
 
-#: ../lib/modules/quota.inc:118
-#: ../lib/modules/quota.inc:361
+#: ../lib/modules/quota.inc:119
+#: ../lib/modules/quota.inc:379
 msgid "Used inodes"
 msgstr "已经使用的节点"
 
-#: ../lib/modules/quota.inc:119
+#: ../lib/modules/quota.inc:120
 msgid "Used inodes (files)"
 msgstr "已经使用的节点(文件)"
 
-#: ../lib/modules/sambaGroupMapping.inc:66
+#: ../lib/modules/sambaGroupMapping.inc:67
 msgid "User"
 msgstr "用户"
 
@@ -6423,13 +6524,18 @@ msgstr "用户帐号(例如 Unix, Samba和Kolab)"
 #: ../lib/modules/sambaAccount.inc:267
 #: ../lib/modules/sambaAccount.inc:377
 #: ../lib/modules/sambaAccount.inc:768
-#: ../lib/modules/sambaSamAccount.inc:229
-#: ../lib/modules/sambaSamAccount.inc:383
-#: ../lib/modules/sambaSamAccount.inc:995
-#: ../lib/modules/sambaSamAccount.inc:1252
+#: ../lib/modules/sambaSamAccount.inc:246
+#: ../lib/modules/sambaSamAccount.inc:403
+#: ../lib/modules/sambaSamAccount.inc:1035
+#: ../lib/modules/sambaSamAccount.inc:1292
+#: ../lib/modules/sambaSamAccount.inc:1503
 msgid "User can change password"
 msgstr "用户可以修改密码"
 
+#: ../lib/modules/sambaSamAccount.inc:342
+msgid "User can/must change password"
+msgstr "用户可以/必须修改密码"
+
 #: ../lib/modules/posixAccount.inc:377
 msgid "User description. If left empty first and last name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名."
@@ -6449,16 +6555,16 @@ msgstr "用户修改"
 #: ../lib/modules/sambaAccount.inc:274
 #: ../lib/modules/sambaAccount.inc:379
 #: ../lib/modules/sambaAccount.inc:776
-#: ../lib/modules/sambaSamAccount.inc:231
-#: ../lib/modules/sambaSamAccount.inc:390
-#: ../lib/modules/sambaSamAccount.inc:1012
-#: ../lib/modules/sambaSamAccount.inc:1257
+#: ../lib/modules/sambaSamAccount.inc:248
+#: ../lib/modules/sambaSamAccount.inc:410
+#: ../lib/modules/sambaSamAccount.inc:1052
+#: ../lib/modules/sambaSamAccount.inc:1297
+#: ../lib/modules/sambaSamAccount.inc:1508
 msgid "User must change password"
 msgstr "用户必须修改密码"
 
-#: ../templates/lists/changePassword.php:135
+#: ../templates/lists/changePassword.php:138
 #: ../templates/login.php:254
-#: ../lib/types/user.inc:85
 #: ../lib/modules/account.inc:94
 #: ../lib/modules/account.inc:115
 #: ../lib/modules/account.inc:135
@@ -6466,6 +6572,16 @@ msgstr "用户必须修改密码"
 #: ../lib/modules/account.inc:138
 #: ../lib/modules/account.inc:220
 #: ../lib/modules/account.inc:241
+#: ../lib/modules/inetOrgPerson.inc:99
+#: ../lib/modules/inetOrgPerson.inc:335
+#: ../lib/modules/inetOrgPerson.inc:450
+#: ../lib/modules/inetOrgPerson.inc:712
+#: ../lib/modules/inetOrgPerson.inc:1064
+#: ../lib/modules/uidObject.inc:38
+#: ../lib/modules/uidObject.inc:60
+#: ../lib/modules/uidObject.inc:78
+#: ../lib/modules/uidObject.inc:92
+#: ../lib/modules/uidObject.inc:153
 #: ../lib/modules/posixAccount.inc:76
 #: ../lib/modules/posixAccount.inc:77
 #: ../lib/modules/posixAccount.inc:80
@@ -6473,26 +6589,24 @@ msgstr "用户必须修改密码"
 #: ../lib/modules/posixAccount.inc:372
 #: ../lib/modules/posixAccount.inc:964
 #: ../lib/modules/posixAccount.inc:1242
-#: ../lib/modules/inetOrgPerson.inc:99
-#: ../lib/modules/inetOrgPerson.inc:335
-#: ../lib/modules/inetOrgPerson.inc:450
-#: ../lib/modules/inetOrgPerson.inc:712
-#: ../lib/modules/inetOrgPerson.inc:1064
+#: ../lib/types/user.inc:85
+#: ../lib/types/alias.inc:82
 msgid "User name"
 msgstr "用户名"
 
-#: ../lib/modules/posixAccount.inc:84
 #: ../lib/modules/inetOrgPerson.inc:101
+#: ../lib/modules/posixAccount.inc:84
 msgid "User name already exists!"
 msgstr "用户名已经存在!"
 
 #: ../lib/modules/account.inc:135
 #: ../lib/modules/account.inc:136
 #: ../lib/modules/account.inc:138
-#: ../lib/modules/posixAccount.inc:77
-#: ../lib/modules/posixAccount.inc:82
 #: ../lib/modules/inetOrgPerson.inc:99
 #: ../lib/modules/inetOrgPerson.inc:100
+#: ../lib/modules/uidObject.inc:78
+#: ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:82
 msgid "User name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !"
 msgstr "用户名包含非法字符,只能使用a-z,A-Z,0-9,和 .-_!"
 
@@ -6501,33 +6615,33 @@ msgid "User name in use. Selected next free user name."
 msgstr "用户名存在,请选择其他的用户名."
 
 #: ../lib/modules/account.inc:95
-#: ../lib/modules/posixAccount.inc:373
 #: ../lib/modules/inetOrgPerson.inc:451
+#: ../lib/modules/posixAccount.inc:373
 msgid "User name of the user who should be created. Valid characters are: a-z,A-Z,0-9, .-_. LAM does not allow a number as first character because useradd also does not allow it. 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,A-Z,,0-9.-_. 系统和useradd命令一样都不允许以数字开头的帐号。如果用户名已经存在,系统会在用户名后面增加一个数字.警告:超过8个字符的帐号在旧的系统中会产生问题,如果超过16个字符,无法登录windows。"
 
-#: ../lib/types/user.inc:44
 #: ../lib/modules/posixAccount.inc:56
 #: ../lib/modules/posixAccount.inc:57
 #: ../lib/modules/posixAccount.inc:60
 #: ../lib/modules/posixAccount.inc:157
+#: ../lib/types/user.inc:44
 msgid "Users"
 msgstr "用户"
 
-#: ../lib/modules/posixGroup.inc:395
+#: ../lib/modules/posixGroup.inc:417
 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:399
+#: ../lib/modules/posixGroup.inc:421
 msgid "Users who will become member of the current group. User names are separated by semicolons."
 msgstr "属于当前组的用户,以分号隔开."
 
-#: ../templates/tests/lamdaemonTest.php:217
+#: ../templates/tests/lamdaemonTest.php:226
 #, php-format
 msgid "Using %s as lamdaemon remote server."
 msgstr "使用%s做为lamdeamon的远程服务器."
 
-#: ../templates/tests/lamdaemonTest.php:238
+#: ../templates/tests/lamdaemonTest.php:247
 #, php-format
 msgid "Using %s to connect to remote server."
 msgstr "使用%s连接远程服务器."
@@ -6571,24 +6685,24 @@ msgid "Was unable to delete DN: %s."
 msgstr "无法删除DN: %s."
 
 #: ../templates/tree/update.php:109
-#: ../templates/tree/add_oclass.php:93
 #: ../templates/tree/add_oclass_form.php:162
+#: ../templates/tree/add_oclass.php:93
 #: ../templates/delete.php:196
 #: ../lib/modules.inc:1693
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "无法修改DN: %s的属性"
 
-#: ../templates/lists/changePassword.php:368
+#: ../templates/lists/changePassword.php:407
 #, php-format
 msgid "Was unable to modify attributes from DN: %s."
 msgstr "无法修改DN: %s的属性"
 
 #: ../templates/delete.php:212
-#: ../lib/modules/phpGroupwareGroup.inc:173
+#: ../lib/modules.inc:1717
+#: ../lib/modules/phpGroupwareGroup.inc:190
 #: ../lib/modules/phpGroupwareUser.inc:333
 #: ../lib/modules/phpGroupwareUser.inc:353
-#: ../lib/modules.inc:1717
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "无法删除DN: %s的属性."
@@ -6598,11 +6712,11 @@ msgstr "无法删除DN: %s的属性."
 msgid "Was unable to rename DN: %s."
 msgstr "无法重命名DN: %s."
 
-#: ../lib/modules/sambaSamAccount.inc:1189
+#: ../lib/modules/sambaSamAccount.inc:1229
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../lib/modules/sambaSamAccount.inc:490
+#: ../lib/modules/sambaSamAccount.inc:510
 msgid "Western Europe Time, London, Lisbon"
 msgstr "西欧时间,伦敦,里斯本"
 
@@ -6611,18 +6725,18 @@ msgid "When using ldaps:// be sure to use exactly the same IP/domain name as in
 msgstr "当使用ldaps://时必须使用和您的证书相同的ip/domain!"
 
 #: ../lib/modules/sambaAccount.inc:410
-#: ../lib/modules/sambaSamAccount.inc:269
+#: ../lib/modules/sambaSamAccount.inc:286
 msgid "Windows domain name of account."
 msgstr "帐号所属的windows域"
 
 #: ../lib/modules/sambaAccount.inc:311
 #: ../lib/modules/sambaAccount.inc:820
-#: ../lib/modules/sambaSamAccount.inc:434
-#: ../lib/modules/sambaSamAccount.inc:1089
-#: ../lib/modules/sambaSamAccount.inc:1511
-#: ../lib/modules/sambaSamAccount.inc:1659
-#: ../lib/modules/sambaGroupMapping.inc:217
-#: ../lib/modules/sambaGroupMapping.inc:346
+#: ../lib/modules/sambaGroupMapping.inc:255
+#: ../lib/modules/sambaGroupMapping.inc:386
+#: ../lib/modules/sambaSamAccount.inc:454
+#: ../lib/modules/sambaSamAccount.inc:1129
+#: ../lib/modules/sambaSamAccount.inc:1561
+#: ../lib/modules/sambaSamAccount.inc:1716
 msgid "Windows group"
 msgstr "Windows组"
 
@@ -6631,23 +6745,23 @@ msgid "Windows group RID"
 msgstr "Windows组的RID"
 
 #: ../lib/modules/sambaAccount.inc:400
-#: ../lib/modules/sambaGroupMapping.inc:318
+#: ../lib/modules/sambaGroupMapping.inc:358
 msgid "Windows group name"
 msgstr "Windows组名"
 
-#: ../lib/modules/sambaGroupMapping.inc:331
+#: ../lib/modules/sambaGroupMapping.inc:371
 msgid "Windows group type."
 msgstr "Windows组类型"
 
-#: ../lib/modules/sambaSamAccount.inc:252
+#: ../lib/modules/sambaSamAccount.inc:269
 msgid "Windows primary group"
 msgstr "Windows主组"
 
-#: ../lib/modules/sambaSamAccount.inc:255
+#: ../lib/modules/sambaSamAccount.inc:272
 msgid "Windows primary group SID"
 msgstr "Windows主组的SID"
 
-#: ../lib/modules/sambaGroupMapping.inc:327
+#: ../lib/modules/sambaGroupMapping.inc:367
 msgid "Windows-Domain name of group."
 msgstr "组的windows域名."
 
@@ -6655,13 +6769,13 @@ msgstr "组的windows域名."
 msgid "Workgroup"
 msgstr "工作组"
 
-#: ../lib/modules/sambaSamAccount.inc:298
-#: ../lib/modules/sambaSamAccount.inc:1341
-#: ../lib/modules/sambaSamAccount.inc:1679
+#: ../lib/modules/sambaSamAccount.inc:315
+#: ../lib/modules/sambaSamAccount.inc:1381
+#: ../lib/modules/sambaSamAccount.inc:1736
 msgid "Working directory"
 msgstr "工作目录"
 
-#: ../lib/modules/sambaSamAccount.inc:299
+#: ../lib/modules/sambaSamAccount.inc:316
 msgid "Working directory of initial program."
 msgstr "初始化程序的工作目录。"
 
@@ -6674,9 +6788,9 @@ msgstr "写入"
 msgid "Write access"
 msgstr "写权限"
 
-#: ../templates/login.php:447
 #: ../templates/selfService/selfServiceLogin.php:89
 #: ../templates/selfService/selfServiceLogin.php:107
+#: ../templates/login.php:447
 msgid "Wrong password/user name combination. Please try again."
 msgstr "错误的密码和用户组合,请重试!"
 
@@ -6687,7 +6801,7 @@ msgstr "错误的密码和用户组合,请重试!"
 msgid "Yes"
 msgstr "是"
 
-#: ../lib/modules/posixGroup.inc:478
+#: ../lib/modules/posixGroup.inc:504
 msgid "You are using a capital letters. This can cause problems because Windows isn't case-sensitive."
 msgstr "您使用了大写字符,这会造成一些问题,因为windows大小写不敏感."
 
@@ -6709,7 +6823,7 @@ msgstr "您没有为此对象选择对象类,请返回重新选择."
 msgid "You do not have the required access rights or the LDAP schema is not published by your server."
 msgstr "您无权访问或LDAP架构未发布到LDAP服务器。"
 
-#: ../lib/modules/dhcp_settings.inc:181
+#: ../lib/modules/dhcp_settings.inc:240
 msgid "You entered one or more invalid DNS servers."
 msgstr "您输入了一个或多个非常的DNS服务器."
 
@@ -6717,7 +6831,7 @@ msgstr "您输入了一个或多个非常的DNS服务器."
 msgid "You have been logged off from LDAP Account Manager."
 msgstr "您已经从系统退出"
 
-#: ../templates/lists/changePassword.php:289
+#: ../templates/lists/changePassword.php:292
 msgid "You have to activate the \"I am sure\" checkbox."
 msgstr "您必须激活\"我确认\"选项。"
 
@@ -6739,7 +6853,7 @@ msgstr "您没有做任何修改."
 msgid "You need to add at least one member to this group."
 msgstr "您至少需要为这个组增加一个成员."
 
-#: ../templates/tests/lamdaemonTest.php:242
+#: ../templates/tests/lamdaemonTest.php:251
 #, php-format
 msgid "Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"
 msgstr "系统管理者(%s)必须有一个合法的UNIX帐号才能运行lamdaemon !"
@@ -6761,8 +6875,8 @@ msgstr "超时,请点此外返回到登录界面."
 msgid "Your session expired, please log in again."
 msgstr "超时,请重新登录."
 
-#: ../templates/config/mainmanage.php:139
 #: ../templates/selfService/adminMain.php:113
+#: ../templates/config/mainmanage.php:139
 #: ../lib/config.inc:389
 msgid "Your settings were successfully saved."
 msgstr "设置保存成功."
@@ -6771,12 +6885,13 @@ msgstr "设置保存成功."
 msgid "YourCompany, Human Resources"
 msgstr "某某公司,人力资源部"
 
-#: ../lib/modules/ddns.inc:80
-#: ../lib/modules/ddns.inc:468
+#: ../lib/modules/ddns.inc:97
+#: ../lib/modules/ddns.inc:328
+#: ../lib/modules/ddns.inc:361
 msgid "Zone names"
 msgstr "区域名"
 
-#: ../lib/modules/ddns.inc:81
+#: ../lib/modules/ddns.inc:98
 msgid "Zone names for the DNS server (e.g. company.local)."
 msgstr "DNS服务器的区域名(比如: company.local)."
 
@@ -6786,12 +6901,12 @@ msgid "[attribute deleted]"
 msgstr "[删除属性]"
 
 #: ../lib/modules/sambaAccount.inc:289
-#: ../lib/modules/sambaSamAccount.inc:412
+#: ../lib/modules/sambaSamAccount.inc:432
 msgid "\\\\server\\homes\\smiller"
 msgstr "\\\\server\\homes\\smiller"
 
 #: ../lib/modules/sambaAccount.inc:295
-#: ../lib/modules/sambaSamAccount.inc:418
+#: ../lib/modules/sambaSamAccount.inc:438
 msgid "\\\\server\\profiles\\smiller"
 msgstr "\\\\server\\profiles\\smiller"
 
@@ -6804,8 +6919,8 @@ msgstr "激活"
 msgid "add value"
 msgstr "增加值"
 
-#: ../lib/modules/posixGroup.inc:350
 #: ../lib/modules/groupOfNames.inc:86
+#: ../lib/modules/posixGroup.inc:389
 msgid "adminstrators"
 msgstr "管理员"
 
@@ -6825,30 +6940,30 @@ msgstr "dc=yourcompany,dc=com"
 msgid "delete attribute"
 msgstr "删除属性"
 
-#: ../lib/modules/sambaSamAccount.inc:1376
-#: ../lib/modules/sambaSamAccount.inc:1699
+#: ../lib/modules/sambaSamAccount.inc:1416
+#: ../lib/modules/sambaSamAccount.inc:1756
 msgid "disabled"
 msgstr "关闭"
 
-#: ../lib/modules/sambaSamAccount.inc:1388
-#: ../lib/modules/sambaSamAccount.inc:1710
+#: ../lib/modules/sambaSamAccount.inc:1428
+#: ../lib/modules/sambaSamAccount.inc:1767
 msgid "disconnect"
 msgstr "中断连接"
 
-#: ../templates/lists/changePassword.php:179
+#: ../templates/lists/changePassword.php:182
 msgid "display on screen"
 msgstr "屏幕显示"
 
+#: ../templates/tree/add_value_form.php:107
+#: ../templates/tree/add_value_form.php:110
 #: ../templates/tree/edit.php:179
 #: ../templates/tree/edit.php:181
 #: ../templates/tree/edit.php:308
 #: ../templates/tree/edit.php:310
-#: ../templates/tree/add_value_form.php:107
-#: ../templates/tree/add_value_form.php:110
 msgid "download value"
 msgstr "下载值"
 
-#: ../templates/lists/changePassword.php:153
+#: ../templates/lists/changePassword.php:156
 #: ../lib/modules/inetOrgPerson.inc:85
 #: ../lib/modules/inetOrgPerson.inc:152
 #: ../lib/modules/inetOrgPerson.inc:287
@@ -6864,13 +6979,13 @@ msgstr "电子邮件地址"
 msgid "false"
 msgstr "失败"
 
-#: ../lib/modules/sambaSamAccount.inc:1397
-#: ../lib/modules/sambaSamAccount.inc:1718
+#: ../lib/modules/sambaSamAccount.inc:1437
+#: ../lib/modules/sambaSamAccount.inc:1775
 msgid "from any client"
 msgstr "从任何客户端"
 
-#: ../lib/modules/sambaSamAccount.inc:1398
-#: ../lib/modules/sambaSamAccount.inc:1719
+#: ../lib/modules/sambaSamAccount.inc:1438
+#: ../lib/modules/sambaSamAccount.inc:1776
 msgid "from previous client only"
 msgstr "仅从以前的客户端"
 
@@ -6878,8 +6993,8 @@ msgstr "仅从以前的客户端"
 msgid "group01,group02"
 msgstr "group01,group02"
 
-#: ../lib/modules/quota.inc:180
-#: ../lib/modules/quota.inc:182
+#: ../lib/modules/quota.inc:181
+#: ../lib/modules/quota.inc:183
 msgid "hours"
 msgstr "小时"
 
@@ -6888,23 +7003,23 @@ msgstr "小时"
 msgid "inactive"
 msgstr "停用"
 
-#: ../lib/modules/sambaSamAccount.inc:1380
-#: ../lib/modules/sambaSamAccount.inc:1703
+#: ../lib/modules/sambaSamAccount.inc:1420
+#: ../lib/modules/sambaSamAccount.inc:1760
 msgid "input off, notify off"
 msgstr "输入关，提醒关"
 
-#: ../lib/modules/sambaSamAccount.inc:1379
-#: ../lib/modules/sambaSamAccount.inc:1702
+#: ../lib/modules/sambaSamAccount.inc:1419
+#: ../lib/modules/sambaSamAccount.inc:1759
 msgid "input off, notify on"
 msgstr "输入关，提醒开"
 
-#: ../lib/modules/sambaSamAccount.inc:1378
-#: ../lib/modules/sambaSamAccount.inc:1701
+#: ../lib/modules/sambaSamAccount.inc:1418
+#: ../lib/modules/sambaSamAccount.inc:1758
 msgid "input on, notify off"
 msgstr "输入开，提醒关"
 
-#: ../lib/modules/sambaSamAccount.inc:1377
-#: ../lib/modules/sambaSamAccount.inc:1700
+#: ../lib/modules/sambaSamAccount.inc:1417
+#: ../lib/modules/sambaSamAccount.inc:1757
 msgid "input on, notify on"
 msgstr "输入开，提醒开"
 
@@ -6930,25 +7045,23 @@ msgstr "mail.yourdomain.org"
 
 #: ../lib/modules/sambaAccount.inc:327
 #: ../lib/modules/sambaAccount.inc:337
-#: ../lib/modules/sambaSamAccount.inc:335
-#: ../lib/modules/sambaSamAccount.inc:461
+#: ../lib/modules/sambaSamAccount.inc:355
+#: ../lib/modules/sambaSamAccount.inc:481
 msgid "mydomain"
 msgstr "我的域"
 
-#: ../lib/modules/sambaSamAccount.inc:436
+#: ../lib/modules/sambaSamAccount.inc:456
 msgid "mygroup"
 msgstr "我的组"
 
-#: ../lib/modules/sambaSamAccount.inc:1667
-#: ../lib/modules/sambaSamAccount.inc:1675
-#: ../lib/modules/sambaSamAccount.inc:1685
-#: ../lib/modules/sambaSamAccount.inc:1690
-#: ../lib/modules/sambaSamAccount.inc:1695
+#: ../lib/modules/sambaSamAccount.inc:1724
+#: ../lib/modules/sambaSamAccount.inc:1732
+#: ../lib/modules/sambaSamAccount.inc:1742
+#: ../lib/modules/sambaSamAccount.inc:1747
+#: ../lib/modules/sambaSamAccount.inc:1752
 msgid "no"
 msgstr "否"
 
-#: ../templates/tree/templates/creation/custom.php:189
-#: ../templates/tree/templates/creation/custom.php:212
 #: ../templates/schema/schema.php:165
 #: ../templates/schema/schema.php:234
 #: ../templates/schema/schema.php:245
@@ -6957,6 +7070,8 @@ msgstr "否"
 #: ../templates/schema/schema.php:375
 #: ../templates/schema/schema.php:409
 #: ../templates/schema/schema.php:431
+#: ../templates/tree/templates/creation/custom.php:189
+#: ../templates/tree/templates/creation/custom.php:212
 msgid "none"
 msgstr "空"
 
@@ -6979,7 +7094,7 @@ msgstr "未指定"
 msgid "ou=People,dc=yourcompany,dc=com will read and store all accounts in this subtree."
 msgstr "ou=People,dc=yourcompany,dc=com 表示将会在此子树下读取和保存所有帐号"
 
-#: ../templates/masscreate.php:162
+#: ../templates/masscreate.php:166
 msgid "ou=accounts,dc=yourdomain,dc=org"
 msgstr "ou=accounts,dc=yourdomain,dc=org"
 
@@ -6996,31 +7111,32 @@ msgid "pc01,pc02"
 msgstr "pc01,pc02"
 
 #: ../templates/tree/edit.php:246
-#: ../templates/config/confmain.php:466
 #: ../templates/selfService/adminMain.php:554
+#: ../templates/config/confmain.php:466
 #: ../lib/modules.inc:1134
 msgid "required"
 msgstr "必选项"
 
-#: ../lib/modules/sambaSamAccount.inc:1389
-#: ../lib/modules/sambaSamAccount.inc:1711
+#: ../lib/modules/sambaSamAccount.inc:1429
+#: ../lib/modules/sambaSamAccount.inc:1768
 msgid "reset"
 msgstr "复位"
 
-#: ../lib/modules/posixGroup.inc:376
 #: ../lib/modules/sambaAccount.inc:231
-#: ../lib/modules/sambaSamAccount.inc:347
+#: ../lib/modules/posixGroup.inc:380
 #: ../lib/modules/posixAccount.inc:254
+#: ../lib/modules/sambaSamAccount.inc:367
 msgid "secret"
 msgstr "secret"
 
-#: ../templates/lists/changePassword.php:181
+#: ../templates/lists/changePassword.php:184
 msgid "send via mail"
 msgstr "通过邮件发送"
 
-#: ../lib/modules/posixAccount.inc:199
-#: ../lib/modules/inetOrgPerson.inc:337
 #: ../lib/modules/nisMailAlias.inc:91
+#: ../lib/modules/inetOrgPerson.inc:337
+#: ../lib/modules/uidObject.inc:62
+#: ../lib/modules/posixAccount.inc:199
 msgid "smiller"
 msgstr "smiller"
 
@@ -7045,10 +7161,11 @@ msgid "true"
 msgstr "true"
 
 #: ../lib/modules/inetOrgPerson.inc:229
+#: ../lib/modules/aliasEntry.inc:64
 msgid "uid=smiller,ou=People,dc=company,dc=com"
 msgstr "uid=smiller,ou=People,dc=company,dc=com"
 
-#: ../lib/modules/posixGroup.inc:370
+#: ../lib/modules/posixGroup.inc:374
 msgid "user01,user02,user03"
 msgstr "user01,user02,user03"
 
@@ -7060,15 +7177,27 @@ msgstr "user@company.com"
 msgid "users"
 msgstr "用户"
 
-#: ../lib/modules/sambaSamAccount.inc:1665
-#: ../lib/modules/sambaSamAccount.inc:1673
-#: ../lib/modules/sambaSamAccount.inc:1683
-#: ../lib/modules/sambaSamAccount.inc:1688
-#: ../lib/modules/sambaSamAccount.inc:1693
 #: ../lib/modules/inetOrgPerson.inc:313
+#: ../lib/modules/sambaSamAccount.inc:1722
+#: ../lib/modules/sambaSamAccount.inc:1730
+#: ../lib/modules/sambaSamAccount.inc:1740
+#: ../lib/modules/sambaSamAccount.inc:1745
+#: ../lib/modules/sambaSamAccount.inc:1750
 msgid "yes"
 msgstr "是"
 
+#~ msgid "Account suffix"
+#~ msgstr "帐号后缀"
+#~ msgid "Edit PDF structure"
+#~ msgstr "编辑PDF结构"
+#~ msgid "Edit profile"
+#~ msgstr "编辑配置文件"
+#~ msgid ""
+#~ "LDAP DN (e.g. dc=company,dc=com) of accounts. This is used to find "
+#~ "possible delegation candidates."
+#~ msgstr "帐号的LDAP DN(比如: dc=complay,dc=com).用来查找可能的委托候选人."
+#~ msgid "PDF structures"
+#~ msgstr "PDF架构"
 #~ msgid "Create PDF for all aliases"
 #~ msgstr "为所有别名建立PDF"
 #~ msgid "Create PDF for all domains"