diff --git a/lam/locale/zh_CN/LC_MESSAGES/messages.mo b/lam/locale/zh_CN/LC_MESSAGES/messages.mo
index 1efb90f4..af1c6db5 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 b051548e..c2bd4c79 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: 2013-05-22 01:24+0800\n"
+"PO-Revision-Date: 2013-09-03 15:56-0500\n"
 "Last-Translator: Alan Needham <needham@sina.com>\n"
 "Language-Team: Chinese(Simplified) <needham@sina.com>\n"
 "Language: zh_CN\n"
@@ -43,7 +43,7 @@ msgstr "\"Send as\"属性"
 msgid "\"Send as\" privileges"
 msgstr "\"做为..发送\"权限"
 
-#: ../lib/modules/posixAccount.inc:479
+#: ../lib/modules/posixAccount.inc:508
 msgid ""
 "$user and $group will be replaced with user name and primary group name."
 msgstr "$usert和$group会被用户名或主要组名替代 "
@@ -52,7 +52,7 @@ msgstr "$usert和$group会被用户名或主要组名替代 "
 msgid "(host1,user1,example.com);(host2,user2,example.com)"
 msgstr "(主机1,用户1,example.com);(主机2,用户2,example.com)"
 
-#: ../lib/modules/qmailUser.inc:361 ../lib/modules/posixAccount.inc:290
+#: ../lib/modules/qmailUser.inc:361 ../lib/modules/posixAccount.inc:305
 msgid "/home/smiller"
 msgstr "/home/smiller"
 
@@ -78,7 +78,7 @@ msgstr "123-124-1234"
 msgid "12345"
 msgstr "12345"
 
-#: ../lib/modules/dhcp_settings.inc:160
+#: ../lib/modules/dhcp_settings.inc:167
 msgid ""
 "<b>B-Node (0x01): Broadcast.</b><br/>The client tries to find other "
 "workstations via broadcasting\n"
@@ -118,8 +118,8 @@ msgstr ""
 msgid "<b>Maximum length:</b> %s characters"
 msgstr "<b>最大长度:</b> %s 字符"
 
-#: ../lib/modules/selfRegistration.inc:539
-#: ../lib/modules/passwordSelfReset.inc:1372
+#: ../lib/modules/selfRegistration.inc:540
+#: ../lib/modules/passwordSelfReset.inc:1456
 msgid ""
 "A confirmation mail was sent. Please click on the link in the mail to "
 "proceed."
@@ -141,7 +141,7 @@ msgstr "选项列表(比如:!authenticate)."
 msgid "A required column is missing in your CSV file."
 msgstr "您的CSV文件中缺少一个必要的列."
 
-#: ../lib/modules/kolabUser.inc:114
+#: ../lib/modules/kolabUser.inc:115
 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."
@@ -178,7 +178,7 @@ msgstr "AMA标志"
 msgid "Abandon"
 msgstr "终止"
 
-#: ../templates/lists/changePassword.php:643
+#: ../templates/lists/changePassword.php:659
 msgid "Aborted password change."
 msgstr "中断密码更改"
 
@@ -186,7 +186,7 @@ msgstr "中断密码更改"
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr "阿布达比, 马斯凯特, 巴库"
 
-#: ../templates/config/confmain.php:263 ../help/help.inc:103
+#: ../templates/config/confmain.php:263 ../help/help.inc:105
 msgid "Access level"
 msgstr "访问级别"
 
@@ -194,7 +194,9 @@ msgstr "访问级别"
 msgid "Account"
 msgstr "帐号"
 
-#: ../templates/massBuildAccounts.php:201 ../lib/modules/mitKerberos.inc:281
+#: ../templates/massBuildAccounts.php:201 ../lib/modules/kolabGroup.inc:159
+#: ../lib/modules/kolabGroup.inc:161 ../lib/modules/kolabGroup.inc:163
+#: ../lib/modules/kolabGroup.inc:165 ../lib/modules/mitKerberos.inc:281
 #: ../lib/modules/mitKerberos.inc:282 ../lib/modules/mitKerberos.inc:283
 #: ../lib/modules/mitKerberos.inc:285 ../lib/modules/mitKerberos.inc:287
 #: ../lib/modules/mitKerberos.inc:288
@@ -225,24 +227,24 @@ msgstr "帐号"
 #: ../lib/modules/zarafaContact.inc:175 ../lib/modules/zarafaContact.inc:177
 #: ../lib/modules/zarafaContact.inc:178 ../lib/modules/zarafaContact.inc:179
 #: ../lib/modules/zarafaContact.inc:180 ../lib/modules/windowsHost.inc:125
-#: ../lib/modules/posixGroup.inc:537 ../lib/modules/posixGroup.inc:541
-#: ../lib/modules/posixGroup.inc:542 ../lib/modules/zarafaGroup.inc:210
+#: ../lib/modules/posixGroup.inc:577 ../lib/modules/posixGroup.inc:581
+#: ../lib/modules/posixGroup.inc:582 ../lib/modules/zarafaGroup.inc:210
 #: ../lib/modules/zarafaGroup.inc:212 ../lib/modules/zarafaGroup.inc:213
 #: ../lib/modules/zarafaGroup.inc:214 ../lib/modules/zarafaGroup.inc:215
 #: ../lib/modules/zarafaGroup.inc:217 ../lib/modules/device.inc:134
-#: ../lib/modules/device.inc:135 ../lib/modules/dhcp_settings.inc:293
-#: ../lib/modules/dhcp_settings.inc:295 ../lib/modules/dhcp_settings.inc:297
-#: ../lib/modules/dhcp_settings.inc:299 ../lib/modules/dhcp_settings.inc:301
-#: ../lib/modules/dhcp_settings.inc:302 ../lib/modules/dhcp_settings.inc:304
-#: ../lib/modules/dhcp_settings.inc:306 ../lib/modules/dhcp_settings.inc:310
-#: ../lib/modules/eduPerson.inc:237 ../lib/modules/eduPerson.inc:239
-#: ../lib/modules/eduPerson.inc:241 ../lib/modules/eduPerson.inc:243
-#: ../lib/modules/eduPerson.inc:244 ../lib/modules/eduPerson.inc:245
-#: ../lib/modules/eduPerson.inc:246 ../lib/modules/quota.inc:52
-#: ../lib/modules/quota.inc:54 ../lib/modules/quota.inc:56
-#: ../lib/modules/quota.inc:58 ../lib/modules/quota.inc:60
-#: ../lib/modules/quota.inc:62 ../lib/modules/quota.inc:63
-#: ../lib/modules/zarafaAddressList.inc:163
+#: ../lib/modules/device.inc:135 ../lib/modules/dhcp_settings.inc:314
+#: ../lib/modules/dhcp_settings.inc:316 ../lib/modules/dhcp_settings.inc:318
+#: ../lib/modules/dhcp_settings.inc:320 ../lib/modules/dhcp_settings.inc:322
+#: ../lib/modules/dhcp_settings.inc:323 ../lib/modules/dhcp_settings.inc:324
+#: ../lib/modules/dhcp_settings.inc:326 ../lib/modules/dhcp_settings.inc:328
+#: ../lib/modules/dhcp_settings.inc:332 ../lib/modules/eduPerson.inc:237
+#: ../lib/modules/eduPerson.inc:239 ../lib/modules/eduPerson.inc:241
+#: ../lib/modules/eduPerson.inc:243 ../lib/modules/eduPerson.inc:244
+#: ../lib/modules/eduPerson.inc:245 ../lib/modules/eduPerson.inc:246
+#: ../lib/modules/quota.inc:52 ../lib/modules/quota.inc:54
+#: ../lib/modules/quota.inc:56 ../lib/modules/quota.inc:58
+#: ../lib/modules/quota.inc:60 ../lib/modules/quota.inc:62
+#: ../lib/modules/quota.inc:63 ../lib/modules/zarafaAddressList.inc:163
 #: ../lib/modules/zarafaAddressList.inc:164
 #: ../lib/modules/zarafaAddressList.inc:165
 #: ../lib/modules/sambaSamAccount.inc:96 ../lib/modules/sambaSamAccount.inc:99
@@ -260,13 +262,13 @@ msgstr "帐号"
 #: ../lib/modules/sambaSamAccount.inc:117
 #: ../lib/modules/sambaSamAccount.inc:118
 #: ../lib/modules/sambaSamAccount.inc:120
-#: ../lib/modules/sambaSamAccount.inc:121 ../lib/modules/posixAccount.inc:84
-#: ../lib/modules/posixAccount.inc:89 ../lib/modules/posixAccount.inc:93
-#: ../lib/modules/posixAccount.inc:101 ../lib/modules/posixAccount.inc:102
-#: ../lib/modules/posixAccount.inc:103 ../lib/modules/posixAccount.inc:104
-#: ../lib/modules/posixAccount.inc:105 ../lib/modules/posixAccount.inc:106
-#: ../lib/modules/posixAccount.inc:108 ../lib/modules/posixAccount.inc:109
-#: ../lib/modules/posixAccount.inc:110 ../lib/modules/posixAccount.inc:112
+#: ../lib/modules/sambaSamAccount.inc:121 ../lib/modules/posixAccount.inc:102
+#: ../lib/modules/posixAccount.inc:107 ../lib/modules/posixAccount.inc:111
+#: ../lib/modules/posixAccount.inc:119 ../lib/modules/posixAccount.inc:120
+#: ../lib/modules/posixAccount.inc:121 ../lib/modules/posixAccount.inc:122
+#: ../lib/modules/posixAccount.inc:123 ../lib/modules/posixAccount.inc:124
+#: ../lib/modules/posixAccount.inc:126 ../lib/modules/posixAccount.inc:127
+#: ../lib/modules/posixAccount.inc:128 ../lib/modules/posixAccount.inc:130
 #: ../lib/modules/zarafaUser.inc:441 ../lib/modules/zarafaUser.inc:443
 #: ../lib/modules/zarafaUser.inc:445 ../lib/modules/zarafaUser.inc:446
 #: ../lib/modules/zarafaUser.inc:448 ../lib/modules/zarafaUser.inc:450
@@ -282,11 +284,12 @@ msgstr "帐号"
 #: ../lib/modules/windowsUser.inc:462 ../lib/modules/windowsUser.inc:464
 #: ../lib/modules/windowsUser.inc:1022 ../lib/modules/windowsUser.inc:1031
 #: ../lib/modules/windowsUser.inc:1040 ../lib/modules/windowsUser.inc:1051
-#: ../lib/modules/windowsUser.inc:1087 ../lib/modules/kolabUser.inc:179
-#: ../lib/modules/kolabUser.inc:181 ../lib/modules/kolabUser.inc:183
-#: ../lib/modules/kolabUser.inc:185 ../lib/modules/ddns.inc:145
-#: ../lib/modules/nisObject.inc:117 ../lib/modules/sambaGroupMapping.inc:435
-#: ../lib/modules/sambaGroupMapping.inc:436
+#: ../lib/modules/windowsUser.inc:1087 ../lib/modules/kolabUser.inc:212
+#: ../lib/modules/kolabUser.inc:214 ../lib/modules/kolabUser.inc:216
+#: ../lib/modules/kolabUser.inc:218 ../lib/modules/kolabUser.inc:220
+#: ../lib/modules/kolabUser.inc:222 ../lib/modules/ddns.inc:145
+#: ../lib/modules/nisObject.inc:117 ../lib/modules/sambaGroupMapping.inc:590
+#: ../lib/modules/sambaGroupMapping.inc:591
 #: ../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
@@ -328,13 +331,13 @@ msgstr "帐号"
 #: ../lib/modules/qmailGroup.inc:427 ../lib/modules/qmailGroup.inc:428
 #: ../lib/modules/qmailGroup.inc:429 ../lib/modules/qmailGroup.inc:430
 #: ../lib/modules/authorizedServiceObject.inc:123
-#: ../lib/modules/heimdalKerberos.inc:240
-#: ../lib/modules/heimdalKerberos.inc:241
-#: ../lib/modules/heimdalKerberos.inc:242
-#: ../lib/modules/heimdalKerberos.inc:244
-#: ../lib/modules/heimdalKerberos.inc:246 ../lib/modules/windowsGroup.inc:241
-#: ../lib/modules/windowsGroup.inc:243 ../lib/modules/windowsGroup.inc:245
-#: ../lib/modules/windowsGroup.inc:246 ../lib/modules/windowsGroup.inc:247
+#: ../lib/modules/heimdalKerberos.inc:245
+#: ../lib/modules/heimdalKerberos.inc:246
+#: ../lib/modules/heimdalKerberos.inc:247
+#: ../lib/modules/heimdalKerberos.inc:249
+#: ../lib/modules/heimdalKerberos.inc:251 ../lib/modules/windowsGroup.inc:258
+#: ../lib/modules/windowsGroup.inc:260 ../lib/modules/windowsGroup.inc:262
+#: ../lib/modules/windowsGroup.inc:263 ../lib/modules/windowsGroup.inc:264
 #: ../lib/modules/nisMailAlias.inc:115 ../lib/modules/nisMailAlias.inc:117
 #: ../lib/modules/hostObject.inc:104
 #, php-format
@@ -375,7 +378,7 @@ msgstr "建立帐号确认"
 msgid "Account creation via file upload"
 msgstr "通过上传文件建立帐号"
 
-#: ../lib/modules/posixAccount.inc:486
+#: ../lib/modules/posixAccount.inc:515
 msgid "Account deactivated"
 msgstr "帐号已停用"
 
@@ -395,11 +398,11 @@ msgstr "帐号详细信息"
 #: ../lib/modules/shadowAccount.inc:226 ../lib/modules/shadowAccount.inc:343
 #: ../lib/modules/shadowAccount.inc:444 ../lib/modules/shadowAccount.inc:490
 #: ../lib/modules/heimdalKerberos.inc:95
-#: ../lib/modules/heimdalKerberos.inc:175
-#: ../lib/modules/heimdalKerberos.inc:207
-#: ../lib/modules/heimdalKerberos.inc:313
-#: ../lib/modules/heimdalKerberos.inc:536
-#: ../lib/modules/heimdalKerberos.inc:671
+#: ../lib/modules/heimdalKerberos.inc:180
+#: ../lib/modules/heimdalKerberos.inc:212
+#: ../lib/modules/heimdalKerberos.inc:318
+#: ../lib/modules/heimdalKerberos.inc:541
+#: ../lib/modules/heimdalKerberos.inc:676
 msgid "Account expiration date"
 msgstr "帐号过期日期"
 
@@ -439,8 +442,8 @@ msgstr "帐号状态"
 #: ../lib/modules/asteriskAccount.inc:331
 #: ../lib/modules/asteriskAccount.inc:393
 #: ../lib/modules/asteriskAccount.inc:679
-#: ../lib/modules/asteriskAccount.inc:1191 ../lib/modules/customFields.inc:425
-#: ../lib/modules/customFields.inc:468
+#: ../lib/modules/asteriskAccount.inc:1191 ../lib/modules/customFields.inc:440
+#: ../lib/modules/customFields.inc:488
 msgid "Account type"
 msgstr "帐号类型"
 
@@ -451,11 +454,11 @@ msgstr "帐号类型"
 msgid "Account types"
 msgstr "帐号类型"
 
-#: ../help/help.inc:105
+#: ../help/help.inc:107
 msgid "Account types and modules"
 msgstr "帐号类型和模块"
 
-#: ../help/help.inc:107
+#: ../help/help.inc:109
 msgid ""
 "Account types define which sorts of LDAP entries (e.g. users and groups) "
 "should be managed. The account modules define which properties (e.g. Unix "
@@ -468,9 +471,9 @@ msgstr ""
 msgid "Account was created successfully."
 msgstr "新增帐号成功"
 
-#: ../templates/lists/changePassword.php:673
-#: ../templates/lists/changePassword.php:725
-#: ../templates/lists/changePassword.php:771 ../lib/modules.inc:1284
+#: ../templates/lists/changePassword.php:689
+#: ../templates/lists/changePassword.php:741
+#: ../templates/lists/changePassword.php:787 ../lib/modules.inc:1284
 msgid "Account was modified successfully."
 msgstr "帐号修改成功"
 
@@ -509,7 +512,7 @@ msgstr "激活这个选项将从客户机上继承初始化程序和工作目录
 msgid "Activate this checkbox to set the client's printer as default printer."
 msgstr "激活这个选项将会设置客户打印机为缺省打印机。"
 
-#: ../lib/modules/posixAccount.inc:442
+#: ../lib/modules/posixAccount.inc:471
 msgid "Activating this checkbox will remove the user's home directory."
 msgstr "激活这个选项将会删除用户的主目录."
 
@@ -530,7 +533,8 @@ msgstr "激活这个选项将会删除用户的主目录."
 #: ../lib/modules/zarafaAddressList.inc:215
 #: ../lib/modules/zarafaAddressList.inc:341 ../lib/modules/zarafaUser.inc:77
 #: ../lib/modules/zarafaUser.inc:202 ../lib/modules/zarafaUser.inc:296
-#: ../lib/modules/zarafaUser.inc:626
+#: ../lib/modules/zarafaUser.inc:626 ../lib/modules/fixed_ip.inc:100
+#: ../lib/modules/fixed_ip.inc:366 ../lib/modules/fixed_ip.inc:562
 msgid "Active"
 msgstr "激活"
 
@@ -540,11 +544,11 @@ msgstr "激活帐号类型"
 
 #: ../templates/serverInfo.php:307 ../templates/serverInfo.php:384
 #: ../templates/config/profmanage.php:251
-#: ../templates/config/confmodules.php:295
+#: ../templates/config/confmodules.php:305
 #: ../templates/config/conftypes.php:223
 #: ../templates/selfService/profManage.php:209
-#: ../templates/pdfedit/pdfpage.php:561 ../templates/pdfedit/pdfpage.php:571
-#: ../templates/pdfedit/pdfpage.php:581 ../templates/pdfedit/pdfpage.php:595
+#: ../templates/pdfedit/pdfpage.php:596 ../templates/pdfedit/pdfpage.php:606
+#: ../templates/pdfedit/pdfpage.php:616 ../templates/pdfedit/pdfpage.php:630
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1206
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1210
 #: ../templates/3rdParty/pla/htdocs/add_attr_form.php:78
@@ -552,14 +556,17 @@ msgstr "激活帐号类型"
 #: ../lib/modules/zarafaContact.inc:379 ../lib/modules/zarafaGroup.inc:448
 #: ../lib/modules/device.inc:259 ../lib/modules/zarafaUser.inc:906
 #: ../lib/modules/zarafaUser.inc:1528 ../lib/modules/zarafaUser.inc:1560
-#: ../lib/modules/kolabUser.inc:707 ../lib/modules/kolabUser.inc:755
+#: ../lib/modules/kolabUser.inc:786 ../lib/modules/kolabUser.inc:834
+#: ../lib/modules/sambaGroupMapping.inc:385
+#: ../lib/modules/sambaGroupMapping.inc:476
+#: ../lib/modules/ldapPublicKey.inc:295 ../lib/modules/ldapPublicKey.inc:305
 #: ../lib/modules/nisnetgroup.inc:275 ../lib/modules/inetOrgPerson.inc:2185
 #: ../lib/modules/sudoRole.inc:269 ../lib/modules/sudoRole.inc:296
 #: ../lib/modules/sudoRole.inc:323 ../lib/modules/sudoRole.inc:350
 #: ../lib/modules/sudoRole.inc:377 ../lib/modules/sudoRole.inc:404
-#: ../lib/modules/customFields.inc:895 ../lib/modules/qmailGroup.inc:815
-#: ../lib/modules/windowsGroup.inc:416 ../lib/modules/groupOfNames.inc:282
-#: ../lib/modules/groupOfNames.inc:396
+#: ../lib/modules/customFields.inc:998 ../lib/modules/qmailGroup.inc:815
+#: ../lib/modules/windowsGroup.inc:510 ../lib/modules/groupOfNames.inc:338
+#: ../lib/modules/groupOfNames.inc:473
 msgid "Add"
 msgstr "增加"
 
@@ -587,11 +594,11 @@ msgstr "增加FreeRadius扩展"
 msgid "Add IP address extension"
 msgstr "增加IP地址扩展"
 
-#: ../lib/modules/mitKerberos.inc:479 ../lib/modules/heimdalKerberos.inc:394
+#: ../lib/modules/mitKerberos.inc:479 ../lib/modules/heimdalKerberos.inc:399
 msgid "Add Kerberos extension"
 msgstr "增加 Kerberos 扩展"
 
-#: ../lib/modules/kolabUser.inc:319
+#: ../lib/modules/kolabGroup.inc:201 ../lib/modules/kolabUser.inc:362
 msgid "Add Kolab extension"
 msgstr "增加 Kolab 扩展"
 
@@ -600,7 +607,7 @@ msgid "Add Puppet extension"
 msgstr "增加 Puppet 扩展"
 
 #: ../lib/modules/sambaSamAccount.inc:1286
-#: ../lib/modules/sambaGroupMapping.inc:289
+#: ../lib/modules/sambaGroupMapping.inc:415
 msgid "Add Samba 3 extension"
 msgstr "增加 Samba 3 扩展"
 
@@ -608,6 +615,10 @@ msgstr "增加 Samba 3 扩展"
 msgid "Add Shadow account extension"
 msgstr "增加 Shadow 帐号扩展"
 
+#: ../lib/modules/posixGroup.inc:249 ../lib/modules/posixAccount.inc:1420
+msgid "Add Unix extension"
+msgstr "增加Unix扩展"
+
 #: ../lib/modules/zarafaContact.inc:123 ../lib/modules/zarafaContact.inc:191
 msgid "Add Zarafa contact extension"
 msgstr "增加Zarafa联系人扩展"
@@ -641,12 +652,13 @@ msgstr "增加条目"
 
 #: ../lib/modules/zarafaContact.inc:418 ../lib/modules/zarafaGroup.inc:487
 #: ../lib/modules/device.inc:302 ../lib/modules/zarafaUser.inc:945
-#: ../lib/modules/qmailGroup.inc:851 ../lib/modules/windowsGroup.inc:459
-#: ../lib/modules/groupOfNames.inc:325 ../lib/modules/groupOfNames.inc:439
+#: ../lib/modules/sambaGroupMapping.inc:491 ../lib/modules/qmailGroup.inc:851
+#: ../lib/modules/windowsGroup.inc:553 ../lib/modules/groupOfNames.inc:381
+#: ../lib/modules/groupOfNames.inc:516
 msgid "Add entries of this type:"
 msgstr "增加类型条目"
 
-#: ../lib/modules/customFields.inc:377
+#: ../lib/modules/customFields.inc:392
 msgid "Add extension"
 msgstr "增加扩展"
 
@@ -658,11 +670,11 @@ msgstr "为DNS增加一个固定的IP地址"
 msgid "Add host extension"
 msgstr "增加 host 扩展"
 
-#: ../templates/selfService/adminMain.php:550 ../help/help.inc:210
+#: ../templates/selfService/adminMain.php:550 ../help/help.inc:212
 msgid "Add input field"
 msgstr "增加输入栏目"
 
-#: ../lib/modules/customFields.inc:2203
+#: ../lib/modules/customFields.inc:2463
 msgid "Add more mapping fields"
 msgstr "增加更多的映射域"
 
@@ -688,11 +700,11 @@ msgstr "给对象新增属性"
 msgid "Add new binary attribute"
 msgstr "新增binary属性."
 
-#: ../lib/modules/customFields.inc:852
+#: ../lib/modules/customFields.inc:955
 msgid "Add new field"
 msgstr "增加新域"
 
-#: ../templates/selfService/adminMain.php:542 ../help/help.inc:208
+#: ../templates/selfService/adminMain.php:542 ../help/help.inc:210
 msgid "Add new group"
 msgstr "新增组"
 
@@ -709,19 +721,19 @@ msgstr "增加新的对象类到<b>%s</b>"
 msgid "Add object class and attributes"
 msgstr "增加对象类和属性"
 
-#: ../lib/modules/passwordSelfReset.inc:269
+#: ../lib/modules/passwordSelfReset.inc:285
 msgid "Add password self reset extension"
 msgstr "增加密码自助复位扩展"
 
 #: ../lib/modules/inetOrgPerson.inc:816 ../lib/modules/inetOrgPerson.inc:2106
-#: ../lib/modules/inetOrgPerson.inc:2144 ../lib/modules/inetOrgPerson.inc:3145
+#: ../lib/modules/inetOrgPerson.inc:2144 ../lib/modules/inetOrgPerson.inc:3147
 msgid "Add photo"
 msgstr "新增照片"
 
 #: ../templates/config/profmanage.php:239
 #: ../templates/config/profmanage.php:252
 #: ../templates/selfService/profManage.php:202
-#: ../templates/selfService/profManage.php:210 ../help/help.inc:124
+#: ../templates/selfService/profManage.php:210 ../help/help.inc:126
 msgid "Add profile"
 msgstr "增加配置文件"
 
@@ -745,11 +757,11 @@ msgstr "添加中"
 msgid "Adding the range failed because errors occured."
 msgstr "因为发生了错误致使增加范围失败"
 
-#: ../templates/selfService/adminMain.php:460 ../help/help.inc:214
+#: ../templates/selfService/adminMain.php:460 ../help/help.inc:216
 msgid "Additional CSS links"
 msgstr "附加的CSS连接"
 
-#: ../templates/config/conftypes.php:274 ../help/help.inc:152
+#: ../templates/config/conftypes.php:274 ../help/help.inc:154
 msgid "Additional LDAP filter"
 msgstr "附加的LDAP过滤表达式"
 
@@ -759,10 +771,10 @@ msgstr "附加的LDAP过滤表达式"
 msgid "Additional email addresses for this entry."
 msgstr "本条目的附加邮件地址"
 
-#: ../lib/modules/posixAccount.inc:282 ../lib/modules/posixAccount.inc:385
-#: ../lib/modules/posixAccount.inc:433 ../lib/modules/posixAccount.inc:494
-#: ../lib/modules/posixAccount.inc:1253 ../lib/modules/posixAccount.inc:1518
-#: ../lib/modules/posixAccount.inc:1620
+#: ../lib/modules/posixAccount.inc:297 ../lib/modules/posixAccount.inc:408
+#: ../lib/modules/posixAccount.inc:462 ../lib/modules/posixAccount.inc:523
+#: ../lib/modules/posixAccount.inc:1355 ../lib/modules/posixAccount.inc:1633
+#: ../lib/modules/posixAccount.inc:1744
 msgid "Additional groups"
 msgstr "附加组"
 
@@ -787,13 +799,13 @@ msgstr "地址列表总计:%s"
 msgid "Address of IMAP server (e.g. mail.example.org)."
 msgstr "IMAP服务器地址（比如:mail.example.org)"
 
-#: ../help/help.inc:209
+#: ../help/help.inc:211
 msgid ""
 "Adds a new group element to the list of self service options. Use this to "
 "structure the input fields."
 msgstr "为自助服务选项列表新增组元素.利用它建立输入栏目."
 
-#: ../help/help.inc:211
+#: ../help/help.inc:213
 msgid "Adds a new self service option to the selected group element."
 msgstr "为选定的组元素增加新的自助服务选项."
 
@@ -809,15 +821,15 @@ msgstr "管理"
 
 #: ../lib/modules/selfRegistration.inc:53
 #: ../lib/modules/selfRegistration.inc:100
-#: ../lib/modules/passwordSelfReset.inc:92
-#: ../lib/modules/passwordSelfReset.inc:195
+#: ../lib/modules/passwordSelfReset.inc:93
+#: ../lib/modules/passwordSelfReset.inc:209
 msgid "Admin DN"
 msgstr "管理DN"
 
 #: ../lib/modules/selfRegistration.inc:58
 #: ../lib/modules/selfRegistration.inc:104
-#: ../lib/modules/passwordSelfReset.inc:96
-#: ../lib/modules/passwordSelfReset.inc:199
+#: ../lib/modules/passwordSelfReset.inc:97
+#: ../lib/modules/passwordSelfReset.inc:213
 msgid "Admin password"
 msgstr "管理密码"
 
@@ -826,12 +838,12 @@ msgstr "管理密码"
 msgid "Administration"
 msgstr "管理者"
 
-#: ../lib/modules/posixGroup.inc:412 ../lib/modules/nisnetgroup.inc:115
-#: ../lib/modules/groupOfNames.inc:101
+#: ../lib/modules/posixGroup.inc:448 ../lib/modules/nisnetgroup.inc:115
+#: ../lib/modules/groupOfNames.inc:112
 msgid "Administrators group"
 msgstr "管理员组"
 
-#: ../templates/config/conftypes.php:300 ../lib/modules/posixAccount.inc:243
+#: ../templates/config/conftypes.php:300 ../lib/modules/posixAccount.inc:264
 msgid "Advanced options"
 msgstr "高级选项"
 
@@ -849,8 +861,8 @@ msgstr "阿拉斯加"
 msgid "Algorithmic RID base is not a number!"
 msgstr "RID算法的基数不是一个数字!"
 
-#: ../lib/modules/customFields.inc:64 ../lib/modules/customFields.inc:429
-#: ../lib/modules/customFields.inc:471 ../lib/modules/aliasEntry.inc:38
+#: ../lib/modules/customFields.inc:66 ../lib/modules/customFields.inc:444
+#: ../lib/modules/customFields.inc:491 ../lib/modules/aliasEntry.inc:38
 msgid "Alias"
 msgstr "别名"
 
@@ -900,13 +912,17 @@ msgstr "修改成功."
 msgid "All selected accounts (%s)"
 msgstr "所有选中的帐号(%s)"
 
+#: ../lib/modules/dhcp_settings.inc:103
+msgid "Allow"
+msgstr "允许"
+
 #: ../lib/modules/sambaDomain.inc:110 ../lib/modules/sambaDomain.inc:187
-#: ../lib/modules/sambaDomain.inc:301 ../lib/modules/sambaDomain.inc:661
+#: ../lib/modules/sambaDomain.inc:301 ../lib/modules/sambaDomain.inc:665
 msgid "Allow machine password changes"
 msgstr "允许改变主机密码"
 
-#: ../lib/modules/customFields.inc:128 ../lib/modules/customFields.inc:132
-#: ../lib/modules/customFields.inc:2361
+#: ../lib/modules/customFields.inc:130 ../lib/modules/customFields.inc:134
+#: ../lib/modules/customFields.inc:2633
 msgid "Allow multiple values"
 msgstr "允许多值"
 
@@ -936,21 +952,41 @@ msgstr "允许用户在此域输入。"
 msgid "Allowed codec"
 msgstr "允许的编码"
 
-#: ../templates/config/mainmanage.php:202 ../lib/types/user.inc:95
-#: ../help/help.inc:146
+#: ../templates/config/mainmanage.php:260 ../lib/types/user.inc:95
+#: ../help/help.inc:148
 msgid "Allowed hosts"
 msgstr "允许的主机"
 
+#: ../lib/modules/kolabGroup.inc:88 ../lib/modules/kolabGroup.inc:92
+#: ../lib/modules/kolabGroup.inc:122 ../lib/modules/kolabGroup.inc:145
+#: ../lib/modules/kolabGroup.inc:162 ../lib/modules/kolabGroup.inc:186
+#: ../lib/modules/kolabGroup.inc:401 ../lib/modules/kolabUser.inc:134
+#: ../lib/modules/kolabUser.inc:138 ../lib/modules/kolabUser.inc:184
+#: ../lib/modules/kolabUser.inc:201 ../lib/modules/kolabUser.inc:219
+#: ../lib/modules/kolabUser.inc:349 ../lib/modules/kolabUser.inc:722
+msgid "Allowed recepients"
+msgstr "允许的接收者"
+
+#: ../lib/modules/kolabGroup.inc:97 ../lib/modules/kolabGroup.inc:101
+#: ../lib/modules/kolabGroup.inc:128 ../lib/modules/kolabGroup.inc:146
+#: ../lib/modules/kolabGroup.inc:164 ../lib/modules/kolabGroup.inc:188
+#: ../lib/modules/kolabGroup.inc:402 ../lib/modules/kolabUser.inc:143
+#: ../lib/modules/kolabUser.inc:147 ../lib/modules/kolabUser.inc:190
+#: ../lib/modules/kolabUser.inc:202 ../lib/modules/kolabUser.inc:221
+#: ../lib/modules/kolabUser.inc:351 ../lib/modules/kolabUser.inc:723
+msgid "Allowed senders"
+msgstr "允许的发送者"
+
 #: ../lib/modules/sambaSamAccount.inc:1312
 #: ../lib/modules/sambaSamAccount.inc:1313
 msgid "Allowed workstations"
 msgstr "允许的工作站"
 
-#: ../lib/modules/customFields.inc:133
+#: ../lib/modules/customFields.inc:135
 msgid "Allows to enter multiple values for this attribute."
 msgstr "这个属性允许输入多值."
 
-#: ../lib/modules/customFields.inc:129
+#: ../lib/modules/customFields.inc:131
 msgid "Allows to select multiple values from the list."
 msgstr "这个列表允许多选."
 
@@ -968,7 +1004,7 @@ msgstr "阿尔迈迪，达卡，科伦坡"
 msgid "Alternate address"
 msgstr "变更地址"
 
-#: ../lib/modules.inc:1066 ../lib/modules.inc:1161 ../help/help.inc:192
+#: ../lib/modules.inc:1066 ../lib/modules.inc:1161 ../help/help.inc:194
 msgid "Alternate recipient"
 msgstr "另外的接收者"
 
@@ -987,21 +1023,21 @@ msgstr "下面高亮的属性(%s)已经被修改."
 
 #: ../lib/modules/sudoRole.inc:222
 msgid "An sudo role with this name already exists. Please choose another name."
-msgstr "这个名字的duso角色已经存在,请选择另外一个名字."
+msgstr "这个名字的 sudo 角色已经存在, 请选择另外一个名字."
 
-#: ../lib/modules/passwordSelfReset.inc:76
-#: ../lib/modules/passwordSelfReset.inc:155
-#: ../lib/modules/passwordSelfReset.inc:163
-#: ../lib/modules/passwordSelfReset.inc:247
-#: ../lib/modules/passwordSelfReset.inc:289
-#: ../lib/modules/passwordSelfReset.inc:394
-#: ../lib/modules/passwordSelfReset.inc:540
-#: ../lib/modules/passwordSelfReset.inc:871
+#: ../lib/modules/passwordSelfReset.inc:77
+#: ../lib/modules/passwordSelfReset.inc:164
+#: ../lib/modules/passwordSelfReset.inc:172
+#: ../lib/modules/passwordSelfReset.inc:263
+#: ../lib/modules/passwordSelfReset.inc:305
+#: ../lib/modules/passwordSelfReset.inc:410
+#: ../lib/modules/passwordSelfReset.inc:556
+#: ../lib/modules/passwordSelfReset.inc:913
 msgid "Answer"
 msgstr "回答"
 
-#: ../lib/modules/kolabUser.inc:255 ../lib/modules/kolabUser.inc:635
-#: ../lib/modules/kolabUser.inc:730 ../lib/modules/kolabUser.inc:733
+#: ../lib/modules/kolabUser.inc:291 ../lib/modules/kolabUser.inc:712
+#: ../lib/modules/kolabUser.inc:809 ../lib/modules/kolabUser.inc:812
 msgid "Anyone"
 msgstr "任何人"
 
@@ -1112,8 +1148,8 @@ msgstr "属性"
 msgid "Attribute doesn't exist"
 msgstr "属性不存在"
 
-#: ../lib/modules/customFields.inc:80 ../lib/modules/customFields.inc:879
-#: ../lib/modules/customFields.inc:1293
+#: ../lib/modules/customFields.inc:82 ../lib/modules/customFields.inc:982
+#: ../lib/modules/customFields.inc:1476
 msgid "Attribute name"
 msgstr "属性名"
 
@@ -1168,18 +1204,22 @@ msgstr "授权服务不合法"
 msgid "Automatical scripts"
 msgstr "自动脚本"
 
+#: ../lib/modules/kolabGroup.inc:110 ../lib/modules/kolabGroup.inc:116
 #: ../lib/modules/puppetClient.inc:101 ../lib/modules/puppetClient.inc:153
 #: ../lib/modules/qmailUser.inc:124 ../lib/modules/qmailUser.inc:256
 #: ../lib/modules/zarafaContact.inc:80 ../lib/modules/zarafaContact.inc:572
+#: ../lib/modules/posixGroup.inc:376 ../lib/modules/posixGroup.inc:508
 #: ../lib/modules/eduPerson.inc:143 ../lib/modules/eduPerson.inc:148
 #: ../lib/modules/sambaSamAccount.inc:158
-#: ../lib/modules/sambaSamAccount.inc:389 ../lib/modules/zarafaUser.inc:129
+#: ../lib/modules/sambaSamAccount.inc:389 ../lib/modules/posixAccount.inc:425
+#: ../lib/modules/posixAccount.inc:1680 ../lib/modules/zarafaUser.inc:129
 #: ../lib/modules/zarafaUser.inc:1369 ../lib/modules/shadowAccount.inc:99
-#: ../lib/modules/shadowAccount.inc:190 ../lib/modules/customFields.inc:694
+#: ../lib/modules/shadowAccount.inc:190 ../lib/modules/customFields.inc:777
 #: ../lib/modules/qmailGroup.inc:94 ../lib/modules/qmailGroup.inc:225
 #: ../lib/modules/authorizedServiceObject.inc:82
 #: ../lib/modules/authorizedServiceObject.inc:110
-#: ../lib/modules/passwordSelfReset.inc:139 ../lib/modules/hostObject.inc:76
+#: ../lib/modules/passwordSelfReset.inc:141
+#: ../lib/modules/passwordSelfReset.inc:148 ../lib/modules/hostObject.inc:76
 #: ../lib/modules/hostObject.inc:94
 msgid "Automatically add this extension"
 msgstr "自动增加这个扩展项"
@@ -1224,7 +1264,7 @@ msgstr "有效的帐号类型"
 msgid "Available actions"
 msgstr "可选动作"
 
-#: ../lib/modules/posixAccount.inc:1350 ../lib/modules/posixAccount.inc:1383
+#: ../lib/modules/posixAccount.inc:1465 ../lib/modules/posixAccount.inc:1498
 #: ../lib/modules/windowsUser.inc:728 ../lib/modules/nisnetgroup.inc:379
 #: ../lib/modules/groupOfNamesUser.inc:113
 msgid "Available groups"
@@ -1234,11 +1274,11 @@ msgstr "可选组"
 msgid "Available members"
 msgstr "可用的用户"
 
-#: ../templates/config/confmodules.php:304
+#: ../templates/config/confmodules.php:314
 msgid "Available modules"
 msgstr "可选模块"
 
-#: ../lib/modules/posixGroup.inc:263 ../lib/modules/asteriskExtension.inc:456
+#: ../lib/modules/posixGroup.inc:293 ../lib/modules/asteriskExtension.inc:456
 msgid "Available users"
 msgstr "可选用户"
 
@@ -1250,21 +1290,21 @@ msgstr "可选工作站"
 msgid "Azores, Cape Verde Islands"
 msgstr "亚速尔,维德角岛"
 
-#: ../lib/modules/dhcp_settings.inc:94
+#: ../lib/modules/dhcp_settings.inc:96
 msgid "B-Node (0x01)"
 msgstr "B-节点 (0x01)"
 
 #: ../templates/massBuildAccounts.php:276 ../lib/modules/zarafaContact.inc:425
-#: ../lib/modules/posixGroup.inc:308 ../lib/modules/zarafaGroup.inc:494
+#: ../lib/modules/posixGroup.inc:338 ../lib/modules/zarafaGroup.inc:494
 #: ../lib/modules/device.inc:309 ../lib/modules/sambaSamAccount.inc:1332
 #: ../lib/modules/sambaSamAccount.inc:1616
-#: ../lib/modules/posixAccount.inc:1423 ../lib/modules/posixAccount.inc:1497
+#: ../lib/modules/posixAccount.inc:1538 ../lib/modules/posixAccount.inc:1612
 #: ../lib/modules/zarafaUser.inc:952 ../lib/modules/zarafaUser.inc:1001
-#: ../lib/modules/windowsUser.inc:772 ../lib/modules/nisnetgroup.inc:393
-#: ../lib/modules/inetOrgPerson.inc:2145 ../lib/modules/inetOrgPerson.inc:2221
-#: ../lib/modules/inetOrgPerson.inc:2306 ../lib/modules/qmailGroup.inc:858
-#: ../lib/modules/windowsGroup.inc:466 ../lib/modules/groupOfNames.inc:332
-#: ../lib/modules/groupOfNames.inc:446
+#: ../lib/modules/windowsUser.inc:772 ../lib/modules/sambaGroupMapping.inc:498
+#: ../lib/modules/nisnetgroup.inc:393 ../lib/modules/inetOrgPerson.inc:2145
+#: ../lib/modules/inetOrgPerson.inc:2221 ../lib/modules/inetOrgPerson.inc:2308
+#: ../lib/modules/qmailGroup.inc:858 ../lib/modules/windowsGroup.inc:560
+#: ../lib/modules/groupOfNames.inc:388 ../lib/modules/groupOfNames.inc:523
 msgid "Back"
 msgstr "返回"
 
@@ -1314,11 +1354,11 @@ msgstr "返回到主机列表"
 msgid "Back to list"
 msgstr "返回列表"
 
-#: ../templates/config/mainmanage.php:163 ../templates/config/index.php:79
+#: ../templates/config/mainmanage.php:218 ../templates/config/index.php:79
 #: ../templates/config/index.php:133 ../templates/config/conflogin.php:117
-#: ../templates/config/conflogin.php:196 ../templates/config/mainlogin.php:122
-#: ../templates/config/mainlogin.php:176
-#: ../templates/selfService/selfServiceSP.php:120
+#: ../templates/config/conflogin.php:196 ../templates/config/mainlogin.php:124
+#: ../templates/config/mainlogin.php:178
+#: ../templates/selfService/selfServiceSP.php:127
 #: ../templates/selfService/adminLogin.php:114
 #: ../templates/selfService/adminLogin.php:191
 msgid "Back to login"
@@ -1393,11 +1433,11 @@ msgstr "Base (只有基本DN)"
 msgid "Base DN"
 msgstr "基本DN"
 
-#: ../templates/config/confmodules.php:212 ../help/help.inc:138
+#: ../templates/config/confmodules.php:212 ../help/help.inc:140
 msgid "Base module"
 msgstr "基本模块"
 
-#: ../templates/pdfedit/pdfpage.php:444
+#: ../templates/pdfedit/pdfpage.php:441
 msgid "Beginning"
 msgstr "开始"
 
@@ -1414,15 +1454,15 @@ msgstr "二进制值"
 msgid "Bind"
 msgstr "绑定"
 
-#: ../templates/config/confmain.php:426
+#: ../templates/config/confmain.php:427
 msgid "Bind password"
 msgstr "绑定密码"
 
-#: ../templates/config/confmain.php:424
+#: ../templates/config/confmain.php:425
 msgid "Bind user"
 msgstr "绑定用户"
 
-#: ../help/help.inc:122
+#: ../help/help.inc:124
 msgid "Bind user and password"
 msgstr "绑定用户名和密码"
 
@@ -1472,7 +1512,7 @@ msgstr "巴西,布宜诺斯艾利斯"
 msgid "Building snapshot of tree to copy"
 msgstr "建立树的快照用来拷贝"
 
-#: ../lib/modules/sambaGroupMapping.inc:71
+#: ../lib/modules/sambaGroupMapping.inc:73
 msgid "Builtin group"
 msgstr "内置组"
 
@@ -1488,8 +1528,8 @@ msgstr "块更新以下DN"
 #: ../lib/modules/inetOrgPerson.inc:215 ../lib/modules/inetOrgPerson.inc:344
 #: ../lib/modules/inetOrgPerson.inc:438 ../lib/modules/inetOrgPerson.inc:668
 #: ../lib/modules/inetOrgPerson.inc:832 ../lib/modules/inetOrgPerson.inc:836
-#: ../lib/modules/inetOrgPerson.inc:1932 ../lib/modules/inetOrgPerson.inc:2373
-#: ../lib/modules/inetOrgPerson.inc:3121
+#: ../lib/modules/inetOrgPerson.inc:1932 ../lib/modules/inetOrgPerson.inc:2375
+#: ../lib/modules/inetOrgPerson.inc:3123
 msgid "Business category"
 msgstr "商业种类"
 
@@ -1497,7 +1537,7 @@ msgstr "商业种类"
 msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 msgstr "商业种类(比如:行政部门,IT服务部门,管理部门,...)"
 
-#: ../help/help.inc:155
+#: ../help/help.inc:157
 msgid ""
 "By default LAM will show all accounts that match the selected account "
 "modules."
@@ -1520,7 +1560,7 @@ msgstr "字节已发送"
 msgid "CSV file"
 msgstr "CSV 文件"
 
-#: ../help/help.inc:101
+#: ../help/help.inc:103
 msgid "Cache timeout"
 msgstr "缓存超时"
 
@@ -1544,9 +1584,9 @@ msgstr "拨号 ID号"
 #: ../lib/modules/sambaSamAccount.inc:296
 #: ../lib/modules/sambaSamAccount.inc:299
 #: ../lib/modules/sambaSamAccount.inc:302
-#: ../lib/modules/sambaSamAccount.inc:308 ../lib/modules/posixAccount.inc:495
+#: ../lib/modules/sambaSamAccount.inc:308 ../lib/modules/posixAccount.inc:524
 #: ../lib/modules/windowsUser.inc:184 ../lib/modules/windowsUser.inc:187
-#: ../lib/modules/sambaGroupMapping.inc:365
+#: ../lib/modules/sambaGroupMapping.inc:152
 #: ../lib/modules/shadowAccount.inc:171 ../lib/modules/shadowAccount.inc:175
 #: ../lib/modules/shadowAccount.inc:179 ../lib/modules/shadowAccount.inc:183
 #: ../lib/modules/groupOfNamesUser.inc:54
@@ -1564,23 +1604,23 @@ msgstr "可能呼叫转移"
 
 #: ../templates/lists/changePassword.php:312
 #: ../templates/lists/changePassword.php:341
-#: ../templates/lists/changePassword.php:381
-#: ../templates/lists/changePassword.php:412 ../templates/ou_edit.php:121
+#: ../templates/lists/changePassword.php:382
+#: ../templates/lists/changePassword.php:413 ../templates/ou_edit.php:121
 #: ../templates/config/profmanage.php:253
 #: ../templates/config/profmanage.php:265
 #: ../templates/config/profmanage.php:274
 #: ../templates/config/profmanage.php:291
 #: ../templates/config/profmanage.php:302
-#: ../templates/config/mainmanage.php:261
+#: ../templates/config/mainmanage.php:389
 #: ../templates/config/confmodules.php:227
-#: ../templates/config/confmain.php:452
+#: ../templates/config/confmain.php:453
 #: ../templates/config/moduleSettings.php:238
 #: ../templates/config/conftypes.php:321
 #: ../templates/selfService/profManage.php:211
 #: ../templates/selfService/profManage.php:227
 #: ../templates/selfService/profManage.php:240
 #: ../templates/selfService/adminMain.php:663
-#: ../templates/pdfedit/pdfpage.php:603 ../templates/pdfedit/pdfmain.php:195
+#: ../templates/pdfedit/pdfpage.php:638 ../templates/pdfedit/pdfmain.php:195
 #: ../templates/pdfedit/pdfmain.php:202 ../templates/pdfedit/pdfmain.php:208
 #: ../templates/delete.php:121 ../templates/profedit/profilepage.php:241
 #: ../templates/profedit/profilemain.php:197
@@ -1591,36 +1631,38 @@ msgstr "可能呼叫转移"
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:136
 #: ../templates/3rdParty/pla/htdocs/create_confirm.php:121
 #: ../templates/3rdParty/pla/htdocs/mass_delete.php:119
-#: ../templates/initsuff.php:190 ../lib/types/automountType.inc:234
-#: ../lib/types/user.inc:304 ../lib/modules/mitKerberos.inc:691
-#: ../lib/modules/qmailUser.inc:914 ../lib/modules/zarafaContact.inc:380
-#: ../lib/modules/windowsHost.inc:219 ../lib/modules/zarafaGroup.inc:449
-#: ../lib/modules/device.inc:260 ../lib/modules/sambaSamAccount.inc:1407
+#: ../templates/initsuff.php:191 ../lib/types/automountType.inc:234
+#: ../lib/types/user.inc:304 ../lib/modules/kolabGroup.inc:275
+#: ../lib/modules/mitKerberos.inc:691 ../lib/modules/qmailUser.inc:914
+#: ../lib/modules/zarafaContact.inc:380 ../lib/modules/windowsHost.inc:219
+#: ../lib/modules/zarafaGroup.inc:449 ../lib/modules/device.inc:260
+#: ../lib/modules/sambaSamAccount.inc:1407
 #: ../lib/modules/sambaSamAccount.inc:1456
 #: ../lib/modules/sambaSamAccount.inc:1542 ../lib/modules/zarafaUser.inc:907
-#: ../lib/modules/kolabUser.inc:455 ../lib/modules/shadowAccount.inc:469
-#: ../lib/modules/nisnetgroup.inc:483 ../lib/modules/inetOrgPerson.inc:2186
-#: ../lib/modules/freeRadius.inc:478 ../lib/modules/aliasEntry.inc:140
-#: ../lib/modules/aliasEntry.inc:160 ../lib/modules/qmailGroup.inc:816
-#: ../lib/modules/heimdalKerberos.inc:592 ../lib/modules/windowsGroup.inc:417
-#: ../lib/modules/groupOfNames.inc:283 ../lib/modules/groupOfNames.inc:397
+#: ../lib/modules/kolabUser.inc:502 ../lib/modules/sambaGroupMapping.inc:477
+#: ../lib/modules/shadowAccount.inc:469 ../lib/modules/nisnetgroup.inc:483
+#: ../lib/modules/inetOrgPerson.inc:2186 ../lib/modules/freeRadius.inc:478
+#: ../lib/modules/aliasEntry.inc:140 ../lib/modules/aliasEntry.inc:160
+#: ../lib/modules/qmailGroup.inc:816 ../lib/modules/heimdalKerberos.inc:597
+#: ../lib/modules/windowsGroup.inc:459 ../lib/modules/windowsGroup.inc:511
+#: ../lib/modules/groupOfNames.inc:339 ../lib/modules/groupOfNames.inc:474
 #: ../lib/modules/nisMailAlias.inc:284 ../lib/lists.inc:704
 #: ../lib/lists.inc:785 ../lib/modules.inc:1200
 msgid "Cancel"
 msgstr "取消"
 
-#: ../templates/login.php:558 ../templates/login.php:616
-#: ../templates/login.php:621
-#: ../templates/selfService/selfServiceLogin.php:106
-#: ../templates/selfService/selfServiceLogin.php:142
-#: ../templates/selfService/selfServiceLogin.php:147
+#: ../templates/login.php:572 ../templates/login.php:630
+#: ../templates/login.php:635
+#: ../templates/selfService/selfServiceLogin.php:107
+#: ../templates/selfService/selfServiceLogin.php:143
+#: ../templates/selfService/selfServiceLogin.php:148
 #: ../templates/selfService/selfServiceMain.php:168
 #: ../templates/selfService/selfServiceMain.php:182
-#: ../lib/modules/selfRegistration.inc:588
+#: ../lib/modules/selfRegistration.inc:608
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "无法连接指定的LDAP服务器,请再试一次."
 
-#: ../templates/login.php:303 ../lib/config.inc:1474
+#: ../templates/login.php:313 ../lib/config.inc:1495
 msgid "Cannot open config file!"
 msgstr "无法打开配置文件!"
 
@@ -1628,6 +1670,12 @@ msgstr "无法打开配置文件!"
 msgid "Cannot update quota."
 msgstr "不能修改配额"
 
+#: ../lib/config.inc:1507 ../lib/config.inc:1515
+msgid ""
+"Cannot write certificate file. Please check the permissions of config/"
+"serverCerts.pem."
+msgstr "不能写入证书文件. 请检查config/serverCerts.pem的权限."
+
 #: ../lib/modules/zarafaUser.inc:113 ../lib/modules/zarafaUser.inc:200
 #: ../lib/modules/zarafaUser.inc:288 ../lib/modules/zarafaUser.inc:405
 #: ../lib/modules/zarafaUser.inc:447 ../lib/modules/zarafaUser.inc:577
@@ -1642,7 +1690,7 @@ msgstr "标题和标签"
 #: ../lib/modules/inetOrgPerson.inc:144 ../lib/modules/inetOrgPerson.inc:340
 #: ../lib/modules/inetOrgPerson.inc:592 ../lib/modules/inetOrgPerson.inc:662
 #: ../lib/modules/inetOrgPerson.inc:856 ../lib/modules/inetOrgPerson.inc:1907
-#: ../lib/modules/inetOrgPerson.inc:2375 ../lib/modules/inetOrgPerson.inc:3099
+#: ../lib/modules/inetOrgPerson.inc:2377 ../lib/modules/inetOrgPerson.inc:3101
 msgid "Car license"
 msgstr "汽车执照"
 
@@ -1655,7 +1703,6 @@ msgid "Central Time (US & Canada), Mexico City"
 msgstr "中央时间(美国和加拿大),墨西哥市 "
 
 #: ../templates/selfService/adminMain.php:479
-#: ../templates/pdfedit/pdfpage.php:502 ../templates/pdfedit/pdfpage.php:511
 #: ../lib/modules/mitKerberos.inc:378 ../lib/modules/mitKerberos.inc:389
 #: ../lib/modules/mitKerberos.inc:687 ../lib/modules/qmailUser.inc:654
 #: ../lib/modules/qmailUser.inc:910 ../lib/modules/zarafaContact.inc:218
@@ -1667,11 +1714,12 @@ msgstr "中央时间(美国和加拿大),墨西哥市 "
 #: ../lib/modules/shadowAccount.inc:465 ../lib/modules/inetOrgPerson.inc:2059
 #: ../lib/modules/freeRadius.inc:334 ../lib/modules/freeRadius.inc:474
 #: ../lib/modules/asteriskExtension.inc:229 ../lib/modules/aliasEntry.inc:93
-#: ../lib/modules/qmailGroup.inc:565 ../lib/modules/passwordSelfReset.inc:295
-#: ../lib/modules/heimdalKerberos.inc:316
-#: ../lib/modules/heimdalKerberos.inc:327
-#: ../lib/modules/heimdalKerberos.inc:588 ../lib/modules/groupOfNames.inc:182
-#: ../lib/modules/groupOfNames.inc:204
+#: ../lib/modules/qmailGroup.inc:565 ../lib/modules/passwordSelfReset.inc:311
+#: ../lib/modules/heimdalKerberos.inc:321
+#: ../lib/modules/heimdalKerberos.inc:332
+#: ../lib/modules/heimdalKerberos.inc:593 ../lib/modules/windowsGroup.inc:338
+#: ../lib/modules/windowsGroup.inc:458 ../lib/modules/groupOfNames.inc:214
+#: ../lib/modules/groupOfNames.inc:237
 msgid "Change"
 msgstr "更改"
 
@@ -1683,7 +1731,7 @@ msgstr "更改 Asterisk 密码"
 msgid "Change Asterisk voicemail password"
 msgstr "更改 Asterisk 语音邮件密码"
 
-#: ../lib/modules/posixGroup.inc:219 ../lib/modules/posixGroup.inc:451
+#: ../lib/modules/posixGroup.inc:216 ../lib/modules/posixGroup.inc:487
 msgid "Change GID number of users and hosts"
 msgstr "更改用户和主机的GID号"
 
@@ -1713,7 +1761,7 @@ msgid "Change account status"
 msgstr "改变帐号状态"
 
 #: ../templates/config/profmanage.php:298
-#: ../templates/config/profmanage.php:301 ../help/help.inc:132
+#: ../templates/config/profmanage.php:301 ../help/help.inc:134
 msgid "Change default profile"
 msgstr "更改缺省的配置文件"
 
@@ -1721,7 +1769,7 @@ msgstr "更改缺省的配置文件"
 msgid "Change list settings"
 msgstr "改变列表设置"
 
-#: ../templates/config/mainmanage.php:253 ../help/help.inc:134
+#: ../templates/config/mainmanage.php:374 ../help/help.inc:136
 msgid "Change master password"
 msgstr "更改管理员密码"
 
@@ -1730,7 +1778,7 @@ msgstr "更改管理员密码"
 #: ../templates/lists/changePassword.php:311
 #: ../templates/lists/changePassword.php:338
 #: ../templates/lists/changePassword.php:340 ../lib/types/user.inc:669
-#: ../help/help.inc:99
+#: ../help/help.inc:101
 msgid "Change password"
 msgstr "更改密码"
 
@@ -1747,15 +1795,15 @@ msgstr "更改密码 "
 msgid "Change settings"
 msgstr "修改设置"
 
-#: ../lib/modules/posixAccount.inc:1041
+#: ../lib/modules/posixAccount.inc:1143
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "值已改变,因为只能使用ASCII字符."
 
-#: ../lib/modules/passwordSelfReset.inc:157
+#: ../lib/modules/passwordSelfReset.inc:166
 msgid "Charlie"
 msgstr "Charlie"
 
-#: ../lib/modules/posixAccount.inc:1284
+#: ../lib/modules/posixAccount.inc:1387
 msgid "Check home directories"
 msgstr "检查主目录"
 
@@ -1783,7 +1831,7 @@ msgid ""
 "data."
 msgstr "请仔细检查输入,上传前程序仅做基本检查."
 
-#: ../lib/modules/customFields.inc:1976
+#: ../lib/modules/customFields.inc:2222
 msgid "Checkbox"
 msgstr "复选框"
 
@@ -1816,7 +1864,7 @@ msgstr "类"
 msgid "Clear filter"
 msgstr "清除过滤表达式"
 
-#: ../lib/config.inc:197
+#: ../lib/config.inc:211
 msgid "Click here if you are not directed to the next page."
 msgstr "如果没有自动跳转到下一页请点此处."
 
@@ -1843,8 +1891,8 @@ msgstr "缺省为客户打印机"
 msgid "Collective"
 msgstr "集合(Collective)"
 
-#: ../templates/masscreate.php:278 ../lib/modules/customFields.inc:112
-#: ../lib/modules/customFields.inc:1849
+#: ../templates/masscreate.php:278 ../lib/modules/customFields.inc:114
+#: ../lib/modules/customFields.inc:2085
 msgid "Columns"
 msgstr "列"
 
@@ -1873,18 +1921,18 @@ msgstr "命令"
 msgid "Commit"
 msgstr "提交"
 
-#: ../lib/modules/posixAccount.inc:402
+#: ../lib/modules/posixAccount.inc:431
 msgid "Common examples are \"@givenname@%sn%\" or \"%givenname%.%sn%\"."
 msgstr "普通的例子是 \"@givenname@%sn%\" 或 \"%givenname%.%sn%\"."
 
-#: ../lib/modules/posixAccount.inc:111 ../lib/modules/posixAccount.inc:157
-#: ../lib/modules/posixAccount.inc:263 ../lib/modules/posixAccount.inc:388
-#: ../lib/modules/posixAccount.inc:498 ../lib/modules/posixAccount.inc:520
-#: ../lib/modules/posixAccount.inc:1230 ../lib/modules/posixAccount.inc:1623
-#: ../lib/modules/posixAccount.inc:2319 ../lib/modules/inetOrgPerson.inc:90
-#: ../lib/modules/inetOrgPerson.inc:695 ../lib/modules/inetOrgPerson.inc:808
-#: ../lib/modules/inetOrgPerson.inc:1430 ../lib/modules/inetOrgPerson.inc:2370
-#: ../lib/modules/inetOrgPerson.inc:2501
+#: ../templates/config/mainmanage.php:316 ../lib/modules/posixAccount.inc:129
+#: ../lib/modules/posixAccount.inc:178 ../lib/modules/posixAccount.inc:341
+#: ../lib/modules/posixAccount.inc:414 ../lib/modules/posixAccount.inc:527
+#: ../lib/modules/posixAccount.inc:549 ../lib/modules/posixAccount.inc:1331
+#: ../lib/modules/posixAccount.inc:1747 ../lib/modules/posixAccount.inc:2447
+#: ../lib/modules/inetOrgPerson.inc:90 ../lib/modules/inetOrgPerson.inc:695
+#: ../lib/modules/inetOrgPerson.inc:808 ../lib/modules/inetOrgPerson.inc:1430
+#: ../lib/modules/inetOrgPerson.inc:2372 ../lib/modules/inetOrgPerson.inc:2503
 #: ../lib/modules/asteriskExtension.inc:111
 msgid "Common name"
 msgstr "全名"
@@ -1965,7 +2013,7 @@ msgid ""
 msgstr ""
 "在确认发送者时使用的确认文本。可以使用 qmail 回复中的通常的%HEADER%等标签"
 
-#: ../templates/config/confmodules.php:384
+#: ../templates/config/confmodules.php:394
 msgid "Conflicting module:"
 msgstr "冲突的模块:"
 
@@ -2087,7 +2135,7 @@ msgstr "不能更改文件名"
 msgid "Could not rename the entry."
 msgstr "不能重命名条目."
 
-#: ../templates/pdfedit/pdfpage.php:109
+#: ../templates/pdfedit/pdfpage.php:117
 msgid "Could not save PDF structure, access denied."
 msgstr "无法保存PDF结构,存取拒绝."
 
@@ -2095,13 +2143,13 @@ msgstr "无法保存PDF结构,存取拒绝."
 #: ../templates/profedit/profilemain.php:167
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1185
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1189
-#: ../templates/initsuff.php:189 ../lib/modules/sambaSamAccount.inc:1595
-#: ../lib/modules/posixAccount.inc:1476
+#: ../templates/initsuff.php:190 ../lib/modules/sambaSamAccount.inc:1595
+#: ../lib/modules/posixAccount.inc:1591
 msgid "Create"
 msgstr "建立"
 
 #: ../lib/lists.inc:497 ../lib/lists.inc:679 ../lib/modules.inc:1315
-#: ../help/help.inc:178
+#: ../help/help.inc:180
 msgid "Create PDF file"
 msgstr "建立PDF文件"
 
@@ -2184,8 +2232,8 @@ msgstr "建立另外一个用户"
 msgid "Create for"
 msgstr "建立"
 
-#: ../lib/modules/posixAccount.inc:295 ../lib/modules/posixAccount.inc:1270
-#: ../lib/modules/posixAccount.inc:1541
+#: ../lib/modules/posixAccount.inc:310 ../lib/modules/posixAccount.inc:1373
+#: ../lib/modules/posixAccount.inc:1656
 msgid "Create home directory"
 msgstr "建立主目录"
 
@@ -2200,8 +2248,8 @@ msgstr "建立邮箱"
 msgid "Create new entry here"
 msgstr "在这儿新建条目"
 
-#: ../lib/modules/customFields.inc:60 ../lib/modules/customFields.inc:420
-#: ../lib/modules/customFields.inc:433
+#: ../lib/modules/customFields.inc:62 ../lib/modules/customFields.inc:435
+#: ../lib/modules/customFields.inc:448
 msgid "Create new group"
 msgstr "建立新组"
 
@@ -2225,7 +2273,7 @@ msgstr "建立新的自动挂接映射."
 msgid "Created new profile."
 msgstr "新增配置文件"
 
-#: ../lib/modules/customFields.inc:61
+#: ../lib/modules/customFields.inc:63
 msgid ""
 "Creates a new group for the given account type. Groups build a container for "
 "object classes and attributes."
@@ -2257,7 +2305,7 @@ msgstr "当前 <b>%s</b>个属性 <b>%s</b>值的列表: "
 msgid "Current usage (kB)"
 msgstr "当前使用量(kB)"
 
-#: ../lib/modules/customFields.inc:56 ../lib/modules/customFields.inc:910
+#: ../lib/modules/customFields.inc:58 ../lib/modules/customFields.inc:1013
 msgid "Custom fields"
 msgstr "自定义域"
 
@@ -2294,7 +2342,7 @@ msgstr "DHCP管理者"
 msgid "DHCP count: %s"
 msgstr "DHCP总计: %s"
 
-#: ../lib/types/dhcp.inc:173 ../lib/modules/dhcp_settings.inc:113
+#: ../lib/types/dhcp.inc:173 ../lib/modules/dhcp_settings.inc:120
 msgid "DHCP settings"
 msgstr "DHCP 设置"
 
@@ -2321,17 +2369,17 @@ msgstr "DN不存在"
 msgid "DN settings"
 msgstr "DN 设置"
 
-#: ../templates/masscreate.php:311 ../help/help.inc:168
+#: ../templates/masscreate.php:311 ../help/help.inc:170
 msgid "DN suffix"
 msgstr "DN 后缀"
 
-#: ../lib/modules/dhcp_settings.inc:193 ../lib/modules/dhcp_settings.inc:207
-#: ../lib/modules/dhcp_settings.inc:246 ../lib/modules/dhcp_settings.inc:547
-#: ../lib/modules/dhcp_settings.inc:633
+#: ../lib/modules/dhcp_settings.inc:204 ../lib/modules/dhcp_settings.inc:219
+#: ../lib/modules/dhcp_settings.inc:261 ../lib/modules/dhcp_settings.inc:570
+#: ../lib/modules/dhcp_settings.inc:670
 msgid "DNS"
 msgstr "DNS"
 
-#: ../lib/modules/dhcp_settings.inc:147
+#: ../lib/modules/dhcp_settings.inc:154
 msgid "DNS (Domain Name System)"
 msgstr "DNS(域名解析系统)"
 
@@ -2378,7 +2426,7 @@ msgid ""
 "expiration. If set value must be >0."
 msgstr "在密码过期前提醒用户的天数,若设其值,必大于0."
 
-#: ../templates/config/mainmanage.php:223
+#: ../templates/config/mainmanage.php:352
 msgid "Debug"
 msgstr "调试"
 
@@ -2389,13 +2437,13 @@ msgstr "调试"
 msgid "Default"
 msgstr "缺省"
 
-#: ../lib/modules/dhcp_settings.inc:151 ../lib/modules/dhcp_settings.inc:194
-#: ../lib/modules/dhcp_settings.inc:208 ../lib/modules/dhcp_settings.inc:252
-#: ../lib/modules/dhcp_settings.inc:549 ../lib/modules/dhcp_settings.inc:634
+#: ../lib/modules/dhcp_settings.inc:158 ../lib/modules/dhcp_settings.inc:205
+#: ../lib/modules/dhcp_settings.inc:220 ../lib/modules/dhcp_settings.inc:267
+#: ../lib/modules/dhcp_settings.inc:572 ../lib/modules/dhcp_settings.inc:671
 msgid "Default gateway"
 msgstr "缺省网关"
 
-#: ../templates/config/confmain.php:285 ../help/help.inc:95
+#: ../templates/config/confmain.php:286 ../help/help.inc:97
 msgid "Default language"
 msgstr "缺省语言"
 
@@ -2409,7 +2457,7 @@ msgid "Default user"
 msgstr "缺省用户"
 
 #: ../templates/masscreate.php:300 ../templates/masscreate.php:375
-#: ../lib/modules/customFields.inc:108 ../lib/modules/customFields.inc:2000
+#: ../lib/modules/customFields.inc:110 ../lib/modules/customFields.inc:2248
 msgid "Default value"
 msgstr "缺省值"
 
@@ -2423,10 +2471,10 @@ msgid ""
 "peer."
 msgstr "为此端检查消息等待信号(MWI)来定义邮箱"
 
-#: ../lib/modules/kolabUser.inc:97 ../lib/modules/kolabUser.inc:113
-#: ../lib/modules/kolabUser.inc:117 ../lib/modules/kolabUser.inc:159
-#: ../lib/modules/kolabUser.inc:169 ../lib/modules/kolabUser.inc:295
-#: ../lib/modules/kolabUser.inc:644 ../lib/modules/kolabUser.inc:709
+#: ../lib/modules/kolabUser.inc:98 ../lib/modules/kolabUser.inc:114
+#: ../lib/modules/kolabUser.inc:118 ../lib/modules/kolabUser.inc:178
+#: ../lib/modules/kolabUser.inc:200 ../lib/modules/kolabUser.inc:332
+#: ../lib/modules/kolabUser.inc:721 ../lib/modules/kolabUser.inc:788
 msgid "Delegates"
 msgstr "代理(Delegates)"
 
@@ -2439,9 +2487,11 @@ msgstr "代理(Delegates)"
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:33
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:124
 #: ../lib/modules/sambaSamAccount.inc:1588
-#: ../lib/modules/posixAccount.inc:1469 ../lib/modules/zarafaUser.inc:1500
-#: ../lib/modules/zarafaUser.inc:1552 ../lib/modules/kolabUser.inc:699
-#: ../lib/modules/nisnetgroup.inc:246 ../lib/modules/inetOrgPerson.inc:3239
+#: ../lib/modules/posixAccount.inc:1584 ../lib/modules/zarafaUser.inc:1500
+#: ../lib/modules/zarafaUser.inc:1552 ../lib/modules/kolabUser.inc:778
+#: ../lib/modules/sambaGroupMapping.inc:398
+#: ../lib/modules/ldapPublicKey.inc:290 ../lib/modules/nisnetgroup.inc:246
+#: ../lib/modules/inetOrgPerson.inc:3241 ../lib/modules/customFields.inc:2950
 #: ../lib/lists.inc:491
 msgid "Delete"
 msgstr "删除"
@@ -2465,11 +2515,15 @@ msgstr "在拷贝(移动)后删除:"
 msgid "Delete all %s objects"
 msgstr "删除全部 %s 个对象"
 
-#: ../lib/modules/customFields.inc:521
+#: ../templates/config/mainmanage.php:278
+msgid "Delete all CA certificates"
+msgstr "删除全部 CA 证书"
+
+#: ../lib/modules/customFields.inc:546
 msgid "Delete group"
 msgstr "删除组"
 
-#: ../lib/modules/posixAccount.inc:1319
+#: ../lib/modules/posixAccount.inc:1434
 msgid "Delete home directory"
 msgstr "删除主目录"
 
@@ -2477,7 +2531,7 @@ msgstr "删除主目录"
 msgid "Delete mailbox"
 msgstr "删除邮箱"
 
-#: ../templates/ou_edit.php:197 ../help/help.inc:235
+#: ../templates/ou_edit.php:197 ../help/help.inc:237
 msgid "Delete organisational unit"
 msgstr "删除组织单元"
 
@@ -2489,7 +2543,7 @@ msgstr "删除照片"
 #: ../templates/config/profmanage.php:270
 #: ../templates/config/profmanage.php:273
 #: ../templates/selfService/profManage.php:232
-#: ../templates/selfService/profManage.php:239 ../help/help.inc:128
+#: ../templates/selfService/profManage.php:239 ../help/help.inc:130
 msgid "Delete profile"
 msgstr "删除配置文件"
 
@@ -2605,7 +2659,7 @@ msgstr "正在删除对象"
 msgid "Deletion date"
 msgstr "删除日期"
 
-#: ../lib/lists.inc:1060
+#: ../lib/lists.inc:1061
 msgid "Deletion was successful."
 msgstr "删除操作成功."
 
@@ -2628,6 +2682,7 @@ msgstr "分发程序"
 #: ../lib/modules/asteriskAccount.inc:476
 #: ../lib/modules/asteriskAccount.inc:794
 #: ../lib/modules/asteriskAccount.inc:1202
+#: ../lib/modules/dhcp_settings.inc:104
 msgid "Deny"
 msgstr "拒绝"
 
@@ -2635,10 +2690,28 @@ msgstr "拒绝"
 #: ../lib/modules/inetOrgPerson.inc:346 ../lib/modules/inetOrgPerson.inc:552
 #: ../lib/modules/inetOrgPerson.inc:671 ../lib/modules/inetOrgPerson.inc:868
 #: ../lib/modules/inetOrgPerson.inc:872 ../lib/modules/inetOrgPerson.inc:1961
-#: ../lib/modules/inetOrgPerson.inc:2385 ../lib/modules/inetOrgPerson.inc:3159
+#: ../lib/modules/inetOrgPerson.inc:2387 ../lib/modules/inetOrgPerson.inc:3161
 msgid "Department"
 msgstr "部门"
 
+#: ../lib/modules/kolabGroup.inc:98 ../lib/modules/kolabGroup.inc:102
+#: ../lib/modules/kolabUser.inc:144 ../lib/modules/kolabUser.inc:148
+msgid ""
+"Describes the allowed or disallowed SMTP addresses sending mail to this "
+"account (e.g. \"domain.tld\" or \"-user@domain.tld\")."
+msgstr ""
+"描述是否允许SMTP向这个地址发送邮件(比如 \"domain.tld\" 或 \"-user@domain.tld"
+"\"）。"
+
+#: ../lib/modules/kolabGroup.inc:89 ../lib/modules/kolabGroup.inc:93
+#: ../lib/modules/kolabUser.inc:135 ../lib/modules/kolabUser.inc:139
+msgid ""
+"Describes the allowed or disallowed SMTP recipient addresses for mail sent "
+"by this account (e.g. \"domain.tld\" or \"-user@domain.tld\")."
+msgstr ""
+"描述是否允许SMTP接收这个地址发来的邮件(比如: \"domain.tld\" 或 \"-"
+"user@domain.tld\")."
+
 #: ../templates/schema/schema.php:89 ../templates/schema/schema.php:143
 #: ../templates/schema/schema.php:346
 #: ../templates/3rdParty/pla/lib/functions.php:1898
@@ -2653,20 +2726,20 @@ msgstr "部门"
 #: ../lib/modules/account.inc:232 ../lib/modules/windowsHost.inc:71
 #: ../lib/modules/windowsHost.inc:94 ../lib/modules/windowsHost.inc:113
 #: ../lib/modules/windowsHost.inc:136 ../lib/modules/windowsHost.inc:288
-#: ../lib/modules/posixGroup.inc:198 ../lib/modules/posixGroup.inc:371
-#: ../lib/modules/posixGroup.inc:423 ../lib/modules/posixGroup.inc:508
+#: ../lib/modules/posixGroup.inc:199 ../lib/modules/posixGroup.inc:407
+#: ../lib/modules/posixGroup.inc:459 ../lib/modules/posixGroup.inc:548
 #: ../lib/modules/device.inc:74 ../lib/modules/device.inc:108
 #: ../lib/modules/device.inc:123 ../lib/modules/device.inc:170
-#: ../lib/modules/device.inc:439 ../lib/modules/dhcp_settings.inc:183
-#: ../lib/modules/dhcp_settings.inc:199 ../lib/modules/dhcp_settings.inc:279
-#: ../lib/modules/dhcp_settings.inc:581 ../lib/modules/dhcp_settings.inc:639
-#: ../lib/modules/posixAccount.inc:516 ../lib/modules/windowsUser.inc:99
+#: ../lib/modules/device.inc:439 ../lib/modules/dhcp_settings.inc:190
+#: ../lib/modules/dhcp_settings.inc:210 ../lib/modules/dhcp_settings.inc:300
+#: ../lib/modules/dhcp_settings.inc:613 ../lib/modules/dhcp_settings.inc:677
+#: ../lib/modules/posixAccount.inc:545 ../lib/modules/windowsUser.inc:99
 #: ../lib/modules/windowsUser.inc:252 ../lib/modules/windowsUser.inc:381
 #: ../lib/modules/windowsUser.inc:524 ../lib/modules/windowsUser.inc:1216
 #: ../lib/modules/nisObject.inc:66 ../lib/modules/nisObject.inc:96
 #: ../lib/modules/nisObject.inc:107 ../lib/modules/nisObject.inc:148
-#: ../lib/modules/nisObject.inc:213 ../lib/modules/sambaGroupMapping.inc:321
-#: ../lib/modules/sambaGroupMapping.inc:388 ../lib/modules/automount.inc:65
+#: ../lib/modules/nisObject.inc:213 ../lib/modules/sambaGroupMapping.inc:107
+#: ../lib/modules/sambaGroupMapping.inc:529 ../lib/modules/automount.inc:65
 #: ../lib/modules/automount.inc:88 ../lib/modules/automount.inc:98
 #: ../lib/modules/automount.inc:133 ../lib/modules/automount.inc:195
 #: ../lib/modules/nisnetgroup.inc:80 ../lib/modules/nisnetgroup.inc:133
@@ -2674,14 +2747,15 @@ msgstr "部门"
 #: ../lib/modules/inetOrgPerson.inc:158 ../lib/modules/inetOrgPerson.inc:308
 #: ../lib/modules/inetOrgPerson.inc:398 ../lib/modules/inetOrgPerson.inc:611
 #: ../lib/modules/inetOrgPerson.inc:701 ../lib/modules/inetOrgPerson.inc:1444
-#: ../lib/modules/inetOrgPerson.inc:2356 ../lib/modules/sudoRole.inc:59
+#: ../lib/modules/inetOrgPerson.inc:2358 ../lib/modules/sudoRole.inc:59
 #: ../lib/modules/sudoRole.inc:128 ../lib/modules/sudoRole.inc:172
 #: ../lib/modules/sudoRole.inc:253 ../lib/modules/sudoRole.inc:683
-#: ../lib/modules/windowsGroup.inc:110 ../lib/modules/windowsGroup.inc:169
-#: ../lib/modules/windowsGroup.inc:221 ../lib/modules/windowsGroup.inc:258
-#: ../lib/modules/windowsGroup.inc:616 ../lib/modules/groupOfNames.inc:64
-#: ../lib/modules/groupOfNames.inc:99 ../lib/modules/groupOfNames.inc:130
-#: ../lib/modules/groupOfNames.inc:178 ../lib/modules/groupOfNames.inc:539
+#: ../lib/modules/windowsGroup.inc:110 ../lib/modules/windowsGroup.inc:175
+#: ../lib/modules/windowsGroup.inc:235 ../lib/modules/windowsGroup.inc:275
+#: ../lib/modules/windowsGroup.inc:714 ../lib/modules/groupOfNames.inc:68
+#: ../lib/modules/groupOfNames.inc:110 ../lib/modules/groupOfNames.inc:146
+#: ../lib/modules/groupOfNames.inc:164 ../lib/modules/groupOfNames.inc:208
+#: ../lib/modules/groupOfNames.inc:620
 msgid "Description"
 msgstr "描述"
 
@@ -2719,47 +2793,47 @@ msgstr ""
 "关闭这个策略的用户到用户的认证功能，防止策略从其他用户那里得到会话密钥。"
 
 #: ../lib/modules/heimdalKerberos.inc:123
-#: ../lib/modules/heimdalKerberos.inc:370
+#: ../lib/modules/heimdalKerberos.inc:375
 msgid "Disallow TGT-based tickets"
 msgstr "不允许基于TGT的票据"
 
 #: ../lib/modules/mitKerberos.inc:167 ../lib/modules/mitKerberos.inc:453
 #: ../lib/modules/heimdalKerberos.inc:141
-#: ../lib/modules/heimdalKerberos.inc:375
+#: ../lib/modules/heimdalKerberos.inc:380
 msgid "Disallow all tickets"
 msgstr "不允许所有的编码"
 
-#: ../templates/config/conftypes.php:297 ../help/help.inc:160
+#: ../templates/config/conftypes.php:297 ../help/help.inc:162
 msgid "Disallow delete"
 msgstr "不允许删除"
 
 #: ../lib/modules/mitKerberos.inc:155 ../lib/modules/mitKerberos.inc:423
 #: ../lib/modules/heimdalKerberos.inc:126
-#: ../lib/modules/heimdalKerberos.inc:345
+#: ../lib/modules/heimdalKerberos.inc:350
 msgid "Disallow forwardable tickets"
 msgstr "不允许转发的票据."
 
 #: ../lib/modules/mitKerberos.inc:152 ../lib/modules/mitKerberos.inc:438
 #: ../lib/modules/heimdalKerberos.inc:135
-#: ../lib/modules/heimdalKerberos.inc:360
+#: ../lib/modules/heimdalKerberos.inc:365
 msgid "Disallow post-dated tickets"
 msgstr "不允许过期的票据"
 
 #: ../lib/modules/mitKerberos.inc:161 ../lib/modules/mitKerberos.inc:428
 #: ../lib/modules/heimdalKerberos.inc:129
-#: ../lib/modules/heimdalKerberos.inc:350
+#: ../lib/modules/heimdalKerberos.inc:355
 msgid "Disallow proxiable tickets"
 msgstr "不允许代理的票据"
 
 #: ../lib/modules/mitKerberos.inc:158 ../lib/modules/mitKerberos.inc:433
 #: ../lib/modules/heimdalKerberos.inc:132
-#: ../lib/modules/heimdalKerberos.inc:355
+#: ../lib/modules/heimdalKerberos.inc:360
 msgid "Disallow renewable tickets"
 msgstr "不允许刷新的票据"
 
 #: ../lib/modules/mitKerberos.inc:179 ../lib/modules/mitKerberos.inc:443
 #: ../lib/modules/heimdalKerberos.inc:138
-#: ../lib/modules/heimdalKerberos.inc:365
+#: ../lib/modules/heimdalKerberos.inc:370
 msgid "Disallow service tickets"
 msgstr "不允许服务票据"
 
@@ -2777,7 +2851,7 @@ msgid "Disallowed codec"
 msgstr "不允许的编码"
 
 #: ../lib/modules/sambaDomain.inc:106 ../lib/modules/sambaDomain.inc:186
-#: ../lib/modules/sambaDomain.inc:292 ../lib/modules/sambaDomain.inc:656
+#: ../lib/modules/sambaDomain.inc:292 ../lib/modules/sambaDomain.inc:660
 msgid "Disconnect users outside logon hours"
 msgstr "切断连接前用户登录小时数"
 
@@ -2804,10 +2878,10 @@ msgstr "显示格式"
 #: ../lib/modules/windowsUser.inc:240 ../lib/modules/windowsUser.inc:382
 #: ../lib/modules/windowsUser.inc:445 ../lib/modules/windowsUser.inc:522
 #: ../lib/modules/windowsUser.inc:1217
-#: ../lib/modules/sambaGroupMapping.inc:259
-#: ../lib/modules/sambaGroupMapping.inc:319
+#: ../lib/modules/sambaGroupMapping.inc:105
+#: ../lib/modules/sambaGroupMapping.inc:139
 #: ../lib/modules/sambaGroupMapping.inc:352
-#: ../lib/modules/sambaGroupMapping.inc:386
+#: ../lib/modules/sambaGroupMapping.inc:527
 msgid "Display name"
 msgstr "显示名"
 
@@ -2829,8 +2903,8 @@ msgstr "显示的帐号数以\"0\"开始,加2才是您的电子表格的行数."
 msgid "Distribution"
 msgstr "分发"
 
-#: ../lib/modules/passwordSelfReset.inc:128
-#: ../lib/modules/passwordSelfReset.inc:236
+#: ../lib/modules/passwordSelfReset.inc:129
+#: ../lib/modules/passwordSelfReset.inc:252
 msgid "Do not ask security question"
 msgstr "不需要安全提问"
 
@@ -2846,7 +2920,7 @@ msgstr "确认删除这个PDF结构?"
 msgid "Do you really want to delete this profile?"
 msgstr "确认删除这个配置文件?"
 
-#: ../lib/modules/kolabUser.inc:450
+#: ../lib/modules/kolabGroup.inc:266 ../lib/modules/kolabUser.inc:497
 msgid "Do you really want to mark this account for deletion?"
 msgstr "确认将此帐号打上删除标记?"
 
@@ -2874,9 +2948,9 @@ msgstr "确认如下更改?"
 #: ../lib/modules/sambaSamAccount.inc:1749
 #: ../lib/modules/sambaSamAccount.inc:1771
 #: ../lib/modules/sambaSamAccount.inc:1880
-#: ../lib/modules/sambaGroupMapping.inc:286
-#: ../lib/modules/sambaGroupMapping.inc:364
-#: ../lib/modules/sambaGroupMapping.inc:408 ../lib/modules/nisnetgroup.inc:216
+#: ../lib/modules/sambaGroupMapping.inc:151
+#: ../lib/modules/sambaGroupMapping.inc:379
+#: ../lib/modules/sambaGroupMapping.inc:563 ../lib/modules/nisnetgroup.inc:216
 #: ../lib/modules/nisnetgroup.inc:582
 msgid "Domain"
 msgstr "域"
@@ -2888,35 +2962,35 @@ msgstr "域KRBTGT"
 #: ../lib/types/smbDomain.inc:91 ../lib/modules/sambaDomain.inc:74
 #: ../lib/modules/sambaDomain.inc:144 ../lib/modules/sambaDomain.inc:178
 #: ../lib/modules/sambaDomain.inc:249 ../lib/modules/sambaDomain.inc:254
-#: ../lib/modules/sambaDomain.inc:635
+#: ../lib/modules/sambaDomain.inc:639
 msgid "Domain SID"
 msgstr "域SID"
 
-#: ../lib/modules/sambaGroupMapping.inc:331
-#: ../lib/modules/windowsGroup.inc:164 ../lib/modules/windowsGroup.inc:171
-#: ../lib/modules/windowsGroup.inc:177
+#: ../lib/modules/sambaGroupMapping.inc:118
+#: ../lib/modules/windowsGroup.inc:170 ../lib/modules/windowsGroup.inc:177
+#: ../lib/modules/windowsGroup.inc:183
 msgid "Domain administrators"
 msgstr "域管理员"
 
 #: ../lib/modules/sambaSamAccount.inc:79 ../lib/modules/sambaSamAccount.inc:84
-#: ../lib/modules/sambaGroupMapping.inc:58
-#: ../lib/modules/sambaGroupMapping.inc:337
+#: ../lib/modules/sambaGroupMapping.inc:60
+#: ../lib/modules/sambaGroupMapping.inc:124
 msgid "Domain admins"
 msgstr "域管理员"
 
 #: ../lib/modules/sambaSamAccount.inc:80
-#: ../lib/modules/sambaGroupMapping.inc:63
+#: ../lib/modules/sambaGroupMapping.inc:65
 msgid "Domain certificate admins"
 msgstr "域认证管理员"
 
 #: ../lib/modules/sambaSamAccount.inc:80
 #: ../lib/modules/sambaSamAccount.inc:791
-#: ../lib/modules/sambaGroupMapping.inc:61
+#: ../lib/modules/sambaGroupMapping.inc:63
 msgid "Domain computers"
 msgstr "域内计算机"
 
 #: ../lib/modules/sambaSamAccount.inc:80
-#: ../lib/modules/sambaGroupMapping.inc:62
+#: ../lib/modules/sambaGroupMapping.inc:64
 msgid "Domain controllers"
 msgstr "域控制器"
 
@@ -2926,17 +3000,17 @@ msgid "Domain count: %s"
 msgstr "域总计:%s"
 
 #: ../lib/modules/sambaSamAccount.inc:81
-#: ../lib/modules/sambaGroupMapping.inc:65
+#: ../lib/modules/sambaGroupMapping.inc:67
 msgid "Domain enterprise admins"
 msgstr "域企业管理员"
 
-#: ../lib/modules/sambaGroupMapping.inc:69
-#: ../lib/modules/sambaGroupMapping.inc:277
+#: ../lib/modules/sambaGroupMapping.inc:71
+#: ../lib/modules/sambaGroupMapping.inc:370
 msgid "Domain group"
 msgstr "域内组"
 
 #: ../lib/modules/sambaSamAccount.inc:79 ../lib/modules/sambaSamAccount.inc:84
-#: ../lib/modules/sambaGroupMapping.inc:60
+#: ../lib/modules/sambaGroupMapping.inc:62
 msgid "Domain guests"
 msgstr "域内来宾"
 
@@ -2944,13 +3018,13 @@ msgstr "域内来宾"
 msgid "Domain local"
 msgstr "本地域"
 
-#: ../lib/types/smbDomain.inc:92 ../lib/modules/dhcp_settings.inc:131
-#: ../lib/modules/dhcp_settings.inc:190 ../lib/modules/dhcp_settings.inc:204
-#: ../lib/modules/dhcp_settings.inc:228 ../lib/modules/dhcp_settings.inc:537
-#: ../lib/modules/dhcp_settings.inc:630 ../lib/modules/nisnetgroup.inc:147
+#: ../lib/types/smbDomain.inc:92 ../lib/modules/dhcp_settings.inc:138
+#: ../lib/modules/dhcp_settings.inc:201 ../lib/modules/dhcp_settings.inc:216
+#: ../lib/modules/dhcp_settings.inc:243 ../lib/modules/dhcp_settings.inc:560
+#: ../lib/modules/dhcp_settings.inc:667 ../lib/modules/nisnetgroup.inc:147
 #: ../lib/modules/sambaDomain.inc:70 ../lib/modules/sambaDomain.inc:137
 #: ../lib/modules/sambaDomain.inc:177 ../lib/modules/sambaDomain.inc:234
-#: ../lib/modules/sambaDomain.inc:239 ../lib/modules/sambaDomain.inc:634
+#: ../lib/modules/sambaDomain.inc:239 ../lib/modules/sambaDomain.inc:638
 msgid "Domain name"
 msgstr "域名"
 
@@ -2960,18 +3034,18 @@ msgid "Domain name is invalid!"
 msgstr "域名非法!"
 
 #: ../lib/modules/sambaSamAccount.inc:81
-#: ../lib/modules/sambaGroupMapping.inc:66
+#: ../lib/modules/sambaGroupMapping.inc:68
 msgid "Domain policy admins"
 msgstr "域策略管理员"
 
 #: ../lib/modules/sambaSamAccount.inc:81
-#: ../lib/modules/sambaGroupMapping.inc:64
+#: ../lib/modules/sambaGroupMapping.inc:66
 msgid "Domain schema admins"
 msgstr "域架构管理员"
 
 #: ../lib/modules/sambaSamAccount.inc:79
 #: ../lib/modules/sambaSamAccount.inc:2183
-#: ../lib/modules/sambaGroupMapping.inc:59
+#: ../lib/modules/sambaGroupMapping.inc:61
 msgid "Domain users"
 msgstr "域内用户"
 
@@ -2979,10 +3053,14 @@ msgstr "域内用户"
 msgid "Don't stop on errors"
 msgstr "发生错误时不停止"
 
-#: ../templates/pdfedit/pdfpage.php:477
+#: ../templates/pdfedit/pdfpage.php:475
 msgid "Down"
 msgstr "向下"
 
+#: ../templates/config/mainmanage.php:275
+msgid "Download CA certificates"
+msgstr "下载 CA 证书"
+
 #: ../templates/masscreate.php:250
 msgid "Download sample CSV file"
 msgstr "下载CSV示例文件"
@@ -3027,15 +3105,15 @@ msgstr "编辑"
 msgid "Edit again"
 msgstr "再次编辑"
 
-#: ../templates/config/mainmanage.php:134 ../templates/config/index.php:99
+#: ../templates/config/mainmanage.php:189 ../templates/config/index.php:99
 msgid "Edit general settings"
 msgstr "编辑通用设置"
 
-#: ../lib/modules/posixAccount.inc:1254 ../lib/modules/windowsUser.inc:582
+#: ../lib/modules/posixAccount.inc:1356 ../lib/modules/windowsUser.inc:582
 msgid "Edit groups"
 msgstr "编辑组"
 
-#: ../lib/modules/posixGroup.inc:202 ../lib/modules/windowsGroup.inc:313
+#: ../lib/modules/posixGroup.inc:220 ../lib/modules/windowsGroup.inc:348
 msgid "Edit members"
 msgstr "编辑成员"
 
@@ -3060,13 +3138,16 @@ msgstr "编辑工作站"
 #: ../lib/modules/zarafaDynamicGroup.inc:236
 #: ../lib/modules/zarafaDynamicGroup.inc:241
 #: ../lib/modules/zarafaGroup.inc:228 ../lib/modules/zarafaGroup.inc:235
-#: ../lib/modules/passwordSelfReset.inc:178
+#: ../lib/modules/passwordSelfReset.inc:191
 #: ../lib/modules/nisMailAlias.inc:277
 msgid "Email"
 msgstr "电子邮件"
 
-#: ../templates/lists/changePassword.php:269
-#: ../lib/modules/selfRegistration.inc:342
+#: ../templates/lists/changePassword.php:269 ../lib/modules/kolabGroup.inc:80
+#: ../lib/modules/kolabGroup.inc:84 ../lib/modules/kolabGroup.inc:136
+#: ../lib/modules/kolabGroup.inc:149 ../lib/modules/kolabGroup.inc:158
+#: ../lib/modules/kolabGroup.inc:160 ../lib/modules/kolabGroup.inc:183
+#: ../lib/modules/kolabGroup.inc:400 ../lib/modules/selfRegistration.inc:342
 #: ../lib/modules/selfRegistration.inc:417
 #: ../lib/modules/zarafaDynamicGroup.inc:60
 #: ../lib/modules/zarafaDynamicGroup.inc:61
@@ -3087,7 +3168,7 @@ msgstr "电子邮件"
 #: ../lib/modules/inetOrgPerson.inc:336 ../lib/modules/inetOrgPerson.inc:518
 #: ../lib/modules/inetOrgPerson.inc:653 ../lib/modules/inetOrgPerson.inc:789
 #: ../lib/modules/inetOrgPerson.inc:793 ../lib/modules/inetOrgPerson.inc:1821
-#: ../lib/modules/inetOrgPerson.inc:2369 ../lib/modules/inetOrgPerson.inc:2945
+#: ../lib/modules/inetOrgPerson.inc:2371 ../lib/modules/inetOrgPerson.inc:2947
 #: ../lib/modules/asteriskVoicemail.inc:98
 #: ../lib/modules/asteriskVoicemail.inc:131
 #: ../lib/modules/asteriskVoicemail.inc:169
@@ -3096,15 +3177,19 @@ msgstr "电子邮件"
 #: ../lib/modules/qmailGroup.inc:120 ../lib/modules/qmailGroup.inc:233
 #: ../lib/modules/qmailGroup.inc:364 ../lib/modules/qmailGroup.inc:413
 #: ../lib/modules/qmailGroup.inc:450 ../lib/modules/qmailGroup.inc:1053
-#: ../lib/modules/imapAccess.inc:212 ../lib/modules/passwordSelfReset.inc:702
-#: ../lib/modules/passwordSelfReset.inc:850
-#: ../lib/modules/windowsGroup.inc:118 ../lib/modules/windowsGroup.inc:153
-#: ../lib/modules/windowsGroup.inc:205 ../lib/modules/windowsGroup.inc:228
-#: ../lib/modules/windowsGroup.inc:242 ../lib/modules/windowsGroup.inc:260
-#: ../lib/modules/windowsGroup.inc:618
+#: ../lib/modules/imapAccess.inc:212 ../lib/modules/passwordSelfReset.inc:718
+#: ../lib/modules/passwordSelfReset.inc:887
+#: ../lib/modules/windowsGroup.inc:118 ../lib/modules/windowsGroup.inc:157
+#: ../lib/modules/windowsGroup.inc:211 ../lib/modules/windowsGroup.inc:242
+#: ../lib/modules/windowsGroup.inc:259 ../lib/modules/windowsGroup.inc:277
+#: ../lib/modules/windowsGroup.inc:716
 msgid "Email address"
 msgstr "电子邮件地址"
 
+#: ../lib/modules/kolabGroup.inc:160 ../lib/modules/kolabGroup.inc:161
+msgid "Email address already exists."
+msgstr "邮件地址已经存在. "
+
 #: ../lib/modules/asteriskVoicemail.inc:99
 msgid "Email address for this voicemail account."
 msgstr "此语音邮件帐号的电子邮件地址"
@@ -3125,17 +3210,17 @@ msgstr "主持此列表的电子邮件地址（例如，批准邮件）。"
 #: ../lib/modules/windowsUser.inc:202 ../lib/modules/windowsUser.inc:206
 #: ../lib/modules/windowsUser.inc:300 ../lib/modules/windowsUser.inc:387
 #: ../lib/modules/windowsUser.inc:459 ../lib/modules/windowsUser.inc:536
-#: ../lib/modules/windowsUser.inc:1222 ../lib/modules/kolabUser.inc:121
+#: ../lib/modules/windowsUser.inc:1222 ../lib/modules/kolabUser.inc:122
 #: ../lib/modules/windowsGroup.inc:122 ../lib/modules/windowsGroup.inc:126
-#: ../lib/modules/windowsGroup.inc:155 ../lib/modules/windowsGroup.inc:213
-#: ../lib/modules/windowsGroup.inc:231 ../lib/modules/windowsGroup.inc:244
-#: ../lib/modules/windowsGroup.inc:263 ../lib/modules/windowsGroup.inc:619
+#: ../lib/modules/windowsGroup.inc:159 ../lib/modules/windowsGroup.inc:219
+#: ../lib/modules/windowsGroup.inc:245 ../lib/modules/windowsGroup.inc:261
+#: ../lib/modules/windowsGroup.inc:280 ../lib/modules/windowsGroup.inc:717
 msgid "Email alias"
 msgstr "电子邮件别名"
 
 #: ../lib/modules/zarafaContact.inc:77 ../lib/modules/zarafaUser.inc:118
 #: ../lib/modules/windowsUser.inc:203 ../lib/modules/windowsUser.inc:207
-#: ../lib/modules/kolabUser.inc:122 ../lib/modules/windowsGroup.inc:123
+#: ../lib/modules/kolabUser.inc:123 ../lib/modules/windowsGroup.inc:123
 #: ../lib/modules/windowsGroup.inc:127
 msgid "Email alias for this account."
 msgstr "此帐号的电子邮件别名"
@@ -3143,16 +3228,16 @@ msgstr "此帐号的电子邮件别名"
 #: ../lib/modules/zarafaContact.inc:174 ../lib/modules/zarafaContact.inc:175
 #: ../lib/modules/zarafaUser.inc:449 ../lib/modules/zarafaUser.inc:450
 #: ../lib/modules/windowsUser.inc:459 ../lib/modules/windowsUser.inc:460
-#: ../lib/modules/kolabUser.inc:180 ../lib/modules/windowsGroup.inc:244
-#: ../lib/modules/windowsGroup.inc:245
+#: ../lib/modules/kolabUser.inc:213 ../lib/modules/windowsGroup.inc:261
+#: ../lib/modules/windowsGroup.inc:262
 msgid "Email alias is invalid!"
 msgstr "电子邮件别名非法!"
 
-#: ../lib/modules/kolabUser.inc:125
+#: ../lib/modules/kolabUser.inc:126
 msgid "Email alias list"
 msgstr "电子邮件别名列表"
 
-#: ../lib/modules/kolabUser.inc:181
+#: ../lib/modules/kolabUser.inc:214
 msgid "Email alias list has invalid format!"
 msgstr "电子邮件别名列表格式非法!"
 
@@ -3171,25 +3256,25 @@ msgstr "电子邮件别名列表格式非法!"
 #: ../lib/modules/zarafaUser.inc:210 ../lib/modules/zarafaUser.inc:229
 #: ../lib/modules/zarafaUser.inc:411 ../lib/modules/zarafaUser.inc:426
 #: ../lib/modules/zarafaUser.inc:475 ../lib/modules/zarafaUser.inc:1301
-#: ../lib/modules/zarafaUser.inc:1563 ../lib/modules/kolabUser.inc:153
-#: ../lib/modules/kolabUser.inc:168 ../lib/modules/kolabUser.inc:275
-#: ../lib/modules/kolabUser.inc:643
+#: ../lib/modules/zarafaUser.inc:1563 ../lib/modules/kolabUser.inc:172
+#: ../lib/modules/kolabUser.inc:199 ../lib/modules/kolabUser.inc:311
+#: ../lib/modules/kolabUser.inc:720
 msgid "Email aliases"
 msgstr "电子邮件别名"
 
 #: ../lib/modules/inetOrgPerson.inc:354 ../lib/modules/inetOrgPerson.inc:414
 #: ../lib/modules/inetOrgPerson.inc:683 ../lib/modules/inetOrgPerson.inc:900
-#: ../lib/modules/inetOrgPerson.inc:1913 ../lib/modules/inetOrgPerson.inc:2380
-#: ../lib/modules/passwordSelfReset.inc:181
-#: ../lib/modules/passwordSelfReset.inc:708
-#: ../lib/modules/passwordSelfReset.inc:855
+#: ../lib/modules/inetOrgPerson.inc:1913 ../lib/modules/inetOrgPerson.inc:2382
+#: ../lib/modules/passwordSelfReset.inc:194
+#: ../lib/modules/passwordSelfReset.inc:724
+#: ../lib/modules/passwordSelfReset.inc:892
 msgid "Employee number"
 msgstr "雇员号"
 
 #: ../lib/modules/inetOrgPerson.inc:88 ../lib/modules/inetOrgPerson.inc:212
 #: ../lib/modules/inetOrgPerson.inc:342 ../lib/modules/inetOrgPerson.inc:422
 #: ../lib/modules/inetOrgPerson.inc:665 ../lib/modules/inetOrgPerson.inc:721
-#: ../lib/modules/inetOrgPerson.inc:1919 ../lib/modules/inetOrgPerson.inc:2378
+#: ../lib/modules/inetOrgPerson.inc:1919 ../lib/modules/inetOrgPerson.inc:2380
 msgid "Employee type"
 msgstr "雇员类型"
 
@@ -3197,13 +3282,13 @@ msgstr "雇员类型"
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇员类型: 承包商,雇员,实习生,临时工,外部员工,..."
 
-#: ../templates/lists/changePassword.php:464
-#: ../templates/lists/changePassword.php:471 ../templates/login.php:532
+#: ../templates/lists/changePassword.php:468
+#: ../templates/lists/changePassword.php:475 ../templates/login.php:546
 msgid "Empty password submitted. Please try again."
 msgstr "提交了空密码,请重试."
 
-#: ../lib/modules/passwordSelfReset.inc:84
-#: ../lib/modules/passwordSelfReset.inc:172
+#: ../lib/modules/passwordSelfReset.inc:85
+#: ../lib/modules/passwordSelfReset.inc:181
 msgid "Enable password self reset link"
 msgstr "打开密码自助复位链接"
 
@@ -3295,7 +3380,7 @@ msgstr "相等"
 msgid "Equipment"
 msgstr "设备"
 
-#: ../templates/config/mainmanage.php:223
+#: ../templates/config/mainmanage.php:352
 #: ../templates/3rdParty/pla/lib/Template.php:430
 #: ../templates/3rdParty/pla/lib/Template.php:473
 #: ../templates/3rdParty/pla/lib/Template.php:517
@@ -3311,7 +3396,7 @@ msgstr "错误"
 msgid "Error number"
 msgstr "错误号"
 
-#: ../lib/modules/mitKerberos.inc:1185 ../lib/modules/heimdalKerberos.inc:1033
+#: ../lib/modules/mitKerberos.inc:1180 ../lib/modules/heimdalKerberos.inc:1041
 msgid "Error while changing Kerberos password."
 msgstr "在修改Kerberos密码时发生错误."
 
@@ -3320,7 +3405,7 @@ msgstr "在修改Kerberos密码时发生错误."
 msgid "Error while deleting DN: %s"
 msgstr "删除DN: %s时发生错误"
 
-#: ../help/help.inc:139
+#: ../help/help.inc:141
 msgid ""
 "Every account type needs exactly one base module. This module provides a "
 "structural object class."
@@ -3328,9 +3413,9 @@ msgstr "每个帐号类型都需要一个基本模块,这个模块提供一个
 
 #: ../lib/modules/customScripts.inc:60 ../lib/modules/customScripts.inc:73
 #: ../lib/modules/selfRegistration.inc:124 ../lib/modules/zarafaContact.inc:90
-#: ../lib/modules/zarafaGroup.inc:93 ../lib/modules/dhcp_settings.inc:534
+#: ../lib/modules/zarafaGroup.inc:93 ../lib/modules/dhcp_settings.inc:557
 #: ../lib/modules/zarafaUser.inc:139 ../help/help.inc:74 ../help/help.inc:80
-#: ../help/help.inc:86 ../help/help.inc:91 ../help/help.inc:111
+#: ../help/help.inc:88 ../help/help.inc:93 ../help/help.inc:113
 msgid "Example"
 msgstr "示例"
 
@@ -3342,7 +3427,7 @@ msgstr "示例值"
 msgid "Examples"
 msgstr "示例"
 
-#: ../templates/config/confmain.php:307
+#: ../templates/config/confmain.php:308
 msgid "Execute"
 msgstr "运行"
 
@@ -3386,7 +3471,7 @@ msgid "Export"
 msgstr "导出"
 
 #: ../templates/pdfedit/pdfmain.php:206 ../templates/pdfedit/pdfmain.php:207
-#: ../help/help.inc:190
+#: ../help/help.inc:192
 msgid "Export PDF structure"
 msgstr "导出PDF结构"
 
@@ -3395,7 +3480,7 @@ msgid "Export format"
 msgstr "导出格式"
 
 #: ../templates/profedit/profilemain.php:207
-#: ../templates/profedit/profilemain.php:208 ../help/help.inc:172
+#: ../templates/profedit/profilemain.php:208 ../help/help.inc:174
 msgid "Export profile"
 msgstr "导出配置文件"
 
@@ -3472,8 +3557,8 @@ msgstr "失败记录间隔"
 #: ../lib/modules/inetOrgPerson.inc:191 ../lib/modules/inetOrgPerson.inc:334
 #: ../lib/modules/inetOrgPerson.inc:510 ../lib/modules/inetOrgPerson.inc:650
 #: ../lib/modules/inetOrgPerson.inc:781 ../lib/modules/inetOrgPerson.inc:785
-#: ../lib/modules/inetOrgPerson.inc:1794 ../lib/modules/inetOrgPerson.inc:2371
-#: ../lib/modules/inetOrgPerson.inc:3000
+#: ../lib/modules/inetOrgPerson.inc:1794 ../lib/modules/inetOrgPerson.inc:2373
+#: ../lib/modules/inetOrgPerson.inc:3002
 msgid "Fax number"
 msgstr "传真号"
 
@@ -3483,13 +3568,17 @@ msgstr "传真号"
 msgid "Features"
 msgstr "功能"
 
-#: ../templates/config/mainmanage.php:227
+#: ../templates/config/mainmanage.php:356
 #: ../templates/3rdParty/pla/lib/functions.php:533
 #: ../templates/3rdParty/pla/tools/unserialize.php:14
 #: ../templates/3rdParty/pla/htdocs/import.php:48
 msgid "File"
 msgstr "文件"
 
+#: ../lib/modules/customFields.inc:142 ../lib/modules/customFields.inc:2790
+msgid "File extension"
+msgstr "文件扩展名"
+
 #: ../lib/modules/sambaSamAccount.inc:302
 msgid ""
 "File name and path relative to netlogon-share which should be executed on "
@@ -3511,6 +3600,7 @@ msgid "File path"
 msgstr "文件路径"
 
 #: ../templates/masscreate.php:237 ../lib/tools/fileUpload.inc:44
+#: ../lib/modules/ldapPublicKey.inc:73 ../lib/modules/customFields.inc:2776
 #: ../lib/lists.inc:770
 msgid "File upload"
 msgstr "文件上传"
@@ -3523,15 +3613,18 @@ msgstr "文件上传"
 #: ../lib/modules/zarafaDynamicGroup.inc:164
 #: ../lib/modules/zarafaDynamicGroup.inc:232
 #: ../lib/modules/zarafaDynamicGroup.inc:467
-#: ../lib/modules/zarafaContact.inc:84 ../lib/modules/posixGroup.inc:301
-#: ../lib/modules/posixGroup.inc:467 ../lib/modules/zarafaAddressList.inc:72
+#: ../lib/modules/zarafaContact.inc:84 ../lib/modules/posixGroup.inc:331
+#: ../lib/modules/posixGroup.inc:503 ../lib/modules/zarafaAddressList.inc:72
 #: ../lib/modules/zarafaAddressList.inc:127
 #: ../lib/modules/zarafaAddressList.inc:138
 #: ../lib/modules/zarafaAddressList.inc:199
 #: ../lib/modules/zarafaAddressList.inc:336 ../lib/modules/zarafaUser.inc:133
-#: ../lib/modules/nisnetgroup.inc:97 ../lib/modules/nisnetgroup.inc:470
+#: ../lib/modules/sambaGroupMapping.inc:163
+#: ../lib/modules/sambaGroupMapping.inc:470 ../lib/modules/nisnetgroup.inc:97
+#: ../lib/modules/nisnetgroup.inc:470 ../lib/modules/groupOfNames.inc:92
+#: ../lib/modules/groupOfNames.inc:332 ../lib/modules/groupOfNames.inc:467
 #: ../lib/modules/nisMailAlias.inc:82 ../lib/modules/nisMailAlias.inc:273
-#: ../lib/lists.inc:376 ../help/help.inc:150
+#: ../lib/lists.inc:376 ../help/help.inc:152
 msgid "Filter"
 msgstr "过滤器"
 
@@ -3546,8 +3639,8 @@ msgstr "进行过滤"
 #: ../lib/modules/windowsUser.inc:1218 ../lib/modules/inetOrgPerson.inc:64
 #: ../lib/modules/inetOrgPerson.inc:140 ../lib/modules/inetOrgPerson.inc:375
 #: ../lib/modules/inetOrgPerson.inc:607 ../lib/modules/inetOrgPerson.inc:713
-#: ../lib/modules/inetOrgPerson.inc:1413 ../lib/modules/inetOrgPerson.inc:2358
-#: ../lib/modules/inetOrgPerson.inc:2923
+#: ../lib/modules/inetOrgPerson.inc:1413 ../lib/modules/inetOrgPerson.inc:2360
+#: ../lib/modules/inetOrgPerson.inc:2925
 msgid "First name"
 msgstr "名字"
 
@@ -3564,20 +3657,20 @@ msgstr "用户名字只允许字母,-和空格"
 msgid "Fix IP addresses"
 msgstr "固定IP地址"
 
-#: ../templates/config/confmain.php:396
+#: ../templates/config/confmain.php:397
 msgid "Fixed list"
 msgstr "固定列表"
 
-#: ../lib/modules/posixGroup.inc:346 ../lib/modules/posixAccount.inc:182
-#: ../lib/modules/posixAccount.inc:200
+#: ../lib/modules/posixGroup.inc:382 ../lib/modules/posixAccount.inc:203
+#: ../lib/modules/posixAccount.inc:221
 msgid "Fixed range"
 msgstr "固定的范围"
 
-#: ../templates/pdfedit/pdfpage.php:464
+#: ../templates/pdfedit/pdfpage.php:461
 msgid "Folding marks"
 msgstr "折叠记号"
 
-#: ../lib/modules/kolabUser.inc:106
+#: ../lib/modules/kolabUser.inc:107
 msgid "For automatic invitation handling."
 msgstr "自动处理邀请."
 
@@ -3590,16 +3683,16 @@ msgstr "上传请使用\"(主机,用户,域)\"格式来编写条目.多条目请
 #: ../templates/lists/changePassword.php:233
 #: ../lib/modules/mitKerberos.inc:176 ../lib/modules/mitKerberos.inc:418
 #: ../lib/modules/shadowAccount.inc:360 ../lib/modules/heimdalKerberos.inc:120
-#: ../lib/modules/heimdalKerberos.inc:340 ../lib/modules.inc:1058
-#: ../help/help.inc:184
+#: ../lib/modules/heimdalKerberos.inc:345 ../lib/modules.inc:1058
+#: ../help/help.inc:186
 msgid "Force password change"
 msgstr "强制改变密码"
 
-#: ../lib/modules/passwordSelfReset.inc:640
+#: ../lib/modules/passwordSelfReset.inc:656
 msgid "Forgot password?"
 msgstr "忘记密码?"
 
-#: ../templates/3rdParty/pla/lib/QueryRender.php:484 ../help/help.inc:224
+#: ../templates/3rdParty/pla/lib/QueryRender.php:484 ../help/help.inc:226
 msgid "Format"
 msgstr "格式"
 
@@ -3621,15 +3714,15 @@ msgstr "FreeRadius"
 msgid "Friday"
 msgstr "星期五"
 
-#: ../templates/config/confmain.php:331 ../lib/modules/selfRegistration.inc:75
+#: ../templates/config/confmain.php:332 ../lib/modules/selfRegistration.inc:75
 #: ../lib/modules/selfRegistration.inc:131
-#: ../lib/modules/passwordSelfReset.inc:104
-#: ../lib/modules/passwordSelfReset.inc:212
-#: ../lib/modules/passwordSelfReset.inc:228 ../help/help.inc:218
+#: ../lib/modules/passwordSelfReset.inc:105
+#: ../lib/modules/passwordSelfReset.inc:228
+#: ../lib/modules/passwordSelfReset.inc:244 ../help/help.inc:220
 msgid "From address"
 msgstr "收件人地址"
 
-#: ../templates/config/confmain.php:495
+#: ../templates/config/confmain.php:496
 msgid "From address for password mails is invalid."
 msgstr "密码邮件的发件人地址非法"
 
@@ -3690,7 +3783,7 @@ msgstr "功能"
 msgid "GB-12345"
 msgstr "GB-12345"
 
-#: ../lib/modules/posixGroup.inc:346 ../lib/modules/posixGroup.inc:459
+#: ../lib/modules/posixGroup.inc:382 ../lib/modules/posixGroup.inc:495
 msgid "GID generator"
 msgstr "GID生成器"
 
@@ -3698,23 +3791,23 @@ msgstr "GID生成器"
 #: ../lib/modules/qmailUser.inc:107 ../lib/modules/qmailUser.inc:228
 #: ../lib/modules/qmailUser.inc:334 ../lib/modules/qmailUser.inc:414
 #: ../lib/modules/qmailUser.inc:574 ../lib/modules/qmailUser.inc:1190
-#: ../lib/modules/posixGroup.inc:188 ../lib/modules/posixGroup.inc:364
-#: ../lib/modules/posixGroup.inc:377 ../lib/modules/posixGroup.inc:419
-#: ../lib/modules/posixGroup.inc:439 ../lib/modules/posixGroup.inc:507
-#: ../lib/modules/posixGroup.inc:530 ../lib/modules/posixAccount.inc:107
-#: ../lib/modules/posixAccount.inc:383 ../lib/modules/posixAccount.inc:1625
-#: ../lib/modules/sambaGroupMapping.inc:317
-#: ../lib/modules/sambaGroupMapping.inc:384
+#: ../lib/modules/posixGroup.inc:189 ../lib/modules/posixGroup.inc:400
+#: ../lib/modules/posixGroup.inc:413 ../lib/modules/posixGroup.inc:455
+#: ../lib/modules/posixGroup.inc:475 ../lib/modules/posixGroup.inc:547
+#: ../lib/modules/posixGroup.inc:570 ../lib/modules/posixAccount.inc:125
+#: ../lib/modules/posixAccount.inc:406 ../lib/modules/posixAccount.inc:1749
+#: ../lib/modules/sambaGroupMapping.inc:103
+#: ../lib/modules/sambaGroupMapping.inc:525
 msgid "GID number"
 msgstr "GID编号"
 
-#: ../lib/modules/posixGroup.inc:530
+#: ../lib/modules/posixGroup.inc:570
 msgid ""
 "GID number has changed. Please select checkbox to change GID number of users "
 "and hosts."
 msgstr "GID的编号已经更改,请点击选择框来改变用户GID号"
 
-#: ../lib/modules/posixAccount.inc:107
+#: ../lib/modules/posixAccount.inc:125
 #, php-format
 msgid ""
 "GID number has changed. To keep file ownership you have to run the following "
@@ -3723,7 +3816,7 @@ msgstr ""
 "GID已经更改,要保持文件属性一,你必须以root身份运行以下命令: 'find / -gid %s -"
 "uid %s -exec chgrp %s {} \\;'"
 
-#: ../lib/modules/posixGroup.inc:537
+#: ../lib/modules/posixGroup.inc:577
 msgid "GID number has to be a numeric value!"
 msgstr "GID号必须使用数字"
 
@@ -3731,10 +3824,10 @@ msgstr "GID号必须使用数字"
 msgid "GID number is already in use."
 msgstr "GID号已经被使用"
 
-#: ../lib/modules/posixAccount.inc:228 ../lib/modules/posixAccount.inc:326
-#: ../lib/modules/posixAccount.inc:368 ../lib/modules/posixAccount.inc:392
-#: ../lib/modules/posixAccount.inc:470 ../lib/modules/posixAccount.inc:508
-#: ../lib/modules/posixAccount.inc:1240 ../lib/modules/posixAccount.inc:1628
+#: ../lib/modules/posixAccount.inc:249 ../lib/modules/posixAccount.inc:349
+#: ../lib/modules/posixAccount.inc:391 ../lib/modules/posixAccount.inc:417
+#: ../lib/modules/posixAccount.inc:499 ../lib/modules/posixAccount.inc:537
+#: ../lib/modules/posixAccount.inc:1342 ../lib/modules/posixAccount.inc:1752
 msgid "Gecos"
 msgstr "备注(Gecos)"
 
@@ -3746,6 +3839,7 @@ msgstr "通用"
 msgid "General information"
 msgstr "一般信息"
 
+#: ../templates/config/mainmanage.php:396
 #: ../templates/config/confmodules.php:164
 #: ../templates/config/confmain.php:205
 #: ../templates/config/moduleSettings.php:163
@@ -3755,7 +3849,7 @@ msgstr "一般信息"
 msgid "General settings"
 msgstr "通用设置"
 
-#: ../templates/lists/changePassword.php:294 ../help/help.inc:216
+#: ../templates/lists/changePassword.php:294 ../help/help.inc:218
 msgid "Generate random password"
 msgstr "生成随机密码"
 
@@ -3814,7 +3908,7 @@ msgstr "节点限制的宽限期,大部分文件系统都使用最大值7天."
 msgid "Grace inode period"
 msgstr "节点限制宽限期"
 
-#: ../templates/config/confmain.php:312
+#: ../templates/config/confmain.php:313
 #: ../templates/selfService/adminMain.php:589
 msgid "Group"
 msgstr "组"
@@ -3829,12 +3923,12 @@ msgstr "组帐号(比如unix和samba)"
 msgid "Group count: %s"
 msgstr "帐号总计:%s"
 
-#: ../lib/types/group.inc:96 ../lib/modules/posixGroup.inc:410
+#: ../lib/types/group.inc:96 ../lib/modules/posixGroup.inc:446
 #: ../lib/modules/nisnetgroup.inc:113
 msgid "Group description"
 msgstr "组说明"
 
-#: ../lib/modules/posixGroup.inc:424
+#: ../lib/modules/posixGroup.inc:460
 msgid "Group description. If left empty group name will be used."
 msgstr "组说明,若空则会使用组名来替代."
 
@@ -3843,11 +3937,11 @@ msgid "Group member DNs"
 msgstr "组成员DN"
 
 #: ../templates/3rdParty/pla/htdocs/modify_member_form.php:94
-#: ../lib/types/group.inc:94 ../lib/modules/posixGroup.inc:201
-#: ../lib/modules/posixGroup.inc:259 ../lib/modules/posixGroup.inc:365
-#: ../lib/modules/posixGroup.inc:383 ../lib/modules/posixGroup.inc:427
-#: ../lib/modules/posixGroup.inc:431 ../lib/modules/posixGroup.inc:504
-#: ../lib/modules/windowsGroup.inc:312
+#: ../lib/types/group.inc:94 ../lib/modules/posixGroup.inc:219
+#: ../lib/modules/posixGroup.inc:289 ../lib/modules/posixGroup.inc:401
+#: ../lib/modules/posixGroup.inc:419 ../lib/modules/posixGroup.inc:463
+#: ../lib/modules/posixGroup.inc:467 ../lib/modules/posixGroup.inc:544
+#: ../lib/modules/windowsGroup.inc:347
 msgid "Group members"
 msgstr "组成员"
 
@@ -3859,19 +3953,19 @@ msgstr "组成员"
 #: ../lib/modules/zarafaDynamicGroup.inc:188
 #: ../lib/modules/zarafaDynamicGroup.inc:189
 #: ../lib/modules/zarafaDynamicGroup.inc:213
-#: ../lib/modules/zarafaDynamicGroup.inc:464 ../lib/modules/posixGroup.inc:178
-#: ../lib/modules/posixGroup.inc:368 ../lib/modules/posixGroup.inc:398
-#: ../lib/modules/posixGroup.inc:447 ../lib/modules/posixGroup.inc:506
-#: ../lib/modules/posixGroup.inc:538 ../lib/modules/posixGroup.inc:539
-#: ../lib/modules/posixGroup.inc:540 ../lib/modules/nisnetgroup.inc:76
+#: ../lib/modules/zarafaDynamicGroup.inc:464 ../lib/modules/posixGroup.inc:179
+#: ../lib/modules/posixGroup.inc:404 ../lib/modules/posixGroup.inc:434
+#: ../lib/modules/posixGroup.inc:483 ../lib/modules/posixGroup.inc:546
+#: ../lib/modules/posixGroup.inc:578 ../lib/modules/posixGroup.inc:579
+#: ../lib/modules/posixGroup.inc:580 ../lib/modules/nisnetgroup.inc:76
 #: ../lib/modules/nisnetgroup.inc:105 ../lib/modules/nisnetgroup.inc:132
 #: ../lib/modules/nisnetgroup.inc:144 ../lib/modules/nisnetgroup.inc:186
 #: ../lib/modules/nisnetgroup.inc:574 ../lib/modules/windowsGroup.inc:106
-#: ../lib/modules/windowsGroup.inc:162 ../lib/modules/windowsGroup.inc:220
-#: ../lib/modules/windowsGroup.inc:240 ../lib/modules/windowsGroup.inc:257
-#: ../lib/modules/windowsGroup.inc:615 ../lib/modules/groupOfNames.inc:60
-#: ../lib/modules/groupOfNames.inc:92 ../lib/modules/groupOfNames.inc:129
-#: ../lib/modules/groupOfNames.inc:538
+#: ../lib/modules/windowsGroup.inc:168 ../lib/modules/windowsGroup.inc:234
+#: ../lib/modules/windowsGroup.inc:257 ../lib/modules/windowsGroup.inc:274
+#: ../lib/modules/windowsGroup.inc:713 ../lib/modules/groupOfNames.inc:64
+#: ../lib/modules/groupOfNames.inc:101 ../lib/modules/groupOfNames.inc:142
+#: ../lib/modules/groupOfNames.inc:619
 msgid "Group name"
 msgstr "组名"
 
@@ -3880,15 +3974,15 @@ msgid "Group name already in use."
 msgstr "组名已经被使用"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:189
-#: ../lib/modules/zarafaDynamicGroup.inc:190 ../lib/modules/posixGroup.inc:540
-#: ../lib/modules/posixGroup.inc:541 ../lib/modules/nisnetgroup.inc:144
-#: ../lib/modules/windowsGroup.inc:240 ../lib/modules/windowsGroup.inc:241
+#: ../lib/modules/zarafaDynamicGroup.inc:190 ../lib/modules/posixGroup.inc:580
+#: ../lib/modules/posixGroup.inc:581 ../lib/modules/nisnetgroup.inc:144
+#: ../lib/modules/windowsGroup.inc:257 ../lib/modules/windowsGroup.inc:258
 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:539
+#: ../lib/modules/posixGroup.inc:579
 msgid "Group name in use. Selected next free group name."
 msgstr "组名已被使用,请选择可用的组名."
 
@@ -3898,7 +3992,7 @@ msgid ""
 "A-Z, 0-9 and .-_ ."
 msgstr "将要建立的组名,可用字符为: a-z, A-Z, 0-9,及 -或_ "
 
-#: ../lib/modules/posixGroup.inc:448
+#: ../lib/modules/posixGroup.inc:484
 msgid ""
 "Group name of the group which should be created. Valid characters are: a-z, "
 "A-Z, 0-9 and .-_ . If group name is already used group name will be expanded "
@@ -3926,24 +4020,24 @@ msgstr "帐号的组名"
 msgid "Group of unique names"
 msgstr "组的唯一名"
 
-#: ../lib/modules/posixGroup.inc:389 ../lib/modules/posixGroup.inc:435
+#: ../lib/modules/posixGroup.inc:425 ../lib/modules/posixGroup.inc:471
 msgid "Group password"
 msgstr "组密码"
 
-#: ../lib/modules/windowsGroup.inc:142 ../lib/modules/windowsGroup.inc:181
-#: ../lib/modules/windowsGroup.inc:225 ../lib/modules/windowsGroup.inc:298
-#: ../lib/modules/windowsGroup.inc:644
+#: ../lib/modules/windowsGroup.inc:142 ../lib/modules/windowsGroup.inc:187
+#: ../lib/modules/windowsGroup.inc:239 ../lib/modules/windowsGroup.inc:315
+#: ../lib/modules/windowsGroup.inc:742
 msgid "Group scope"
 msgstr "组范围"
 
-#: ../lib/modules/sambaGroupMapping.inc:282
-#: ../lib/modules/windowsGroup.inc:138 ../lib/modules/windowsGroup.inc:189
-#: ../lib/modules/windowsGroup.inc:224 ../lib/modules/windowsGroup.inc:301
-#: ../lib/modules/windowsGroup.inc:645
+#: ../lib/modules/sambaGroupMapping.inc:375
+#: ../lib/modules/windowsGroup.inc:138 ../lib/modules/windowsGroup.inc:195
+#: ../lib/modules/windowsGroup.inc:238 ../lib/modules/windowsGroup.inc:318
+#: ../lib/modules/windowsGroup.inc:743
 msgid "Group type"
 msgstr "组类型"
 
-#: ../lib/types/group.inc:54 ../lib/modules/posixGroup.inc:345
+#: ../lib/types/group.inc:54 ../lib/modules/posixGroup.inc:381
 #: ../lib/modules/zarafaGroup.inc:113 ../lib/modules/windowsUser.inc:192
 #: ../lib/modules/windowsUser.inc:195 ../lib/modules/windowsUser.inc:374
 #: ../lib/modules/windowsUser.inc:404 ../lib/modules/windowsUser.inc:581
@@ -3952,32 +4046,32 @@ msgstr "组类型"
 msgid "Groups"
 msgstr "组"
 
-#: ../lib/types/gon.inc:53 ../lib/modules/posixAccount.inc:233
-#: ../lib/modules/posixAccount.inc:334 ../lib/modules/posixAccount.inc:395
-#: ../lib/modules/posixAccount.inc:1380 ../lib/modules/posixAccount.inc:1529
-#: ../lib/modules/posixAccount.inc:1637 ../lib/modules/windowsUser.inc:725
+#: ../lib/types/gon.inc:53 ../lib/modules/posixAccount.inc:254
+#: ../lib/modules/posixAccount.inc:357 ../lib/modules/posixAccount.inc:420
+#: ../lib/modules/posixAccount.inc:1495 ../lib/modules/posixAccount.inc:1644
+#: ../lib/modules/posixAccount.inc:1761 ../lib/modules/windowsUser.inc:725
 #: ../lib/modules/groupOfNamesUser.inc:47
 #: ../lib/modules/groupOfNamesUser.inc:49
 #: ../lib/modules/groupOfNamesUser.inc:53
 #: ../lib/modules/groupOfNamesUser.inc:57
 #: ../lib/modules/groupOfNamesUser.inc:64
-#: ../lib/modules/groupOfNamesUser.inc:276
-#: ../lib/modules/groupOfNamesUser.inc:312
+#: ../lib/modules/groupOfNamesUser.inc:304
+#: ../lib/modules/groupOfNamesUser.inc:340
 msgid "Groups of names"
 msgstr "组名"
 
-#: ../lib/modules/dhcp_settings.inc:97
+#: ../lib/modules/dhcp_settings.inc:99
 msgid "H-Node (0x08)"
 msgstr "H-节点 (0x08)"
 
-#: ../templates/config/confmain.php:344 ../lib/modules/selfRegistration.inc:81
-#: ../lib/modules/passwordSelfReset.inc:216
-#: ../lib/modules/passwordSelfReset.inc:232 ../help/help.inc:227
+#: ../templates/config/confmain.php:345 ../lib/modules/selfRegistration.inc:81
+#: ../lib/modules/passwordSelfReset.inc:232
+#: ../lib/modules/passwordSelfReset.inc:248 ../help/help.inc:229
 msgid "HTML format"
 msgstr "HTML格式"
 
-#: ../templates/config/confmain.php:430
-#: ../templates/selfService/adminMain.php:428 ../help/help.inc:120
+#: ../templates/config/confmain.php:431
+#: ../templates/selfService/adminMain.php:428 ../help/help.inc:122
 msgid "HTTP authentication"
 msgstr "HTTP认证"
 
@@ -3987,17 +4081,17 @@ msgstr "HTTP认证"
 msgid "HTTP port"
 msgstr "HTTP端口"
 
-#: ../lib/modules/quota.inc:627 ../lib/modules/systemQuotas.inc:377
+#: ../lib/modules/quota.inc:628 ../lib/modules/systemQuotas.inc:377
 msgid "Hard block"
 msgstr "块的硬性限制"
 
 #: ../lib/modules/quota.inc:112 ../lib/modules/quota.inc:113
-#: ../lib/modules/quota.inc:395 ../lib/modules/quota.inc:500
+#: ../lib/modules/quota.inc:395 ../lib/modules/quota.inc:501
 #: ../lib/modules/systemQuotas.inc:119
 msgid "Hard block limit"
 msgstr "块的硬性限制"
 
-#: ../lib/modules/quota.inc:629 ../lib/modules/systemQuotas.inc:379
+#: ../lib/modules/quota.inc:630 ../lib/modules/systemQuotas.inc:379
 msgid "Hard inode"
 msgstr "节点的硬性限制"
 
@@ -4006,7 +4100,7 @@ msgid "Hard inode (files) limit"
 msgstr "节点的硬性限制"
 
 #: ../lib/modules/quota.inc:134 ../lib/modules/quota.inc:399
-#: ../lib/modules/quota.inc:502 ../lib/modules/systemQuotas.inc:123
+#: ../lib/modules/quota.inc:503 ../lib/modules/systemQuotas.inc:123
 msgid "Hard inode limit"
 msgstr "节点硬性限制"
 
@@ -4018,12 +4112,12 @@ msgstr "有子条目"
 msgid "Hawaii"
 msgstr "夏威夷"
 
-#: ../templates/pdfedit/pdfpage.php:455 ../templates/pdfedit/pdfpage.php:556
-#: ../templates/pdfedit/pdfpage.php:563
+#: ../templates/pdfedit/pdfpage.php:452 ../templates/pdfedit/pdfpage.php:591
+#: ../templates/pdfedit/pdfpage.php:598
 msgid "Headline"
 msgstr "标题"
 
-#: ../lib/modules/heimdalKerberos.inc:223
+#: ../lib/modules/heimdalKerberos.inc:228
 msgid "Heimdal Kerberos password change command"
 msgstr "Heimdal Kerberos密码修改命令"
 
@@ -4047,11 +4141,11 @@ msgstr "这里您可以修改用户设置."
 msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr "您可以上传CSV文件来建立多个帐号"
 
-#: ../lib/modules/dhcp_settings.inc:184
+#: ../lib/modules/dhcp_settings.inc:191
 msgid "Here you can enter a description for this DHCP entry."
 msgstr "可以输入此DHCP条目的描述"
 
-#: ../lib/modules/nisnetgroup.inc:81 ../lib/modules/groupOfNames.inc:65
+#: ../lib/modules/nisnetgroup.inc:81 ../lib/modules/groupOfNames.inc:69
 msgid "Here you can enter a description for this group."
 msgstr "在这输入组的描述."
 
@@ -4059,15 +4153,16 @@ msgstr "在这输入组的描述."
 msgid "Here you can enter a description for this role."
 msgstr "在这输入这个角色的描述."
 
-#: ../lib/modules/zarafaContact.inc:85 ../lib/modules/posixGroup.inc:468
-#: ../lib/modules/zarafaUser.inc:134 ../lib/modules/nisnetgroup.inc:98
+#: ../lib/modules/zarafaContact.inc:85 ../lib/modules/posixGroup.inc:504
+#: ../lib/modules/zarafaUser.inc:134 ../lib/modules/sambaGroupMapping.inc:164
+#: ../lib/modules/nisnetgroup.inc:98 ../lib/modules/groupOfNames.inc:93
 #: ../lib/modules/nisMailAlias.inc:83
 msgid ""
 "Here you can enter a filter value. Only entries which contain the filter "
 "text will be shown."
 msgstr "这里您可以输入过滤条件,只显示符合过滤条件的条目."
 
-#: ../lib/modules/posixAccount.inc:434 ../lib/modules/groupOfNamesUser.inc:58
+#: ../lib/modules/posixAccount.inc:463 ../lib/modules/groupOfNamesUser.inc:58
 msgid ""
 "Here you can enter a list of additional group memberships. The group names "
 "are separated by commas."
@@ -4081,7 +4176,7 @@ msgstr "在这输入这个设备的序列号."
 msgid "Here you can enter additional web sites for the user."
 msgstr "在这可以为用户输入一个附加的web网站."
 
-#: ../help/help.inc:193
+#: ../help/help.inc:195
 msgid ""
 "Here you can enter an alternative mail address for the password. To use the "
 "user's primary email address please leave the field blank."
@@ -4089,7 +4184,7 @@ msgstr ""
 "这儿你可以为密码事宜输入一个其他的邮箱地址。如果使用用户的主要邮箱地址，请留"
 "空。"
 
-#: ../lib/modules/customFields.inc:69
+#: ../lib/modules/customFields.inc:71
 msgid ""
 "Here you can enter one or more object classes (separated by comma). This "
 "will allow you to add/remove the group's attributes including their object "
@@ -4105,7 +4200,7 @@ msgstr "这里可以输入用户的部门."
 msgid "Here you can explicitly enable and disable Zarafa features."
 msgstr "你可以在这里打开或关闭Zarafa功能."
 
-#: ../help/help.inc:191
+#: ../help/help.inc:193
 msgid ""
 "Here you can export PDF structures to other server profiles (overwrite "
 "existing). You may also export a structure to the global templates. In this "
@@ -4115,7 +4210,7 @@ msgstr ""
 "可以导出PDF架构到其他服务器配置文件(覆盖已有).也可以导出一个架构到全局模板,将"
 "这个架构拷贝到所有还不存在这个名字的服务器模板."
 
-#: ../help/help.inc:173
+#: ../help/help.inc:175
 msgid ""
 "Here you can export account profiles to other server profiles (overwrite "
 "existing). You may also export a profile to the global templates. In this "
@@ -4125,25 +4220,25 @@ msgstr ""
 "可以导出账号配置到其他服务器配置文件(覆盖已有).也可以输出一个配置文件到全局模"
 "板,将这个配置文件拷贝到所有还不存在这个名字的服务器模板."
 
-#: ../help/help.inc:189
+#: ../help/help.inc:191
 msgid ""
 "Here you can import PDF structures from other server profiles (overwrite "
 "existing)."
 msgstr "可以导入其他服务器配置文件的PDF架构(覆盖已有)."
 
-#: ../help/help.inc:171
+#: ../help/help.inc:173
 msgid ""
 "Here you can import account profiles from other server profiles (overwrite "
 "existing)."
 msgstr "可以导入其他服务器配置文件的账号配置文件(覆盖已有)."
 
-#: ../help/help.inc:151
+#: ../help/help.inc:153
 msgid ""
 "Here you can input simple filter expressions (e.g. 'value' or 'v*'). The "
 "filter is case-sensitive."
 msgstr "在此输入简单的过滤语法(例如'value'或'v*'),系统在过滤时区分大小写."
 
-#: ../help/help.inc:177
+#: ../help/help.inc:179
 msgid ""
 "Here you can load an account profile to set default settings for your "
 "account. The \"default\" profile is automatically loaded for new accounts."
@@ -4155,12 +4250,12 @@ msgstr ""
 msgid "Here you can manage your account profiles."
 msgstr "您可以管理您的帐号配置文件."
 
-#: ../help/help.inc:179
+#: ../help/help.inc:181
 msgid ""
 "Here you can select a PDF structure and export the account to a PDF file."
 msgstr "您可以选择一个PDF结构,您可以在此選擇一個PDF架構,然後將帳號滙出成PDF檔."
 
-#: ../help/help.inc:145
+#: ../help/help.inc:147
 msgid ""
 "Here you can select where LAM should save its log messages. System logging "
 "will go to Syslog on Unix systems and event log on Windows. You can also "
@@ -4169,12 +4264,12 @@ msgstr ""
 "您在此选择系统日志的存入位置,系统日志记录可以记录在UNIX 系统或WINDOWS 日志系"
 "统,您也可以选择文件"
 
-#: ../help/help.inc:106
+#: ../help/help.inc:108
 msgid ""
 "Here you can select which plugins you want to use for account management."
 msgstr "在此您可以选择一些选择帐号管理的插件"
 
-#: ../help/help.inc:119
+#: ../help/help.inc:121
 msgid ""
 "Here you can set a limit for LDAP searches. This will restrict the number of "
 "results for LDAP searches. Please use this if LAM's LDAP queries produce too "
@@ -4183,7 +4278,7 @@ msgstr ""
 "设置LDAP查询结果条目数量的限制。如果服务器查询负载较重，可以使用这个设置来限"
 "制LDAP查询返回结果的条目数量。"
 
-#: ../help/help.inc:215
+#: ../help/help.inc:217
 msgid ""
 "Here you can specify additional CSS links to change the layout of the self "
 "service pages. This is useful to adapt them to your corporate design. Please "
@@ -4192,7 +4287,7 @@ msgstr ""
 "这里可以指定附加的CSS链接来改变自助服务页的布局.这样做有利于采用公司的统一设"
 "计.每行添加一个CSS连接."
 
-#: ../help/help.inc:149
+#: ../help/help.inc:151
 msgid ""
 "Here you can specify minimum requirements for passwords. The character "
 "classes are: lowercase, uppercase, numeric and symbols."
@@ -4206,7 +4301,7 @@ msgstr ""
 "这里可以指定一个包含在NIS网络组中的分组.此分组中所有用户都会认同为这个网络组"
 "中的成员."
 
-#: ../help/help.inc:123
+#: ../help/help.inc:125
 msgid ""
 "Here you can specify the DN and password of the bind user that will be used "
 "for the LDAP search. This is required if your LDAP server does not allow "
@@ -4241,6 +4336,10 @@ msgstr "这里可以指定遮蔽(shadow)模型。"
 msgid "Here you can test if certain LAM features work on your installation."
 msgstr "测试您安装的系统功能是否正确."
 
+#: ../lib/modules/customFields.inc:147
+msgid "Here you can upload a new file."
+msgstr "您可以上传一个新的文件. "
+
 #: ../templates/config/conftypes.php:283
 #: ../lib/types/zarafaAddressListType.inc:95
 #: ../lib/types/zarafaDynamicGroupType.inc:96
@@ -4261,11 +4360,11 @@ msgstr "测试您安装的系统功能是否正确."
 #: ../lib/modules/zarafaAddressList.inc:346 ../lib/modules/zarafaUser.inc:73
 #: ../lib/modules/zarafaUser.inc:331 ../lib/modules/zarafaUser.inc:380
 #: ../lib/modules/zarafaUser.inc:408 ../lib/modules/zarafaUser.inc:609
-#: ../lib/modules/zarafaUser.inc:1340 ../help/help.inc:156
+#: ../lib/modules/zarafaUser.inc:1340 ../help/help.inc:158
 msgid "Hidden"
 msgstr "隐藏"
 
-#: ../help/help.inc:157
+#: ../help/help.inc:159
 msgid ""
 "Hidden account types will not show up in LAM. This is useful if you want to "
 "display e.g. only groups but still need to manage their members."
@@ -4277,18 +4376,19 @@ msgstr ""
 #: ../lib/modules/asteriskAccount.inc:245 ../lib/modules/qmailUser.inc:95
 #: ../lib/modules/qmailUser.inc:188 ../lib/modules/zarafaGroup.inc:102
 #: ../lib/modules/zarafaGroup.inc:128 ../lib/modules/sambaSamAccount.inc:386
-#: ../lib/modules/sambaSamAccount.inc:576 ../lib/modules/posixAccount.inc:224
-#: ../lib/modules/posixAccount.inc:405 ../lib/modules/zarafaUser.inc:125
+#: ../lib/modules/sambaSamAccount.inc:576 ../lib/modules/posixAccount.inc:245
+#: ../lib/modules/posixAccount.inc:434 ../lib/modules/zarafaUser.inc:125
 #: ../lib/modules/zarafaUser.inc:182 ../lib/modules/inetOrgPerson.inc:304
 #: ../lib/modules/inetOrgPerson.inc:876 ../lib/modules/freeRadius.inc:105
 #: ../lib/modules/freeRadius.inc:111 ../lib/modules/zarafaServer.inc:81
 #: ../lib/modules/zarafaServer.inc:152 ../lib/modules/qmailGroup.inc:61
 #: ../lib/modules/qmailGroup.inc:112 ../lib/modules/windowsGroup.inc:102
-#: ../lib/modules/windowsGroup.inc:149
+#: ../lib/modules/windowsGroup.inc:153 ../lib/modules/groupOfNames.inc:60
+#: ../lib/modules/groupOfNames.inc:158
 msgid "Hidden options"
 msgstr "隐藏的选项"
 
-#: ../templates/config/confmain.php:357
+#: ../templates/config/confmain.php:358
 msgid "Hidden tools"
 msgstr "隐藏的工具"
 
@@ -4329,7 +4429,7 @@ msgid ""
 "above)"
 msgstr "提示:必须选择精确的结构化对象类(上述加粗项)"
 
-#: ../lib/modules/posixAccount.inc:495 ../lib/modules/windowsUser.inc:193
+#: ../lib/modules/posixAccount.inc:524 ../lib/modules/windowsUser.inc:193
 #: ../lib/modules/groupOfNamesUser.inc:54
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr "按住CTRL键可以多选组."
@@ -4337,18 +4437,18 @@ msgstr "按住CTRL键可以多选组."
 #: ../lib/types/user.inc:98 ../lib/modules/sambaSamAccount.inc:223
 #: ../lib/modules/sambaSamAccount.inc:344
 #: ../lib/modules/sambaSamAccount.inc:1476
-#: ../lib/modules/sambaSamAccount.inc:1891 ../lib/modules/posixAccount.inc:82
-#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:85
-#: ../lib/modules/posixAccount.inc:288 ../lib/modules/posixAccount.inc:386
-#: ../lib/modules/posixAccount.inc:437 ../lib/modules/posixAccount.inc:441
-#: ../lib/modules/posixAccount.inc:445 ../lib/modules/posixAccount.inc:478
-#: ../lib/modules/posixAccount.inc:1015 ../lib/modules/posixAccount.inc:1258
-#: ../lib/modules/posixAccount.inc:1436 ../lib/modules/posixAccount.inc:1536
-#: ../lib/modules/posixAccount.inc:1626
+#: ../lib/modules/sambaSamAccount.inc:1891 ../lib/modules/posixAccount.inc:100
+#: ../lib/modules/posixAccount.inc:101 ../lib/modules/posixAccount.inc:103
+#: ../lib/modules/posixAccount.inc:303 ../lib/modules/posixAccount.inc:409
+#: ../lib/modules/posixAccount.inc:466 ../lib/modules/posixAccount.inc:470
+#: ../lib/modules/posixAccount.inc:474 ../lib/modules/posixAccount.inc:507
+#: ../lib/modules/posixAccount.inc:1117 ../lib/modules/posixAccount.inc:1361
+#: ../lib/modules/posixAccount.inc:1551 ../lib/modules/posixAccount.inc:1651
+#: ../lib/modules/posixAccount.inc:1750
 msgid "Home directory"
 msgstr "个人目录"
 
-#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/posixAccount.inc:103
 #, php-format
 msgid ""
 "Home directory changed. To keep home directory you have to run the following "
@@ -4392,11 +4492,11 @@ msgstr "用户的宿主服务器."
 #: ../lib/modules/inetOrgPerson.inc:330 ../lib/modules/inetOrgPerson.inc:494
 #: ../lib/modules/inetOrgPerson.inc:644 ../lib/modules/inetOrgPerson.inc:820
 #: ../lib/modules/inetOrgPerson.inc:824 ../lib/modules/inetOrgPerson.inc:1740
-#: ../lib/modules/inetOrgPerson.inc:2367 ../lib/modules/inetOrgPerson.inc:2978
+#: ../lib/modules/inetOrgPerson.inc:2369 ../lib/modules/inetOrgPerson.inc:2980
 msgid "Home telephone number"
 msgstr "宅电"
 
-#: ../lib/modules/posixAccount.inc:82 ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:100 ../lib/modules/posixAccount.inc:102
 msgid "Homedirectory contains invalid characters."
 msgstr "个人目录包含非法字符"
 
@@ -4423,8 +4523,8 @@ msgstr "主机总计: %s"
 msgid "Host description"
 msgstr "主机描述"
 
-#: ../lib/modules/account.inc:89 ../lib/modules/posixAccount.inc:509
-#: ../lib/modules/posixAccount.inc:517
+#: ../lib/modules/account.inc:89 ../lib/modules/posixAccount.inc:538
+#: ../lib/modules/posixAccount.inc:546
 msgid "Host description. If left empty host name will be used."
 msgstr "主机描述.如果留空会使用主机名."
 
@@ -4438,27 +4538,27 @@ msgstr "主机列表"
 #: ../lib/modules/windowsHost.inc:67 ../lib/modules/windowsHost.inc:87
 #: ../lib/modules/windowsHost.inc:112 ../lib/modules/windowsHost.inc:124
 #: ../lib/modules/windowsHost.inc:135 ../lib/modules/windowsHost.inc:287
-#: ../lib/modules/posixAccount.inc:97 ../lib/modules/posixAccount.inc:98
-#: ../lib/modules/posixAccount.inc:100 ../lib/modules/posixAccount.inc:345
-#: ../lib/modules/posixAccount.inc:376 ../lib/modules/posixAccount.inc:504
-#: ../lib/modules/posixAccount.inc:1222 ../lib/modules/posixAccount.inc:1616
+#: ../lib/modules/posixAccount.inc:115 ../lib/modules/posixAccount.inc:116
+#: ../lib/modules/posixAccount.inc:118 ../lib/modules/posixAccount.inc:368
+#: ../lib/modules/posixAccount.inc:399 ../lib/modules/posixAccount.inc:533
+#: ../lib/modules/posixAccount.inc:1322 ../lib/modules/posixAccount.inc:1740
 #: ../lib/modules/nisnetgroup.inc:146 ../lib/modules/nisnetgroup.inc:474
 msgid "Host name"
 msgstr "主机名"
 
-#: ../lib/modules/posixAccount.inc:104
+#: ../lib/modules/posixAccount.inc:122
 msgid "Host name already exists!"
 msgstr "主机名已经存在!"
 
 #: ../lib/modules/windowsHost.inc:124 ../lib/modules/windowsHost.inc:125
-#: ../lib/modules/posixAccount.inc:98 ../lib/modules/posixAccount.inc:102
+#: ../lib/modules/posixAccount.inc:116 ../lib/modules/posixAccount.inc:120
 #: ../lib/modules/nisnetgroup.inc:146
 msgid ""
 "Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
 msgstr "主机名包含非法字符,合法字符包括 a-z, A-Z, 0-9 和 .-_"
 
-#: ../lib/modules/posixAccount.inc:100
+#: ../lib/modules/posixAccount.inc:118
 msgid "Host name in use. Selected next free host name."
 msgstr "主机名已被使用, 请选择其它的主机名."
 
@@ -4466,7 +4566,7 @@ msgstr "主机名已被使用, 请选择其它的主机名."
 msgid "Host name must end with $!"
 msgstr "主机名必须使用$结尾!"
 
-#: ../lib/modules/account.inc:85 ../lib/modules/posixAccount.inc:505
+#: ../lib/modules/account.inc:85 ../lib/modules/posixAccount.inc:534
 msgid ""
 "Host name of the host which should be created. Valid characters are: a-z,A-"
 "Z,0-9, .-_$. Host names are always ending with $. If last character is not $ "
@@ -4476,9 +4576,9 @@ msgstr ""
 "将要建立的主机名.合法字符为:a-z,A-Z,0-9,_$..主机名总是以$结尾.如果最后一个字"
 "符不是$,会自动填加.如果主机名已经存在,会在主机名后自动增加下一个可用的数字."
 
-#: ../lib/types/host.inc:53 ../lib/modules/posixAccount.inc:77
-#: ../lib/modules/posixAccount.inc:78 ../lib/modules/posixAccount.inc:80
-#: ../lib/modules/posixAccount.inc:199 ../lib/modules/sudoRole.inc:67
+#: ../lib/types/host.inc:53 ../lib/modules/posixAccount.inc:95
+#: ../lib/modules/posixAccount.inc:96 ../lib/modules/posixAccount.inc:98
+#: ../lib/modules/posixAccount.inc:220 ../lib/modules/sudoRole.inc:67
 #: ../lib/modules/sudoRole.inc:92 ../lib/modules/sudoRole.inc:140
 #: ../lib/modules/sudoRole.inc:174 ../lib/modules/sudoRole.inc:183
 #: ../lib/modules/sudoRole.inc:291 ../lib/modules/sudoRole.inc:685
@@ -4491,16 +4591,16 @@ msgstr "主机"
 msgid "I am out of office."
 msgstr "我辞职了."
 
-#: ../lib/modules/posixGroup.inc:533 ../lib/modules/posixAccount.inc:88
-#: ../lib/modules/posixAccount.inc:985
+#: ../lib/modules/posixGroup.inc:573 ../lib/modules/posixAccount.inc:106
+#: ../lib/modules/posixAccount.inc:1087
 msgid "ID is already in use"
 msgstr "ID已经被使用"
 
-#: ../lib/modules/posixGroup.inc:531 ../lib/modules/posixGroup.inc:532
-#: ../lib/modules/posixGroup.inc:533 ../lib/modules/posixGroup.inc:632
-#: ../lib/modules/posixAccount.inc:86 ../lib/modules/posixAccount.inc:87
-#: ../lib/modules/posixAccount.inc:88 ../lib/modules/posixAccount.inc:976
-#: ../lib/modules/posixAccount.inc:981 ../lib/modules/posixAccount.inc:985
+#: ../lib/modules/posixGroup.inc:571 ../lib/modules/posixGroup.inc:572
+#: ../lib/modules/posixGroup.inc:573 ../lib/modules/posixGroup.inc:695
+#: ../lib/modules/posixAccount.inc:104 ../lib/modules/posixAccount.inc:105
+#: ../lib/modules/posixAccount.inc:106 ../lib/modules/posixAccount.inc:1078
+#: ../lib/modules/posixAccount.inc:1083 ../lib/modules/posixAccount.inc:1087
 msgid "ID-Number"
 msgstr "ID号"
 
@@ -4527,8 +4627,8 @@ msgstr "输入IMAP 密码"
 #: ../lib/modules/asteriskAccount.inc:1217 ../lib/modules/freeRadius.inc:77
 #: ../lib/modules/freeRadius.inc:115 ../lib/modules/freeRadius.inc:186
 #: ../lib/modules/freeRadius.inc:218 ../lib/modules/freeRadius.inc:305
-#: ../lib/modules/freeRadius.inc:616 ../lib/modules/fixed_ip.inc:94
-#: ../lib/modules/fixed_ip.inc:343 ../lib/modules/fixed_ip.inc:523
+#: ../lib/modules/freeRadius.inc:616 ../lib/modules/fixed_ip.inc:96
+#: ../lib/modules/fixed_ip.inc:362 ../lib/modules/fixed_ip.inc:560
 msgid "IP address"
 msgstr "IP地址"
 
@@ -4551,12 +4651,12 @@ msgstr "注册服务器的IP地址或域名"
 msgid "IP addresses"
 msgstr "IP地址"
 
-#: ../lib/modules/fixed_ip.inc:98
+#: ../lib/modules/fixed_ip.inc:105
 msgid "IP list"
 msgstr "IP列表"
 
-#: ../lib/modules/passwordSelfReset.inc:132
-#: ../lib/modules/passwordSelfReset.inc:183
+#: ../lib/modules/passwordSelfReset.inc:133
+#: ../lib/modules/passwordSelfReset.inc:197
 msgid "Identification method"
 msgstr "标识方法"
 
@@ -4593,7 +4693,7 @@ msgstr "如果您选中此项，用户在下次登录时必须修改密码。"
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "如果选中将使用UNIX密码作为SAMBA密码."
 
-#: ../lib/modules/posixAccount.inc:487
+#: ../lib/modules/posixAccount.inc:516
 msgid ""
 "If checked account will be deactivated by putting a \"!\" before the "
 "encrypted password."
@@ -4632,19 +4732,19 @@ msgid ""
 "of failed login attempts."
 msgstr "帐号被锁定(设置L标志).多次登录失败后帐号会被锁定.在此可以解除锁定."
 
-#: ../help/help.inc:159
+#: ../help/help.inc:161
 msgid ""
 "If checked then the user will not be able to create new entries of this "
 "account type."
 msgstr "如果选中，用户不能建立新的帐户条目。"
 
-#: ../help/help.inc:161
+#: ../help/help.inc:163
 msgid ""
 "If checked then the user will not be able to delete entries of this account "
 "type."
 msgstr "如果选中，用户不能删除账号类型这个条目。"
 
-#: ../lib/modules/posixGroup.inc:420
+#: ../lib/modules/posixGroup.inc:456
 msgid ""
 "If empty GID number will be generated automaticly depending on your "
 "configuration settings."
@@ -4654,7 +4754,7 @@ msgstr "如果为空,视配置而定,GID号自动产生."
 msgid "If empty GID number will be generated automaticly."
 msgstr "如果为空,GID号会自动生成."
 
-#: ../lib/modules/qmailUser.inc:225 ../lib/modules/posixAccount.inc:426
+#: ../lib/modules/qmailUser.inc:225 ../lib/modules/posixAccount.inc:455
 msgid "If empty UID number will be generated automaticly."
 msgstr "如果为空,UID号会自动生成."
 
@@ -4664,7 +4764,7 @@ msgid ""
 "specified number of consecutive failed login attempts."
 msgstr "此项如果设置，用户在连续特定数量的登录失败后，将不允许再登录。"
 
-#: ../help/help.inc:121
+#: ../help/help.inc:123
 msgid ""
 "If enabled then LAM will use user and password that is provided by the web "
 "server via HTTP authentication."
@@ -4712,7 +4812,7 @@ msgid ""
 "list."
 msgstr "此处如果设置为真,所有进来的邮件都需要来自于列表中的用户"
 
-#: ../lib/modules/customFields.inc:109
+#: ../lib/modules/customFields.inc:111
 msgid ""
 "If the LDAP attribute has no value then the checkbox is set to this value."
 msgstr "如果LDAP属性值为空,则此复选框被设为此值."
@@ -4723,6 +4823,13 @@ msgid ""
 "to send email until the size of the mailbox is reduced."
 msgstr "如果邮箱达到软限额极限,用户将不能发送邮件,除非邮箱占用空间减小."
 
+#: ../lib/modules/passwordSelfReset.inc:138
+msgid ""
+"If the user has a Samba 3 extension then the Samba password will also be "
+"set. Otherwise, no action is taken."
+msgstr ""
+"如果用户有一个Samba 3 扩展模块, 会设置Samba的密码. 如果没有,就不会有任何动作."
+
 #: ../lib/modules/windowsUser.inc:124 ../lib/modules/windowsUser.inc:128
 msgid "If the user has multiple telephone numbers then please enter it here."
 msgstr "如果用户有多个电话号码，可以在这儿输入."
@@ -4754,7 +4861,7 @@ msgstr ""
 "如果为Zarafa使用了反向代理,则在此指定服务器的URL.(比如:\"https://zproxy."
 "example.com:237/z1\")."
 
-#: ../lib/modules/passwordSelfReset.inc:129
+#: ../lib/modules/passwordSelfReset.inc:130
 msgid ""
 "If you select this option then the user is only authenticated by his email "
 "address. LAM Pro will not ask for the answer to the security question. "
@@ -4794,7 +4901,7 @@ msgstr "如果您选中此项，用户不能请求服务票据."
 
 #: ../lib/modules/mitKerberos.inc:177 ../lib/modules/sambaSamAccount.inc:285
 #: ../lib/modules/windowsUser.inc:190 ../lib/modules/heimdalKerberos.inc:121
-#: ../help/help.inc:185
+#: ../help/help.inc:187
 msgid ""
 "If you set this option then the user has to change his password at the next "
 "login."
@@ -4823,22 +4930,22 @@ msgid ""
 msgstr ""
 "如果使用\"inetOrgPerson\" 对象类,并且没有提供 \"cn\"属性,LAM会把它设为用户名."
 
-#: ../help/help.inc:100
+#: ../help/help.inc:102
 msgid ""
 "If you want to change the current preferences password, please enter it here."
 msgstr "在此设置当前管理密码."
 
-#: ../help/help.inc:135
+#: ../help/help.inc:137
 msgid ""
 "If you want to change your master configuration password, please enter it "
 "here."
 msgstr "在此变更管理配置密码."
 
-#: ../lib/modules/sambaGroupMapping.inc:357
+#: ../lib/modules/sambaGroupMapping.inc:144
 msgid "If you want to use a well known RID you can select a well known group."
 msgstr "如果想用知名的RID,需要选择知名的组。 "
 
-#: ../help/help.inc:110
+#: ../help/help.inc:112
 msgid ""
 "If your server runs on another port then add a comma and the port number "
 "after the server."
@@ -4855,12 +4962,16 @@ msgid "Import"
 msgstr "导入"
 
 #: ../templates/pdfedit/pdfmain.php:200 ../templates/pdfedit/pdfmain.php:201
-#: ../help/help.inc:188
+#: ../help/help.inc:190
 msgid "Import PDF structures"
 msgstr "导入PDF架构"
 
+#: ../templates/config/mainmanage.php:298
+msgid "Import from server"
+msgstr "从服务器导入"
+
 #: ../templates/profedit/profilemain.php:201
-#: ../templates/profedit/profilemain.php:202 ../help/help.inc:170
+#: ../templates/profedit/profilemain.php:202 ../help/help.inc:172
 msgid "Import profiles"
 msgstr "导出配置文件"
 
@@ -4869,6 +4980,18 @@ msgstr "导出配置文件"
 msgid "Import successful"
 msgstr "导入成功!"
 
+#: ../templates/config/mainmanage.php:155
+msgid "Imported certificate from server."
+msgstr "从服务器导入证书"
+
+#: ../templates/config/mainmanage.php:300
+msgid "Imports the certificate directly from your LDAP server."
+msgstr "从LDAP服务器直接导入证书"
+
+#: ../lib/modules/fixed_ip.inc:101
+msgid "Inactive hosts will not be able to get an address from the DHCP server."
+msgstr "非激活的主机不会从DHCP服务器获取到地址."
+
 #: ../templates/3rdParty/pla/htdocs/export_form.php:87
 msgid "Include system attributes"
 msgstr "包括系统属性"
@@ -4905,7 +5028,7 @@ msgstr "初始化程序"
 #: ../lib/modules/inetOrgPerson.inc:155 ../lib/modules/inetOrgPerson.inc:356
 #: ../lib/modules/inetOrgPerson.inc:390 ../lib/modules/inetOrgPerson.inc:686
 #: ../lib/modules/inetOrgPerson.inc:904 ../lib/modules/inetOrgPerson.inc:1424
-#: ../lib/modules/inetOrgPerson.inc:2383 ../lib/modules/inetOrgPerson.inc:3170
+#: ../lib/modules/inetOrgPerson.inc:2385 ../lib/modules/inetOrgPerson.inc:3172
 msgid "Initials"
 msgstr "初始化"
 
@@ -4969,7 +5092,7 @@ msgstr "在登录脚本中插入用户名或组名."
 msgid "Inserted user or group name in profile path."
 msgstr "在配置路径中插入用户名或组名."
 
-#: ../lib/modules/fixed_ip.inc:380
+#: ../lib/modules/fixed_ip.inc:403
 msgid "Invalid MAC address."
 msgstr "非法的MAC地址"
 
@@ -4993,18 +5116,29 @@ msgstr "不符合附加属性规范的格式"
 msgid "Invalid password for IMAP admin or other problem occured."
 msgstr "非法的IMAP管理员密码或者发生了其它问题。"
 
-#: ../lib/modules/inetOrgPerson.inc:3696
+#: ../lib/modules/ldapPublicKey.inc:576 ../lib/modules/inetOrgPerson.inc:3698
+#: ../lib/modules/customFields.inc:1303
 msgid "Invalid request"
 msgstr "无效请求"
 
-#: ../lib/modules/kolabUser.inc:98 ../lib/modules/kolabUser.inc:105
-#: ../lib/modules/kolabUser.inc:140 ../lib/modules/kolabUser.inc:166
-#: ../lib/modules/kolabUser.inc:240 ../lib/modules/kolabUser.inc:635
-#: ../lib/modules/kolabUser.inc:757
+#: ../templates/config/mainmanage.php:164
+msgid "Invalid server name. Please enter \"server\" or \"server:port\"."
+msgstr "不合法的服务器名. 请输入 \"服务器名\" or \"服务器名:端口\"."
+
+#: ../lib/modules/passwordSelfReset.inc:781
+#: ../lib/modules/passwordSelfReset.inc:1000
+#, php-format
+msgid "Invalid value in field \"%s\"."
+msgstr "在\"%s\"域有非法字符."
+
+#: ../lib/modules/kolabUser.inc:99 ../lib/modules/kolabUser.inc:106
+#: ../lib/modules/kolabUser.inc:159 ../lib/modules/kolabUser.inc:197
+#: ../lib/modules/kolabUser.inc:275 ../lib/modules/kolabUser.inc:712
+#: ../lib/modules/kolabUser.inc:836
 msgid "Invitation policy"
 msgstr "邀请原则"
 
-#: ../lib/modules/kolabUser.inc:109
+#: ../lib/modules/kolabUser.inc:110
 msgid "Invitation policy list"
 msgstr "邀请原则列表"
 
@@ -5016,7 +5150,7 @@ msgstr "伊斯兰堡,卡拉奇"
 msgid "It is not possible to delete all ranges."
 msgstr "不能删除所有范围"
 
-#: ../lib/modules/posixGroup.inc:531 ../lib/modules/posixAccount.inc:87
+#: ../lib/modules/posixGroup.inc:571 ../lib/modules/posixAccount.inc:105
 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 "
@@ -5029,8 +5163,8 @@ msgstr ""
 #: ../lib/modules/inetOrgPerson.inc:209 ../lib/modules/inetOrgPerson.inc:338
 #: ../lib/modules/inetOrgPerson.inc:406 ../lib/modules/inetOrgPerson.inc:659
 #: ../lib/modules/inetOrgPerson.inc:705 ../lib/modules/inetOrgPerson.inc:709
-#: ../lib/modules/inetOrgPerson.inc:1883 ../lib/modules/inetOrgPerson.inc:2357
-#: ../lib/modules/inetOrgPerson.inc:3181
+#: ../lib/modules/inetOrgPerson.inc:1883 ../lib/modules/inetOrgPerson.inc:2359
+#: ../lib/modules/inetOrgPerson.inc:3183
 msgid "Job title"
 msgstr "头衔"
 
@@ -5071,11 +5205,11 @@ msgstr "跳转到末页"
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: ../lib/modules/kolabUser.inc:73
+#: ../lib/modules/kolabGroup.inc:67 ../lib/modules/kolabUser.inc:73
 msgid "Kolab"
 msgstr "Kolab"
 
-#: ../lib/modules/posixGroup.inc:456
+#: ../lib/modules/posixGroup.inc:492
 msgid ""
 "LAM checks if the entered group name and GID are unique. Here you can enter "
 "the LDAP suffix that is used to search for duplicates. By default the "
@@ -5087,7 +5221,7 @@ msgstr ""
 "会使用账号类型的后缀。如果你使用了多个不同OU的服务器配置而且需要组名或GID唯"
 "一，在此处修改。"
 
-#: ../lib/modules/posixAccount.inc:450
+#: ../lib/modules/posixAccount.inc:479
 msgid ""
 "LAM checks if the entered user name and UID are unique. Here you can enter "
 "the LDAP suffix that is used to search for duplicates. By default the "
@@ -5099,7 +5233,7 @@ msgstr ""
 "省会使用账号类型的后缀。如果你需要使用多个不同OU的服务器配置而且需要用户名或"
 "UID唯一，在此处修改。"
 
-#: ../templates/login.php:258 ../templates/config/index.php:85
+#: ../templates/login.php:268 ../templates/config/index.php:85
 msgid "LAM configuration"
 msgstr "LAM 配置"
 
@@ -5107,8 +5241,8 @@ msgstr "LAM 配置"
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr "您的输入检查完毕,即将建立帐号"
 
-#: ../lib/modules/posixGroup.inc:444 ../lib/modules/posixAccount.inc:422
-#: ../lib/modules/inetOrgPerson.inc:881 ../lib/modules/customFields.inc:121
+#: ../lib/modules/posixGroup.inc:480 ../lib/modules/posixAccount.inc:451
+#: ../lib/modules/inetOrgPerson.inc:881 ../lib/modules/customFields.inc:123
 msgid ""
 "LAM supports CRYPT, CRYPT-SHA512, SHA, SSHA, MD5 and SMD5 to generate the "
 "hash value of passwords. SSHA and CRYPT are the most common but CRYPT does "
@@ -5132,7 +5266,7 @@ msgstr "LAM用户密码"
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAM无法建立%s帐号,LDAP发生错误."
 
-#: ../lib/modules/sambaGroupMapping.inc:435
+#: ../lib/modules/sambaGroupMapping.inc:590
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "系统找不到这个Samba域!"
 
@@ -5140,17 +5274,17 @@ msgstr "系统找不到这个Samba域!"
 msgid "LAM was unable to find a domain with this name!"
 msgstr "LAM找不到这个域!"
 
-#: ../lib/modules/posixAccount.inc:105 ../lib/modules/windowsUser.inc:1088
+#: ../lib/modules/posixAccount.inc:123 ../lib/modules/windowsUser.inc:1088
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAM找不到这个组"
 
-#: ../lib/modules/posixAccount.inc:2098 ../lib/modules/posixAccount.inc:2159
-#: ../lib/modules/windowsUser.inc:1165 ../lib/modules/groupOfNamesUser.inc:406
+#: ../lib/modules/posixAccount.inc:2226 ../lib/modules/posixAccount.inc:2287
+#: ../lib/modules/windowsUser.inc:1165 ../lib/modules/groupOfNamesUser.inc:434
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAM无法修改 %s组成员"
 
-#: ../lib/modules/posixGroup.inc:460 ../lib/modules/posixAccount.inc:458
+#: ../lib/modules/posixGroup.inc:496 ../lib/modules/posixAccount.inc:487
 msgid ""
 "LAM will automatically suggest UID/GID numbers. You can either use a fixed "
 "range of numbers or an LDAP entry with object class \"sambaUnixIdPool\"."
@@ -5158,11 +5292,11 @@ msgstr ""
 "LAM将自动提供UID/GID数字.  也可以指定一个固定的范围或在LDAP中指定目标类 "
 "\"sambaUnixIdPool\"."
 
-#: ../help/help.inc:197
+#: ../help/help.inc:199
 msgid "LAM will search for accounts in this part of the LDAP tree."
 msgstr "LAM将在这部分LDAP树搜索帐号."
 
-#: ../lib/modules/posixAccount.inc:401
+#: ../lib/modules/posixAccount.inc:430
 msgid ""
 "LAM will suggest a user name based on e.g. first and last name. Here you can "
 "specify the suggestion. %sn% will be replaced by the last name. @givenname@ "
@@ -5172,7 +5306,7 @@ msgstr ""
 "LAM将基于姓名建议一个用户名.您可以指定这个建议值, %sn%被姓来替换  @givenname@"
 "被名字的第一个字符来替换.仅一些Person 的tab属性可能被使用。"
 
-#: ../help/help.inc:199
+#: ../help/help.inc:201
 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 "
@@ -5211,11 +5345,11 @@ msgstr "这个列表中的用户的LDAP条目"
 msgid "LDAP entries that moderate this list (e.g. approve mails)."
 msgstr "主持这个列表(比如批准邮件)的LDAP条目"
 
-#: ../templates/login.php:631
+#: ../templates/login.php:645
 msgid "LDAP error, server says:"
 msgstr "LDAP错误,服务器错误消息:"
 
-#: ../templates/config/confmain.php:420
+#: ../templates/config/confmain.php:421
 msgid "LDAP filter"
 msgstr "LDAP过滤条件"
 
@@ -5247,34 +5381,34 @@ msgstr "LDAP 密码"
 msgid "LDAP said"
 msgstr "LDAP说"
 
-#: ../templates/config/confmain.php:397 ../help/help.inc:116
+#: ../templates/config/confmain.php:398 ../help/help.inc:118
 msgid "LDAP search"
 msgstr "LDAP搜索"
 
-#: ../templates/selfService/adminMain.php:426 ../help/help.inc:200
+#: ../templates/selfService/adminMain.php:426 ../help/help.inc:202
 msgid "LDAP search attribute"
 msgstr "LDAP搜索属性"
 
-#: ../lib/account.inc:705
+#: ../lib/account.inc:768
 msgid "LDAP search failed! Please check your preferences."
 msgstr "LDAP搜索失败，请检查配置。"
 
-#: ../templates/config/confmain.php:253 ../help/help.inc:118
+#: ../templates/config/confmain.php:253 ../help/help.inc:120
 msgid "LDAP search limit"
 msgstr "LDAP搜索限制"
 
-#: ../templates/login.php:449
+#: ../templates/login.php:463
 msgid "LDAP server"
 msgstr "LDAP服务器"
 
-#: ../lib/account.inc:696
+#: ../lib/account.inc:759
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "超过LDAP限制的大小,无法显示所有条目."
 
-#: ../templates/config/confmain.php:416 ../templates/config/conftypes.php:252
+#: ../templates/config/confmain.php:417 ../templates/config/conftypes.php:252
 #: ../templates/selfService/adminMain.php:415
 #: ../templates/profedit/profilepage.php:202 ../help/help.inc:71
-#: ../help/help.inc:196
+#: ../help/help.inc:198
 msgid "LDAP suffix"
 msgstr "LDAP后缀"
 
@@ -5286,7 +5420,7 @@ msgstr "LDAP上传中,请稍等..."
 msgid "LDAP user"
 msgstr "LDAP用户"
 
-#: ../help/help.inc:198
+#: ../help/help.inc:200
 msgid "LDAP user and password"
 msgstr "LDAP用户名和密码"
 
@@ -5307,8 +5441,8 @@ msgstr "LDIF导入"
 msgid "LDIF import only supports version 1"
 msgstr "LDIF导入功能只支持版本1"
 
-#: ../lib/modules/customFields.inc:76 ../lib/modules/customFields.inc:870
-#: ../lib/modules/customFields.inc:1288 ../lib/modules/customFields.inc:2190
+#: ../lib/modules/customFields.inc:78 ../lib/modules/customFields.inc:973
+#: ../lib/modules/customFields.inc:1471 ../lib/modules/customFields.inc:2450
 msgid "Label"
 msgstr "标签"
 
@@ -5322,7 +5456,7 @@ msgstr "lamdaemon 路径没有以 \".pl\"结尾,你需要输入这个脚本的
 msgid "Lamdaemon server and path"
 msgstr "Lamdaemon 服务器和路径"
 
-#: ../templates/config/confmain.php:322
+#: ../templates/config/confmain.php:323
 msgid "Lamdaemon settings"
 msgstr "Lamdaemon设置"
 
@@ -5355,15 +5489,15 @@ msgstr "Lamdaemon: 检查 NSS LDAP"
 msgid "Lamdaemon: read quotas"
 msgstr "Lamdaemon: 读取配额"
 
-#: ../templates/login.php:387
+#: ../templates/login.php:401
 msgid "Language"
 msgstr "语言"
 
-#: ../templates/config/confmain.php:536
+#: ../templates/config/confmain.php:540
 msgid "Language is not defined!"
 msgstr "尚未定义语言"
 
-#: ../templates/config/confmain.php:292
+#: ../templates/config/confmain.php:293
 msgid "Language settings"
 msgstr "语言设定"
 
@@ -5379,8 +5513,8 @@ msgstr "上次登录"
 #: ../lib/modules/windowsUser.inc:1227 ../lib/modules/inetOrgPerson.inc:66
 #: ../lib/modules/inetOrgPerson.inc:140 ../lib/modules/inetOrgPerson.inc:381
 #: ../lib/modules/inetOrgPerson.inc:608 ../lib/modules/inetOrgPerson.inc:717
-#: ../lib/modules/inetOrgPerson.inc:1417 ../lib/modules/inetOrgPerson.inc:2359
-#: ../lib/modules/inetOrgPerson.inc:2934
+#: ../lib/modules/inetOrgPerson.inc:1417 ../lib/modules/inetOrgPerson.inc:2361
+#: ../lib/modules/inetOrgPerson.inc:2936
 msgid "Last name"
 msgstr "姓"
 
@@ -5410,9 +5544,9 @@ msgstr "最后密码变更"
 msgid "Last qualify milliseconds"
 msgstr "最后的限定毫秒"
 
-#: ../lib/modules/dhcp_settings.inc:139 ../lib/modules/dhcp_settings.inc:191
-#: ../lib/modules/dhcp_settings.inc:205 ../lib/modules/dhcp_settings.inc:234
-#: ../lib/modules/dhcp_settings.inc:539 ../lib/modules/dhcp_settings.inc:631
+#: ../lib/modules/dhcp_settings.inc:146 ../lib/modules/dhcp_settings.inc:202
+#: ../lib/modules/dhcp_settings.inc:217 ../lib/modules/dhcp_settings.inc:249
+#: ../lib/modules/dhcp_settings.inc:562 ../lib/modules/dhcp_settings.inc:668
 msgid "Lease time"
 msgstr "释放时间"
 
@@ -5426,8 +5560,8 @@ msgstr "行结尾"
 
 #: ../lib/modules/selfRegistration.inc:51
 #: ../lib/modules/selfRegistration.inc:96
-#: ../lib/modules/passwordSelfReset.inc:88
-#: ../lib/modules/passwordSelfReset.inc:193
+#: ../lib/modules/passwordSelfReset.inc:89
+#: ../lib/modules/passwordSelfReset.inc:207
 msgid "Link text"
 msgstr "链接文本"
 
@@ -5435,7 +5569,7 @@ msgstr "链接文本"
 msgid "Link to self service login page for your users"
 msgstr "对用户自助服务登录界面的链接."
 
-#: ../templates/config/conftypes.php:263 ../help/help.inc:83
+#: ../templates/config/conftypes.php:263 ../help/help.inc:85
 msgid "List attributes"
 msgstr "属性列表"
 
@@ -5463,7 +5597,7 @@ msgid ""
 "workstation."
 msgstr "允许用户登录的Samba工作站,留空表示所有工作站."
 
-#: ../templates/config/confmain.php:530
+#: ../templates/config/confmain.php:534
 msgid "List of admin users is empty or invalid!"
 msgstr "管理员清单为空或非法."
 
@@ -5480,7 +5614,7 @@ msgstr "不合法编码列表"
 msgid "List of entries to be deleted:"
 msgstr "将被删除的条目列表:"
 
-#: ../templates/config/confmain.php:412
+#: ../templates/config/confmain.php:413
 msgid "List of valid users"
 msgstr "合法用户列表"
 
@@ -5488,7 +5622,7 @@ msgstr "合法用户列表"
 msgid "Listeners"
 msgstr "监听"
 
-#: ../lib/modules.inc:1211 ../help/help.inc:176
+#: ../lib/modules.inc:1211 ../help/help.inc:178
 msgid "Load profile"
 msgstr "调入配置文件"
 
@@ -5529,10 +5663,17 @@ msgstr "本机邮件"
 msgid "Local address list"
 msgstr "本机邮递列表"
 
-#: ../lib/modules/sambaGroupMapping.inc:70
+#: ../lib/modules/sambaGroupMapping.inc:72
 msgid "Local group"
 msgstr "本地组"
 
+#: ../lib/modules/sambaGroupMapping.inc:108
+#: ../lib/modules/sambaGroupMapping.inc:159
+#: ../lib/modules/sambaGroupMapping.inc:381
+#: ../lib/modules/sambaGroupMapping.inc:542
+msgid "Local members"
+msgstr "本地成员"
+
 #: ../lib/types/host.inc:97 ../lib/modules/ipHost.inc:66
 #: ../lib/modules/ipHost.inc:84 ../lib/modules/ipHost.inc:98
 #: ../lib/modules/ipHost.inc:149 ../lib/modules/ipHost.inc:309
@@ -5548,8 +5689,8 @@ msgstr "本地组"
 #: ../lib/modules/inetOrgPerson.inc:170 ../lib/modules/inetOrgPerson.inc:316
 #: ../lib/modules/inetOrgPerson.inc:576 ../lib/modules/inetOrgPerson.inc:623
 #: ../lib/modules/inetOrgPerson.inc:840 ../lib/modules/inetOrgPerson.inc:844
-#: ../lib/modules/inetOrgPerson.inc:1561 ../lib/modules/inetOrgPerson.inc:2379
-#: ../lib/modules/inetOrgPerson.inc:3077
+#: ../lib/modules/inetOrgPerson.inc:1561 ../lib/modules/inetOrgPerson.inc:2381
+#: ../lib/modules/inetOrgPerson.inc:3079
 msgid "Location"
 msgstr "地点"
 
@@ -5557,9 +5698,9 @@ msgstr "地点"
 msgid "Lock"
 msgstr "锁"
 
-#: ../templates/lists/changePassword.php:389
-#: ../templates/lists/changePassword.php:409
-#: ../templates/lists/changePassword.php:411
+#: ../templates/lists/changePassword.php:390
+#: ../templates/lists/changePassword.php:410
+#: ../templates/lists/changePassword.php:412
 #: ../lib/modules/ppolicyUser.inc:139
 msgid "Lock account"
 msgstr "锁定帐号"
@@ -5568,8 +5709,8 @@ msgstr "锁定帐号"
 msgid "Lock account?"
 msgstr "锁定帐号?"
 
-#: ../lib/modules/posixGroup.inc:209 ../lib/modules/posixAccount.inc:316
-#: ../lib/modules/posixAccount.inc:1298 ../lib/modules/inetOrgPerson.inc:2084
+#: ../lib/modules/posixGroup.inc:206 ../lib/modules/posixAccount.inc:331
+#: ../lib/modules/posixAccount.inc:1401 ../lib/modules/inetOrgPerson.inc:2084
 msgid "Lock password"
 msgstr "锁定密码"
 
@@ -5578,7 +5719,7 @@ msgstr "锁定密码"
 #: ../lib/modules/ppolicy.inc:257 ../lib/modules/ppolicy.inc:469
 #: ../lib/modules/sambaDomain.inc:126 ../lib/modules/sambaDomain.inc:191
 #: ../lib/modules/sambaDomain.inc:216 ../lib/modules/sambaDomain.inc:333
-#: ../lib/modules/sambaDomain.inc:645
+#: ../lib/modules/sambaDomain.inc:649
 msgid "Lockout duration"
 msgstr "帐号锁定期"
 
@@ -5598,7 +5739,7 @@ msgstr "锁定的用户"
 
 #: ../lib/modules/sambaDomain.inc:114 ../lib/modules/sambaDomain.inc:188
 #: ../lib/modules/sambaDomain.inc:218 ../lib/modules/sambaDomain.inc:309
-#: ../lib/modules/sambaDomain.inc:642
+#: ../lib/modules/sambaDomain.inc:646
 msgid "Lockout users after bad logon attempts"
 msgstr "在多次错误登录后锁定用户."
 
@@ -5606,11 +5747,11 @@ msgstr "在多次错误登录后锁定用户."
 msgid "Lockout users after bad logon attempts must be between 0 and 999."
 msgstr "用户锁定前错误的登录次数必须在0－999之间。"
 
-#: ../templates/config/mainmanage.php:238 ../help/help.inc:144
+#: ../templates/config/mainmanage.php:367 ../help/help.inc:146
 msgid "Log destination"
 msgstr "日志存储位置"
 
-#: ../templates/config/mainmanage.php:224 ../help/help.inc:142
+#: ../templates/config/mainmanage.php:353 ../help/help.inc:144
 msgid "Log level"
 msgstr "日志等级"
 
@@ -5619,50 +5760,50 @@ msgstr "日志等级"
 msgid "Logged in as: %s"
 msgstr "以%s 的身份登录. "
 
-#: ../templates/config/mainmanage.php:241
+#: ../templates/config/mainmanage.php:350
 msgid "Logging"
 msgstr "日志"
 
-#: ../templates/login.php:422 ../templates/config/conflogin.php:62
-#: ../templates/config/mainlogin.php:70
-#: ../templates/selfService/selfServiceLogin.php:179
-#: ../templates/selfService/selfServiceLogin.php:285
+#: ../templates/login.php:436 ../templates/config/conflogin.php:62
+#: ../templates/config/mainlogin.php:72
+#: ../templates/selfService/selfServiceLogin.php:180
+#: ../templates/selfService/selfServiceLogin.php:292
 #: ../templates/selfService/adminLogin.php:64
 #: ../templates/3rdParty/pla/lib/HTMLTree.php:530 ../help/help.inc:56
 msgid "Login"
 msgstr "登录"
 
-#: ../templates/selfService/adminMain.php:437 ../help/help.inc:202
+#: ../templates/selfService/adminMain.php:437 ../help/help.inc:204
 msgid "Login attribute label"
 msgstr "登录属性标签"
 
-#: ../templates/selfService/adminMain.php:442 ../help/help.inc:204
+#: ../templates/selfService/adminMain.php:442 ../help/help.inc:206
 msgid "Login caption"
 msgstr "登录标题"
 
-#: ../templates/config/confmain.php:399 ../help/help.inc:114
+#: ../templates/config/confmain.php:400 ../help/help.inc:116
 msgid "Login method"
 msgstr "登录方法"
 
-#: ../lib/types/user.inc:99 ../lib/modules/posixAccount.inc:157
-#: ../lib/modules/posixAccount.inc:302 ../lib/modules/posixAccount.inc:387
-#: ../lib/modules/posixAccount.inc:490 ../lib/modules/posixAccount.inc:1291
-#: ../lib/modules/posixAccount.inc:1538 ../lib/modules/posixAccount.inc:1627
-#: ../lib/modules/posixAccount.inc:2331
+#: ../lib/types/user.inc:99 ../lib/modules/posixAccount.inc:178
+#: ../lib/modules/posixAccount.inc:317 ../lib/modules/posixAccount.inc:410
+#: ../lib/modules/posixAccount.inc:519 ../lib/modules/posixAccount.inc:1394
+#: ../lib/modules/posixAccount.inc:1653 ../lib/modules/posixAccount.inc:1751
+#: ../lib/modules/posixAccount.inc:2459
 msgid "Login shell"
 msgstr "登录shell"
 
-#: ../lib/modules/posixAccount.inc:165 ../lib/modules/posixAccount.inc:220
-#: ../lib/modules/posixAccount.inc:453
+#: ../lib/modules/posixAccount.inc:186 ../lib/modules/posixAccount.inc:241
+#: ../lib/modules/posixAccount.inc:482
 msgid "Login shells"
 msgstr "登录shells"
 
-#: ../templates/pdfedit/pdfpage.php:456
+#: ../templates/pdfedit/pdfpage.php:453
 msgid "Logo"
 msgstr "标志"
 
 #: ../lib/modules/sambaDomain.inc:102 ../lib/modules/sambaDomain.inc:185
-#: ../lib/modules/sambaDomain.inc:283 ../lib/modules/sambaDomain.inc:651
+#: ../lib/modules/sambaDomain.inc:283 ../lib/modules/sambaDomain.inc:655
 msgid "Logon for password change"
 msgstr "密码修改登录"
 
@@ -5703,14 +5844,14 @@ msgstr "登录脚本非法!"
 msgid "Logout"
 msgstr "退出"
 
-#: ../lib/modules/dhcp_settings.inc:96
+#: ../lib/modules/dhcp_settings.inc:98
 msgid "M-Node (0x04)"
 msgstr "M-节点 (0x04)"
 
 #: ../lib/types/dhcp.inc:96 ../lib/modules/ieee802device.inc:51
 #: ../lib/modules/ieee802device.inc:61 ../lib/modules/ieee802device.inc:72
-#: ../lib/modules/ieee802device.inc:104 ../lib/modules/fixed_ip.inc:91
-#: ../lib/modules/fixed_ip.inc:339 ../lib/modules/fixed_ip.inc:523
+#: ../lib/modules/ieee802device.inc:104 ../lib/modules/fixed_ip.inc:92
+#: ../lib/modules/fixed_ip.inc:358 ../lib/modules/fixed_ip.inc:561
 msgid "MAC address"
 msgstr "MAC地址"
 
@@ -5742,15 +5883,15 @@ msgstr "邮箱域"
 msgid "Mail routing"
 msgstr "邮件路由"
 
-#: ../lib/modules/selfRegistration.inc:513
-#: ../lib/modules/selfRegistration.inc:543
-#: ../lib/modules/passwordSelfReset.inc:1320
-#: ../lib/modules/passwordSelfReset.inc:1335
-#: ../lib/modules/passwordSelfReset.inc:1376
+#: ../lib/modules/selfRegistration.inc:514
+#: ../lib/modules/selfRegistration.inc:544
+#: ../lib/modules/passwordSelfReset.inc:1404
+#: ../lib/modules/passwordSelfReset.inc:1419
+#: ../lib/modules/passwordSelfReset.inc:1460
 msgid "Mail sending failed."
 msgstr "邮件发送失败."
 
-#: ../lib/modules/kolabUser.inc:84
+#: ../lib/modules/kolabUser.inc:85
 #: ../lib/modules/inetLocalMailRecipient.inc:73
 #: ../lib/modules/inetLocalMailRecipient.inc:78
 #: ../lib/modules/inetLocalMailRecipient.inc:105
@@ -5760,7 +5901,7 @@ msgstr "邮件发送失败."
 msgid "Mail server"
 msgstr "邮件服务器"
 
-#: ../lib/account.inc:943
+#: ../lib/account.inc:993
 #, php-format
 msgid "Mail successfully sent to %s."
 msgstr "邮件已经成功发送到%s."
@@ -5788,17 +5929,17 @@ msgstr "在IMAP服务器上这个邮箱已经存在。"
 msgid "Mailbox does not exist on IMAP server."
 msgstr "在IMAP服务器上不存在这个邮箱。"
 
-#: ../lib/modules/kolabUser.inc:129 ../lib/modules/kolabUser.inc:146
-#: ../lib/modules/kolabUser.inc:167 ../lib/modules/kolabUser.inc:229
-#: ../lib/modules/kolabUser.inc:234 ../lib/modules/kolabUser.inc:624
+#: ../lib/modules/kolabUser.inc:130 ../lib/modules/kolabUser.inc:165
+#: ../lib/modules/kolabUser.inc:198 ../lib/modules/kolabUser.inc:265
+#: ../lib/modules/kolabUser.inc:270 ../lib/modules/kolabUser.inc:701
 msgid "Mailbox home server"
 msgstr "邮件宿主服务器"
 
-#: ../lib/modules/kolabUser.inc:184
+#: ../lib/modules/kolabUser.inc:217
 msgid "Mailbox home server name is empty!"
 msgstr "邮件宿主服务器为空 !"
 
-#: ../lib/modules/kolabUser.inc:182 ../lib/modules/kolabUser.inc:183
+#: ../lib/modules/kolabUser.inc:215 ../lib/modules/kolabUser.inc:216
 msgid "Mailbox home server name is invalid!"
 msgstr "邮件宿主服务器非法!"
 
@@ -5810,11 +5951,11 @@ msgstr "邮件别名(例如:NIS邮件别名)"
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "邮件转发."
 
-#: ../templates/pdfedit/pdfpage.php:370 ../templates/pdfedit/pdfpage.php:633
+#: ../templates/pdfedit/pdfpage.php:367 ../templates/pdfedit/pdfpage.php:678
 msgid "Main"
 msgstr "主要设置"
 
-#: ../templates/selfService/adminMain.php:448 ../help/help.inc:206
+#: ../templates/selfService/adminMain.php:448 ../help/help.inc:208
 msgid "Main page caption"
 msgstr "主页标题"
 
@@ -5848,7 +5989,10 @@ msgstr "管理服务器设置"
 
 #: ../lib/modules/windowsHost.inc:79 ../lib/modules/windowsHost.inc:105
 #: ../lib/modules/windowsHost.inc:115 ../lib/modules/windowsHost.inc:139
-#: ../lib/modules/windowsHost.inc:294
+#: ../lib/modules/windowsHost.inc:294 ../lib/modules/windowsGroup.inc:146
+#: ../lib/modules/windowsGroup.inc:161 ../lib/modules/windowsGroup.inc:227
+#: ../lib/modules/windowsGroup.inc:248 ../lib/modules/windowsGroup.inc:329
+#: ../lib/modules/windowsGroup.inc:748
 msgid "Managed by"
 msgstr "管理:"
 
@@ -5861,7 +6005,7 @@ msgstr "管理后缀"
 #: ../lib/modules/ipHost.inc:310 ../lib/modules/inetOrgPerson.inc:348
 #: ../lib/modules/inetOrgPerson.inc:430 ../lib/modules/inetOrgPerson.inc:674
 #: ../lib/modules/inetOrgPerson.inc:725 ../lib/modules/inetOrgPerson.inc:729
-#: ../lib/modules/inetOrgPerson.inc:2058 ../lib/modules/inetOrgPerson.inc:2360
+#: ../lib/modules/inetOrgPerson.inc:2058 ../lib/modules/inetOrgPerson.inc:2362
 msgid "Manager"
 msgstr "管理员"
 
@@ -5899,11 +6043,12 @@ msgstr "映射条目包含非法字符,只能使用 ASCII 字符."
 msgid "Mapping name"
 msgstr "映射的名字"
 
-#: ../lib/modules/kolabUser.inc:313 ../lib/modules/kolabUser.inc:454
+#: ../lib/modules/kolabGroup.inc:194 ../lib/modules/kolabGroup.inc:274
+#: ../lib/modules/kolabUser.inc:356 ../lib/modules/kolabUser.inc:501
 msgid "Mark account for deletion"
 msgstr "将此帐号标记为删除"
 
-#: ../lib/modules/kolabUser.inc:133
+#: ../lib/modules/kolabGroup.inc:106 ../lib/modules/kolabUser.inc:152
 msgid "Mark for deletion"
 msgstr "标记为删除"
 
@@ -5912,11 +6057,11 @@ msgid "Mass delete"
 msgstr "批量删除"
 
 #: ../templates/config/profmanage.php:309
-#: ../templates/config/mainlogin.php:156
+#: ../templates/config/mainlogin.php:158
 #: ../templates/selfService/profManage.php:247
 #: ../templates/pdfedit/pdfmain.php:252 ../templates/pdfedit/pdfmain.php:299
 #: ../templates/profedit/profilemain.php:255
-#: ../templates/profedit/profilemain.php:303 ../help/help.inc:136
+#: ../templates/profedit/profilemain.php:303 ../help/help.inc:138
 msgid "Master password"
 msgstr "管理员密码"
 
@@ -5928,7 +6073,7 @@ msgstr "管理员密码"
 msgid "Master password is wrong!"
 msgstr "系统管理员密码错误!"
 
-#: ../templates/config/mainmanage.php:77
+#: ../templates/config/mainmanage.php:82
 msgid "Master passwords are different or empty!"
 msgstr "管理员密码不同或为空!"
 
@@ -5944,30 +6089,30 @@ msgstr "匹配规则"
 msgid "Max. file descriptors"
 msgstr "最大的文件描述符"
 
-#: ../lib/modules/posixGroup.inc:354 ../lib/modules/posixGroup.inc:535
-#: ../lib/modules/posixGroup.inc:536
+#: ../lib/modules/posixGroup.inc:390 ../lib/modules/posixGroup.inc:575
+#: ../lib/modules/posixGroup.inc:576
 msgid "Maximum GID number"
 msgstr "最大GID号"
 
-#: ../lib/modules/posixGroup.inc:535
+#: ../lib/modules/posixGroup.inc:575
 msgid "Maximum GID number is invalid or empty!"
 msgstr "最大的GID非法或为空!"
 
-#: ../lib/modules/posixGroup.inc:536
+#: ../lib/modules/posixGroup.inc:576
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "最大GID必须大于最小GID!"
 
-#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:78
-#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:80
-#: ../lib/modules/posixAccount.inc:193 ../lib/modules/posixAccount.inc:211
+#: ../lib/modules/posixAccount.inc:94 ../lib/modules/posixAccount.inc:96
+#: ../lib/modules/posixAccount.inc:97 ../lib/modules/posixAccount.inc:98
+#: ../lib/modules/posixAccount.inc:214 ../lib/modules/posixAccount.inc:232
 msgid "Maximum UID number"
 msgstr "最大UID号"
 
-#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:94 ../lib/modules/posixAccount.inc:96
 msgid "Maximum UID number is invalid!"
 msgstr "最大UID号非法"
 
-#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:97 ../lib/modules/posixAccount.inc:98
 msgid "Maximum UID number must be greater than minimum UID number!"
 msgstr "最大UID号必须大于最小UID号!"
 
@@ -5979,12 +6124,17 @@ msgstr "最大失败次数"
 
 #: ../templates/3rdParty/pla/htdocs/add_attr_form.php:128
 #: ../templates/3rdParty/pla/htdocs/import_form.php:36
+#: ../lib/modules/customFields.inc:138 ../lib/modules/customFields.inc:2795
 msgid "Maximum file size"
 msgstr "最大文件大小"
 
-#: ../lib/modules/dhcp_settings.inc:143 ../lib/modules/dhcp_settings.inc:192
-#: ../lib/modules/dhcp_settings.inc:206 ../lib/modules/dhcp_settings.inc:240
-#: ../lib/modules/dhcp_settings.inc:543 ../lib/modules/dhcp_settings.inc:632
+#: ../lib/modules/customFields.inc:2827
+msgid "Maximum file size must be a number. Please enter 0 for no limit."
+msgstr "文件大小的最大值必须是一个数字. 输入0表示无限制."
+
+#: ../lib/modules/dhcp_settings.inc:150 ../lib/modules/dhcp_settings.inc:203
+#: ../lib/modules/dhcp_settings.inc:218 ../lib/modules/dhcp_settings.inc:255
+#: ../lib/modules/dhcp_settings.inc:566 ../lib/modules/dhcp_settings.inc:669
 msgid "Maximum lease time"
 msgstr "最大释放时间"
 
@@ -5992,7 +6142,7 @@ msgstr "最大释放时间"
 msgid "Maximum length"
 msgstr "最大长度"
 
-#: ../lib/lists.inc:1003 ../help/help.inc:93
+#: ../lib/lists.inc:1004 ../help/help.inc:95
 msgid "Maximum list entries"
 msgstr "最大列表条目"
 
@@ -6011,7 +6161,7 @@ msgstr "在中断一个通话之前的非活动秒数最大值"
 #: ../lib/modules/ppolicy.inc:466 ../lib/modules/sambaDomain.inc:122
 #: ../lib/modules/sambaDomain.inc:190 ../lib/modules/sambaDomain.inc:213
 #: ../lib/modules/sambaDomain.inc:215 ../lib/modules/sambaDomain.inc:325
-#: ../lib/modules/sambaDomain.inc:644
+#: ../lib/modules/sambaDomain.inc:648
 msgid "Maximum password age"
 msgstr "密码最长生命"
 
@@ -6040,16 +6190,16 @@ msgstr "用户过滤表达式"
 #: ../lib/modules/nisnetgroup.inc:92 ../lib/modules/nisnetgroup.inc:125
 #: ../lib/modules/nisnetgroup.inc:135 ../lib/modules/nisnetgroup.inc:279
 #: ../lib/modules/nisnetgroup.inc:578 ../lib/modules/windowsGroup.inc:130
-#: ../lib/modules/windowsGroup.inc:134 ../lib/modules/windowsGroup.inc:197
-#: ../lib/modules/windowsGroup.inc:223 ../lib/modules/windowsGroup.inc:653
-#: ../lib/modules/groupOfNames.inc:76 ../lib/modules/groupOfNames.inc:80
-#: ../lib/modules/groupOfNames.inc:113 ../lib/modules/groupOfNames.inc:121
-#: ../lib/modules/groupOfNames.inc:132 ../lib/modules/groupOfNames.inc:203
-#: ../lib/modules/groupOfNames.inc:559
+#: ../lib/modules/windowsGroup.inc:134 ../lib/modules/windowsGroup.inc:203
+#: ../lib/modules/windowsGroup.inc:237 ../lib/modules/windowsGroup.inc:757
+#: ../lib/modules/groupOfNames.inc:80 ../lib/modules/groupOfNames.inc:84
+#: ../lib/modules/groupOfNames.inc:126 ../lib/modules/groupOfNames.inc:134
+#: ../lib/modules/groupOfNames.inc:143 ../lib/modules/groupOfNames.inc:236
+#: ../lib/modules/groupOfNames.inc:640
 msgid "Members"
 msgstr "组成员"
 
-#: ../lib/modules/groupOfNames.inc:84 ../lib/modules/groupOfNames.inc:136
+#: ../lib/modules/groupOfNames.inc:88 ../lib/modules/groupOfNames.inc:154
 msgid "Members are optional"
 msgstr "组员是可选的"
 
@@ -6095,41 +6245,41 @@ msgid "Miller"
 msgstr "米勒"
 
 #: ../lib/modules/sambaDomain.inc:94 ../lib/modules/sambaDomain.inc:183
-#: ../lib/modules/sambaDomain.inc:269 ../lib/modules/sambaDomain.inc:640
+#: ../lib/modules/sambaDomain.inc:269 ../lib/modules/sambaDomain.inc:644
 msgid "Minimal password length"
 msgstr "最短密码长度"
 
-#: ../lib/modules/posixGroup.inc:351 ../lib/modules/posixGroup.inc:534
+#: ../lib/modules/posixGroup.inc:387 ../lib/modules/posixGroup.inc:574
 msgid "Minimum GID number"
 msgstr "最小GID号"
 
-#: ../lib/modules/posixGroup.inc:534
+#: ../lib/modules/posixGroup.inc:574
 msgid "Minimum GID number is invalid or empty!"
 msgstr "最小GID错误或为空"
 
-#: ../lib/modules/posixAccount.inc:75 ../lib/modules/posixAccount.inc:77
-#: ../lib/modules/posixAccount.inc:190 ../lib/modules/posixAccount.inc:208
+#: ../lib/modules/posixAccount.inc:93 ../lib/modules/posixAccount.inc:95
+#: ../lib/modules/posixAccount.inc:211 ../lib/modules/posixAccount.inc:229
 msgid "Minimum UID number"
 msgstr "最小UID号"
 
-#: ../lib/modules/posixAccount.inc:75 ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:93 ../lib/modules/posixAccount.inc:95
 msgid "Minimum UID number is invalid!"
 msgstr "最小UID非法!"
 
-#: ../lib/modules/passwordSelfReset.inc:80
-#: ../lib/modules/passwordSelfReset.inc:191
+#: ../lib/modules/passwordSelfReset.inc:81
+#: ../lib/modules/passwordSelfReset.inc:205
 msgid "Minimum answer length"
 msgstr "最短答案的长度"
 
-#: ../templates/config/mainmanage.php:216
+#: ../templates/config/mainmanage.php:345
 msgid "Minimum character classes"
 msgstr "最少字符类别"
 
-#: ../templates/config/mainmanage.php:212
+#: ../templates/config/mainmanage.php:341
 msgid "Minimum lowercase characters"
 msgstr "最少小写字母字符数"
 
-#: ../templates/config/mainmanage.php:214
+#: ../templates/config/mainmanage.php:343
 msgid "Minimum numeric characters"
 msgstr "最少数字字符数"
 
@@ -6141,22 +6291,22 @@ msgstr "最少数字字符数"
 #: ../lib/modules/ppolicy.inc:159 ../lib/modules/ppolicy.inc:191
 #: ../lib/modules/ppolicy.inc:465 ../lib/modules/sambaDomain.inc:118
 #: ../lib/modules/sambaDomain.inc:189 ../lib/modules/sambaDomain.inc:214
-#: ../lib/modules/sambaDomain.inc:317 ../lib/modules/sambaDomain.inc:643
+#: ../lib/modules/sambaDomain.inc:317 ../lib/modules/sambaDomain.inc:647
 msgid "Minimum password age"
 msgstr "密码最短生命"
 
-#: ../templates/config/mainmanage.php:211 ../lib/types/ppolicyType.inc:87
+#: ../templates/config/mainmanage.php:340 ../lib/types/ppolicyType.inc:87
 #: ../lib/modules/ppolicy.inc:113 ../lib/modules/ppolicy.inc:140
 #: ../lib/modules/ppolicy.inc:168 ../lib/modules/ppolicy.inc:243
 #: ../lib/modules/ppolicy.inc:473
 msgid "Minimum password length"
 msgstr "最短密码长度"
 
-#: ../templates/config/mainmanage.php:215
+#: ../templates/config/mainmanage.php:344
 msgid "Minimum symbolic characters"
 msgstr "最少标点符号字符数"
 
-#: ../templates/config/mainmanage.php:213
+#: ../templates/config/mainmanage.php:342
 msgid "Minimum uppercase characters"
 msgstr "最少的大字字母字符数"
 
@@ -6172,11 +6322,11 @@ msgstr "取消了增,删,改等修改命令"
 #: ../lib/modules/inetOrgPerson.inc:141 ../lib/modules/inetOrgPerson.inc:332
 #: ../lib/modules/inetOrgPerson.inc:502 ../lib/modules/inetOrgPerson.inc:647
 #: ../lib/modules/inetOrgPerson.inc:773 ../lib/modules/inetOrgPerson.inc:777
-#: ../lib/modules/inetOrgPerson.inc:1767 ../lib/modules/inetOrgPerson.inc:2368
+#: ../lib/modules/inetOrgPerson.inc:1767 ../lib/modules/inetOrgPerson.inc:2370
 msgid "Mobile number"
 msgstr "手机号码"
 
-#: ../lib/modules/inetOrgPerson.inc:2989
+#: ../lib/modules/inetOrgPerson.inc:2991
 msgid "Mobile telephone number"
 msgstr "手机号码"
 
@@ -6270,7 +6420,7 @@ msgid "Mountain Time (US & Canada)"
 msgstr "时区(美国和加拿大)"
 
 #: ../lib/modules/quota.inc:98 ../lib/modules/quota.inc:392
-#: ../lib/modules/quota.inc:498 ../lib/modules/quota.inc:625
+#: ../lib/modules/quota.inc:499 ../lib/modules/quota.inc:626
 #: ../lib/modules/systemQuotas.inc:90 ../lib/modules/systemQuotas.inc:115
 #: ../lib/modules/systemQuotas.inc:375
 msgid "Mountpoint"
@@ -6284,11 +6434,19 @@ msgstr "装配点包含非法字符"
 msgid "Mountpoint of device with enabled quotas."
 msgstr "可限制配额设备挂接点"
 
-#: ../lib/modules/customFields.inc:1453
+#: ../lib/modules/customFields.inc:558
+msgid "Move down"
+msgstr "向下移动"
+
+#: ../lib/modules/customFields.inc:552
+msgid "Move up"
+msgstr "向上移动"
+
+#: ../lib/modules/customFields.inc:1671 ../lib/modules/customFields.inc:2800
 msgid "Multi value"
 msgstr "多值"
 
-#: ../lib/modules/customFields.inc:2382
+#: ../lib/modules/customFields.inc:2655
 msgid "Multi-select fields must not contain empty values."
 msgstr "多选域不能包含空值."
 
@@ -6302,27 +6460,30 @@ msgstr "多选域不能包含空值."
 msgid "Multiple values are separated by comma."
 msgstr "用逗号分隔多值."
 
-#: ../lib/modules/puppetClient.inc:78 ../lib/modules/puppetClient.inc:90
-#: ../lib/modules/puppetClient.inc:98 ../lib/modules/device.inc:67
-#: ../lib/modules/windowsUser.inc:128 ../lib/modules/windowsUser.inc:164
-#: ../lib/modules/windowsUser.inc:196 ../lib/modules/windowsUser.inc:207
-#: ../lib/modules/inetOrgPerson.inc:710 ../lib/modules/inetOrgPerson.inc:730
-#: ../lib/modules/inetOrgPerson.inc:738 ../lib/modules/inetOrgPerson.inc:746
-#: ../lib/modules/inetOrgPerson.inc:754 ../lib/modules/inetOrgPerson.inc:770
-#: ../lib/modules/inetOrgPerson.inc:778 ../lib/modules/inetOrgPerson.inc:786
-#: ../lib/modules/inetOrgPerson.inc:794 ../lib/modules/inetOrgPerson.inc:805
-#: ../lib/modules/inetOrgPerson.inc:825 ../lib/modules/inetOrgPerson.inc:837
-#: ../lib/modules/inetOrgPerson.inc:845 ../lib/modules/inetOrgPerson.inc:853
-#: ../lib/modules/inetOrgPerson.inc:865 ../lib/modules/inetOrgPerson.inc:873
-#: ../lib/modules/inetOrgPerson.inc:889 ../lib/modules/inetOrgPerson.inc:897
-#: ../lib/modules/inetOrgPerson.inc:905 ../lib/modules/systemQuotas.inc:63
-#: ../lib/modules/freeRadius.inc:94 ../lib/modules/qmailGroup.inc:121
-#: ../lib/modules/qmailGroup.inc:129 ../lib/modules/qmailGroup.inc:142
-#: ../lib/modules/qmailGroup.inc:154 ../lib/modules/qmailGroup.inc:162
-#: ../lib/modules/qmailGroup.inc:170 ../lib/modules/qmailGroup.inc:178
-#: ../lib/modules/qmailGroup.inc:186 ../lib/modules/qmailGroup.inc:202
-#: ../lib/modules/qmailGroup.inc:210 ../lib/modules/qmailGroup.inc:218
-#: ../lib/modules/windowsGroup.inc:127 ../lib/modules/groupOfNames.inc:73
+#: ../lib/modules/kolabGroup.inc:85 ../lib/modules/kolabGroup.inc:94
+#: ../lib/modules/kolabGroup.inc:103 ../lib/modules/puppetClient.inc:78
+#: ../lib/modules/puppetClient.inc:90 ../lib/modules/puppetClient.inc:98
+#: ../lib/modules/device.inc:67 ../lib/modules/windowsUser.inc:128
+#: ../lib/modules/windowsUser.inc:164 ../lib/modules/windowsUser.inc:196
+#: ../lib/modules/windowsUser.inc:207 ../lib/modules/kolabUser.inc:140
+#: ../lib/modules/kolabUser.inc:149 ../lib/modules/inetOrgPerson.inc:710
+#: ../lib/modules/inetOrgPerson.inc:730 ../lib/modules/inetOrgPerson.inc:738
+#: ../lib/modules/inetOrgPerson.inc:746 ../lib/modules/inetOrgPerson.inc:754
+#: ../lib/modules/inetOrgPerson.inc:770 ../lib/modules/inetOrgPerson.inc:778
+#: ../lib/modules/inetOrgPerson.inc:786 ../lib/modules/inetOrgPerson.inc:794
+#: ../lib/modules/inetOrgPerson.inc:805 ../lib/modules/inetOrgPerson.inc:825
+#: ../lib/modules/inetOrgPerson.inc:837 ../lib/modules/inetOrgPerson.inc:845
+#: ../lib/modules/inetOrgPerson.inc:853 ../lib/modules/inetOrgPerson.inc:865
+#: ../lib/modules/inetOrgPerson.inc:873 ../lib/modules/inetOrgPerson.inc:889
+#: ../lib/modules/inetOrgPerson.inc:897 ../lib/modules/inetOrgPerson.inc:905
+#: ../lib/modules/systemQuotas.inc:63 ../lib/modules/freeRadius.inc:94
+#: ../lib/modules/qmailGroup.inc:121 ../lib/modules/qmailGroup.inc:129
+#: ../lib/modules/qmailGroup.inc:142 ../lib/modules/qmailGroup.inc:154
+#: ../lib/modules/qmailGroup.inc:162 ../lib/modules/qmailGroup.inc:170
+#: ../lib/modules/qmailGroup.inc:178 ../lib/modules/qmailGroup.inc:186
+#: ../lib/modules/qmailGroup.inc:202 ../lib/modules/qmailGroup.inc:210
+#: ../lib/modules/qmailGroup.inc:218 ../lib/modules/windowsGroup.inc:127
+#: ../lib/modules/groupOfNames.inc:77
 msgid "Multiple values are separated by semicolon."
 msgstr "用逗号分隔多值."
 
@@ -6409,8 +6570,8 @@ msgstr "NIS 对象"
 #: ../lib/modules/automount.inc:57 ../lib/modules/automount.inc:73
 #: ../lib/modules/automount.inc:96 ../lib/modules/automount.inc:121
 #: ../lib/modules/automount.inc:193 ../lib/modules/asteriskExtension.inc:815
-#: ../lib/modules/customFields.inc:72 ../lib/modules/customFields.inc:860
-#: ../lib/modules/customFields.inc:1279 ../lib/modules/groupOfNames.inc:170
+#: ../lib/modules/customFields.inc:74 ../lib/modules/customFields.inc:963
+#: ../lib/modules/customFields.inc:1454 ../lib/modules/groupOfNames.inc:199
 msgid "Name"
 msgstr "名"
 
@@ -6418,7 +6579,7 @@ msgstr "名"
 msgid "Name of the address list which should be created."
 msgstr "将要建立的地址列表名"
 
-#: ../help/help.inc:167
+#: ../help/help.inc:169
 msgid ""
 "Name under which the profile will be saved. If a profile with the same name "
 "exists, it will be overwritten."
@@ -6428,8 +6589,8 @@ msgstr "将来保存的配置名,如果配置名存在,会被覆盖."
 msgid "Named object"
 msgstr "已命名对象"
 
-#: ../lib/modules/dhcp_settings.inc:179 ../lib/modules/dhcp_settings.inc:198
-#: ../lib/modules/dhcp_settings.inc:571 ../lib/modules/dhcp_settings.inc:641
+#: ../lib/modules/dhcp_settings.inc:186 ../lib/modules/dhcp_settings.inc:209
+#: ../lib/modules/dhcp_settings.inc:603 ../lib/modules/dhcp_settings.inc:679
 #: ../lib/modules/freeRadius.inc:81 ../lib/modules/freeRadius.inc:117
 #: ../lib/modules/freeRadius.inc:131 ../lib/modules/freeRadius.inc:194
 #: ../lib/modules/freeRadius.inc:221 ../lib/modules/freeRadius.inc:313
@@ -6437,15 +6598,15 @@ msgstr "已命名对象"
 msgid "Net mask"
 msgstr "子网掩码"
 
-#: ../lib/modules/dhcp_settings.inc:155 ../lib/modules/dhcp_settings.inc:195
-#: ../lib/modules/dhcp_settings.inc:209 ../lib/modules/dhcp_settings.inc:258
-#: ../lib/modules/dhcp_settings.inc:551 ../lib/modules/dhcp_settings.inc:635
+#: ../lib/modules/dhcp_settings.inc:162 ../lib/modules/dhcp_settings.inc:206
+#: ../lib/modules/dhcp_settings.inc:221 ../lib/modules/dhcp_settings.inc:273
+#: ../lib/modules/dhcp_settings.inc:574 ../lib/modules/dhcp_settings.inc:672
 msgid "Netbios name servers"
 msgstr "Netbios命名服务器"
 
-#: ../lib/modules/dhcp_settings.inc:159 ../lib/modules/dhcp_settings.inc:196
-#: ../lib/modules/dhcp_settings.inc:211 ../lib/modules/dhcp_settings.inc:264
-#: ../lib/modules/dhcp_settings.inc:561 ../lib/modules/dhcp_settings.inc:636
+#: ../lib/modules/dhcp_settings.inc:166 ../lib/modules/dhcp_settings.inc:207
+#: ../lib/modules/dhcp_settings.inc:223 ../lib/modules/dhcp_settings.inc:279
+#: ../lib/modules/dhcp_settings.inc:584 ../lib/modules/dhcp_settings.inc:673
 msgid "Netbios node type"
 msgstr "Netbios 节点类型"
 
@@ -6473,7 +6634,7 @@ msgstr "新 NIS 对象"
 msgid "New OU created successfully."
 msgstr "新OU建立成功."
 
-#: ../lib/modules/ldapPublicKey.inc:113
+#: ../lib/modules/ldapPublicKey.inc:127
 msgid "New SSH public key"
 msgstr "新SSH公钥"
 
@@ -6511,7 +6672,7 @@ msgstr "新域"
 msgid "New extension"
 msgstr "新扩展"
 
-#: ../templates/pdfedit/pdfpage.php:585
+#: ../templates/pdfedit/pdfpage.php:620
 msgid "New field"
 msgstr "新字段"
 
@@ -6532,11 +6693,11 @@ msgstr "新主机"
 msgid "New local address"
 msgstr "新本地邮件地址"
 
-#: ../templates/config/mainmanage.php:247
+#: ../templates/config/mainmanage.php:376
 msgid "New master password"
 msgstr "新管理员密码"
 
-#: ../templates/config/mainmanage.php:74
+#: ../templates/config/mainmanage.php:79
 msgid "New master password set successfully."
 msgstr "新管理员密码设置成功."
 
@@ -6544,14 +6705,14 @@ msgstr "新管理员密码设置成功."
 msgid "New object"
 msgstr "新对象"
 
-#: ../templates/ou_edit.php:183 ../help/help.inc:233
+#: ../templates/ou_edit.php:183 ../help/help.inc:235
 msgid "New organisational unit"
 msgstr "新组织单元"
 
-#: ../templates/config/confmain.php:433
+#: ../templates/config/confmain.php:434
 #: ../lib/modules/sambaSamAccount.inc:2290
-#: ../lib/modules/posixAccount.inc:2298 ../lib/modules/windowsUser.inc:1319
-#: ../lib/modules/passwordSelfReset.inc:884
+#: ../lib/modules/posixAccount.inc:2426 ../lib/modules/windowsUser.inc:1319
+#: ../lib/modules/passwordSelfReset.inc:926
 msgid "New password"
 msgstr "新密码"
 
@@ -6581,7 +6742,7 @@ msgstr "新收信者"
 msgid "New required attributes"
 msgstr "新必要属性"
 
-#: ../templates/pdfedit/pdfpage.php:553
+#: ../templates/pdfedit/pdfpage.php:588
 msgid "New section"
 msgstr "新节"
 
@@ -6593,7 +6754,7 @@ msgstr "新sudo角色"
 msgid "New user"
 msgstr "新用户"
 
-#: ../lib/modules/inetOrgPerson.inc:2297
+#: ../lib/modules/inetOrgPerson.inc:2299
 msgid "New user certificate"
 msgstr "新用户认证"
 
@@ -6604,7 +6765,7 @@ msgstr "新值"
 
 #: ../lib/modules/sambaDomain.inc:78 ../lib/modules/sambaDomain.inc:158
 #: ../lib/modules/sambaDomain.inc:179 ../lib/modules/sambaDomain.inc:354
-#: ../lib/modules/sambaDomain.inc:636
+#: ../lib/modules/sambaDomain.inc:640
 msgid "Next RID"
 msgstr "下一个RID"
 
@@ -6626,7 +6787,7 @@ msgstr "建立用户帐号使用的下一个RID(Winbind)."
 
 #: ../lib/modules/sambaDomain.inc:86 ../lib/modules/sambaDomain.inc:170
 #: ../lib/modules/sambaDomain.inc:181 ../lib/modules/sambaDomain.inc:370
-#: ../lib/modules/sambaDomain.inc:638
+#: ../lib/modules/sambaDomain.inc:642
 msgid "Next group RID"
 msgstr "下一个组的RID"
 
@@ -6636,7 +6797,7 @@ msgstr "下一个组的RID不是数字!"
 
 #: ../lib/modules/sambaDomain.inc:82 ../lib/modules/sambaDomain.inc:164
 #: ../lib/modules/sambaDomain.inc:180 ../lib/modules/sambaDomain.inc:362
-#: ../lib/modules/sambaDomain.inc:637
+#: ../lib/modules/sambaDomain.inc:641
 msgid "Next user RID"
 msgstr "下一个用户的RID"
 
@@ -6652,7 +6813,7 @@ msgstr "昵称"
 
 #: ../templates/schema/schema.php:153 ../templates/schema/schema.php:195
 #: ../templates/schema/schema.php:200 ../templates/schema/schema.php:205
-#: ../templates/pdfedit/pdfpage.php:463 ../lib/modules/qmailGroup.inc:314
+#: ../templates/pdfedit/pdfpage.php:460 ../lib/modules/qmailGroup.inc:314
 #: ../lib/modules/qmailGroup.inc:315 ../lib/modules/qmailGroup.inc:316
 #: ../lib/modules/qmailGroup.inc:356 ../lib/modules/qmailGroup.inc:357
 #: ../lib/modules/qmailGroup.inc:358 ../lib/modules/qmailGroup.inc:1027
@@ -6679,11 +6840,11 @@ msgid "No RDN attribute was selected."
 msgstr "没有选中RDN属性"
 
 #: ../lib/modules/sambaSamAccount.inc:1088
-#: ../lib/modules/sambaGroupMapping.inc:241
+#: ../lib/modules/sambaGroupMapping.inc:334
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "在LDAP中没有发现Samba域,请先建立一个."
 
-#: ../lib/modules/posixAccount.inc:541 ../lib/modules/posixAccount.inc:1185
+#: ../lib/modules/posixAccount.inc:570 ../lib/modules/posixAccount.inc:1285
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "在LDAP中没有发现Unix组,请先建立一个."
 
@@ -6716,7 +6877,7 @@ msgstr "未做任何修改."
 msgid "No current value for attribute <b>%s</b>."
 msgstr "属性<b>%s</b>没有当前值."
 
-#: ../templates/login.php:97
+#: ../templates/login.php:104
 msgid ""
 "No default profile set. Please set it in the server profile configuration."
 msgstr "没有指定缺省的配置文件. 请在服务器配置中指定."
@@ -6729,16 +6890,22 @@ msgstr "没有描述"
 msgid "No domains found!"
 msgstr "没有发现域!"
 
+#: ../lib/modules/passwordSelfReset.inc:1404
+msgid "No email address found."
+msgstr "没有发现邮件地址. "
+
 #: ../templates/3rdParty/pla/htdocs/mass_delete.php:20
 #: ../templates/3rdParty/pla/htdocs/mass_delete.php:21
 msgid "No entry was selected to delete"
 msgstr "没有选中要删除的条目"
 
-#: ../lib/modules/inetOrgPerson.inc:3630
+#: ../lib/modules/ldapPublicKey.inc:513 ../lib/modules/inetOrgPerson.inc:3632
+#: ../lib/modules/customFields.inc:3130
 msgid "No file received."
 msgstr "没有收到文件."
 
-#: ../lib/modules/inetOrgPerson.inc:96
+#: ../templates/config/mainmanage.php:127 ../lib/modules/ldapPublicKey.inc:102
+#: ../lib/modules/inetOrgPerson.inc:96 ../lib/modules/customFields.inc:3065
 msgid "No file selected."
 msgstr "没有选择文件!"
 
@@ -6746,7 +6913,7 @@ msgstr "没有选择文件!"
 msgid "No forwarding"
 msgstr "不能转发"
 
-#: ../lib/modules/posixGroup.inc:532 ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixGroup.inc:572 ../lib/modules/posixAccount.inc:104
 msgid "No free ID-Number!"
 msgstr "没有可用的ID号!"
 
@@ -6784,11 +6951,11 @@ msgstr "没有设置lamdaemon服务器,请先设置LAM配置."
 msgid "No local delivery"
 msgstr "没有本地发送"
 
-#: ../templates/config/mainmanage.php:227
+#: ../templates/config/mainmanage.php:356
 msgid "No logging"
 msgstr "无日志"
 
-#: ../templates/pdfedit/pdfpage.php:432
+#: ../templates/pdfedit/pdfpage.php:429
 msgid "No logo"
 msgstr "无标志"
 
@@ -6796,7 +6963,7 @@ msgstr "无标志"
 msgid "No new attributes available for this entry"
 msgstr "本条目没有新的可用属性"
 
-#: ../templates/config/conftypes.php:290 ../help/help.inc:158
+#: ../templates/config/conftypes.php:290 ../help/help.inc:160
 msgid "No new entries"
 msgstr "没有新条目"
 
@@ -6804,12 +6971,12 @@ msgstr "没有新条目"
 msgid "No objects found!"
 msgstr "未发现对象!"
 
-#: ../templates/config/confmodules.php:396
+#: ../templates/config/confmodules.php:406
 msgid "No or more than one base module selected!"
 msgstr "未选择基本模块或选择多于一个!"
 
 #: ../templates/config/confsave.php:53 ../templates/config/confmain.php:55
-#: ../lib/modules/passwordSelfReset.inc:981
+#: ../lib/modules/passwordSelfReset.inc:1033
 msgid "No password was entered!"
 msgstr "没有输入密码!"
 
@@ -6829,11 +6996,11 @@ msgstr "没有程序发送"
 msgid "No scripts to run."
 msgstr "没有运行的脚本"
 
-#: ../templates/pdfedit/pdfpage.php:129
+#: ../templates/pdfedit/pdfpage.php:137
 msgid "No section text specified"
 msgstr "没有指定段文本"
 
-#: ../lib/modules/passwordSelfReset.inc:1003
+#: ../lib/modules/passwordSelfReset.inc:1055
 msgid "No security answer found."
 msgstr "没有发现安全问题."
 
@@ -6841,11 +7008,11 @@ msgstr "没有发现安全问题."
 msgid "No server profiles found. Please create one."
 msgstr "没有服务器设置,请先建立一个."
 
-#: ../templates/pdfedit/pdfpage.php:117
+#: ../templates/pdfedit/pdfpage.php:125
 msgid "No static text specified"
 msgstr "没有指定静态文本"
 
-#: ../lib/modules/dhcp_settings.inc:290
+#: ../lib/modules/dhcp_settings.inc:311
 msgid "No subnet entered."
 msgstr "没有输入子网掩码!"
 
@@ -6886,9 +7053,9 @@ msgid ""
 "require"
 msgstr "注意:您必须输入这些对象类所需的新属性"
 
-#: ../lib/modules/windowsGroup.inc:114 ../lib/modules/windowsGroup.inc:175
-#: ../lib/modules/windowsGroup.inc:222 ../lib/modules/windowsGroup.inc:309
-#: ../lib/modules/windowsGroup.inc:617
+#: ../lib/modules/windowsGroup.inc:114 ../lib/modules/windowsGroup.inc:181
+#: ../lib/modules/windowsGroup.inc:236 ../lib/modules/windowsGroup.inc:326
+#: ../lib/modules/windowsGroup.inc:715
 msgid "Notes"
 msgstr "备注"
 
@@ -6896,7 +7063,7 @@ msgstr "备注"
 msgid "Nothing to export"
 msgstr "导出结果为空"
 
-#: ../templates/config/mainmanage.php:223
+#: ../templates/config/mainmanage.php:352
 msgid "Notice"
 msgstr "注意"
 
@@ -6904,7 +7071,7 @@ msgstr "注意"
 msgid "Number of child entries"
 msgstr "子条目的数量"
 
-#: ../lib/modules/customFields.inc:113
+#: ../lib/modules/customFields.inc:115
 msgid "Number of columns in text area."
 msgstr "文本区中列的数量."
 
@@ -6933,7 +7100,7 @@ msgstr "登录失败的次数"
 msgid "Number of minutes after which the bad logon attempts are reset."
 msgstr "重置错误登录次数的分钟数."
 
-#: ../lib/modules/customFields.inc:117
+#: ../lib/modules/customFields.inc:119
 msgid "Number of rows in text area."
 msgstr "文本区中行的数量"
 
@@ -6970,15 +7137,15 @@ msgstr "OU无效!"
 msgid "OU is not empty or invalid!"
 msgstr "OU不为空或非法!"
 
-#: ../help/help.inc:233 ../help/help.inc:235
+#: ../help/help.inc:235 ../help/help.inc:237
 msgid "OU-Editor"
 msgstr "OU编辑器"
 
 #: ../templates/schema/schema.php:65 ../templates/schema/schema.php:66
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1324
 #: ../lib/modules/selfRegistration.inc:64
-#: ../lib/modules/selfRegistration.inc:113 ../lib/modules/customFields.inc:68
-#: ../lib/modules/customFields.inc:476
+#: ../lib/modules/selfRegistration.inc:113 ../lib/modules/customFields.inc:70
+#: ../lib/modules/customFields.inc:496
 msgid "Object classes"
 msgstr "对象类"
 
@@ -6992,8 +7159,8 @@ msgid "Obsolete"
 msgstr "已过时的"
 
 #: ../lib/modules/sambaDomain.inc:282 ../lib/modules/sambaDomain.inc:291
-#: ../lib/modules/sambaDomain.inc:300 ../lib/modules/sambaDomain.inc:649
-#: ../lib/modules/sambaDomain.inc:654 ../lib/modules/sambaDomain.inc:659
+#: ../lib/modules/sambaDomain.inc:300 ../lib/modules/sambaDomain.inc:653
+#: ../lib/modules/sambaDomain.inc:658 ../lib/modules/sambaDomain.inc:663
 msgid "Off"
 msgstr "关闭"
 
@@ -7004,15 +7171,15 @@ msgstr "关闭"
 #: ../lib/modules/inetOrgPerson.inc:182 ../lib/modules/inetOrgPerson.inc:324
 #: ../lib/modules/inetOrgPerson.inc:600 ../lib/modules/inetOrgPerson.inc:635
 #: ../lib/modules/inetOrgPerson.inc:860 ../lib/modules/inetOrgPerson.inc:864
-#: ../lib/modules/inetOrgPerson.inc:1673 ../lib/modules/inetOrgPerson.inc:2377
-#: ../lib/modules/inetOrgPerson.inc:3110
+#: ../lib/modules/inetOrgPerson.inc:1673 ../lib/modules/inetOrgPerson.inc:2379
+#: ../lib/modules/inetOrgPerson.inc:3112
 msgid "Office name"
 msgstr "办公室名"
 
 #: ../templates/lists/changePassword.php:312
 #: ../templates/lists/changePassword.php:341
-#: ../templates/lists/changePassword.php:381
-#: ../templates/lists/changePassword.php:412
+#: ../templates/lists/changePassword.php:382
+#: ../templates/lists/changePassword.php:413
 #: ../templates/tests/lamdaemonTest.php:92 ../templates/ou_edit.php:191
 #: ../templates/ou_edit.php:205 ../templates/masscreate.php:206
 #: ../templates/config/profmanage.php:253
@@ -7021,8 +7188,8 @@ msgstr "办公室名"
 #: ../templates/config/profmanage.php:291
 #: ../templates/config/profmanage.php:300
 #: ../templates/config/profmanage.php:302
-#: ../templates/config/mainmanage.php:260
-#: ../templates/config/conflogin.php:172 ../templates/config/mainlogin.php:163
+#: ../templates/config/mainmanage.php:388
+#: ../templates/config/conflogin.php:172 ../templates/config/mainlogin.php:165
 #: ../templates/selfService/profManage.php:211
 #: ../templates/selfService/profManage.php:227
 #: ../templates/selfService/profManage.php:240
@@ -7039,14 +7206,14 @@ msgstr "办公室名"
 #: ../lib/modules/zarafaContact.inc:422 ../lib/modules/zarafaGroup.inc:491
 #: ../lib/modules/device.inc:306 ../lib/modules/sambaSamAccount.inc:1406
 #: ../lib/modules/sambaSamAccount.inc:1541 ../lib/modules/zarafaUser.inc:949
-#: ../lib/modules/zarafaUser.inc:1000 ../lib/modules/nisnetgroup.inc:472
-#: ../lib/modules/nisnetgroup.inc:482 ../lib/modules/asteriskExtension.inc:477
-#: ../lib/modules/aliasEntry.inc:139 ../lib/modules/aliasEntry.inc:159
-#: ../lib/modules/qmailGroup.inc:855 ../lib/modules/imapAccess.inc:275
-#: ../lib/modules/passwordSelfReset.inc:719
-#: ../lib/modules/passwordSelfReset.inc:915
-#: ../lib/modules/windowsGroup.inc:463 ../lib/modules/groupOfNames.inc:329
-#: ../lib/modules/groupOfNames.inc:443 ../lib/modules/nisMailAlias.inc:275
+#: ../lib/modules/zarafaUser.inc:1000 ../lib/modules/sambaGroupMapping.inc:495
+#: ../lib/modules/nisnetgroup.inc:472 ../lib/modules/nisnetgroup.inc:482
+#: ../lib/modules/asteriskExtension.inc:477 ../lib/modules/aliasEntry.inc:139
+#: ../lib/modules/aliasEntry.inc:159 ../lib/modules/qmailGroup.inc:855
+#: ../lib/modules/imapAccess.inc:275 ../lib/modules/passwordSelfReset.inc:741
+#: ../lib/modules/passwordSelfReset.inc:960
+#: ../lib/modules/windowsGroup.inc:557 ../lib/modules/groupOfNames.inc:385
+#: ../lib/modules/groupOfNames.inc:520 ../lib/modules/nisMailAlias.inc:275
 #: ../lib/modules/nisMailAlias.inc:283 ../lib/lists.inc:703
 #: ../lib/lists.inc:785 ../lib/modules.inc:1199
 msgid "Ok"
@@ -7058,8 +7225,8 @@ msgid "Old value"
 msgstr "旧值"
 
 #: ../lib/modules/sambaDomain.inc:282 ../lib/modules/sambaDomain.inc:291
-#: ../lib/modules/sambaDomain.inc:300 ../lib/modules/sambaDomain.inc:650
-#: ../lib/modules/sambaDomain.inc:655 ../lib/modules/sambaDomain.inc:660
+#: ../lib/modules/sambaDomain.inc:300 ../lib/modules/sambaDomain.inc:654
+#: ../lib/modules/sambaDomain.inc:659 ../lib/modules/sambaDomain.inc:664
 msgid "On"
 msgstr "On"
 
@@ -7075,7 +7242,7 @@ msgstr "中断或超时连接"
 msgid "One (one level beneath base)"
 msgstr "One (基类下第一层)"
 
-#: ../lib/modules/range.inc:107 ../lib/modules/fixed_ip.inc:106
+#: ../lib/modules/range.inc:107 ../lib/modules/fixed_ip.inc:113
 msgid "One or more errors occured. The invalid fields are marked."
 msgstr "发生了错误,非法域已经被标记."
 
@@ -7103,19 +7270,19 @@ msgstr "可选属性"
 #: ../lib/types/sudo.inc:83 ../lib/modules/mitKerberos.inc:409
 #: ../lib/modules/zarafaDynamicGroup.inc:260
 #: ../lib/modules/zarafaContact.inc:230 ../lib/modules/zarafaGroup.inc:274
-#: ../lib/modules/posixAccount.inc:217 ../lib/modules/zarafaUser.inc:603
-#: ../lib/modules/windowsUser.inc:542 ../lib/modules/sudoRole.inc:83
-#: ../lib/modules/sudoRole.inc:112 ../lib/modules/sudoRole.inc:164
-#: ../lib/modules/sudoRole.inc:178 ../lib/modules/sudoRole.inc:187
-#: ../lib/modules/sudoRole.inc:399 ../lib/modules/sudoRole.inc:689
-#: ../lib/modules/asteriskExtension.inc:115
+#: ../lib/modules/posixAccount.inc:238 ../lib/modules/zarafaUser.inc:603
+#: ../lib/modules/windowsUser.inc:542 ../lib/modules/kolabUser.inc:347
+#: ../lib/modules/sudoRole.inc:83 ../lib/modules/sudoRole.inc:112
+#: ../lib/modules/sudoRole.inc:164 ../lib/modules/sudoRole.inc:178
+#: ../lib/modules/sudoRole.inc:187 ../lib/modules/sudoRole.inc:399
+#: ../lib/modules/sudoRole.inc:689 ../lib/modules/asteriskExtension.inc:115
 #: ../lib/modules/asteriskVoicemail.inc:106
 #: ../lib/modules/asteriskVoicemail.inc:116
 #: ../lib/modules/asteriskVoicemail.inc:133
 #: ../lib/modules/asteriskVoicemail.inc:181
 #: ../lib/modules/asteriskVoicemail.inc:273
 #: ../lib/modules/asteriskVoicemail.inc:394 ../lib/modules/qmailGroup.inc:604
-#: ../lib/modules/heimdalKerberos.inc:331
+#: ../lib/modules/heimdalKerberos.inc:336
 msgid "Options"
 msgstr "选项"
 
@@ -7145,14 +7312,14 @@ msgstr "排序"
 #: ../lib/modules/inetOrgPerson.inc:206 ../lib/modules/inetOrgPerson.inc:352
 #: ../lib/modules/inetOrgPerson.inc:568 ../lib/modules/inetOrgPerson.inc:677
 #: ../lib/modules/inetOrgPerson.inc:892 ../lib/modules/inetOrgPerson.inc:896
-#: ../lib/modules/inetOrgPerson.inc:2021 ../lib/modules/inetOrgPerson.inc:2382
+#: ../lib/modules/inetOrgPerson.inc:2021 ../lib/modules/inetOrgPerson.inc:2384
 msgid "Organisation"
 msgstr "组织"
 
 #: ../lib/modules/inetOrgPerson.inc:203 ../lib/modules/inetOrgPerson.inc:350
 #: ../lib/modules/inetOrgPerson.inc:560 ../lib/modules/inetOrgPerson.inc:680
 #: ../lib/modules/inetOrgPerson.inc:884 ../lib/modules/inetOrgPerson.inc:888
-#: ../lib/modules/inetOrgPerson.inc:1991 ../lib/modules/inetOrgPerson.inc:2381
+#: ../lib/modules/inetOrgPerson.inc:1991 ../lib/modules/inetOrgPerson.inc:2383
 msgid "Organisational unit"
 msgstr "组织单元"
 
@@ -7166,7 +7333,7 @@ msgstr "组织单元"
 msgid "Organisational units contains an invalid entry."
 msgstr "组织单元中有一个非法条目"
 
-#: ../templates/config/confmain.php:316
+#: ../templates/config/confmain.php:317
 msgid "Other"
 msgstr "其它"
 
@@ -7188,7 +7355,7 @@ msgstr "其他web网站"
 msgid "Output may contain HTML"
 msgstr "输出可以包含HTML语句"
 
-#: ../lib/modules/customScripts.inc:230 ../lib/modules/customScripts.inc:516
+#: ../lib/modules/customScripts.inc:230 ../lib/modules/customScripts.inc:520
 #, php-format
 msgid "Output of command \"%s\" with return code %s"
 msgstr "\"%s\"命令的输出和返回值%s"
@@ -7201,7 +7368,7 @@ msgstr "覆盖物"
 msgid "Override default quota settings."
 msgstr "覆盖缺少的限制设置"
 
-#: ../templates/config/confmain.php:308 ../lib/types/asteriskExt.inc:96
+#: ../templates/config/confmain.php:309 ../lib/types/asteriskExt.inc:96
 #: ../lib/types/asteriskExt.inc:158
 msgid "Owner"
 msgstr "拥有者"
@@ -7209,19 +7376,19 @@ msgstr "拥有者"
 #: ../lib/types/gon.inc:94 ../lib/modules/device.inc:62
 #: ../lib/modules/device.inc:66 ../lib/modules/device.inc:96
 #: ../lib/modules/device.inc:121 ../lib/modules/device.inc:186
-#: ../lib/modules/device.inc:442 ../lib/modules/groupOfNames.inc:68
-#: ../lib/modules/groupOfNames.inc:72 ../lib/modules/groupOfNames.inc:105
-#: ../lib/modules/groupOfNames.inc:131 ../lib/modules/groupOfNames.inc:181
-#: ../lib/modules/groupOfNames.inc:547
+#: ../lib/modules/device.inc:442 ../lib/modules/groupOfNames.inc:72
+#: ../lib/modules/groupOfNames.inc:76 ../lib/modules/groupOfNames.inc:118
+#: ../lib/modules/groupOfNames.inc:149 ../lib/modules/groupOfNames.inc:162
+#: ../lib/modules/groupOfNames.inc:213 ../lib/modules/groupOfNames.inc:628
 msgid "Owners"
 msgstr "拥有者"
 
-#: ../lib/modules/dhcp_settings.inc:95
+#: ../lib/modules/dhcp_settings.inc:97
 msgid "P-Node (0x02)"
 msgstr "P-节点 (0x02)"
 
-#: ../lib/modules/fixed_ip.inc:88 ../lib/modules/fixed_ip.inc:335
-#: ../lib/modules/fixed_ip.inc:523
+#: ../lib/modules/fixed_ip.inc:88 ../lib/modules/fixed_ip.inc:354
+#: ../lib/modules/fixed_ip.inc:559
 msgid "PC name"
 msgstr "PC机器名"
 
@@ -7229,17 +7396,17 @@ msgstr "PC机器名"
 msgid "PC01"
 msgstr "PC01"
 
-#: ../templates/pdfedit/pdfpage.php:448 ../templates/pdfedit/pdfmain.php:84
+#: ../templates/pdfedit/pdfpage.php:445 ../templates/pdfedit/pdfmain.php:84
 #: ../lib/tools/pdfEdit.inc:44
 msgid "PDF editor"
 msgstr "PDF编辑器"
 
 #: ../templates/masscreate.php:269 ../templates/pdfedit/pdfmain.php:272
-#: ../lib/lists.inc:681 ../help/help.inc:182
+#: ../lib/lists.inc:681 ../help/help.inc:184
 msgid "PDF structure"
 msgstr "PDF架构"
 
-#: ../templates/pdfedit/pdfpage.php:100
+#: ../templates/pdfedit/pdfpage.php:108
 msgid "PDF structure name not valid"
 msgstr "PDF架构名无效"
 
@@ -7260,8 +7427,8 @@ msgstr "个PDU被发送"
 msgid "POP3"
 msgstr "POP3"
 
-#: ../templates/lists/changePassword.php:369
-#: ../templates/lists/changePassword.php:400 ../lib/types/user.inc:377
+#: ../templates/lists/changePassword.php:370
+#: ../templates/lists/changePassword.php:401 ../lib/types/user.inc:377
 #: ../lib/types/user.inc:409
 msgid "PPolicy"
 msgstr "P策略"
@@ -7270,7 +7437,7 @@ msgstr "P策略"
 msgid "Pacific Time (US & Canada)"
 msgstr "太平洋时间(美国和加拿大)"
 
-#: ../lib/modules/dhcp_settings.inc:152
+#: ../lib/modules/dhcp_settings.inc:159
 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."
@@ -7278,7 +7445,7 @@ msgstr ""
 "如果数据包的接收者不在同一个网络,数据包将会发往缺省网关.缺省网关将数据包转向"
 "目标网络."
 
-#: ../templates/selfService/adminMain.php:454 ../help/help.inc:212
+#: ../templates/selfService/adminMain.php:454 ../help/help.inc:214
 msgid "Page header"
 msgstr "页首"
 
@@ -7320,8 +7487,8 @@ msgstr "继承于"
 msgid "Parse error"
 msgstr "解析错误"
 
-#: ../templates/lists/changePassword.php:328 ../templates/login.php:369
-#: ../templates/selfService/selfServiceLogin.php:268
+#: ../templates/lists/changePassword.php:328 ../templates/login.php:383
+#: ../templates/selfService/selfServiceLogin.php:275
 #: ../lib/selfService.inc:373 ../lib/modules/mitKerberos.inc:149
 #: ../lib/modules/mitKerberos.inc:235 ../lib/modules/mitKerberos.inc:250
 #: ../lib/modules/mitKerberos.inc:796 ../lib/modules/mitKerberos.inc:799
@@ -7330,29 +7497,29 @@ msgstr "解析错误"
 #: ../lib/modules/selfRegistration.inc:424
 #: ../lib/modules/selfRegistration.inc:427
 #: ../lib/modules/asteriskAccount.inc:106
-#: ../lib/modules/asteriskAccount.inc:387 ../lib/modules/posixGroup.inc:206
-#: ../lib/modules/posixGroup.inc:529 ../lib/modules/sambaSamAccount.inc:105
+#: ../lib/modules/asteriskAccount.inc:387 ../lib/modules/posixGroup.inc:203
+#: ../lib/modules/posixGroup.inc:569 ../lib/modules/sambaSamAccount.inc:105
 #: ../lib/modules/sambaSamAccount.inc:106
 #: ../lib/modules/sambaSamAccount.inc:243
-#: ../lib/modules/sambaSamAccount.inc:412 ../lib/modules/posixAccount.inc:91
-#: ../lib/modules/posixAccount.inc:92 ../lib/modules/posixAccount.inc:157
-#: ../lib/modules/posixAccount.inc:310 ../lib/modules/posixAccount.inc:389
-#: ../lib/modules/posixAccount.inc:482 ../lib/modules/posixAccount.inc:1295
-#: ../lib/modules/posixAccount.inc:1640 ../lib/modules/posixAccount.inc:1643
+#: ../lib/modules/sambaSamAccount.inc:412 ../lib/modules/posixAccount.inc:109
+#: ../lib/modules/posixAccount.inc:110 ../lib/modules/posixAccount.inc:178
+#: ../lib/modules/posixAccount.inc:325 ../lib/modules/posixAccount.inc:411
+#: ../lib/modules/posixAccount.inc:511 ../lib/modules/posixAccount.inc:1398
+#: ../lib/modules/posixAccount.inc:1764 ../lib/modules/posixAccount.inc:1767
 #: ../lib/modules/windowsUser.inc:198 ../lib/modules/windowsUser.inc:222
 #: ../lib/modules/windowsUser.inc:405 ../lib/modules/windowsUser.inc:419
 #: ../lib/modules/windowsUser.inc:465 ../lib/modules/windowsUser.inc:466
 #: ../lib/modules/windowsUser.inc:1262 ../lib/modules/windowsUser.inc:1265
 #: ../lib/modules/inetOrgPerson.inc:908 ../lib/modules/inetOrgPerson.inc:2081
-#: ../lib/modules/inetOrgPerson.inc:2518
+#: ../lib/modules/inetOrgPerson.inc:2520
 #: ../lib/modules/asteriskVoicemail.inc:90
 #: ../lib/modules/asteriskVoicemail.inc:156
-#: ../lib/modules/customFields.inc:1706 ../lib/modules/heimdalKerberos.inc:117
-#: ../lib/modules/heimdalKerberos.inc:199
-#: ../lib/modules/heimdalKerberos.inc:211
-#: ../lib/modules/heimdalKerberos.inc:687
-#: ../lib/modules/heimdalKerberos.inc:690 ../lib/modules.inc:1040
-#: ../help/help.inc:180
+#: ../lib/modules/customFields.inc:1928 ../lib/modules/heimdalKerberos.inc:117
+#: ../lib/modules/heimdalKerberos.inc:204
+#: ../lib/modules/heimdalKerberos.inc:216
+#: ../lib/modules/heimdalKerberos.inc:692
+#: ../lib/modules/heimdalKerberos.inc:695 ../lib/modules.inc:1040
+#: ../help/help.inc:182
 msgid "Password"
 msgstr "密码"
 
@@ -7365,7 +7532,7 @@ msgstr "下次登录时修改密码"
 
 #: ../lib/modules/mitKerberos.inc:141 ../lib/modules/mitKerberos.inc:254
 #: ../lib/modules/heimdalKerberos.inc:111
-#: ../lib/modules/heimdalKerberos.inc:215
+#: ../lib/modules/heimdalKerberos.inc:220
 msgid "Password change command"
 msgstr "密码修改命令"
 
@@ -7374,7 +7541,7 @@ msgid "Password change options"
 msgstr "密码修改选项"
 
 #: ../lib/modules/ppolicyUser.inc:52 ../lib/modules/ppolicyUser.inc:67
-#: ../lib/modules/ppolicyUser.inc:121 ../lib/modules/ppolicyUser.inc:232
+#: ../lib/modules/ppolicyUser.inc:121 ../lib/modules/ppolicyUser.inc:254
 msgid "Password change required"
 msgstr "需要修改密码"
 
@@ -7386,7 +7553,7 @@ msgstr "修改密码时需要旧密码"
 
 #: ../lib/modules/mitKerberos.inc:182 ../lib/modules/mitKerberos.inc:468
 #: ../lib/modules/heimdalKerberos.inc:147
-#: ../lib/modules/heimdalKerberos.inc:385
+#: ../lib/modules/heimdalKerberos.inc:390
 msgid "Password change service"
 msgstr "密码修改服务"
 
@@ -7395,9 +7562,9 @@ msgid "Password check"
 msgstr "密码检查"
 
 #: ../lib/modules/mitKerberos.inc:288 ../lib/modules/selfRegistration.inc:424
-#: ../lib/modules/posixGroup.inc:529 ../lib/modules/sambaSamAccount.inc:106
-#: ../lib/modules/sambaSamAccount.inc:107 ../lib/modules/posixAccount.inc:92
-#: ../lib/modules/posixAccount.inc:93 ../lib/modules/windowsUser.inc:466
+#: ../lib/modules/posixGroup.inc:569 ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/sambaSamAccount.inc:107 ../lib/modules/posixAccount.inc:110
+#: ../lib/modules/posixAccount.inc:111 ../lib/modules/windowsUser.inc:466
 #: ../lib/modules/inetOrgPerson.inc:99
 msgid "Password contains invalid characters. Valid characters are:"
 msgstr "密码名包含非法字符,只能使用:"
@@ -7427,11 +7594,11 @@ msgstr "密码超期必须是自然数或-1."
 msgid "Password for voicemail mailbox."
 msgstr "语音邮箱的密码."
 
-#: ../lib/modules/posixGroup.inc:443 ../lib/modules/posixGroup.inc:488
-#: ../lib/modules/posixAccount.inc:163 ../lib/modules/posixAccount.inc:219
-#: ../lib/modules/posixAccount.inc:421 ../lib/modules/inetOrgPerson.inc:299
-#: ../lib/modules/inetOrgPerson.inc:880 ../lib/modules/customFields.inc:120
-#: ../lib/modules/customFields.inc:1718
+#: ../lib/modules/posixGroup.inc:479 ../lib/modules/posixGroup.inc:528
+#: ../lib/modules/posixAccount.inc:184 ../lib/modules/posixAccount.inc:240
+#: ../lib/modules/posixAccount.inc:450 ../lib/modules/inetOrgPerson.inc:299
+#: ../lib/modules/inetOrgPerson.inc:880 ../lib/modules/customFields.inc:122
+#: ../lib/modules/customFields.inc:1942
 msgid "Password hash type"
 msgstr "密码哈希类型"
 
@@ -7439,11 +7606,11 @@ msgstr "密码哈希类型"
 #: ../lib/modules/ppolicy.inc:138 ../lib/modules/ppolicy.inc:162
 #: ../lib/modules/ppolicy.inc:223 ../lib/modules/ppolicy.inc:467
 #: ../lib/modules/sambaDomain.inc:98 ../lib/modules/sambaDomain.inc:184
-#: ../lib/modules/sambaDomain.inc:276 ../lib/modules/sambaDomain.inc:641
+#: ../lib/modules/sambaDomain.inc:276 ../lib/modules/sambaDomain.inc:645
 msgid "Password history length"
 msgstr "历史密码长度"
 
-#: ../templates/config/confmain.php:349
+#: ../templates/config/confmain.php:350
 msgid "Password mail settings"
 msgstr "密码邮件设置"
 
@@ -7478,13 +7645,13 @@ msgstr "密码策略"
 msgid "Password policies (ppolicy)"
 msgstr "密码策略"
 
-#: ../templates/config/mainmanage.php:217 ../lib/types/user.inc:284
+#: ../templates/config/mainmanage.php:336 ../lib/types/user.inc:284
 #: ../lib/types/user.inc:837 ../lib/modules/ppolicyUser.inc:38
 #: ../lib/modules/ppolicyUser.inc:48 ../lib/modules/ppolicyUser.inc:60
 #: ../lib/modules/ppolicyUser.inc:76 ../lib/modules/ppolicyUser.inc:112
-#: ../lib/modules/ppolicyUser.inc:227 ../lib/modules/ppolicyUser.inc:260
+#: ../lib/modules/ppolicyUser.inc:249 ../lib/modules/ppolicyUser.inc:282
 #: ../lib/modules/ppolicy.inc:55 ../lib/modules/sambaDomain.inc:259
-#: ../help/help.inc:148
+#: ../help/help.inc:150
 msgid "Password policy"
 msgstr "密码策略"
 
@@ -7494,21 +7661,21 @@ msgstr "密码策略"
 msgid "Password quality check"
 msgstr "密码质量检查"
 
-#: ../lib/modules/passwordSelfReset.inc:230
+#: ../lib/modules/passwordSelfReset.inc:246
 msgid "Password reset confirmation"
 msgstr "密码重置确认"
 
-#: ../lib/modules/passwordSelfReset.inc:214
+#: ../lib/modules/passwordSelfReset.inc:230
 msgid "Password reset notification"
 msgstr "密码重置提示"
 
-#: ../lib/modules/passwordSelfReset.inc:58
-#: ../lib/modules/passwordSelfReset.inc:722
-#: ../lib/modules/passwordSelfReset.inc:918
+#: ../lib/modules/passwordSelfReset.inc:59
+#: ../lib/modules/passwordSelfReset.inc:744
+#: ../lib/modules/passwordSelfReset.inc:963
 msgid "Password self reset"
 msgstr "密码复位"
 
-#: ../lib/modules/passwordSelfReset.inc:1384
+#: ../lib/modules/passwordSelfReset.inc:1468
 msgid "Password successfully reset."
 msgstr "密码被成功复位."
 
@@ -7523,9 +7690,9 @@ msgstr "密码提醒日期"
 msgid "Password warning must be are natural number."
 msgstr "密码提醒日期必须是自然数."
 
-#: ../templates/config/confmain.php:576
+#: ../templates/config/confmain.php:580
 #: ../templates/3rdParty/pla/htdocs/password_checker.php:61
-#: ../lib/modules/passwordSelfReset.inc:986 ../lib/modules.inc:1116
+#: ../lib/modules/passwordSelfReset.inc:1038 ../lib/modules.inc:1116
 msgid "Passwords are different!"
 msgstr "密码不同!"
 
@@ -7561,7 +7728,7 @@ msgstr ""
 msgid "Path separator"
 msgstr "路径分隔符"
 
-#: ../templates/config/confmain.php:299
+#: ../templates/config/confmain.php:300
 msgid "Path to external script"
 msgstr "外部脚本路径"
 
@@ -7602,8 +7769,8 @@ msgid "Personal data"
 msgstr "个人数据"
 
 #: ../lib/types/user.inc:102 ../lib/types/user.inc:620
-#: ../lib/modules/inetOrgPerson.inc:143 ../lib/modules/inetOrgPerson.inc:3139
-#: ../lib/modules/inetOrgPerson.inc:3146
+#: ../lib/modules/inetOrgPerson.inc:143 ../lib/modules/inetOrgPerson.inc:3141
+#: ../lib/modules/inetOrgPerson.inc:3148
 msgid "Photo"
 msgstr "照片"
 
@@ -7620,7 +7787,7 @@ msgstr "照片文件(JPG格式)"
 msgid "Pickup group"
 msgstr "接听组"
 
-#: ../lib/modules/ldapPublicKey.inc:67
+#: ../lib/modules/ldapPublicKey.inc:70
 msgid "Please a comma separated list of your public SSH keys."
 msgstr "您的公钥列表,以逗号分隔."
 
@@ -7681,7 +7848,7 @@ msgstr "请输入一个一般命名!"
 msgid "Please enter a correct list of valid mail domains."
 msgstr "请输入正确有效的邮箱域列表"
 
-#: ../lib/modules/customFields.inc:77
+#: ../lib/modules/customFields.inc:79
 msgid "Please enter a descriptive label for this field."
 msgstr "输入此域的描述标签."
 
@@ -7702,7 +7869,7 @@ msgstr "输入此主机的描述信息"
 msgid "Please enter a descriptive text for this user."
 msgstr "输入此用户的描述信息."
 
-#: ../lib/modules/groupOfNames.inc:145
+#: ../lib/modules/groupOfNames.inc:174
 msgid "Please enter a group name!"
 msgstr "请输入组名!"
 
@@ -7722,11 +7889,11 @@ msgstr "请输入设备名"
 msgid "Please enter a name for this policy."
 msgstr "请为这个密码策略输入一个名字."
 
-#: ../lib/modules/customFields.inc:1873
+#: ../lib/modules/customFields.inc:2110
 msgid "Please enter a natural number for column count."
 msgstr "请为列的数量输入一个自然数。"
 
-#: ../lib/modules/customFields.inc:1883
+#: ../lib/modules/customFields.inc:2120
 msgid "Please enter a natural number for row count."
 msgstr "请为行的数量输入一个自然数."
 
@@ -7751,6 +7918,7 @@ msgid "Please enter a number for quota size."
 msgstr "请输入磁盘限额"
 
 #: ../templates/lib/141_jquery-validationEngine-lang.php:51
+#: ../templates/lib/141_jquery-validationEngine-lang.php:55
 #: ../lib/modules/zarafaUser.inc:440 ../lib/modules/zarafaUser.inc:441
 #: ../lib/modules/zarafaUser.inc:442 ../lib/modules/zarafaUser.inc:443
 #: ../lib/modules/zarafaUser.inc:444 ../lib/modules/zarafaUser.inc:445
@@ -7794,7 +7962,7 @@ msgstr "请为密码历史长度输入一个数值"
 msgid "Please enter a role name."
 msgstr "请输入角色名."
 
-#: ../lib/modules/passwordSelfReset.inc:1007
+#: ../lib/modules/passwordSelfReset.inc:1059
 msgid "Please enter a security answer."
 msgstr "请输入安全问题."
 
@@ -7808,7 +7976,7 @@ msgid ""
 "link."
 msgstr "请为含建立链接的确认邮件输入文本."
 
-#: ../lib/modules/customFields.inc:73
+#: ../lib/modules/customFields.inc:75
 msgid "Please enter a unique name for this field."
 msgstr "请这个域输入一个唯一的名字."
 
@@ -7816,7 +7984,7 @@ msgstr "请这个域输入一个唯一的名字."
 msgid "Please enter a unique name for this password policy."
 msgstr "请为这个密码策略输入一个唯一的名字"
 
-#: ../lib/modules/kolabUser.inc:201 ../lib/modules/kolabUser.inc:207
+#: ../lib/modules/kolabUser.inc:238 ../lib/modules/kolabUser.inc:244
 msgid "Please enter a user password."
 msgstr "请输入用户密码."
 
@@ -7825,7 +7993,7 @@ msgstr "请输入用户密码."
 msgid "Please enter a valid DN in the field:"
 msgstr "请输入有效的DN!"
 
-#: ../lib/modules/customFields.inc:993 ../lib/modules/customFields.inc:1316
+#: ../lib/modules/customFields.inc:1105 ../lib/modules/customFields.inc:1507
 msgid ""
 "Please enter a valid LDAP attribute name. Allowed characters are a-z, 0-9, _ "
 "and -."
@@ -7835,7 +8003,7 @@ msgstr "请输入合法的LDAP属性名,只能使用 a-z,0-9,_和-."
 msgid "Please enter a valid account status."
 msgstr "请输入有效的用户状态."
 
-#: ../templates/config/confmain.php:520
+#: ../templates/config/confmain.php:524
 msgid "Please enter a valid bind user."
 msgstr "请输入有效的绑定账号."
 
@@ -7843,7 +8011,7 @@ msgstr "请输入有效的绑定账号."
 msgid "Please enter a valid business category!"
 msgstr "请输入有效的商业种类!"
 
-#: ../lib/modules/posixAccount.inc:111 ../lib/modules/posixAccount.inc:112
+#: ../lib/modules/posixAccount.inc:129 ../lib/modules/posixAccount.inc:130
 #: ../lib/modules/inetOrgPerson.inc:90 ../lib/modules/inetOrgPerson.inc:91
 msgid "Please enter a valid common name!"
 msgstr "请输入有效的全名!"
@@ -7854,8 +8022,8 @@ msgstr "请输入有效的配置类型!"
 
 #: ../lib/modules/mitKerberos.inc:282 ../lib/modules/mitKerberos.inc:283
 #: ../lib/modules/qmailUser.inc:463 ../lib/modules/sambaSamAccount.inc:116
-#: ../lib/modules/heimdalKerberos.inc:241
-#: ../lib/modules/heimdalKerberos.inc:242
+#: ../lib/modules/heimdalKerberos.inc:246
+#: ../lib/modules/heimdalKerberos.inc:247
 msgid "Please enter a valid date in format DD-MM-YYYY."
 msgstr "请输入日期,格式为(DD-MM-YYYY)."
 
@@ -7878,6 +8046,7 @@ msgstr "请输入有效的显示名!"
 msgid "Please enter a valid drive letter."
 msgstr "请输入有效的盘符."
 
+#: ../lib/modules/kolabGroup.inc:158 ../lib/modules/kolabGroup.inc:159
 #: ../lib/modules/selfRegistration.inc:417
 #: ../lib/modules/zarafaDynamicGroup.inc:193
 #: ../lib/modules/zarafaDynamicGroup.inc:194 ../lib/modules/qmailUser.inc:441
@@ -7892,9 +8061,9 @@ msgstr "请输入有效的盘符."
 #: ../lib/modules/qmailGroup.inc:419 ../lib/modules/qmailGroup.inc:420
 #: ../lib/modules/qmailGroup.inc:421 ../lib/modules/qmailGroup.inc:422
 #: ../lib/modules/qmailGroup.inc:423 ../lib/modules/qmailGroup.inc:424
-#: ../lib/modules/qmailGroup.inc:425 ../lib/modules/passwordSelfReset.inc:745
-#: ../lib/modules/passwordSelfReset.inc:941
-#: ../lib/modules/windowsGroup.inc:242 ../lib/modules/windowsGroup.inc:243
+#: ../lib/modules/qmailGroup.inc:425 ../lib/modules/passwordSelfReset.inc:767
+#: ../lib/modules/passwordSelfReset.inc:986
+#: ../lib/modules/windowsGroup.inc:259 ../lib/modules/windowsGroup.inc:260
 #: ../lib/modules.inc:1161
 msgid "Please enter a valid email address!"
 msgstr "请输入有效的邮件地址!"
@@ -7905,8 +8074,8 @@ msgstr "请输入有效的邮件地址!"
 msgid "Please enter a valid email alias."
 msgstr "请输入有效的邮件地址."
 
-#: ../lib/modules/passwordSelfReset.inc:752
-#: ../lib/modules/passwordSelfReset.inc:948
+#: ../lib/modules/passwordSelfReset.inc:774
+#: ../lib/modules/passwordSelfReset.inc:993
 msgid "Please enter a valid employee number."
 msgstr "请输入有效的员工号."
 
@@ -7918,7 +8087,7 @@ msgstr "请输入有效的雇员类别!"
 msgid "Please enter a valid fax number!"
 msgstr "请输入有效的传真号!"
 
-#: ../lib/modules/customFields.inc:143
+#: ../lib/modules/customFields.inc:157
 msgid ""
 "Please enter a valid field name. Only letters, numbers, dash and underline "
 "are allowed."
@@ -7949,11 +8118,11 @@ msgstr "请输入有效的来自账号!"
 msgid "Please enter a valid group name!"
 msgstr "请输入有效的组名!"
 
-#: ../lib/modules/windowsGroup.inc:246
+#: ../lib/modules/windowsGroup.inc:263
 msgid "Please enter a valid group scope."
 msgstr "请输入有效的组范围."
 
-#: ../lib/modules/windowsGroup.inc:247
+#: ../lib/modules/windowsGroup.inc:264
 msgid "Please enter a valid group type."
 msgstr "请输入有效的组类型."
 
@@ -7986,10 +8155,14 @@ msgstr "请输入有效的服务列表名."
 msgid "Please enter a valid mobile number!"
 msgstr "请输入有效的手机号!"
 
-#: ../lib/modules/customFields.inc:145
+#: ../lib/modules/customFields.inc:160
 msgid "Please enter a valid object class."
 msgstr "请输入有效的目标类."
 
+#: ../lib/modules/dhcp_settings.inc:324
+msgid "Please enter a valid option."
+msgstr "请输入有效的选项."
+
 #: ../lib/modules/zarafaServer.inc:170 ../lib/modules/zarafaServer.inc:171
 msgid "Please enter a valid path."
 msgstr "请输入有效的路径."
@@ -8018,6 +8191,11 @@ msgstr "请输入有效的主要联系."
 msgid "Please enter a valid realm."
 msgstr "请输入有效的域."
 
+#: ../lib/modules/kolabGroup.inc:162 ../lib/modules/kolabGroup.inc:163
+#: ../lib/modules/kolabUser.inc:219 ../lib/modules/kolabUser.inc:220
+msgid "Please enter a valid recepient expression."
+msgstr "请输入有效的接收者表达式!"
+
 #: ../lib/modules/inetOrgPerson.inc:82 ../lib/modules/inetOrgPerson.inc:83
 msgid "Please enter a valid registered address."
 msgstr "请输入有效的注册地址!"
@@ -8026,6 +8204,11 @@ msgstr "请输入有效的注册地址!"
 msgid "Please enter a valid scoped affiliation."
 msgstr "请输入有效的有限联系."
 
+#: ../lib/modules/kolabGroup.inc:164 ../lib/modules/kolabGroup.inc:165
+#: ../lib/modules/kolabUser.inc:221 ../lib/modules/kolabUser.inc:222
+msgid "Please enter a valid sender expression."
+msgstr "请输入有效的发送者表达式."
+
 #: ../lib/modules/qmailUser.inc:461 ../lib/modules/qmailUser.inc:462
 #: ../lib/modules/imapAccess.inc:158
 msgid "Please enter a valid server name where the mailboxes reside."
@@ -8042,34 +8225,34 @@ msgstr "请输入有效的街道名!"
 msgid "Please enter a valid telephone number!"
 msgstr "请输入有效的电话号码!"
 
-#: ../lib/modules/passwordSelfReset.inc:759
-#: ../lib/modules/passwordSelfReset.inc:955
+#: ../lib/modules/passwordSelfReset.inc:788
+#: ../lib/modules/passwordSelfReset.inc:1007
 msgid "Please enter a valid user name or email address."
 msgstr "请输入有效的用户名或邮件地址."
 
-#: ../lib/modules/posixGroup.inc:632 ../lib/modules/posixAccount.inc:976
-#: ../lib/modules/posixAccount.inc:981
+#: ../lib/modules/posixGroup.inc:695 ../lib/modules/posixAccount.inc:1078
+#: ../lib/modules/posixAccount.inc:1083
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "请输入有效值(介于%s和%s之间)!"
 
-#: ../lib/modules/customFields.inc:2018
+#: ../lib/modules/customFields.inc:2267
 msgid "Please enter a value for status \"checked\"."
 msgstr "请为状态\"选中\"输入一个值."
 
-#: ../lib/modules/customFields.inc:2025
+#: ../lib/modules/customFields.inc:2274
 msgid "Please enter a value for status \"unchecked\"."
 msgstr "请为状态\"未选中\"输入一个值."
 
-#: ../lib/modules/customFields.inc:65
+#: ../lib/modules/customFields.inc:67
 msgid "Please enter an alias for this group."
 msgstr "请为这个账号输入一个别名."
 
-#: ../lib/modules/customFields.inc:144
+#: ../lib/modules/customFields.inc:159
 msgid "Please enter an alias name."
 msgstr "请输入有效的别名!"
 
-#: ../lib/modules/kolabUser.inc:213 ../lib/modules/imapAccess.inc:188
+#: ../lib/modules/kolabUser.inc:250 ../lib/modules/imapAccess.inc:188
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "请在本页面输入邮件地址:%s"
@@ -8107,7 +8290,7 @@ msgstr "输入序列名只能使用ASCII字符."
 msgid "Please enter only ASCII characters for the user names."
 msgstr "输入用户名只能使用ASCII字符."
 
-#: ../lib/modules/passwordSelfReset.inc:258
+#: ../lib/modules/passwordSelfReset.inc:274
 msgid ""
 "Please enter the DN and password of the administrative password self reset "
 "account."
@@ -8119,7 +8302,7 @@ msgid ""
 "account."
 msgstr "请输入管理员级密码自助复位的帐号和密码."
 
-#: ../lib/modules/posixGroup.inc:464 ../lib/modules/posixAccount.inc:462
+#: ../lib/modules/posixGroup.inc:500 ../lib/modules/posixAccount.inc:491
 msgid ""
 "Please enter the DN of the LDAP entry with object class \"sambaUnixIdPool\"."
 msgstr "请输入目标类为\"sambaUnixIdPool\"的 LDAP 条目的DN"
@@ -8132,15 +8315,15 @@ msgstr "请输入DNS服务器IP地址"
 msgid "Please enter the LDAP DN that should be used to create new users."
 msgstr "请输入用于建立新用户的LDAP DN."
 
-#: ../lib/modules/passwordSelfReset.inc:93
+#: ../lib/modules/passwordSelfReset.inc:94
 msgid "Please enter the LDAP DN that should be used to reset passwords."
 msgstr "请输入用于复位密码的LDAP DN."
 
-#: ../lib/modules/customFields.inc:81
+#: ../lib/modules/customFields.inc:83
 msgid "Please enter the LDAP attribute name for this field."
 msgstr "请为此域输入LDAP属性."
 
-#: ../help/help.inc:117
+#: ../help/help.inc:119
 msgid ""
 "Please enter the LDAP suffix where LAM should start to search for users. The "
 "LDAP filter needs to match the given user name to exactly one DN. The value "
@@ -8179,7 +8362,7 @@ msgid ""
 "Please enter the automount entry (e.g. \"-fstype=nfs,rw server:/home\")."
 msgstr "请输入自动挂接条目(比如:\"-fstype=nfs,rw server:/home\")"
 
-#: ../templates/login.php:285
+#: ../templates/login.php:295
 msgid "Please enter the configuration and create a server profile."
 msgstr "请输入配置名称并新建一个服务器配置"
 
@@ -8234,7 +8417,7 @@ msgstr "请输入映射条目(比如:\"-fstype=nfs,rw server:/projects\")"
 msgid "Please enter the mapping name for this entry (e.g. auto.home)."
 msgstr "请输入本条目的映射名(比如:auto.home)."
 
-#: ../help/help.inc:137
+#: ../help/help.inc:139
 msgid ""
 "Please enter the master configuration password. This is NOT your LDAP "
 "password. It is stored in your config.cfg file. If this is the first time "
@@ -8243,7 +8426,7 @@ msgstr ""
 "请输入本系统管理配置密码,不是LDAP密码,存在在config.cfg文件中,如果第一次登录,"
 "请输入\"lam\"."
 
-#: ../templates/config/mainlogin.php:143
+#: ../templates/config/mainlogin.php:145
 msgid "Please enter the master password to change the general preferences:"
 msgstr "更改一般配置,请输入管理密码:"
 
@@ -8251,38 +8434,38 @@ msgstr "更改一般配置,请输入管理密码:"
 msgid "Please enter the message store."
 msgstr "请输入消息的存储空间"
 
-#: ../help/help.inc:125
+#: ../help/help.inc:127
 msgid ""
 "Please enter the name of the new profile and the password to change its "
 "settings. Profile names may contain letters, numbers and -/_."
 msgstr "请输入新配置文件名和密码.配置文件名可以包含字符和-/_ ."
 
-#: ../help/help.inc:127
+#: ../help/help.inc:129
 msgid ""
 "Please enter the new name of the profile. The name may contain letters, "
 "numbers and -/_."
 msgstr "請輸入新的設定檔名稱.可以包含字母,數字和 -/_ ."
 
 #: ../lib/modules/selfRegistration.inc:105
-#: ../lib/modules/passwordSelfReset.inc:97
+#: ../lib/modules/passwordSelfReset.inc:98
 msgid ""
 "Please enter the password for the admin DN. Please note that this is saved "
 "as clear-text in the self service profile."
 msgstr "请输入管理DN的密码.请注意密码将在自助服务配置中以明文存放."
 
-#: ../lib/modules/asteriskAccount.inc:107 ../lib/modules/posixAccount.inc:483
+#: ../lib/modules/asteriskAccount.inc:107 ../lib/modules/posixAccount.inc:512
 #: ../lib/modules/windowsUser.inc:199 ../lib/modules/inetOrgPerson.inc:909
 msgid "Please enter the password which you want to set for this account."
 msgstr "请输入这个帐号的密码."
 
-#: ../help/help.inc:181
+#: ../help/help.inc:183
 msgid ""
 "Please enter the password which you want to set for this account. You may "
 "also generate a random password (12 characters) which will be displayed on "
 "your screen."
 msgstr "请输入本帐号的密码.可以生成一个12个字符长的随机密码,显示在屏幕上."
 
-#: ../lib/modules/posixAccount.inc:438
+#: ../lib/modules/posixAccount.inc:467
 msgid "Please enter the path to the user's home directory."
 msgstr "请输入用户主目录路径."
 
@@ -8294,7 +8477,7 @@ msgstr "请输入非加密的HTTP连接端口号"
 msgid "Please enter the port number for encrypted connections."
 msgstr "请输入加密连接的端口号"
 
-#: ../lib/modules/passwordSelfReset.inc:73
+#: ../lib/modules/passwordSelfReset.inc:74
 msgid ""
 "Please enter the possible security questions for the password self reset."
 msgstr "请为密码复位设置安全提问."
@@ -8333,7 +8516,7 @@ msgstr ""
 "请输入正则表达式 (比如:\"/^[0-9a-zA-Z]+$/\") ,如果值不匹配,则会显示错误信息."
 "语法的描述 <a href=\"%s\">看这里</a>."
 
-#: ../lib/modules/customFields.inc:93
+#: ../lib/modules/customFields.inc:95
 #, php-format
 msgid ""
 "Please enter the regular expression (e.g. \"/^[0-9a-zA-Z]+$/\") to validate "
@@ -8342,14 +8525,14 @@ msgstr ""
 "请输入正则表达式 (比如:\"/^[0-9a-zA-Z]+$/\")来校验这个域 .语法的描述 <a href="
 "\"%s\">看这里</a>."
 
-#: ../templates/lists/changePassword.php:476
+#: ../templates/lists/changePassword.php:480
 #: ../lib/modules/selfRegistration.inc:421
-#: ../lib/modules/sambaSamAccount.inc:105 ../lib/modules/posixAccount.inc:91
-#: ../lib/modules/windowsUser.inc:465 ../lib/modules/customFields.inc:1783
+#: ../lib/modules/sambaSamAccount.inc:105 ../lib/modules/posixAccount.inc:109
+#: ../lib/modules/windowsUser.inc:465 ../lib/modules/customFields.inc:2008
 msgid "Please enter the same password in both password fields."
 msgstr "在两个密码输入框请输入相同的密码."
 
-#: ../lib/modules/passwordSelfReset.inc:69
+#: ../lib/modules/passwordSelfReset.inc:70
 msgid "Please enter the security question for the password self reset."
 msgstr "请为密码自复位输入安全提问."
 
@@ -8376,11 +8559,11 @@ msgstr "请输入主配置密码来修改用户自助服务配置文件."
 msgid "Please enter your password to change the server preferences:"
 msgstr "改变服务器配置,请输入密码:"
 
-#: ../lib/modules/ldapPublicKey.inc:63
+#: ../lib/modules/ldapPublicKey.inc:66
 msgid "Please enter your public SSH key."
 msgstr "请输入您的SSH公钥."
 
-#: ../lib/modules/range.inc:394 ../lib/modules/fixed_ip.inc:329
+#: ../lib/modules/range.inc:394 ../lib/modules/fixed_ip.inc:348
 msgid "Please fill out the DHCP settings first."
 msgstr "请先填写DHCP设置"
 
@@ -8395,6 +8578,10 @@ msgid ""
 "represent one account for each row."
 msgstr "请提供帐号数据CSV格式文件.第一行必须为栏目标识,以下每行表示一个帐号."
 
+#: ../lib/config.inc:1617
+msgid "Please provide a file in DER or PEM format."
+msgstr "请提供 DER 或 PEM 格式的文件。"
+
 #: ../templates/massBuildAccounts.php:256
 msgid "Please provide a file to upload."
 msgstr "请提供上传的文件。"
@@ -8404,11 +8591,11 @@ msgid ""
 "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr "请选择图像文件上传,必须是JPG格式(.jpg/.jpeg)."
 
-#: ../lib/modules/customFields.inc:85
+#: ../lib/modules/customFields.inc:87
 msgid "Please select the field type (e.g. text field)."
 msgstr "请输入域的类型(比如:文本框). "
 
-#: ../help/help.inc:143
+#: ../help/help.inc:145
 msgid ""
 "Please select your prefered log level. Messages with a lower level will not "
 "be logged."
@@ -8428,14 +8615,14 @@ msgstr "请在页面%s上输入必须的属性."
 msgid "Please set up your master configuration file (config/config.cfg) first!"
 msgstr "请先主配置文件(config/config.cfg)!"
 
-#: ../lib/modules/dhcp_settings.inc:521 ../lib/modules/ddns.inc:355
+#: ../lib/modules/dhcp_settings.inc:544 ../lib/modules/ddns.inc:355
 msgid ""
 "Please set your LDAP suffix to an LDAP entry with object class \"dhcpService"
 "\" or \"dhcpServer\"."
 msgstr ""
 "请设置LDAP后缀为一个目标类为\"dhcpService\" 或者 \"dhcpServer\"的 LDAP 条目."
 
-#: ../lib/modules/passwordSelfReset.inc:133
+#: ../lib/modules/passwordSelfReset.inc:134
 msgid "Please specify how your users need to identify themselves."
 msgstr "请指定你的用户需要怎样标识自己."
 
@@ -8443,7 +8630,7 @@ msgstr "请指定你的用户需要怎样标识自己."
 msgid "Please specify the group scope."
 msgstr "请指定组的范围"
 
-#: ../lib/modules/customFields.inc:125
+#: ../lib/modules/customFields.inc:127
 msgid ""
 "Please specify the possible values for this field. Each value can have a "
 "descriptive label that is displayed to the user."
@@ -8458,7 +8645,7 @@ msgstr "请稍等"
 msgid "Policy count: %s"
 msgstr "策略总计: %s"
 
-#: ../lib/modules/kolabUser.inc:179
+#: ../lib/modules/kolabUser.inc:212
 msgid "Policy list has invalid format!"
 msgstr "策略列表含有非法格式!"
 
@@ -8475,19 +8662,20 @@ msgstr "端口"
 msgid "Port number."
 msgstr "端口号"
 
-#: ../templates/pdfedit/pdfpage.php:557 ../templates/pdfedit/pdfpage.php:567
-#: ../templates/pdfedit/pdfpage.php:577 ../templates/pdfedit/pdfpage.php:592
+#: ../templates/pdfedit/pdfpage.php:592 ../templates/pdfedit/pdfpage.php:602
+#: ../templates/pdfedit/pdfpage.php:612 ../templates/pdfedit/pdfpage.php:627
 msgid "Position"
 msgstr "位置"
 
 #: ../templates/masscreate.php:304 ../templates/masscreate.php:379
 #: ../lib/modules/customScripts.inc:113 ../lib/modules/customScripts.inc:115
 #: ../lib/modules/customScripts.inc:117
-#: ../lib/modules/sambaGroupMapping.inc:436
+#: ../lib/modules/sambaGroupMapping.inc:591
 msgid "Possible values"
 msgstr "可能的值"
 
-#: ../lib/modules/posixGroup.inc:469
+#: ../lib/modules/posixGroup.inc:505 ../lib/modules/sambaGroupMapping.inc:165
+#: ../lib/modules/groupOfNames.inc:94
 msgid ""
 "Possible wildcards are: \"*\" = any character, \"^\" = line start, \"$\" = "
 "line end"
@@ -8500,8 +8688,8 @@ msgstr "可能的通配符是: \"*\" = 任意字符, \"^\" = 行的开头, \"$\"
 #: ../lib/modules/inetOrgPerson.inc:164 ../lib/modules/inetOrgPerson.inc:312
 #: ../lib/modules/inetOrgPerson.inc:478 ../lib/modules/inetOrgPerson.inc:617
 #: ../lib/modules/inetOrgPerson.inc:741 ../lib/modules/inetOrgPerson.inc:745
-#: ../lib/modules/inetOrgPerson.inc:1507 ../lib/modules/inetOrgPerson.inc:2362
-#: ../lib/modules/inetOrgPerson.inc:3055
+#: ../lib/modules/inetOrgPerson.inc:1507 ../lib/modules/inetOrgPerson.inc:2364
+#: ../lib/modules/inetOrgPerson.inc:3057
 msgid "Post office box"
 msgstr "邮政信箱"
 
@@ -8509,7 +8697,7 @@ msgstr "邮政信箱"
 #: ../lib/modules/inetOrgPerson.inc:176 ../lib/modules/inetOrgPerson.inc:320
 #: ../lib/modules/inetOrgPerson.inc:462 ../lib/modules/inetOrgPerson.inc:629
 #: ../lib/modules/inetOrgPerson.inc:757 ../lib/modules/inetOrgPerson.inc:1617
-#: ../lib/modules/inetOrgPerson.inc:2364 ../lib/modules/inetOrgPerson.inc:3022
+#: ../lib/modules/inetOrgPerson.inc:2366 ../lib/modules/inetOrgPerson.inc:3024
 msgid "Postal address"
 msgstr "邮政地址"
 
@@ -8525,8 +8713,8 @@ msgstr "邮政地址,城市"
 #: ../lib/modules/inetOrgPerson.inc:167 ../lib/modules/inetOrgPerson.inc:314
 #: ../lib/modules/inetOrgPerson.inc:454 ../lib/modules/inetOrgPerson.inc:620
 #: ../lib/modules/inetOrgPerson.inc:749 ../lib/modules/inetOrgPerson.inc:753
-#: ../lib/modules/inetOrgPerson.inc:1534 ../lib/modules/inetOrgPerson.inc:2363
-#: ../lib/modules/inetOrgPerson.inc:3044
+#: ../lib/modules/inetOrgPerson.inc:1534 ../lib/modules/inetOrgPerson.inc:2365
+#: ../lib/modules/inetOrgPerson.inc:3046
 msgid "Postal code"
 msgstr "邮政编码"
 
@@ -8543,7 +8731,7 @@ msgstr "预定义环境"
 msgid "Predefined services"
 msgstr "预定义服务"
 
-#: ../help/help.inc:87
+#: ../help/help.inc:89
 msgid "Predefined values"
 msgstr "预订值"
 
@@ -8561,11 +8749,11 @@ msgstr "总裁"
 msgid "Primary affiliation"
 msgstr "主要联系"
 
-#: ../lib/modules/posixAccount.inc:275 ../lib/modules/posixAccount.inc:359
-#: ../lib/modules/posixAccount.inc:384 ../lib/modules/posixAccount.inc:429
-#: ../lib/modules/posixAccount.inc:474 ../lib/modules/posixAccount.inc:512
-#: ../lib/modules/posixAccount.inc:1246 ../lib/modules/posixAccount.inc:1516
-#: ../lib/modules/posixAccount.inc:1562 ../lib/modules/posixAccount.inc:1619
+#: ../lib/modules/posixAccount.inc:290 ../lib/modules/posixAccount.inc:382
+#: ../lib/modules/posixAccount.inc:407 ../lib/modules/posixAccount.inc:458
+#: ../lib/modules/posixAccount.inc:503 ../lib/modules/posixAccount.inc:541
+#: ../lib/modules/posixAccount.inc:1348 ../lib/modules/posixAccount.inc:1631
+#: ../lib/modules/posixAccount.inc:1677 ../lib/modules/posixAccount.inc:1743
 msgid "Primary group"
 msgstr "主要组"
 
@@ -8609,9 +8797,9 @@ msgstr "配置文件编辑器"
 #: ../templates/config/profmanage.php:159
 #: ../templates/config/profmanage.php:236
 #: ../templates/selfService/profManage.php:101
-#: ../templates/selfService/profManage.php:199 ../help/help.inc:124
-#: ../help/help.inc:126 ../help/help.inc:128 ../help/help.inc:130
-#: ../help/help.inc:132
+#: ../templates/selfService/profManage.php:199 ../help/help.inc:126
+#: ../help/help.inc:128 ../help/help.inc:130 ../help/help.inc:132
+#: ../help/help.inc:134
 msgid "Profile management"
 msgstr "配置文件管理"
 
@@ -8625,7 +8813,7 @@ msgstr "配置文件管理"
 #: ../templates/selfService/profManage.php:233
 #: ../templates/profedit/profilepage.php:186
 #: ../templates/profedit/profilemain.php:275
-#: ../templates/profedit/profilemain.php:319 ../help/help.inc:166
+#: ../templates/profedit/profilemain.php:319 ../help/help.inc:168
 msgid "Profile name"
 msgstr "配置文件名"
 
@@ -8713,15 +8901,15 @@ msgstr "Qmail"
 msgid "Qualify"
 msgstr "合格"
 
-#: ../lib/modules/passwordSelfReset.inc:68
-#: ../lib/modules/passwordSelfReset.inc:142
-#: ../lib/modules/passwordSelfReset.inc:149
-#: ../lib/modules/passwordSelfReset.inc:162
-#: ../lib/modules/passwordSelfReset.inc:246
-#: ../lib/modules/passwordSelfReset.inc:282
-#: ../lib/modules/passwordSelfReset.inc:391
-#: ../lib/modules/passwordSelfReset.inc:535
-#: ../lib/modules/passwordSelfReset.inc:868
+#: ../lib/modules/passwordSelfReset.inc:69
+#: ../lib/modules/passwordSelfReset.inc:151
+#: ../lib/modules/passwordSelfReset.inc:158
+#: ../lib/modules/passwordSelfReset.inc:171
+#: ../lib/modules/passwordSelfReset.inc:262
+#: ../lib/modules/passwordSelfReset.inc:298
+#: ../lib/modules/passwordSelfReset.inc:407
+#: ../lib/modules/passwordSelfReset.inc:551
+#: ../lib/modules/passwordSelfReset.inc:910
 msgid "Question"
 msgstr "提问"
 
@@ -8734,7 +8922,7 @@ msgstr "提问"
 msgid "Quota"
 msgstr "配额"
 
-#: ../lib/modules/quota.inc:690
+#: ../lib/modules/quota.inc:691
 #, php-format
 msgid "Quota for %s on %s"
 msgstr "%s 在 %s 的硬盘配额:"
@@ -8783,7 +8971,7 @@ msgid "Quota warning limit"
 msgstr "限制告警点."
 
 #: ../templates/masscreate.php:328 ../templates/profedit/profilepage.php:213
-#: ../lib/modules.inc:1001 ../help/help.inc:164
+#: ../lib/modules.inc:1001 ../help/help.inc:166
 msgid "RDN identifier"
 msgstr "RDN标志"
 
@@ -8793,7 +8981,7 @@ msgstr "RID (Windows UID)"
 
 #: ../lib/modules/sambaDomain.inc:90 ../lib/modules/sambaDomain.inc:151
 #: ../lib/modules/sambaDomain.inc:182 ../lib/modules/sambaDomain.inc:376
-#: ../lib/modules/sambaDomain.inc:382 ../lib/modules/sambaDomain.inc:639
+#: ../lib/modules/sambaDomain.inc:382 ../lib/modules/sambaDomain.inc:643
 msgid "RID base"
 msgstr "RID 基类"
 
@@ -8819,7 +9007,7 @@ msgstr "RTP保持超时"
 msgid "RTP timeout"
 msgstr "RTP超时"
 
-#: ../lib/modules/customFields.inc:2160
+#: ../lib/modules/customFields.inc:2418
 msgid "Radio buttons"
 msgstr "单选按钮"
 
@@ -8836,15 +9024,16 @@ msgstr "范围到"
 msgid "Ranges"
 msgstr "范围"
 
-#: ../templates/config/confmain.php:305
+#: ../templates/config/confmain.php:306
 msgid "Read"
 msgstr "读"
 
-#: ../templates/config/confmain.php:261 ../lib/modules/customFields.inc:88
+#: ../templates/config/confmain.php:261 ../lib/modules/customFields.inc:90
+#: ../lib/modules/customFields.inc:1483
 msgid "Read-only"
 msgstr "只读"
 
-#: ../lib/modules/customFields.inc:89
+#: ../lib/modules/customFields.inc:91
 msgid ""
 "Read-only fields cannot be changed by the user. Use this if you want to show "
 "an attribute just for information."
@@ -8860,6 +9049,8 @@ msgstr "确定删除这些属性的值?"
 #: ../lib/modules/freeRadius.inc:170 ../lib/modules/freeRadius.inc:224
 #: ../lib/modules/freeRadius.inc:270 ../lib/modules/freeRadius.inc:618
 #: ../lib/modules/heimdalKerberos.inc:91
+#: ../lib/modules/heimdalKerberos.inc:150
+#: ../lib/modules/heimdalKerberos.inc:156
 msgid "Realm"
 msgstr "域"
 
@@ -8902,10 +9093,10 @@ msgstr "此对象的所有子集递归拷贝完毕"
 
 #: ../templates/config/profmanage.php:247
 #: ../templates/config/profmanage.php:285
-#: ../templates/config/mainmanage.php:250 ../templates/config/confmain.php:435
+#: ../templates/config/mainmanage.php:379 ../templates/config/confmain.php:436
 #: ../lib/modules/selfRegistration.inc:357
 #: ../lib/modules/sambaSamAccount.inc:2293
-#: ../lib/modules/posixAccount.inc:2301 ../lib/modules/windowsUser.inc:1322
+#: ../lib/modules/posixAccount.inc:2429 ../lib/modules/windowsUser.inc:1322
 msgid "Reenter password"
 msgstr "再次输入密码"
 
@@ -8939,7 +9130,7 @@ msgstr "注册新帐号"
 #: ../lib/modules/inetOrgPerson.inc:179 ../lib/modules/inetOrgPerson.inc:322
 #: ../lib/modules/inetOrgPerson.inc:470 ../lib/modules/inetOrgPerson.inc:632
 #: ../lib/modules/inetOrgPerson.inc:761 ../lib/modules/inetOrgPerson.inc:1646
-#: ../lib/modules/inetOrgPerson.inc:2365 ../lib/modules/inetOrgPerson.inc:3033
+#: ../lib/modules/inetOrgPerson.inc:2367 ../lib/modules/inetOrgPerson.inc:3035
 msgid "Registered address"
 msgstr "注册地址"
 
@@ -8982,19 +9173,19 @@ msgstr "如果冲突会被拒绝"
 msgid "Reloading"
 msgstr "重新载入"
 
-#: ../templates/login.php:416
+#: ../templates/login.php:430
 msgid "Remember user name"
 msgstr "记住用户的名字"
 
-#: ../templates/config/confmodules.php:300
-#: ../templates/pdfedit/pdfpage.php:479 ../lib/modules/mitKerberos.inc:689
+#: ../templates/config/confmodules.php:310
+#: ../templates/pdfedit/pdfpage.php:477 ../lib/modules/mitKerberos.inc:689
 #: ../lib/modules/qmailUser.inc:912 ../lib/modules/windowsHost.inc:151
-#: ../lib/modules/sambaSamAccount.inc:1454 ../lib/modules/kolabUser.inc:743
+#: ../lib/modules/sambaSamAccount.inc:1454 ../lib/modules/kolabUser.inc:822
 #: ../lib/modules/shadowAccount.inc:467 ../lib/modules/freeRadius.inc:476
 #: ../lib/modules/sudoRole.inc:266 ../lib/modules/sudoRole.inc:293
 #: ../lib/modules/sudoRole.inc:320 ../lib/modules/sudoRole.inc:347
 #: ../lib/modules/sudoRole.inc:374 ../lib/modules/sudoRole.inc:401
-#: ../lib/modules/heimdalKerberos.inc:590
+#: ../lib/modules/heimdalKerberos.inc:595 ../lib/modules/windowsGroup.inc:341
 msgid "Remove"
 msgstr "删除"
 
@@ -9018,7 +9209,7 @@ msgstr "删除FreeRadius扩展"
 msgid "Remove IP address extension"
 msgstr "删除 IP 地址扩展"
 
-#: ../lib/modules/mitKerberos.inc:473 ../lib/modules/heimdalKerberos.inc:389
+#: ../lib/modules/mitKerberos.inc:473 ../lib/modules/heimdalKerberos.inc:394
 msgid "Remove Kerberos extension"
 msgstr "删除Kerberos扩展"
 
@@ -9034,12 +9225,16 @@ msgstr "删除 Samba 3 扩展"
 msgid "Remove Shadow account extension"
 msgstr "删除 Shadow 帐号扩展"
 
+#: ../lib/modules/posixGroup.inc:242 ../lib/modules/posixAccount.inc:1413
+msgid "Remove Unix extension"
+msgstr "删除 Unix 扩展"
+
 #: ../lib/modules/zarafaContact.inc:247 ../lib/modules/zarafaGroup.inc:303
 #: ../lib/modules/zarafaUser.inc:687 ../lib/modules/zarafaServer.inc:225
 msgid "Remove Zarafa extension"
 msgstr "删除Zarafa扩展"
 
-#: ../lib/modules/customFields.inc:395
+#: ../lib/modules/customFields.inc:410
 msgid "Remove extension"
 msgstr "删除扩展"
 
@@ -9055,12 +9250,12 @@ msgstr "从所有的(唯一)名字组中删除."
 msgid "Remove host extension"
 msgstr "删除主机扩展"
 
-#: ../lib/modules/posixGroup.inc:214 ../lib/modules/posixAccount.inc:1303
+#: ../lib/modules/posixGroup.inc:211 ../lib/modules/posixAccount.inc:1406
 #: ../lib/modules/inetOrgPerson.inc:2089
 msgid "Remove password"
 msgstr "删除密码"
 
-#: ../lib/modules/passwordSelfReset.inc:300
+#: ../lib/modules/passwordSelfReset.inc:316
 msgid "Remove password self reset extension"
 msgstr "删除密码自助复位扩展"
 
@@ -9072,8 +9267,8 @@ msgstr "删除Qmail扩展"
 #: ../lib/modules/zarafaContact.inc:407 ../lib/modules/zarafaGroup.inc:476
 #: ../lib/modules/device.inc:287 ../lib/modules/zarafaUser.inc:934
 #: ../lib/modules/inetOrgPerson.inc:2213 ../lib/modules/qmailGroup.inc:843
-#: ../lib/modules/windowsGroup.inc:444 ../lib/modules/groupOfNames.inc:310
-#: ../lib/modules/groupOfNames.inc:424
+#: ../lib/modules/windowsGroup.inc:538 ../lib/modules/groupOfNames.inc:366
+#: ../lib/modules/groupOfNames.inc:501
 msgid "Remove selected entries"
 msgstr "删除所选条目"
 
@@ -9081,7 +9276,7 @@ msgstr "删除所选条目"
 msgid "Remove this account type"
 msgstr "删除这个帐号类型"
 
-#: ../lib/modules/inetOrgPerson.inc:3135
+#: ../lib/modules/inetOrgPerson.inc:3137
 msgid "Remove/replace photo"
 msgstr "删除/更改照片"
 
@@ -9105,7 +9300,7 @@ msgstr "将<b>%s</b> 重新命名到新的对象"
 #: ../templates/config/profmanage.php:258
 #: ../templates/config/profmanage.php:264
 #: ../templates/selfService/profManage.php:216
-#: ../templates/selfService/profManage.php:226 ../help/help.inc:126
+#: ../templates/selfService/profManage.php:226 ../help/help.inc:128
 msgid "Rename profile"
 msgstr "配置文件重命名"
 
@@ -9132,34 +9327,34 @@ msgstr "重命名中"
 #: ../lib/modules/mitKerberos.inc:229 ../lib/modules/mitKerberos.inc:246
 #: ../lib/modules/mitKerberos.inc:367 ../lib/modules/mitKerberos.inc:772
 #: ../lib/modules/heimdalKerberos.inc:107
-#: ../lib/modules/heimdalKerberos.inc:153
-#: ../lib/modules/heimdalKerberos.inc:193
-#: ../lib/modules/heimdalKerberos.inc:210
-#: ../lib/modules/heimdalKerberos.inc:305
-#: ../lib/modules/heimdalKerberos.inc:683
+#: ../lib/modules/heimdalKerberos.inc:158
+#: ../lib/modules/heimdalKerberos.inc:198
+#: ../lib/modules/heimdalKerberos.inc:215
+#: ../lib/modules/heimdalKerberos.inc:310
+#: ../lib/modules/heimdalKerberos.inc:688
 msgid "Renewable lifetime"
 msgstr "可重建生命周期"
 
 #: ../lib/modules/mitKerberos.inc:286 ../lib/modules/mitKerberos.inc:287
-#: ../lib/modules/heimdalKerberos.inc:245
-#: ../lib/modules/heimdalKerberos.inc:246
+#: ../lib/modules/heimdalKerberos.inc:250
+#: ../lib/modules/heimdalKerberos.inc:251
 msgid "Renewable lifetime must be a number."
 msgstr "可重建寿命必须是数字!"
 
 #: ../templates/lists/changePassword.php:331
-#: ../lib/modules/passwordSelfReset.inc:891 ../lib/modules.inc:1045
+#: ../lib/modules/passwordSelfReset.inc:933 ../lib/modules.inc:1045
 msgid "Repeat password"
 msgstr "确认密码"
 
-#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:1015
+#: ../lib/modules/posixAccount.inc:101 ../lib/modules/posixAccount.inc:1117
 msgid "Replaced $user or $group in homedir."
 msgstr "在homedir中已更改$user和$group. "
 
-#: ../templates/config/confmain.php:334 ../help/help.inc:229
+#: ../templates/config/confmain.php:335 ../help/help.inc:231
 msgid "Reply-to address"
 msgstr "回复地址"
 
-#: ../templates/config/confmain.php:498
+#: ../templates/config/confmain.php:499
 msgid "Reply-to address for password mails is invalid."
 msgstr "密码邮件的回复地址非法"
 
@@ -9190,7 +9385,7 @@ msgstr "需要硬件认证"
 
 #: ../lib/modules/mitKerberos.inc:170 ../lib/modules/mitKerberos.inc:458
 #: ../lib/modules/heimdalKerberos.inc:144
-#: ../lib/modules/heimdalKerberos.inc:380
+#: ../lib/modules/heimdalKerberos.inc:385
 msgid "Requires preauthentication"
 msgstr "需要预认证"
 
@@ -9209,7 +9404,7 @@ msgstr "复位密码"
 
 #: ../lib/modules/sambaDomain.inc:130 ../lib/modules/sambaDomain.inc:192
 #: ../lib/modules/sambaDomain.inc:217 ../lib/modules/sambaDomain.inc:341
-#: ../lib/modules/sambaDomain.inc:646
+#: ../lib/modules/sambaDomain.inc:650
 msgid "Reset time after lockout"
 msgstr "在锁定后复位时间"
 
@@ -9249,7 +9444,7 @@ msgstr "获取DN"
 msgid "Reverse zone name"
 msgstr "反向区域名"
 
-#: ../templates/config/confmain.php:301 ../help/help.inc:112
+#: ../templates/config/confmain.php:302 ../help/help.inc:114
 msgid "Rights for the home directory"
 msgstr "个人目录的权限"
 
@@ -9266,8 +9461,8 @@ msgstr "房间"
 #: ../lib/modules/inetOrgPerson.inc:144 ../lib/modules/inetOrgPerson.inc:185
 #: ../lib/modules/inetOrgPerson.inc:326 ../lib/modules/inetOrgPerson.inc:544
 #: ../lib/modules/inetOrgPerson.inc:638 ../lib/modules/inetOrgPerson.inc:828
-#: ../lib/modules/inetOrgPerson.inc:1695 ../lib/modules/inetOrgPerson.inc:2372
-#: ../lib/modules/inetOrgPerson.inc:3066
+#: ../lib/modules/inetOrgPerson.inc:1695 ../lib/modules/inetOrgPerson.inc:2374
+#: ../lib/modules/inetOrgPerson.inc:3068
 msgid "Room number"
 msgstr "房间号"
 
@@ -9279,7 +9474,7 @@ msgstr "房间号"
 msgid "Routing address"
 msgstr "邮寄地址"
 
-#: ../lib/modules/customFields.inc:116 ../lib/modules/customFields.inc:1855
+#: ../lib/modules/customFields.inc:118 ../lib/modules/customFields.inc:2091
 msgid "Rows"
 msgstr "行"
 
@@ -9338,32 +9533,40 @@ msgstr "SSH连接"
 msgid "SSH connection could be established."
 msgstr "SSH连接可以建立."
 
-#: ../lib/modules/ldapPublicKey.inc:52 ../lib/modules/ldapPublicKey.inc:62
-#: ../lib/modules/ldapPublicKey.inc:66 ../lib/modules/ldapPublicKey.inc:74
-#: ../lib/modules/ldapPublicKey.inc:103
+#: ../lib/modules/ldapPublicKey.inc:55 ../lib/modules/ldapPublicKey.inc:65
+#: ../lib/modules/ldapPublicKey.inc:69 ../lib/modules/ldapPublicKey.inc:81
+#: ../lib/modules/ldapPublicKey.inc:117
 msgid "SSH public key"
 msgstr "SSH公钥"
 
-#: ../lib/modules/ldapPublicKey.inc:81 ../lib/modules/ldapPublicKey.inc:85
-#: ../lib/modules/ldapPublicKey.inc:181 ../lib/modules/ldapPublicKey.inc:221
+#: ../lib/modules/ldapPublicKey.inc:88 ../lib/modules/ldapPublicKey.inc:92
+#: ../lib/modules/ldapPublicKey.inc:225 ../lib/modules/ldapPublicKey.inc:265
 msgid "SSH public keys"
 msgstr "SSH公钥"
 
+#: ../help/help.inc:83
+msgid "SSL certificate"
+msgstr "SSL 数字证书"
+
+#: ../templates/config/mainmanage.php:262
+msgid "SSL certificates"
+msgstr "SSL 数字证书"
+
 #: ../lib/modules/zarafaServer.inc:65 ../lib/modules/zarafaServer.inc:99
 #: ../lib/modules/zarafaServer.inc:129 ../lib/modules/zarafaServer.inc:168
 #: ../lib/modules/zarafaServer.inc:196 ../lib/modules/zarafaServer.inc:374
 msgid "SSL port"
 msgstr "SSL端口"
 
-#: ../templates/lists/changePassword.php:365
-#: ../templates/lists/changePassword.php:396
+#: ../templates/lists/changePassword.php:366
+#: ../templates/lists/changePassword.php:397
 msgid "Samba"
 msgstr "Samba"
 
 #: ../lib/types/user.inc:276 ../lib/types/user.inc:373
 #: ../lib/types/user.inc:405 ../lib/types/user.inc:829
 #: ../lib/modules/sambaSamAccount.inc:139
-#: ../lib/modules/sambaGroupMapping.inc:308
+#: ../lib/modules/sambaGroupMapping.inc:94
 msgid "Samba 3"
 msgstr "Samba 3"
 
@@ -9375,15 +9578,15 @@ msgstr "Samba 3 域SID非法!"
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 域条目"
 
-#: ../lib/modules/posixGroup.inc:346 ../lib/modules/posixAccount.inc:182
-#: ../lib/modules/posixAccount.inc:200
+#: ../lib/modules/posixGroup.inc:382 ../lib/modules/posixAccount.inc:203
+#: ../lib/modules/posixAccount.inc:221
 msgid "Samba ID pool"
 msgstr "Samba ID 池"
 
-#: ../lib/modules/posixGroup.inc:357 ../lib/modules/posixGroup.inc:463
-#: ../lib/modules/posixGroup.inc:544 ../lib/modules/posixAccount.inc:113
-#: ../lib/modules/posixAccount.inc:187 ../lib/modules/posixAccount.inc:205
-#: ../lib/modules/posixAccount.inc:461
+#: ../lib/modules/posixGroup.inc:393 ../lib/modules/posixGroup.inc:499
+#: ../lib/modules/posixGroup.inc:584 ../lib/modules/posixAccount.inc:131
+#: ../lib/modules/posixAccount.inc:208 ../lib/modules/posixAccount.inc:226
+#: ../lib/modules/posixAccount.inc:490
 msgid "Samba ID pool DN"
 msgstr "Samba ID 池的DN"
 
@@ -9394,12 +9597,12 @@ msgstr "Samba ID 池的DN"
 msgid "Samba RID"
 msgstr "Samba RID"
 
-#: ../lib/modules/sambaGroupMapping.inc:335
-#: ../lib/modules/sambaGroupMapping.inc:360
+#: ../lib/modules/sambaGroupMapping.inc:122
+#: ../lib/modules/sambaGroupMapping.inc:147
 msgid "Samba RID number"
 msgstr "Samba RID号"
 
-#: ../lib/modules/sambaGroupMapping.inc:329
+#: ../lib/modules/sambaGroupMapping.inc:116
 msgid "Samba display name"
 msgstr "Samba 显示名"
 
@@ -9407,7 +9610,7 @@ msgstr "Samba 显示名"
 msgid "Samba domain"
 msgstr "Samba 域"
 
-#: ../lib/modules/sambaGroupMapping.inc:145
+#: ../lib/modules/sambaGroupMapping.inc:238
 msgid "Samba domain name"
 msgstr "Samba 域名"
 
@@ -9415,10 +9618,10 @@ msgstr "Samba 域名"
 msgid "Samba domains"
 msgstr "Samba 域"
 
-#: ../lib/modules/sambaGroupMapping.inc:320
-#: ../lib/modules/sambaGroupMapping.inc:341
-#: ../lib/modules/sambaGroupMapping.inc:368
-#: ../lib/modules/sambaGroupMapping.inc:387
+#: ../lib/modules/sambaGroupMapping.inc:106
+#: ../lib/modules/sambaGroupMapping.inc:128
+#: ../lib/modules/sambaGroupMapping.inc:155
+#: ../lib/modules/sambaGroupMapping.inc:528
 msgid "Samba group type"
 msgstr "Samba 组类型"
 
@@ -9443,16 +9646,17 @@ msgid "Saturday"
 msgstr "星期六"
 
 #: ../templates/config/confmodules.php:224
-#: ../templates/config/confmain.php:449
+#: ../templates/config/confmain.php:450
 #: ../templates/config/moduleSettings.php:235
 #: ../templates/config/conftypes.php:318
 #: ../templates/selfService/selfServiceMain.php:397
 #: ../templates/selfService/adminMain.php:660
-#: ../templates/pdfedit/pdfpage.php:601
+#: ../templates/pdfedit/pdfpage.php:636
 #: ../templates/profedit/profilepage.php:238
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1243
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1247
-#: ../lib/modules/inetOrgPerson.inc:3235 ../lib/modules.inc:1184
+#: ../lib/modules/inetOrgPerson.inc:3237 ../lib/modules/customFields.inc:2944
+#: ../lib/modules.inc:1184
 msgid "Save"
 msgstr "保存"
 
@@ -9493,23 +9697,23 @@ msgstr "Schema测试"
 msgid "Scoped affiliations"
 msgstr "作用域关系"
 
-#: ../help/help.inc:97
+#: ../help/help.inc:99
 msgid "Script path"
 msgstr "脚本路径"
 
-#: ../templates/config/confmain.php:539
+#: ../templates/config/confmain.php:543
 msgid "Script path is invalid!"
 msgstr "脚本路径非法!"
 
-#: ../templates/config/confmain.php:558
+#: ../templates/config/confmain.php:562
 msgid "Script rights are invalid!"
 msgstr "脚本权限非法!"
 
-#: ../templates/config/confmain.php:542
+#: ../templates/config/confmain.php:546
 msgid "Script server is invalid!"
 msgstr "脚本服务器非法!"
 
-#: ../help/help.inc:108
+#: ../help/help.inc:110
 msgid "Script servers"
 msgstr "脚本服务器"
 
@@ -9546,7 +9750,7 @@ msgstr "搜索范围"
 msgid "Search tree suffix for users"
 msgstr "查询用户的树后缀"
 
-#: ../templates/pdfedit/pdfpage.php:573
+#: ../templates/pdfedit/pdfpage.php:608
 msgid "Section"
 msgstr "节"
 
@@ -9575,13 +9779,13 @@ msgid ""
 "as email lists."
 msgstr "安全组用于权限管理,分发组用于email用户列表."
 
-#: ../lib/modules/passwordSelfReset.inc:72
-#: ../lib/modules/passwordSelfReset.inc:167
-#: ../lib/modules/passwordSelfReset.inc:204
+#: ../lib/modules/passwordSelfReset.inc:73
+#: ../lib/modules/passwordSelfReset.inc:176
+#: ../lib/modules/passwordSelfReset.inc:218
 msgid "Security questions"
 msgstr "安全提问"
 
-#: ../templates/config/mainmanage.php:203 ../templates/config/confmain.php:439
+#: ../templates/config/mainmanage.php:256 ../templates/config/confmain.php:440
 msgid "Security settings"
 msgstr "安全设定"
 
@@ -9589,7 +9793,7 @@ msgstr "安全设定"
 msgid "See also"
 msgstr "同时参考"
 
-#: ../lib/account.inc:699
+#: ../lib/account.inc:762
 msgid "See the manual for instructions to solve this problem."
 msgstr "参考手册来解决本问题."
 
@@ -9613,7 +9817,7 @@ msgstr "选择LDIF文件"
 msgid "Select host"
 msgstr "选择主机"
 
-#: ../lib/modules/customFields.inc:2349
+#: ../lib/modules/customFields.inc:2619
 msgid "Select list"
 msgstr "选项列表"
 
@@ -9625,17 +9829,17 @@ msgstr "选择邮件"
 msgid "Select user"
 msgstr "选择用户"
 
-#: ../lib/modules/posixAccount.inc:1348 ../lib/modules/posixAccount.inc:1381
+#: ../lib/modules/posixAccount.inc:1463 ../lib/modules/posixAccount.inc:1496
 #: ../lib/modules/windowsUser.inc:726 ../lib/modules/nisnetgroup.inc:377
 #: ../lib/modules/groupOfNamesUser.inc:111
 msgid "Selected groups"
 msgstr "已选择的组"
 
-#: ../templates/masscreate.php:158 ../templates/config/confmodules.php:289
+#: ../templates/masscreate.php:158 ../templates/config/confmodules.php:299
 msgid "Selected modules"
 msgstr "已选择的模块"
 
-#: ../lib/modules/posixGroup.inc:261 ../lib/modules/asteriskExtension.inc:454
+#: ../lib/modules/posixGroup.inc:291 ../lib/modules/asteriskExtension.inc:454
 msgid "Selected users"
 msgstr "已选择的用户"
 
@@ -9651,17 +9855,21 @@ msgstr "自助服务配置编辑器"
 msgid "Self service login"
 msgstr "自助服务登录"
 
+#: ../lib/modules/passwordSelfReset.inc:195
+msgid "Self service login attribute"
+msgstr "自助服务登录属性"
+
 #: ../templates/selfService/adminMain.php:344
 msgid "Self service profile"
 msgstr "自助服务配置"
 
-#: ../lib/modules/passwordSelfReset.inc:118
-#: ../lib/modules/passwordSelfReset.inc:222
+#: ../lib/modules/passwordSelfReset.inc:119
+#: ../lib/modules/passwordSelfReset.inc:238
 msgid "Send confirmation mail"
 msgstr "发送确认邮件"
 
-#: ../lib/modules/passwordSelfReset.inc:100
-#: ../lib/modules/passwordSelfReset.inc:206
+#: ../lib/modules/passwordSelfReset.inc:101
+#: ../lib/modules/passwordSelfReset.inc:222
 msgid "Send notification mail"
 msgstr "发送提示邮件"
 
@@ -9671,7 +9879,7 @@ msgstr "通过邮件发送密码"
 
 #: ../templates/lists/changePassword.php:305
 #: ../templates/lists/changePassword.php:335 ../lib/modules.inc:1062
-#: ../help/help.inc:186
+#: ../help/help.inc:188
 msgid "Send via mail"
 msgstr "通过邮件发送"
 
@@ -9696,25 +9904,25 @@ msgstr "发送者条目"
 msgid "Sender filter"
 msgstr "发送者过滤表达式"
 
-#: ../lib/modules/passwordSelfReset.inc:101
+#: ../lib/modules/passwordSelfReset.inc:102
 msgid "Sends a mail to the user to inform him about the password change."
 msgstr "发一封邮件来通知用户有关密码修改事宜."
 
-#: ../lib/modules/passwordSelfReset.inc:119
+#: ../lib/modules/passwordSelfReset.inc:120
 msgid ""
 "Sends a mail to the user to validate his email address before the password "
 "change."
 msgstr "在密码修改前,给用户发一封邮件来确认邮件地址."
 
-#: ../lib/modules/inetOrgPerson.inc:798 ../help/help.inc:187
+#: ../lib/modules/inetOrgPerson.inc:798 ../help/help.inc:189
 msgid ""
 "Sends the password to the user via mail. Please edit your LAM server profile "
 "to setup the mail settings."
 msgstr "把密码通过邮件发送给用户。请编辑LAM服务器配置文件来设定邮件的配置."
 
-#: ../lib/modules/device.inc:58 ../lib/modules/device.inc:90
-#: ../lib/modules/device.inc:120 ../lib/modules/device.inc:176
-#: ../lib/modules/device.inc:438
+#: ../templates/config/mainmanage.php:312 ../lib/modules/device.inc:58
+#: ../lib/modules/device.inc:90 ../lib/modules/device.inc:120
+#: ../lib/modules/device.inc:176 ../lib/modules/device.inc:438
 msgid "Serial number"
 msgstr "序列号"
 
@@ -9724,6 +9932,7 @@ msgstr "序列号"
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:110
 #: ../templates/3rdParty/pla/htdocs/create_confirm.php:54
 #: ../templates/3rdParty/pla/htdocs/export_form.php:56
+#: ../lib/modules/kolabGroup.inc:270
 msgid "Server"
 msgstr "服务器"
 
@@ -9737,7 +9946,7 @@ msgstr "服务器"
 msgid "Server address"
 msgstr "服务器地址"
 
-#: ../templates/config/confmain.php:482
+#: ../templates/config/confmain.php:483
 #: ../templates/selfService/adminMain.php:187
 msgid "Server address is invalid!"
 msgstr "服务器地址非法!"
@@ -9746,18 +9955,18 @@ msgstr "服务器地址非法!"
 msgid "Server information"
 msgstr "服务器信息"
 
-#: ../templates/config/confmain.php:298
+#: ../templates/config/confmain.php:299
 msgid "Server list"
 msgstr "服务器列表"
 
-#: ../templates/login.php:457 ../templates/config/confmodules.php:137
+#: ../templates/login.php:471 ../templates/config/confmodules.php:137
 #: ../templates/config/confmain.php:167
 #: ../templates/config/moduleSettings.php:136
 #: ../templates/config/conftypes.php:155
 msgid "Server profile"
 msgstr "服务器设置文件"
 
-#: ../templates/config/confmain.php:267
+#: ../templates/config/confmain.php:268
 #: ../templates/selfService/adminMain.php:429
 msgid "Server settings"
 msgstr "服务器设置"
@@ -9778,7 +9987,7 @@ msgstr "服务器"
 msgid "Service name (e.g. sshd, imap, ftp). Enter one service per entry."
 msgstr "服务名(比如:sshd,imap,ftp).每个条目输入一个服务."
 
-#: ../templates/config/mainmanage.php:201 ../help/help.inc:140
+#: ../templates/config/mainmanage.php:259 ../help/help.inc:142
 msgid "Session timeout"
 msgstr "会话超时"
 
@@ -9795,12 +10004,12 @@ msgid "Set also for Kerberos"
 msgstr "同时也为Kerberos设置"
 
 #: ../lib/modules/mitKerberos.inc:683 ../lib/modules/shadowAccount.inc:452
-#: ../lib/modules/heimdalKerberos.inc:584
+#: ../lib/modules/heimdalKerberos.inc:589
 msgid "Set also for Samba 3"
 msgstr "同时也为Samba 3设置"
 
 #: ../lib/modules/mitKerberos.inc:680 ../lib/modules/sambaSamAccount.inc:1439
-#: ../lib/modules/heimdalKerberos.inc:581
+#: ../lib/modules/heimdalKerberos.inc:586
 msgid "Set also for Shadow"
 msgstr "同时也为Shadow设置"
 
@@ -9808,13 +10017,13 @@ msgstr "同时也为Shadow设置"
 msgid "Set password"
 msgstr "设置密码"
 
-#: ../lib/modules/posixAccount.inc:241 ../lib/modules/posixAccount.inc:409
+#: ../lib/modules/posixAccount.inc:262 ../lib/modules/posixAccount.inc:438
 msgid "Set primary group as memberUid"
 msgstr "为主组设置memberUid"
 
 #: ../templates/config/profmanage.php:279
 #: ../templates/config/profmanage.php:289
-#: ../templates/config/profmanage.php:290 ../help/help.inc:130
+#: ../templates/config/profmanage.php:290 ../help/help.inc:132
 msgid "Set profile password"
 msgstr "设置文件密码"
 
@@ -9834,7 +10043,7 @@ msgstr "设置搜索条件为0,来获取所有的记录"
 msgid "Set this field read-only."
 msgstr "将此域设为只读。"
 
-#: ../lib/modules/groupOfNames.inc:85
+#: ../lib/modules/groupOfNames.inc:89
 msgid ""
 "Set this only if your LDAP schema allows that groups may not have any "
 "members (e.g. if you use OpenDJ)."
@@ -9844,7 +10053,7 @@ msgstr "仅在LDAP模板允许组不含组员时再设置(比如使用OpenDJ)."
 msgid "Sets the delivery mode (e.g. disable mail forwarding)."
 msgstr "设置发送模式(比如 关闭邮件转发)."
 
-#: ../lib/modules/posixGroup.inc:436
+#: ../lib/modules/posixGroup.inc:472
 msgid "Sets the group password."
 msgstr "设置组密码"
 
@@ -9915,12 +10124,12 @@ msgstr "单封邮件的大小限额(字节数).更大的邮件会被退回."
 msgid "Skip"
 msgstr "跳过"
 
-#: ../lib/modules/quota.inc:626 ../lib/modules/systemQuotas.inc:376
+#: ../lib/modules/quota.inc:627 ../lib/modules/systemQuotas.inc:376
 msgid "Soft block"
 msgstr "软块"
 
 #: ../lib/modules/quota.inc:106 ../lib/modules/quota.inc:394
-#: ../lib/modules/quota.inc:499 ../lib/modules/systemQuotas.inc:117
+#: ../lib/modules/quota.inc:500 ../lib/modules/systemQuotas.inc:117
 msgid "Soft block limit"
 msgstr "软块限制"
 
@@ -9928,7 +10137,7 @@ msgstr "软块限制"
 msgid "Soft block limit."
 msgstr "软块限制."
 
-#: ../lib/modules/quota.inc:628 ../lib/modules/systemQuotas.inc:378
+#: ../lib/modules/quota.inc:629 ../lib/modules/systemQuotas.inc:378
 msgid "Soft inode"
 msgstr "软节点"
 
@@ -9937,7 +10146,7 @@ msgid "Soft inode (files) limit."
 msgstr "软节点限制."
 
 #: ../lib/modules/quota.inc:128 ../lib/modules/quota.inc:398
-#: ../lib/modules/quota.inc:501 ../lib/modules/systemQuotas.inc:121
+#: ../lib/modules/quota.inc:502 ../lib/modules/systemQuotas.inc:121
 msgid "Soft inode limit"
 msgstr "软节点限制."
 
@@ -9982,7 +10191,7 @@ msgid ""
 "Specifies a filter that matches the members (e.g. \"(mail=*@zarafa.nl)\")."
 msgstr "指定用户匹配的过滤规则.(比如:\"(mail=*@zarafa.nl)\")."
 
-#: ../help/help.inc:228
+#: ../help/help.inc:230
 msgid "Specifies if the mail should be sent as text or HTML."
 msgstr "指定发送邮件用文本方式还是HTML方式"
 
@@ -10000,6 +10209,10 @@ msgid ""
 "for new entries."
 msgstr "指定本服务器是否公用存储.仅在新条目可更改."
 
+#: ../lib/modules/dhcp_settings.inc:195
+msgid "Specifies if unknown clients are allowed."
+msgstr "指定是否允许未知的客户端"
+
 #: ../lib/modules/ppolicy.inc:126
 msgid "Specifies if users are allowed to change their own passwords or not."
 msgstr "指定用户是否允许修改自己的密码。"
@@ -10011,6 +10224,10 @@ msgid ""
 "dc=company,dc=com\")."
 msgstr "指定LDAP搜索用户的基础DN(比如: \"ou=zarafa,dc=company,dc=com\")."
 
+#: ../lib/modules/customFields.inc:143
+msgid "Specifies the allowed file extension. This is checked at upload time."
+msgstr "指定允许的文件扩展名. 会在上传的时候检查."
+
 #: ../lib/modules/zarafaContact.inc:89 ../lib/modules/zarafaGroup.inc:92
 #: ../lib/modules/zarafaUser.inc:138
 msgid ""
@@ -10022,6 +10239,10 @@ msgstr "指定引用条目时使用的属性.如果你引用组,这里必须为\
 msgid "Specifies the capacity of this resource."
 msgstr "指定资源容量"
 
+#: ../lib/modules/customFields.inc:139
+msgid "Specifies the maximum allowed file size in bytes."
+msgstr "指定允许的文件最大字节数."
+
 #: ../lib/modules/mitKerberos.inc:130 ../lib/modules/heimdalKerberos.inc:104
 msgid "Specifies the maximum lifetime of a ticket in days."
 msgstr "指定票证的最大生命周期天数."
@@ -10130,12 +10351,12 @@ msgstr "开始时间"
 #: ../lib/modules/inetOrgPerson.inc:173 ../lib/modules/inetOrgPerson.inc:318
 #: ../lib/modules/inetOrgPerson.inc:584 ../lib/modules/inetOrgPerson.inc:626
 #: ../lib/modules/inetOrgPerson.inc:848 ../lib/modules/inetOrgPerson.inc:852
-#: ../lib/modules/inetOrgPerson.inc:1588 ../lib/modules/inetOrgPerson.inc:2376
-#: ../lib/modules/inetOrgPerson.inc:3088
+#: ../lib/modules/inetOrgPerson.inc:1588 ../lib/modules/inetOrgPerson.inc:2378
+#: ../lib/modules/inetOrgPerson.inc:3090
 msgid "State"
 msgstr "地点"
 
-#: ../templates/pdfedit/pdfpage.php:523 ../templates/pdfedit/pdfpage.php:525
+#: ../templates/pdfedit/pdfpage.php:538 ../templates/pdfedit/pdfpage.php:540
 msgid "Static text"
 msgstr "静态文本"
 
@@ -10149,13 +10370,13 @@ msgstr "第 %s步,共 %s步"
 msgid "Steve"
 msgstr "Steve"
 
-#: ../lib/modules/sambaSamAccount.inc:408 ../lib/modules/posixAccount.inc:265
-#: ../lib/modules/windowsUser.inc:242 ../lib/modules/inetOrgPerson.inc:2503
+#: ../lib/modules/sambaSamAccount.inc:408 ../lib/modules/posixAccount.inc:343
+#: ../lib/modules/windowsUser.inc:242 ../lib/modules/inetOrgPerson.inc:2505
 #: ../lib/modules/asteriskVoicemail.inc:165
 msgid "Steve Miller"
 msgstr "Steve Miller"
 
-#: ../lib/modules/posixAccount.inc:328
+#: ../lib/modules/posixAccount.inc:351
 msgid "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 msgstr "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 
@@ -10171,11 +10392,11 @@ msgstr "Steve,Stevo"
 #: ../lib/modules/inetOrgPerson.inc:310 ../lib/modules/inetOrgPerson.inc:446
 #: ../lib/modules/inetOrgPerson.inc:614 ../lib/modules/inetOrgPerson.inc:733
 #: ../lib/modules/inetOrgPerson.inc:737 ../lib/modules/inetOrgPerson.inc:1480
-#: ../lib/modules/inetOrgPerson.inc:2361 ../lib/modules/inetOrgPerson.inc:3011
+#: ../lib/modules/inetOrgPerson.inc:2363 ../lib/modules/inetOrgPerson.inc:3013
 msgid "Street"
 msgstr "街道"
 
-#: ../templates/pdfedit/pdfpage.php:452 ../templates/pdfedit/pdfmain.php:315
+#: ../templates/pdfedit/pdfpage.php:449 ../templates/pdfedit/pdfmain.php:315
 msgid "Structure name"
 msgstr "结构名"
 
@@ -10191,24 +10412,24 @@ msgstr "Sub (条目的子树)"
 msgid "Subgroups"
 msgstr "分组"
 
-#: ../templates/config/confmain.php:337 ../lib/modules/selfRegistration.inc:77
+#: ../templates/config/confmain.php:338 ../lib/modules/selfRegistration.inc:77
 #: ../lib/modules/selfRegistration.inc:135
-#: ../lib/modules/passwordSelfReset.inc:108
-#: ../lib/modules/passwordSelfReset.inc:214
-#: ../lib/modules/passwordSelfReset.inc:230 ../help/help.inc:220
+#: ../lib/modules/passwordSelfReset.inc:109
+#: ../lib/modules/passwordSelfReset.inc:230
+#: ../lib/modules/passwordSelfReset.inc:246 ../help/help.inc:222
 msgid "Subject"
 msgstr "标题"
 
-#: ../lib/types/dhcp.inc:94 ../lib/modules/dhcp_settings.inc:135
-#: ../lib/modules/dhcp_settings.inc:189 ../lib/modules/dhcp_settings.inc:203
-#: ../lib/modules/dhcp_settings.inc:220 ../lib/modules/dhcp_settings.inc:531
-#: ../lib/modules/dhcp_settings.inc:640
+#: ../lib/types/dhcp.inc:94 ../lib/modules/dhcp_settings.inc:142
+#: ../lib/modules/dhcp_settings.inc:200 ../lib/modules/dhcp_settings.inc:215
+#: ../lib/modules/dhcp_settings.inc:235 ../lib/modules/dhcp_settings.inc:554
+#: ../lib/modules/dhcp_settings.inc:678
 msgid "Subnet"
 msgstr "子网"
 
-#: ../lib/modules/dhcp_settings.inc:175 ../lib/modules/dhcp_settings.inc:197
-#: ../lib/modules/dhcp_settings.inc:214 ../lib/modules/dhcp_settings.inc:272
-#: ../lib/modules/dhcp_settings.inc:567 ../lib/modules/dhcp_settings.inc:637
+#: ../lib/modules/dhcp_settings.inc:182 ../lib/modules/dhcp_settings.inc:208
+#: ../lib/modules/dhcp_settings.inc:226 ../lib/modules/dhcp_settings.inc:293
+#: ../lib/modules/dhcp_settings.inc:599 ../lib/modules/dhcp_settings.inc:674
 msgid "Subnet mask"
 msgstr "子网掩码"
 
@@ -10249,12 +10470,12 @@ msgstr "Sudo角色"
 msgid "Suffix"
 msgstr "后缀"
 
-#: ../lib/modules/posixGroup.inc:360 ../lib/modules/posixGroup.inc:455
+#: ../lib/modules/posixGroup.inc:396 ../lib/modules/posixGroup.inc:491
 msgid "Suffix for GID/group name check"
 msgstr "GID/组名的后缀检查"
 
-#: ../lib/modules/posixAccount.inc:196 ../lib/modules/posixAccount.inc:214
-#: ../lib/modules/posixAccount.inc:449
+#: ../lib/modules/posixAccount.inc:217 ../lib/modules/posixAccount.inc:235
+#: ../lib/modules/posixAccount.inc:478
 msgid "Suffix for UID/user name check"
 msgstr "UID/用户名的后缀检查"
 
@@ -10271,7 +10492,7 @@ msgstr "切换条目"
 msgid "Sync Asterisk password with Unix password"
 msgstr "同步Asterisk和Unix的密码"
 
-#: ../lib/modules/heimdalKerberos.inc:230
+#: ../lib/modules/heimdalKerberos.inc:235
 msgid "Sync Heimdal Kerberos password with Unix password"
 msgstr " Heimdal Kerberos密码与Unix的密码同步"
 
@@ -10279,6 +10500,11 @@ msgstr " Heimdal Kerberos密码与Unix的密码同步"
 msgid "Sync MIT Kerberos password with Unix password"
 msgstr "MIT Kerberos 密码与Unix的密码同步"
 
+#: ../lib/modules/passwordSelfReset.inc:137
+#: ../lib/modules/passwordSelfReset.inc:220
+msgid "Sync Samba 3 password"
+msgstr "同步 Samba 3 密码"
+
 #: ../lib/modules/sambaSamAccount.inc:241
 msgid "Sync Samba LM password with Unix password"
 msgstr "同步 Samba LM 密码和Unix的密码"
@@ -10287,7 +10513,7 @@ msgstr "同步 Samba LM 密码和Unix的密码"
 msgid "Sync Samba NT password with Unix password"
 msgstr "同步Samba NT的密码和 Unix的密码"
 
-#: ../lib/modules/customFields.inc:922
+#: ../lib/modules/customFields.inc:1027
 msgid "Sync fields with page layout"
 msgstr "页面布局的同步域"
 
@@ -10308,7 +10534,7 @@ msgstr "语法"
 msgid "System administrator"
 msgstr "系统管理员"
 
-#: ../templates/config/mainmanage.php:227
+#: ../templates/config/mainmanage.php:356
 msgid "System logging"
 msgstr "系统日志"
 
@@ -10316,7 +10542,7 @@ msgstr "系统日志"
 msgid "TLS cannot be combined with ldaps://."
 msgstr "TLS不能与ldaps://结合"
 
-#: ../lib/modules/kolabUser.inc:178
+#: ../lib/modules/kolabUser.inc:211
 msgid "Target of invitation policy is invalid!"
 msgstr "邀请策略的目标非法 !"
 
@@ -10338,8 +10564,8 @@ msgstr "技术名字"
 #: ../lib/modules/inetOrgPerson.inc:188 ../lib/modules/inetOrgPerson.inc:328
 #: ../lib/modules/inetOrgPerson.inc:486 ../lib/modules/inetOrgPerson.inc:641
 #: ../lib/modules/inetOrgPerson.inc:765 ../lib/modules/inetOrgPerson.inc:769
-#: ../lib/modules/inetOrgPerson.inc:1713 ../lib/modules/inetOrgPerson.inc:2366
-#: ../lib/modules/inetOrgPerson.inc:2967
+#: ../lib/modules/inetOrgPerson.inc:1713 ../lib/modules/inetOrgPerson.inc:2368
+#: ../lib/modules/inetOrgPerson.inc:2969
 msgid "Telephone number"
 msgstr "电话号码"
 
@@ -10348,8 +10574,8 @@ msgid "Temp"
 msgstr "临时"
 
 #: ../lib/modules/windowsUser.inc:254 ../lib/modules/inetOrgPerson.inc:400
-msgid "Temp, contract til December"
-msgstr "临时,合同到年底"
+msgid "Temp, contract till December"
+msgstr "临时, 合同到12月份"
 
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:725
 msgid "Template"
@@ -10369,20 +10595,20 @@ msgstr "终端服务选项"
 msgid "Tests"
 msgstr "测试"
 
-#: ../templates/config/confmain.php:346 ../lib/modules/selfRegistration.inc:84
+#: ../templates/config/confmain.php:347 ../lib/modules/selfRegistration.inc:84
 #: ../lib/modules/selfRegistration.inc:108
-#: ../lib/modules/passwordSelfReset.inc:112
-#: ../lib/modules/passwordSelfReset.inc:122
-#: ../lib/modules/passwordSelfReset.inc:218
-#: ../lib/modules/passwordSelfReset.inc:234 ../help/help.inc:222
+#: ../lib/modules/passwordSelfReset.inc:113
+#: ../lib/modules/passwordSelfReset.inc:123
+#: ../lib/modules/passwordSelfReset.inc:234
+#: ../lib/modules/passwordSelfReset.inc:250 ../help/help.inc:224
 msgid "Text"
 msgstr "文本"
 
-#: ../lib/modules/customFields.inc:1837
+#: ../lib/modules/customFields.inc:2071
 msgid "Text area"
 msgstr "文本区"
 
-#: ../templates/pdfedit/pdfpage.php:582 ../lib/modules/customFields.inc:1430
+#: ../templates/pdfedit/pdfpage.php:617 ../lib/modules/customFields.inc:1646
 msgid "Text field"
 msgstr "输入框"
 
@@ -10394,7 +10620,7 @@ msgid ""
 msgstr ""
 "用户用来进行机构间认证的\"NetID\".格式是\"user@scope\",其中scope是本地安全域."
 
-#: ../lib/modules/dhcp_settings.inc:307
+#: ../lib/modules/dhcp_settings.inc:329
 msgid "The DHCP ranges were changed to fit for the new subnet."
 msgstr "为适应新子网的变化,DHCP范围已经更改."
 
@@ -10416,22 +10642,22 @@ msgid ""
 "units."
 msgstr "代表用户组织单元的目录条目的DN."
 
-#: ../lib/modules/posixGroup.inc:452
+#: ../lib/modules/posixGroup.inc:488
 msgid ""
 "The ID of this group was changed. You can update all user and host entries "
 "to the new group ID."
 msgstr "组ID已经改变.你可以更新所有的用户和主机条目到新的组ID."
 
-#: ../templates/config/mainmanage.php:95
+#: ../templates/config/mainmanage.php:100
 #, php-format
 msgid "The IP address %s is invalid!"
 msgstr "IP地址 %s非法 !"
 
-#: ../lib/modules/fixed_ip.inc:394
+#: ../lib/modules/fixed_ip.inc:417
 msgid "The IP address does not match the subnet."
 msgstr "IP地址与子网不匹配."
 
-#: ../lib/modules/fixed_ip.inc:397
+#: ../lib/modules/fixed_ip.inc:420
 msgid "The IP address is already in use."
 msgstr "IP地址已被使用: "
 
@@ -10440,21 +10666,21 @@ msgstr "IP地址已被使用: "
 #: ../lib/modules/asteriskAccount.inc:637 ../lib/modules/ppolicyUser.inc:85
 #: ../lib/modules/range.inc:410 ../lib/modules/range.inc:427
 #: ../lib/modules/freeRadius.inc:242 ../lib/modules/freeRadius.inc:243
-#: ../lib/modules/fixed_ip.inc:389
+#: ../lib/modules/fixed_ip.inc:412
 msgid "The IP address is invalid."
 msgstr "IP地址非法 !"
 
-#: ../lib/modules/fixed_ip.inc:95
+#: ../lib/modules/fixed_ip.inc:97
 msgid "The IP address of the PC."
 msgstr "PC机的IP地址."
 
-#: ../lib/modules/dhcp_settings.inc:148
+#: ../lib/modules/dhcp_settings.inc:155
 msgid ""
 "The IP addresses 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/dhcp_settings.inc:156
+#: ../lib/modules/dhcp_settings.inc:163
 msgid ""
 "The IP addresses of the Netbios name servers (e.g. \"123.123.123.123, "
 "123.123.123.124\")."
@@ -10464,7 +10690,7 @@ msgstr "Netbios命名服务器的IP地址(比如: \"123.123.123.123, 123.123.123
 msgid "The IP does not match the subnet."
 msgstr "IP与子网掩码不匹配."
 
-#: ../lib/modules/mitKerberos.inc:146
+#: ../lib/modules/mitKerberos.inc:146 ../lib/modules/heimdalKerberos.inc:151
 msgid "The Kerberos realm for this account."
 msgstr "此帐号的Kerberos域"
 
@@ -10472,27 +10698,27 @@ msgstr "此帐号的Kerberos域"
 msgid "The Kerberos realm of this user."
 msgstr "此帐号的Kerberos域"
 
-#: ../lib/modules/fixed_ip.inc:92
+#: ../lib/modules/fixed_ip.inc:93
 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:300 ../lib/modules/dhcp_settings.inc:301
+#: ../lib/modules/dhcp_settings.inc:321 ../lib/modules/dhcp_settings.inc:322
 msgid "The Netbios server is invalid."
 msgstr "Netbios服务器非法."
 
-#: ../lib/modules/fixed_ip.inc:361
+#: ../lib/modules/fixed_ip.inc:384
 msgid "The PC name may not be longer than 20 characters."
 msgstr "PC机器名的长度不能超过20个字符."
 
-#: ../lib/modules/fixed_ip.inc:370
+#: ../lib/modules/fixed_ip.inc:393
 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:364
+#: ../lib/modules/fixed_ip.inc:387
 msgid "The PC name needs to be at least 2 characters long."
 msgstr "PC机器名的长度最短需要两个字符."
 
-#: ../help/help.inc:183
+#: ../help/help.inc:185
 msgid ""
 "The PDF structure defines what information is exported as PDF file and how "
 "the pages are structured. You can manage the PDF structures in the PDF "
@@ -10514,12 +10740,12 @@ msgstr "此帐号的Radius域"
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "您的Samba服务器的SID,可以通过使用\"net getlocalsid\"命令获取."
 
-#: ../templates/selfService/selfServiceLogin.php:106
+#: ../templates/selfService/selfServiceLogin.php:107
 #: ../templates/selfService/selfServiceMain.php:168
 msgid "The TLS encryption could not be started."
 msgstr "TLS加密失败."
 
-#: ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:99
 msgid ""
 "The UID ranges for users and hosts overlap! This is a problem because LAM "
 "uses the highest UID in use + 1 for new accounts. Please set the minimum UID "
@@ -10552,16 +10778,16 @@ msgstr "账号类型非法."
 msgid "The account will be locked after this date."
 msgstr "帐号将在这一天之后锁定."
 
-#: ../help/help.inc:169
+#: ../help/help.inc:171
 msgid "The account will be saved under this LDAP suffix."
 msgstr "帐号将会保存在此后缀下."
 
-#: ../lib/modules/passwordSelfReset.inc:257
+#: ../lib/modules/passwordSelfReset.inc:273
 #, php-format
 msgid "The answer needs to be at least %s characters long."
 msgstr "答案的最短长度为%s个字符."
 
-#: ../lib/modules/passwordSelfReset.inc:1015
+#: ../lib/modules/passwordSelfReset.inc:1067
 msgid "The answer to the security question is wrong."
 msgstr "安全问题的答案是错误的."
 
@@ -10602,7 +10828,7 @@ msgstr "配置文件不可写."
 msgid "The container you specified (%s) does not exist. Please try again."
 msgstr "您指定的容器%s不存在,请重试."
 
-#: ../lib/modules/dhcp_settings.inc:298 ../lib/modules/dhcp_settings.inc:299
+#: ../lib/modules/dhcp_settings.inc:319 ../lib/modules/dhcp_settings.inc:320
 msgid "The default gateway is invalid."
 msgstr "缺省网关非法."
 
@@ -10615,13 +10841,13 @@ msgstr ".qmail文件的缺省解释."
 msgid "The destination entry (%s) already exists."
 msgstr "目标条目(%s)已经存在."
 
-#: ../lib/modules/dhcp_settings.inc:309 ../lib/modules/dhcp_settings.inc:310
+#: ../lib/modules/dhcp_settings.inc:331 ../lib/modules/dhcp_settings.inc:332
 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:132
+#: ../lib/modules/dhcp_settings.inc:139
 msgid "The domain name of the subnet."
 msgstr "域名的子网掩码."
 
@@ -10633,7 +10859,7 @@ msgstr "邮件地址非法 !"
 msgid "The ending IP address of the range."
 msgstr "范围的最高IP地址."
 
-#: ../lib/modules/dhcp_settings.inc:302
+#: ../lib/modules/dhcp_settings.inc:323
 msgid "The entered Netbios node type does not exist."
 msgstr "输入的Netbios节点类型不存在."
 
@@ -10720,7 +10946,7 @@ msgstr "在拷贝源条目时建立的新条目的全DN"
 msgid "The full name is invalid."
 msgstr "全名非法."
 
-#: ../templates/login.php:572
+#: ../templates/login.php:586
 msgid "The given user name matches multiple LDAP entries."
 msgstr "给定的用户名匹配了多条LDAP条目."
 
@@ -10730,6 +10956,10 @@ msgid ""
 "password may be used to login."
 msgstr "缓期认证限量指定了密码过期后还能认证的次数。"
 
+#: ../lib/modules/windowsGroup.inc:147
+msgid "The group is managed by this contact person."
+msgstr "本组的管理者是这位联系人."
+
 #: ../lib/modules/freeRadius.inc:90 ../lib/modules/freeRadius.inc:94
 msgid "The group names for this account."
 msgstr "此帐号的组名"
@@ -10738,7 +10968,7 @@ msgstr "此帐号的组名"
 msgid "The groups for this account. You can insert a group name or DN."
 msgstr "本帐号的所属组,您可以输入一个组名或DN名."
 
-#: ../templates/pdfedit/pdfpage.php:129
+#: ../templates/pdfedit/pdfpage.php:137
 msgid "The headline for a new section must contain at least one character."
 msgstr "新段的标题最少要有一个字符."
 
@@ -10765,11 +10995,11 @@ msgid ""
 "with \"genDDNSkey\"."
 msgstr "使DHCP服务器能够进行DNS更新的KEY. 产生KEY的命令是 \"genDDNSkey\"."
 
-#: ../lib/modules/dhcp_settings.inc:296 ../lib/modules/dhcp_settings.inc:297
+#: ../lib/modules/dhcp_settings.inc:317 ../lib/modules/dhcp_settings.inc:318
 msgid "The lease time is invalid."
 msgstr "释放时间非法."
 
-#: ../lib/modules/dhcp_settings.inc:140
+#: ../lib/modules/dhcp_settings.inc:147
 msgid ""
 "The lease time specifies after how many seconds the client should request a "
 "new IP address."
@@ -10787,7 +11017,7 @@ msgstr "这个节点的配置好的Puppet类列表(比如：ntp)."
 msgid "The list of hosts from which the user may run the commands."
 msgstr "用户可以运行命令的主机列表."
 
-#: ../lib/modules/customFields.inc:2242
+#: ../lib/modules/customFields.inc:2503
 msgid "The list of labels contains duplicates."
 msgstr "这个标签列表包含重复值."
 
@@ -10795,7 +11025,7 @@ msgstr "这个标签列表包含重复值."
 msgid "The list of users who own this sudo role and may run the commands."
 msgstr "具备sudo角色并可以运行命令的用户列表."
 
-#: ../lib/modules/customFields.inc:2239
+#: ../lib/modules/customFields.inc:2500
 msgid "The list of values contains duplicates."
 msgstr "这个值列表包含重复值."
 
@@ -10803,12 +11033,13 @@ msgstr "这个值列表包含重复值."
 msgid "The list's alternate email address."
 msgstr "用户列表的另一个地址."
 
+#: ../lib/modules/kolabGroup.inc:81 ../lib/modules/kolabGroup.inc:85
 #: ../lib/modules/qmailGroup.inc:117 ../lib/modules/qmailGroup.inc:121
 #: ../lib/modules/windowsGroup.inc:119
 msgid "The list's email address."
 msgstr "用户列表的邮件地址."
 
-#: ../templates/config/mainmanage.php:111
+#: ../templates/config/mainmanage.php:116
 msgid ""
 "The log file is empty or contains invalid characters! Valid characters are: "
 "a-z, A-Z, 0-9, /, \\, ., :, _ and -."
@@ -10823,7 +11054,7 @@ msgstr "有权限来建立或删除邮箱的IMAP登录名."
 msgid "The mail server that contains the message store."
 msgstr "邮件存储所在的邮件服务器."
 
-#: ../help/help.inc:223
+#: ../help/help.inc:225
 msgid "The mail text of all password mails."
 msgstr "密码邮寄时的邮件文本"
 
@@ -10831,8 +11062,8 @@ msgstr "密码邮寄时的邮件文本"
 msgid "The mail text of the confirmation mail."
 msgstr "确认邮件的文本"
 
-#: ../lib/modules/passwordSelfReset.inc:113
-#: ../lib/modules/passwordSelfReset.inc:123
+#: ../lib/modules/passwordSelfReset.inc:114
+#: ../lib/modules/passwordSelfReset.inc:124
 msgid "The mail text of the mails."
 msgstr "邮件文本"
 
@@ -10840,11 +11071,11 @@ msgstr "邮件文本"
 msgid "The mailbox format is invalid."
 msgstr "邮箱格式不合法."
 
-#: ../lib/modules/dhcp_settings.inc:303 ../lib/modules/dhcp_settings.inc:304
+#: ../lib/modules/dhcp_settings.inc:325 ../lib/modules/dhcp_settings.inc:326
 msgid "The maximum lease time is invalid."
 msgstr "最长释放时间非法."
 
-#: ../lib/modules/dhcp_settings.inc:144
+#: ../lib/modules/dhcp_settings.inc:151
 msgid ""
 "The maximum lease time specifies after how many seconds the client must "
 "request a new IP address."
@@ -10859,7 +11090,7 @@ msgstr "用户邮箱可存储的最多邮件数量"
 msgid "The module %s is not yet ready."
 msgstr "%s模块未启动."
 
-#: ../templates/pdfedit/pdfpage.php:100
+#: ../templates/pdfedit/pdfpage.php:108
 msgid ""
 "The name for that PDF-structure you submitted is not valid. A valid name "
 "must consist of the following characters: 'a-z','A-Z','0-9','_','-'."
@@ -10883,11 +11114,11 @@ msgstr "PC机器名."
 msgid "The name of the extension (e.g. voicemail or sip)."
 msgstr "扩展的名字(比如:voicemail 或 sip)."
 
-#: ../lib/modules/kolabUser.inc:130
+#: ../lib/modules/kolabUser.inc:131
 msgid "The name of the server where the mailbox is located."
 msgstr "邮箱所在服务器名."
 
-#: ../lib/modules/dhcp_settings.inc:136
+#: ../lib/modules/dhcp_settings.inc:143
 msgid "The name of the subnet. Example: 192.168.10.0"
 msgstr "子网名称.比如: 192.168.10.0"
 
@@ -10899,7 +11130,7 @@ msgstr "WINDOWS域名或工作组名."
 msgid "The net mask for the IP address."
 msgstr "IP地址的网络掩码."
 
-#: ../lib/modules/dhcp_settings.inc:180
+#: ../lib/modules/dhcp_settings.inc:187
 msgid ""
 "The net mask is derived from the subnet mask. LAM will calculate it "
 "automatically."
@@ -10918,7 +11149,7 @@ msgstr "保存帐号后新密码同时保存到目录服务器."
 msgid "The number of milliseconds for the last qualify."
 msgstr "上一次合格的微秒数"
 
-#: ../help/help.inc:115
+#: ../help/help.inc:117
 msgid ""
 "The number of users who may login to LAM is restricted. This can be either a "
 "fixed list of DNs or LAM can search LDAP to find a DN which matches the "
@@ -10950,7 +11181,7 @@ msgstr "选项的格式不正确."
 msgid "The owners of this device."
 msgstr "设备所有者"
 
-#: ../lib/modules/groupOfNames.inc:69 ../lib/modules/groupOfNames.inc:73
+#: ../lib/modules/groupOfNames.inc:73 ../lib/modules/groupOfNames.inc:77
 msgid "The owners of this group."
 msgstr "此组的拥有者."
 
@@ -10967,43 +11198,43 @@ msgid "The parameter @@principal@@ will be replaced with the principal name."
 msgstr "参数 @@principal@@ 会被主要的名字代替."
 
 #: ../templates/config/confsave.php:71 ../templates/config/confmain.php:73
-#: ../templates/config/mainlogin.php:59
+#: ../templates/config/mainlogin.php:61
 #: ../templates/selfService/adminLogin.php:54
 msgid "The password is invalid! Please try again."
 msgstr "密码无效,请重试!"
 
-#: ../lib/security.inc:301
+#: ../lib/security.inc:310
 #, php-format
 msgid "The password is too short. You have to enter at least %s characters."
 msgstr "密码太短,至少需要%s个字符."
 
-#: ../lib/security.inc:353
+#: ../lib/security.inc:362
 #, php-format
 msgid ""
 "The password is too weak. You have to enter at least %s different character "
 "classes (upper/lower case, numbers and symbols)."
 msgstr "密码弱度不够.最少需要输入%s个字符类别(大/小写,数字和符号)."
 
-#: ../lib/security.inc:324
+#: ../lib/security.inc:333
 #, php-format
 msgid ""
 "The password is too weak. You have to enter at least %s lower case "
 "characters."
 msgstr "密码强度不够,最少需要%s个小写字母."
 
-#: ../lib/security.inc:332
+#: ../lib/security.inc:341
 #, php-format
 msgid ""
 "The password is too weak. You have to enter at least %s numeric characters."
 msgstr "密码强度不够,最少需要%s个数字字符."
 
-#: ../lib/security.inc:336
+#: ../lib/security.inc:345
 #, php-format
 msgid ""
 "The password is too weak. You have to enter at least %s symbolic characters."
 msgstr "密码强度不够.最少需要%s个标点符号字符."
 
-#: ../lib/security.inc:328
+#: ../lib/security.inc:337
 #, php-format
 msgid ""
 "The password is too weak. You have to enter at least %s upper case "
@@ -11016,7 +11247,7 @@ msgid ""
 "is stored in the LAM server profile."
 msgstr "IMAP管理员用户的密码.IMAP管理员用户登录名保存在LAM服务器的配置中."
 
-#: ../templates/lists/changePassword.php:529 ../lib/modules.inc:1111
+#: ../templates/lists/changePassword.php:545 ../lib/modules.inc:1111
 msgid "The password was set to:"
 msgstr "密码被设置为:"
 
@@ -11030,17 +11261,17 @@ msgstr "用户地址的邮箱."
 msgid "The postal code of the user's address."
 msgstr "用户地址的邮政编码"
 
-#: ../lib/modules/posixAccount.inc:430
+#: ../lib/modules/posixAccount.inc:459
 msgid ""
 "The primary group for this account. You can insert a GID number or a group "
 "name."
 msgstr "本帐号的主组名,您可以输入一个GID号或组名."
 
-#: ../lib/modules/posixAccount.inc:513
+#: ../lib/modules/posixAccount.inc:542
 msgid "The primary group the host should be member of."
 msgstr "该主机所属的主组名."
 
-#: ../lib/modules/posixAccount.inc:475
+#: ../lib/modules/posixAccount.inc:504
 msgid "The primary group the user should be member of."
 msgstr "该用户所属的主组名."
 
@@ -11081,10 +11312,10 @@ msgstr "第二个选项是LDAP属性名,第三个选项是描述标签."
 
 #: ../lib/modules/asteriskAccount.inc:235 ../lib/modules/qmailUser.inc:189
 #: ../lib/modules/zarafaGroup.inc:103 ../lib/modules/sambaSamAccount.inc:387
-#: ../lib/modules/posixAccount.inc:406 ../lib/modules/zarafaUser.inc:126
+#: ../lib/modules/posixAccount.inc:435 ../lib/modules/zarafaUser.inc:126
 #: ../lib/modules/inetOrgPerson.inc:877 ../lib/modules/freeRadius.inc:106
 #: ../lib/modules/zarafaServer.inc:82 ../lib/modules/qmailGroup.inc:113
-#: ../lib/modules/windowsGroup.inc:103
+#: ../lib/modules/windowsGroup.inc:103 ../lib/modules/groupOfNames.inc:61
 msgid ""
 "The selected options will not be managed inside LAM. You can use this to "
 "reduce the number of displayed input fields."
@@ -11103,7 +11334,7 @@ msgstr "范围的起始IP地址."
 msgid "The state where the user resides or works."
 msgstr "用户居住或工作地点."
 
-#: ../templates/pdfedit/pdfpage.php:117
+#: ../templates/pdfedit/pdfpage.php:125
 msgid "The static text must contain at least one character."
 msgstr "静态文本至少包含一个字符."
 
@@ -11112,28 +11343,28 @@ msgstr "静态文本至少包含一个字符."
 msgid "The street name of the user's address."
 msgstr "用户地址的街道名"
 
-#: ../help/help.inc:221
+#: ../help/help.inc:223
 msgid "The subject of all password mails."
 msgstr "密码邮件的主题."
 
 #: ../lib/modules/selfRegistration.inc:136
-#: ../lib/modules/passwordSelfReset.inc:109
+#: ../lib/modules/passwordSelfReset.inc:110
 msgid "The subject of the mails."
 msgstr "邮件主题."
 
-#: ../lib/modules/dhcp_settings.inc:291
+#: ../lib/modules/dhcp_settings.inc:312
 msgid "The subnet is already in use."
 msgstr "子网掩码已经被占用."
 
-#: ../lib/modules/dhcp_settings.inc:292 ../lib/modules/dhcp_settings.inc:293
+#: ../lib/modules/dhcp_settings.inc:313 ../lib/modules/dhcp_settings.inc:314
 msgid "The subnet is invalid."
 msgstr "子网非法"
 
-#: ../lib/modules/dhcp_settings.inc:305 ../lib/modules/dhcp_settings.inc:306
+#: ../lib/modules/dhcp_settings.inc:327 ../lib/modules/dhcp_settings.inc:328
 msgid "The subnet mask is invalid."
 msgstr "子网掩码非法"
 
-#: ../lib/modules/dhcp_settings.inc:176
+#: ../lib/modules/dhcp_settings.inc:183
 msgid "The subnet mask of the network."
 msgstr "网络的子网掩码."
 
@@ -11145,6 +11376,16 @@ msgstr "sudo命令以这些组员的身份运行."
 msgid "The sudo commands may be run as these users (e.g. root)."
 msgstr "sudo命令以这个用户的身份运行(比如:root)."
 
+#: ../lib/modules/customFields.inc:3050 ../lib/modules/customFields.inc:3137
+#, php-format
+msgid "The uploaded file does not have the correct file extension (%s)."
+msgstr "上传文件没有正确的扩展名 (%s)."
+
+#: ../lib/modules/customFields.inc:3046 ../lib/modules/customFields.inc:3133
+#, php-format
+msgid "The uploaded file is too large (> %s bytes)."
+msgstr "上传的文件太大了 (> %s 字节)."
+
 #: ../templates/3rdParty/pla/lib/import_functions.php:396
 msgid "The url attribute value should begin with file://."
 msgstr "URL属性值必须以file://开始"
@@ -11232,11 +11473,11 @@ msgstr "没有被标记为RDN的属性"
 msgid "The wildcard for the account creation link is @@creationLink@@."
 msgstr "账号建立连接的通配符 @@resetLink@@."
 
-#: ../lib/modules/passwordSelfReset.inc:115 ../help/help.inc:226
+#: ../lib/modules/passwordSelfReset.inc:116 ../help/help.inc:228
 msgid "The wildcard for the new password is @@newPassword@@."
 msgstr "新密码的通配符为@@newPassword@@."
 
-#: ../lib/modules/passwordSelfReset.inc:125
+#: ../lib/modules/passwordSelfReset.inc:126
 msgid "The wildcard for the reset link is @@resetLink@@."
 msgstr "复位连接的通配符 @@resetLink@@."
 
@@ -11245,11 +11486,11 @@ msgstr "复位连接的通配符 @@resetLink@@."
 msgid "There are <b>%s</b> members in group <b>%s</b>:"
 msgstr "共有<b>%s</b>个用户中在组<b>%s</b>中:"
 
-#: ../lib/modules/posixGroup.inc:543
+#: ../lib/modules/posixGroup.inc:583
 msgid "There are still users who have this group as their primary group."
 msgstr "仍有用户的主组为本组."
 
-#: ../lib/modules/sambaGroupMapping.inc:434
+#: ../lib/modules/sambaGroupMapping.inc:589
 msgid "There can be only one group of this type."
 msgstr "只能有一种本类型组."
 
@@ -11270,14 +11511,14 @@ msgstr "上传时发生错误."
 msgid "There will be %s updates done with this mass update"
 msgstr "在这次批量更新中将有%s个更新"
 
-#: ../lib/modules/posixGroup.inc:440
+#: ../lib/modules/posixGroup.inc:476
 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."
 
-#: ../lib/modules/posixAccount.inc:418
+#: ../lib/modules/posixAccount.inc:447
 msgid ""
 "These are the minimum and maximum numbers to use for machine IDs when "
 "creating new accounts for hosts. The range should be different from that of "
@@ -11286,7 +11527,7 @@ msgstr ""
 "这是为主机新建账号时机器ID号的最小值和最大值.这个范围不同于用户数量.新主机帐"
 "号的ID总是得到当前最高值加1."
 
-#: ../lib/modules/posixAccount.inc:414
+#: ../lib/modules/posixAccount.inc:443
 msgid ""
 "These are the minimum and maximum numbers to use for user IDs when creating "
 "new user accounts. The range should be different from that of machines. New "
@@ -11332,12 +11573,12 @@ msgstr ""
 msgid "These services will show up as hint if you enter a new service."
 msgstr "在输入新服务时，这个列表会被提示。"
 
-#: ../lib/modules/posixAccount.inc:106
+#: ../lib/modules/posixAccount.inc:124
 msgid ""
 "This GID number is invalid! Please provide either a number or a group name."
 msgstr "GID号非法!请提供新号或组名."
 
-#: ../help/help.inc:213
+#: ../help/help.inc:215
 msgid ""
 "This HTML code will be placed on top of all self service pages. E.g. you can "
 "use this to place your custom logo. Any HTML code is permitted."
@@ -11345,11 +11586,11 @@ msgstr ""
 "这些HTML代码将显示在自助服务主页的上端,比如可以在此放在贵公司标志,可以输入任"
 "何HTML代码."
 
-#: ../lib/modules/fixed_ip.inc:367
+#: ../lib/modules/fixed_ip.inc:390
 msgid "This PC name already exists."
 msgstr "PC机器名已经存在!"
 
-#: ../lib/modules/kolabUser.inc:219
+#: ../lib/modules/kolabGroup.inc:178 ../lib/modules/kolabUser.inc:256
 msgid "This account is marked for deletion."
 msgstr "本帐号标记为删除."
 
@@ -11379,11 +11620,11 @@ msgstr "用来指定用户是否拥有汽车执照."
 msgid "This change requires to add new attributes."
 msgstr "这次修改需要增加新的属性."
 
-#: ../help/help.inc:131
+#: ../help/help.inc:133
 msgid "This changes the password of the selected profile."
 msgstr "改变设置文件的密码."
 
-#: ../help/help.inc:133
+#: ../help/help.inc:135
 msgid "This changes the profile which is selected by default at login."
 msgstr "改变缺省登录使用的配置文件."
 
@@ -11418,13 +11659,13 @@ msgstr "自定义脚本设置中包含一个非法的帐号类型."
 msgid "This custom script setting includes an invalid action type."
 msgstr "自定义脚本设置中包含一个非法的动作类型"
 
-#: ../help/help.inc:96
+#: ../help/help.inc:98
 msgid ""
 "This defines the language of the login window and sets this language as the "
 "default language. Users can change the language at login."
 msgstr "设置登录语言和默认语言.用户可以在登录时更改."
 
-#: ../help/help.inc:113
+#: ../help/help.inc:115
 msgid ""
 "This defines the rights for the home directories which are created by "
 "lamdaemon."
@@ -11458,12 +11699,12 @@ msgstr "描述用户所在地点."
 msgid "This document was automatically created by LDAP Account Manager"
 msgstr "本文件由本系统自动产生."
 
-#: ../help/help.inc:230
+#: ../help/help.inc:232
 msgid ""
 "This email address will be set as reply-to address of all password mails."
 msgstr "这个邮件地址会被设定为密码邮件的发件人地址."
 
-#: ../help/help.inc:219
+#: ../help/help.inc:221
 msgid ""
 "This email address will be set as sender address of all password mails. If "
 "empty the system default (php.ini) will be used."
@@ -11472,14 +11713,14 @@ msgstr ""
 "值."
 
 #: ../lib/modules/selfRegistration.inc:132
-#: ../lib/modules/passwordSelfReset.inc:105
+#: ../lib/modules/passwordSelfReset.inc:106
 msgid ""
 "This email address will be set as sender address of the mails. If empty the "
 "system default (php.ini) will be used."
 msgstr ""
 "这个邮件地址会被设定为邮件的发件人地址.如果为空,刚使用phi.ini指定的缺省值."
 
-#: ../lib/modules/passwordSelfReset.inc:85
+#: ../lib/modules/passwordSelfReset.inc:86
 msgid "This enables the password self reset function."
 msgstr "打开密码自助复位功能."
 
@@ -11501,7 +11742,11 @@ msgstr "本条目是一个包含%s 子条目的子树的根."
 msgid "This field is required."
 msgstr "必要的属性"
 
-#: ../lib/modules/posixAccount.inc:108
+#: ../lib/modules/customFields.inc:158
+msgid "This field name already exists. Please choose a different one."
+msgstr "这个域的名字的已经存在, 请选择另外一个名字."
+
+#: ../lib/modules/posixAccount.inc:126
 msgid "This gecos value is invalid!"
 msgstr "备注值非法!"
 
@@ -11513,15 +11758,15 @@ msgstr "这是以逗号分隔的IP地址列表."
 msgid "This is a comma separated list of MAC addresses."
 msgstr "这是以逗号分隔的MAC地址列表."
 
-#: ../lib/modules/kolabUser.inc:118
+#: ../lib/modules/kolabUser.inc:119
 msgid "This is a comma separated list of delegates."
 msgstr "这是以逗号分隔的代表列表."
 
-#: ../lib/modules/kolabUser.inc:126
+#: ../lib/modules/kolabUser.inc:127
 msgid "This is a comma separated list of eMail aliases."
 msgstr "这是以逗号分隔的电子邮件别名列表."
 
-#: ../lib/modules/kolabUser.inc:110
+#: ../lib/modules/kolabUser.inc:111
 msgid "This is a comma separated list of invitation policies."
 msgstr "这是逗号分隔的约会策略列表."
 
@@ -11533,7 +11778,7 @@ msgstr "这是以逗号分隔的收件人列表."
 msgid "This is a comma separated list of the users public email addresses."
 msgstr "这是逗号分隔的用户公开邮件地址."
 
-#: ../help/help.inc:147
+#: ../help/help.inc:149
 msgid ""
 "This is a list of IP addresses from hosts who may access LAM. You can use \"*"
 "\" as wildcard (e.g. 192.168.0.*)."
@@ -11549,11 +11794,11 @@ msgid ""
 msgstr ""
 "这是一个用户可以输入的附加属性列表.请注意用户名,密码和邮箱地址是强制性的."
 
-#: ../lib/modules/windowsGroup.inc:131 ../lib/modules/groupOfNames.inc:77
+#: ../lib/modules/windowsGroup.inc:131 ../lib/modules/groupOfNames.inc:81
 msgid "This is a list of members of this group."
 msgstr "这是该组用户列表."
 
-#: ../lib/modules/windowsGroup.inc:135 ../lib/modules/groupOfNames.inc:81
+#: ../lib/modules/windowsGroup.inc:135 ../lib/modules/groupOfNames.inc:85
 msgid ""
 "This is a list of members of this group. Multiple members are separated by "
 "semicolons."
@@ -11569,7 +11814,7 @@ msgid ""
 "accounts. Please enter one object class in each line."
 msgstr "这是用来建立新账号的对象类列表.每行输入一个对象类."
 
-#: ../help/help.inc:109
+#: ../help/help.inc:111
 msgid ""
 "This is a list of the servers where the lamdaemon scripts are stored. LDAP "
 "Account Manager will make a SSH connection to the servers with the user name "
@@ -11579,7 +11824,7 @@ msgstr ""
 "这是lamdaemon指令所在的服务器列表.本系统将用户登录时提供的用户名和密码,通过"
 "SSH连接这台服务器.服务器列表以分号分隔.可以在冒号号添加一些说明."
 
-#: ../help/help.inc:89
+#: ../help/help.inc:91
 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."
@@ -11593,7 +11838,7 @@ msgstr "这是一个不能被删除的结构化对象类"
 msgid "This is an optional description for this entry."
 msgstr "可以输入此条目的描述(可选)"
 
-#: ../help/help.inc:201
+#: ../help/help.inc:203
 msgid ""
 "This is needed to find the LDAP DNs of your user accounts. E.g. if you use "
 "\"uid\" and your user inputs \"miller\" then LAM will search for an account "
@@ -11603,10 +11848,10 @@ msgstr ""
 "uid=miller这个条件来搜索帐号."
 
 #: ../lib/modules/zarafaDynamicGroup.inc:192 ../lib/modules/ipHost.inc:110
-#: ../lib/modules/posixGroup.inc:544 ../lib/modules/device.inc:135
+#: ../lib/modules/posixGroup.inc:584 ../lib/modules/device.inc:135
 #: ../lib/modules/eduPerson.inc:239 ../lib/modules/eduPerson.inc:241
 #: ../lib/modules/zarafaAddressList.inc:163
-#: ../lib/modules/posixAccount.inc:113 ../lib/modules/inetOrgPerson.inc:95
+#: ../lib/modules/posixAccount.inc:131 ../lib/modules/inetOrgPerson.inc:95
 #: ../lib/modules/aliasEntry.inc:79 ../lib/modules/qmailGroup.inc:426
 #: ../lib/modules/qmailGroup.inc:427 ../lib/modules/qmailGroup.inc:428
 msgid "This is not a valid DN!"
@@ -11616,7 +11861,7 @@ msgstr "不是一个有效的DN!"
 msgid "This is not a valid RID number!"
 msgstr "不是一个有效的RID号!"
 
-#: ../lib/modules/sambaGroupMapping.inc:436
+#: ../lib/modules/sambaGroupMapping.inc:591
 msgid "This is not a valid Samba 3 group type!"
 msgstr "不是一个有效的Samba 3 组类型!"
 
@@ -11636,6 +11881,16 @@ msgstr "用户公开邮件地址之一."
 msgid "This is one recipient for this alias."
 msgstr "这个别名的一个收件人."
 
+#: ../help/help.inc:84
+msgid ""
+"This is only needed for TLS/SSL connections. By default, LAM will use the "
+"certificate authorities installed on your system. If you have a private CA "
+"in your company you can upload your CA certificates here and override the "
+"system certificates."
+msgstr ""
+"仅TLS/SSL连接时需要. 缺省情况是, LAM将使用安装在你系统的证书认证. 如果在公司"
+"里你有私用的CA认证中心, 你在这里可以上传CA证书, 覆盖系统中的证书. "
+
 #: ../lib/modules/asteriskAccount.inc:95
 msgid ""
 "This is the ID of the user in the Asterisk database. It may contain digits "
@@ -11663,13 +11918,13 @@ msgid ""
 "hierarchies in your company."
 msgstr "用户管理员的LDAP DN.显示您在公司的阶层."
 
-#: ../lib/modules/customFields.inc:101
+#: ../lib/modules/customFields.inc:103
 msgid ""
 "This is the LDAP attribute's value that puts the checkbox in an activated "
 "state. The value is case-insensitive."
 msgstr "这个令复选框处于激活状态的LDAP的属性值.这个值是大小写敏感的."
 
-#: ../lib/modules/customFields.inc:105
+#: ../lib/modules/customFields.inc:107
 msgid ""
 "This is the LDAP attribute's value that puts the checkbox in an deactivated "
 "state. The value is case-insensitive."
@@ -11685,7 +11940,7 @@ msgstr "网卡的MAC地址(比如:00:01:02:DE:EF:18)."
 msgid "This is the SID of the user's primary Windows group."
 msgstr "用户Windows主组的SID."
 
-#: ../help/help.inc:98
+#: ../help/help.inc:100
 msgid ""
 "This is the absolute path to an external script for setting quotas and "
 "creating home directories."
@@ -11707,7 +11962,7 @@ msgstr "用户在Windows系统中的全名."
 msgid "This is the active password policy for this account."
 msgstr "本帐号正在使用的帐号策略。"
 
-#: ../lib/modules/passwordSelfReset.inc:77
+#: ../lib/modules/passwordSelfReset.inc:78
 msgid ""
 "This is the answer to the security question. It allows users to reset their "
 "password."
@@ -11735,7 +11990,7 @@ msgid ""
 "maximum password age then you can force a password change here."
 msgstr "这是用户更改密码的日期.如果指定了密码最长有效期,这儿可以强制密码修改."
 
-#: ../lib/modules/sambaGroupMapping.inc:353
+#: ../lib/modules/sambaGroupMapping.inc:140
 msgid "This is the group name which will be shown in Windows."
 msgstr "显示在Windows系统中的组名."
 
@@ -11743,7 +11998,7 @@ msgstr "显示在Windows系统中的组名."
 msgid "This is the host's location (e.g. Munich, server room 3)."
 msgstr "这是主机的放置地点(比如慕尼黑,服务器室3号)"
 
-#: ../help/help.inc:165
+#: ../help/help.inc:167
 msgid ""
 "This is the identifier for the relative DN value. It must be one of the "
 "given allowed LDAP attributes (e.g. user accounts usually use \"uid\" while "
@@ -11752,7 +12007,7 @@ msgstr ""
 "RDN值的标志.必须是您LDAP属性中的一个值(比如,用户帐号经常使用\"uid\",而组名经"
 "常使用\"cn\"))"
 
-#: ../lib/modules/passwordSelfReset.inc:89
+#: ../lib/modules/passwordSelfReset.inc:90
 msgid ""
 "This is the label for the link to the password self reset. If empty \"Forgot "
 "password?\" will be used."
@@ -11764,7 +12019,7 @@ msgid ""
 "new account\" will be used."
 msgstr "连接到自注册服务的标签.留空使用\"注册新账号\"."
 
-#: ../help/help.inc:84
+#: ../help/help.inc:86
 msgid ""
 "This is the list of attributes to show in the account list. The entries can "
 "either be predefined values, \"#attribute\", or individual ones, \"attribute:"
@@ -11773,7 +12028,7 @@ msgstr ""
 "帐号列表所显示的属性列表.可以是预定义值\"#attribute\",或者独立的值,"
 "\"attribute:description\".用分号隔离多个条目."
 
-#: ../lib/modules/posixAccount.inc:454
+#: ../lib/modules/posixAccount.inc:483
 msgid "This is the list of valid login shells."
 msgstr "这是有效的登录shell的列表"
 
@@ -11791,15 +12046,15 @@ msgstr "用户的邮件服务器."
 msgid "This is the mailbox size limit in bytes."
 msgstr "用户的邮箱限额的大小(字节数)."
 
-#: ../lib/modules/passwordSelfReset.inc:81
+#: ../lib/modules/passwordSelfReset.inc:82
 msgid "This is the minimum length for answers to the security question."
 msgstr "安全问题的答案的最小长度."
 
-#: ../lib/modules/nisnetgroup.inc:77 ../lib/modules/groupOfNames.inc:61
+#: ../lib/modules/nisnetgroup.inc:77 ../lib/modules/groupOfNames.inc:65
 msgid "This is the name of this group."
 msgstr "组名."
 
-#: ../lib/modules/posixAccount.inc:521
+#: ../lib/modules/posixAccount.inc:550
 msgid ""
 "This is the natural name of the host. If empty, the host name will be used."
 msgstr "主机帐号的自然名(natural name).留空使用主机名."
@@ -11810,7 +12065,7 @@ msgid ""
 "used."
 msgstr "用户自然名,留空会使用姓名."
 
-#: ../lib/modules/posixAccount.inc:499
+#: ../lib/modules/posixAccount.inc:528
 msgid ""
 "This is the natural name of the user. If empty, the first and last name or "
 "user name is used."
@@ -11828,7 +12083,7 @@ msgid ""
 "old passwords."
 msgstr "为防止用户使用旧的密码而保存的历史密码数量."
 
-#: ../help/help.inc:94
+#: ../help/help.inc:96
 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."
@@ -11838,7 +12093,7 @@ msgstr "显示帐号中的行数，如果搜索到更多的行数会分页显示
 msgid "This is the path to the user's home directory."
 msgstr "这是用户的主目录路径."
 
-#: ../lib/modules/sambaGroupMapping.inc:361
+#: ../lib/modules/sambaGroupMapping.inc:148
 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 "
@@ -11904,13 +12159,13 @@ msgid ""
 "account was locked. -1 means forever."
 msgstr "用户帐号被锁定后用户不能登录的时间(分钟),-1表示永久."
 
-#: ../help/help.inc:141
+#: ../help/help.inc:143
 msgid ""
 "This is the time (in minutes) of inactivity after which a user is "
 "automatically logged off."
 msgstr "在自动退出前,用户不活动时间(分钟)."
 
-#: ../help/help.inc:102
+#: ../help/help.inc:104
 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 "
@@ -11944,7 +12199,7 @@ msgstr "当使用账号和密码定义type=friend时,此项设置用来允许呼
 msgid "This is used to mark this account as resource."
 msgstr "用来标识此账号是一个资源"
 
-#: ../lib/modules/posixAccount.inc:109
+#: ../lib/modules/posixAccount.inc:127
 msgid "This login shell is invalid!"
 msgstr "登录shell非法!"
 
@@ -11956,7 +12211,7 @@ msgstr "邮件地址已被使用: "
 msgid "This mailbox will be created/deleted."
 msgstr "这个邮箱将会被建立或删除."
 
-#: ../lib/modules/customFields.inc:97
+#: ../lib/modules/customFields.inc:99
 msgid ""
 "This message is shown when the field value does not match the validation "
 "expression."
@@ -12017,19 +12272,19 @@ msgstr ""
 msgid "This specifies what to do when the client connection is broken."
 msgstr "这里指定客户连接中断的动作。"
 
-#: ../help/help.inc:205
+#: ../help/help.inc:207
 msgid ""
 "This text is displayed on top of the self service login page. You can also "
 "input HTML code here."
 msgstr "这些文本显示在自助服务登录面的上端.你可以在此输入HTML代码."
 
-#: ../help/help.inc:207
+#: ../help/help.inc:209
 msgid ""
 "This text is displayed on top of the self service main page. You can also "
 "input HTML code here."
 msgstr "这些文本显示在自助服务主页的上端,可以在此输入HTML代码."
 
-#: ../help/help.inc:203
+#: ../help/help.inc:205
 msgid ""
 "This text should shortly describe your selected LDAP search attribute (e.g. "
 "email or user name)."
@@ -12066,7 +12321,7 @@ msgstr "此值只能设为 \"Room\" 或 \"Equipment\"."
 #: ../lib/modules/sambaSamAccount.inc:112
 #: ../lib/modules/sambaSamAccount.inc:113
 #: ../lib/modules/sambaSamAccount.inc:114
-#: ../lib/modules/sambaSamAccount.inc:115 ../lib/modules/posixAccount.inc:110
+#: ../lib/modules/sambaSamAccount.inc:115 ../lib/modules/posixAccount.inc:128
 #: ../lib/modules/zarafaUser.inc:453 ../lib/modules/zarafaUser.inc:455
 #: ../lib/modules/zarafaUser.inc:456 ../lib/modules/zarafaUser.inc:457
 #: ../lib/modules/zarafaUser.inc:458 ../lib/modules/zarafaUser.inc:459
@@ -12079,33 +12334,35 @@ msgstr "此值只能设为 \"true\" 或 \"false\"."
 msgid "This value can only be \"true\", \"false\" or \"system\"."
 msgstr "此值只能设为\"true\", \"false\" or \"system\"."
 
-#: ../lib/modules/posixGroup.inc:542
+#: ../lib/modules/posixGroup.inc:582
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "此值必须是用分号分开的用户名列表."
 
-#: ../help/help.inc:234
+#: ../help/help.inc:236
 msgid "This will create a new organisational unit under the selected one."
 msgstr "在所选的节点下建立新的组织单元."
 
-#: ../lib/modules/posixAccount.inc:446
+#: ../lib/modules/posixAccount.inc:475
 msgid "This will create the user's home directory on the specified server."
 msgstr "将在指定的服务器上建立用户的主目录."
 
-#: ../help/help.inc:236
+#: ../help/help.inc:238
 msgid ""
 "This will delete the selected organisational unit. The OU has to be empty."
 msgstr "将删除所选的组织单元.组织单元必须为空."
 
-#: ../help/help.inc:129
+#: ../help/help.inc:131
 msgid "This will delete the selected profile."
 msgstr "将删除所选的配置文件."
 
-#: ../lib/modules/puppetClient.inc:102 ../lib/modules/qmailUser.inc:257
-#: ../lib/modules/zarafaContact.inc:81 ../lib/modules/eduPerson.inc:144
-#: ../lib/modules/sambaSamAccount.inc:390 ../lib/modules/zarafaUser.inc:130
-#: ../lib/modules/shadowAccount.inc:191 ../lib/modules/qmailGroup.inc:226
+#: ../lib/modules/kolabGroup.inc:111 ../lib/modules/puppetClient.inc:102
+#: ../lib/modules/qmailUser.inc:257 ../lib/modules/zarafaContact.inc:81
+#: ../lib/modules/posixGroup.inc:509 ../lib/modules/eduPerson.inc:144
+#: ../lib/modules/sambaSamAccount.inc:390 ../lib/modules/posixAccount.inc:426
+#: ../lib/modules/zarafaUser.inc:130 ../lib/modules/shadowAccount.inc:191
+#: ../lib/modules/qmailGroup.inc:226
 #: ../lib/modules/authorizedServiceObject.inc:83
-#: ../lib/modules/hostObject.inc:77
+#: ../lib/modules/passwordSelfReset.inc:142 ../lib/modules/hostObject.inc:77
 msgid "This will enable the extension automatically if this profile is loaded."
 msgstr "在配置文件调入时，将自动打开扩展项。"
 
@@ -12119,7 +12376,7 @@ msgid ""
 "the user via mail."
 msgstr "将会生成一个随机的密码并在屏幕上显示或通过邮件发送给用户."
 
-#: ../help/help.inc:217
+#: ../help/help.inc:219
 msgid ""
 "This will set a random password and display it on the screen or send it to "
 "the user via mail. Please edit your LAM server profile to setup the mail "
@@ -12128,7 +12385,7 @@ msgstr ""
 "将会生成一个随机的密码并在屏幕上显示或通过邮件发送给用户。请编辑LAM服务器配置"
 "文件来设定邮件的配置."
 
-#: ../lib/modules/kolabUser.inc:134
+#: ../lib/modules/kolabGroup.inc:107 ../lib/modules/kolabUser.inc:153
 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)."
@@ -12150,17 +12407,17 @@ msgstr "星期四"
 #: ../lib/modules/mitKerberos.inc:223 ../lib/modules/mitKerberos.inc:247
 #: ../lib/modules/mitKerberos.inc:356 ../lib/modules/mitKerberos.inc:776
 #: ../lib/modules/heimdalKerberos.inc:103
-#: ../lib/modules/heimdalKerberos.inc:152
-#: ../lib/modules/heimdalKerberos.inc:187
-#: ../lib/modules/heimdalKerberos.inc:209
-#: ../lib/modules/heimdalKerberos.inc:294
-#: ../lib/modules/heimdalKerberos.inc:679
+#: ../lib/modules/heimdalKerberos.inc:157
+#: ../lib/modules/heimdalKerberos.inc:192
+#: ../lib/modules/heimdalKerberos.inc:214
+#: ../lib/modules/heimdalKerberos.inc:299
+#: ../lib/modules/heimdalKerberos.inc:684
 msgid "Ticket lifetime"
 msgstr "票证寿命"
 
 #: ../lib/modules/mitKerberos.inc:284 ../lib/modules/mitKerberos.inc:285
-#: ../lib/modules/heimdalKerberos.inc:243
-#: ../lib/modules/heimdalKerberos.inc:244
+#: ../lib/modules/heimdalKerberos.inc:248
+#: ../lib/modules/heimdalKerberos.inc:249
 msgid "Ticket lifetime must be a number."
 msgstr "票证寿命必须是数字!"
 
@@ -12181,7 +12438,7 @@ msgstr "时区"
 msgid "To"
 msgstr "到"
 
-#: ../lib/modules/posixAccount.inc:491
+#: ../lib/modules/posixAccount.inc:520
 msgid "To disable login use /bin/false."
 msgstr "使用/bin/false来禁止登录"
 
@@ -12189,7 +12446,7 @@ msgstr "使用/bin/false来禁止登录"
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "东京,首尔,大孤,雅库茨克"
 
-#: ../templates/config/confmain.php:388
+#: ../templates/config/confmain.php:389
 msgid "Tool settings"
 msgstr "工具设置"
 
@@ -12221,7 +12478,7 @@ msgstr "树状结构后缀"
 msgid "Tree view"
 msgstr "树状结构"
 
-#: ../templates/config/confmain.php:533
+#: ../templates/config/confmain.php:537
 msgid "TreeSuffix is invalid!"
 msgstr "树状结构后缀非法!"
 
@@ -12233,25 +12490,25 @@ msgstr "星期二"
 #: ../templates/schema/schema.php:348 ../lib/modules/zarafaUser.inc:109
 #: ../lib/modules/zarafaUser.inc:198 ../lib/modules/zarafaUser.inc:279
 #: ../lib/modules/zarafaUser.inc:402 ../lib/modules/zarafaUser.inc:567
-#: ../lib/modules/zarafaUser.inc:1317 ../lib/modules/customFields.inc:84
-#: ../lib/modules/customFields.inc:889 ../lib/modules/customFields.inc:1285
+#: ../lib/modules/zarafaUser.inc:1317 ../lib/modules/customFields.inc:86
+#: ../lib/modules/customFields.inc:992 ../lib/modules/customFields.inc:1468
 msgid "Type"
 msgstr "类型"
 
-#: ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:112
 msgid "UID"
 msgstr "UID"
 
-#: ../lib/modules/posixAccount.inc:182 ../lib/modules/posixAccount.inc:200
-#: ../lib/modules/posixAccount.inc:457
+#: ../lib/modules/posixAccount.inc:203 ../lib/modules/posixAccount.inc:221
+#: ../lib/modules/posixAccount.inc:486
 msgid "UID generator"
 msgstr "UID生成器"
 
-#: ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:112
 msgid "UID has changed. Do you want to change home directory?"
 msgstr "UID已经改变,想改变主目录吗?"
 
-#: ../lib/modules/posixAccount.inc:89
+#: ../lib/modules/posixAccount.inc:107
 msgid ""
 "UID must be a number. It has to be inside the UID range which is defined in "
 "your configuration profile."
@@ -12261,15 +12518,15 @@ msgstr "UID必须是一个数字,必须在配置文件中所定的UID范围内."
 #: ../lib/modules/qmailUser.inc:105 ../lib/modules/qmailUser.inc:224
 #: ../lib/modules/qmailUser.inc:325 ../lib/modules/qmailUser.inc:411
 #: ../lib/modules/qmailUser.inc:563 ../lib/modules/qmailUser.inc:1189
-#: ../lib/modules/posixAccount.inc:90 ../lib/modules/posixAccount.inc:269
-#: ../lib/modules/posixAccount.inc:353 ../lib/modules/posixAccount.inc:382
-#: ../lib/modules/posixAccount.inc:413 ../lib/modules/posixAccount.inc:417
-#: ../lib/modules/posixAccount.inc:425 ../lib/modules/posixAccount.inc:1233
-#: ../lib/modules/posixAccount.inc:1624
+#: ../lib/modules/posixAccount.inc:108 ../lib/modules/posixAccount.inc:284
+#: ../lib/modules/posixAccount.inc:376 ../lib/modules/posixAccount.inc:405
+#: ../lib/modules/posixAccount.inc:442 ../lib/modules/posixAccount.inc:446
+#: ../lib/modules/posixAccount.inc:454 ../lib/modules/posixAccount.inc:1335
+#: ../lib/modules/posixAccount.inc:1748
 msgid "UID number"
 msgstr "UID编号"
 
-#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:108
 #, php-format
 msgid ""
 "UID number has changed. To keep file ownership you have to run the following "
@@ -12282,7 +12539,7 @@ msgstr ""
 msgid "UID number is already in use."
 msgstr "UID已经被使用"
 
-#: ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:99
 msgid "UID ranges for Unix accounts"
 msgstr "Unix帐号的UID范围"
 
@@ -12305,8 +12562,8 @@ msgstr "URL"
 msgid "Unable to change ACL on IMAP server for mailbox deletion."
 msgstr "在邮箱删除时无法改变IMAP服务器的ACL."
 
-#: ../lib/modules/mitKerberos.inc:1167 ../lib/modules/mitKerberos.inc:1171
-#: ../lib/modules/heimdalKerberos.inc:1019
+#: ../lib/modules/mitKerberos.inc:1162 ../lib/modules/mitKerberos.inc:1166
+#: ../lib/modules/heimdalKerberos.inc:1027
 msgid "Unable to change Kerberos password."
 msgstr "无法修改kerberos密码"
 
@@ -12335,8 +12592,8 @@ msgstr "无法连接远端服务器 !"
 msgid "Unable to create ZIP file for PDF export."
 msgstr "无法为PDF导出工作建立ZIP文件."
 
-#: ../lib/modules/selfRegistration.inc:588
-#: ../lib/modules/selfRegistration.inc:592
+#: ../lib/modules/selfRegistration.inc:608
+#: ../lib/modules/selfRegistration.inc:612
 msgid "Unable to create account."
 msgstr "无法建立新账号."
 
@@ -12376,31 +12633,39 @@ msgstr "无法在IMAP服务器上删除邮箱."
 
 #: ../templates/config/profmanage.php:123
 #: ../templates/selfService/profManage.php:87
-#: ../templates/profedit/profilemain.php:108 ../lib/config.inc:127
-#: ../lib/config.inc:139 ../lib/config.inc:146 ../lib/config.inc:154
+#: ../templates/profedit/profilemain.php:108 ../lib/config.inc:141
+#: ../lib/config.inc:153 ../lib/config.inc:160 ../lib/config.inc:168
 msgid "Unable to delete profile!"
 msgstr "无法删除配置文件!"
 
-#: ../lib/modules/posixAccount.inc:1842 ../lib/modules/posixAccount.inc:1851
-#: ../lib/modules/posixAccount.inc:2115 ../lib/modules/nisnetgroup.inc:538
-#: ../lib/modules/groupOfNamesUser.inc:340
+#: ../lib/modules/posixAccount.inc:1968 ../lib/modules/posixAccount.inc:1977
+#: ../lib/modules/posixAccount.inc:2243 ../lib/modules/nisnetgroup.inc:538
+#: ../lib/modules/groupOfNamesUser.inc:368
 msgid "Unable to find group in LDAP."
 msgstr "LDAP中找不到组."
 
-#: ../lib/modules/passwordSelfReset.inc:780
-#: ../lib/modules/passwordSelfReset.inc:973
+#: ../lib/modules/passwordSelfReset.inc:817
+msgid "Unable to find password security answer for this account."
+msgstr "找不到这个帐号的密码安全提问."
+
+#: ../lib/modules/passwordSelfReset.inc:809
+#: ../lib/modules/passwordSelfReset.inc:1025
 msgid "Unable to find password security question for this account."
 msgstr "找不到这个帐号的密码安全提问."
 
-#: ../templates/login.php:580 ../templates/login.php:586
+#: ../templates/login.php:594 ../templates/login.php:600
 msgid "Unable to find the user name in LDAP."
 msgstr "LDAP中找不到用户名."
 
-#: ../lib/modules/passwordSelfReset.inc:771
-#: ../lib/modules/passwordSelfReset.inc:1046
+#: ../lib/modules/passwordSelfReset.inc:800
+#: ../lib/modules/passwordSelfReset.inc:1098
 msgid "Unable to find user account."
 msgstr "找不到用户账号."
 
+#: ../templates/config/mainmanage.php:160
+msgid "Unable to import server certificate. Please use the upload function."
+msgstr "不能导入服务器证书. 请使用上传功能."
+
 #: ../lib/modules.inc:1492 ../lib/modules.inc:1496
 msgid "Unable to load LDAP entry:"
 msgstr "无法调入LDAP条目:"
@@ -12419,10 +12684,14 @@ msgstr "无法在IMAP服务器上找到邮箱."
 msgid "Unable to read file."
 msgstr "无法读入文件"
 
-#: ../lib/modules/passwordSelfReset.inc:1208
-#: ../lib/modules/passwordSelfReset.inc:1218
-#: ../lib/modules/passwordSelfReset.inc:1224
-#: ../lib/modules/passwordSelfReset.inc:1233
+#: ../lib/modules/selfRegistration.inc:601
+msgid "Unable to register your new account. Please try again."
+msgstr "无法注册新帐号, 请重试."
+
+#: ../lib/modules/passwordSelfReset.inc:1293
+#: ../lib/modules/passwordSelfReset.inc:1302
+#: ../lib/modules/passwordSelfReset.inc:1308
+#: ../lib/modules/passwordSelfReset.inc:1317
 msgid "Unable to reset password."
 msgstr "不能复位密码"
 
@@ -12441,16 +12710,16 @@ msgstr "无法获取schema!"
 msgid "Unable to save profile!"
 msgstr "无法存储配置文件!"
 
-#: ../lib/account.inc:949
+#: ../lib/account.inc:999
 msgid "Unable to send mail!"
 msgstr "无法发送邮件!"
 
-#: ../lib/modules/passwordSelfReset.inc:829
-#: ../lib/modules/passwordSelfReset.inc:1058
+#: ../lib/modules/passwordSelfReset.inc:866
+#: ../lib/modules/passwordSelfReset.inc:1110
 msgid "Unable to verify your password reset request. Please try again."
 msgstr "无法确认您的密码复位请求,请重试."
 
-#: ../lib/modules/selfRegistration.inc:600
+#: ../lib/modules/selfRegistration.inc:635
 msgid "Unable to verify your user creation request. Please try again."
 msgstr "无法确认您的用户建立请求,请重试."
 
@@ -12462,11 +12731,11 @@ msgstr "解除绑定"
 msgid "Universal"
 msgstr "通用的"
 
-#: ../templates/lists/changePassword.php:361
-#: ../templates/lists/changePassword.php:392 ../lib/types/user.inc:268
+#: ../templates/lists/changePassword.php:362
+#: ../templates/lists/changePassword.php:393 ../lib/types/user.inc:268
 #: ../lib/types/user.inc:369 ../lib/types/user.inc:401
-#: ../lib/types/user.inc:821 ../lib/modules/posixGroup.inc:332
-#: ../lib/modules/posixAccount.inc:143
+#: ../lib/types/user.inc:821 ../lib/modules/posixGroup.inc:362
+#: ../lib/modules/posixAccount.inc:161
 msgid "Unix"
 msgstr "unix"
 
@@ -12474,11 +12743,17 @@ msgstr "unix"
 msgid "Unix account"
 msgstr "Unix帐号"
 
-#: ../lib/modules/posixAccount.inc:235 ../lib/modules/posixAccount.inc:1347
+#: ../lib/modules/posixAccount.inc:256 ../lib/modules/posixAccount.inc:1462
 msgid "Unix groups"
 msgstr "Unix组"
 
-#: ../lib/modules/kolabUser.inc:185
+#: ../lib/modules/dhcp_settings.inc:194 ../lib/modules/dhcp_settings.inc:211
+#: ../lib/modules/dhcp_settings.inc:287 ../lib/modules/dhcp_settings.inc:595
+#: ../lib/modules/dhcp_settings.inc:675
+msgid "Unknown clients"
+msgstr "未知的客户端"
+
+#: ../lib/modules/kolabUser.inc:218
 #, php-format
 msgid "Unknown delegate address: %s"
 msgstr "不明的代表地址:%s"
@@ -12493,9 +12768,9 @@ msgid "Unlock"
 msgstr "解锁"
 
 #: ../templates/lists/changePassword.php:203
-#: ../templates/lists/changePassword.php:358
-#: ../templates/lists/changePassword.php:378
-#: ../templates/lists/changePassword.php:380
+#: ../templates/lists/changePassword.php:359
+#: ../templates/lists/changePassword.php:379
+#: ../templates/lists/changePassword.php:381
 #: ../lib/modules/ppolicyUser.inc:135
 msgid "Unlock account"
 msgstr "解锁账号."
@@ -12504,16 +12779,16 @@ msgstr "解锁账号."
 msgid "Unlock account?"
 msgstr "解锁账号?"
 
-#: ../lib/modules/posixGroup.inc:212 ../lib/modules/posixAccount.inc:1301
+#: ../lib/modules/posixGroup.inc:209 ../lib/modules/posixAccount.inc:1404
 #: ../lib/modules/inetOrgPerson.inc:2087
 msgid "Unlock password"
 msgstr "解除密码锁定"
 
-#: ../templates/masscreate.php:106 ../templates/config/confmodules.php:376
+#: ../templates/masscreate.php:106 ../templates/config/confmodules.php:386
 msgid "Unsolved dependency:"
 msgstr "未解决的依赖性问题:"
 
-#: ../templates/pdfedit/pdfpage.php:475
+#: ../templates/pdfedit/pdfpage.php:473
 msgid "Up"
 msgstr "向上"
 
@@ -12544,19 +12819,33 @@ msgstr "修改值"
 msgid "Updating object"
 msgstr "对象升级中"
 
-#: ../lib/modules/inetOrgPerson.inc:2301
+#: ../templates/config/mainmanage.php:288 ../lib/modules/ldapPublicKey.inc:141
+#: ../lib/modules/inetOrgPerson.inc:2303
 msgid "Upload"
 msgstr "上传"
 
+#: ../templates/config/mainmanage.php:290
+msgid "Upload CA certificate in DER/PEM format."
+msgstr "上传DEF/PEM格式的CA证书"
+
+#: ../lib/modules/ldapPublicKey.inc:74
+msgid "Upload a file with one or more keys. Each line contains one key."
+msgstr "上传包含一个或多个密钥的文件. 一行一个密钥."
+
 #: ../templates/massBuildAccounts.php:242
 msgid "Upload accounts to LDAP"
 msgstr "上传帐号到LDAP"
 
+#: ../lib/modules/ldapPublicKey.inc:137 ../lib/modules/customFields.inc:146
+#: ../lib/modules/customFields.inc:2916
+msgid "Upload file"
+msgstr "上传文件"
+
 #: ../templates/masscreate.php:271
 msgid "Upload file and create accounts"
 msgstr "开始上传,建立帐号"
 
-#: ../templates/massDoUpload.php:254 ../lib/lists.inc:1063
+#: ../templates/massDoUpload.php:254 ../lib/lists.inc:1064
 msgid "Upload has finished"
 msgstr "上传完毕"
 
@@ -12592,7 +12881,7 @@ msgstr "使用unix的密码"
 msgid "Use no password"
 msgstr "无需密码"
 
-#: ../help/help.inc:153
+#: ../help/help.inc:155
 msgid ""
 "Use this to enter an additional LDAP filter (e.g. \"(cn!=admin)\") to reduce "
 "the number of visible elements for this account type."
@@ -12610,6 +12899,12 @@ msgstr "使用此项来隐藏呼叫者ID."
 msgid "Use this to hide this entry from the address book."
 msgstr "使用此项来隐藏地址簿的条目"
 
+#: ../lib/modules/sambaGroupMapping.inc:160
+msgid ""
+"Use this to specify other groups or accounts from other domains as group "
+"members."
+msgstr "用此来指定从其他域来的组或帐号的组成员."
+
 #: ../lib/modules/quota.inc:102 ../lib/modules/quota.inc:393
 msgid "Used blocks"
 msgstr "已使用的块数"
@@ -12685,7 +12980,7 @@ msgstr "用户可以修改密码"
 
 #: ../lib/modules/inetOrgPerson.inc:147 ../lib/modules/inetOrgPerson.inc:360
 #: ../lib/modules/inetOrgPerson.inc:912 ../lib/modules/inetOrgPerson.inc:2044
-#: ../lib/modules/inetOrgPerson.inc:3208
+#: ../lib/modules/inetOrgPerson.inc:3210
 msgid "User certificates"
 msgstr "用户数字证书"
 
@@ -12694,7 +12989,7 @@ msgstr "用户数字证书"
 msgid "User count: %s"
 msgstr "帐号总计: %s"
 
-#: ../lib/modules/posixAccount.inc:471
+#: ../lib/modules/posixAccount.inc:500
 msgid "User description. If left empty first and last name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名."
 
@@ -12715,15 +13010,15 @@ msgstr "用户修改"
 #: ../lib/modules/mitKerberos.inc:780 ../lib/modules/sambaSamAccount.inc:289
 #: ../lib/modules/sambaSamAccount.inc:1148 ../lib/modules/windowsUser.inc:560
 #: ../lib/modules/heimdalKerberos.inc:99
-#: ../lib/modules/heimdalKerberos.inc:181
-#: ../lib/modules/heimdalKerberos.inc:208
-#: ../lib/modules/heimdalKerberos.inc:324
-#: ../lib/modules/heimdalKerberos.inc:541
-#: ../lib/modules/heimdalKerberos.inc:675
+#: ../lib/modules/heimdalKerberos.inc:186
+#: ../lib/modules/heimdalKerberos.inc:213
+#: ../lib/modules/heimdalKerberos.inc:329
+#: ../lib/modules/heimdalKerberos.inc:546
+#: ../lib/modules/heimdalKerberos.inc:680
 msgid "User must change password"
 msgstr "用户必须修改密码"
 
-#: ../templates/lists/changePassword.php:262 ../templates/login.php:328
+#: ../templates/lists/changePassword.php:262 ../templates/login.php:338
 #: ../lib/types/alias.inc:91 ../lib/types/user.inc:94
 #: ../lib/selfService.inc:366 ../lib/modules/mitKerberos.inc:109
 #: ../lib/modules/mitKerberos.inc:204 ../lib/modules/mitKerberos.inc:242
@@ -12737,35 +13032,35 @@ msgstr "用户必须修改密码"
 #: ../lib/modules/account.inc:257 ../lib/modules/uidObject.inc:38
 #: ../lib/modules/uidObject.inc:60 ../lib/modules/uidObject.inc:69
 #: ../lib/modules/uidObject.inc:78 ../lib/modules/uidObject.inc:93
-#: ../lib/modules/uidObject.inc:154 ../lib/modules/posixAccount.inc:95
-#: ../lib/modules/posixAccount.inc:96 ../lib/modules/posixAccount.inc:99
-#: ../lib/modules/posixAccount.inc:255 ../lib/modules/posixAccount.inc:379
-#: ../lib/modules/posixAccount.inc:466 ../lib/modules/posixAccount.inc:1220
-#: ../lib/modules/posixAccount.inc:1614 ../lib/modules/windowsUser.inc:95
+#: ../lib/modules/uidObject.inc:154 ../lib/modules/posixAccount.inc:113
+#: ../lib/modules/posixAccount.inc:114 ../lib/modules/posixAccount.inc:117
+#: ../lib/modules/posixAccount.inc:276 ../lib/modules/posixAccount.inc:402
+#: ../lib/modules/posixAccount.inc:495 ../lib/modules/posixAccount.inc:1320
+#: ../lib/modules/posixAccount.inc:1738 ../lib/modules/windowsUser.inc:95
 #: ../lib/modules/windowsUser.inc:214 ../lib/modules/windowsUser.inc:380
 #: ../lib/modules/windowsUser.inc:443 ../lib/modules/windowsUser.inc:519
 #: ../lib/modules/windowsUser.inc:1215 ../lib/modules/nisnetgroup.inc:145
 #: ../lib/modules/nisnetgroup.inc:475 ../lib/modules/inetOrgPerson.inc:92
 #: ../lib/modules/inetOrgPerson.inc:366 ../lib/modules/inetOrgPerson.inc:693
 #: ../lib/modules/inetOrgPerson.inc:812 ../lib/modules/inetOrgPerson.inc:1408
-#: ../lib/modules/inetOrgPerson.inc:2374 ../lib/modules/inetOrgPerson.inc:2509
-#: ../lib/modules/passwordSelfReset.inc:177
-#: ../lib/modules/passwordSelfReset.inc:696
-#: ../lib/modules/passwordSelfReset.inc:845
+#: ../lib/modules/inetOrgPerson.inc:2376 ../lib/modules/inetOrgPerson.inc:2511
+#: ../lib/modules/passwordSelfReset.inc:190
+#: ../lib/modules/passwordSelfReset.inc:712
+#: ../lib/modules/passwordSelfReset.inc:882
 #: ../lib/modules/heimdalKerberos.inc:87
-#: ../lib/modules/heimdalKerberos.inc:168
-#: ../lib/modules/heimdalKerberos.inc:206
-#: ../lib/modules/heimdalKerberos.inc:283
-#: ../lib/modules/heimdalKerberos.inc:668
+#: ../lib/modules/heimdalKerberos.inc:173
+#: ../lib/modules/heimdalKerberos.inc:211
+#: ../lib/modules/heimdalKerberos.inc:288
+#: ../lib/modules/heimdalKerberos.inc:673
 msgid "User name"
 msgstr "用户名"
 
-#: ../lib/modules/selfRegistration.inc:411 ../lib/modules/posixAccount.inc:103
+#: ../lib/modules/selfRegistration.inc:411 ../lib/modules/posixAccount.inc:121
 #: ../lib/modules/inetOrgPerson.inc:94
 msgid "User name already exists!"
 msgstr "用户名已经存在!"
 
-#: ../lib/modules/passwordSelfReset.inc:179
+#: ../lib/modules/passwordSelfReset.inc:192
 msgid "User name and email address"
 msgstr "用户名和用户的电子邮件地址"
 
@@ -12778,21 +13073,21 @@ msgstr "用户名属性"
 #: ../lib/modules/account.inc:118 ../lib/modules/account.inc:120
 #: ../lib/modules/zarafaContact.inc:176 ../lib/modules/zarafaContact.inc:177
 #: ../lib/modules/uidObject.inc:78 ../lib/modules/zarafaGroup.inc:216
-#: ../lib/modules/zarafaGroup.inc:217 ../lib/modules/posixAccount.inc:96
-#: ../lib/modules/posixAccount.inc:101 ../lib/modules/zarafaUser.inc:451
+#: ../lib/modules/zarafaGroup.inc:217 ../lib/modules/posixAccount.inc:114
+#: ../lib/modules/posixAccount.inc:119 ../lib/modules/zarafaUser.inc:451
 #: ../lib/modules/zarafaUser.inc:452 ../lib/modules/windowsUser.inc:443
 #: ../lib/modules/windowsUser.inc:444 ../lib/modules/nisnetgroup.inc:145
 #: ../lib/modules/inetOrgPerson.inc:92 ../lib/modules/inetOrgPerson.inc:93
-#: ../lib/modules/passwordSelfReset.inc:738
-#: ../lib/modules/passwordSelfReset.inc:934
-#: ../lib/modules/heimdalKerberos.inc:239
-#: ../lib/modules/heimdalKerberos.inc:240
+#: ../lib/modules/passwordSelfReset.inc:760
+#: ../lib/modules/passwordSelfReset.inc:979
+#: ../lib/modules/heimdalKerberos.inc:244
+#: ../lib/modules/heimdalKerberos.inc:245
 msgid ""
 "User name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
 msgstr "用户名包含非法字符,只能使用a-z,A-Z,0-9,和 .-_!"
 
-#: ../lib/modules/posixAccount.inc:99
+#: ../lib/modules/posixAccount.inc:117
 msgid "User name in use. Selected next free user name."
 msgstr "用户名存在,请选择其他的用户名."
 
@@ -12803,7 +13098,7 @@ msgid ""
 "Z,0-9, @.-_."
 msgstr "将要建立的用户名,可用字符为: a-z,A-Z,0-9, @.-_."
 
-#: ../lib/modules/posixAccount.inc:467
+#: ../lib/modules/posixAccount.inc:496
 msgid ""
 "User name of the user who should be created. Valid characters are: a-z,A-"
 "Z,0-9, @.-_. If user name is already used user name will be expanded with a "
@@ -12812,13 +13107,13 @@ msgstr ""
 "将要建立的用户名,可用字符为:a-z,A-Z,0-9, @.-_..如果该组名存在,会在组名末尾增"
 "加下一个可以使用的数字。"
 
-#: ../lib/modules/passwordSelfReset.inc:180
-#: ../lib/modules/passwordSelfReset.inc:714
-#: ../lib/modules/passwordSelfReset.inc:860
+#: ../lib/modules/passwordSelfReset.inc:193
+#: ../lib/modules/passwordSelfReset.inc:736
+#: ../lib/modules/passwordSelfReset.inc:902
 msgid "User name or email address"
 msgstr "用户名或用户邮件地址."
 
-#: ../lib/modules/posixAccount.inc:242 ../lib/modules/posixAccount.inc:400
+#: ../lib/modules/posixAccount.inc:263 ../lib/modules/posixAccount.inc:429
 msgid "User name suggestion"
 msgstr "用户名建议"
 
@@ -12837,9 +13132,9 @@ msgstr "用户自注册"
 msgid "User server"
 msgstr "用户服务器"
 
-#: ../lib/types/user.inc:53 ../lib/modules/posixAccount.inc:75
-#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:79
-#: ../lib/modules/posixAccount.inc:181 ../lib/modules/zarafaUser.inc:180
+#: ../lib/types/user.inc:53 ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/posixAccount.inc:94 ../lib/modules/posixAccount.inc:97
+#: ../lib/modules/posixAccount.inc:202 ../lib/modules/zarafaUser.inc:180
 #: ../lib/modules/sudoRole.inc:63 ../lib/modules/sudoRole.inc:87
 #: ../lib/modules/sudoRole.inc:134 ../lib/modules/sudoRole.inc:173
 #: ../lib/modules/sudoRole.inc:182 ../lib/modules/sudoRole.inc:264
@@ -12852,13 +13147,13 @@ msgstr "用户"
 msgid "Users or groups that may directly send email as this user."
 msgstr "可以用这个用户直接发送邮件的用户或组."
 
-#: ../lib/modules/posixGroup.inc:428
+#: ../lib/modules/posixGroup.inc:464
 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:432
+#: ../lib/modules/posixGroup.inc:468
 msgid ""
 "Users who will become member of the current group. User names are separated "
 "by semicolons."
@@ -12874,7 +13169,7 @@ msgstr "使用%s做为lamdeamon的远程服务器."
 msgid "Using %s to connect to remote server."
 msgstr "使用%s连接远程服务器."
 
-#: ../lib/modules/posixAccount.inc:410
+#: ../lib/modules/posixAccount.inc:439
 msgid ""
 "Usually, users are not added to groups as memberUid if they have this group "
 "as primary group. If your application ignores primary groups then you can "
@@ -12887,7 +13182,11 @@ msgstr ""
 msgid "VCARD 2.1 Export"
 msgstr "VCARD 2.1 导出"
 
-#: ../help/help.inc:88
+#: ../templates/config/mainmanage.php:314
+msgid "Valid to"
+msgstr "下列是有效的"
+
+#: ../help/help.inc:90
 msgid "Valid users"
 msgstr "合法用户"
 
@@ -12895,27 +13194,27 @@ msgstr "合法用户"
 msgid "Validate server certificate"
 msgstr "校验服务器数字证书."
 
-#: ../lib/modules/customFields.inc:92 ../lib/modules/customFields.inc:1442
+#: ../lib/modules/customFields.inc:94 ../lib/modules/customFields.inc:1660
 msgid "Validation expression"
 msgstr "合法性检查表达式"
 
-#: ../lib/modules/customFields.inc:96 ../lib/modules/customFields.inc:1447
+#: ../lib/modules/customFields.inc:98 ../lib/modules/customFields.inc:1665
 msgid "Validation message"
 msgstr "合法性检查消息"
 
-#: ../lib/modules/customFields.inc:2189
+#: ../lib/modules/customFields.inc:2449
 msgid "Value"
 msgstr "值"
 
-#: ../lib/modules/customFields.inc:100 ../lib/modules/customFields.inc:1988
+#: ../lib/modules/customFields.inc:102 ../lib/modules/customFields.inc:2236
 msgid "Value for \"checked\""
 msgstr "\"选定\"时的值"
 
-#: ../lib/modules/customFields.inc:104 ../lib/modules/customFields.inc:1994
+#: ../lib/modules/customFields.inc:106 ../lib/modules/customFields.inc:2242
 msgid "Value for \"unchecked\""
 msgstr "\"未选定\"时的值"
 
-#: ../lib/modules/customFields.inc:124 ../lib/modules/customFields.inc:2185
+#: ../lib/modules/customFields.inc:126 ../lib/modules/customFields.inc:2445
 msgid "Value mapping"
 msgstr "值映射"
 
@@ -12971,19 +13270,19 @@ msgstr "语音邮件的语境."
 msgid "Voicemail mailbox for this account."
 msgstr "此帐号的语音邮箱."
 
-#: ../templates/login.php:485
+#: ../templates/login.php:499
 msgid "Want more features? Get LAM Pro!"
 msgstr "需要更多的功能吗? 参见系统专业版! "
 
-#: ../templates/config/mainmanage.php:223
+#: ../templates/config/mainmanage.php:352
 #: ../templates/3rdParty/pla/lib/page.php:76
 msgid "Warning"
 msgstr "警告"
 
-#: ../templates/delete.php:234 ../lib/modules/posixAccount.inc:737
-#: ../lib/modules/posixAccount.inc:763 ../lib/modules/windowsUser.inc:819
-#: ../lib/modules/groupOfNamesUser.inc:196
-#: ../lib/modules/groupOfNamesUser.inc:216 ../lib/modules.inc:1836
+#: ../templates/delete.php:234 ../lib/modules/posixAccount.inc:786
+#: ../lib/modules/posixAccount.inc:839 ../lib/modules/windowsUser.inc:819
+#: ../lib/modules/groupOfNamesUser.inc:197
+#: ../lib/modules/groupOfNamesUser.inc:244 ../lib/modules.inc:1836
 #, php-format
 msgid "Was unable to add attributes to DN: %s."
 msgstr "无法为DN: %s增加属性."
@@ -12998,23 +13297,24 @@ msgstr "无法创建DN: %s."
 msgid "Was unable to delete DN: %s."
 msgstr "无法删除DN: %s."
 
-#: ../templates/lists/changePassword.php:678
-#: ../templates/lists/changePassword.php:716
-#: ../templates/lists/changePassword.php:762 ../templates/delete.php:225
+#: ../templates/lists/changePassword.php:694
+#: ../templates/lists/changePassword.php:732
+#: ../templates/lists/changePassword.php:778 ../templates/delete.php:225
 #, php-format
 msgid "Was unable to modify attributes from DN: %s."
 msgstr "无法修改DN: %s的属性"
 
-#: ../lib/modules/windowsUser.inc:845 ../lib/modules/windowsUser.inc:1188
+#: ../lib/modules/posixAccount.inc:824 ../lib/modules/windowsUser.inc:845
+#: ../lib/modules/windowsUser.inc:1188 ../lib/modules/groupOfNamesUser.inc:229
 #: ../lib/modules.inc:1819
 #, php-format
 msgid "Was unable to modify attributes of DN: %s."
 msgstr "不能修改DN: %s的属性"
 
-#: ../templates/delete.php:243 ../lib/modules/posixAccount.inc:745
-#: ../lib/modules/posixAccount.inc:780 ../lib/modules/windowsUser.inc:832
-#: ../lib/modules/groupOfNamesUser.inc:201
-#: ../lib/modules/groupOfNamesUser.inc:230 ../lib/modules.inc:1848
+#: ../templates/delete.php:243 ../lib/modules/posixAccount.inc:794
+#: ../lib/modules/posixAccount.inc:856 ../lib/modules/windowsUser.inc:832
+#: ../lib/modules/groupOfNamesUser.inc:202
+#: ../lib/modules/groupOfNamesUser.inc:258 ../lib/modules.inc:1848
 #, php-format
 msgid "Was unable to remove attributes from DN: %s."
 msgstr "无法删除DN: %s的属性."
@@ -13031,8 +13331,8 @@ msgstr "无法重命名DN: %s."
 #: ../lib/modules/inetOrgPerson.inc:197 ../lib/modules/inetOrgPerson.inc:358
 #: ../lib/modules/inetOrgPerson.inc:536 ../lib/modules/inetOrgPerson.inc:656
 #: ../lib/modules/inetOrgPerson.inc:800 ../lib/modules/inetOrgPerson.inc:804
-#: ../lib/modules/inetOrgPerson.inc:1848 ../lib/modules/inetOrgPerson.inc:2384
-#: ../lib/modules/inetOrgPerson.inc:2956
+#: ../lib/modules/inetOrgPerson.inc:1848 ../lib/modules/inetOrgPerson.inc:2386
+#: ../lib/modules/inetOrgPerson.inc:2958
 msgid "Web site"
 msgstr "网站"
 
@@ -13048,7 +13348,7 @@ msgstr "欢迎来到LAM自助服务.请输入用户名和密码."
 msgid "Western Europe Time, London, Lisbon"
 msgstr "西欧时间,伦敦,里斯本"
 
-#: ../lib/modules/passwordSelfReset.inc:151
+#: ../lib/modules/passwordSelfReset.inc:160
 msgid "What is the name of your favourite pet?"
 msgstr "你最喜欢的宠物名字?"
 
@@ -13070,8 +13370,8 @@ msgid ""
 "in your certificate!"
 msgstr "当使用ldaps://或TLS协议时确认在证书中使用相同的ip/domain!"
 
-#: ../templates/lists/changePassword.php:373
-#: ../templates/lists/changePassword.php:404 ../lib/types/user.inc:292
+#: ../templates/lists/changePassword.php:374
+#: ../templates/lists/changePassword.php:405 ../lib/types/user.inc:292
 #: ../lib/types/user.inc:381 ../lib/types/user.inc:413
 #: ../lib/types/user.inc:845 ../lib/modules/windowsHost.inc:57
 #: ../lib/modules/windowsUser.inc:82 ../lib/modules/windowsGroup.inc:92
@@ -13087,17 +13387,17 @@ msgstr "帐号所属的windows域"
 #: ../lib/modules/sambaSamAccount.inc:1236
 #: ../lib/modules/sambaSamAccount.inc:1756
 #: ../lib/modules/sambaSamAccount.inc:1881
-#: ../lib/modules/sambaGroupMapping.inc:274
-#: ../lib/modules/sambaGroupMapping.inc:318
-#: ../lib/modules/sambaGroupMapping.inc:385
+#: ../lib/modules/sambaGroupMapping.inc:104
+#: ../lib/modules/sambaGroupMapping.inc:367
+#: ../lib/modules/sambaGroupMapping.inc:526
 msgid "Windows group"
 msgstr "Windows组"
 
-#: ../lib/modules/sambaGroupMapping.inc:356
+#: ../lib/modules/sambaGroupMapping.inc:143
 msgid "Windows group name"
 msgstr "Windows组名"
 
-#: ../lib/modules/sambaGroupMapping.inc:369
+#: ../lib/modules/sambaGroupMapping.inc:156
 msgid "Windows group type."
 msgstr "Windows组类型"
 
@@ -13118,7 +13418,7 @@ msgstr "Windows主组"
 msgid "Windows primary group SID"
 msgstr "Windows主组的SID"
 
-#: ../lib/modules/sambaGroupMapping.inc:365
+#: ../lib/modules/sambaGroupMapping.inc:152
 msgid "Windows-Domain name of group."
 msgstr "组的windows域名."
 
@@ -13141,7 +13441,7 @@ msgstr "工作目录"
 msgid "Working directory of initial program."
 msgstr "初始化程序的工作目录。"
 
-#: ../templates/config/confmain.php:306
+#: ../templates/config/confmain.php:307
 msgid "Write"
 msgstr "写入"
 
@@ -13149,9 +13449,9 @@ msgstr "写入"
 msgid "Write access"
 msgstr "写权限"
 
-#: ../templates/login.php:568 ../templates/login.php:626
-#: ../templates/selfService/selfServiceLogin.php:121
-#: ../templates/selfService/selfServiceLogin.php:138
+#: ../templates/login.php:582 ../templates/login.php:640
+#: ../templates/selfService/selfServiceLogin.php:122
+#: ../templates/selfService/selfServiceLogin.php:139
 msgid "Wrong password/user name combination. Please try again."
 msgstr "错误的密码和用户组合,请重试!"
 
@@ -13161,34 +13461,46 @@ msgstr "错误的配额类型.配额必须为数字."
 
 #: ../templates/schema/schema.php:153 ../templates/schema/schema.php:195
 #: ../templates/schema/schema.php:200 ../templates/schema/schema.php:205
-#: ../templates/pdfedit/pdfpage.php:463 ../lib/modules/qmailGroup.inc:315
+#: ../templates/pdfedit/pdfpage.php:460 ../lib/modules/qmailGroup.inc:315
 #: ../lib/modules/qmailGroup.inc:357 ../lib/modules/qmailGroup.inc:1027
 #: ../lib/modules/qmailGroup.inc:1028 ../lib/modules/qmailGroup.inc:1070
 #: ../lib/modules/qmailGroup.inc:1076 ../lib/modules/imapAccess.inc:112
 msgid "Yes"
 msgstr "是"
 
-#: ../lib/modules/account.inc:119 ../lib/modules/posixGroup.inc:538
-#: ../lib/modules/posixAccount.inc:95 ../lib/modules/posixAccount.inc:97
+#: ../templates/lists/changePassword.php:491
+#: ../lib/modules/ppolicyUser.inc:333 ../lib/modules/ppolicyUser.inc:382
+msgid "You are reusing an old password. Please choose a different password."
+msgstr "重复使用了旧密码. 请输入与原来密码不同的新密码. "
+
+#: ../lib/modules/account.inc:119 ../lib/modules/posixGroup.inc:578
+#: ../lib/modules/posixAccount.inc:113 ../lib/modules/posixAccount.inc:115
 msgid ""
 "You are using capital letters. This can cause problems because Windows is "
 "not case-sensitive."
 msgstr "您正在使用大写字符,这会造成一些问题,因为windows大小写不敏感."
 
-#: ../lib/lists.inc:1065
+#: ../lib/lists.inc:1066
 #, php-format
 msgid ""
 "You can download your PDF files {link=%s}{color=#d2131a}here{endcolor}"
 "{endlink}."
 msgstr "你可以下载你的PDF文件 {link=%s}{color=#d2131a}这里{endcolor}{endlink}."
 
-#: ../help/help.inc:104
+#: ../templates/initsuff.php:181
+msgid ""
+"You can setup the LDAP suffixes for all account types in your LAM server "
+"profile on tab \"Account types\"."
+msgstr ""
+"可以为在LAM服务器配备文件中的\" 帐号类型 \"中为所有的帐号类型设置LDAP后缀."
+
+#: ../help/help.inc:106
 msgid ""
 "You can specify if LAM allows full write access, password changes or only "
 "read access."
 msgstr "您可以指定LAM是否允许全部权限,只能更改密码,或是只读."
 
-#: ../help/help.inc:154
+#: ../help/help.inc:156
 msgid ""
 "You can use the wildcard @@LOGIN_DN@@ which will be substituted with the DN "
 "of the user who is currently logged in to LAM."
@@ -13200,8 +13512,8 @@ msgstr "你可以使用掩码@@LOGIN_DN@@来替代登录到LAM的用户的DN"
 msgid "You can use this to temporarily deactivate the Zarafa extension."
 msgstr "可以使用它来临时解除Zarafa扩展项"
 
-#: ../lib/modules/passwordSelfReset.inc:114
-#: ../lib/modules/passwordSelfReset.inc:124 ../help/help.inc:225
+#: ../lib/modules/passwordSelfReset.inc:115
+#: ../lib/modules/passwordSelfReset.inc:125 ../help/help.inc:227
 msgid ""
 "You can use wildcards for LDAP attributes in the form @@attribute@@ (e.g. "
 "@@uid@@ for the user name)."
@@ -13230,7 +13542,7 @@ msgstr "在服务器只读方式下不能更新"
 msgid "You cannot rename an entry which has child entries."
 msgstr "不能为一个有子条目的条目重新命名"
 
-#: ../templates/config/confmain.php:486
+#: ../templates/config/confmain.php:487
 msgid ""
 "You cannot use SSL and TLS encryption at the same time. Please use either "
 "\"ldaps://\" or TLS."
@@ -13246,7 +13558,7 @@ msgid ""
 "published by your server."
 msgstr "您无权访问或LDAP架构未发布到LDAP服务器。"
 
-#: ../lib/modules/dhcp_settings.inc:294 ../lib/modules/dhcp_settings.inc:295
+#: ../lib/modules/dhcp_settings.inc:315 ../lib/modules/dhcp_settings.inc:316
 msgid "You entered one or more invalid DNS servers."
 msgstr "您输入了一个或多个非常的DNS服务器."
 
@@ -13267,7 +13579,13 @@ msgstr "%s是必填项目,您留下了空白."
 msgid "You made no changes"
 msgstr "您没有做任何修改."
 
-#: ../lib/modules/posixAccount.inc:103 ../lib/modules/posixAccount.inc:104
+#: ../templates/config/mainmanage.php:138
+#: ../templates/config/mainmanage.php:144
+#: ../templates/config/mainmanage.php:156
+msgid "You might need to restart your webserver for changes to take effect."
+msgstr "必须要重启WEB服务器,以使修改生效."
+
+#: ../lib/modules/posixAccount.inc:121 ../lib/modules/posixAccount.inc:122
 #, php-format
 msgid "You might want to use %s instead of %s."
 msgstr "你可能想用 %s来代替%s."
@@ -13276,11 +13594,11 @@ msgstr "你可能想用 %s来代替%s."
 msgid "You must either upload a file or provide an import in the text box."
 msgstr "在文本框中必须上传一个文件或提供一种导入方式."
 
-#: ../lib/modules/groupOfNames.inc:146 ../lib/modules/groupOfNames.inc:147
+#: ../lib/modules/groupOfNames.inc:175 ../lib/modules/groupOfNames.inc:176
 msgid "You need to add at least one member to this group."
 msgstr "您至少需要为这个组增加一个成员."
 
-#: ../lib/modules/passwordSelfReset.inc:256
+#: ../lib/modules/passwordSelfReset.inc:272
 msgid "You specified an answer but no security question."
 msgstr "您指定了一个没有安全问题的答案."
 
@@ -13327,22 +13645,28 @@ msgid ""
 "webserver user."
 msgstr "你的修改只能在web服务器有权写文件的条件下保存."
 
-#: ../lib/modules/selfRegistration.inc:596
+#: ../lib/modules/selfRegistration.inc:630
+msgid ""
+"Your new account was created but post processing failed. Please contact your "
+"local administrator."
+msgstr "您的新帐号已经建立, 但后续处理工作失败. 请联系本地管理员."
+
+#: ../lib/modules/selfRegistration.inc:627
 msgid ""
 "Your new account was successfully created. Please return to login to change "
 "your user data."
 msgstr "你的新账号已经成功建立.请返回后登录并修改用户数据."
 
-#: ../lib/security.inc:168
+#: ../lib/security.inc:177
 msgid "Your session expired, click here to go back to the login page."
 msgstr "超时,请点此外返回到登录界面."
 
-#: ../templates/login.php:289 ../templates/selfService/selfServiceLogin.php:78
+#: ../templates/login.php:299 ../templates/selfService/selfServiceLogin.php:79
 msgid "Your session expired, please log in again."
 msgstr "超时,请重新登录."
 
-#: ../templates/login.php:294 ../templates/login.php:299
-#: ../templates/login.php:308
+#: ../templates/login.php:304 ../templates/login.php:309
+#: ../templates/login.php:318
 msgid "Your settings were successfully saved."
 msgstr "设置保存成功."
 
@@ -13418,9 +13742,9 @@ msgstr "\\\\server\\profiles\\smiller"
 msgid "add value"
 msgstr "增加值"
 
-#: ../lib/modules/zarafaDynamicGroup.inc:111 ../lib/modules/posixGroup.inc:400
+#: ../lib/modules/zarafaDynamicGroup.inc:111 ../lib/modules/posixGroup.inc:436
 #: ../lib/modules/zarafaAddressList.inc:99 ../lib/modules/nisnetgroup.inc:107
-#: ../lib/modules/groupOfNames.inc:94
+#: ../lib/modules/groupOfNames.inc:103
 msgid "adminstrators"
 msgstr "管理员"
 
@@ -13522,7 +13846,7 @@ msgstr "从任何客户端"
 msgid "from previous client only"
 msgstr "仅从以前的客户端"
 
-#: ../lib/modules/posixAccount.inc:284 ../lib/modules/posixAccount.inc:336
+#: ../lib/modules/posixAccount.inc:299 ../lib/modules/posixAccount.inc:359
 #: ../lib/modules/nisnetgroup.inc:121 ../lib/modules/groupOfNamesUser.inc:66
 msgid "group01,group02"
 msgstr "group01,group02"
@@ -13537,8 +13861,8 @@ msgid "group1@company.com,group2@company.com"
 msgstr "group1@company.com,group2@company.com"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:119
-#: ../lib/modules/zarafaGroup.inc:160 ../lib/modules/windowsGroup.inc:207
-#: ../lib/modules/windowsGroup.inc:215
+#: ../lib/modules/zarafaGroup.inc:160 ../lib/modules/windowsGroup.inc:213
+#: ../lib/modules/windowsGroup.inc:221
 msgid "group@company.com"
 msgstr "groupr@company.com"
 
@@ -13601,7 +13925,7 @@ msgstr "列表"
 msgid "login"
 msgstr "登录"
 
-#: ../lib/modules/posixAccount.inc:361
+#: ../lib/modules/posixAccount.inc:384
 msgid "machines"
 msgstr "机器"
 
@@ -13649,7 +13973,8 @@ msgstr "新"
 #: ../lib/modules/ppolicy.inc:474 ../lib/modules/ppolicy.inc:484
 #: ../lib/modules/ppolicy.inc:489 ../lib/modules/ppolicy.inc:496
 #: ../lib/modules/ppolicy.inc:499 ../lib/modules/generalInformation.inc:93
-#: ../lib/modules/zarafaServer.inc:377 ../lib/modules/customFields.inc:2122
+#: ../lib/modules/zarafaServer.inc:377 ../lib/modules/customFields.inc:2371
+#: ../lib/modules/fixed_ip.inc:570
 msgid "no"
 msgstr "否"
 
@@ -13673,7 +13998,7 @@ msgstr "本条目没有新的可用二进制属性"
 #: ../templates/schema/schema.php:240 ../templates/schema/schema.php:289
 #: ../templates/schema/schema.php:355 ../templates/schema/schema.php:370
 #: ../templates/schema/schema.php:404 ../templates/schema/schema.php:426
-#: ../templates/3rdParty/pla/lib/functions.php:2602
+#: ../templates/3rdParty/pla/lib/functions.php:2612
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1573
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1581
 msgid "none"
@@ -13703,11 +14028,11 @@ msgstr "ou=People,dc=yourcompany,dc=com 表示将会在此子树下读取和保
 msgid "ou=accounts,dc=yourdomain,dc=org"
 msgstr "ou=accounts,dc=yourdomain,dc=org"
 
-#: ../lib/modules/posixAccount.inc:347
+#: ../lib/modules/posixAccount.inc:370
 msgid "pc01$"
 msgstr "pc01$"
 
-#: ../lib/modules/posixAccount.inc:370
+#: ../lib/modules/posixAccount.inc:393
 msgid "pc01,Room 2.34"
 msgstr "pc01,Room 2.34"
 
@@ -13731,8 +14056,8 @@ msgstr "刷新"
 msgid "rename"
 msgstr "重命名"
 
-#: ../templates/3rdParty/pla/lib/PageRender.php:445 ../lib/html.inc:718
-#: ../lib/html.inc:1609 ../lib/html.inc:2124
+#: ../templates/3rdParty/pla/lib/PageRender.php:445 ../lib/html.inc:742
+#: ../lib/html.inc:1633 ../lib/html.inc:2148
 msgid "required"
 msgstr "必选项"
 
@@ -13750,11 +14075,11 @@ msgid "seconds"
 msgstr "秒"
 
 #: ../lib/modules/mitKerberos.inc:237 ../lib/modules/asteriskAccount.inc:389
-#: ../lib/modules/posixGroup.inc:391 ../lib/modules/sambaSamAccount.inc:414
-#: ../lib/modules/posixAccount.inc:312 ../lib/modules/windowsUser.inc:224
-#: ../lib/modules/inetOrgPerson.inc:2520
+#: ../lib/modules/posixGroup.inc:427 ../lib/modules/sambaSamAccount.inc:414
+#: ../lib/modules/posixAccount.inc:327 ../lib/modules/windowsUser.inc:224
+#: ../lib/modules/inetOrgPerson.inc:2522
 #: ../lib/modules/asteriskVoicemail.inc:158
-#: ../lib/modules/heimdalKerberos.inc:201
+#: ../lib/modules/heimdalKerberos.inc:206
 msgid "secret"
 msgstr "secret"
 
@@ -13763,9 +14088,9 @@ msgid "select the rdn attribute"
 msgstr "选择RDN属性"
 
 #: ../lib/modules/mitKerberos.inc:206 ../lib/modules/uidObject.inc:62
-#: ../lib/modules/posixAccount.inc:257 ../lib/modules/windowsUser.inc:216
-#: ../lib/modules/inetOrgPerson.inc:2511
-#: ../lib/modules/heimdalKerberos.inc:170 ../lib/modules/nisMailAlias.inc:99
+#: ../lib/modules/posixAccount.inc:278 ../lib/modules/windowsUser.inc:216
+#: ../lib/modules/inetOrgPerson.inc:2513
+#: ../lib/modules/heimdalKerberos.inc:175 ../lib/modules/nisMailAlias.inc:99
 msgid "smiller"
 msgstr "smiller"
 
@@ -13777,7 +14102,7 @@ msgstr "smiller@otherdomain.org"
 msgid "smiller@yourdomain.org"
 msgstr "smiller@yourdomain.org"
 
-#: ../lib/modules/ldapPublicKey.inc:76
+#: ../lib/modules/ldapPublicKey.inc:83
 msgid "ssh-dss 234234 user@host"
 msgstr "ssh-dss 234234 user@host"
 
@@ -13807,7 +14132,15 @@ msgstr "true"
 msgid "uid=smiller,ou=People,dc=company,dc=com"
 msgstr "uid=smiller,ou=People,dc=company,dc=com"
 
-#: ../lib/modules/posixGroup.inc:385
+#: ../templates/config/mainmanage.php:266
+msgid "use custom CA certificates"
+msgstr "使用自定义 CA 数字证书"
+
+#: ../templates/config/mainmanage.php:263
+msgid "use system certificates"
+msgstr "使用系统的数字证书"
+
+#: ../lib/modules/posixGroup.inc:421
 msgid "user01,user02,user03"
 msgstr "user01,user02,user03"
 
@@ -13820,7 +14153,7 @@ msgstr "user01,user02,user03"
 msgid "user@company.com"
 msgstr "user@company.com"
 
-#: ../lib/modules/posixAccount.inc:277
+#: ../lib/modules/posixAccount.inc:292
 msgid "users"
 msgstr "用户"
 
@@ -13856,7 +14189,8 @@ msgstr "和"
 #: ../lib/modules/ppolicy.inc:491 ../lib/modules/ppolicy.inc:494
 #: ../lib/modules/ppolicy.inc:501 ../lib/modules/inetOrgPerson.inc:594
 #: ../lib/modules/generalInformation.inc:95
-#: ../lib/modules/zarafaServer.inc:379 ../lib/modules/customFields.inc:2122
+#: ../lib/modules/zarafaServer.inc:379 ../lib/modules/customFields.inc:2371
+#: ../lib/modules/fixed_ip.inc:568
 msgid "yes"
 msgstr "是"
 
@@ -14303,9 +14637,6 @@ msgstr "是"
 #~ msgid "Unix workstations are invalid!"
 #~ msgstr "unix工作站无效!"
 
-#~ msgid "Unknown error"
-#~ msgstr "未知错误"
-
 #~ msgid "You have been logged off from LDAP Account Manager."
 #~ msgstr "您已经从系统退出"