diff --git a/lam/locale/zh_CN/LC_MESSAGES/messages.mo b/lam/locale/zh_CN/LC_MESSAGES/messages.mo
index 13e68ee8..e6a13992 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 61ac7c2c..767f94c3 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: 2012-06-18 17:23+0800\n"
+"PO-Revision-Date: 2012-09-13 17:31+0800\n"
 "Last-Translator: Needham <needham@sina.com>\n"
 "Language-Team: Chinese(Simplified) <needham@sina.com>\n"
 "Language: \n"
@@ -54,48 +54,48 @@ msgstr "\"Send as\"属性"
 #: ../lib/modules/zarafaUser.inc:215
 #: ../lib/modules/zarafaUser.inc:374
 #: ../lib/modules/zarafaUser.inc:401
-#: ../lib/modules/zarafaUser.inc:420
-#: ../lib/modules/zarafaUser.inc:464
-#: ../lib/modules/zarafaUser.inc:840
-#: ../lib/modules/zarafaUser.inc:1336
-#: ../lib/modules/zarafaUser.inc:1532
+#: ../lib/modules/zarafaUser.inc:422
+#: ../lib/modules/zarafaUser.inc:466
+#: ../lib/modules/zarafaUser.inc:842
+#: ../lib/modules/zarafaUser.inc:1338
+#: ../lib/modules/zarafaUser.inc:1539
 msgid "\"Send as\" privileges"
 msgstr "\"做为..发送\"权限"
 
-#: ../lib/modules/posixAccount.inc:384
+#: ../lib/modules/posixAccount.inc:402
 msgid "$user and $group will be replaced with user name and primary group name."
 msgstr "$usert和$group会被用户名或主要组名替代 "
 
-#: ../lib/modules/nisnetgroup.inc:124
+#: ../lib/modules/nisnetgroup.inc:127
 msgid "(host1,user1,example.com);(host2,user2,example.com)"
 msgstr "(主机1,用户1,example.com);(主机2,用户2,example.com)"
 
-#: ../lib/modules/posixAccount.inc:231
+#: ../lib/modules/posixAccount.inc:245
 msgid "/home/smiller"
 msgstr "/home/smiller"
 
-#: ../lib/modules/inetOrgPerson.inc:411
+#: ../lib/modules/inetOrgPerson.inc:415
 #: ../lib/modules/asteriskVoicemail.inc:177
 msgid "123-123-1234"
 msgstr "123-123-1234"
 
-#: ../lib/modules/inetOrgPerson.inc:427
+#: ../lib/modules/inetOrgPerson.inc:431
 msgid "123-123-1235"
 msgstr "123-123-1235"
 
-#: ../lib/modules/inetOrgPerson.inc:435
+#: ../lib/modules/inetOrgPerson.inc:439
 msgid "123-123-1236"
 msgstr "123-123-1236"
 
-#: ../lib/modules/inetOrgPerson.inc:419
+#: ../lib/modules/inetOrgPerson.inc:423
 msgid "123-124-1234"
 msgstr "123-124-1234"
 
-#: ../lib/modules/inetOrgPerson.inc:403
+#: ../lib/modules/inetOrgPerson.inc:407
 msgid "12345"
 msgstr "12345"
 
-#: ../lib/modules/dhcp_settings.inc:153
+#: ../lib/modules/dhcp_settings.inc:160
 msgid ""
 "<b>B-Node (0x01): Broadcast.</b><br/>The client tries to find other workstations via broadcasting\n"
 "(works only inside the same collision domain, viz. the same subnet).<br/><br/>\n"
@@ -130,8 +130,8 @@ msgstr ""
 msgid "<b>Maximum length:</b> %s characters"
 msgstr "<b>最大长度:</b> %s 字符"
 
-#: ../lib/modules/selfRegistration.inc:529
-#: ../lib/modules/passwordSelfReset.inc:1187
+#: ../lib/modules/selfRegistration.inc:539
+#: ../lib/modules/passwordSelfReset.inc:1191
 msgid "A confirmation mail was sent. Please click on the link in the mail to proceed."
 msgstr "确认邮件已经发送,请点击邮件中的链接来处理."
 
@@ -148,11 +148,11 @@ msgstr "在结果中显示的属性列表(以逗号分隔)"
 msgid "A list of options (e.g. NOPASSWD)."
 msgstr "选项列表(比如:NOPASSWD)."
 
-#: ../templates/massBuildAccounts.php:119
+#: ../templates/massBuildAccounts.php:122
 msgid "A required column is missing in your CSV file."
 msgstr "您的CSV文件中缺少一个必要的列."
 
-#: ../lib/modules/kolabUser.inc:132
+#: ../lib/modules/kolabUser.inc:114
 msgid "A user may define who is allowed to act on behalf of herself. This property is checked when using the Kolab smtp daemon (Postfix) to send emails."
 msgstr "使用者可以同意由某人来代表自己，在 Kolab smtp 服务器(Postfix)发送电子邮件时会检查这个属性."
 
@@ -181,15 +181,15 @@ msgstr "必须指定一个合法的newsuperior属性"
 msgid "AMA flags"
 msgstr "AMA标志"
 
-#: ../templates/serverInfo.php:340
+#: ../templates/serverInfo.php:342
 msgid "Abandon"
 msgstr "终止"
 
-#: ../templates/lists/changePassword.php:637
+#: ../templates/lists/changePassword.php:643
 msgid "Aborted password change."
 msgstr "中断密码更改"
 
-#: ../lib/modules/sambaSamAccount.inc:543
+#: ../lib/modules/sambaSamAccount.inc:548
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr "阿布达比, 马斯凯特, 巴库"
 
@@ -202,7 +202,7 @@ msgstr "访问级别"
 msgid "Account"
 msgstr "帐号"
 
-#: ../templates/massBuildAccounts.php:175
+#: ../templates/massBuildAccounts.php:178
 #: ../lib/modules/zarafaDynamicGroup.inc:171
 #: ../lib/modules/zarafaDynamicGroup.inc:173
 #: ../lib/modules/zarafaDynamicGroup.inc:175
@@ -222,14 +222,18 @@ msgstr "帐号"
 #: ../lib/modules/asteriskAccount.inc:639
 #: ../lib/modules/account.inc:118
 #: ../lib/modules/ieee802device.inc:89
+#: ../lib/modules/puppetClient.inc:178
+#: ../lib/modules/puppetClient.inc:180
+#: ../lib/modules/puppetClient.inc:182
+#: ../lib/modules/puppetClient.inc:183
 #: ../lib/modules/zarafaContact.inc:158
 #: ../lib/modules/zarafaContact.inc:160
 #: ../lib/modules/zarafaContact.inc:161
 #: ../lib/modules/zarafaContact.inc:162
 #: ../lib/modules/zarafaContact.inc:163
-#: ../lib/modules/posixGroup.inc:492
-#: ../lib/modules/posixGroup.inc:496
-#: ../lib/modules/posixGroup.inc:497
+#: ../lib/modules/posixGroup.inc:503
+#: ../lib/modules/posixGroup.inc:507
+#: ../lib/modules/posixGroup.inc:508
 #: ../lib/modules/zarafaGroup.inc:188
 #: ../lib/modules/zarafaGroup.inc:190
 #: ../lib/modules/zarafaGroup.inc:191
@@ -238,85 +242,82 @@ msgstr "帐号"
 #: ../lib/modules/zarafaGroup.inc:195
 #: ../lib/modules/device.inc:127
 #: ../lib/modules/device.inc:128
-#: ../lib/modules/dhcp_settings.inc:286
-#: ../lib/modules/dhcp_settings.inc:288
-#: ../lib/modules/dhcp_settings.inc:290
-#: ../lib/modules/dhcp_settings.inc:292
-#: ../lib/modules/dhcp_settings.inc:294
+#: ../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:305
-#: ../lib/modules/eduPerson.inc:216
-#: ../lib/modules/eduPerson.inc:218
-#: ../lib/modules/eduPerson.inc:220
-#: ../lib/modules/eduPerson.inc:222
+#: ../lib/modules/dhcp_settings.inc:306
+#: ../lib/modules/dhcp_settings.inc:311
+#: ../lib/modules/dhcp_settings.inc:312
+#: ../lib/modules/eduPerson.inc:217
+#: ../lib/modules/eduPerson.inc:219
+#: ../lib/modules/eduPerson.inc:221
 #: ../lib/modules/eduPerson.inc:223
 #: ../lib/modules/eduPerson.inc:224
 #: ../lib/modules/eduPerson.inc:225
-#: ../lib/modules/quota.inc:51
-#: ../lib/modules/quota.inc:53
-#: ../lib/modules/quota.inc:55
-#: ../lib/modules/quota.inc:57
-#: ../lib/modules/quota.inc:59
-#: ../lib/modules/quota.inc:61
+#: ../lib/modules/eduPerson.inc:226
+#: ../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:145
 #: ../lib/modules/zarafaAddressList.inc:146
 #: ../lib/modules/zarafaAddressList.inc:147
-#: ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:91
-#: ../lib/modules/sambaSamAccount.inc:94
-#: ../lib/modules/sambaSamAccount.inc:96
+#: ../lib/modules/sambaSamAccount.inc:89
+#: ../lib/modules/sambaSamAccount.inc:92
+#: ../lib/modules/sambaSamAccount.inc:95
 #: ../lib/modules/sambaSamAccount.inc:97
-#: ../lib/modules/sambaSamAccount.inc:98
-#: ../lib/modules/sambaSamAccount.inc:99
 #: ../lib/modules/sambaSamAccount.inc:100
+#: ../lib/modules/sambaSamAccount.inc:101
 #: ../lib/modules/sambaSamAccount.inc:102
 #: ../lib/modules/sambaSamAccount.inc:103
-#: ../lib/modules/sambaSamAccount.inc:104
 #: ../lib/modules/sambaSamAccount.inc:105
 #: ../lib/modules/sambaSamAccount.inc:106
 #: ../lib/modules/sambaSamAccount.inc:107
 #: ../lib/modules/sambaSamAccount.inc:108
+#: ../lib/modules/sambaSamAccount.inc:109
 #: ../lib/modules/sambaSamAccount.inc:110
 #: ../lib/modules/sambaSamAccount.inc:111
-#: ../lib/modules/posixAccount.inc:76
-#: ../lib/modules/posixAccount.inc:81
-#: ../lib/modules/posixAccount.inc:85
-#: ../lib/modules/posixAccount.inc:93
-#: ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/sambaSamAccount.inc:113
+#: ../lib/modules/sambaSamAccount.inc:114
+#: ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixAccount.inc:91
 #: ../lib/modules/posixAccount.inc:95
-#: ../lib/modules/posixAccount.inc:96
-#: ../lib/modules/posixAccount.inc:97
-#: ../lib/modules/posixAccount.inc:98
-#: ../lib/modules/posixAccount.inc:100
-#: ../lib/modules/posixAccount.inc:101
-#: ../lib/modules/posixAccount.inc:102
+#: ../lib/modules/posixAccount.inc:103
 #: ../lib/modules/posixAccount.inc:104
-#: ../lib/modules/zarafaUser.inc:410
+#: ../lib/modules/posixAccount.inc:105
+#: ../lib/modules/posixAccount.inc:106
+#: ../lib/modules/posixAccount.inc:107
+#: ../lib/modules/posixAccount.inc:108
+#: ../lib/modules/posixAccount.inc:110
+#: ../lib/modules/posixAccount.inc:111
+#: ../lib/modules/posixAccount.inc:112
+#: ../lib/modules/posixAccount.inc:114
 #: ../lib/modules/zarafaUser.inc:412
 #: ../lib/modules/zarafaUser.inc:414
-#: ../lib/modules/zarafaUser.inc:415
+#: ../lib/modules/zarafaUser.inc:416
 #: ../lib/modules/zarafaUser.inc:417
 #: ../lib/modules/zarafaUser.inc:419
 #: ../lib/modules/zarafaUser.inc:421
-#: ../lib/modules/zarafaUser.inc:422
 #: ../lib/modules/zarafaUser.inc:423
 #: ../lib/modules/zarafaUser.inc:424
 #: ../lib/modules/zarafaUser.inc:425
 #: ../lib/modules/zarafaUser.inc:426
 #: ../lib/modules/zarafaUser.inc:427
 #: ../lib/modules/zarafaUser.inc:428
+#: ../lib/modules/zarafaUser.inc:429
+#: ../lib/modules/zarafaUser.inc:430
 #: ../lib/modules/ppolicyUser.inc:86
-#: ../lib/modules/kolabUser.inc:230
-#: ../lib/modules/kolabUser.inc:232
-#: ../lib/modules/kolabUser.inc:234
-#: ../lib/modules/kolabUser.inc:236
-#: ../lib/modules/kolabUser.inc:238
-#: ../lib/modules/kolabUser.inc:240
-#: ../lib/modules/kolabUser.inc:242
+#: ../lib/modules/kolabUser.inc:179
+#: ../lib/modules/kolabUser.inc:181
+#: ../lib/modules/kolabUser.inc:183
+#: ../lib/modules/kolabUser.inc:185
 #: ../lib/modules/ddns.inc:158
 #: ../lib/modules/nisObject.inc:117
 #: ../lib/modules/sambaGroupMapping.inc:441
@@ -327,31 +328,31 @@ msgstr "帐号"
 #: ../lib/modules/shadowAccount.inc:64
 #: ../lib/modules/shadowAccount.inc:66
 #: ../lib/modules/shadowAccount.inc:67
-#: ../lib/modules/automount.inc:105
+#: ../lib/modules/automount.inc:108
 #: ../lib/modules/sambaDomain.inc:202
 #: ../lib/modules/sambaDomain.inc:204
 #: ../lib/modules/sambaDomain.inc:206
 #: ../lib/modules/sambaDomain.inc:208
 #: ../lib/modules/sambaDomain.inc:210
 #: ../lib/modules/sambaDomain.inc:212
-#: ../lib/modules/inetOrgPerson.inc:49
-#: ../lib/modules/inetOrgPerson.inc:51
-#: ../lib/modules/inetOrgPerson.inc:53
-#: ../lib/modules/inetOrgPerson.inc:55
-#: ../lib/modules/inetOrgPerson.inc:57
-#: ../lib/modules/inetOrgPerson.inc:59
-#: ../lib/modules/inetOrgPerson.inc:61
-#: ../lib/modules/inetOrgPerson.inc:63
-#: ../lib/modules/inetOrgPerson.inc:65
-#: ../lib/modules/inetOrgPerson.inc:67
-#: ../lib/modules/inetOrgPerson.inc:69
-#: ../lib/modules/inetOrgPerson.inc:71
-#: ../lib/modules/inetOrgPerson.inc:73
-#: ../lib/modules/inetOrgPerson.inc:75
-#: ../lib/modules/inetOrgPerson.inc:77
+#: ../lib/modules/inetOrgPerson.inc:50
+#: ../lib/modules/inetOrgPerson.inc:52
+#: ../lib/modules/inetOrgPerson.inc:54
+#: ../lib/modules/inetOrgPerson.inc:56
+#: ../lib/modules/inetOrgPerson.inc:58
+#: ../lib/modules/inetOrgPerson.inc:60
+#: ../lib/modules/inetOrgPerson.inc:62
+#: ../lib/modules/inetOrgPerson.inc:64
+#: ../lib/modules/inetOrgPerson.inc:66
+#: ../lib/modules/inetOrgPerson.inc:68
+#: ../lib/modules/inetOrgPerson.inc:70
+#: ../lib/modules/inetOrgPerson.inc:72
+#: ../lib/modules/inetOrgPerson.inc:74
+#: ../lib/modules/inetOrgPerson.inc:76
 #: ../lib/modules/inetOrgPerson.inc:78
 #: ../lib/modules/inetOrgPerson.inc:79
-#: ../lib/modules/inetOrgPerson.inc:82
+#: ../lib/modules/inetOrgPerson.inc:80
+#: ../lib/modules/inetOrgPerson.inc:83
 #: ../lib/modules/systemQuotas.inc:91
 #: ../lib/modules/systemQuotas.inc:93
 #: ../lib/modules/systemQuotas.inc:95
@@ -359,12 +360,12 @@ msgstr "帐号"
 #: ../lib/modules/systemQuotas.inc:99
 #: ../lib/modules/systemQuotas.inc:101
 #: ../lib/modules/systemQuotas.inc:103
-#: ../lib/modules/freeRadius.inc:242
-#: ../lib/modules/freeRadius.inc:244
-#: ../lib/modules/freeRadius.inc:246
-#: ../lib/modules/freeRadius.inc:248
-#: ../lib/modules/freeRadius.inc:250
-#: ../lib/modules/freeRadius.inc:252
+#: ../lib/modules/freeRadius.inc:243
+#: ../lib/modules/freeRadius.inc:245
+#: ../lib/modules/freeRadius.inc:247
+#: ../lib/modules/freeRadius.inc:249
+#: ../lib/modules/freeRadius.inc:251
+#: ../lib/modules/freeRadius.inc:253
 #: ../lib/modules/sudoRole.inc:224
 #: ../lib/modules/sudoRole.inc:226
 #: ../lib/modules/sudoRole.inc:228
@@ -382,7 +383,7 @@ msgstr "帐号"
 #: ../lib/modules/inetLocalMailRecipient.inc:126
 #: ../lib/modules/inetLocalMailRecipient.inc:128
 #: ../lib/modules/aliasEntry.inc:79
-#: ../lib/modules/authorizedServiceObject.inc:115
+#: ../lib/modules/authorizedServiceObject.inc:123
 #: ../lib/modules/heimdalKerberos.inc:238
 #: ../lib/modules/heimdalKerberos.inc:239
 #: ../lib/modules/heimdalKerberos.inc:240
@@ -403,12 +404,12 @@ msgstr "帐号 %s:"
 #: ../lib/modules/asteriskAccount.inc:373
 #: ../lib/modules/asteriskAccount.inc:671
 #: ../lib/modules/asteriskAccount.inc:1189
-#: ../lib/modules/asteriskExtension.inc:90
-#: ../lib/modules/asteriskExtension.inc:121
-#: ../lib/modules/asteriskExtension.inc:128
-#: ../lib/modules/asteriskExtension.inc:144
-#: ../lib/modules/asteriskExtension.inc:298
-#: ../lib/modules/asteriskExtension.inc:797
+#: ../lib/modules/asteriskExtension.inc:91
+#: ../lib/modules/asteriskExtension.inc:122
+#: ../lib/modules/asteriskExtension.inc:129
+#: ../lib/modules/asteriskExtension.inc:145
+#: ../lib/modules/asteriskExtension.inc:299
+#: ../lib/modules/asteriskExtension.inc:806
 #: ../lib/modules/asteriskVoicemail.inc:82
 #: ../lib/modules/asteriskVoicemail.inc:118
 #: ../lib/modules/asteriskVoicemail.inc:128
@@ -418,7 +419,7 @@ msgstr "帐号 %s:"
 msgid "Account context"
 msgstr "帐号语境"
 
-#: ../lib/modules/selfRegistration.inc:377
+#: ../lib/modules/selfRegistration.inc:387
 msgid "Account creation"
 msgstr "帐号建立"
 
@@ -426,11 +427,11 @@ msgstr "帐号建立"
 msgid "Account creation confirmation"
 msgstr "建立帐号确认"
 
-#: ../templates/masscreate.php:118
+#: ../templates/masscreate.php:123
 msgid "Account creation via file upload"
 msgstr "通过上传文件建立帐号"
 
-#: ../lib/modules/posixAccount.inc:391
+#: ../lib/modules/posixAccount.inc:409
 msgid "Account deactivated"
 msgstr "帐号已停用"
 
@@ -439,11 +440,11 @@ msgid "Account details"
 msgstr "帐号详细信息"
 
 #: ../lib/types/user.inc:104
-#: ../lib/modules/sambaSamAccount.inc:323
-#: ../lib/modules/sambaSamAccount.inc:438
-#: ../lib/modules/sambaSamAccount.inc:1136
-#: ../lib/modules/sambaSamAccount.inc:1383
-#: ../lib/modules/sambaSamAccount.inc:1523
+#: ../lib/modules/sambaSamAccount.inc:328
+#: ../lib/modules/sambaSamAccount.inc:443
+#: ../lib/modules/sambaSamAccount.inc:1141
+#: ../lib/modules/sambaSamAccount.inc:1388
+#: ../lib/modules/sambaSamAccount.inc:1528
 #: ../lib/modules/shadowAccount.inc:121
 #: ../lib/modules/shadowAccount.inc:184
 #: ../lib/modules/shadowAccount.inc:224
@@ -463,16 +464,16 @@ msgstr "帐号过期日期"
 msgid "Account inactive"
 msgstr "帐号停用(inactive)"
 
-#: ../lib/modules/sambaSamAccount.inc:263
-#: ../lib/modules/sambaSamAccount.inc:269
-#: ../lib/modules/sambaSamAccount.inc:430
-#: ../lib/modules/sambaSamAccount.inc:1104
-#: ../lib/modules/sambaSamAccount.inc:1519
+#: ../lib/modules/sambaSamAccount.inc:268
+#: ../lib/modules/sambaSamAccount.inc:274
+#: ../lib/modules/sambaSamAccount.inc:435
+#: ../lib/modules/sambaSamAccount.inc:1109
+#: ../lib/modules/sambaSamAccount.inc:1524
 msgid "Account is deactivated"
 msgstr "帐号已经停用"
 
-#: ../lib/modules/sambaSamAccount.inc:266
-#: ../lib/modules/sambaSamAccount.inc:1110
+#: ../lib/modules/sambaSamAccount.inc:271
+#: ../lib/modules/sambaSamAccount.inc:1115
 msgid "Account is locked"
 msgstr "帐号锁定"
 
@@ -481,12 +482,12 @@ msgid "Account name:"
 msgstr "帐号名"
 
 #: ../lib/types/user.inc:269
-#: ../lib/types/user.inc:646
-#: ../lib/types/user.inc:761
+#: ../lib/types/user.inc:657
+#: ../lib/types/user.inc:772
 msgid "Account status"
 msgstr "帐号状态"
 
-#: ../templates/masscreate.php:132
+#: ../templates/masscreate.php:137
 #: ../lib/modules/asteriskAccount.inc:110
 #: ../lib/modules/asteriskAccount.inc:318
 #: ../lib/modules/asteriskAccount.inc:331
@@ -511,14 +512,14 @@ msgstr "帐号类型和模块"
 msgid "Account types define which sorts of LDAP entries (e.g. users and groups) should be managed. The account modules define which properties (e.g. Unix and Samba) can be edited."
 msgstr "LDAP条目类型中的帐号类型定义必须是可管理的（比如user和group),帐号模块定义中的属性（例如 UNIX 和SAMBA）必须是可编辑的。"
 
-#: ../lib/modules.inc:1242
+#: ../lib/modules.inc:1248
 msgid "Account was created successfully."
 msgstr "新增帐号成功"
 
-#: ../templates/lists/changePassword.php:669
-#: ../templates/lists/changePassword.php:710
-#: ../templates/lists/changePassword.php:750
-#: ../lib/modules.inc:1245
+#: ../templates/lists/changePassword.php:675
+#: ../templates/lists/changePassword.php:716
+#: ../templates/lists/changePassword.php:756
+#: ../lib/modules.inc:1251
 msgid "Account was modified successfully."
 msgstr "帐号修改成功"
 
@@ -532,31 +533,31 @@ msgid "Activate DynDNS"
 msgstr "活动的动态DNS"
 
 #: ../templates/config/confmain.php:231
-#: ../templates/selfService/adminMain.php:377
+#: ../templates/selfService/adminMain.php:391
 msgid "Activate TLS"
 msgstr "激活TLS"
 
-#: ../lib/modules/sambaSamAccount.inc:330
+#: ../lib/modules/sambaSamAccount.inc:335
 msgid "Activate this checkbox to allow this user to use the terminal service."
 msgstr "激活这个选项允许用户使用终端服务。"
 
-#: ../lib/modules/sambaSamAccount.inc:351
+#: ../lib/modules/sambaSamAccount.inc:356
 msgid "Activate this checkbox to connect drives from the client machine."
 msgstr "激活这个选项将从客户机上连接驱动器。"
 
-#: ../lib/modules/sambaSamAccount.inc:354
+#: ../lib/modules/sambaSamAccount.inc:359
 msgid "Activate this checkbox to connect printers from the client machine."
 msgstr "激活这个选项将从客户机上连接打印机。"
 
-#: ../lib/modules/sambaSamAccount.inc:339
+#: ../lib/modules/sambaSamAccount.inc:344
 msgid "Activate this checkbox to inherit the initial program and working directory from the client machine."
 msgstr "激活这个选项将从客户机上继承初始化程序和工作目录。"
 
-#: ../lib/modules/sambaSamAccount.inc:357
+#: ../lib/modules/sambaSamAccount.inc:362
 msgid "Activate this checkbox to set the client's printer as default printer."
 msgstr "激活这个选项将会设置客户打印机为缺省打印机。"
 
-#: ../lib/modules/posixAccount.inc:363
+#: ../lib/modules/posixAccount.inc:377
 msgid "Activating this checkbox will remove the user's home directory."
 msgstr "激活这个选项将会删除用户的主目录."
 
@@ -583,7 +584,7 @@ msgstr "激活这个选项将会删除用户的主目录."
 #: ../lib/modules/zarafaUser.inc:69
 #: ../lib/modules/zarafaUser.inc:180
 #: ../lib/modules/zarafaUser.inc:274
-#: ../lib/modules/zarafaUser.inc:595
+#: ../lib/modules/zarafaUser.inc:597
 msgid "Active"
 msgstr "激活"
 
@@ -591,16 +592,16 @@ msgstr "激活"
 msgid "Active account types"
 msgstr "激活帐号类型"
 
-#: ../templates/serverInfo.php:305
-#: ../templates/serverInfo.php:382
+#: ../templates/serverInfo.php:307
+#: ../templates/serverInfo.php:384
 #: ../templates/config/profmanage.php:239
 #: ../templates/config/confmodules.php:286
 #: ../templates/config/conftypes.php:214
 #: ../templates/selfService/profManage.php:210
-#: ../templates/pdfedit/pdfpage.php:543
-#: ../templates/pdfedit/pdfpage.php:553
-#: ../templates/pdfedit/pdfpage.php:563
-#: ../templates/pdfedit/pdfpage.php:577
+#: ../templates/pdfedit/pdfpage.php:545
+#: ../templates/pdfedit/pdfpage.php:555
+#: ../templates/pdfedit/pdfpage.php:565
+#: ../templates/pdfedit/pdfpage.php:579
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1206
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1210
 #: ../templates/3rdParty/pla/htdocs/add_attr_form.php:78
@@ -608,20 +609,20 @@ msgstr "激活帐号类型"
 #: ../lib/modules/zarafaContact.inc:358
 #: ../lib/modules/zarafaGroup.inc:414
 #: ../lib/modules/device.inc:250
-#: ../lib/modules/zarafaUser.inc:875
-#: ../lib/modules/zarafaUser.inc:1530
-#: ../lib/modules/zarafaUser.inc:1558
-#: ../lib/modules/kolabUser.inc:876
-#: ../lib/modules/kolabUser.inc:910
-#: ../lib/modules/nisnetgroup.inc:272
-#: ../lib/modules/inetOrgPerson.inc:1882
+#: ../lib/modules/zarafaUser.inc:877
+#: ../lib/modules/zarafaUser.inc:1536
+#: ../lib/modules/zarafaUser.inc:1568
+#: ../lib/modules/kolabUser.inc:716
+#: ../lib/modules/kolabUser.inc:764
+#: ../lib/modules/nisnetgroup.inc:275
+#: ../lib/modules/inetOrgPerson.inc:1886
 #: ../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:293
+#: ../lib/modules/customFields.inc:302
 #: ../lib/modules/groupOfNames.inc:272
 #: ../lib/modules/groupOfNames.inc:384
 msgid "Add"
@@ -635,15 +636,15 @@ msgstr "增加 Asterisk 帐号"
 msgid "Add Asterisk voicemail extension"
 msgstr "增加Asterisk语音邮件扩展"
 
-#: ../lib/modules/authorizedServiceObject.inc:181
+#: ../lib/modules/authorizedServiceObject.inc:195
 msgid "Add Authorized Service extension"
 msgstr "增加授权服务扩展"
 
-#: ../lib/modules/eduPerson.inc:398
+#: ../lib/modules/eduPerson.inc:399
 msgid "Add EDU person extension"
 msgstr "增加EDU用户扩展"
 
-#: ../lib/modules/freeRadius.inc:344
+#: ../lib/modules/freeRadius.inc:345
 msgid "Add FreeRadius extension"
 msgstr "增加FreeRadius扩展"
 
@@ -655,11 +656,15 @@ msgstr "增加IP地址扩展"
 msgid "Add Kerberos extension"
 msgstr "增加 Kerberos 扩展"
 
-#: ../lib/modules/kolabUser.inc:398
+#: ../lib/modules/kolabUser.inc:319
 msgid "Add Kolab extension"
 msgstr "增加 Kolab 扩展"
 
-#: ../lib/modules/sambaSamAccount.inc:1247
+#: ../lib/modules/puppetClient.inc:217
+msgid "Add Puppet extension"
+msgstr "增加 Puppet 扩展"
+
+#: ../lib/modules/sambaSamAccount.inc:1252
 #: ../lib/modules/sambaGroupMapping.inc:293
 msgid "Add Samba 3 extension"
 msgstr "增加 Samba 3 扩展"
@@ -677,7 +682,7 @@ msgstr "增加Zarafa联系人扩展"
 #: ../lib/modules/zarafaUser.inc:152
 #: ../lib/modules/zarafaUser.inc:153
 #: ../lib/modules/zarafaUser.inc:198
-#: ../lib/modules/zarafaUser.inc:439
+#: ../lib/modules/zarafaUser.inc:441
 #: ../lib/modules/zarafaServer.inc:214
 msgid "Add Zarafa extension"
 msgstr "增加Zarafa扩展"
@@ -695,18 +700,18 @@ msgstr "增加所有"
 msgid "Add an additional value to attribute"
 msgstr "给属性新增一个值."
 
-#: ../lib/modules/asteriskExtension.inc:342
+#: ../lib/modules/asteriskExtension.inc:343
 msgid "Add another rule"
 msgstr "增加另外一个规则"
 
-#: ../lib/modules/inetOrgPerson.inc:1917
+#: ../lib/modules/inetOrgPerson.inc:1921
 msgid "Add entries"
 msgstr "增加条目"
 
 #: ../lib/modules/zarafaContact.inc:397
 #: ../lib/modules/zarafaGroup.inc:453
 #: ../lib/modules/device.inc:293
-#: ../lib/modules/zarafaUser.inc:914
+#: ../lib/modules/zarafaUser.inc:916
 #: ../lib/modules/groupOfNames.inc:315
 #: ../lib/modules/groupOfNames.inc:427
 msgid "Add entries of this type:"
@@ -720,12 +725,12 @@ msgstr "为DNS增加一个固定的IP地址"
 msgid "Add host extension"
 msgstr "增加 host 扩展"
 
-#: ../templates/selfService/adminMain.php:483
+#: ../templates/selfService/adminMain.php:510
 #: ../help/help.inc:190
 msgid "Add input field"
 msgstr "增加输入栏目"
 
-#: ../lib/modules/customFields.inc:1240
+#: ../lib/modules/customFields.inc:1297
 msgid "Add more mapping fields"
 msgstr "增加更多的映射域"
 
@@ -751,11 +756,11 @@ msgstr "给对象新增属性"
 msgid "Add new binary attribute"
 msgstr "新增binary属性."
 
-#: ../lib/modules/customFields.inc:252
+#: ../lib/modules/customFields.inc:261
 msgid "Add new field"
 msgstr "增加新域"
 
-#: ../templates/selfService/adminMain.php:475
+#: ../templates/selfService/adminMain.php:502
 #: ../help/help.inc:188
 msgid "Add new group"
 msgstr "新增组"
@@ -773,14 +778,14 @@ msgstr "增加新的对象类到<b>%s</b>"
 msgid "Add object class and attributes"
 msgstr "增加对象类和属性"
 
-#: ../lib/modules/passwordSelfReset.inc:245
+#: ../lib/modules/passwordSelfReset.inc:246
 msgid "Add password self reset extension"
 msgstr "增加密码自助复位扩展"
 
-#: ../lib/modules/inetOrgPerson.inc:709
-#: ../lib/modules/inetOrgPerson.inc:1804
-#: ../lib/modules/inetOrgPerson.inc:1841
-#: ../lib/modules/inetOrgPerson.inc:2682
+#: ../lib/modules/inetOrgPerson.inc:713
+#: ../lib/modules/inetOrgPerson.inc:1808
+#: ../lib/modules/inetOrgPerson.inc:1845
+#: ../lib/modules/inetOrgPerson.inc:2765
 msgid "Add photo"
 msgstr "新增照片"
 
@@ -808,7 +813,7 @@ msgstr "添加中"
 msgid "Adding the range failed because errors occured."
 msgstr "因为发生了错误致使增加范围失败"
 
-#: ../templates/selfService/adminMain.php:424
+#: ../templates/selfService/adminMain.php:438
 #: ../help/help.inc:194
 msgid "Additional CSS links"
 msgstr "附加的CSS连接"
@@ -820,21 +825,21 @@ msgstr "附加的CSS连接"
 msgid "Additional email addresses for this entry."
 msgstr "本条目的附加邮件地址"
 
-#: ../lib/modules/posixAccount.inc:223
-#: ../lib/modules/posixAccount.inc:318
-#: ../lib/modules/posixAccount.inc:354
-#: ../lib/modules/posixAccount.inc:399
-#: ../lib/modules/posixAccount.inc:1136
-#: ../lib/modules/posixAccount.inc:1393
-#: ../lib/modules/posixAccount.inc:1495
+#: ../lib/modules/posixAccount.inc:237
+#: ../lib/modules/posixAccount.inc:332
+#: ../lib/modules/posixAccount.inc:368
+#: ../lib/modules/posixAccount.inc:417
+#: ../lib/modules/posixAccount.inc:1156
+#: ../lib/modules/posixAccount.inc:1413
+#: ../lib/modules/posixAccount.inc:1515
 msgid "Additional groups"
 msgstr "附加组"
 
-#: ../templates/massDoUpload.php:129
+#: ../templates/massDoUpload.php:132
 msgid "Additional tasks for module:"
 msgstr "模块的附加任务："
 
-#: ../lib/modules/inetOrgPerson.inc:1290
+#: ../lib/modules/inetOrgPerson.inc:1294
 msgid "Address"
 msgstr "地址"
 
@@ -843,7 +848,7 @@ msgstr "地址"
 msgid "Address list count: %s"
 msgstr "地址列表总计:%s"
 
-#: ../lib/modules/imapAccess.inc:70
+#: ../lib/modules/imapAccess.inc:71
 msgid "Address of IMAP server (e.g. mail.example.org)."
 msgstr "IMAP服务器地址（比如:mail.example.org)"
 
@@ -862,46 +867,46 @@ msgstr "为新IP范围增加输入域"
 #: ../lib/modules/zarafaUser.inc:93
 #: ../lib/modules/zarafaUser.inc:301
 #: ../lib/modules/zarafaUser.inc:359
-#: ../lib/modules/zarafaUser.inc:604
-#: ../lib/modules/zarafaUser.inc:1318
+#: ../lib/modules/zarafaUser.inc:606
+#: ../lib/modules/zarafaUser.inc:1320
 msgid "Admin"
 msgstr "管理"
 
 #: ../lib/modules/selfRegistration.inc:53
 #: ../lib/modules/selfRegistration.inc:100
-#: ../lib/modules/passwordSelfReset.inc:85
-#: ../lib/modules/passwordSelfReset.inc:173
+#: ../lib/modules/passwordSelfReset.inc:86
+#: ../lib/modules/passwordSelfReset.inc:174
 msgid "Admin DN"
 msgstr "管理DN"
 
 #: ../lib/modules/selfRegistration.inc:58
 #: ../lib/modules/selfRegistration.inc:104
-#: ../lib/modules/passwordSelfReset.inc:89
-#: ../lib/modules/passwordSelfReset.inc:177
+#: ../lib/modules/passwordSelfReset.inc:90
+#: ../lib/modules/passwordSelfReset.inc:178
 msgid "Admin password"
 msgstr "管理密码"
 
-#: ../lib/modules/inetOrgPerson.inc:363
-#: ../lib/modules/inetOrgPerson.inc:467
+#: ../lib/modules/inetOrgPerson.inc:367
+#: ../lib/modules/inetOrgPerson.inc:471
 msgid "Administration"
 msgstr "管理者"
 
-#: ../lib/modules/posixGroup.inc:389
-#: ../lib/modules/nisnetgroup.inc:112
+#: ../lib/modules/posixGroup.inc:392
+#: ../lib/modules/nisnetgroup.inc:115
 #: ../lib/modules/groupOfNames.inc:101
 msgid "Administrators group"
 msgstr "管理员组"
 
-#: ../lib/modules/eduPerson.inc:92
-#: ../lib/modules/eduPerson.inc:96
-#: ../lib/modules/eduPerson.inc:160
-#: ../lib/modules/eduPerson.inc:198
-#: ../lib/modules/eduPerson.inc:287
-#: ../lib/modules/eduPerson.inc:677
+#: ../lib/modules/eduPerson.inc:93
+#: ../lib/modules/eduPerson.inc:97
+#: ../lib/modules/eduPerson.inc:161
+#: ../lib/modules/eduPerson.inc:199
+#: ../lib/modules/eduPerson.inc:288
+#: ../lib/modules/eduPerson.inc:678
 msgid "Affiliations"
 msgstr "联系"
 
-#: ../lib/modules/sambaSamAccount.inc:530
+#: ../lib/modules/sambaSamAccount.inc:535
 msgid "Alaska"
 msgstr "阿拉斯加"
 
@@ -950,7 +955,7 @@ msgstr "别名"
 msgid "Aliased entry"
 msgstr "已有别名条目"
 
-#: ../templates/schema/schema.php:224
+#: ../templates/schema/schema.php:226
 #: ../lib/types/alias.inc:53
 msgid "Aliases"
 msgstr "别名"
@@ -960,7 +965,7 @@ msgstr "别名"
 msgid "All accounts (%s)"
 msgstr "所有帐号 %s:"
 
-#: ../templates/selfService/selfServiceMain.php:310
+#: ../templates/selfService/selfServiceMain.php:314
 #: ../templates/initsuff.php:157
 msgid "All changes were successful."
 msgstr "修改成功."
@@ -978,25 +983,29 @@ msgid "Allow machine password changes"
 msgstr "允许改变主机密码"
 
 #: ../lib/modules/customFields.inc:116
-#: ../lib/modules/customFields.inc:1370
+#: ../lib/modules/customFields.inc:1430
 msgid "Allow multiple values"
 msgstr "允许多值"
 
 #: ../lib/types/ppolicyType.inc:90
-#: ../lib/modules/ppolicy.inc:124
-#: ../lib/modules/ppolicy.inc:147
-#: ../lib/modules/ppolicy.inc:286
-#: ../lib/modules/ppolicy.inc:497
+#: ../lib/modules/ppolicy.inc:125
+#: ../lib/modules/ppolicy.inc:148
+#: ../lib/modules/ppolicy.inc:287
+#: ../lib/modules/ppolicy.inc:498
 msgid "Allow password change"
 msgstr "允许改变密码"
 
-#: ../lib/modules/sambaSamAccount.inc:211
-#: ../lib/modules/sambaSamAccount.inc:329
-#: ../lib/modules/sambaSamAccount.inc:1429
-#: ../lib/modules/sambaSamAccount.inc:1715
+#: ../lib/modules/sambaSamAccount.inc:215
+#: ../lib/modules/sambaSamAccount.inc:334
+#: ../lib/modules/sambaSamAccount.inc:1434
+#: ../lib/modules/sambaSamAccount.inc:1720
 msgid "Allow terminal server login"
 msgstr "允许终端服务登录"
 
+#: ../templates/selfService/adminMain.php:482
+msgid "Allow user input for this field."
+msgstr "允许用户在此域输入。"
+
 #: ../lib/modules/asteriskAccount.inc:194
 #: ../lib/modules/asteriskAccount.inc:287
 #: ../lib/modules/asteriskAccount.inc:351
@@ -1012,8 +1021,8 @@ msgstr "允许的编码"
 msgid "Allowed hosts"
 msgstr "允许的主机"
 
-#: ../lib/modules/sambaSamAccount.inc:1273
-#: ../lib/modules/sambaSamAccount.inc:1274
+#: ../lib/modules/sambaSamAccount.inc:1278
+#: ../lib/modules/sambaSamAccount.inc:1279
 msgid "Allowed workstations"
 msgstr "允许的工作站"
 
@@ -1021,7 +1030,7 @@ msgstr "允许的工作站"
 msgid "Allows to select multiple values from the list."
 msgstr "这个列表允许多选."
 
-#: ../lib/modules/sambaSamAccount.inc:545
+#: ../lib/modules/sambaSamAccount.inc:550
 msgid "Almaty, Dhaka, Colombo"
 msgstr "阿尔迈迪，达卡，科伦坡"
 
@@ -1042,34 +1051,35 @@ msgstr "下面高亮的属性(%s)已经被修改."
 msgid "An sudo role with this name already exists. Please choose another name."
 msgstr "这个名字的duso角色已经存在,请选择另外一个名字."
 
-#: ../lib/modules/passwordSelfReset.inc:69
-#: ../lib/modules/passwordSelfReset.inc:144
-#: ../lib/modules/passwordSelfReset.inc:152
-#: ../lib/modules/passwordSelfReset.inc:223
-#: ../lib/modules/passwordSelfReset.inc:265
-#: ../lib/modules/passwordSelfReset.inc:372
-#: ../lib/modules/passwordSelfReset.inc:516
-#: ../lib/modules/passwordSelfReset.inc:793
+#: ../lib/modules/passwordSelfReset.inc:70
+#: ../lib/modules/passwordSelfReset.inc:145
+#: ../lib/modules/passwordSelfReset.inc:153
+#: ../lib/modules/passwordSelfReset.inc:224
+#: ../lib/modules/passwordSelfReset.inc:266
+#: ../lib/modules/passwordSelfReset.inc:373
+#: ../lib/modules/passwordSelfReset.inc:519
+#: ../lib/modules/passwordSelfReset.inc:797
 msgid "Answer"
 msgstr "回答"
 
-#: ../lib/modules/kolabUser.inc:334
-#: ../lib/modules/kolabUser.inc:795
-#: ../lib/modules/kolabUser.inc:897
+#: ../lib/modules/kolabUser.inc:255
+#: ../lib/modules/kolabUser.inc:638
+#: ../lib/modules/kolabUser.inc:739
+#: ../lib/modules/kolabUser.inc:742
 msgid "Anyone"
 msgstr "任何人"
 
-#: ../lib/modules/asteriskExtension.inc:102
-#: ../lib/modules/asteriskExtension.inc:157
-#: ../lib/modules/asteriskExtension.inc:358
-#: ../lib/modules/asteriskExtension.inc:813
+#: ../lib/modules/asteriskExtension.inc:103
+#: ../lib/modules/asteriskExtension.inc:158
+#: ../lib/modules/asteriskExtension.inc:359
+#: ../lib/modules/asteriskExtension.inc:822
 msgid "Application"
 msgstr "应用"
 
-#: ../lib/modules/asteriskExtension.inc:86
-#: ../lib/modules/asteriskExtension.inc:164
-#: ../lib/modules/asteriskExtension.inc:366
-#: ../lib/modules/asteriskExtension.inc:814
+#: ../lib/modules/asteriskExtension.inc:87
+#: ../lib/modules/asteriskExtension.inc:165
+#: ../lib/modules/asteriskExtension.inc:367
+#: ../lib/modules/asteriskExtension.inc:823
 msgid "Application data"
 msgstr "应用数据"
 
@@ -1078,14 +1088,14 @@ msgstr "应用数据"
 #: ../lib/modules/zarafaUser.inc:188
 #: ../lib/modules/zarafaUser.inc:334
 #: ../lib/modules/zarafaUser.inc:398
-#: ../lib/modules/zarafaUser.inc:555
-#: ../lib/modules/zarafaUser.inc:958
-#: ../lib/modules/zarafaUser.inc:1366
-#: ../lib/modules/zarafaUser.inc:1391
+#: ../lib/modules/zarafaUser.inc:557
+#: ../lib/modules/zarafaUser.inc:960
+#: ../lib/modules/zarafaUser.inc:1368
+#: ../lib/modules/zarafaUser.inc:1393
 msgid "Archive servers"
 msgstr "归档服务器"
 
-#: ../lib/modules/zarafaUser.inc:553
+#: ../lib/modules/zarafaUser.inc:555
 msgid "Archiving"
 msgstr "正在归档中"
 
@@ -1098,7 +1108,7 @@ msgstr "确认永久删除这个对象?"
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "确认永久删除这个对象?"
 
-#: ../lib/modules/imapAccess.inc:114
+#: ../lib/modules/imapAccess.inc:115
 msgid "Ask"
 msgstr "问"
 
@@ -1110,7 +1120,7 @@ msgstr "Asterisk"
 msgid "Asterisk AMA (Automated Message Accounting) flags."
 msgstr "Asterisk AMA(自动消息账号)标志"
 
-#: ../lib/modules/asteriskExtension.inc:71
+#: ../lib/modules/asteriskExtension.inc:72
 msgid "Asterisk extension"
 msgstr "Asterisk 扩展"
 
@@ -1136,7 +1146,7 @@ msgstr "Asterisk语音邮件"
 msgid "Asterisk voicemail context."
 msgstr "Asterisk语音邮件的语境."
 
-#: ../lib/modules/sambaSamAccount.inc:535
+#: ../lib/modules/sambaSamAccount.inc:540
 msgid "Atlantic time (Canada), Caracas"
 msgstr "大西洋时间(加拿大),卡拉卡斯"
 
@@ -1159,8 +1169,8 @@ msgid "Attribute doesn't exist"
 msgstr "属性不存在"
 
 #: ../lib/modules/customFields.inc:68
-#: ../lib/modules/customFields.inc:278
-#: ../lib/modules/customFields.inc:614
+#: ../lib/modules/customFields.inc:287
+#: ../lib/modules/customFields.inc:677
 msgid "Attribute name"
 msgstr "属性名"
 
@@ -1172,8 +1182,8 @@ msgstr "属性不可用"
 msgid "Attribute not valid"
 msgstr "属性不合法"
 
-#: ../templates/schema/schema.php:67
-#: ../templates/schema/schema.php:68
+#: ../templates/schema/schema.php:69
+#: ../templates/schema/schema.php:70
 msgid "Attribute types"
 msgstr "属性类型"
 
@@ -1182,7 +1192,7 @@ msgstr "属性类型"
 msgid "Attributes"
 msgstr "属性"
 
-#: ../lib/modules/sambaSamAccount.inc:551
+#: ../lib/modules/sambaSamAccount.inc:556
 msgid "Auckland, Fiji, Kamchatka"
 msgstr "奥克兰,斐济,堪察加"
 
@@ -1197,58 +1207,64 @@ msgstr "边界代理的认证用户"
 #: ../lib/modules/authorizedServiceObject.inc:64
 #: ../lib/modules/authorizedServiceObject.inc:74
 #: ../lib/modules/authorizedServiceObject.inc:78
-#: ../lib/modules/authorizedServiceObject.inc:90
-#: ../lib/modules/authorizedServiceObject.inc:97
-#: ../lib/modules/authorizedServiceObject.inc:101
-#: ../lib/modules/authorizedServiceObject.inc:155
-#: ../lib/modules/authorizedServiceObject.inc:278
+#: ../lib/modules/authorizedServiceObject.inc:98
+#: ../lib/modules/authorizedServiceObject.inc:105
+#: ../lib/modules/authorizedServiceObject.inc:109
+#: ../lib/modules/authorizedServiceObject.inc:167
+#: ../lib/modules/authorizedServiceObject.inc:292
 msgid "Authorized Services"
 msgstr "授权的服务"
 
+#: ../lib/modules/authorizedServiceObject.inc:122
+msgid "Authorized services are invalid."
+msgstr "授权服务不合法"
+
 #: ../lib/modules/customScripts.inc:133
 msgid "Automatical scripts"
 msgstr "自动脚本"
 
+#: ../lib/modules/puppetClient.inc:101
+#: ../lib/modules/puppetClient.inc:153
 #: ../lib/modules/zarafaContact.inc:77
 #: ../lib/modules/zarafaContact.inc:560
-#: ../lib/modules/eduPerson.inc:129
-#: ../lib/modules/eduPerson.inc:134
-#: ../lib/modules/sambaSamAccount.inc:147
-#: ../lib/modules/sambaSamAccount.inc:377
+#: ../lib/modules/eduPerson.inc:130
+#: ../lib/modules/eduPerson.inc:135
+#: ../lib/modules/sambaSamAccount.inc:151
+#: ../lib/modules/sambaSamAccount.inc:382
 #: ../lib/modules/zarafaUser.inc:121
-#: ../lib/modules/zarafaUser.inc:1377
+#: ../lib/modules/zarafaUser.inc:1379
 #: ../lib/modules/shadowAccount.inc:99
 #: ../lib/modules/shadowAccount.inc:188
 #: ../lib/modules/authorizedServiceObject.inc:82
-#: ../lib/modules/authorizedServiceObject.inc:102
-#: ../lib/modules/passwordSelfReset.inc:128
+#: ../lib/modules/authorizedServiceObject.inc:110
+#: ../lib/modules/passwordSelfReset.inc:129
 #: ../lib/modules/hostObject.inc:76
 #: ../lib/modules/hostObject.inc:94
 msgid "Automatically add this extension"
 msgstr "自动增加这个扩展项"
 
-#: ../lib/types/automountType.inc:39
 #: ../lib/types/automountType.inc:48
+#: ../lib/types/automountType.inc:57
 msgid "Automount entries"
 msgstr "自动挂接条目"
 
-#: ../lib/types/automountType.inc:78
-#: ../lib/modules/automount.inc:40
-#: ../lib/modules/automount.inc:58
-#: ../lib/modules/automount.inc:78
-#: ../lib/modules/automount.inc:94
-#: ../lib/modules/automount.inc:104
-#: ../lib/modules/automount.inc:124
-#: ../lib/modules/automount.inc:191
+#: ../lib/types/automountType.inc:87
+#: ../lib/modules/automount.inc:43
+#: ../lib/modules/automount.inc:61
+#: ../lib/modules/automount.inc:81
+#: ../lib/modules/automount.inc:97
+#: ../lib/modules/automount.inc:107
+#: ../lib/modules/automount.inc:127
+#: ../lib/modules/automount.inc:194
 msgid "Automount entry"
 msgstr "自动安装条目"
 
-#: ../lib/modules/automount.inc:104
-#: ../lib/modules/automount.inc:105
+#: ../lib/modules/automount.inc:107
+#: ../lib/modules/automount.inc:108
 msgid "Automount entry contains invalid characters. Only ASCII characters are allowed."
 msgstr "自动挂接条目包含非法字符,只能使用 ASCII 字符."
 
-#: ../lib/types/automountType.inc:186
+#: ../lib/types/automountType.inc:214
 #, php-format
 msgid "Automount entry count: %s"
 msgstr "自动安装条目总计:%s"
@@ -1263,10 +1279,10 @@ msgstr "有效的帐号类型"
 msgid "Available actions"
 msgstr "可选动作"
 
-#: ../lib/modules/posixAccount.inc:1231
-#: ../lib/modules/posixAccount.inc:1261
-#: ../lib/modules/nisnetgroup.inc:376
-#: ../lib/modules/groupOfNamesUser.inc:110
+#: ../lib/modules/posixAccount.inc:1251
+#: ../lib/modules/posixAccount.inc:1281
+#: ../lib/modules/nisnetgroup.inc:379
+#: ../lib/modules/groupOfNamesUser.inc:112
 msgid "Available groups"
 msgstr "可选组"
 
@@ -1278,37 +1294,37 @@ msgstr "可用的用户"
 msgid "Available modules"
 msgstr "可选模块"
 
-#: ../lib/modules/posixGroup.inc:253
-#: ../lib/modules/asteriskExtension.inc:448
+#: ../lib/modules/posixGroup.inc:255
+#: ../lib/modules/asteriskExtension.inc:456
 msgid "Available users"
 msgstr "可选用户"
 
-#: ../lib/modules/sambaSamAccount.inc:1276
+#: ../lib/modules/sambaSamAccount.inc:1281
 msgid "Available workstations"
 msgstr "可选工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:538
+#: ../lib/modules/sambaSamAccount.inc:543
 msgid "Azores, Cape Verde Islands"
 msgstr "亚速尔,维德角岛"
 
-#: ../lib/modules/dhcp_settings.inc:87
+#: ../lib/modules/dhcp_settings.inc:94
 msgid "B-Node (0x01)"
 msgstr "B-节点 (0x01)"
 
-#: ../templates/massBuildAccounts.php:251
+#: ../templates/massBuildAccounts.php:254
 #: ../lib/modules/zarafaContact.inc:404
-#: ../lib/modules/posixGroup.inc:277
+#: ../lib/modules/posixGroup.inc:279
 #: ../lib/modules/zarafaGroup.inc:460
 #: ../lib/modules/device.inc:300
-#: ../lib/modules/sambaSamAccount.inc:1293
-#: ../lib/modules/posixAccount.inc:1299
-#: ../lib/modules/posixAccount.inc:1372
-#: ../lib/modules/zarafaUser.inc:921
-#: ../lib/modules/zarafaUser.inc:970
-#: ../lib/modules/nisnetgroup.inc:390
-#: ../lib/modules/inetOrgPerson.inc:1842
-#: ../lib/modules/inetOrgPerson.inc:1918
-#: ../lib/modules/groupOfNamesUser.inc:146
+#: ../lib/modules/sambaSamAccount.inc:1298
+#: ../lib/modules/posixAccount.inc:1319
+#: ../lib/modules/posixAccount.inc:1392
+#: ../lib/modules/zarafaUser.inc:923
+#: ../lib/modules/zarafaUser.inc:972
+#: ../lib/modules/nisnetgroup.inc:393
+#: ../lib/modules/inetOrgPerson.inc:1846
+#: ../lib/modules/inetOrgPerson.inc:1922
+#: ../lib/modules/groupOfNamesUser.inc:148
 #: ../lib/modules/groupOfNames.inc:322
 #: ../lib/modules/groupOfNames.inc:434
 msgid "Back"
@@ -1322,7 +1338,7 @@ msgstr "返回到DHCP列表"
 msgid "Back to NIS object list"
 msgstr "返回到 NIS 对象列表"
 
-#: ../lib/baseType.inc:46
+#: ../lib/baseType.inc:48
 msgid "Back to account list"
 msgstr "返回到帐号列表"
 
@@ -1335,7 +1351,7 @@ msgstr "返回到地址列表"
 msgid "Back to alias list"
 msgstr "返回到别名列表"
 
-#: ../lib/types/automountType.inc:30
+#: ../lib/types/automountType.inc:35
 msgid "Back to automount list"
 msgstr "返回到自动挂接列表"
 
@@ -1393,7 +1409,7 @@ msgstr "返回到用户列表"
 msgid "Back up"
 msgstr "备份"
 
-#: ../templates/serverInfo.php:161
+#: ../templates/serverInfo.php:163
 msgid "Backends"
 msgstr "后端"
 
@@ -1401,11 +1417,11 @@ msgstr "后端"
 msgid "Backup script"
 msgstr "备份脚本"
 
-#: ../lib/modules/sambaSamAccount.inc:542
+#: ../lib/modules/sambaSamAccount.inc:547
 msgid "Baghdad, Riyadh, Moscow"
 msgstr "巴格达,利雅得,莫斯科"
 
-#: ../lib/modules/sambaSamAccount.inc:546
+#: ../lib/modules/sambaSamAccount.inc:551
 msgid "Bangkok, Hanoi, Jakarta"
 msgstr "曼谷,河内,安卡拉"
 
@@ -1444,11 +1460,11 @@ msgstr "基本DN"
 msgid "Base module"
 msgstr "基本模块"
 
-#: ../templates/pdfedit/pdfpage.php:434
+#: ../templates/pdfedit/pdfpage.php:436
 msgid "Beginning"
 msgstr "开始"
 
-#: ../lib/modules/sambaSamAccount.inc:547
+#: ../lib/modules/sambaSamAccount.inc:552
 msgid "Beijing, Perth, Singapore"
 msgstr "北京,佩斯,新加坡"
 
@@ -1457,8 +1473,8 @@ msgstr "北京,佩斯,新加坡"
 msgid "Binary value"
 msgstr "二进制值"
 
-#: ../templates/serverInfo.php:284
-#: ../templates/serverInfo.php:373
+#: ../templates/serverInfo.php:286
+#: ../templates/serverInfo.php:375
 msgid "Bind"
 msgstr "绑定"
 
@@ -1474,43 +1490,43 @@ msgstr "绑定用户"
 msgid "Bind user and password"
 msgstr "绑定用户名和密码"
 
-#: ../lib/modules/quota.inc:52
+#: ../lib/modules/quota.inc:53
 #: ../lib/modules/systemQuotas.inc:94
 msgid "Block hard quota"
 msgstr "块数硬性限额"
 
-#: ../lib/modules/quota.inc:52
 #: ../lib/modules/quota.inc:53
+#: ../lib/modules/quota.inc:54
 #: ../lib/modules/systemQuotas.inc:94
 #: ../lib/modules/systemQuotas.inc:95
 msgid "Block hard quota contains invalid characters. Only natural numbers are allowed."
 msgstr "块数硬性限额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:58
+#: ../lib/modules/quota.inc:59
 #: ../lib/modules/systemQuotas.inc:100
 msgid "Block quota"
 msgstr "块数限额"
 
-#: ../lib/modules/quota.inc:50
+#: ../lib/modules/quota.inc:51
 #: ../lib/modules/systemQuotas.inc:92
 msgid "Block soft quota"
 msgstr "块数软性限额"
 
-#: ../lib/modules/quota.inc:50
 #: ../lib/modules/quota.inc:51
+#: ../lib/modules/quota.inc:52
 #: ../lib/modules/systemQuotas.inc:92
 #: ../lib/modules/systemQuotas.inc:93
 msgid "Block soft quota contains invalid characters. Only natural numbers are allowed."
 msgstr "块数软性限额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:58
 #: ../lib/modules/quota.inc:59
+#: ../lib/modules/quota.inc:60
 #: ../lib/modules/systemQuotas.inc:100
 #: ../lib/modules/systemQuotas.inc:101
 msgid "Block soft quota must be smaller than block hard quota."
 msgstr "块数软性限额必须小于硬性限额."
 
-#: ../lib/modules/sambaSamAccount.inc:536
+#: ../lib/modules/sambaSamAccount.inc:541
 msgid "Brazil, Buenos Aires"
 msgstr "巴西,布宜诺斯艾利斯"
 
@@ -1530,19 +1546,19 @@ msgstr "块编辑以下DN"
 msgid "Bulk update the following DNs"
 msgstr "块更新以下DN"
 
-#: ../lib/modules/inetOrgPerson.inc:81
-#: ../lib/modules/inetOrgPerson.inc:127
-#: ../lib/modules/inetOrgPerson.inc:268
-#: ../lib/modules/inetOrgPerson.inc:361
-#: ../lib/modules/inetOrgPerson.inc:573
-#: ../lib/modules/inetOrgPerson.inc:725
-#: ../lib/modules/inetOrgPerson.inc:1703
-#: ../lib/modules/inetOrgPerson.inc:2079
-#: ../lib/modules/inetOrgPerson.inc:2660
+#: ../lib/modules/inetOrgPerson.inc:82
+#: ../lib/modules/inetOrgPerson.inc:128
+#: ../lib/modules/inetOrgPerson.inc:273
+#: ../lib/modules/inetOrgPerson.inc:365
+#: ../lib/modules/inetOrgPerson.inc:577
+#: ../lib/modules/inetOrgPerson.inc:729
+#: ../lib/modules/inetOrgPerson.inc:1707
+#: ../lib/modules/inetOrgPerson.inc:2083
+#: ../lib/modules/inetOrgPerson.inc:2741
 msgid "Business category"
 msgstr "商业种类"
 
-#: ../lib/modules/inetOrgPerson.inc:726
+#: ../lib/modules/inetOrgPerson.inc:730
 msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 msgstr "商业种类(比如:行政部门,IT服务部门,管理部门,...)"
 
@@ -1550,12 +1566,12 @@ msgstr "商业种类(比如:行政部门,IT服务部门,管理部门,...)"
 msgid "By default, LAM will show the executed command along with any output of it. If you want to hide the command and only show the output then activate this option."
 msgstr "缺省情况下,LAM显示运行命令及其输出.如果您想隐藏命令而仅显示输出,请激活这个选项."
 
-#: ../templates/serverInfo.php:251
-#: ../templates/serverInfo.php:257
+#: ../templates/serverInfo.php:253
+#: ../templates/serverInfo.php:259
 msgid "Bytes sent"
 msgstr "字节已发送"
 
-#: ../templates/masscreate.php:241
+#: ../templates/masscreate.php:246
 msgid "CSV file"
 msgstr "CSV 文件"
 
@@ -1580,17 +1596,17 @@ msgstr "呼叫组"
 msgid "Caller ID"
 msgstr "拨号 ID号"
 
-#: ../lib/modules/sambaSamAccount.inc:284
-#: ../lib/modules/sambaSamAccount.inc:287
-#: ../lib/modules/sambaSamAccount.inc:290
-#: ../lib/modules/sambaSamAccount.inc:296
-#: ../lib/modules/posixAccount.inc:400
+#: ../lib/modules/sambaSamAccount.inc:289
+#: ../lib/modules/sambaSamAccount.inc:292
+#: ../lib/modules/sambaSamAccount.inc:295
+#: ../lib/modules/sambaSamAccount.inc:301
+#: ../lib/modules/posixAccount.inc:418
 #: ../lib/modules/sambaGroupMapping.inc:369
 #: ../lib/modules/shadowAccount.inc:169
 #: ../lib/modules/shadowAccount.inc:173
 #: ../lib/modules/shadowAccount.inc:177
 #: ../lib/modules/shadowAccount.inc:181
-#: ../lib/modules/groupOfNamesUser.inc:52
+#: ../lib/modules/groupOfNamesUser.inc:54
 msgid "Can be left empty."
 msgstr "可以置空"
 
@@ -1607,7 +1623,7 @@ msgstr "可能呼叫转移"
 #: ../templates/lists/changePassword.php:328
 #: ../templates/lists/changePassword.php:362
 #: ../templates/lists/changePassword.php:388
-#: ../templates/ou_edit.php:119
+#: ../templates/ou_edit.php:121
 #: ../templates/config/profmanage.php:241
 #: ../templates/config/profmanage.php:253
 #: ../templates/config/profmanage.php:262
@@ -1621,42 +1637,42 @@ msgstr "可能呼叫转移"
 #: ../templates/selfService/profManage.php:212
 #: ../templates/selfService/profManage.php:228
 #: ../templates/selfService/profManage.php:241
-#: ../templates/selfService/adminMain.php:587
-#: ../templates/pdfedit/pdfpage.php:585
-#: ../templates/pdfedit/pdfmain.php:158
+#: ../templates/selfService/adminMain.php:615
+#: ../templates/pdfedit/pdfpage.php:587
+#: ../templates/pdfedit/pdfmain.php:160
 #: ../templates/delete.php:117
-#: ../templates/profedit/profilepage.php:230
-#: ../templates/profedit/profilemain.php:157
+#: ../templates/profedit/profilepage.php:236
+#: ../templates/profedit/profilemain.php:159
 #: ../templates/3rdParty/pla/htdocs/update_confirm.php:197
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:83
 #: ../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:189
-#: ../lib/types/automountType.inc:210
-#: ../lib/types/automountType.inc:245
+#: ../lib/types/automountType.inc:244
+#: ../lib/types/automountType.inc:279
 #: ../lib/types/user.inc:273
-#: ../lib/types/dhcp.inc:288
+#: ../lib/types/dhcp.inc:291
 #: ../lib/modules/zarafaContact.inc:359
 #: ../lib/modules/zarafaGroup.inc:415
 #: ../lib/modules/device.inc:251
-#: ../lib/modules/sambaSamAccount.inc:1368
-#: ../lib/modules/sambaSamAccount.inc:1411
-#: ../lib/modules/sambaSamAccount.inc:1497
-#: ../lib/modules/zarafaUser.inc:876
-#: ../lib/modules/kolabUser.inc:567
+#: ../lib/modules/sambaSamAccount.inc:1373
+#: ../lib/modules/sambaSamAccount.inc:1416
+#: ../lib/modules/sambaSamAccount.inc:1502
+#: ../lib/modules/zarafaUser.inc:878
+#: ../lib/modules/kolabUser.inc:455
 #: ../lib/modules/shadowAccount.inc:445
-#: ../lib/modules/nisnetgroup.inc:480
-#: ../lib/modules/inetOrgPerson.inc:1883
-#: ../lib/modules/freeRadius.inc:477
+#: ../lib/modules/nisnetgroup.inc:483
+#: ../lib/modules/inetOrgPerson.inc:1887
+#: ../lib/modules/freeRadius.inc:478
 #: ../lib/modules/aliasEntry.inc:140
 #: ../lib/modules/aliasEntry.inc:160
 #: ../lib/modules/heimdalKerberos.inc:590
 #: ../lib/modules/groupOfNames.inc:273
 #: ../lib/modules/groupOfNames.inc:385
 #: ../lib/lists.inc:659
-#: ../lib/lists.inc:731
-#: ../lib/modules.inc:1139
+#: ../lib/lists.inc:732
+#: ../lib/modules.inc:1145
 msgid "Cancel"
 msgstr "取消"
 
@@ -1666,18 +1682,18 @@ msgstr "取消"
 #: ../templates/selfService/selfServiceLogin.php:90
 #: ../templates/selfService/selfServiceLogin.php:126
 #: ../templates/selfService/selfServiceLogin.php:131
-#: ../templates/selfService/selfServiceMain.php:139
-#: ../templates/selfService/selfServiceMain.php:153
-#: ../lib/modules/selfRegistration.inc:577
+#: ../templates/selfService/selfServiceMain.php:143
+#: ../templates/selfService/selfServiceMain.php:157
+#: ../lib/modules/selfRegistration.inc:588
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "无法连接指定的LDAP服务器,请再试一次."
 
 #: ../templates/login.php:247
-#: ../lib/config.inc:1417
+#: ../lib/config.inc:1418
 msgid "Cannot open config file!"
 msgstr "无法打开配置文件!"
 
-#: ../lib/modules/imapAccess.inc:161
+#: ../lib/modules/imapAccess.inc:162
 msgid "Cannot update quota."
 msgstr "不能修改配额"
 
@@ -1685,53 +1701,53 @@ msgstr "不能修改配额"
 #: ../lib/modules/zarafaUser.inc:178
 #: ../lib/modules/zarafaUser.inc:266
 #: ../lib/modules/zarafaUser.inc:383
-#: ../lib/modules/zarafaUser.inc:416
-#: ../lib/modules/zarafaUser.inc:546
-#: ../lib/modules/zarafaUser.inc:1301
+#: ../lib/modules/zarafaUser.inc:418
+#: ../lib/modules/zarafaUser.inc:548
+#: ../lib/modules/zarafaUser.inc:1303
 msgid "Capacity"
 msgstr "容量"
 
-#: ../templates/selfService/adminMain.php:425
+#: ../templates/selfService/adminMain.php:439
 msgid "Captions and labels"
 msgstr "标题和标签"
 
-#: ../lib/modules/inetOrgPerson.inc:126
-#: ../lib/modules/inetOrgPerson.inc:264
-#: ../lib/modules/inetOrgPerson.inc:497
-#: ../lib/modules/inetOrgPerson.inc:567
-#: ../lib/modules/inetOrgPerson.inc:745
-#: ../lib/modules/inetOrgPerson.inc:1688
-#: ../lib/modules/inetOrgPerson.inc:2081
-#: ../lib/modules/inetOrgPerson.inc:2646
+#: ../lib/modules/inetOrgPerson.inc:127
+#: ../lib/modules/inetOrgPerson.inc:269
+#: ../lib/modules/inetOrgPerson.inc:501
+#: ../lib/modules/inetOrgPerson.inc:571
+#: ../lib/modules/inetOrgPerson.inc:749
+#: ../lib/modules/inetOrgPerson.inc:1692
+#: ../lib/modules/inetOrgPerson.inc:2085
+#: ../lib/modules/inetOrgPerson.inc:2719
 msgid "Car license"
 msgstr "汽车执照"
 
-#: ../lib/modules/sambaSamAccount.inc:540
+#: ../lib/modules/sambaSamAccount.inc:545
 msgid "Central Europe Time, Paris, Berlin"
 msgstr "欧洲中央时间,巴黎,柏林"
 
-#: ../lib/modules/sambaSamAccount.inc:533
+#: ../lib/modules/sambaSamAccount.inc:538
 msgid "Central Time (US & Canada), Mexico City"
 msgstr "中央时间(美国和加拿大),墨西哥市 "
 
-#: ../templates/selfService/adminMain.php:442
-#: ../templates/pdfedit/pdfpage.php:484
-#: ../templates/pdfedit/pdfpage.php:493
+#: ../templates/selfService/adminMain.php:456
+#: ../templates/pdfedit/pdfpage.php:486
+#: ../templates/pdfedit/pdfpage.php:495
 #: ../lib/modules/zarafaContact.inc:199
 #: ../lib/modules/zarafaGroup.inc:236
 #: ../lib/modules/device.inc:180
-#: ../lib/modules/sambaSamAccount.inc:1139
-#: ../lib/modules/sambaSamAccount.inc:1407
-#: ../lib/modules/zarafaUser.inc:467
-#: ../lib/modules/zarafaUser.inc:558
+#: ../lib/modules/sambaSamAccount.inc:1144
+#: ../lib/modules/sambaSamAccount.inc:1412
+#: ../lib/modules/zarafaUser.inc:469
+#: ../lib/modules/zarafaUser.inc:560
 #: ../lib/modules/shadowAccount.inc:344
 #: ../lib/modules/shadowAccount.inc:441
-#: ../lib/modules/inetOrgPerson.inc:1760
-#: ../lib/modules/freeRadius.inc:333
-#: ../lib/modules/freeRadius.inc:473
-#: ../lib/modules/asteriskExtension.inc:228
+#: ../lib/modules/inetOrgPerson.inc:1764
+#: ../lib/modules/freeRadius.inc:334
+#: ../lib/modules/freeRadius.inc:474
+#: ../lib/modules/asteriskExtension.inc:229
 #: ../lib/modules/aliasEntry.inc:93
-#: ../lib/modules/passwordSelfReset.inc:271
+#: ../lib/modules/passwordSelfReset.inc:272
 #: ../lib/modules/heimdalKerberos.inc:314
 #: ../lib/modules/heimdalKerberos.inc:325
 #: ../lib/modules/heimdalKerberos.inc:586
@@ -1740,8 +1756,8 @@ msgstr "中央时间(美国和加拿大),墨西哥市 "
 msgid "Change"
 msgstr "更改"
 
-#: ../lib/modules/posixGroup.inc:217
-#: ../lib/modules/posixGroup.inc:428
+#: ../lib/modules/posixGroup.inc:219
+#: ../lib/modules/posixGroup.inc:431
 msgid "Change GID number of users and hosts"
 msgstr "更改用户和主机的GID号"
 
@@ -1755,9 +1771,9 @@ msgstr "改变帐号状态"
 msgid "Change default profile"
 msgstr "更改缺省的配置文件"
 
-#: ../lib/types/automountType.inc:245
-#: ../lib/types/dhcp.inc:288
-#: ../lib/lists.inc:731
+#: ../lib/types/automountType.inc:279
+#: ../lib/types/dhcp.inc:291
+#: ../lib/lists.inc:732
 msgid "Change list settings"
 msgstr "改变列表设置"
 
@@ -1771,7 +1787,7 @@ msgstr "更改管理员密码"
 #: ../templates/lists/changePassword.php:298
 #: ../templates/lists/changePassword.php:325
 #: ../templates/lists/changePassword.php:327
-#: ../lib/types/user.inc:601
+#: ../lib/types/user.inc:612
 #: ../help/help.inc:99
 msgid "Change password"
 msgstr "更改密码"
@@ -1785,30 +1801,30 @@ msgstr "现在更改密码?"
 msgid "Change passwords"
 msgstr "更改密码 "
 
-#: ../lib/types/automountType.inc:246
-#: ../lib/types/dhcp.inc:289
-#: ../lib/lists.inc:732
+#: ../lib/types/automountType.inc:280
+#: ../lib/types/dhcp.inc:292
+#: ../lib/lists.inc:733
 msgid "Change settings"
 msgstr "修改设置"
 
-#: ../lib/modules/posixAccount.inc:933
+#: ../lib/modules/posixAccount.inc:953
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "值已改变,因为只能使用ASCII字符."
 
-#: ../lib/modules/passwordSelfReset.inc:146
+#: ../lib/modules/passwordSelfReset.inc:147
 msgid "Charlie"
 msgstr "Charlie"
 
-#: ../lib/modules/posixAccount.inc:1166
+#: ../lib/modules/posixAccount.inc:1186
 msgid "Check home directories"
 msgstr "检查主目录"
 
-#: ../templates/tests/index.php:52
+#: ../templates/tests/index.php:54
 #: ../lib/tools/tests.inc:112
 msgid "Check if quotas and homedirectories can be managed."
 msgstr "请检查是否可能管理限额和主目录"
 
-#: ../templates/tests/index.php:58
+#: ../templates/tests/index.php:60
 #: ../lib/tools/tests.inc:118
 msgid "Check if the LDAP schema fits the requirements of the selected account modules."
 msgstr "检查LDAP的架构是否符合选中的帐号模块需求"
@@ -1817,15 +1833,15 @@ msgstr "检查LDAP的架构是否符合选中的帐号模块需求"
 msgid "Check password"
 msgstr "检查密码"
 
-#: ../templates/tests/lamdaemonTest.php:85
+#: ../templates/tests/lamdaemonTest.php:87
 msgid "Check quotas"
 msgstr "检查限额"
 
-#: ../templates/masscreate.php:235
+#: ../templates/masscreate.php:240
 msgid "Check your input carefully. LAM will only do some basic checks on the upload data."
 msgstr "请仔细检查输入,上传前程序仅做基本检查."
 
-#: ../lib/modules/customFields.inc:1051
+#: ../lib/modules/customFields.inc:1108
 msgid "Checkbox"
 msgstr "复选框"
 
@@ -1838,10 +1854,20 @@ msgstr "儿童"
 msgid "Choose entry"
 msgstr "选择的条目"
 
-#: ../lib/modules/imapAccess.inc:82
+#: ../lib/modules/imapAccess.inc:83
 msgid "Choose the way how to provide the IMAP admin password. You can use the same password as for the LAM login or LAM will ask you for a password when it is required."
 msgstr "选择IMAP管理密码的输入方法。可以使用与LAM登录相同的密码，也可以在需要时再输入。"
 
+#: ../lib/modules/puppetClient.inc:85
+#: ../lib/modules/puppetClient.inc:89
+#: ../lib/modules/puppetClient.inc:133
+#: ../lib/modules/puppetClient.inc:148
+#: ../lib/modules/puppetClient.inc:161
+#: ../lib/modules/puppetClient.inc:264
+#: ../lib/modules/puppetClient.inc:428
+msgid "Classes"
+msgstr "类"
+
 #: ../lib/config.inc:158
 msgid "Click here if you are not directed to the next page."
 msgstr "如果没有自动跳转到下一页请点此处."
@@ -1854,28 +1880,28 @@ msgstr "点击弹出的对话框来选择一个图形化的日期"
 msgid "Click to popup a dialog to select an entry (DN) graphically"
 msgstr "点击弹出的对话框来选择一个图形化的DN条目"
 
-#: ../lib/types/user.inc:551
+#: ../lib/types/user.inc:562
 msgid "Click to switch between thumbnail and original size."
 msgstr "点击在缩略图与原来的大小间切换"
 
-#: ../lib/modules/sambaSamAccount.inc:223
-#: ../lib/modules/sambaSamAccount.inc:356
-#: ../lib/modules/sambaSamAccount.inc:1465
-#: ../lib/modules/sambaSamAccount.inc:1743
+#: ../lib/modules/sambaSamAccount.inc:227
+#: ../lib/modules/sambaSamAccount.inc:361
+#: ../lib/modules/sambaSamAccount.inc:1470
+#: ../lib/modules/sambaSamAccount.inc:1748
 msgid "Client printer is default"
 msgstr "缺省为客户打印机"
 
-#: ../templates/schema/schema.php:197
+#: ../templates/schema/schema.php:199
 msgid "Collective"
 msgstr "集合(Collective)"
 
-#: ../templates/masscreate.php:270
+#: ../templates/masscreate.php:275
 #: ../lib/modules/customFields.inc:100
-#: ../lib/modules/customFields.inc:958
+#: ../lib/modules/customFields.inc:1012
 msgid "Columns"
 msgstr "列"
 
-#: ../lib/modules/sambaSamAccount.inc:296
+#: ../lib/modules/sambaSamAccount.inc:301
 msgid "Comma separated list of Samba workstations the user is allowed to login. Empty means every workstation."
 msgstr "用户可以登录的Samba工作站,用逗号分隔,空值表示所有工作站."
 
@@ -1902,31 +1928,31 @@ msgstr "命令"
 msgid "Commit"
 msgstr "提交"
 
-#: ../lib/modules/posixAccount.inc:103
-#: ../lib/modules/posixAccount.inc:148
-#: ../lib/modules/posixAccount.inc:204
-#: ../lib/modules/posixAccount.inc:321
-#: ../lib/modules/posixAccount.inc:403
-#: ../lib/modules/posixAccount.inc:425
-#: ../lib/modules/posixAccount.inc:1116
-#: ../lib/modules/posixAccount.inc:1491
-#: ../lib/modules/posixAccount.inc:2124
-#: ../lib/modules/inetOrgPerson.inc:74
-#: ../lib/modules/inetOrgPerson.inc:595
-#: ../lib/modules/inetOrgPerson.inc:701
-#: ../lib/modules/inetOrgPerson.inc:1253
-#: ../lib/modules/inetOrgPerson.inc:2077
-#: ../lib/modules/inetOrgPerson.inc:2204
-#: ../lib/modules/asteriskExtension.inc:110
+#: ../lib/modules/posixAccount.inc:113
+#: ../lib/modules/posixAccount.inc:158
+#: ../lib/modules/posixAccount.inc:218
+#: ../lib/modules/posixAccount.inc:335
+#: ../lib/modules/posixAccount.inc:421
+#: ../lib/modules/posixAccount.inc:443
+#: ../lib/modules/posixAccount.inc:1136
+#: ../lib/modules/posixAccount.inc:1511
+#: ../lib/modules/posixAccount.inc:2146
+#: ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/inetOrgPerson.inc:599
+#: ../lib/modules/inetOrgPerson.inc:705
+#: ../lib/modules/inetOrgPerson.inc:1257
+#: ../lib/modules/inetOrgPerson.inc:2081
+#: ../lib/modules/inetOrgPerson.inc:2208
+#: ../lib/modules/asteriskExtension.inc:111
 msgid "Common name"
 msgstr "全名"
 
-#: ../lib/modules/asteriskExtension.inc:111
+#: ../lib/modules/asteriskExtension.inc:112
 msgid "Common name of the Asterisk extension."
 msgstr "Asterisk 扩展的一般命名"
 
-#: ../templates/serverInfo.php:333
-#: ../templates/serverInfo.php:394
+#: ../templates/serverInfo.php:335
+#: ../templates/serverInfo.php:396
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1168
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1172
 #: ../templates/3rdParty/pla/htdocs/compare_form.php:33
@@ -1955,12 +1981,12 @@ msgstr "与另外一个条目进行比较"
 msgid "Comparing the following DNs"
 msgstr "比较如下DN条目"
 
-#: ../templates/serverInfo.php:282
-#: ../templates/serverInfo.php:369
+#: ../templates/serverInfo.php:284
+#: ../templates/serverInfo.php:371
 msgid "Completed"
 msgstr "完成"
 
-#: ../templates/serverInfo.php:112
+#: ../templates/serverInfo.php:114
 msgid "Config suffix"
 msgstr "配置后缀"
 
@@ -1976,31 +2002,31 @@ msgstr "确认邮件的设置"
 msgid "Conflicting module:"
 msgstr "冲突的模块:"
 
-#: ../lib/modules/sambaSamAccount.inc:221
-#: ../lib/modules/sambaSamAccount.inc:350
-#: ../lib/modules/sambaSamAccount.inc:1461
-#: ../lib/modules/sambaSamAccount.inc:1733
+#: ../lib/modules/sambaSamAccount.inc:225
+#: ../lib/modules/sambaSamAccount.inc:355
+#: ../lib/modules/sambaSamAccount.inc:1466
+#: ../lib/modules/sambaSamAccount.inc:1738
 msgid "Connect client drives"
 msgstr "连接客户驱动器"
 
-#: ../lib/modules/sambaSamAccount.inc:222
-#: ../lib/modules/sambaSamAccount.inc:353
-#: ../lib/modules/sambaSamAccount.inc:1463
-#: ../lib/modules/sambaSamAccount.inc:1738
+#: ../lib/modules/sambaSamAccount.inc:226
+#: ../lib/modules/sambaSamAccount.inc:358
+#: ../lib/modules/sambaSamAccount.inc:1468
+#: ../lib/modules/sambaSamAccount.inc:1743
 msgid "Connect client printers"
 msgstr "连接客户打印机"
 
-#: ../templates/serverInfo.php:228
+#: ../templates/serverInfo.php:230
 msgid "Connection statistics"
 msgstr "连接统计"
 
-#: ../lib/modules/sambaSamAccount.inc:218
-#: ../lib/modules/sambaSamAccount.inc:1449
-#: ../lib/modules/sambaSamAccount.inc:1726
+#: ../lib/modules/sambaSamAccount.inc:222
+#: ../lib/modules/sambaSamAccount.inc:1454
+#: ../lib/modules/sambaSamAccount.inc:1731
 msgid "Connection time limit"
 msgstr "连接时间限制"
 
-#: ../lib/modules/inetOrgPerson.inc:1514
+#: ../lib/modules/inetOrgPerson.inc:1518
 msgid "Contact data"
 msgstr "联系数据"
 
@@ -2094,42 +2120,28 @@ msgstr "不能更改文件名"
 msgid "Could not rename the entry."
 msgstr "不能重命名条目."
 
-#: ../templates/pdfedit/pdfpage.php:99
+#: ../templates/pdfedit/pdfpage.php:101
 msgid "Could not save PDF structure, access denied."
 msgstr "无法保存PDF结构,存取拒绝."
 
-#: ../lib/modules/kolabUser.inc:86
-#: ../lib/modules/kolabUser.inc:147
-#: ../lib/modules/kolabUser.inc:176
-#: ../lib/modules/kolabUser.inc:215
-#: ../lib/modules/kolabUser.inc:285
-#: ../lib/modules/kolabUser.inc:771
-msgid "Country"
-msgstr "国家"
-
-#: ../lib/modules/kolabUser.inc:233
-#: ../lib/modules/kolabUser.inc:234
-msgid "Country name is invalid!"
-msgstr "国家名称非法!"
-
-#: ../templates/pdfedit/pdfmain.php:137
-#: ../templates/profedit/profilemain.php:131
+#: ../templates/pdfedit/pdfmain.php:139
+#: ../templates/profedit/profilemain.php:133
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1185
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1189
 #: ../templates/initsuff.php:188
-#: ../lib/modules/posixAccount.inc:1351
+#: ../lib/modules/posixAccount.inc:1371
 msgid "Create"
 msgstr "建立"
 
 #: ../lib/lists.inc:448
 #: ../lib/lists.inc:634
-#: ../lib/modules.inc:1273
+#: ../lib/modules.inc:1279
 #: ../help/help.inc:164
 msgid "Create PDF file"
 msgstr "建立PDF文件"
 
-#: ../templates/massDoUpload.php:171
-#: ../templates/masscreate.php:252
+#: ../templates/massDoUpload.php:174
+#: ../templates/masscreate.php:257
 msgid "Create PDF files"
 msgstr "建立PDF文件"
 
@@ -2139,11 +2151,11 @@ msgstr "建立PDF文件"
 msgid "Create a child entry"
 msgstr "新建子条目"
 
-#: ../templates/pdfedit/pdfmain.php:130
+#: ../templates/pdfedit/pdfmain.php:132
 msgid "Create a new PDF structure"
 msgstr "建立新的PDF架构"
 
-#: ../templates/profedit/profilemain.php:119
+#: ../templates/profedit/profilemain.php:121
 msgid "Create a new profile"
 msgstr "建立新的配置文件"
 
@@ -2155,7 +2167,7 @@ msgstr "新建另外一个DHCP条目"
 msgid "Create another NIS object"
 msgstr "建立另外一个 NIS 对象."
 
-#: ../lib/baseType.inc:45
+#: ../lib/baseType.inc:47
 msgid "Create another account"
 msgstr "建立另外一个帐号"
 
@@ -2168,7 +2180,7 @@ msgstr "建立另外一个地址列表"
 msgid "Create another alias"
 msgstr "建立另外一个别名"
 
-#: ../lib/types/automountType.inc:29
+#: ../lib/types/automountType.inc:34
 msgid "Create another automount entry"
 msgstr "建立另外自动挂接帐号"
 
@@ -2211,13 +2223,13 @@ msgstr "建立另外一个用户"
 msgid "Create for"
 msgstr "建立"
 
-#: ../lib/modules/posixAccount.inc:236
-#: ../lib/modules/posixAccount.inc:1152
-#: ../lib/modules/posixAccount.inc:1416
+#: ../lib/modules/posixAccount.inc:250
+#: ../lib/modules/posixAccount.inc:1172
+#: ../lib/modules/posixAccount.inc:1436
 msgid "Create home directory"
 msgstr "建立主目录"
 
-#: ../lib/modules/imapAccess.inc:237
+#: ../lib/modules/imapAccess.inc:238
 msgid "Create mailbox"
 msgstr "建立邮箱"
 
@@ -2239,7 +2251,7 @@ msgstr "对立对象"
 msgid "Created by"
 msgstr "创建者:"
 
-#: ../lib/types/automountType.inc:286
+#: ../lib/types/automountType.inc:320
 msgid "Created new automount map."
 msgstr "建立新的自动挂接映射."
 
@@ -2261,8 +2273,8 @@ msgstr "成功建立.DN<b>%s</b>已经建立."
 msgid "Creation time"
 msgstr "创建时间"
 
-#: ../templates/serverInfo.php:230
-#: ../templates/serverInfo.php:235
+#: ../templates/serverInfo.php:232
+#: ../templates/serverInfo.php:237
 msgid "Current connections"
 msgstr "当前连接"
 
@@ -2271,12 +2283,12 @@ msgstr "当前连接"
 msgid "Current list of <b>%s</b> values for attribute <b>%s</b>:"
 msgstr "当前 <b>%s</b>个属性 <b>%s</b>值的列表: "
 
-#: ../lib/modules/imapAccess.inc:290
+#: ../lib/modules/imapAccess.inc:292
 msgid "Current usage (kB)"
 msgstr "当前使用量(kB)"
 
 #: ../lib/modules/customFields.inc:56
-#: ../lib/modules/customFields.inc:307
+#: ../lib/modules/customFields.inc:316
 msgid "Custom fields"
 msgstr "自定义域"
 
@@ -2315,7 +2327,7 @@ msgid "DHCP count: %s"
 msgstr "DHCP总计: %s"
 
 #: ../lib/types/dhcp.inc:173
-#: ../lib/modules/dhcp_settings.inc:106
+#: ../lib/modules/dhcp_settings.inc:113
 msgid "DHCP settings"
 msgstr "DHCP 设置"
 
@@ -2328,8 +2340,8 @@ msgstr "DHCP 设置"
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:35
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:112
 #: ../templates/3rdParty/pla/htdocs/mass_delete.php:57
-#: ../lib/modules.inc:382
-#: ../lib/modules.inc:1821
+#: ../lib/modules.inc:388
+#: ../lib/modules.inc:1833
 msgid "DN"
 msgstr "DN"
 
@@ -2339,28 +2351,28 @@ msgstr "DN"
 msgid "DN does not exist"
 msgstr "DN不存在"
 
-#: ../templates/masscreate.php:274
+#: ../templates/masscreate.php:279
 msgid "DN settings"
 msgstr "DN 设置"
 
-#: ../templates/masscreate.php:303
+#: ../templates/masscreate.php:308
 #: ../help/help.inc:158
 msgid "DN suffix"
 msgstr "DN 后缀"
 
-#: ../lib/modules/dhcp_settings.inc:186
-#: ../lib/modules/dhcp_settings.inc:200
-#: ../lib/modules/dhcp_settings.inc:239
-#: ../lib/modules/dhcp_settings.inc:545
-#: ../lib/modules/dhcp_settings.inc:632
+#: ../lib/modules/dhcp_settings.inc:193
+#: ../lib/modules/dhcp_settings.inc:207
+#: ../lib/modules/dhcp_settings.inc:246
+#: ../lib/modules/dhcp_settings.inc:552
+#: ../lib/modules/dhcp_settings.inc:639
 msgid "DNS"
 msgstr "DNS"
 
-#: ../lib/modules/dhcp_settings.inc:140
+#: ../lib/modules/dhcp_settings.inc:147
 msgid "DNS (Domain Name System)"
 msgstr "DNS(域名解析系统)"
 
-#: ../lib/modules/asteriskExtension.inc:107
+#: ../lib/modules/asteriskExtension.inc:108
 msgid "DNs of the extension owners"
 msgstr "扩展属主的DN名"
 
@@ -2388,11 +2400,11 @@ msgstr "SIP客户端的DTMF模式配置"
 msgid "Data"
 msgstr "数据"
 
-#: ../lib/modules/sambaSamAccount.inc:276
+#: ../lib/modules/sambaSamAccount.inc:281
 msgid "Date after the user is able to change his password."
 msgstr "多少天后用户才能修改密码。"
 
-#: ../lib/modules/sambaSamAccount.inc:278
+#: ../lib/modules/sambaSamAccount.inc:283
 #: ../lib/modules/heimdalKerberos.inc:100
 msgid "Date after the user must change his password."
 msgstr "多少天后用户必须修改密码"
@@ -2410,12 +2422,12 @@ msgstr "调试"
 msgid "Default"
 msgstr "缺省"
 
-#: ../lib/modules/dhcp_settings.inc:144
-#: ../lib/modules/dhcp_settings.inc:187
-#: ../lib/modules/dhcp_settings.inc:201
-#: ../lib/modules/dhcp_settings.inc:245
-#: ../lib/modules/dhcp_settings.inc:547
-#: ../lib/modules/dhcp_settings.inc:633
+#: ../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:554
+#: ../lib/modules/dhcp_settings.inc:640
 msgid "Default gateway"
 msgstr "缺省网关"
 
@@ -2433,10 +2445,10 @@ msgstr "缺省语言"
 msgid "Default user"
 msgstr "缺省用户"
 
-#: ../templates/masscreate.php:292
-#: ../templates/masscreate.php:367
+#: ../templates/masscreate.php:297
+#: ../templates/masscreate.php:372
 #: ../lib/modules/customFields.inc:96
-#: ../lib/modules/customFields.inc:1074
+#: ../lib/modules/customFields.inc:1131
 msgid "Default value"
 msgstr "缺省值"
 
@@ -2448,34 +2460,34 @@ msgstr "定义工作站是否更改密码."
 msgid "Defines the mailbox to check for message waiting indication (MWI) for this peer."
 msgstr "为此端检查消息等待信号(MWI)来定义邮箱"
 
+#: ../lib/modules/kolabUser.inc:97
+#: ../lib/modules/kolabUser.inc:113
 #: ../lib/modules/kolabUser.inc:117
-#: ../lib/modules/kolabUser.inc:131
-#: ../lib/modules/kolabUser.inc:135
-#: ../lib/modules/kolabUser.inc:195
-#: ../lib/modules/kolabUser.inc:218
-#: ../lib/modules/kolabUser.inc:374
-#: ../lib/modules/kolabUser.inc:809
-#: ../lib/modules/kolabUser.inc:877
+#: ../lib/modules/kolabUser.inc:159
+#: ../lib/modules/kolabUser.inc:169
+#: ../lib/modules/kolabUser.inc:295
+#: ../lib/modules/kolabUser.inc:652
+#: ../lib/modules/kolabUser.inc:718
 msgid "Delegates"
 msgstr "代理(Delegates)"
 
-#: ../templates/serverInfo.php:319
-#: ../templates/serverInfo.php:388
-#: ../templates/ou_edit.php:118
+#: ../templates/serverInfo.php:321
+#: ../templates/serverInfo.php:390
+#: ../templates/ou_edit.php:120
 #: ../templates/config/profmanage.php:260
 #: ../templates/selfService/profManage.php:239
-#: ../templates/pdfedit/pdfmain.php:157
-#: ../templates/pdfedit/pdfmain.php:158
+#: ../templates/pdfedit/pdfmain.php:159
+#: ../templates/pdfedit/pdfmain.php:160
 #: ../templates/delete.php:116
-#: ../templates/profedit/profilemain.php:156
-#: ../templates/profedit/profilemain.php:157
+#: ../templates/profedit/profilemain.php:158
+#: ../templates/profedit/profilemain.php:159
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:33
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:124
-#: ../lib/modules/posixAccount.inc:1344
-#: ../lib/modules/zarafaUser.inc:1506
-#: ../lib/modules/zarafaUser.inc:1552
-#: ../lib/modules/kolabUser.inc:873
-#: ../lib/modules/nisnetgroup.inc:243
+#: ../lib/modules/posixAccount.inc:1364
+#: ../lib/modules/zarafaUser.inc:1510
+#: ../lib/modules/zarafaUser.inc:1560
+#: ../lib/modules/kolabUser.inc:708
+#: ../lib/modules/nisnetgroup.inc:246
 #: ../lib/lists.inc:442
 msgid "Delete"
 msgstr "删除"
@@ -2499,21 +2511,21 @@ msgstr "在拷贝(移动)后删除:"
 msgid "Delete all %s objects"
 msgstr "删除全部 %s 个对象"
 
-#: ../lib/modules/posixAccount.inc:1201
+#: ../lib/modules/posixAccount.inc:1221
 msgid "Delete home directory"
 msgstr "删除主目录"
 
-#: ../lib/modules/imapAccess.inc:230
+#: ../lib/modules/imapAccess.inc:231
 msgid "Delete mailbox"
 msgstr "删除邮箱"
 
-#: ../templates/ou_edit.php:192
+#: ../templates/ou_edit.php:194
 #: ../help/help.inc:215
 msgid "Delete organisational unit"
 msgstr "删除组织单元"
 
 #: ../templates/3rdParty/pla/lib/functions.php:2014
-#: ../lib/modules/inetOrgPerson.inc:1807
+#: ../lib/modules/inetOrgPerson.inc:1811
 msgid "Delete photo"
 msgstr "删除照片"
 
@@ -2531,8 +2543,8 @@ msgstr "删除配置文件"
 msgid "Delete range"
 msgstr "删除范围"
 
-#: ../lib/modules/asteriskExtension.inc:308
-#: ../lib/modules/asteriskExtension.inc:331
+#: ../lib/modules/asteriskExtension.inc:309
+#: ../lib/modules/asteriskExtension.inc:332
 msgid "Delete rule"
 msgstr "删除规则"
 
@@ -2553,7 +2565,7 @@ msgstr "删除选中的地址列表"
 msgid "Delete selected aliases"
 msgstr "删除选中的别名"
 
-#: ../lib/types/automountType.inc:189
+#: ../lib/types/automountType.inc:217
 msgid "Delete selected automount entries"
 msgstr "删除选中的自动挂接条目"
 
@@ -2565,7 +2577,7 @@ msgstr "删除选中的域"
 msgid "Delete selected extensions"
 msgstr "删除选中的扩展"
 
-#: ../lib/types/gon.inc:181
+#: ../lib/types/gon.inc:183
 #: ../lib/types/zarafaDynamicGroupType.inc:168
 #: ../lib/types/group.inc:207
 #: ../lib/types/netgroup.inc:172
@@ -2588,7 +2600,7 @@ msgstr "删除选中的策略"
 msgid "Delete selected sudo roles"
 msgstr "删除选中的sudo角色"
 
-#: ../lib/types/user.inc:466
+#: ../lib/types/user.inc:477
 msgid "Delete selected users"
 msgstr "删除选中的用户"
 
@@ -2607,7 +2619,7 @@ msgstr "删除这个条目"
 msgid "Deleted DN: %s"
 msgstr "删除的DN: %s"
 
-#: ../templates/pdfedit/pdfmain.php:84
+#: ../templates/pdfedit/pdfmain.php:86
 msgid "Deleted PDF structure."
 msgstr "删除的PDF结构."
 
@@ -2615,7 +2627,7 @@ msgstr "删除的PDF结构."
 msgid "Deleted account"
 msgstr "已删除的帐号"
 
-#: ../templates/profedit/profilemain.php:94
+#: ../templates/profedit/profilemain.php:96
 msgid "Deleted profile."
 msgstr "已删除的配置文件."
 
@@ -2634,7 +2646,7 @@ msgstr "正在删除"
 msgid "Deleting objects"
 msgstr "正在删除对象"
 
-#: ../lib/lists.inc:967
+#: ../lib/lists.inc:968
 msgid "Deletion was successful."
 msgstr "删除操作成功."
 
@@ -2647,27 +2659,27 @@ msgstr "删除操作成功."
 msgid "Deny"
 msgstr "拒绝"
 
-#: ../lib/modules/inetOrgPerson.inc:128
-#: ../lib/modules/inetOrgPerson.inc:165
-#: ../lib/modules/inetOrgPerson.inc:270
-#: ../lib/modules/inetOrgPerson.inc:465
-#: ../lib/modules/inetOrgPerson.inc:576
-#: ../lib/modules/inetOrgPerson.inc:757
+#: ../lib/modules/inetOrgPerson.inc:129
+#: ../lib/modules/inetOrgPerson.inc:170
+#: ../lib/modules/inetOrgPerson.inc:275
+#: ../lib/modules/inetOrgPerson.inc:469
+#: ../lib/modules/inetOrgPerson.inc:580
 #: ../lib/modules/inetOrgPerson.inc:761
-#: ../lib/modules/inetOrgPerson.inc:1713
-#: ../lib/modules/inetOrgPerson.inc:2091
-#: ../lib/modules/inetOrgPerson.inc:2692
+#: ../lib/modules/inetOrgPerson.inc:765
+#: ../lib/modules/inetOrgPerson.inc:1717
+#: ../lib/modules/inetOrgPerson.inc:2095
+#: ../lib/modules/inetOrgPerson.inc:2779
 msgid "Department"
 msgstr "部门"
 
-#: ../templates/schema/schema.php:87
-#: ../templates/schema/schema.php:141
-#: ../templates/schema/schema.php:344
+#: ../templates/schema/schema.php:89
+#: ../templates/schema/schema.php:143
+#: ../templates/schema/schema.php:346
 #: ../templates/3rdParty/pla/lib/functions.php:1898
 #: ../templates/3rdParty/pla/lib/functions.php:1902
 #: ../templates/3rdParty/pla/htdocs/add_value_form.php:139
 #: ../templates/3rdParty/pla/htdocs/import.php:101
-#: ../lib/types/automountType.inc:79
+#: ../lib/types/automountType.inc:88
 #: ../lib/types/nisObjectType.inc:80
 #: ../lib/types/user.inc:101
 #: ../lib/types/sudo.inc:84
@@ -2679,21 +2691,21 @@ msgstr "部门"
 #: ../lib/modules/account.inc:106
 #: ../lib/modules/account.inc:221
 #: ../lib/modules/account.inc:232
-#: ../lib/modules/posixGroup.inc:196
-#: ../lib/modules/posixGroup.inc:348
-#: ../lib/modules/posixGroup.inc:400
-#: ../lib/modules/posixGroup.inc:467
+#: ../lib/modules/posixGroup.inc:198
+#: ../lib/modules/posixGroup.inc:351
+#: ../lib/modules/posixGroup.inc:403
+#: ../lib/modules/posixGroup.inc:474
 #: ../lib/modules/device.inc:74
 #: ../lib/modules/device.inc:107
 #: ../lib/modules/device.inc:117
 #: ../lib/modules/device.inc:163
 #: ../lib/modules/device.inc:448
-#: ../lib/modules/dhcp_settings.inc:176
-#: ../lib/modules/dhcp_settings.inc:192
-#: ../lib/modules/dhcp_settings.inc:272
-#: ../lib/modules/dhcp_settings.inc:579
-#: ../lib/modules/dhcp_settings.inc:638
-#: ../lib/modules/posixAccount.inc:421
+#: ../lib/modules/dhcp_settings.inc:183
+#: ../lib/modules/dhcp_settings.inc:199
+#: ../lib/modules/dhcp_settings.inc:279
+#: ../lib/modules/dhcp_settings.inc:586
+#: ../lib/modules/dhcp_settings.inc:645
+#: ../lib/modules/posixAccount.inc:439
 #: ../lib/modules/nisObject.inc:66
 #: ../lib/modules/nisObject.inc:96
 #: ../lib/modules/nisObject.inc:107
@@ -2701,21 +2713,21 @@ msgstr "部门"
 #: ../lib/modules/nisObject.inc:213
 #: ../lib/modules/sambaGroupMapping.inc:325
 #: ../lib/modules/sambaGroupMapping.inc:394
-#: ../lib/modules/automount.inc:62
-#: ../lib/modules/automount.inc:85
-#: ../lib/modules/automount.inc:95
-#: ../lib/modules/automount.inc:130
-#: ../lib/modules/automount.inc:192
-#: ../lib/modules/nisnetgroup.inc:77
-#: ../lib/modules/nisnetgroup.inc:130
-#: ../lib/modules/nisnetgroup.inc:189
-#: ../lib/modules/nisnetgroup.inc:574
-#: ../lib/modules/inetOrgPerson.inc:232
-#: ../lib/modules/inetOrgPerson.inc:321
-#: ../lib/modules/inetOrgPerson.inc:516
-#: ../lib/modules/inetOrgPerson.inc:601
-#: ../lib/modules/inetOrgPerson.inc:1266
-#: ../lib/modules/inetOrgPerson.inc:2061
+#: ../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
+#: ../lib/modules/nisnetgroup.inc:192
+#: ../lib/modules/nisnetgroup.inc:577
+#: ../lib/modules/inetOrgPerson.inc:237
+#: ../lib/modules/inetOrgPerson.inc:325
+#: ../lib/modules/inetOrgPerson.inc:520
+#: ../lib/modules/inetOrgPerson.inc:605
+#: ../lib/modules/inetOrgPerson.inc:1270
+#: ../lib/modules/inetOrgPerson.inc:2065
 #: ../lib/modules/sudoRole.inc:59
 #: ../lib/modules/sudoRole.inc:128
 #: ../lib/modules/sudoRole.inc:172
@@ -2738,8 +2750,8 @@ msgstr "目标DN"
 msgid "Device"
 msgstr "设备"
 
-#: ../lib/modules/sambaSamAccount.inc:371
-#: ../lib/modules/sambaSamAccount.inc:559
+#: ../lib/modules/sambaSamAccount.inc:376
+#: ../lib/modules/sambaSamAccount.inc:564
 msgid "Disable LM hashes"
 msgstr "屏蔽LM哈希方法"
 
@@ -2803,9 +2815,9 @@ msgstr "不允许的编码"
 msgid "Disconnect users outside logon hours"
 msgstr "切断连接前用户登录小时数"
 
-#: ../lib/modules/sambaSamAccount.inc:219
-#: ../lib/modules/sambaSamAccount.inc:1453
-#: ../lib/modules/sambaSamAccount.inc:1727
+#: ../lib/modules/sambaSamAccount.inc:223
+#: ../lib/modules/sambaSamAccount.inc:1458
+#: ../lib/modules/sambaSamAccount.inc:1732
 msgid "Disconnection time limit"
 msgstr "断开连接时间限制"
 
@@ -2817,12 +2829,12 @@ msgstr "如果用户登录限制时间到则断开连接."
 msgid "Display format"
 msgstr "显示格式"
 
-#: ../lib/modules/sambaSamAccount.inc:101
-#: ../lib/modules/sambaSamAccount.inc:191
-#: ../lib/modules/sambaSamAccount.inc:236
-#: ../lib/modules/sambaSamAccount.inc:394
-#: ../lib/modules/sambaSamAccount.inc:1095
-#: ../lib/modules/sambaSamAccount.inc:1684
+#: ../lib/modules/sambaSamAccount.inc:104
+#: ../lib/modules/sambaSamAccount.inc:195
+#: ../lib/modules/sambaSamAccount.inc:241
+#: ../lib/modules/sambaSamAccount.inc:399
+#: ../lib/modules/sambaSamAccount.inc:1100
+#: ../lib/modules/sambaSamAccount.inc:1689
 #: ../lib/modules/sambaGroupMapping.inc:263
 #: ../lib/modules/sambaGroupMapping.inc:323
 #: ../lib/modules/sambaGroupMapping.inc:356
@@ -2838,28 +2850,28 @@ msgstr "屏幕显示"
 msgid "Display the created entry"
 msgstr "显示创建的条目"
 
-#: ../lib/modules.inc:475
+#: ../lib/modules.inc:481
 msgid "Displayed account numbers start at \"0\". Add 2 to get the row in your spreadsheet."
 msgstr "显示的帐号数以\"0\"开始,加2才是您的电子表格的行数."
 
-#: ../lib/modules/passwordSelfReset.inc:121
-#: ../lib/modules/passwordSelfReset.inc:214
+#: ../lib/modules/passwordSelfReset.inc:122
+#: ../lib/modules/passwordSelfReset.inc:215
 msgid "Do not ask security question"
 msgstr "不需要安全提问"
 
-#: ../templates/ou_edit.php:110
+#: ../templates/ou_edit.php:112
 msgid "Do you really want to delete this OU?"
 msgstr "确认删除这个OU?"
 
-#: ../templates/pdfedit/pdfmain.php:172
+#: ../templates/pdfedit/pdfmain.php:174
 msgid "Do you really want to delete this PDF structure?"
 msgstr "确认删除这个PDF结构?"
 
-#: ../templates/profedit/profilemain.php:172
+#: ../templates/profedit/profilemain.php:174
 msgid "Do you really want to delete this profile?"
 msgstr "确认删除这个配置文件?"
 
-#: ../lib/modules/kolabUser.inc:562
+#: ../lib/modules/kolabUser.inc:450
 msgid "Do you really want to mark this account for deletion?"
 msgstr "确认将此帐号打上删除标记?"
 
@@ -2875,20 +2887,20 @@ msgstr "确认创建这个条目?"
 msgid "Do you want to make these changes?"
 msgstr "确认如下更改?"
 
-#: ../lib/modules/sambaSamAccount.inc:192
-#: ../lib/modules/sambaSamAccount.inc:314
-#: ../lib/modules/sambaSamAccount.inc:387
-#: ../lib/modules/sambaSamAccount.inc:511
-#: ../lib/modules/sambaSamAccount.inc:1216
-#: ../lib/modules/sambaSamAccount.inc:1558
-#: ../lib/modules/sambaSamAccount.inc:1580
-#: ../lib/modules/sambaSamAccount.inc:1702
+#: ../lib/modules/sambaSamAccount.inc:196
+#: ../lib/modules/sambaSamAccount.inc:319
+#: ../lib/modules/sambaSamAccount.inc:392
+#: ../lib/modules/sambaSamAccount.inc:516
+#: ../lib/modules/sambaSamAccount.inc:1221
+#: ../lib/modules/sambaSamAccount.inc:1563
+#: ../lib/modules/sambaSamAccount.inc:1585
+#: ../lib/modules/sambaSamAccount.inc:1707
 #: ../lib/modules/sambaGroupMapping.inc:71
 #: ../lib/modules/sambaGroupMapping.inc:290
 #: ../lib/modules/sambaGroupMapping.inc:368
 #: ../lib/modules/sambaGroupMapping.inc:414
-#: ../lib/modules/nisnetgroup.inc:213
-#: ../lib/modules/nisnetgroup.inc:584
+#: ../lib/modules/nisnetgroup.inc:216
+#: ../lib/modules/nisnetgroup.inc:587
 msgid "Domain"
 msgstr "域"
 
@@ -2906,24 +2918,24 @@ msgstr "域SID"
 msgid "Domain administrators"
 msgstr "域管理员"
 
-#: ../lib/modules/sambaSamAccount.inc:74
+#: ../lib/modules/sambaSamAccount.inc:75
 #: ../lib/modules/sambaGroupMapping.inc:58
 #: ../lib/modules/sambaGroupMapping.inc:341
 msgid "Domain admins"
 msgstr "域管理员"
 
-#: ../lib/modules/sambaSamAccount.inc:75
+#: ../lib/modules/sambaSamAccount.inc:76
 #: ../lib/modules/sambaGroupMapping.inc:63
 msgid "Domain certificate admins"
 msgstr "域认证管理员"
 
-#: ../lib/modules/sambaSamAccount.inc:75
-#: ../lib/modules/sambaSamAccount.inc:779
+#: ../lib/modules/sambaSamAccount.inc:76
+#: ../lib/modules/sambaSamAccount.inc:784
 #: ../lib/modules/sambaGroupMapping.inc:61
 msgid "Domain computers"
 msgstr "域内计算机"
 
-#: ../lib/modules/sambaSamAccount.inc:75
+#: ../lib/modules/sambaSamAccount.inc:76
 #: ../lib/modules/sambaGroupMapping.inc:62
 msgid "Domain controllers"
 msgstr "域控制器"
@@ -2933,7 +2945,7 @@ msgstr "域控制器"
 msgid "Domain count: %s"
 msgstr "域总计:%s"
 
-#: ../lib/modules/sambaSamAccount.inc:76
+#: ../lib/modules/sambaSamAccount.inc:77
 #: ../lib/modules/sambaGroupMapping.inc:65
 msgid "Domain enterprise admins"
 msgstr "域企业管理员"
@@ -2943,19 +2955,19 @@ msgstr "域企业管理员"
 msgid "Domain group"
 msgstr "域内组"
 
-#: ../lib/modules/sambaSamAccount.inc:74
+#: ../lib/modules/sambaSamAccount.inc:75
 #: ../lib/modules/sambaGroupMapping.inc:60
 msgid "Domain guests"
 msgstr "域内来宾"
 
 #: ../lib/types/smbDomain.inc:92
-#: ../lib/modules/dhcp_settings.inc:124
-#: ../lib/modules/dhcp_settings.inc:183
-#: ../lib/modules/dhcp_settings.inc:197
-#: ../lib/modules/dhcp_settings.inc:221
-#: ../lib/modules/dhcp_settings.inc:535
-#: ../lib/modules/dhcp_settings.inc:629
-#: ../lib/modules/nisnetgroup.inc:144
+#: ../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:542
+#: ../lib/modules/dhcp_settings.inc:636
+#: ../lib/modules/nisnetgroup.inc:147
 #: ../lib/modules/sambaDomain.inc:70
 #: ../lib/modules/sambaDomain.inc:137
 #: ../lib/modules/sambaDomain.inc:177
@@ -2965,24 +2977,24 @@ msgstr "域内来宾"
 msgid "Domain name"
 msgstr "域名"
 
-#: ../lib/modules/nisnetgroup.inc:144
+#: ../lib/modules/nisnetgroup.inc:147
 #: ../lib/modules/sambaDomain.inc:201
 #: ../lib/modules/sambaDomain.inc:202
 msgid "Domain name is invalid!"
 msgstr "域名非法!"
 
-#: ../lib/modules/sambaSamAccount.inc:76
+#: ../lib/modules/sambaSamAccount.inc:77
 #: ../lib/modules/sambaGroupMapping.inc:66
 msgid "Domain policy admins"
 msgstr "域策略管理员"
 
-#: ../lib/modules/sambaSamAccount.inc:76
+#: ../lib/modules/sambaSamAccount.inc:77
 #: ../lib/modules/sambaGroupMapping.inc:64
 msgid "Domain schema admins"
 msgstr "域架构管理员"
 
-#: ../lib/modules/sambaSamAccount.inc:74
-#: ../lib/modules/sambaSamAccount.inc:2008
+#: ../lib/modules/sambaSamAccount.inc:75
+#: ../lib/modules/sambaSamAccount.inc:2013
 #: ../lib/modules/sambaGroupMapping.inc:59
 msgid "Domain users"
 msgstr "域内用户"
@@ -2991,19 +3003,19 @@ msgstr "域内用户"
 msgid "Don't stop on errors"
 msgstr "发生错误时不停止"
 
-#: ../templates/pdfedit/pdfpage.php:459
+#: ../templates/pdfedit/pdfpage.php:461
 msgid "Down"
 msgstr "向下"
 
-#: ../templates/masscreate.php:244
+#: ../templates/masscreate.php:249
 msgid "Download sample CSV file"
 msgstr "下载CSV示例文件"
 
-#: ../templates/serverInfo.php:122
+#: ../templates/serverInfo.php:124
 msgid "Dynamic subtrees"
 msgstr "动态子树"
 
-#: ../lib/modules/eduPerson.inc:64
+#: ../lib/modules/eduPerson.inc:65
 msgid "EDU person"
 msgstr "EDU用户"
 
@@ -3011,27 +3023,27 @@ msgstr "EDU用户"
 msgid "Each line represents one LDAP attribute. The options are separated by \"::\". The first option specifies if the attribute is mandatory. It can have the values \"optional\" and \"required\"."
 msgstr "每一行代表一个LDAP属性.选择用 \"::\"来分隔,第一个选项指定这是否是一个强制选项,它的值是\"可选\"或\"必选\"."
 
-#: ../lib/modules/sambaSamAccount.inc:549
+#: ../lib/modules/sambaSamAccount.inc:554
 msgid "East Australian Standard, Guam"
 msgstr "澳东标准时间,关岛"
 
-#: ../lib/modules/sambaSamAccount.inc:541
+#: ../lib/modules/sambaSamAccount.inc:546
 msgid "Eastern Europe Time, South Africa"
 msgstr "东欧时间,南非"
 
-#: ../lib/modules/sambaSamAccount.inc:534
+#: ../lib/modules/sambaSamAccount.inc:539
 msgid "Eastern Time (US & Canada), Bogota"
 msgstr "美国东部时间(美国和加拿大),波哥大"
 
-#: ../templates/pdfedit/pdfmain.php:154
-#: ../templates/profedit/profilemain.php:153
-#: ../lib/modules/sambaSamAccount.inc:1221
+#: ../templates/pdfedit/pdfmain.php:156
+#: ../templates/profedit/profilemain.php:155
 #: ../lib/modules/sambaSamAccount.inc:1226
+#: ../lib/modules/sambaSamAccount.inc:1231
 #: ../lib/lists.inc:436
 msgid "Edit"
 msgstr "编辑"
 
-#: ../lib/modules.inc:1281
+#: ../lib/modules.inc:1287
 msgid "Edit again"
 msgstr "再次编辑"
 
@@ -3040,11 +3052,11 @@ msgstr "再次编辑"
 msgid "Edit general settings"
 msgstr "编辑通用设置"
 
-#: ../lib/modules/posixAccount.inc:1137
+#: ../lib/modules/posixAccount.inc:1157
 msgid "Edit groups"
 msgstr "编辑组"
 
-#: ../lib/modules/posixGroup.inc:200
+#: ../lib/modules/posixGroup.inc:202
 msgid "Edit members"
 msgstr "编辑成员"
 
@@ -3056,11 +3068,11 @@ msgstr "编辑自动服务功能"
 msgid "Edit server profiles"
 msgstr "编辑服务器配置文件"
 
-#: ../lib/modules/nisnetgroup.inc:198
+#: ../lib/modules/nisnetgroup.inc:201
 msgid "Edit subgroups"
 msgstr "编辑分组"
 
-#: ../lib/modules/sambaSamAccount.inc:1177
+#: ../lib/modules/sambaSamAccount.inc:1182
 msgid "Edit workstations"
 msgstr "编辑工作站"
 
@@ -3075,8 +3087,8 @@ msgid "Email"
 msgstr "电子邮件"
 
 #: ../templates/lists/changePassword.php:256
-#: ../lib/modules/selfRegistration.inc:332
-#: ../lib/modules/selfRegistration.inc:407
+#: ../lib/modules/selfRegistration.inc:342
+#: ../lib/modules/selfRegistration.inc:417
 #: ../lib/modules/zarafaDynamicGroup.inc:60
 #: ../lib/modules/zarafaDynamicGroup.inc:61
 #: ../lib/modules/zarafaDynamicGroup.inc:113
@@ -3089,25 +3101,25 @@ msgstr "电子邮件"
 #: ../lib/modules/zarafaGroup.inc:171
 #: ../lib/modules/zarafaGroup.inc:187
 #: ../lib/modules/zarafaGroup.inc:621
-#: ../lib/modules/inetOrgPerson.inc:60
-#: ../lib/modules/inetOrgPerson.inc:123
-#: ../lib/modules/inetOrgPerson.inc:159
-#: ../lib/modules/inetOrgPerson.inc:260
-#: ../lib/modules/inetOrgPerson.inc:441
-#: ../lib/modules/inetOrgPerson.inc:558
-#: ../lib/modules/inetOrgPerson.inc:685
+#: ../lib/modules/inetOrgPerson.inc:61
+#: ../lib/modules/inetOrgPerson.inc:124
+#: ../lib/modules/inetOrgPerson.inc:164
+#: ../lib/modules/inetOrgPerson.inc:265
+#: ../lib/modules/inetOrgPerson.inc:445
+#: ../lib/modules/inetOrgPerson.inc:562
 #: ../lib/modules/inetOrgPerson.inc:689
-#: ../lib/modules/inetOrgPerson.inc:1629
-#: ../lib/modules/inetOrgPerson.inc:2076
-#: ../lib/modules/inetOrgPerson.inc:2548
+#: ../lib/modules/inetOrgPerson.inc:693
+#: ../lib/modules/inetOrgPerson.inc:1633
+#: ../lib/modules/inetOrgPerson.inc:2080
+#: ../lib/modules/inetOrgPerson.inc:2565
 #: ../lib/modules/asteriskVoicemail.inc:98
 #: ../lib/modules/asteriskVoicemail.inc:131
 #: ../lib/modules/asteriskVoicemail.inc:169
 #: ../lib/modules/asteriskVoicemail.inc:261
 #: ../lib/modules/asteriskVoicemail.inc:410
-#: ../lib/modules/imapAccess.inc:206
-#: ../lib/modules/passwordSelfReset.inc:672
-#: ../lib/modules/passwordSelfReset.inc:783
+#: ../lib/modules/imapAccess.inc:207
+#: ../lib/modules/passwordSelfReset.inc:676
+#: ../lib/modules/passwordSelfReset.inc:787
 msgid "Email address"
 msgstr "电子邮件地址"
 
@@ -3117,29 +3129,29 @@ msgstr "此语音邮件帐号的电子邮件地址"
 
 #: ../lib/modules/zarafaContact.inc:73
 #: ../lib/modules/zarafaUser.inc:109
-#: ../lib/modules/kolabUser.inc:139
+#: ../lib/modules/kolabUser.inc:121
 msgid "Email alias"
 msgstr "电子邮件别名"
 
 #: ../lib/modules/zarafaContact.inc:74
 #: ../lib/modules/zarafaUser.inc:110
-#: ../lib/modules/kolabUser.inc:140
+#: ../lib/modules/kolabUser.inc:122
 msgid "Email alias for this account."
 msgstr "此帐号的电子邮件别名"
 
 #: ../lib/modules/zarafaContact.inc:157
 #: ../lib/modules/zarafaContact.inc:158
-#: ../lib/modules/zarafaUser.inc:418
-#: ../lib/modules/zarafaUser.inc:419
-#: ../lib/modules/kolabUser.inc:231
+#: ../lib/modules/zarafaUser.inc:420
+#: ../lib/modules/zarafaUser.inc:421
+#: ../lib/modules/kolabUser.inc:180
 msgid "Email alias is invalid!"
 msgstr "电子邮件别名非法!"
 
-#: ../lib/modules/kolabUser.inc:143
+#: ../lib/modules/kolabUser.inc:125
 msgid "Email alias list"
 msgstr "电子邮件别名列表"
 
-#: ../lib/modules/kolabUser.inc:232
+#: ../lib/modules/kolabUser.inc:181
 msgid "Email alias list has invalid format!"
 msgstr "电子邮件别名列表格式非法!"
 
@@ -3164,37 +3176,37 @@ msgstr "电子邮件别名列表格式非法!"
 #: ../lib/modules/zarafaUser.inc:207
 #: ../lib/modules/zarafaUser.inc:389
 #: ../lib/modules/zarafaUser.inc:401
-#: ../lib/modules/zarafaUser.inc:444
-#: ../lib/modules/zarafaUser.inc:1342
-#: ../lib/modules/zarafaUser.inc:1560
-#: ../lib/modules/kolabUser.inc:189
-#: ../lib/modules/kolabUser.inc:217
-#: ../lib/modules/kolabUser.inc:354
-#: ../lib/modules/kolabUser.inc:805
+#: ../lib/modules/zarafaUser.inc:446
+#: ../lib/modules/zarafaUser.inc:1344
+#: ../lib/modules/zarafaUser.inc:1571
+#: ../lib/modules/kolabUser.inc:153
+#: ../lib/modules/kolabUser.inc:168
+#: ../lib/modules/kolabUser.inc:275
+#: ../lib/modules/kolabUser.inc:648
 msgid "Email aliases"
 msgstr "电子邮件别名"
 
-#: ../lib/modules/inetOrgPerson.inc:276
-#: ../lib/modules/inetOrgPerson.inc:337
-#: ../lib/modules/inetOrgPerson.inc:585
-#: ../lib/modules/inetOrgPerson.inc:781
-#: ../lib/modules/inetOrgPerson.inc:1693
-#: ../lib/modules/inetOrgPerson.inc:2086
+#: ../lib/modules/inetOrgPerson.inc:281
+#: ../lib/modules/inetOrgPerson.inc:341
+#: ../lib/modules/inetOrgPerson.inc:589
+#: ../lib/modules/inetOrgPerson.inc:785
+#: ../lib/modules/inetOrgPerson.inc:1697
+#: ../lib/modules/inetOrgPerson.inc:2090
 msgid "Employee number"
 msgstr "雇员号"
 
-#: ../lib/modules/inetOrgPerson.inc:72
-#: ../lib/modules/inetOrgPerson.inc:174
-#: ../lib/modules/inetOrgPerson.inc:266
-#: ../lib/modules/inetOrgPerson.inc:345
-#: ../lib/modules/inetOrgPerson.inc:570
-#: ../lib/modules/inetOrgPerson.inc:617
-#: ../lib/modules/inetOrgPerson.inc:1698
-#: ../lib/modules/inetOrgPerson.inc:2065
+#: ../lib/modules/inetOrgPerson.inc:73
+#: ../lib/modules/inetOrgPerson.inc:179
+#: ../lib/modules/inetOrgPerson.inc:271
+#: ../lib/modules/inetOrgPerson.inc:349
+#: ../lib/modules/inetOrgPerson.inc:574
+#: ../lib/modules/inetOrgPerson.inc:621
+#: ../lib/modules/inetOrgPerson.inc:1702
+#: ../lib/modules/inetOrgPerson.inc:2069
 msgid "Employee type"
 msgstr "雇员类型"
 
-#: ../lib/modules/inetOrgPerson.inc:618
+#: ../lib/modules/inetOrgPerson.inc:622
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇员类型: 承包商,雇员,实习生,临时工,外部员工,..."
 
@@ -3204,8 +3216,8 @@ msgstr "雇员类型: 承包商,雇员,实习生,临时工,外部员工,..."
 msgid "Empty password submitted. Please try again."
 msgstr "提交了空密码,请重试."
 
-#: ../lib/modules/passwordSelfReset.inc:77
-#: ../lib/modules/passwordSelfReset.inc:161
+#: ../lib/modules/passwordSelfReset.inc:78
+#: ../lib/modules/passwordSelfReset.inc:162
 msgid "Enable password self reset link"
 msgstr "打开密码自助复位链接"
 
@@ -3214,7 +3226,7 @@ msgstr "打开密码自助复位链接"
 msgid "Enable self registration link"
 msgstr "打开自助注册链接"
 
-#: ../lib/modules/ppolicy.inc:89
+#: ../lib/modules/ppolicy.inc:90
 msgid "Enables quality checking (e.g. password length) of passwords. If set to \"force\" then you need to disable password hashing in your LAM server profile to change passwords with LAM."
 msgstr "打开密码质量（比如密码长度）检查。如果设置为“强制”，则必须在LAM的服务器配置中关闭密码哈希，才能用LAM更改密码。"
 
@@ -3222,16 +3234,16 @@ msgstr "打开密码质量（比如密码长度）检查。如果设置为“强
 msgid "Encountered an error while performing search."
 msgstr "检索时发生错误."
 
-#: ../lib/modules/imapAccess.inc:72
-#: ../lib/modules/imapAccess.inc:107
+#: ../lib/modules/imapAccess.inc:73
+#: ../lib/modules/imapAccess.inc:108
 msgid "Encryption protocol"
 msgstr "加密协议"
 
-#: ../lib/modules/imapAccess.inc:73
+#: ../lib/modules/imapAccess.inc:74
 msgid "Encryption protocol for connecting to IMAP server. LAM requires an encrypted connection."
 msgstr "连接到IMAP的加密协议。LAM需要加密的连接。"
 
-#: ../lib/modules/sambaSamAccount.inc:527
+#: ../lib/modules/sambaSamAccount.inc:532
 msgid "Eniwetok, Kwajalein"
 msgstr "埃尼威托克,瓜加林"
 
@@ -3239,12 +3251,12 @@ msgstr "埃尼威托克,瓜加林"
 msgid "Enter the values you would like to add:"
 msgstr "输入想增加的值:"
 
-#: ../lib/modules/eduPerson.inc:105
-#: ../lib/modules/eduPerson.inc:109
-#: ../lib/modules/eduPerson.inc:173
-#: ../lib/modules/eduPerson.inc:204
-#: ../lib/modules/eduPerson.inc:335
-#: ../lib/modules/eduPerson.inc:681
+#: ../lib/modules/eduPerson.inc:106
+#: ../lib/modules/eduPerson.inc:110
+#: ../lib/modules/eduPerson.inc:174
+#: ../lib/modules/eduPerson.inc:205
+#: ../lib/modules/eduPerson.inc:336
+#: ../lib/modules/eduPerson.inc:682
 msgid "Entitlements"
 msgstr "授权"
 
@@ -3252,7 +3264,7 @@ msgstr "授权"
 msgid "Entries found"
 msgstr "个条目被发现"
 
-#: ../templates/serverInfo.php:267
+#: ../templates/serverInfo.php:269
 msgid "Entries sent"
 msgstr "条已经被发送"
 
@@ -3279,12 +3291,22 @@ msgstr "条目建立"
 msgid "Entry does not exist"
 msgstr "条目不存在"
 
-#: ../templates/schema/schema.php:164
+#: ../lib/modules/puppetClient.inc:73
+#: ../lib/modules/puppetClient.inc:77
+#: ../lib/modules/puppetClient.inc:121
+#: ../lib/modules/puppetClient.inc:146
+#: ../lib/modules/puppetClient.inc:154
+#: ../lib/modules/puppetClient.inc:232
+#: ../lib/modules/puppetClient.inc:422
+msgid "Environment"
+msgstr "环境"
+
+#: ../templates/schema/schema.php:166
 msgid "Equality"
 msgstr "相等"
 
-#: ../lib/modules/zarafaUser.inc:530
-#: ../lib/modules/zarafaUser.inc:1293
+#: ../lib/modules/zarafaUser.inc:532
+#: ../lib/modules/zarafaUser.inc:1295
 msgid "Equipment"
 msgstr "设备"
 
@@ -3304,7 +3326,7 @@ msgstr "错误"
 msgid "Error number"
 msgstr "错误号"
 
-#: ../lib/modules/heimdalKerberos.inc:1034
+#: ../lib/modules/heimdalKerberos.inc:1035
 msgid "Error while changing Kerberos password."
 msgstr "在修改Kerberos密码时发生错误."
 
@@ -3322,7 +3344,7 @@ msgstr "每个帐号类型都需要一个基本模块,这个模块提供一个
 #: ../lib/modules/selfRegistration.inc:124
 #: ../lib/modules/zarafaContact.inc:87
 #: ../lib/modules/zarafaGroup.inc:89
-#: ../lib/modules/dhcp_settings.inc:532
+#: ../lib/modules/dhcp_settings.inc:539
 #: ../lib/modules/zarafaUser.inc:131
 #: ../help/help.inc:74
 #: ../help/help.inc:80
@@ -3332,8 +3354,8 @@ msgstr "每个帐号类型都需要一个基本模块,这个模块提供一个
 msgid "Example"
 msgstr "示例"
 
-#: ../templates/masscreate.php:288
-#: ../templates/masscreate.php:363
+#: ../templates/masscreate.php:293
+#: ../templates/masscreate.php:368
 msgid "Example value"
 msgstr "示例值"
 
@@ -3345,16 +3367,16 @@ msgstr "示例"
 msgid "Execute"
 msgstr "运行"
 
-#: ../templates/tests/lamdaemonTest.php:261
+#: ../templates/tests/lamdaemonTest.php:263
 msgid "Execute lamdaemon"
 msgstr "运行 lamdaemon"
 
-#: ../lib/modules/freeRadius.inc:96
-#: ../lib/modules/freeRadius.inc:122
-#: ../lib/modules/freeRadius.inc:201
-#: ../lib/modules/freeRadius.inc:229
-#: ../lib/modules/freeRadius.inc:431
-#: ../lib/modules/freeRadius.inc:628
+#: ../lib/modules/freeRadius.inc:97
+#: ../lib/modules/freeRadius.inc:123
+#: ../lib/modules/freeRadius.inc:202
+#: ../lib/modules/freeRadius.inc:230
+#: ../lib/modules/freeRadius.inc:432
+#: ../lib/modules/freeRadius.inc:629
 msgid "Expiration date"
 msgstr "过期时间"
 
@@ -3372,11 +3394,11 @@ msgid "Expiration timestamp (\"regseconds\" option)."
 msgstr "过期时间戳(\"regseconds\"选项)"
 
 #: ../lib/types/ppolicyType.inc:86
-#: ../lib/modules/ppolicy.inc:108
-#: ../lib/modules/ppolicy.inc:140
-#: ../lib/modules/ppolicy.inc:166
-#: ../lib/modules/ppolicy.inc:206
-#: ../lib/modules/ppolicy.inc:481
+#: ../lib/modules/ppolicy.inc:109
+#: ../lib/modules/ppolicy.inc:141
+#: ../lib/modules/ppolicy.inc:167
+#: ../lib/modules/ppolicy.inc:207
+#: ../lib/modules/ppolicy.inc:482
 msgid "Expire warning"
 msgstr "密码过期告警"
 
@@ -3399,7 +3421,7 @@ msgstr "导出格式"
 msgid "Export subtree"
 msgstr "导出子树"
 
-#: ../templates/serverInfo.php:347
+#: ../templates/serverInfo.php:349
 msgid "Extended"
 msgstr "扩展"
 
@@ -3410,25 +3432,25 @@ msgstr "扩展总计:%s"
 
 #: ../lib/types/asteriskExt.inc:94
 #: ../lib/types/asteriskExt.inc:158
-#: ../lib/modules/asteriskExtension.inc:94
-#: ../lib/modules/asteriskExtension.inc:129
-#: ../lib/modules/asteriskExtension.inc:137
-#: ../lib/modules/asteriskExtension.inc:281
-#: ../lib/modules/asteriskExtension.inc:285
-#: ../lib/modules/asteriskExtension.inc:800
+#: ../lib/modules/asteriskExtension.inc:95
+#: ../lib/modules/asteriskExtension.inc:130
+#: ../lib/modules/asteriskExtension.inc:138
+#: ../lib/modules/asteriskExtension.inc:282
+#: ../lib/modules/asteriskExtension.inc:286
+#: ../lib/modules/asteriskExtension.inc:809
 msgid "Extension name"
 msgstr "扩展名"
 
-#: ../lib/modules/asteriskExtension.inc:106
-#: ../lib/modules/asteriskExtension.inc:130
-#: ../lib/modules/asteriskExtension.inc:151
-#: ../lib/modules/asteriskExtension.inc:225
-#: ../lib/modules/asteriskExtension.inc:466
-#: ../lib/modules/asteriskExtension.inc:803
+#: ../lib/modules/asteriskExtension.inc:107
+#: ../lib/modules/asteriskExtension.inc:131
+#: ../lib/modules/asteriskExtension.inc:152
+#: ../lib/modules/asteriskExtension.inc:226
+#: ../lib/modules/asteriskExtension.inc:474
+#: ../lib/modules/asteriskExtension.inc:812
 msgid "Extension owners"
 msgstr "扩展属主"
 
-#: ../lib/modules/asteriskExtension.inc:182
+#: ../lib/modules/asteriskExtension.inc:183
 msgid "Extension with this name already exists."
 msgstr "扩展名已经存在!"
 
@@ -3441,34 +3463,34 @@ msgid "Failed to create entry!"
 msgstr "新增条目失败!"
 
 #: ../lib/types/ppolicyType.inc:85
-#: ../lib/modules/ppolicy.inc:104
-#: ../lib/modules/ppolicy.inc:145
-#: ../lib/modules/ppolicy.inc:165
-#: ../lib/modules/ppolicy.inc:272
-#: ../lib/modules/ppolicy.inc:480
+#: ../lib/modules/ppolicy.inc:105
+#: ../lib/modules/ppolicy.inc:146
+#: ../lib/modules/ppolicy.inc:166
+#: ../lib/modules/ppolicy.inc:273
+#: ../lib/modules/ppolicy.inc:481
 msgid "Failure count interval"
 msgstr "失败记录间隔"
 
-#: ../lib/modules/inetOrgPerson.inc:58
-#: ../lib/modules/inetOrgPerson.inc:124
-#: ../lib/modules/inetOrgPerson.inc:156
-#: ../lib/modules/inetOrgPerson.inc:258
-#: ../lib/modules/inetOrgPerson.inc:433
-#: ../lib/modules/inetOrgPerson.inc:555
-#: ../lib/modules/inetOrgPerson.inc:677
+#: ../lib/modules/inetOrgPerson.inc:59
+#: ../lib/modules/inetOrgPerson.inc:125
+#: ../lib/modules/inetOrgPerson.inc:161
+#: ../lib/modules/inetOrgPerson.inc:263
+#: ../lib/modules/inetOrgPerson.inc:437
+#: ../lib/modules/inetOrgPerson.inc:559
 #: ../lib/modules/inetOrgPerson.inc:681
-#: ../lib/modules/inetOrgPerson.inc:1603
-#: ../lib/modules/inetOrgPerson.inc:2075
-#: ../lib/modules/inetOrgPerson.inc:2583
+#: ../lib/modules/inetOrgPerson.inc:685
+#: ../lib/modules/inetOrgPerson.inc:1607
+#: ../lib/modules/inetOrgPerson.inc:2079
+#: ../lib/modules/inetOrgPerson.inc:2620
 msgid "Fax number"
 msgstr "传真号"
 
 #: ../lib/modules/zarafaUser.inc:140
 #: ../lib/modules/zarafaUser.inc:186
 #: ../lib/modules/zarafaUser.inc:395
-#: ../lib/modules/zarafaUser.inc:639
-#: ../lib/modules/zarafaUser.inc:1356
-#: ../lib/modules/zarafaUser.inc:1401
+#: ../lib/modules/zarafaUser.inc:641
+#: ../lib/modules/zarafaUser.inc:1358
+#: ../lib/modules/zarafaUser.inc:1403
 msgid "Features"
 msgstr "功能"
 
@@ -3479,7 +3501,7 @@ msgstr "功能"
 msgid "File"
 msgstr "文件"
 
-#: ../lib/modules/sambaSamAccount.inc:290
+#: ../lib/modules/sambaSamAccount.inc:295
 msgid "File name and path relative to netlogon-share which should be executed on logon. $user and $group are replaced with user and group name."
 msgstr "用户登录时自动运行的文件名和网络登录共享相对路径,$user和$group会被用户名和组名替换"
 
@@ -3492,11 +3514,11 @@ msgstr "用户登录时自动运行的文件名和网络登录共享相对路径
 msgid "File path"
 msgstr "文件路径"
 
-#: ../templates/masscreate.php:231
+#: ../templates/masscreate.php:236
 #: ../lib/tools/fileUpload.inc:44
-#: ../lib/types/automountType.inc:208
-#: ../lib/types/dhcp.inc:253
-#: ../lib/lists.inc:702
+#: ../lib/types/automountType.inc:241
+#: ../lib/types/dhcp.inc:255
+#: ../lib/lists.inc:703
 msgid "File upload"
 msgstr "文件上传"
 
@@ -3515,8 +3537,8 @@ msgstr "文件上传"
 #: ../lib/modules/zarafaAddressList.inc:181
 #: ../lib/modules/zarafaAddressList.inc:325
 #: ../lib/modules/zarafaUser.inc:125
-#: ../lib/modules/nisnetgroup.inc:94
-#: ../lib/modules/nisnetgroup.inc:467
+#: ../lib/modules/nisnetgroup.inc:97
+#: ../lib/modules/nisnetgroup.inc:470
 #: ../lib/lists.inc:347
 #: ../help/help.inc:150
 msgid "Filter"
@@ -3529,23 +3551,23 @@ msgstr "进行过滤"
 #: ../lib/types/user.inc:96
 #: ../lib/modules/selfRegistration.inc:68
 #: ../lib/modules/selfRegistration.inc:125
-#: ../lib/modules/inetOrgPerson.inc:48
-#: ../lib/modules/inetOrgPerson.inc:122
-#: ../lib/modules/inetOrgPerson.inc:298
-#: ../lib/modules/inetOrgPerson.inc:512
-#: ../lib/modules/inetOrgPerson.inc:609
-#: ../lib/modules/inetOrgPerson.inc:1239
-#: ../lib/modules/inetOrgPerson.inc:2063
-#: ../lib/modules/inetOrgPerson.inc:2534
+#: ../lib/modules/inetOrgPerson.inc:49
+#: ../lib/modules/inetOrgPerson.inc:123
+#: ../lib/modules/inetOrgPerson.inc:302
+#: ../lib/modules/inetOrgPerson.inc:516
+#: ../lib/modules/inetOrgPerson.inc:613
+#: ../lib/modules/inetOrgPerson.inc:1243
+#: ../lib/modules/inetOrgPerson.inc:2067
+#: ../lib/modules/inetOrgPerson.inc:2543
 msgid "First name"
 msgstr "名字"
 
-#: ../lib/modules/inetOrgPerson.inc:48
 #: ../lib/modules/inetOrgPerson.inc:49
+#: ../lib/modules/inetOrgPerson.inc:50
 msgid "First name contains invalid characters!"
 msgstr "名字包含非法字符"
 
-#: ../lib/modules/inetOrgPerson.inc:610
+#: ../lib/modules/inetOrgPerson.inc:614
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "用户名字只允许字母,-和空格"
 
@@ -3557,11 +3579,11 @@ msgstr "固定IP地址"
 msgid "Fixed list"
 msgstr "固定列表"
 
-#: ../lib/modules/kolabUser.inc:124
+#: ../lib/modules/kolabUser.inc:106
 msgid "For automatic invitation handling."
 msgstr "自动处理邀请."
 
-#: ../lib/modules/nisnetgroup.inc:91
+#: ../lib/modules/nisnetgroup.inc:94
 msgid "For the upload please specify the entries in the format \"(HOST,USER,DOMAIN)\". Multiple entries are separated by semicolon."
 msgstr "上传请使用\"(主机,用户,域)\"格式来编写条目.多条目请用分号隔开."
 
@@ -3569,12 +3591,12 @@ msgstr "上传请使用\"(主机,用户,域)\"格式来编写条目.多条目请
 #: ../lib/modules/shadowAccount.inc:358
 #: ../lib/modules/heimdalKerberos.inc:120
 #: ../lib/modules/heimdalKerberos.inc:338
-#: ../lib/modules.inc:1004
+#: ../lib/modules.inc:1010
 #: ../help/help.inc:170
 msgid "Force password change"
 msgstr "强制改变密码"
 
-#: ../lib/modules/passwordSelfReset.inc:615
+#: ../lib/modules/passwordSelfReset.inc:619
 msgid "Forgot password?"
 msgstr "忘记密码?"
 
@@ -3583,36 +3605,20 @@ msgstr "忘记密码?"
 msgid "Format"
 msgstr "格式"
 
-#: ../lib/modules/kolabUser.inc:87
-#: ../lib/modules/kolabUser.inc:116
-#: ../lib/modules/kolabUser.inc:155
-#: ../lib/modules/kolabUser.inc:201
-#: ../lib/modules/kolabUser.inc:219
-#: ../lib/modules/kolabUser.inc:314
-#: ../lib/modules/kolabUser.inc:783
-#: ../lib/modules/kolabUser.inc:839
-msgid "Free/Busy interval"
-msgstr "空闲/忙碌 间隔"
-
-#: ../lib/modules/kolabUser.inc:239
-#: ../lib/modules/kolabUser.inc:240
-msgid "Free/Busy interval must be a number!"
-msgstr "空闲/忙碌间隔必须是一个数字!"
-
-#: ../lib/modules/freeRadius.inc:66
+#: ../lib/modules/freeRadius.inc:67
 msgid "FreeRadius"
 msgstr "FreeRadius"
 
-#: ../lib/modules/sambaSamAccount.inc:1312
+#: ../lib/modules/sambaSamAccount.inc:1317
 msgid "Friday"
 msgstr "星期五"
 
 #: ../templates/config/confmain.php:319
 #: ../lib/modules/selfRegistration.inc:75
 #: ../lib/modules/selfRegistration.inc:131
-#: ../lib/modules/passwordSelfReset.inc:97
-#: ../lib/modules/passwordSelfReset.inc:190
-#: ../lib/modules/passwordSelfReset.inc:206
+#: ../lib/modules/passwordSelfReset.inc:98
+#: ../lib/modules/passwordSelfReset.inc:191
+#: ../lib/modules/passwordSelfReset.inc:207
 #: ../help/help.inc:198
 msgid "From address"
 msgstr "收件人地址"
@@ -3674,48 +3680,48 @@ msgstr "Asterisk语音邮箱的全名."
 msgid "Function"
 msgstr "功能"
 
-#: ../lib/modules/inetOrgPerson.inc:379
+#: ../lib/modules/inetOrgPerson.inc:383
 msgid "GB-12345"
 msgstr "GB-12345"
 
 #: ../lib/types/host.inc:96
 #: ../lib/types/group.inc:93
 #: ../lib/types/user.inc:93
-#: ../lib/modules/posixGroup.inc:186
-#: ../lib/modules/posixGroup.inc:341
-#: ../lib/modules/posixGroup.inc:354
-#: ../lib/modules/posixGroup.inc:396
-#: ../lib/modules/posixGroup.inc:416
-#: ../lib/modules/posixGroup.inc:465
-#: ../lib/modules/posixGroup.inc:485
-#: ../lib/modules/posixAccount.inc:99
-#: ../lib/modules/posixAccount.inc:315
-#: ../lib/modules/posixAccount.inc:1493
+#: ../lib/modules/posixGroup.inc:188
+#: ../lib/modules/posixGroup.inc:344
+#: ../lib/modules/posixGroup.inc:357
+#: ../lib/modules/posixGroup.inc:399
+#: ../lib/modules/posixGroup.inc:419
+#: ../lib/modules/posixGroup.inc:472
+#: ../lib/modules/posixGroup.inc:496
+#: ../lib/modules/posixAccount.inc:109
+#: ../lib/modules/posixAccount.inc:329
+#: ../lib/modules/posixAccount.inc:1513
 #: ../lib/modules/sambaGroupMapping.inc:321
 #: ../lib/modules/sambaGroupMapping.inc:390
 msgid "GID number"
 msgstr "GID编号"
 
-#: ../lib/modules/posixGroup.inc:485
+#: ../lib/modules/posixGroup.inc:496
 msgid "GID number has changed. Please select checkbox to change GID number of users and hosts."
 msgstr "GID的编号已经更改,请点击选择框来改变用户GID号"
 
-#: ../lib/modules/posixAccount.inc:99
+#: ../lib/modules/posixAccount.inc:109
 #, php-format
 msgid "GID number has changed. To keep file ownership you have to run the following command as root: 'find / -gid %s -uid %s -exec chgrp %s {} \\;'"
 msgstr "GID已经更改,要保持文件属性一,你必须以root身份运行以下命令: 'find / -gid %s -uid %s -exec chgrp %s {} \\;'"
 
-#: ../lib/modules/posixGroup.inc:492
+#: ../lib/modules/posixGroup.inc:503
 msgid "GID number has to be a numeric value!"
 msgstr "GID号必须使用数字"
 
-#: ../lib/modules/posixAccount.inc:265
-#: ../lib/modules/posixAccount.inc:305
-#: ../lib/modules/posixAccount.inc:316
-#: ../lib/modules/posixAccount.inc:375
-#: ../lib/modules/posixAccount.inc:413
-#: ../lib/modules/posixAccount.inc:1125
-#: ../lib/modules/posixAccount.inc:1500
+#: ../lib/modules/posixAccount.inc:279
+#: ../lib/modules/posixAccount.inc:319
+#: ../lib/modules/posixAccount.inc:330
+#: ../lib/modules/posixAccount.inc:393
+#: ../lib/modules/posixAccount.inc:431
+#: ../lib/modules/posixAccount.inc:1145
+#: ../lib/modules/posixAccount.inc:1520
 msgid "Gecos"
 msgstr "备注(Gecos)"
 
@@ -3727,8 +3733,8 @@ msgstr "一般信息"
 #: ../templates/config/confmain.php:193
 #: ../templates/config/moduleSettings.php:154
 #: ../templates/config/conftypes.php:173
-#: ../templates/selfService/adminMain.php:360
-#: ../templates/profedit/profilepage.php:204
+#: ../templates/selfService/adminMain.php:374
+#: ../templates/profedit/profilepage.php:210
 msgid "General settings"
 msgstr "通用设置"
 
@@ -3742,14 +3748,10 @@ msgstr "生成随机密码"
 msgid "Generic Error"
 msgstr "一般性错误"
 
-#: ../lib/modules/kolabUser.inc:178
-msgid "Germany"
-msgstr "德国"
-
-#: ../templates/schema/schema.php:126
-#: ../templates/schema/schema.php:263
-#: ../templates/schema/schema.php:294
-#: ../templates/schema/schema.php:319
+#: ../templates/schema/schema.php:128
+#: ../templates/schema/schema.php:265
+#: ../templates/schema/schema.php:296
+#: ../templates/schema/schema.php:321
 msgid "Go"
 msgstr "开始"
 
@@ -3765,34 +3767,34 @@ msgid "Go to"
 msgstr "到"
 
 #: ../lib/types/ppolicyType.inc:82
-#: ../lib/modules/ppolicy.inc:92
-#: ../lib/modules/ppolicy.inc:141
-#: ../lib/modules/ppolicy.inc:162
-#: ../lib/modules/ppolicy.inc:214
-#: ../lib/modules/ppolicy.inc:477
+#: ../lib/modules/ppolicy.inc:93
+#: ../lib/modules/ppolicy.inc:142
+#: ../lib/modules/ppolicy.inc:163
+#: ../lib/modules/ppolicy.inc:215
+#: ../lib/modules/ppolicy.inc:478
 msgid "Grace authentication limit"
 msgstr "缓期认证限制"
 
-#: ../lib/modules/quota.inc:117
-#: ../lib/modules/quota.inc:393
+#: ../lib/modules/quota.inc:118
+#: ../lib/modules/quota.inc:396
 msgid "Grace block period"
 msgstr "块限制宽限周期"
 
-#: ../lib/modules/quota.inc:118
+#: ../lib/modules/quota.inc:119
 msgid "Grace block period. Most filesystems use a fixed maximum value of 7 days."
 msgstr "块限制宽限周期,大部分文件系统都使用最大值7天."
 
-#: ../lib/modules/quota.inc:140
+#: ../lib/modules/quota.inc:141
 msgid "Grace inode (files) period. Most filesystems use a fixed maximum value of 7 days."
 msgstr "节点限制的宽限期,大部分文件系统都使用最大值7天."
 
-#: ../lib/modules/quota.inc:139
-#: ../lib/modules/quota.inc:397
+#: ../lib/modules/quota.inc:140
+#: ../lib/modules/quota.inc:400
 msgid "Grace inode period"
 msgstr "节点限制宽限期"
 
 #: ../templates/config/confmain.php:300
-#: ../templates/selfService/adminMain.php:513
+#: ../templates/selfService/adminMain.php:540
 msgid "Group"
 msgstr "组"
 
@@ -3800,7 +3802,7 @@ msgstr "组"
 msgid "Group accounts (e.g. Unix and Samba)"
 msgstr "组帐号(比如unix和samba)"
 
-#: ../lib/types/gon.inc:178
+#: ../lib/types/gon.inc:180
 #: ../lib/types/zarafaDynamicGroupType.inc:165
 #: ../lib/types/group.inc:204
 #: ../lib/types/netgroup.inc:169
@@ -3809,12 +3811,12 @@ msgid "Group count: %s"
 msgstr "帐号总计:%s"
 
 #: ../lib/types/group.inc:96
-#: ../lib/modules/posixGroup.inc:387
-#: ../lib/modules/nisnetgroup.inc:110
+#: ../lib/modules/posixGroup.inc:390
+#: ../lib/modules/nisnetgroup.inc:113
 msgid "Group description"
 msgstr "组说明"
 
-#: ../lib/modules/posixGroup.inc:401
+#: ../lib/modules/posixGroup.inc:404
 msgid "Group description. If left empty group name will be used."
 msgstr "组说明,若空则会使用组名来替代."
 
@@ -3826,13 +3828,13 @@ msgstr "组成员DN"
 
 #: ../templates/3rdParty/pla/htdocs/modify_member_form.php:94
 #: ../lib/types/group.inc:94
-#: ../lib/modules/posixGroup.inc:199
-#: ../lib/modules/posixGroup.inc:249
-#: ../lib/modules/posixGroup.inc:342
-#: ../lib/modules/posixGroup.inc:360
-#: ../lib/modules/posixGroup.inc:404
-#: ../lib/modules/posixGroup.inc:408
-#: ../lib/modules/posixGroup.inc:466
+#: ../lib/modules/posixGroup.inc:201
+#: ../lib/modules/posixGroup.inc:251
+#: ../lib/modules/posixGroup.inc:345
+#: ../lib/modules/posixGroup.inc:363
+#: ../lib/modules/posixGroup.inc:407
+#: ../lib/modules/posixGroup.inc:411
+#: ../lib/modules/posixGroup.inc:473
 msgid "Group members"
 msgstr "组成员"
 
@@ -3847,20 +3849,20 @@ msgstr "组成员"
 #: ../lib/modules/zarafaDynamicGroup.inc:170
 #: ../lib/modules/zarafaDynamicGroup.inc:194
 #: ../lib/modules/zarafaDynamicGroup.inc:444
-#: ../lib/modules/posixGroup.inc:176
-#: ../lib/modules/posixGroup.inc:345
-#: ../lib/modules/posixGroup.inc:375
-#: ../lib/modules/posixGroup.inc:424
-#: ../lib/modules/posixGroup.inc:464
-#: ../lib/modules/posixGroup.inc:493
-#: ../lib/modules/posixGroup.inc:494
-#: ../lib/modules/posixGroup.inc:495
-#: ../lib/modules/nisnetgroup.inc:73
-#: ../lib/modules/nisnetgroup.inc:102
-#: ../lib/modules/nisnetgroup.inc:129
-#: ../lib/modules/nisnetgroup.inc:141
-#: ../lib/modules/nisnetgroup.inc:183
-#: ../lib/modules/nisnetgroup.inc:572
+#: ../lib/modules/posixGroup.inc:178
+#: ../lib/modules/posixGroup.inc:348
+#: ../lib/modules/posixGroup.inc:378
+#: ../lib/modules/posixGroup.inc:427
+#: ../lib/modules/posixGroup.inc:471
+#: ../lib/modules/posixGroup.inc:504
+#: ../lib/modules/posixGroup.inc:505
+#: ../lib/modules/posixGroup.inc:506
+#: ../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:575
 #: ../lib/modules/groupOfNames.inc:60
 #: ../lib/modules/groupOfNames.inc:92
 #: ../lib/modules/groupOfNames.inc:129
@@ -3874,13 +3876,13 @@ msgstr "组名已经被使用"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:170
 #: ../lib/modules/zarafaDynamicGroup.inc:171
-#: ../lib/modules/posixGroup.inc:495
-#: ../lib/modules/posixGroup.inc:496
-#: ../lib/modules/nisnetgroup.inc:141
+#: ../lib/modules/posixGroup.inc:506
+#: ../lib/modules/posixGroup.inc:507
+#: ../lib/modules/nisnetgroup.inc:144
 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:494
+#: ../lib/modules/posixGroup.inc:505
 msgid "Group name in use. Selected next free group name."
 msgstr "组名已被使用,请选择可用的组名."
 
@@ -3888,34 +3890,34 @@ msgstr "组名已被使用,请选择可用的组名."
 msgid "Group name of the group which should be created. Valid characters are: a-z, A-Z, 0-9 and .-_ ."
 msgstr "将要建立的组名,可用字符为: a-z, A-Z, 0-9,及 -或_ "
 
-#: ../lib/modules/posixGroup.inc:425
+#: ../lib/modules/posixGroup.inc:428
 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 with a number. The next free number will be used."
 msgstr "将要建立的组名,可用字符为:a-z,A-Z,0-9,.-_ .如果该组名存在,会在组名末尾增加下一个可以使用的数字。"
 
-#: ../lib/modules/freeRadius.inc:88
-#: ../lib/modules/freeRadius.inc:92
-#: ../lib/modules/freeRadius.inc:120
-#: ../lib/modules/freeRadius.inc:146
-#: ../lib/modules/freeRadius.inc:177
-#: ../lib/modules/freeRadius.inc:226
-#: ../lib/modules/freeRadius.inc:280
-#: ../lib/modules/freeRadius.inc:625
+#: ../lib/modules/freeRadius.inc:89
+#: ../lib/modules/freeRadius.inc:93
+#: ../lib/modules/freeRadius.inc:121
+#: ../lib/modules/freeRadius.inc:147
+#: ../lib/modules/freeRadius.inc:178
+#: ../lib/modules/freeRadius.inc:227
+#: ../lib/modules/freeRadius.inc:281
+#: ../lib/modules/freeRadius.inc:626
 msgid "Group names"
 msgstr "组名"
 
 #: ../lib/types/gon.inc:53
-#: ../lib/modules/posixAccount.inc:273
-#: ../lib/modules/posixAccount.inc:325
-#: ../lib/modules/posixAccount.inc:1258
-#: ../lib/modules/posixAccount.inc:1404
-#: ../lib/modules/posixAccount.inc:1510
-#: ../lib/modules/groupOfNamesUser.inc:45
+#: ../lib/modules/posixAccount.inc:287
+#: ../lib/modules/posixAccount.inc:339
+#: ../lib/modules/posixAccount.inc:1278
+#: ../lib/modules/posixAccount.inc:1424
+#: ../lib/modules/posixAccount.inc:1530
 #: ../lib/modules/groupOfNamesUser.inc:47
-#: ../lib/modules/groupOfNamesUser.inc:51
-#: ../lib/modules/groupOfNamesUser.inc:55
-#: ../lib/modules/groupOfNamesUser.inc:62
-#: ../lib/modules/groupOfNamesUser.inc:249
-#: ../lib/modules/groupOfNamesUser.inc:285
+#: ../lib/modules/groupOfNamesUser.inc:49
+#: ../lib/modules/groupOfNamesUser.inc:53
+#: ../lib/modules/groupOfNamesUser.inc:57
+#: ../lib/modules/groupOfNamesUser.inc:64
+#: ../lib/modules/groupOfNamesUser.inc:253
+#: ../lib/modules/groupOfNamesUser.inc:289
 #: ../lib/modules/groupOfNames.inc:44
 msgid "Group of names"
 msgstr "组名"
@@ -3928,8 +3930,8 @@ msgstr "帐号的组名"
 msgid "Group of unique names"
 msgstr "组的唯一名"
 
-#: ../lib/modules/posixGroup.inc:366
-#: ../lib/modules/posixGroup.inc:412
+#: ../lib/modules/posixGroup.inc:369
+#: ../lib/modules/posixGroup.inc:415
 msgid "Group password"
 msgstr "组密码"
 
@@ -3938,26 +3940,26 @@ msgid "Group type"
 msgstr "组类型"
 
 #: ../lib/types/group.inc:54
-#: ../lib/modules/posixGroup.inc:313
+#: ../lib/modules/posixGroup.inc:315
 #: ../lib/modules/zarafaGroup.inc:105
 #: ../lib/modules/generalInformation.inc:103
 msgid "Groups"
 msgstr "组"
 
-#: ../lib/modules/dhcp_settings.inc:90
+#: ../lib/modules/dhcp_settings.inc:97
 msgid "H-Node (0x08)"
 msgstr "H-节点 (0x08)"
 
 #: ../templates/config/confmain.php:332
 #: ../lib/modules/selfRegistration.inc:81
-#: ../lib/modules/passwordSelfReset.inc:194
-#: ../lib/modules/passwordSelfReset.inc:210
+#: ../lib/modules/passwordSelfReset.inc:195
+#: ../lib/modules/passwordSelfReset.inc:211
 #: ../help/help.inc:207
 msgid "HTML format"
 msgstr "HTML格式"
 
 #: ../templates/config/confmain.php:411
-#: ../templates/selfService/adminMain.php:392
+#: ../templates/selfService/adminMain.php:406
 #: ../help/help.inc:120
 msgid "HTTP authentication"
 msgstr "HTTP认证"
@@ -3971,31 +3973,31 @@ msgstr "HTTP认证"
 msgid "HTTP port"
 msgstr "HTTP端口"
 
-#: ../lib/modules/quota.inc:624
+#: ../lib/modules/quota.inc:627
 #: ../lib/modules/systemQuotas.inc:377
 msgid "Hard block"
 msgstr "块的硬性限制"
 
-#: ../lib/modules/quota.inc:111
 #: ../lib/modules/quota.inc:112
-#: ../lib/modules/quota.inc:392
-#: ../lib/modules/quota.inc:497
+#: ../lib/modules/quota.inc:113
+#: ../lib/modules/quota.inc:395
+#: ../lib/modules/quota.inc:500
 #: ../lib/modules/systemQuotas.inc:119
 msgid "Hard block limit"
 msgstr "块的硬性限制"
 
-#: ../lib/modules/quota.inc:626
+#: ../lib/modules/quota.inc:629
 #: ../lib/modules/systemQuotas.inc:379
 msgid "Hard inode"
 msgstr "节点的硬性限制"
 
-#: ../lib/modules/quota.inc:134
+#: ../lib/modules/quota.inc:135
 msgid "Hard inode (files) limit"
 msgstr "节点的硬性限制"
 
-#: ../lib/modules/quota.inc:133
-#: ../lib/modules/quota.inc:396
-#: ../lib/modules/quota.inc:499
+#: ../lib/modules/quota.inc:134
+#: ../lib/modules/quota.inc:399
+#: ../lib/modules/quota.inc:502
 #: ../lib/modules/systemQuotas.inc:123
 msgid "Hard inode limit"
 msgstr "节点硬性限制"
@@ -4004,18 +4006,18 @@ msgstr "节点硬性限制"
 msgid "Has subentries"
 msgstr "有子条目"
 
-#: ../lib/modules/sambaSamAccount.inc:529
+#: ../lib/modules/sambaSamAccount.inc:534
 msgid "Hawaii"
 msgstr "夏威夷"
 
-#: ../templates/pdfedit/pdfpage.php:445
-#: ../templates/pdfedit/pdfpage.php:538
-#: ../templates/pdfedit/pdfpage.php:545
+#: ../templates/pdfedit/pdfpage.php:447
+#: ../templates/pdfedit/pdfpage.php:540
+#: ../templates/pdfedit/pdfpage.php:547
 msgid "Headline"
 msgstr "标题"
 
 #: ../templates/main_header.php:130
-#: ../lib/modules.inc:622
+#: ../lib/modules.inc:628
 msgid "Help"
 msgstr "帮助"
 
@@ -4023,23 +4025,23 @@ msgstr "帮助"
 msgid "Here you can browse LDAP object classes and attributes."
 msgstr "这是你可浏览的LDAP对象类和属性."
 
-#: ../lib/modules/sambaSamAccount.inc:369
+#: ../lib/modules/sambaSamAccount.inc:374
 msgid "Here you can change the settings for the terminal server access."
 msgstr "这里可以改变终端服务访问的设置。"
 
-#: ../lib/selfService.inc:342
+#: ../lib/selfService.inc:367
 msgid "Here you can change your personal settings."
 msgstr "这里您可以修改用户设置."
 
-#: ../templates/masscreate.php:123
+#: ../templates/masscreate.php:128
 msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr "您可以上传CSV文件来建立多个帐号"
 
-#: ../lib/modules/dhcp_settings.inc:177
+#: ../lib/modules/dhcp_settings.inc:184
 msgid "Here you can enter a description for this DHCP entry."
 msgstr "可以输入此DHCP条目的描述"
 
-#: ../lib/modules/nisnetgroup.inc:78
+#: ../lib/modules/nisnetgroup.inc:81
 #: ../lib/modules/groupOfNames.inc:65
 msgid "Here you can enter a description for this group."
 msgstr "在这输入组的描述."
@@ -4050,12 +4052,12 @@ msgstr "在这输入这个角色的描述."
 
 #: ../lib/modules/zarafaContact.inc:82
 #: ../lib/modules/zarafaUser.inc:126
-#: ../lib/modules/nisnetgroup.inc:95
+#: ../lib/modules/nisnetgroup.inc:98
 msgid "Here you can enter a filter value. Only entries which contain the filter text will be shown."
 msgstr "这里您可以输入过滤条件,只显示符合过滤条件的条目."
 
-#: ../lib/modules/posixAccount.inc:355
-#: ../lib/modules/groupOfNamesUser.inc:56
+#: ../lib/modules/posixAccount.inc:369
+#: ../lib/modules/groupOfNamesUser.inc:58
 msgid "Here you can enter a list of additional group memberships. The group names are separated by commas."
 msgstr "您可以在此输入附加的组成员,组名以逗号分隔."
 
@@ -4063,8 +4065,8 @@ msgstr "您可以在此输入附加的组成员,组名以逗号分隔."
 msgid "Here you can enter a serial number for this device."
 msgstr "在这输入这个设备的序列号."
 
-#: ../lib/modules/inetOrgPerson.inc:758
 #: ../lib/modules/inetOrgPerson.inc:762
+#: ../lib/modules/inetOrgPerson.inc:766
 msgid "Here you can enter the user's department."
 msgstr "这里可以输入用户的部门."
 
@@ -4108,7 +4110,7 @@ msgstr "这里可以指定附加的CSS链接来改变自助服务页的布局.
 msgid "Here you can specify minimum requirements for passwords. The character classes are: lowercase, uppercase, numeric and symbols."
 msgstr "在此指定用户密码的最小需求.字符类别包括:小写,大写,数字和标点符号."
 
-#: ../lib/modules/nisnetgroup.inc:82
+#: ../lib/modules/nisnetgroup.inc:85
 msgid "Here you can specify subgroups which are included in this NIS netgroup. All members of the subgroups will be treated as members of this group."
 msgstr "这里可以指定一个包含在NIS网络组中的分组.此分组中所有用户都会认同为这个网络组中的成员."
 
@@ -4128,7 +4130,7 @@ msgstr "在此指定用户密码的最小长度."
 msgid "Here you can specify the new password yourself."
 msgstr "这里可以设置自己的新密码。"
 
-#: ../lib/modules/sambaSamAccount.inc:360
+#: ../lib/modules/sambaSamAccount.inc:365
 msgid "Here you can specify the shadowing mode."
 msgstr "这里可以指定遮蔽(shadow)模型。"
 
@@ -4162,8 +4164,8 @@ msgstr "测试您安装的系统功能是否正确."
 #: ../lib/modules/zarafaUser.inc:309
 #: ../lib/modules/zarafaUser.inc:358
 #: ../lib/modules/zarafaUser.inc:386
-#: ../lib/modules/zarafaUser.inc:578
-#: ../lib/modules/zarafaUser.inc:1330
+#: ../lib/modules/zarafaUser.inc:580
+#: ../lib/modules/zarafaUser.inc:1332
 msgid "Hidden"
 msgstr "隐藏"
 
@@ -4171,14 +4173,14 @@ msgstr "隐藏"
 #: ../lib/modules/asteriskAccount.inc:245
 #: ../lib/modules/zarafaGroup.inc:98
 #: ../lib/modules/zarafaGroup.inc:107
-#: ../lib/modules/sambaSamAccount.inc:374
-#: ../lib/modules/sambaSamAccount.inc:564
+#: ../lib/modules/sambaSamAccount.inc:379
+#: ../lib/modules/sambaSamAccount.inc:569
 #: ../lib/modules/zarafaUser.inc:117
 #: ../lib/modules/zarafaUser.inc:160
-#: ../lib/modules/inetOrgPerson.inc:228
-#: ../lib/modules/inetOrgPerson.inc:765
-#: ../lib/modules/freeRadius.inc:104
-#: ../lib/modules/freeRadius.inc:110
+#: ../lib/modules/inetOrgPerson.inc:233
+#: ../lib/modules/inetOrgPerson.inc:769
+#: ../lib/modules/freeRadius.inc:105
+#: ../lib/modules/freeRadius.inc:111
 #: ../lib/modules/zarafaServer.inc:81
 #: ../lib/modules/zarafaServer.inc:136
 msgid "Hidden options"
@@ -4210,7 +4212,7 @@ msgstr "隐藏/显示目录树"
 msgid "Hint"
 msgstr "提示"
 
-#: ../templates/masscreate.php:237
+#: ../templates/masscreate.php:242
 msgid "Hint: Format all cells as text in your spreadsheet program and turn off auto correction."
 msgstr "提示:将电子表格的格式设定为文字,然后关闭自动更正功能"
 
@@ -4222,65 +4224,65 @@ msgstr "提示:要删除一个属性,先清空文本区然后保存."
 msgid "Hint: You must choose exactly one structural object class (shown in bold above)"
 msgstr "提示:必须选择精确的结构化对象类(上述加粗项)"
 
-#: ../lib/modules/posixAccount.inc:400
-#: ../lib/modules/groupOfNamesUser.inc:52
+#: ../lib/modules/posixAccount.inc:418
+#: ../lib/modules/groupOfNamesUser.inc:54
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr "按住CTRL键可以多选组."
 
 #: ../lib/types/user.inc:98
-#: ../lib/modules/sambaSamAccount.inc:212
-#: ../lib/modules/sambaSamAccount.inc:332
-#: ../lib/modules/sambaSamAccount.inc:1431
-#: ../lib/modules/sambaSamAccount.inc:1716
-#: ../lib/modules/posixAccount.inc:74
-#: ../lib/modules/posixAccount.inc:75
-#: ../lib/modules/posixAccount.inc:77
-#: ../lib/modules/posixAccount.inc:229
-#: ../lib/modules/posixAccount.inc:319
-#: ../lib/modules/posixAccount.inc:358
-#: ../lib/modules/posixAccount.inc:362
-#: ../lib/modules/posixAccount.inc:366
-#: ../lib/modules/posixAccount.inc:383
-#: ../lib/modules/posixAccount.inc:910
-#: ../lib/modules/posixAccount.inc:1140
-#: ../lib/modules/posixAccount.inc:1311
-#: ../lib/modules/posixAccount.inc:1411
-#: ../lib/modules/posixAccount.inc:1496
+#: ../lib/modules/sambaSamAccount.inc:216
+#: ../lib/modules/sambaSamAccount.inc:337
+#: ../lib/modules/sambaSamAccount.inc:1436
+#: ../lib/modules/sambaSamAccount.inc:1721
+#: ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/posixAccount.inc:87
+#: ../lib/modules/posixAccount.inc:243
+#: ../lib/modules/posixAccount.inc:333
+#: ../lib/modules/posixAccount.inc:372
+#: ../lib/modules/posixAccount.inc:376
+#: ../lib/modules/posixAccount.inc:380
+#: ../lib/modules/posixAccount.inc:401
+#: ../lib/modules/posixAccount.inc:930
+#: ../lib/modules/posixAccount.inc:1160
+#: ../lib/modules/posixAccount.inc:1331
+#: ../lib/modules/posixAccount.inc:1431
+#: ../lib/modules/posixAccount.inc:1516
 msgid "Home directory"
 msgstr "个人目录"
 
-#: ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:87
 #, php-format
 msgid "Home directory changed. To keep home directory you have to run the following command as root: 'mv %s %s'"
 msgstr "使用者目录已经改变,要操持一致需要在系统以ROOT用户运行如下命令:'mv %s %s'"
 
-#: ../lib/modules/sambaSamAccount.inc:196
-#: ../lib/modules/sambaSamAccount.inc:213
-#: ../lib/modules/sambaSamAccount.inc:280
-#: ../lib/modules/sambaSamAccount.inc:461
-#: ../lib/modules/sambaSamAccount.inc:569
-#: ../lib/modules/sambaSamAccount.inc:1150
-#: ../lib/modules/sambaSamAccount.inc:1439
-#: ../lib/modules/sambaSamAccount.inc:1534
-#: ../lib/modules/sambaSamAccount.inc:1690
-#: ../lib/modules/sambaSamAccount.inc:1717
+#: ../lib/modules/sambaSamAccount.inc:200
+#: ../lib/modules/sambaSamAccount.inc:217
+#: ../lib/modules/sambaSamAccount.inc:285
+#: ../lib/modules/sambaSamAccount.inc:466
+#: ../lib/modules/sambaSamAccount.inc:574
+#: ../lib/modules/sambaSamAccount.inc:1155
+#: ../lib/modules/sambaSamAccount.inc:1444
+#: ../lib/modules/sambaSamAccount.inc:1539
+#: ../lib/modules/sambaSamAccount.inc:1695
+#: ../lib/modules/sambaSamAccount.inc:1722
 msgid "Home drive"
 msgstr "个人驱动器"
 
-#: ../lib/modules/sambaSamAccount.inc:86
 #: ../lib/modules/sambaSamAccount.inc:87
-#: ../lib/modules/sambaSamAccount.inc:199
-#: ../lib/modules/sambaSamAccount.inc:283
-#: ../lib/modules/sambaSamAccount.inc:469
-#: ../lib/modules/sambaSamAccount.inc:571
-#: ../lib/modules/sambaSamAccount.inc:1158
-#: ../lib/modules/sambaSamAccount.inc:1538
-#: ../lib/modules/sambaSamAccount.inc:1687
+#: ../lib/modules/sambaSamAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:203
+#: ../lib/modules/sambaSamAccount.inc:288
+#: ../lib/modules/sambaSamAccount.inc:474
+#: ../lib/modules/sambaSamAccount.inc:576
+#: ../lib/modules/sambaSamAccount.inc:1163
+#: ../lib/modules/sambaSamAccount.inc:1543
+#: ../lib/modules/sambaSamAccount.inc:1692
 msgid "Home path"
 msgstr "个人目录路径"
 
-#: ../lib/modules/sambaSamAccount.inc:86
-#: ../lib/modules/sambaSamAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:87
+#: ../lib/modules/sambaSamAccount.inc:89
 msgid "Home path is invalid."
 msgstr "个人目录路径无效"
 
@@ -4288,21 +4290,21 @@ msgstr "个人目录路径无效"
 msgid "Home server for the user."
 msgstr "用户的宿主服务器."
 
-#: ../lib/modules/inetOrgPerson.inc:54
-#: ../lib/modules/inetOrgPerson.inc:126
-#: ../lib/modules/inetOrgPerson.inc:254
-#: ../lib/modules/inetOrgPerson.inc:417
-#: ../lib/modules/inetOrgPerson.inc:549
-#: ../lib/modules/inetOrgPerson.inc:713
+#: ../lib/modules/inetOrgPerson.inc:55
+#: ../lib/modules/inetOrgPerson.inc:127
+#: ../lib/modules/inetOrgPerson.inc:259
+#: ../lib/modules/inetOrgPerson.inc:421
+#: ../lib/modules/inetOrgPerson.inc:553
 #: ../lib/modules/inetOrgPerson.inc:717
-#: ../lib/modules/inetOrgPerson.inc:1551
-#: ../lib/modules/inetOrgPerson.inc:2073
-#: ../lib/modules/inetOrgPerson.inc:2569
+#: ../lib/modules/inetOrgPerson.inc:721
+#: ../lib/modules/inetOrgPerson.inc:1555
+#: ../lib/modules/inetOrgPerson.inc:2077
+#: ../lib/modules/inetOrgPerson.inc:2598
 msgid "Home telephone number"
 msgstr "宅电"
 
-#: ../lib/modules/posixAccount.inc:74
-#: ../lib/modules/posixAccount.inc:76
+#: ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:86
 msgid "Homedirectory contains invalid characters."
 msgstr "个人目录包含非法字符"
 
@@ -4313,8 +4315,8 @@ msgstr "个人目录包含非法字符"
 #: ../lib/modules/asteriskAccount.inc:380
 #: ../lib/modules/asteriskAccount.inc:663
 #: ../lib/modules/asteriskAccount.inc:1190
-#: ../lib/modules/nisnetgroup.inc:207
-#: ../lib/modules/nisnetgroup.inc:582
+#: ../lib/modules/nisnetgroup.inc:210
+#: ../lib/modules/nisnetgroup.inc:585
 #: ../lib/modules/hostObject.inc:143
 msgid "Host"
 msgstr "主机"
@@ -4333,8 +4335,8 @@ msgid "Host description"
 msgstr "主机描述"
 
 #: ../lib/modules/account.inc:89
-#: ../lib/modules/posixAccount.inc:414
-#: ../lib/modules/posixAccount.inc:422
+#: ../lib/modules/posixAccount.inc:432
+#: ../lib/modules/posixAccount.inc:440
 msgid "Host description. If left empty host name will be used."
 msgstr "主机描述.如果留空会使用主机名."
 
@@ -4348,44 +4350,44 @@ msgstr "主机列表"
 #: ../lib/types/host.inc:92
 #: ../lib/modules/account.inc:84
 #: ../lib/modules/account.inc:209
-#: ../lib/modules/posixAccount.inc:89
-#: ../lib/modules/posixAccount.inc:90
-#: ../lib/modules/posixAccount.inc:92
-#: ../lib/modules/posixAccount.inc:284
-#: ../lib/modules/posixAccount.inc:409
-#: ../lib/modules/nisnetgroup.inc:143
-#: ../lib/modules/nisnetgroup.inc:471
+#: ../lib/modules/posixAccount.inc:99
+#: ../lib/modules/posixAccount.inc:100
+#: ../lib/modules/posixAccount.inc:102
+#: ../lib/modules/posixAccount.inc:298
+#: ../lib/modules/posixAccount.inc:427
+#: ../lib/modules/nisnetgroup.inc:146
+#: ../lib/modules/nisnetgroup.inc:474
 msgid "Host name"
 msgstr "主机名"
 
-#: ../lib/modules/posixAccount.inc:96
+#: ../lib/modules/posixAccount.inc:106
 msgid "Host name already exists!"
 msgstr "主机名已经存在!"
 
-#: ../lib/modules/posixAccount.inc:90
-#: ../lib/modules/posixAccount.inc:94
-#: ../lib/modules/nisnetgroup.inc:143
+#: ../lib/modules/posixAccount.inc:100
+#: ../lib/modules/posixAccount.inc:104
+#: ../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:92
+#: ../lib/modules/posixAccount.inc:102
 msgid "Host name in use. Selected next free host name."
 msgstr "主机名已被使用, 请选择其它的主机名."
 
-#: ../lib/modules/sambaSamAccount.inc:1050
+#: ../lib/modules/sambaSamAccount.inc:1055
 msgid "Host name must end with $!"
 msgstr "主机名必须使用$结尾!"
 
 #: ../lib/modules/account.inc:85
-#: ../lib/modules/posixAccount.inc:410
+#: ../lib/modules/posixAccount.inc:428
 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 $ it will be added. If host name is already used host name will be expanded with a number. The next free number will be used."
 msgstr "将要建立的主机名.合法字符为:a-z,A-Z,0-9,_$..主机名总是以$结尾.如果最后一个字符不是$,会自动填加.如果主机名已经存在,会在主机名后自动增加下一个可用的数字."
 
 #: ../lib/types/host.inc:53
-#: ../lib/modules/posixAccount.inc:69
-#: ../lib/modules/posixAccount.inc:70
-#: ../lib/modules/posixAccount.inc:72
-#: ../lib/modules/posixAccount.inc:175
+#: ../lib/modules/posixAccount.inc:79
+#: ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixAccount.inc:188
 #: ../lib/modules/sudoRole.inc:67
 #: ../lib/modules/sudoRole.inc:92
 #: ../lib/modules/sudoRole.inc:140
@@ -4393,43 +4395,43 @@ msgstr "将要建立的主机名.合法字符为:a-z,A-Z,0-9,_$..主机名总是
 #: ../lib/modules/sudoRole.inc:183
 #: ../lib/modules/sudoRole.inc:291
 #: ../lib/modules/sudoRole.inc:690
-#: ../lib/modules/fixed_ip.inc:69
+#: ../lib/modules/fixed_ip.inc:70
 #: ../lib/modules/hostObject.inc:62
 #: ../lib/modules/hostObject.inc:72
 msgid "Hosts"
 msgstr "主机"
 
-#: ../lib/modules/posixGroup.inc:488
-#: ../lib/modules/posixAccount.inc:80
-#: ../lib/modules/posixAccount.inc:848
+#: ../lib/modules/posixGroup.inc:499
+#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:868
 msgid "ID is already in use"
 msgstr "ID已经被使用"
 
-#: ../lib/modules/posixGroup.inc:486
-#: ../lib/modules/posixGroup.inc:487
-#: ../lib/modules/posixGroup.inc:488
-#: ../lib/modules/posixGroup.inc:586
-#: ../lib/modules/posixAccount.inc:78
-#: ../lib/modules/posixAccount.inc:79
-#: ../lib/modules/posixAccount.inc:80
-#: ../lib/modules/posixAccount.inc:846
-#: ../lib/modules/posixAccount.inc:848
+#: ../lib/modules/posixGroup.inc:497
+#: ../lib/modules/posixGroup.inc:498
+#: ../lib/modules/posixGroup.inc:499
+#: ../lib/modules/posixGroup.inc:597
+#: ../lib/modules/posixAccount.inc:88
+#: ../lib/modules/posixAccount.inc:89
+#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:866
+#: ../lib/modules/posixAccount.inc:868
 msgid "ID-Number"
 msgstr "ID号"
 
 #: ../lib/modules/zarafaUser.inc:318
-#: ../lib/modules/zarafaUser.inc:643
-#: ../lib/modules/zarafaUser.inc:1405
+#: ../lib/modules/zarafaUser.inc:645
+#: ../lib/modules/zarafaUser.inc:1407
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../lib/modules/imapAccess.inc:78
-#: ../lib/modules/imapAccess.inc:111
+#: ../lib/modules/imapAccess.inc:79
+#: ../lib/modules/imapAccess.inc:112
 msgid "IMAP admin user"
 msgstr "IMAP管理员用户"
 
-#: ../lib/modules/imapAccess.inc:81
-#: ../lib/modules/imapAccess.inc:114
+#: ../lib/modules/imapAccess.inc:82
+#: ../lib/modules/imapAccess.inc:115
 msgid "IMAP password input"
 msgstr "输入IMAP 密码"
 
@@ -4443,15 +4445,15 @@ msgstr "输入IMAP 密码"
 #: ../lib/modules/asteriskAccount.inc:584
 #: ../lib/modules/asteriskAccount.inc:936
 #: ../lib/modules/asteriskAccount.inc:1269
-#: ../lib/modules/freeRadius.inc:76
-#: ../lib/modules/freeRadius.inc:114
-#: ../lib/modules/freeRadius.inc:185
-#: ../lib/modules/freeRadius.inc:217
-#: ../lib/modules/freeRadius.inc:304
-#: ../lib/modules/freeRadius.inc:616
-#: ../lib/modules/fixed_ip.inc:93
-#: ../lib/modules/fixed_ip.inc:342
-#: ../lib/modules/fixed_ip.inc:522
+#: ../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:617
+#: ../lib/modules/fixed_ip.inc:94
+#: ../lib/modules/fixed_ip.inc:343
+#: ../lib/modules/fixed_ip.inc:523
 msgid "IP address"
 msgstr "IP地址"
 
@@ -4478,28 +4480,28 @@ msgstr "注册服务器的IP地址或域名"
 msgid "IP addresses"
 msgstr "IP地址"
 
-#: ../lib/modules/fixed_ip.inc:97
+#: ../lib/modules/fixed_ip.inc:98
 msgid "IP list"
 msgstr "IP列表"
 
-#: ../templates/masscreate.php:284
-#: ../templates/masscreate.php:359
+#: ../templates/masscreate.php:289
+#: ../templates/masscreate.php:364
 msgid "Identifier"
 msgstr "标识"
 
-#: ../lib/modules/sambaSamAccount.inc:220
-#: ../lib/modules/sambaSamAccount.inc:1457
-#: ../lib/modules/sambaSamAccount.inc:1728
+#: ../lib/modules/sambaSamAccount.inc:224
+#: ../lib/modules/sambaSamAccount.inc:1462
+#: ../lib/modules/sambaSamAccount.inc:1733
 msgid "Idle time limit"
 msgstr "空闲时间限制"
 
-#: ../lib/modules/freeRadius.inc:100
-#: ../lib/modules/freeRadius.inc:124
-#: ../lib/modules/freeRadius.inc:149
-#: ../lib/modules/freeRadius.inc:209
-#: ../lib/modules/freeRadius.inc:232
-#: ../lib/modules/freeRadius.inc:320
-#: ../lib/modules/freeRadius.inc:631
+#: ../lib/modules/freeRadius.inc:101
+#: ../lib/modules/freeRadius.inc:125
+#: ../lib/modules/freeRadius.inc:150
+#: ../lib/modules/freeRadius.inc:210
+#: ../lib/modules/freeRadius.inc:233
+#: ../lib/modules/freeRadius.inc:321
+#: ../lib/modules/freeRadius.inc:632
 msgid "Idle timeout"
 msgstr "空闲超时"
 
@@ -4507,39 +4509,39 @@ msgstr "空闲超时"
 msgid "If activated then the user is forced to change his password at the next login."
 msgstr "如果您选中此项，用户在下次登录时必须修改密码。"
 
-#: ../lib/modules/sambaSamAccount.inc:246
+#: ../lib/modules/sambaSamAccount.inc:251
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "如果选中将使用UNIX密码作为SAMBA密码."
 
-#: ../lib/modules/posixAccount.inc:392
+#: ../lib/modules/posixAccount.inc:410
 msgid "If checked account will be deactivated by putting a \"!\" before the encrypted password."
 msgstr "在密码前加\"!\",此帐号会被停用."
 
-#: ../lib/modules/sambaSamAccount.inc:252
+#: ../lib/modules/sambaSamAccount.inc:257
 msgid "If checked no password will be used."
 msgstr "如果选中,不需要密码."
 
-#: ../lib/modules/sambaSamAccount.inc:258
+#: ../lib/modules/sambaSamAccount.inc:263
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "密码不过期.(设置X标志)"
 
-#: ../lib/modules/sambaSamAccount.inc:264
+#: ../lib/modules/sambaSamAccount.inc:269
 msgid "If checked then the account will be deactivated. (Setting D-Flag)"
 msgstr "密码停用(设置D标志)"
 
-#: ../lib/modules/sambaSamAccount.inc:267
+#: ../lib/modules/sambaSamAccount.inc:272
 msgid "If checked then the account will be locked (setting L-Flag). You usually want to use this setting to unlock user accounts which were locked because of failed login attempts."
 msgstr "帐号被锁定(设置L标志).多次登录失败后帐号会被锁定.在此可以解除锁定."
 
-#: ../lib/modules/posixGroup.inc:397
+#: ../lib/modules/posixGroup.inc:400
 msgid "If empty GID number will be generated automaticly depending on your configuration settings."
 msgstr "如果为空,视配置而定,GID号自动产生."
 
-#: ../lib/modules/posixAccount.inc:347
+#: ../lib/modules/posixAccount.inc:361
 msgid "If empty UID number will be generated automaticly."
 msgstr "如果为空,UID号会自动生成."
 
-#: ../lib/modules/ppolicy.inc:117
+#: ../lib/modules/ppolicy.inc:118
 msgid "If enabled the user will not be allowed to login after there have been a specified number of consecutive failed login attempts."
 msgstr "此项如果设置，用户在连续特定数量的登录失败后，将不允许再登录。"
 
@@ -4547,7 +4549,7 @@ msgstr "此项如果设置，用户在连续特定数量的登录失败后，将
 msgid "If enabled then LAM will use user and password that is provided by the web server via HTTP authentication."
 msgstr "如果打开,LAM将使用通过HTTP认证的web服务器提供的用户名和密码."
 
-#: ../lib/modules/ppolicy.inc:121
+#: ../lib/modules/ppolicy.inc:122
 msgid "If enabled users must change their passwords when they first login after a password is set or reset by the administrator."
 msgstr "如果此项设置，用户在设置密码或管理员复位密码后第一次登录时，必须要更改密码。"
 
@@ -4559,19 +4561,19 @@ msgstr "如果指定了注册语境,Asterisk将为一个特定端在注册或注
 msgid "If set then users need to login to change their password."
 msgstr "如果设置,用户需要密码才能登录."
 
-#: ../lib/modules/sambaSamAccount.inc:249
+#: ../lib/modules/sambaSamAccount.inc:254
 msgid "If set to \"true\" Unix password will also be used as Samba password."
 msgstr "如果设为\"true\",会用UNIX用户密码做为SAMBA密码."
 
-#: ../lib/modules/sambaSamAccount.inc:270
+#: ../lib/modules/sambaSamAccount.inc:275
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr "如果设为\"true\",帐号会被停用(设置D标志)."
 
-#: ../lib/modules/sambaSamAccount.inc:255
+#: ../lib/modules/sambaSamAccount.inc:260
 msgid "If set to \"true\" no password will be used."
 msgstr "如果设为\"true\",则不需要密码."
 
-#: ../lib/modules/sambaSamAccount.inc:261
+#: ../lib/modules/sambaSamAccount.inc:266
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr "如果设为\"true\",密码不会过期(设为X标志)."
 
@@ -4583,7 +4585,7 @@ msgstr "如果LDAP属性值为空,则此复选框被设为此值."
 msgid "If the mailbox size reaches the soft quota limit, the user will not be able to send email until the size of the mailbox is reduced."
 msgstr "如果邮箱达到软限额极限,用户将不能发送邮件,除非邮箱占用空间减小."
 
-#: ../lib/modules/sambaSamAccount.inc:309
+#: ../lib/modules/sambaSamAccount.inc:314
 msgid "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr "如果留空,LAM会用如下算法:uidNumber*2 + sambaAlgorithmicRidBase."
 
@@ -4591,7 +4593,7 @@ msgstr "如果留空,LAM会用如下算法:uidNumber*2 + sambaAlgorithmicRidBase
 msgid "If you run Zarafa behind a reverse proxy then you can specify the server URL here (e.g. \"https://zproxy.example.com:237/z1\")."
 msgstr "如果为Zarafa使用了反向代理,则在此指定服务器的URL.(比如:\"https://zproxy.example.com:237/z1\")."
 
-#: ../lib/modules/passwordSelfReset.inc:122
+#: ../lib/modules/passwordSelfReset.inc:123
 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. Please handle with care."
 msgstr "如果此项选中,用户仅通过email地址进行认证.LAM PRO不会询问安全问题的答案.请谨慎处理."
 
@@ -4623,7 +4625,7 @@ msgstr "如果您选中此项，用户不能请求可更新的票据."
 msgid "If you set this option then the user cannot request service tickets."
 msgstr "如果您选中此项，用户不能请求服务票据."
 
-#: ../lib/modules/sambaSamAccount.inc:273
+#: ../lib/modules/sambaSamAccount.inc:278
 #: ../lib/modules/heimdalKerberos.inc:121
 #: ../help/help.inc:171
 msgid "If you set this option then the user has to change his password at the next login."
@@ -4675,83 +4677,83 @@ msgstr "包括系统属性"
 msgid "Information about the LDAP server."
 msgstr "有关LDAP服务器的信息"
 
-#: ../lib/modules/sambaSamAccount.inc:215
-#: ../lib/modules/sambaSamAccount.inc:338
-#: ../lib/modules/sambaSamAccount.inc:1443
-#: ../lib/modules/sambaSamAccount.inc:1723
+#: ../lib/modules/sambaSamAccount.inc:219
+#: ../lib/modules/sambaSamAccount.inc:343
+#: ../lib/modules/sambaSamAccount.inc:1448
+#: ../lib/modules/sambaSamAccount.inc:1728
 msgid "Inherit client startup configuration"
 msgstr "继承客户初始配置"
 
-#: ../templates/schema/schema.php:394
-#: ../templates/schema/schema.php:415
+#: ../templates/schema/schema.php:396
+#: ../templates/schema/schema.php:417
 msgid "Inherited from"
 msgstr "继承自"
 
-#: ../templates/schema/schema.php:155
-#: ../templates/schema/schema.php:351
+#: ../templates/schema/schema.php:157
+#: ../templates/schema/schema.php:353
 msgid "Inherits from"
 msgstr "继承自"
 
-#: ../lib/modules/sambaSamAccount.inc:216
-#: ../lib/modules/sambaSamAccount.inc:341
-#: ../lib/modules/sambaSamAccount.inc:1445
-#: ../lib/modules/sambaSamAccount.inc:1724
+#: ../lib/modules/sambaSamAccount.inc:220
+#: ../lib/modules/sambaSamAccount.inc:346
+#: ../lib/modules/sambaSamAccount.inc:1450
+#: ../lib/modules/sambaSamAccount.inc:1729
 msgid "Initial program"
 msgstr "初始化程序"
 
-#: ../lib/modules/inetOrgPerson.inc:128
-#: ../lib/modules/inetOrgPerson.inc:278
-#: ../lib/modules/inetOrgPerson.inc:313
-#: ../lib/modules/inetOrgPerson.inc:588
-#: ../lib/modules/inetOrgPerson.inc:785
-#: ../lib/modules/inetOrgPerson.inc:1248
-#: ../lib/modules/inetOrgPerson.inc:2087
-#: ../lib/modules/inetOrgPerson.inc:2699
+#: ../lib/modules/inetOrgPerson.inc:129
+#: ../lib/modules/inetOrgPerson.inc:283
+#: ../lib/modules/inetOrgPerson.inc:317
+#: ../lib/modules/inetOrgPerson.inc:592
+#: ../lib/modules/inetOrgPerson.inc:789
+#: ../lib/modules/inetOrgPerson.inc:1252
+#: ../lib/modules/inetOrgPerson.inc:2091
+#: ../lib/modules/inetOrgPerson.inc:2790
 msgid "Initials"
 msgstr "初始化"
 
-#: ../templates/serverInfo.php:280
-#: ../templates/serverInfo.php:366
+#: ../templates/serverInfo.php:282
+#: ../templates/serverInfo.php:368
 msgid "Initiated"
 msgstr "初始化完毕"
 
-#: ../lib/modules/quota.inc:56
+#: ../lib/modules/quota.inc:57
 #: ../lib/modules/systemQuotas.inc:98
 msgid "Inode hard quota"
 msgstr "inode硬配额"
 
-#: ../lib/modules/quota.inc:56
 #: ../lib/modules/quota.inc:57
+#: ../lib/modules/quota.inc:58
 #: ../lib/modules/systemQuotas.inc:98
 #: ../lib/modules/systemQuotas.inc:99
 msgid "Inode hard quota contains invalid characters. Only natural numbers are allowed."
 msgstr "inode硬配额包含非法字符,只允许使用自然数."
 
-#: ../lib/modules/quota.inc:60
+#: ../lib/modules/quota.inc:61
 #: ../lib/modules/systemQuotas.inc:102
 msgid "Inode quota"
 msgstr "inode配额"
 
-#: ../lib/modules/quota.inc:54
+#: ../lib/modules/quota.inc:55
 #: ../lib/modules/systemQuotas.inc:96
 msgid "Inode soft quota"
 msgstr "inode软配额"
 
-#: ../lib/modules/quota.inc:54
 #: ../lib/modules/quota.inc:55
+#: ../lib/modules/quota.inc:56
 #: ../lib/modules/systemQuotas.inc:96
 #: ../lib/modules/systemQuotas.inc:97
 msgid "Inode soft quota contains invalid characters. Only natural numbers are allowed."
 msgstr "inode软配额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:60
 #: ../lib/modules/quota.inc:61
+#: ../lib/modules/quota.inc:62
 #: ../lib/modules/systemQuotas.inc:102
 #: ../lib/modules/systemQuotas.inc:103
 msgid "Inode soft quota must be smaller than inode hard quota."
 msgstr "inode软配额必须小于硬配额."
 
-#: ../templates/selfService/adminMain.php:528
+#: ../templates/selfService/adminMain.php:555
 msgid "Input fields"
 msgstr "输入框"
 
@@ -4764,23 +4766,23 @@ msgstr "输入框"
 msgid "Insecure"
 msgstr "不安全"
 
-#: ../lib/modules/sambaSamAccount.inc:87
+#: ../lib/modules/sambaSamAccount.inc:88
 msgid "Inserted user or group name in home path."
 msgstr "在主目录中插入用户名或组名."
 
-#: ../lib/modules/sambaSamAccount.inc:93
+#: ../lib/modules/sambaSamAccount.inc:94
 msgid "Inserted user or group name in logon script."
 msgstr "在登录脚本中插入用户名或组名."
 
-#: ../lib/modules/sambaSamAccount.inc:90
+#: ../lib/modules/sambaSamAccount.inc:91
 msgid "Inserted user or group name in profile path."
 msgstr "在配置路径中插入用户名或组名."
 
-#: ../lib/modules/fixed_ip.inc:379
+#: ../lib/modules/fixed_ip.inc:380
 msgid "Invalid MAC address."
 msgstr "非法的MAC地址"
 
-#: ../templates/massBuildAccounts.php:175
+#: ../templates/massBuildAccounts.php:178
 msgid "Invalid RDN attribute!"
 msgstr "错误的RDN属性!"
 
@@ -4800,25 +4802,25 @@ msgstr "无效的条目"
 msgid "Invalid format for the specification of additional attributes."
 msgstr "不符合附加属性规范的格式"
 
-#: ../lib/modules/imapAccess.inc:159
+#: ../lib/modules/imapAccess.inc:160
 msgid "Invalid password for IMAP admin or other problem occured."
 msgstr "非法的IMAP管理员密码或者发生了其它问题。"
 
-#: ../lib/modules/kolabUser.inc:118
-#: ../lib/modules/kolabUser.inc:123
-#: ../lib/modules/kolabUser.inc:170
-#: ../lib/modules/kolabUser.inc:214
-#: ../lib/modules/kolabUser.inc:319
-#: ../lib/modules/kolabUser.inc:795
-#: ../lib/modules/kolabUser.inc:911
+#: ../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:638
+#: ../lib/modules/kolabUser.inc:766
 msgid "Invitation policy"
 msgstr "邀请原则"
 
-#: ../lib/modules/kolabUser.inc:127
+#: ../lib/modules/kolabUser.inc:109
 msgid "Invitation policy list"
 msgstr "邀请原则列表"
 
-#: ../lib/modules/sambaSamAccount.inc:544
+#: ../lib/modules/sambaSamAccount.inc:549
 msgid "Islamabad, Karachi"
 msgstr "伊斯兰堡,卡拉奇"
 
@@ -4826,25 +4828,25 @@ msgstr "伊斯兰堡,卡拉奇"
 msgid "It is not possible to delete all ranges."
 msgstr "不能删除所有范围"
 
-#: ../lib/modules/posixGroup.inc:486
-#: ../lib/modules/posixAccount.inc:79
+#: ../lib/modules/posixGroup.inc:497
+#: ../lib/modules/posixAccount.inc:89
 msgid "It is possible that this ID-number is reused. This can cause several problems because files with old permissions might still exist. To avoid this warning set maxUID to a higher value."
 msgstr "UID可能被重用,因为旧的权限有可能仍然存在,所以会带来一些问题.要避免本警告消息,请把最大UID设得高一点."
 
-#: ../lib/modules/inetOrgPerson.inc:70
-#: ../lib/modules/inetOrgPerson.inc:128
-#: ../lib/modules/inetOrgPerson.inc:171
-#: ../lib/modules/inetOrgPerson.inc:262
-#: ../lib/modules/inetOrgPerson.inc:329
-#: ../lib/modules/inetOrgPerson.inc:564
-#: ../lib/modules/inetOrgPerson.inc:605
-#: ../lib/modules/inetOrgPerson.inc:1683
-#: ../lib/modules/inetOrgPerson.inc:2062
-#: ../lib/modules/inetOrgPerson.inc:2706
+#: ../lib/modules/inetOrgPerson.inc:71
+#: ../lib/modules/inetOrgPerson.inc:129
+#: ../lib/modules/inetOrgPerson.inc:176
+#: ../lib/modules/inetOrgPerson.inc:267
+#: ../lib/modules/inetOrgPerson.inc:333
+#: ../lib/modules/inetOrgPerson.inc:568
+#: ../lib/modules/inetOrgPerson.inc:609
+#: ../lib/modules/inetOrgPerson.inc:1687
+#: ../lib/modules/inetOrgPerson.inc:2066
+#: ../lib/modules/inetOrgPerson.inc:2801
 msgid "Job title"
 msgstr "头衔"
 
-#: ../lib/modules/inetOrgPerson.inc:606
+#: ../lib/modules/inetOrgPerson.inc:610
 msgid "Job title of user: President, department manager, ..."
 msgstr "用户头衔:如总裁,部门经理..."
 
@@ -4856,17 +4858,17 @@ msgstr "向后跳转10页"
 msgid "Jump 10 pages forward"
 msgstr "向前跳转10页"
 
-#: ../templates/schema/schema.php:253
+#: ../templates/schema/schema.php:255
 msgid "Jump to a matching rule"
 msgstr "选择一个匹配规则"
 
-#: ../templates/schema/schema.php:112
+#: ../templates/schema/schema.php:114
 msgid "Jump to an attribute type"
 msgstr "选择一个属性类型"
 
-#: ../templates/schema/schema.php:306
-#: ../templates/schema/schema.php:356
-#: ../templates/schema/schema.php:371
+#: ../templates/schema/schema.php:308
+#: ../templates/schema/schema.php:358
+#: ../templates/schema/schema.php:373
 msgid "Jump to an object class"
 msgstr "选择一个对象类"
 
@@ -4886,31 +4888,39 @@ msgstr "Kerberos"
 msgid "Kolab"
 msgstr "Kolab"
 
+#: ../lib/modules/posixGroup.inc:436
+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 account type suffix is used. You only need to change this if you use multiple server profiles with different OUs but need unique group names or GIDs."
+msgstr "LAM会检查输入的组名和GID是否唯一。这里您可以输入做重复性搜索的LDAP后缀。缺省会使用账号类型的后缀。如果你使用了多个不同OU的服务器配置而且需要组名或GID唯一，在此处修改。"
+
+#: ../lib/modules/posixAccount.inc:385
+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 account type suffix is used. You only need to change this if you use multiple server profiles with different OUs but need unique user names or UIDs."
+msgstr "LAM会检查输入的用户名和UID是否唯一。这里您可以输入做重复性搜索的LDAP后缀。缺省会使用账号类型的后缀。如果你需要使用多个不同OU的服务器配置而且需要用户名或UID唯一，在此处修改。"
+
 #: ../templates/login.php:207
 #: ../templates/config/index.php:77
 msgid "LAM configuration"
 msgstr "LAM 配置"
 
-#: ../templates/massBuildAccounts.php:212
+#: ../templates/massBuildAccounts.php:215
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr "您的输入检查完毕,即将建立帐号"
 
-#: ../lib/modules/posixGroup.inc:421
-#: ../lib/modules/posixAccount.inc:343
-#: ../lib/modules/inetOrgPerson.inc:770
+#: ../lib/modules/posixGroup.inc:424
+#: ../lib/modules/posixAccount.inc:357
+#: ../lib/modules/inetOrgPerson.inc:774
 #: ../lib/modules/customFields.inc:109
-msgid "LAM supports CRYPT, SHA, SSHA, MD5 and SMD5 to generate the hash value of passwords. SSHA and CRYPT are the most common but CRYPT does not support passwords greater than 8 letters. We do not recommend to use plain text passwords."
-msgstr "系统支持CRYPT, SHA, SSHA, MD5 和 SMD5等HASH算法,用来产生密码的HASH值.SSHA 和 CRYPT是最常用的,但CRYPT 不支持8个字符以上的密码.不建议使用明文密码."
+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 not support passwords greater than 8 letters. We do not recommend to use plain text passwords."
+msgstr "LAM支持CRYPT, CRYPT-SHA512, SHA, SSHA, MD5 和 SMD5 等HASH算法生成密码的HASH值.SSHA 和 CRYPT是最常用的,但CRYPT 不支持8个字符以上的密码.不建议使用明文密码."
 
-#: ../templates/tests/index.php:48
+#: ../templates/tests/index.php:50
 msgid "LAM tests"
 msgstr "LAM 测试"
 
-#: ../lib/modules/imapAccess.inc:114
+#: ../lib/modules/imapAccess.inc:115
 msgid "LAM user password"
 msgstr "LAM用户密码"
 
-#: ../templates/massDoUpload.php:102
+#: ../templates/massDoUpload.php:105
 #, php-format
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAM无法建立%s帐号,LDAP发生错误."
@@ -4919,17 +4929,17 @@ msgstr "LAM无法建立%s帐号,LDAP发生错误."
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "系统找不到这个Samba域!"
 
-#: ../lib/modules/sambaSamAccount.inc:108
+#: ../lib/modules/sambaSamAccount.inc:111
 msgid "LAM was unable to find a domain with this name!"
 msgstr "LAM找不到这个域!"
 
-#: ../lib/modules/posixAccount.inc:97
+#: ../lib/modules/posixAccount.inc:107
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAM找不到这个组"
 
-#: ../lib/modules/posixAccount.inc:1948
-#: ../lib/modules/posixAccount.inc:2009
-#: ../lib/modules/groupOfNamesUser.inc:379
+#: ../lib/modules/posixAccount.inc:1965
+#: ../lib/modules/posixAccount.inc:2026
+#: ../lib/modules/groupOfNamesUser.inc:383
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAM无法修改 %s组成员"
@@ -4953,7 +4963,7 @@ msgstr "LDAP帐号管理配置"
 msgid "LDAP Suffix is invalid!"
 msgstr "LDAP后缀无效!"
 
-#: ../templates/serverInfo.php:180
+#: ../templates/serverInfo.php:182
 msgid "LDAP entries"
 msgstr "LDAP条目"
 
@@ -4965,11 +4975,11 @@ msgstr "LDAP错误,服务器错误消息:"
 msgid "LDAP filter"
 msgstr "LDAP过滤条件"
 
-#: ../lib/modules.inc:1263
+#: ../lib/modules.inc:1269
 msgid "LDAP operation successful."
 msgstr "LDAP操作成功."
 
-#: ../templates/selfService/adminMain.php:385
+#: ../templates/selfService/adminMain.php:399
 msgid "LDAP password"
 msgstr "LDAP 密码"
 
@@ -4982,12 +4992,12 @@ msgstr "LDAP说"
 msgid "LDAP search"
 msgstr "LDAP搜索"
 
-#: ../templates/selfService/adminMain.php:390
+#: ../templates/selfService/adminMain.php:404
 #: ../help/help.inc:180
 msgid "LDAP search attribute"
 msgstr "LDAP搜索属性"
 
-#: ../lib/account.inc:684
+#: ../lib/account.inc:720
 msgid "LDAP search failed! Please check your preferences."
 msgstr "LDAP搜索失败，请检查配置。"
 
@@ -5000,24 +5010,24 @@ msgstr "LDAP搜索限制"
 msgid "LDAP server"
 msgstr "LDAP服务器"
 
-#: ../lib/account.inc:675
+#: ../lib/account.inc:711
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "超过LDAP限制的大小,无法显示所有条目."
 
 #: ../templates/config/confmain.php:397
 #: ../templates/config/conftypes.php:234
-#: ../templates/selfService/adminMain.php:379
-#: ../templates/profedit/profilepage.php:191
+#: ../templates/selfService/adminMain.php:393
+#: ../templates/profedit/profilepage.php:197
 #: ../help/help.inc:71
 #: ../help/help.inc:176
 msgid "LDAP suffix"
 msgstr "LDAP后缀"
 
-#: ../templates/massDoUpload.php:72
+#: ../templates/massDoUpload.php:75
 msgid "LDAP upload in progress. Please wait."
 msgstr "LDAP上传中,请稍等..."
 
-#: ../templates/selfService/adminMain.php:383
+#: ../templates/selfService/adminMain.php:397
 msgid "LDAP user"
 msgstr "LDAP用户"
 
@@ -5025,7 +5035,7 @@ msgstr "LDAP用户"
 msgid "LDAP user and password"
 msgstr "LDAP用户名和密码"
 
-#: ../templates/serverInfo.php:107
+#: ../templates/serverInfo.php:109
 msgid "LDAP version"
 msgstr "LDAP版本"
 
@@ -5043,13 +5053,13 @@ msgid "LDIF import only supports version 1"
 msgstr "LDIF导入功能只支持版本1"
 
 #: ../lib/modules/customFields.inc:64
-#: ../lib/modules/customFields.inc:269
-#: ../lib/modules/customFields.inc:609
-#: ../lib/modules/customFields.inc:1227
+#: ../lib/modules/customFields.inc:278
+#: ../lib/modules/customFields.inc:672
+#: ../lib/modules/customFields.inc:1284
 msgid "Label"
 msgstr "标签"
 
-#: ../templates/tests/lamdaemonTest.php:183
+#: ../templates/tests/lamdaemonTest.php:185
 msgid "Lamdaemon server and path"
 msgstr "Lamdaemon 服务器和路径"
 
@@ -5057,33 +5067,33 @@ msgstr "Lamdaemon 服务器和路径"
 msgid "Lamdaemon settings"
 msgstr "Lamdaemon设置"
 
-#: ../templates/tests/lamdaemonTest.php:133
+#: ../templates/tests/lamdaemonTest.php:135
 msgid "Lamdaemon successfully run."
 msgstr "Lamdaemon成功执行."
 
-#: ../templates/tests/index.php:50
-#: ../templates/tests/lamdaemonTest.php:50
+#: ../templates/tests/index.php:52
+#: ../templates/tests/lamdaemonTest.php:52
 #: ../lib/tools/tests.inc:110
 msgid "Lamdaemon test"
 msgstr "Lamdaemon测试"
 
-#: ../templates/tests/lamdaemonTest.php:283
+#: ../templates/tests/lamdaemonTest.php:285
 msgid "Lamdaemon test finished."
 msgstr "Lamdaemon 测试结束."
 
-#: ../templates/tests/lamdaemonTest.php:265
+#: ../templates/tests/lamdaemonTest.php:267
 msgid "Lamdaemon version"
 msgstr "Lamdaemon版本"
 
-#: ../templates/tests/lamdaemonTest.php:275
+#: ../templates/tests/lamdaemonTest.php:277
 msgid "Lamdaemon: Quota module installed"
 msgstr "Lamdaemon: 配额模块已安装."
 
-#: ../templates/tests/lamdaemonTest.php:271
+#: ../templates/tests/lamdaemonTest.php:273
 msgid "Lamdaemon: check NSS LDAP"
 msgstr "Lamdaemon: 检查 NSS LDAP"
 
-#: ../templates/tests/lamdaemonTest.php:278
+#: ../templates/tests/lamdaemonTest.php:280
 msgid "Lamdaemon: read quotas"
 msgstr "Lamdaemon: 读取配额"
 
@@ -5102,23 +5112,23 @@ msgstr "语言设定"
 #: ../lib/types/user.inc:97
 #: ../lib/modules/selfRegistration.inc:69
 #: ../lib/modules/selfRegistration.inc:126
-#: ../lib/modules/inetOrgPerson.inc:50
-#: ../lib/modules/inetOrgPerson.inc:122
-#: ../lib/modules/inetOrgPerson.inc:304
-#: ../lib/modules/inetOrgPerson.inc:513
-#: ../lib/modules/inetOrgPerson.inc:613
-#: ../lib/modules/inetOrgPerson.inc:1242
-#: ../lib/modules/inetOrgPerson.inc:2064
-#: ../lib/modules/inetOrgPerson.inc:2541
+#: ../lib/modules/inetOrgPerson.inc:51
+#: ../lib/modules/inetOrgPerson.inc:123
+#: ../lib/modules/inetOrgPerson.inc:308
+#: ../lib/modules/inetOrgPerson.inc:517
+#: ../lib/modules/inetOrgPerson.inc:617
+#: ../lib/modules/inetOrgPerson.inc:1246
+#: ../lib/modules/inetOrgPerson.inc:2068
+#: ../lib/modules/inetOrgPerson.inc:2554
 msgid "Last name"
 msgstr "姓"
 
-#: ../lib/modules/inetOrgPerson.inc:50
 #: ../lib/modules/inetOrgPerson.inc:51
+#: ../lib/modules/inetOrgPerson.inc:52
 msgid "Last name contains invalid characters or is empty!"
 msgstr "姓包含非法字符或为空!"
 
-#: ../lib/modules/inetOrgPerson.inc:614
+#: ../lib/modules/inetOrgPerson.inc:618
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "用户姓.只允许字符,-和空格."
 
@@ -5139,12 +5149,12 @@ msgstr "最后密码变更"
 msgid "Last qualify milliseconds"
 msgstr "最后的限定毫秒"
 
-#: ../lib/modules/dhcp_settings.inc:132
-#: ../lib/modules/dhcp_settings.inc:184
-#: ../lib/modules/dhcp_settings.inc:198
-#: ../lib/modules/dhcp_settings.inc:227
-#: ../lib/modules/dhcp_settings.inc:537
-#: ../lib/modules/dhcp_settings.inc:630
+#: ../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:544
+#: ../lib/modules/dhcp_settings.inc:637
 msgid "Lease time"
 msgstr "释放时间"
 
@@ -5158,12 +5168,12 @@ msgstr "行结尾"
 
 #: ../lib/modules/selfRegistration.inc:51
 #: ../lib/modules/selfRegistration.inc:96
-#: ../lib/modules/passwordSelfReset.inc:81
-#: ../lib/modules/passwordSelfReset.inc:171
+#: ../lib/modules/passwordSelfReset.inc:82
+#: ../lib/modules/passwordSelfReset.inc:172
 msgid "Link text"
 msgstr "链接文本"
 
-#: ../templates/selfService/adminMain.php:325
+#: ../templates/selfService/adminMain.php:339
 msgid "Link to self service login page for your users"
 msgstr "对用户自助服务登录界面的链接."
 
@@ -5190,7 +5200,7 @@ msgstr "列表名"
 msgid "List name already in use."
 msgstr "列表名已经被使用"
 
-#: ../lib/modules/sambaSamAccount.inc:293
+#: ../lib/modules/sambaSamAccount.inc:298
 msgid "List of Samba workstations the user is allowed to login. Empty means every workstation."
 msgstr "允许用户登录的Samba工作站,留空表示所有工作站."
 
@@ -5215,11 +5225,11 @@ msgstr "将被删除的条目列表:"
 msgid "List of valid users"
 msgstr "合法用户列表"
 
-#: ../templates/serverInfo.php:150
+#: ../templates/serverInfo.php:152
 msgid "Listeners"
 msgstr "监听"
 
-#: ../lib/modules.inc:1156
+#: ../lib/modules.inc:1162
 #: ../help/help.inc:162
 msgid "Load profile"
 msgstr "调入配置文件"
@@ -5275,20 +5285,21 @@ msgstr "本地组"
 #: ../lib/modules/device.inc:116
 #: ../lib/modules/device.inc:177
 #: ../lib/modules/device.inc:436
-#: ../lib/modules/inetOrgPerson.inc:127
-#: ../lib/modules/inetOrgPerson.inc:141
-#: ../lib/modules/inetOrgPerson.inc:240
-#: ../lib/modules/inetOrgPerson.inc:481
-#: ../lib/modules/inetOrgPerson.inc:528
-#: ../lib/modules/inetOrgPerson.inc:729
+#: ../lib/modules/inetOrgPerson.inc:128
+#: ../lib/modules/inetOrgPerson.inc:146
+#: ../lib/modules/inetOrgPerson.inc:245
+#: ../lib/modules/inetOrgPerson.inc:485
+#: ../lib/modules/inetOrgPerson.inc:532
 #: ../lib/modules/inetOrgPerson.inc:733
-#: ../lib/modules/inetOrgPerson.inc:1379
-#: ../lib/modules/inetOrgPerson.inc:2082
-#: ../lib/modules/inetOrgPerson.inc:2632
+#: ../lib/modules/inetOrgPerson.inc:737
+#: ../lib/modules/inetOrgPerson.inc:1383
+#: ../lib/modules/inetOrgPerson.inc:2086
+#: ../lib/modules/inetOrgPerson.inc:2697
 msgid "Location"
 msgstr "地点"
 
-#: ../lib/types/user.inc:315
+#: ../lib/types/user.inc:316
+#: ../lib/types/user.inc:324
 msgid "Lock"
 msgstr "锁"
 
@@ -5303,19 +5314,19 @@ msgstr "锁定帐号"
 msgid "Lock account?"
 msgstr "锁定帐号?"
 
-#: ../lib/modules/posixGroup.inc:207
-#: ../lib/modules/posixAccount.inc:257
-#: ../lib/modules/posixAccount.inc:1180
-#: ../lib/modules/inetOrgPerson.inc:1782
+#: ../lib/modules/posixGroup.inc:209
+#: ../lib/modules/posixAccount.inc:271
+#: ../lib/modules/posixAccount.inc:1200
+#: ../lib/modules/inetOrgPerson.inc:1786
 msgid "Lock password"
 msgstr "锁定密码"
 
 #: ../lib/types/ppolicyType.inc:83
-#: ../lib/modules/ppolicy.inc:96
-#: ../lib/modules/ppolicy.inc:143
-#: ../lib/modules/ppolicy.inc:163
-#: ../lib/modules/ppolicy.inc:256
-#: ../lib/modules/ppolicy.inc:478
+#: ../lib/modules/ppolicy.inc:97
+#: ../lib/modules/ppolicy.inc:144
+#: ../lib/modules/ppolicy.inc:164
+#: ../lib/modules/ppolicy.inc:257
+#: ../lib/modules/ppolicy.inc:479
 #: ../lib/modules/sambaDomain.inc:126
 #: ../lib/modules/sambaDomain.inc:191
 #: ../lib/modules/sambaDomain.inc:216
@@ -5333,10 +5344,10 @@ msgid "Lockout time"
 msgstr "锁定的时间"
 
 #: ../lib/types/ppolicyType.inc:88
-#: ../lib/modules/ppolicy.inc:116
-#: ../lib/modules/ppolicy.inc:142
-#: ../lib/modules/ppolicy.inc:250
-#: ../lib/modules/ppolicy.inc:487
+#: ../lib/modules/ppolicy.inc:117
+#: ../lib/modules/ppolicy.inc:143
+#: ../lib/modules/ppolicy.inc:251
+#: ../lib/modules/ppolicy.inc:488
 msgid "Lockout users"
 msgstr "锁定的用户"
 
@@ -5382,12 +5393,12 @@ msgstr "日志"
 msgid "Login"
 msgstr "登录"
 
-#: ../templates/selfService/adminMain.php:401
+#: ../templates/selfService/adminMain.php:415
 #: ../help/help.inc:182
 msgid "Login attribute label"
 msgstr "登录属性标签"
 
-#: ../templates/selfService/adminMain.php:406
+#: ../templates/selfService/adminMain.php:420
 #: ../help/help.inc:184
 msgid "Login caption"
 msgstr "登录标题"
@@ -5398,18 +5409,18 @@ msgid "Login method"
 msgstr "登录方法"
 
 #: ../lib/types/user.inc:99
-#: ../lib/modules/posixAccount.inc:148
-#: ../lib/modules/posixAccount.inc:243
-#: ../lib/modules/posixAccount.inc:320
-#: ../lib/modules/posixAccount.inc:395
-#: ../lib/modules/posixAccount.inc:1173
-#: ../lib/modules/posixAccount.inc:1413
-#: ../lib/modules/posixAccount.inc:1497
-#: ../lib/modules/posixAccount.inc:2132
+#: ../lib/modules/posixAccount.inc:158
+#: ../lib/modules/posixAccount.inc:257
+#: ../lib/modules/posixAccount.inc:334
+#: ../lib/modules/posixAccount.inc:413
+#: ../lib/modules/posixAccount.inc:1193
+#: ../lib/modules/posixAccount.inc:1433
+#: ../lib/modules/posixAccount.inc:1517
+#: ../lib/modules/posixAccount.inc:2158
 msgid "Login shell"
 msgstr "登录shell"
 
-#: ../templates/pdfedit/pdfpage.php:446
+#: ../templates/pdfedit/pdfpage.php:448
 msgid "Logo"
 msgstr "标志"
 
@@ -5420,40 +5431,40 @@ msgstr "标志"
 msgid "Logon for password change"
 msgstr "密码修改登录"
 
-#: ../lib/modules/sambaSamAccount.inc:109
-#: ../lib/modules/sambaSamAccount.inc:317
-#: ../lib/modules/sambaSamAccount.inc:320
-#: ../lib/modules/sambaSamAccount.inc:501
-#: ../lib/modules/sambaSamAccount.inc:579
-#: ../lib/modules/sambaSamAccount.inc:1220
-#: ../lib/modules/sambaSamAccount.inc:1570
+#: ../lib/modules/sambaSamAccount.inc:112
+#: ../lib/modules/sambaSamAccount.inc:322
+#: ../lib/modules/sambaSamAccount.inc:325
+#: ../lib/modules/sambaSamAccount.inc:506
+#: ../lib/modules/sambaSamAccount.inc:584
+#: ../lib/modules/sambaSamAccount.inc:1225
+#: ../lib/modules/sambaSamAccount.inc:1575
 msgid "Logon hours"
 msgstr "可登录时间"
 
-#: ../lib/modules/sambaSamAccount.inc:92
 #: ../lib/modules/sambaSamAccount.inc:93
-#: ../lib/modules/sambaSamAccount.inc:205
-#: ../lib/modules/sambaSamAccount.inc:289
-#: ../lib/modules/sambaSamAccount.inc:485
-#: ../lib/modules/sambaSamAccount.inc:575
-#: ../lib/modules/sambaSamAccount.inc:1173
-#: ../lib/modules/sambaSamAccount.inc:1546
-#: ../lib/modules/sambaSamAccount.inc:1693
+#: ../lib/modules/sambaSamAccount.inc:94
+#: ../lib/modules/sambaSamAccount.inc:209
+#: ../lib/modules/sambaSamAccount.inc:294
+#: ../lib/modules/sambaSamAccount.inc:490
+#: ../lib/modules/sambaSamAccount.inc:580
+#: ../lib/modules/sambaSamAccount.inc:1178
+#: ../lib/modules/sambaSamAccount.inc:1551
+#: ../lib/modules/sambaSamAccount.inc:1698
 msgid "Logon script"
 msgstr "登录脚本"
 
-#: ../lib/modules/sambaSamAccount.inc:92
-#: ../lib/modules/sambaSamAccount.inc:94
+#: ../lib/modules/sambaSamAccount.inc:93
+#: ../lib/modules/sambaSamAccount.inc:95
 msgid "Logon script is invalid!"
 msgstr "登录脚本非法!"
 
 #: ../templates/selfService/selfServiceMain.php:53
-#: ../templates/selfService/selfServiceMain.php:361
+#: ../templates/selfService/selfServiceMain.php:365
 #: ../templates/main_header.php:125
 msgid "Logout"
 msgstr "退出"
 
-#: ../lib/modules/dhcp_settings.inc:89
+#: ../lib/modules/dhcp_settings.inc:96
 msgid "M-Node (0x04)"
 msgstr "M-节点 (0x04)"
 
@@ -5462,9 +5473,9 @@ msgstr "M-节点 (0x04)"
 #: ../lib/modules/ieee802device.inc:61
 #: ../lib/modules/ieee802device.inc:72
 #: ../lib/modules/ieee802device.inc:104
-#: ../lib/modules/fixed_ip.inc:90
-#: ../lib/modules/fixed_ip.inc:338
-#: ../lib/modules/fixed_ip.inc:522
+#: ../lib/modules/fixed_ip.inc:91
+#: ../lib/modules/fixed_ip.inc:339
+#: ../lib/modules/fixed_ip.inc:523
 msgid "MAC address"
 msgstr "MAC地址"
 
@@ -5477,7 +5488,7 @@ msgstr "MAC地址列表"
 msgid "MAC addresses"
 msgstr "MAC地址"
 
-#: ../lib/modules/sambaSamAccount.inc:550
+#: ../lib/modules/sambaSamAccount.inc:555
 msgid "Magadan, Solomon Islands"
 msgstr "马加丹,所罗门群岛"
 
@@ -5486,37 +5497,23 @@ msgstr "马加丹,所罗门群岛"
 msgid "Mail aliases"
 msgstr "邮件别名"
 
-#: ../lib/modules/imapAccess.inc:90
-#: ../lib/modules/imapAccess.inc:118
+#: ../lib/modules/imapAccess.inc:91
+#: ../lib/modules/imapAccess.inc:119
 msgid "Mail domains"
 msgstr "邮箱域"
 
-#: ../lib/modules/kolabUser.inc:88
-#: ../lib/modules/kolabUser.inc:159
-#: ../lib/modules/kolabUser.inc:207
-#: ../lib/modules/kolabUser.inc:220
-#: ../lib/modules/kolabUser.inc:306
-#: ../lib/modules/kolabUser.inc:779
-msgid "Mail quota"
-msgstr "邮件限额"
-
-#: ../lib/modules/kolabUser.inc:241
-#: ../lib/modules/kolabUser.inc:242
-msgid "Mail quota must be a number!"
-msgstr "邮件限额必须是数字!"
-
 #: ../lib/modules/inetLocalMailRecipient.inc:51
 msgid "Mail routing"
 msgstr "邮件路由"
 
-#: ../lib/modules/selfRegistration.inc:503
-#: ../lib/modules/selfRegistration.inc:533
-#: ../lib/modules/passwordSelfReset.inc:1150
-#: ../lib/modules/passwordSelfReset.inc:1191
+#: ../lib/modules/selfRegistration.inc:513
+#: ../lib/modules/selfRegistration.inc:543
+#: ../lib/modules/passwordSelfReset.inc:1154
+#: ../lib/modules/passwordSelfReset.inc:1195
 msgid "Mail sending failed."
 msgstr "邮件发送失败."
 
-#: ../lib/modules/kolabUser.inc:85
+#: ../lib/modules/kolabUser.inc:84
 #: ../lib/modules/inetLocalMailRecipient.inc:73
 #: ../lib/modules/inetLocalMailRecipient.inc:78
 #: ../lib/modules/inetLocalMailRecipient.inc:105
@@ -5526,7 +5523,7 @@ msgstr "邮件发送失败."
 msgid "Mail server"
 msgstr "邮件服务器"
 
-#: ../lib/account.inc:898
+#: ../lib/account.inc:935
 #, php-format
 msgid "Mail successfully sent to %s."
 msgstr "邮件已经成功发送到%s."
@@ -5542,35 +5539,35 @@ msgstr "邮件已经成功发送到%s."
 #: ../lib/modules/asteriskVoicemail.inc:149
 #: ../lib/modules/asteriskVoicemail.inc:236
 #: ../lib/modules/asteriskVoicemail.inc:390
-#: ../lib/modules/imapAccess.inc:55
-#: ../lib/modules/imapAccess.inc:96
-#: ../lib/modules/imapAccess.inc:217
+#: ../lib/modules/imapAccess.inc:56
+#: ../lib/modules/imapAccess.inc:97
+#: ../lib/modules/imapAccess.inc:218
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: ../lib/modules/imapAccess.inc:226
+#: ../lib/modules/imapAccess.inc:227
 msgid "Mailbox already exists on IMAP server."
 msgstr "在IMAP服务器上这个邮箱已经存在。"
 
-#: ../lib/modules/imapAccess.inc:233
+#: ../lib/modules/imapAccess.inc:234
 msgid "Mailbox does not exist on IMAP server."
 msgstr "在IMAP服务器上不存在这个邮箱。"
 
-#: ../lib/modules/kolabUser.inc:151
-#: ../lib/modules/kolabUser.inc:182
-#: ../lib/modules/kolabUser.inc:216
-#: ../lib/modules/kolabUser.inc:292
-#: ../lib/modules/kolabUser.inc:297
-#: ../lib/modules/kolabUser.inc:775
+#: ../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:626
 msgid "Mailbox home server"
 msgstr "邮件宿主服务器"
 
-#: ../lib/modules/kolabUser.inc:237
+#: ../lib/modules/kolabUser.inc:184
 msgid "Mailbox home server name is empty!"
 msgstr "邮件宿主服务器为空 !"
 
-#: ../lib/modules/kolabUser.inc:235
-#: ../lib/modules/kolabUser.inc:236
+#: ../lib/modules/kolabUser.inc:182
+#: ../lib/modules/kolabUser.inc:183
 msgid "Mailbox home server name is invalid!"
 msgstr "邮件宿主服务器非法!"
 
@@ -5582,12 +5579,12 @@ msgstr "邮件别名(例如:NIS邮件别名)"
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "邮件转发."
 
-#: ../templates/pdfedit/pdfpage.php:360
-#: ../templates/pdfedit/pdfpage.php:615
+#: ../templates/pdfedit/pdfpage.php:362
+#: ../templates/pdfedit/pdfpage.php:617
 msgid "Main"
 msgstr "主要设置"
 
-#: ../templates/selfService/adminMain.php:412
+#: ../templates/selfService/adminMain.php:426
 #: ../help/help.inc:186
 msgid "Main page caption"
 msgstr "主页标题"
@@ -5596,11 +5593,11 @@ msgstr "主页标题"
 msgid "Make sure your filter (above) will select all child records."
 msgstr "确认您的上述过滤器将选定所有的子记录"
 
-#: ../templates/pdfedit/pdfmain.php:142
+#: ../templates/pdfedit/pdfmain.php:144
 msgid "Manage existing PDF structures"
 msgstr "管理已有的PDF架构"
 
-#: ../templates/profedit/profilemain.php:137
+#: ../templates/profedit/profilemain.php:139
 msgid "Manage existing profiles"
 msgstr "管理已有的设置"
 
@@ -5612,7 +5609,7 @@ msgstr "管理自助服务设置"
 msgid "Manage server profiles"
 msgstr "管理服务器设置"
 
-#: ../templates/serverInfo.php:103
+#: ../templates/serverInfo.php:105
 msgid "Managed suffixes"
 msgstr "管理后缀"
 
@@ -5621,13 +5618,13 @@ msgstr "管理后缀"
 #: ../lib/modules/ipHost.inc:99
 #: ../lib/modules/ipHost.inc:170
 #: ../lib/modules/ipHost.inc:315
-#: ../lib/modules/inetOrgPerson.inc:272
-#: ../lib/modules/inetOrgPerson.inc:353
-#: ../lib/modules/inetOrgPerson.inc:579
-#: ../lib/modules/inetOrgPerson.inc:621
+#: ../lib/modules/inetOrgPerson.inc:277
+#: ../lib/modules/inetOrgPerson.inc:357
+#: ../lib/modules/inetOrgPerson.inc:583
 #: ../lib/modules/inetOrgPerson.inc:625
-#: ../lib/modules/inetOrgPerson.inc:1759
-#: ../lib/modules/inetOrgPerson.inc:2066
+#: ../lib/modules/inetOrgPerson.inc:629
+#: ../lib/modules/inetOrgPerson.inc:1763
+#: ../lib/modules/inetOrgPerson.inc:2070
 msgid "Manager"
 msgstr "管理员"
 
@@ -5671,12 +5668,12 @@ msgstr "映射条目包含非法字符,只能使用 ASCII 字符."
 msgid "Mapping name"
 msgstr "映射的名字"
 
-#: ../lib/modules/kolabUser.inc:392
-#: ../lib/modules/kolabUser.inc:566
+#: ../lib/modules/kolabUser.inc:313
+#: ../lib/modules/kolabUser.inc:454
 msgid "Mark account for deletion"
 msgstr "将此帐号标记为删除"
 
-#: ../lib/modules/kolabUser.inc:163
+#: ../lib/modules/kolabUser.inc:133
 msgid "Mark for deletion"
 msgstr "标记为删除"
 
@@ -5699,58 +5696,58 @@ msgstr "系统管理员密码错误!"
 msgid "Master passwords are different or empty!"
 msgstr "管理员密码不同或为空!"
 
-#: ../templates/schema/schema.php:266
+#: ../templates/schema/schema.php:268
 msgid "Matching rule OID"
 msgstr "匹配规则OID"
 
-#: ../templates/schema/schema.php:75
-#: ../templates/schema/schema.php:76
+#: ../templates/schema/schema.php:77
+#: ../templates/schema/schema.php:78
 msgid "Matching rules"
 msgstr "匹配规则"
 
-#: ../templates/serverInfo.php:171
+#: ../templates/serverInfo.php:173
 msgid "Max. file descriptors"
 msgstr "最大的文件描述符"
 
-#: ../lib/modules/posixGroup.inc:317
-#: ../lib/modules/posixGroup.inc:490
-#: ../lib/modules/posixGroup.inc:491
+#: ../lib/modules/posixGroup.inc:319
+#: ../lib/modules/posixGroup.inc:501
+#: ../lib/modules/posixGroup.inc:502
 msgid "Maximum GID number"
 msgstr "最大GID号"
 
-#: ../lib/modules/posixGroup.inc:490
+#: ../lib/modules/posixGroup.inc:501
 msgid "Maximum GID number is invalid or empty!"
 msgstr "最大的GID非法或为空!"
 
-#: ../lib/modules/posixGroup.inc:491
+#: ../lib/modules/posixGroup.inc:502
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "最大GID必须大于最小GID!"
 
-#: ../lib/modules/posixAccount.inc:68
-#: ../lib/modules/posixAccount.inc:70
-#: ../lib/modules/posixAccount.inc:71
-#: ../lib/modules/posixAccount.inc:72
-#: ../lib/modules/posixAccount.inc:170
-#: ../lib/modules/posixAccount.inc:179
+#: ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixAccount.inc:182
+#: ../lib/modules/posixAccount.inc:192
 msgid "Maximum UID number"
 msgstr "最大UID号"
 
-#: ../lib/modules/posixAccount.inc:68
-#: ../lib/modules/posixAccount.inc:70
+#: ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:80
 msgid "Maximum UID number is invalid!"
 msgstr "最大UID号非法"
 
-#: ../lib/modules/posixAccount.inc:71
-#: ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:82
 msgid "Maximum UID number must be greater than minimum UID number!"
 msgstr "最大UID号必须大于最小UID号!"
 
 #: ../lib/types/ppolicyType.inc:84
-#: ../lib/modules/ppolicy.inc:100
-#: ../lib/modules/ppolicy.inc:144
-#: ../lib/modules/ppolicy.inc:164
-#: ../lib/modules/ppolicy.inc:264
-#: ../lib/modules/ppolicy.inc:479
+#: ../lib/modules/ppolicy.inc:101
+#: ../lib/modules/ppolicy.inc:145
+#: ../lib/modules/ppolicy.inc:165
+#: ../lib/modules/ppolicy.inc:265
+#: ../lib/modules/ppolicy.inc:480
 msgid "Maximum failure count"
 msgstr "最大失败次数"
 
@@ -5759,20 +5756,20 @@ msgstr "最大失败次数"
 msgid "Maximum file size"
 msgstr "最大文件大小"
 
-#: ../lib/modules/dhcp_settings.inc:136
-#: ../lib/modules/dhcp_settings.inc:185
-#: ../lib/modules/dhcp_settings.inc:199
-#: ../lib/modules/dhcp_settings.inc:233
-#: ../lib/modules/dhcp_settings.inc:541
-#: ../lib/modules/dhcp_settings.inc:631
+#: ../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:548
+#: ../lib/modules/dhcp_settings.inc:638
 msgid "Maximum lease time"
 msgstr "最大释放时间"
 
-#: ../templates/schema/schema.php:212
+#: ../templates/schema/schema.php:214
 msgid "Maximum length"
 msgstr "最大长度"
 
-#: ../lib/lists.inc:909
+#: ../lib/lists.inc:910
 #: ../help/help.inc:93
 msgid "Maximum list entries"
 msgstr "最大列表条目"
@@ -5789,12 +5786,12 @@ msgstr "在中断一个通话之前的非活动秒数最大值"
 #: ../lib/modules/shadowAccount.inc:218
 #: ../lib/modules/shadowAccount.inc:329
 #: ../lib/modules/shadowAccount.inc:486
-#: ../lib/modules/ppolicy.inc:80
-#: ../lib/modules/ppolicy.inc:136
-#: ../lib/modules/ppolicy.inc:159
+#: ../lib/modules/ppolicy.inc:81
+#: ../lib/modules/ppolicy.inc:137
 #: ../lib/modules/ppolicy.inc:160
-#: ../lib/modules/ppolicy.inc:198
-#: ../lib/modules/ppolicy.inc:465
+#: ../lib/modules/ppolicy.inc:161
+#: ../lib/modules/ppolicy.inc:199
+#: ../lib/modules/ppolicy.inc:466
 #: ../lib/modules/sambaDomain.inc:122
 #: ../lib/modules/sambaDomain.inc:190
 #: ../lib/modules/sambaDomain.inc:213
@@ -5805,12 +5802,12 @@ msgid "Maximum password age"
 msgstr "密码最长生命"
 
 #: ../lib/types/netgroup.inc:94
-#: ../lib/modules/nisnetgroup.inc:85
-#: ../lib/modules/nisnetgroup.inc:89
-#: ../lib/modules/nisnetgroup.inc:122
-#: ../lib/modules/nisnetgroup.inc:132
-#: ../lib/modules/nisnetgroup.inc:276
-#: ../lib/modules/nisnetgroup.inc:580
+#: ../lib/modules/nisnetgroup.inc:88
+#: ../lib/modules/nisnetgroup.inc:92
+#: ../lib/modules/nisnetgroup.inc:125
+#: ../lib/modules/nisnetgroup.inc:135
+#: ../lib/modules/nisnetgroup.inc:279
+#: ../lib/modules/nisnetgroup.inc:583
 #: ../lib/modules/groupOfNames.inc:76
 #: ../lib/modules/groupOfNames.inc:80
 #: ../lib/modules/groupOfNames.inc:113
@@ -5826,15 +5823,15 @@ msgstr "组成员"
 msgid "Members are optional"
 msgstr "组员是可选的"
 
-#: ../lib/modules/sambaSamAccount.inc:537
+#: ../lib/modules/sambaSamAccount.inc:542
 msgid "Mid-Atlantic"
 msgstr "大西洋地区中部"
 
-#: ../lib/modules/sambaSamAccount.inc:528
+#: ../lib/modules/sambaSamAccount.inc:533
 msgid "Midway Island, Samoa"
 msgstr "中途岛,萨摩亚"
 
-#: ../lib/modules/inetOrgPerson.inc:306
+#: ../lib/modules/inetOrgPerson.inc:310
 msgid "Miller"
 msgstr "米勒"
 
@@ -5845,29 +5842,29 @@ msgstr "米勒"
 msgid "Minimal password length"
 msgstr "最短密码长度"
 
-#: ../lib/modules/posixGroup.inc:314
-#: ../lib/modules/posixGroup.inc:489
+#: ../lib/modules/posixGroup.inc:316
+#: ../lib/modules/posixGroup.inc:500
 msgid "Minimum GID number"
 msgstr "最小GID号"
 
-#: ../lib/modules/posixGroup.inc:489
+#: ../lib/modules/posixGroup.inc:500
 msgid "Minimum GID number is invalid or empty!"
 msgstr "最小GID错误或为空"
 
-#: ../lib/modules/posixAccount.inc:67
-#: ../lib/modules/posixAccount.inc:69
-#: ../lib/modules/posixAccount.inc:167
-#: ../lib/modules/posixAccount.inc:176
+#: ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:79
+#: ../lib/modules/posixAccount.inc:179
+#: ../lib/modules/posixAccount.inc:189
 msgid "Minimum UID number"
 msgstr "最小UID号"
 
-#: ../lib/modules/posixAccount.inc:67
-#: ../lib/modules/posixAccount.inc:69
+#: ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:79
 msgid "Minimum UID number is invalid!"
 msgstr "最小UID非法!"
 
-#: ../lib/modules/passwordSelfReset.inc:73
-#: ../lib/modules/passwordSelfReset.inc:169
+#: ../lib/modules/passwordSelfReset.inc:74
+#: ../lib/modules/passwordSelfReset.inc:170
 msgid "Minimum answer length"
 msgstr "最短答案的长度"
 
@@ -5890,11 +5887,11 @@ msgstr "最少数字字符数"
 #: ../lib/modules/shadowAccount.inc:212
 #: ../lib/modules/shadowAccount.inc:321
 #: ../lib/modules/shadowAccount.inc:485
-#: ../lib/modules/ppolicy.inc:76
-#: ../lib/modules/ppolicy.inc:135
-#: ../lib/modules/ppolicy.inc:158
-#: ../lib/modules/ppolicy.inc:190
-#: ../lib/modules/ppolicy.inc:464
+#: ../lib/modules/ppolicy.inc:77
+#: ../lib/modules/ppolicy.inc:136
+#: ../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
@@ -5905,11 +5902,11 @@ msgstr "密码最短生命"
 
 #: ../templates/config/mainmanage.php:203
 #: ../lib/types/ppolicyType.inc:87
-#: ../lib/modules/ppolicy.inc:112
-#: ../lib/modules/ppolicy.inc:139
-#: ../lib/modules/ppolicy.inc:167
-#: ../lib/modules/ppolicy.inc:242
-#: ../lib/modules/ppolicy.inc:482
+#: ../lib/modules/ppolicy.inc:113
+#: ../lib/modules/ppolicy.inc:140
+#: ../lib/modules/ppolicy.inc:168
+#: ../lib/modules/ppolicy.inc:243
+#: ../lib/modules/ppolicy.inc:483
 msgid "Minimum password length"
 msgstr "最短密码长度"
 
@@ -5930,19 +5927,19 @@ msgid "Missing modify command add, delete or replace"
 msgstr "取消了增,删,改等修改命令"
 
 #: ../lib/types/user.inc:190
-#: ../lib/modules/inetOrgPerson.inc:56
-#: ../lib/modules/inetOrgPerson.inc:123
-#: ../lib/modules/inetOrgPerson.inc:256
-#: ../lib/modules/inetOrgPerson.inc:425
-#: ../lib/modules/inetOrgPerson.inc:552
-#: ../lib/modules/inetOrgPerson.inc:669
+#: ../lib/modules/inetOrgPerson.inc:57
+#: ../lib/modules/inetOrgPerson.inc:124
+#: ../lib/modules/inetOrgPerson.inc:261
+#: ../lib/modules/inetOrgPerson.inc:429
+#: ../lib/modules/inetOrgPerson.inc:556
 #: ../lib/modules/inetOrgPerson.inc:673
-#: ../lib/modules/inetOrgPerson.inc:1577
-#: ../lib/modules/inetOrgPerson.inc:2074
+#: ../lib/modules/inetOrgPerson.inc:677
+#: ../lib/modules/inetOrgPerson.inc:1581
+#: ../lib/modules/inetOrgPerson.inc:2078
 msgid "Mobile number"
 msgstr "手机号码"
 
-#: ../lib/modules/inetOrgPerson.inc:2576
+#: ../lib/modules/inetOrgPerson.inc:2609
 msgid "Mobile telephone number"
 msgstr "手机号码"
 
@@ -5962,13 +5959,13 @@ msgstr "修改时间"
 msgid "Modified by"
 msgstr "修改者"
 
-#: ../templates/serverInfo.php:312
-#: ../templates/serverInfo.php:385
+#: ../templates/serverInfo.php:314
+#: ../templates/serverInfo.php:387
 msgid "Modify"
 msgstr "修改"
 
-#: ../templates/serverInfo.php:326
-#: ../templates/serverInfo.php:391
+#: ../templates/serverInfo.php:328
+#: ../templates/serverInfo.php:393
 msgid "Modify RDN"
 msgstr "修改RDN"
 
@@ -5990,7 +5987,7 @@ msgstr "修改中"
 #: ../templates/config/confmain.php:205
 #: ../templates/config/moduleSettings.php:166
 #: ../templates/config/conftypes.php:185
-#: ../templates/selfService/adminMain.php:362
+#: ../templates/selfService/adminMain.php:376
 msgid "Module settings"
 msgstr "模块设置"
 
@@ -6001,18 +5998,18 @@ msgstr "模块设置"
 msgid "Modules"
 msgstr "模块"
 
-#: ../lib/modules/sambaSamAccount.inc:1311
+#: ../lib/modules/sambaSamAccount.inc:1316
 msgid "Monday"
 msgstr "星期一"
 
-#: ../lib/modules/sambaSamAccount.inc:532
+#: ../lib/modules/sambaSamAccount.inc:537
 msgid "Mountain Time (US & Canada)"
 msgstr "时区(美国和加拿大)"
 
-#: ../lib/modules/quota.inc:97
-#: ../lib/modules/quota.inc:389
-#: ../lib/modules/quota.inc:495
-#: ../lib/modules/quota.inc:622
+#: ../lib/modules/quota.inc:98
+#: ../lib/modules/quota.inc:392
+#: ../lib/modules/quota.inc:498
+#: ../lib/modules/quota.inc:625
 #: ../lib/modules/systemQuotas.inc:90
 #: ../lib/modules/systemQuotas.inc:115
 #: ../lib/modules/systemQuotas.inc:375
@@ -6024,15 +6021,19 @@ msgstr "挂接点"
 msgid "Mountpoint contains invalid characters."
 msgstr "装配点包含非法字符"
 
-#: ../lib/modules/quota.inc:98
+#: ../lib/modules/quota.inc:99
 msgid "Mountpoint of device with enabled quotas."
 msgstr "可限制配额设备挂接点"
 
+#: ../lib/modules/customFields.inc:1451
+msgid "Multi-select fields must not contain empty values."
+msgstr "多选域不能包含空值."
+
 #: ../lib/modules/zarafaDynamicGroup.inc:69
 #: ../lib/modules/zarafaGroup.inc:68
-#: ../lib/modules/eduPerson.inc:98
-#: ../lib/modules/eduPerson.inc:110
-#: ../lib/modules/eduPerson.inc:126
+#: ../lib/modules/eduPerson.inc:99
+#: ../lib/modules/eduPerson.inc:111
+#: ../lib/modules/eduPerson.inc:127
 #: ../lib/modules/zarafaUser.inc:149
 #: ../lib/modules/sudoRole.inc:89
 #: ../lib/modules/sudoRole.inc:94
@@ -6043,25 +6044,28 @@ 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/inetOrgPerson.inc:626
-#: ../lib/modules/inetOrgPerson.inc:634
-#: ../lib/modules/inetOrgPerson.inc:642
-#: ../lib/modules/inetOrgPerson.inc:650
-#: ../lib/modules/inetOrgPerson.inc:666
-#: ../lib/modules/inetOrgPerson.inc:674
-#: ../lib/modules/inetOrgPerson.inc:682
-#: ../lib/modules/inetOrgPerson.inc:690
-#: ../lib/modules/inetOrgPerson.inc:698
-#: ../lib/modules/inetOrgPerson.inc:718
-#: ../lib/modules/inetOrgPerson.inc:734
-#: ../lib/modules/inetOrgPerson.inc:742
-#: ../lib/modules/inetOrgPerson.inc:754
-#: ../lib/modules/inetOrgPerson.inc:762
-#: ../lib/modules/inetOrgPerson.inc:778
-#: ../lib/modules/inetOrgPerson.inc:786
+#: ../lib/modules/inetOrgPerson.inc:630
+#: ../lib/modules/inetOrgPerson.inc:638
+#: ../lib/modules/inetOrgPerson.inc:646
+#: ../lib/modules/inetOrgPerson.inc:654
+#: ../lib/modules/inetOrgPerson.inc:670
+#: ../lib/modules/inetOrgPerson.inc:678
+#: ../lib/modules/inetOrgPerson.inc:686
+#: ../lib/modules/inetOrgPerson.inc:694
+#: ../lib/modules/inetOrgPerson.inc:702
+#: ../lib/modules/inetOrgPerson.inc:722
+#: ../lib/modules/inetOrgPerson.inc:738
+#: ../lib/modules/inetOrgPerson.inc:746
+#: ../lib/modules/inetOrgPerson.inc:758
+#: ../lib/modules/inetOrgPerson.inc:766
+#: ../lib/modules/inetOrgPerson.inc:782
+#: ../lib/modules/inetOrgPerson.inc:790
 #: ../lib/modules/systemQuotas.inc:63
-#: ../lib/modules/freeRadius.inc:93
+#: ../lib/modules/freeRadius.inc:94
 #: ../lib/modules/groupOfNames.inc:73
 msgid "Multiple values are separated by semicolon."
 msgstr "用逗号分隔多值."
@@ -6081,16 +6085,16 @@ msgstr "彩铃"
 
 #: ../lib/modules/ipHost.inc:86
 #: ../lib/modules/device.inc:103
-#: ../lib/modules/inetOrgPerson.inc:483
+#: ../lib/modules/inetOrgPerson.inc:487
 msgid "MyCity"
 msgstr "城市"
 
-#: ../lib/modules/inetOrgPerson.inc:387
-#: ../lib/modules/inetOrgPerson.inc:395
+#: ../lib/modules/inetOrgPerson.inc:391
+#: ../lib/modules/inetOrgPerson.inc:399
 msgid "Mycity"
 msgstr "城市"
 
-#: ../lib/modules/inetOrgPerson.inc:371
+#: ../lib/modules/inetOrgPerson.inc:375
 msgid "Mystreetname 42"
 msgstr "街道42号"
 
@@ -6107,7 +6111,7 @@ msgstr "NAT"
 msgid "NAT setting for this account."
 msgstr "此帐号的NAT设置"
 
-#: ../lib/modules/nisnetgroup.inc:57
+#: ../lib/modules/nisnetgroup.inc:60
 msgid "NIS net group"
 msgstr "NIS网络组"
 
@@ -6136,12 +6140,12 @@ msgstr "NIS 对象条目"
 msgid "NIS objects"
 msgstr "NIS 对象"
 
-#: ../templates/serverInfo.php:145
-#: ../templates/masscreate.php:280
-#: ../templates/masscreate.php:355
-#: ../templates/schema/schema.php:266
-#: ../lib/types/automountType.inc:77
-#: ../lib/types/automountType.inc:262
+#: ../templates/serverInfo.php:147
+#: ../templates/masscreate.php:285
+#: ../templates/masscreate.php:360
+#: ../templates/schema/schema.php:268
+#: ../lib/types/automountType.inc:86
+#: ../lib/types/automountType.inc:296
 #: ../lib/types/ppolicyType.inc:77
 #: ../lib/modules/device.inc:54
 #: ../lib/modules/device.inc:82
@@ -6153,20 +6157,20 @@ msgstr "NIS 对象"
 #: ../lib/modules/nisObject.inc:104
 #: ../lib/modules/nisObject.inc:130
 #: ../lib/modules/nisObject.inc:210
-#: ../lib/modules/ppolicy.inc:72
-#: ../lib/modules/ppolicy.inc:134
-#: ../lib/modules/ppolicy.inc:157
-#: ../lib/modules/ppolicy.inc:182
-#: ../lib/modules/ppolicy.inc:463
-#: ../lib/modules/automount.inc:54
-#: ../lib/modules/automount.inc:70
-#: ../lib/modules/automount.inc:93
-#: ../lib/modules/automount.inc:118
-#: ../lib/modules/automount.inc:190
-#: ../lib/modules/asteriskExtension.inc:812
+#: ../lib/modules/ppolicy.inc:73
+#: ../lib/modules/ppolicy.inc:135
+#: ../lib/modules/ppolicy.inc:158
+#: ../lib/modules/ppolicy.inc:183
+#: ../lib/modules/ppolicy.inc:464
+#: ../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:821
 #: ../lib/modules/customFields.inc:60
-#: ../lib/modules/customFields.inc:260
-#: ../lib/modules/customFields.inc:600
+#: ../lib/modules/customFields.inc:269
+#: ../lib/modules/customFields.inc:663
 #: ../lib/modules/groupOfNames.inc:170
 msgid "Name"
 msgstr "名"
@@ -6183,39 +6187,39 @@ msgstr "将来保存的配置名,如果配置名存在,会被覆盖."
 msgid "Named object"
 msgstr "已命名对象"
 
-#: ../lib/modules/dhcp_settings.inc:172
-#: ../lib/modules/dhcp_settings.inc:191
-#: ../lib/modules/dhcp_settings.inc:569
-#: ../lib/modules/dhcp_settings.inc:637
-#: ../lib/modules/freeRadius.inc:80
-#: ../lib/modules/freeRadius.inc:116
-#: ../lib/modules/freeRadius.inc:130
-#: ../lib/modules/freeRadius.inc:193
-#: ../lib/modules/freeRadius.inc:220
-#: ../lib/modules/freeRadius.inc:312
-#: ../lib/modules/freeRadius.inc:619
+#: ../lib/modules/dhcp_settings.inc:179
+#: ../lib/modules/dhcp_settings.inc:198
+#: ../lib/modules/dhcp_settings.inc:576
+#: ../lib/modules/dhcp_settings.inc:644
+#: ../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
+#: ../lib/modules/freeRadius.inc:620
 msgid "Net mask"
 msgstr "子网掩码"
 
-#: ../lib/modules/dhcp_settings.inc:148
-#: ../lib/modules/dhcp_settings.inc:188
-#: ../lib/modules/dhcp_settings.inc:202
-#: ../lib/modules/dhcp_settings.inc:251
-#: ../lib/modules/dhcp_settings.inc:549
-#: ../lib/modules/dhcp_settings.inc:634
+#: ../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:556
+#: ../lib/modules/dhcp_settings.inc:641
 msgid "Netbios name servers"
 msgstr "Netbios命名服务器"
 
-#: ../lib/modules/dhcp_settings.inc:152
-#: ../lib/modules/dhcp_settings.inc:189
-#: ../lib/modules/dhcp_settings.inc:204
-#: ../lib/modules/dhcp_settings.inc:257
-#: ../lib/modules/dhcp_settings.inc:559
-#: ../lib/modules/dhcp_settings.inc:635
+#: ../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:566
+#: ../lib/modules/dhcp_settings.inc:642
 msgid "Netbios node type"
 msgstr "Netbios 节点类型"
 
-#: ../lib/modules/authorizedServiceObject.inc:167
+#: ../lib/modules/authorizedServiceObject.inc:180
 msgid "New Authorized Service"
 msgstr "新授权服务"
 
@@ -6237,7 +6241,7 @@ msgstr "新MAC地址"
 msgid "New NIS object"
 msgstr "新 NIS 对象"
 
-#: ../templates/ou_edit.php:75
+#: ../templates/ou_edit.php:77
 msgid "New OU created successfully."
 msgstr "新OU建立成功."
 
@@ -6245,7 +6249,7 @@ msgstr "新OU建立成功."
 msgid "New SSH public key"
 msgstr "新SSH公钥"
 
-#: ../lib/modules/inetOrgPerson.inc:491
+#: ../lib/modules/inetOrgPerson.inc:495
 msgid "New York"
 msgstr "纽约"
 
@@ -6261,13 +6265,13 @@ msgstr "新地址列表"
 msgid "New alias"
 msgstr "新别名"
 
-#: ../lib/types/automountType.inc:101
-#: ../lib/types/automountType.inc:188
+#: ../lib/types/automountType.inc:110
+#: ../lib/types/automountType.inc:216
 msgid "New automount entry"
 msgstr "新自动安装条目"
 
-#: ../lib/types/automountType.inc:210
-#: ../lib/types/automountType.inc:211
+#: ../lib/types/automountType.inc:244
+#: ../lib/types/automountType.inc:245
 msgid "New automount map"
 msgstr "新自动装配图"
 
@@ -6285,12 +6289,12 @@ msgstr "新域"
 msgid "New extension"
 msgstr "新扩展"
 
-#: ../templates/pdfedit/pdfpage.php:567
+#: ../templates/pdfedit/pdfpage.php:569
 msgid "New field"
 msgstr "新字段"
 
 #: ../lib/types/gon.inc:119
-#: ../lib/types/gon.inc:180
+#: ../lib/types/gon.inc:182
 #: ../lib/types/zarafaDynamicGroupType.inc:119
 #: ../lib/types/zarafaDynamicGroupType.inc:167
 #: ../lib/types/group.inc:135
@@ -6322,14 +6326,15 @@ msgstr "新管理员密码设置成功."
 msgid "New object"
 msgstr "新对象"
 
-#: ../templates/ou_edit.php:178
+#: ../templates/ou_edit.php:180
 #: ../help/help.inc:213
 msgid "New organisational unit"
 msgstr "新组织单元"
 
 #: ../templates/config/confmain.php:414
-#: ../lib/modules/posixAccount.inc:2107
-#: ../lib/modules/passwordSelfReset.inc:806
+#: ../lib/modules/sambaSamAccount.inc:2120
+#: ../lib/modules/posixAccount.inc:2125
+#: ../lib/modules/passwordSelfReset.inc:810
 msgid "New password"
 msgstr "新密码"
 
@@ -6361,7 +6366,7 @@ msgstr "新收信者"
 msgid "New required attributes"
 msgstr "新必要属性"
 
-#: ../templates/pdfedit/pdfpage.php:535
+#: ../templates/pdfedit/pdfpage.php:537
 msgid "New section"
 msgstr "新节"
 
@@ -6371,7 +6376,7 @@ msgid "New sudo role"
 msgstr "新sudo角色"
 
 #: ../lib/types/user.inc:158
-#: ../lib/types/user.inc:465
+#: ../lib/types/user.inc:476
 msgid "New user"
 msgstr "新用户"
 
@@ -6431,19 +6436,19 @@ msgstr "下一个用户的RID"
 msgid "Next user RID is not a number!"
 msgstr "下一个用户的RID不是数字!"
 
-#: ../lib/modules/eduPerson.inc:88
-#: ../lib/modules/eduPerson.inc:167
-#: ../lib/modules/eduPerson.inc:199
-#: ../lib/modules/eduPerson.inc:311
-#: ../lib/modules/eduPerson.inc:673
+#: ../lib/modules/eduPerson.inc:89
+#: ../lib/modules/eduPerson.inc:168
+#: ../lib/modules/eduPerson.inc:200
+#: ../lib/modules/eduPerson.inc:312
+#: ../lib/modules/eduPerson.inc:674
 msgid "Nick names"
 msgstr "昵称"
 
-#: ../templates/schema/schema.php:151
-#: ../templates/schema/schema.php:193
-#: ../templates/schema/schema.php:198
-#: ../templates/schema/schema.php:203
-#: ../lib/modules/imapAccess.inc:108
+#: ../templates/schema/schema.php:153
+#: ../templates/schema/schema.php:195
+#: ../templates/schema/schema.php:200
+#: ../templates/schema/schema.php:205
+#: ../lib/modules/imapAccess.inc:109
 msgid "No"
 msgstr "否"
 
@@ -6464,13 +6469,13 @@ msgstr "未发现 NIS 对象!"
 msgid "No RDN attribute was selected."
 msgstr "没有选中RDN属性"
 
-#: ../lib/modules/sambaSamAccount.inc:1060
+#: ../lib/modules/sambaSamAccount.inc:1065
 #: ../lib/modules/sambaGroupMapping.inc:245
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "在LDAP中没有发现Samba域,请先建立一个."
 
-#: ../lib/modules/posixAccount.inc:446
-#: ../lib/modules/posixAccount.inc:1075
+#: ../lib/modules/posixAccount.inc:464
+#: ../lib/modules/posixAccount.inc:1095
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "在LDAP中没有发现Unix组,请先建立一个."
 
@@ -6483,7 +6488,7 @@ msgstr "没有发现地址列表!"
 msgid "No aliases found!"
 msgstr "没有发现别名!"
 
-#: ../lib/types/automountType.inc:187
+#: ../lib/types/automountType.inc:215
 msgid "No automount entries found!"
 msgstr "未发现自动挂接条目!"
 
@@ -6500,7 +6505,7 @@ msgstr "未做任何修改."
 msgid "No current value for attribute <b>%s</b>."
 msgstr "属性<b>%s</b>没有当前值."
 
-#: ../templates/schema/schema.php:142
+#: ../templates/schema/schema.php:144
 msgid "No description"
 msgstr "没有描述"
 
@@ -6513,16 +6518,16 @@ msgstr "没有发现域!"
 msgid "No entry was selected to delete"
 msgstr "没有选中要删除的条目"
 
-#: ../lib/modules/inetOrgPerson.inc:80
+#: ../lib/modules/inetOrgPerson.inc:81
 msgid "No file selected."
 msgstr "没有选择文件!"
 
-#: ../lib/modules/posixGroup.inc:487
-#: ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixGroup.inc:498
+#: ../lib/modules/posixAccount.inc:88
 msgid "No free ID-Number!"
 msgstr "没有可用的ID号!"
 
-#: ../lib/types/gon.inc:179
+#: ../lib/types/gon.inc:181
 #: ../lib/types/zarafaDynamicGroupType.inc:166
 #: ../lib/types/group.inc:205
 #: ../lib/types/netgroup.inc:170
@@ -6545,12 +6550,12 @@ msgstr "没有导入的来源"
 msgid "No internal attributes"
 msgstr "没有内部属性"
 
-#: ../templates/tests/lamdaemonTest.php:193
+#: ../templates/tests/lamdaemonTest.php:195
 msgid "No lamdaemon path set, please update your LAM configuration settings."
 msgstr "没有设定lamdaemon路径设置,请更改LAM配置."
 
-#: ../templates/tests/lamdaemonTest.php:95
-#: ../templates/tests/lamdaemonTest.php:188
+#: ../templates/tests/lamdaemonTest.php:97
+#: ../templates/tests/lamdaemonTest.php:190
 msgid "No lamdaemon server set, please update your LAM configuration settings."
 msgstr "没有设置lamdaemon服务器,请先设置LAM配置."
 
@@ -6558,7 +6563,7 @@ msgstr "没有设置lamdaemon服务器,请先设置LAM配置."
 msgid "No logging"
 msgstr "无日志"
 
-#: ../templates/pdfedit/pdfpage.php:422
+#: ../templates/pdfedit/pdfpage.php:424
 msgid "No logo"
 msgstr "无标志"
 
@@ -6576,7 +6581,7 @@ msgstr "未选择基本模块或选择多于一个!"
 
 #: ../templates/config/confsave.php:53
 #: ../templates/config/confmain.php:55
-#: ../lib/modules/passwordSelfReset.inc:871
+#: ../lib/modules/passwordSelfReset.inc:875
 msgid "No password was entered!"
 msgstr "没有输入密码!"
 
@@ -6584,7 +6589,7 @@ msgstr "没有输入密码!"
 msgid "No policies found!"
 msgstr "没有发现策略!"
 
-#: ../templates/tests/schemaTest.php:68
+#: ../templates/tests/schemaTest.php:70
 msgid "No problems found."
 msgstr "未发现问题!"
 
@@ -6592,11 +6597,11 @@ msgstr "未发现问题!"
 msgid "No scripts to run."
 msgstr "没有运行的脚本"
 
-#: ../templates/pdfedit/pdfpage.php:119
+#: ../templates/pdfedit/pdfpage.php:121
 msgid "No section text specified"
 msgstr "没有指定段文本"
 
-#: ../lib/modules/passwordSelfReset.inc:893
+#: ../lib/modules/passwordSelfReset.inc:897
 msgid "No security answer found."
 msgstr "没有发现安全问题."
 
@@ -6604,11 +6609,11 @@ msgstr "没有发现安全问题."
 msgid "No server profiles found. Please create one."
 msgstr "没有服务器设置,请先建立一个."
 
-#: ../templates/pdfedit/pdfpage.php:107
+#: ../templates/pdfedit/pdfpage.php:109
 msgid "No static text specified"
 msgstr "没有指定静态文本"
 
-#: ../lib/modules/dhcp_settings.inc:283
+#: ../lib/modules/dhcp_settings.inc:290
 msgid "No subnet entered."
 msgstr "没有输入子网掩码!"
 
@@ -6622,7 +6627,7 @@ msgstr "没有这个条目"
 msgid "No such entry."
 msgstr "没有这个条目."
 
-#: ../templates/schema/schema.php:436
+#: ../templates/schema/schema.php:438
 #, php-format
 msgid "No such schema item: \"%s\""
 msgstr "没有这个schema项:\"%s\""
@@ -6631,7 +6636,7 @@ msgstr "没有这个schema项:\"%s\""
 msgid "No sudo roles found!"
 msgstr "未发现sudo角色!"
 
-#: ../lib/types/user.inc:464
+#: ../lib/types/user.inc:475
 msgid "No users found!"
 msgstr "未发现用户!"
 
@@ -6679,39 +6684,39 @@ msgstr "重置错误登录次数的分钟数."
 msgid "Number of rows in text area."
 msgstr "文本区中行的数量"
 
-#: ../lib/modules/ppolicy.inc:77
+#: ../lib/modules/ppolicy.inc:78
 #: ../lib/modules/sambaDomain.inc:119
 msgid "Number of seconds after the user is allowed to change his password again."
 msgstr "允许用户再次修改密码的秒数."
 
-#: ../lib/modules/ppolicy.inc:81
+#: ../lib/modules/ppolicy.inc:82
 #: ../lib/modules/sambaDomain.inc:123
 msgid "Number of seconds after which the user must change his password."
 msgstr "多後之後使用者必須更改密碼.(密碼到期),以秒為單位"
 
-#: ../templates/schema/schema.php:145
-#: ../templates/schema/schema.php:342
+#: ../templates/schema/schema.php:147
+#: ../templates/schema/schema.php:344
 msgid "OID"
 msgstr "OID"
 
-#: ../templates/ou_edit.php:81
+#: ../templates/ou_edit.php:83
 msgid "OU already exists!"
 msgstr "OU已经存在!"
 
-#: ../templates/ou_edit.php:92
+#: ../templates/ou_edit.php:94
 msgid "OU deleted successfully."
 msgstr "OU删除成功."
 
-#: ../templates/ou_edit.php:150
+#: ../templates/ou_edit.php:152
 #: ../lib/tools/ouEditor.inc:44
 msgid "OU editor"
 msgstr "OU编辑器"
 
-#: ../templates/ou_edit.php:85
+#: ../templates/ou_edit.php:87
 msgid "OU is invalid!"
 msgstr "OU无效!"
 
-#: ../templates/ou_edit.php:129
+#: ../templates/ou_edit.php:131
 msgid "OU is not empty or invalid!"
 msgstr "OU不为空或非法!"
 
@@ -6720,8 +6725,8 @@ msgstr "OU不为空或非法!"
 msgid "OU-Editor"
 msgstr "OU编辑器"
 
-#: ../templates/schema/schema.php:63
-#: ../templates/schema/schema.php:64
+#: ../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
@@ -6733,8 +6738,8 @@ msgstr "对象类"
 msgid "Object count: %s"
 msgstr "对象总计: %s"
 
-#: ../templates/schema/schema.php:150
-#: ../templates/schema/schema.php:281
+#: ../templates/schema/schema.php:152
+#: ../templates/schema/schema.php:283
 msgid "Obsolete"
 msgstr "已过时的"
 
@@ -6747,15 +6752,15 @@ msgstr "已过时的"
 msgid "Off"
 msgstr "关闭"
 
-#: ../lib/modules/inetOrgPerson.inc:127
-#: ../lib/modules/inetOrgPerson.inc:248
-#: ../lib/modules/inetOrgPerson.inc:505
-#: ../lib/modules/inetOrgPerson.inc:540
-#: ../lib/modules/inetOrgPerson.inc:749
+#: ../lib/modules/inetOrgPerson.inc:128
+#: ../lib/modules/inetOrgPerson.inc:253
+#: ../lib/modules/inetOrgPerson.inc:509
+#: ../lib/modules/inetOrgPerson.inc:544
 #: ../lib/modules/inetOrgPerson.inc:753
-#: ../lib/modules/inetOrgPerson.inc:1487
-#: ../lib/modules/inetOrgPerson.inc:2084
-#: ../lib/modules/inetOrgPerson.inc:2653
+#: ../lib/modules/inetOrgPerson.inc:757
+#: ../lib/modules/inetOrgPerson.inc:1491
+#: ../lib/modules/inetOrgPerson.inc:2088
+#: ../lib/modules/inetOrgPerson.inc:2730
 msgid "Office name"
 msgstr "办公室名"
 
@@ -6763,10 +6768,10 @@ msgstr "办公室名"
 #: ../templates/lists/changePassword.php:328
 #: ../templates/lists/changePassword.php:362
 #: ../templates/lists/changePassword.php:388
-#: ../templates/tests/lamdaemonTest.php:90
-#: ../templates/ou_edit.php:186
-#: ../templates/ou_edit.php:200
-#: ../templates/masscreate.php:197
+#: ../templates/tests/lamdaemonTest.php:92
+#: ../templates/ou_edit.php:188
+#: ../templates/ou_edit.php:202
+#: ../templates/masscreate.php:202
 #: ../templates/config/profmanage.php:241
 #: ../templates/config/profmanage.php:253
 #: ../templates/config/profmanage.php:262
@@ -6782,35 +6787,35 @@ msgstr "办公室名"
 #: ../templates/selfService/profManage.php:241
 #: ../templates/selfService/adminLogin.php:152
 #: ../templates/selfService/adminLogin.php:153
-#: ../templates/selfService/adminMain.php:478
-#: ../templates/selfService/adminMain.php:522
-#: ../templates/pdfedit/pdfmain.php:158
-#: ../templates/profedit/profilemain.php:157
-#: ../lib/types/automountType.inc:210
-#: ../lib/types/automountType.inc:245
+#: ../templates/selfService/adminMain.php:505
+#: ../templates/selfService/adminMain.php:549
+#: ../templates/pdfedit/pdfmain.php:160
+#: ../templates/profedit/profilemain.php:159
+#: ../lib/types/automountType.inc:244
+#: ../lib/types/automountType.inc:279
 #: ../lib/types/user.inc:273
-#: ../lib/types/dhcp.inc:288
-#: ../lib/modules/selfRegistration.inc:374
+#: ../lib/types/dhcp.inc:291
+#: ../lib/modules/selfRegistration.inc:384
 #: ../lib/modules/zarafaContact.inc:401
 #: ../lib/modules/zarafaGroup.inc:457
 #: ../lib/modules/device.inc:297
-#: ../lib/modules/sambaSamAccount.inc:1367
-#: ../lib/modules/sambaSamAccount.inc:1496
-#: ../lib/modules/zarafaUser.inc:918
-#: ../lib/modules/zarafaUser.inc:969
-#: ../lib/modules/nisnetgroup.inc:469
-#: ../lib/modules/nisnetgroup.inc:479
-#: ../lib/modules/asteriskExtension.inc:469
+#: ../lib/modules/sambaSamAccount.inc:1372
+#: ../lib/modules/sambaSamAccount.inc:1501
+#: ../lib/modules/zarafaUser.inc:920
+#: ../lib/modules/zarafaUser.inc:971
+#: ../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/imapAccess.inc:269
-#: ../lib/modules/passwordSelfReset.inc:676
-#: ../lib/modules/passwordSelfReset.inc:827
+#: ../lib/modules/imapAccess.inc:270
+#: ../lib/modules/passwordSelfReset.inc:680
+#: ../lib/modules/passwordSelfReset.inc:831
 #: ../lib/modules/groupOfNames.inc:319
 #: ../lib/modules/groupOfNames.inc:431
 #: ../lib/lists.inc:658
-#: ../lib/lists.inc:731
-#: ../lib/modules.inc:1138
+#: ../lib/lists.inc:732
+#: ../lib/modules.inc:1144
 msgid "Ok"
 msgstr "确定"
 
@@ -6828,10 +6833,10 @@ msgstr "旧值"
 msgid "On"
 msgstr "On"
 
-#: ../lib/modules/sambaSamAccount.inc:225
-#: ../lib/modules/sambaSamAccount.inc:362
-#: ../lib/modules/sambaSamAccount.inc:1482
-#: ../lib/modules/sambaSamAccount.inc:1762
+#: ../lib/modules/sambaSamAccount.inc:229
+#: ../lib/modules/sambaSamAccount.inc:367
+#: ../lib/modules/sambaSamAccount.inc:1487
+#: ../lib/modules/sambaSamAccount.inc:1767
 msgid "On broken or timed out connection"
 msgstr "中断或超时连接"
 
@@ -6841,7 +6846,7 @@ msgid "One (one level beneath base)"
 msgstr "One (基类下第一层)"
 
 #: ../lib/modules/range.inc:107
-#: ../lib/modules/fixed_ip.inc:105
+#: ../lib/modules/fixed_ip.inc:106
 msgid "One or more errors occured. The invalid fields are marked."
 msgstr "发生了错误,非法域已经被标记."
 
@@ -6851,8 +6856,8 @@ msgstr "发生了错误,非法域已经被标记."
 msgid "Operation not successful. DN <b>%s</b> has not been created."
 msgstr "操作不成功,DN <b>%s</b>没有建立"
 
-#: ../templates/serverInfo.php:275
-#: ../templates/serverInfo.php:365
+#: ../templates/serverInfo.php:277
+#: ../templates/serverInfo.php:367
 msgid "Operation statistics"
 msgstr "操作统计"
 
@@ -6862,7 +6867,7 @@ msgstr "操作统计"
 msgid "Operation successful. DN <b>%s</b> has been created."
 msgstr "操作成功. DN  <b>%s</b> 已经建立"
 
-#: ../templates/schema/schema.php:382
+#: ../templates/schema/schema.php:384
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1575
 msgid "Optional attributes"
 msgstr "可选属性"
@@ -6871,8 +6876,8 @@ msgstr "可选属性"
 #: ../lib/modules/zarafaDynamicGroup.inc:241
 #: ../lib/modules/zarafaContact.inc:211
 #: ../lib/modules/zarafaGroup.inc:248
-#: ../lib/modules/posixAccount.inc:184
-#: ../lib/modules/zarafaUser.inc:572
+#: ../lib/modules/posixAccount.inc:198
+#: ../lib/modules/zarafaUser.inc:574
 #: ../lib/modules/sudoRole.inc:83
 #: ../lib/modules/sudoRole.inc:112
 #: ../lib/modules/sudoRole.inc:164
@@ -6880,7 +6885,7 @@ msgstr "可选属性"
 #: ../lib/modules/sudoRole.inc:187
 #: ../lib/modules/sudoRole.inc:399
 #: ../lib/modules/sudoRole.inc:702
-#: ../lib/modules/asteriskExtension.inc:114
+#: ../lib/modules/asteriskExtension.inc:115
 #: ../lib/modules/asteriskVoicemail.inc:106
 #: ../lib/modules/asteriskVoicemail.inc:116
 #: ../lib/modules/asteriskVoicemail.inc:133
@@ -6907,37 +6912,37 @@ msgstr "或者在这儿粘贴您的LDIF文件"
 msgid "Order by"
 msgstr "排序列"
 
-#: ../templates/schema/schema.php:169
+#: ../templates/schema/schema.php:171
 msgid "Ordering"
 msgstr "排序"
 
-#: ../lib/modules/eduPerson.inc:113
-#: ../lib/modules/eduPerson.inc:179
-#: ../lib/modules/eduPerson.inc:200
-#: ../lib/modules/eduPerson.inc:217
-#: ../lib/modules/eduPerson.inc:353
-#: ../lib/modules/eduPerson.inc:684
-#: ../lib/modules/inetOrgPerson.inc:168
-#: ../lib/modules/inetOrgPerson.inc:274
-#: ../lib/modules/inetOrgPerson.inc:473
-#: ../lib/modules/inetOrgPerson.inc:582
-#: ../lib/modules/inetOrgPerson.inc:773
+#: ../lib/modules/eduPerson.inc:114
+#: ../lib/modules/eduPerson.inc:180
+#: ../lib/modules/eduPerson.inc:201
+#: ../lib/modules/eduPerson.inc:218
+#: ../lib/modules/eduPerson.inc:354
+#: ../lib/modules/eduPerson.inc:685
+#: ../lib/modules/inetOrgPerson.inc:173
+#: ../lib/modules/inetOrgPerson.inc:279
+#: ../lib/modules/inetOrgPerson.inc:477
+#: ../lib/modules/inetOrgPerson.inc:586
 #: ../lib/modules/inetOrgPerson.inc:777
-#: ../lib/modules/inetOrgPerson.inc:1739
-#: ../lib/modules/inetOrgPerson.inc:2085
+#: ../lib/modules/inetOrgPerson.inc:781
+#: ../lib/modules/inetOrgPerson.inc:1743
+#: ../lib/modules/inetOrgPerson.inc:2089
 msgid "Organisation"
 msgstr "组织"
 
-#: ../lib/modules/eduPerson.inc:121
-#: ../lib/modules/eduPerson.inc:125
-#: ../lib/modules/eduPerson.inc:191
-#: ../lib/modules/eduPerson.inc:201
-#: ../lib/modules/eduPerson.inc:377
-#: ../lib/modules/eduPerson.inc:690
+#: ../lib/modules/eduPerson.inc:122
+#: ../lib/modules/eduPerson.inc:126
+#: ../lib/modules/eduPerson.inc:192
+#: ../lib/modules/eduPerson.inc:202
+#: ../lib/modules/eduPerson.inc:378
+#: ../lib/modules/eduPerson.inc:691
 msgid "Organisational units"
 msgstr "组织单元"
 
-#: ../lib/modules/eduPerson.inc:221
+#: ../lib/modules/eduPerson.inc:222
 msgid "Organisational units contains an invalid entry."
 msgstr "组织单元中有一个非法条目"
 
@@ -6952,12 +6957,12 @@ msgid "Output may contain HTML"
 msgstr "输出可以包含HTML语句"
 
 #: ../lib/modules/customScripts.inc:230
-#: ../lib/modules/customScripts.inc:502
+#: ../lib/modules/customScripts.inc:516
 #, php-format
 msgid "Output of command \"%s\" with return code %s"
 msgstr "\"%s\"命令的输出和返回值%s"
 
-#: ../templates/serverInfo.php:166
+#: ../templates/serverInfo.php:168
 msgid "Overlays"
 msgstr "覆盖物"
 
@@ -6987,67 +6992,67 @@ msgstr "拥有者"
 msgid "Owners"
 msgstr "拥有者"
 
-#: ../lib/modules/dhcp_settings.inc:88
+#: ../lib/modules/dhcp_settings.inc:95
 msgid "P-Node (0x02)"
 msgstr "P-节点 (0x02)"
 
-#: ../lib/modules/fixed_ip.inc:87
-#: ../lib/modules/fixed_ip.inc:334
-#: ../lib/modules/fixed_ip.inc:522
+#: ../lib/modules/fixed_ip.inc:88
+#: ../lib/modules/fixed_ip.inc:335
+#: ../lib/modules/fixed_ip.inc:523
 msgid "PC name"
 msgstr "PC机器名"
 
-#: ../templates/pdfedit/pdfpage.php:438
-#: ../templates/pdfedit/pdfmain.php:79
+#: ../templates/pdfedit/pdfpage.php:440
+#: ../templates/pdfedit/pdfmain.php:81
 #: ../lib/tools/pdfEdit.inc:44
 msgid "PDF editor"
 msgstr "PDF编辑器"
 
-#: ../templates/masscreate.php:263
+#: ../templates/masscreate.php:268
 #: ../lib/lists.inc:636
 #: ../help/help.inc:168
 msgid "PDF structure"
 msgstr "PDF架构"
 
-#: ../templates/pdfedit/pdfpage.php:90
+#: ../templates/pdfedit/pdfpage.php:92
 msgid "PDF structure name not valid"
 msgstr "PDF架构名无效"
 
-#: ../templates/pdfedit/pdfmain.php:124
+#: ../templates/pdfedit/pdfmain.php:126
 msgid "PDF structure was successfully saved."
 msgstr "PDF架构成功保存."
 
-#: ../templates/serverInfo.php:262
+#: ../templates/serverInfo.php:264
 msgid "PDUs sent"
 msgstr "个PDU被发送"
 
 #: ../lib/modules/zarafaUser.inc:325
-#: ../lib/modules/zarafaUser.inc:646
-#: ../lib/modules/zarafaUser.inc:1408
+#: ../lib/modules/zarafaUser.inc:648
+#: ../lib/modules/zarafaUser.inc:1410
 msgid "POP3"
 msgstr "POP3"
 
 #: ../templates/lists/changePassword.php:354
 #: ../templates/lists/changePassword.php:380
-#: ../lib/types/user.inc:334
-#: ../lib/types/user.inc:368
+#: ../lib/types/user.inc:345
+#: ../lib/types/user.inc:379
 msgid "PPolicy"
 msgstr "P策略"
 
-#: ../lib/modules/sambaSamAccount.inc:531
+#: ../lib/modules/sambaSamAccount.inc:536
 msgid "Pacific Time (US & Canada)"
 msgstr "太平洋时间(美国和加拿大)"
 
-#: ../lib/modules/dhcp_settings.inc:145
+#: ../lib/modules/dhcp_settings.inc:152
 msgid "Packets are sent to the default gateway if the receiver does not reside in the same network. The default gateway routes them to the target network."
 msgstr "如果数据包的接收者不在同一个网络,数据包将会发往缺省网关.缺省网关将数据包转向目标网络."
 
-#: ../templates/selfService/adminMain.php:418
+#: ../templates/selfService/adminMain.php:432
 #: ../help/help.inc:192
 msgid "Page header"
 msgstr "页首"
 
-#: ../templates/selfService/adminMain.php:361
+#: ../templates/selfService/adminMain.php:375
 msgid "Page layout"
 msgstr "页布局"
 
@@ -7067,7 +7072,20 @@ msgstr "Asterisk语音邮件的呼号"
 msgid "Parent DN"
 msgstr "父DN"
 
-#: ../templates/schema/schema.php:364
+#: ../lib/modules/puppetClient.inc:81
+#: ../lib/modules/puppetClient.inc:127
+#: ../lib/modules/puppetClient.inc:147
+#: ../lib/modules/puppetClient.inc:258
+#: ../lib/modules/puppetClient.inc:425
+#: ../lib/modules/puppetClient.inc:462
+msgid "Parent node"
+msgstr "父节点"
+
+#: ../lib/modules/puppetClient.inc:183
+msgid "Parent node not found."
+msgstr "没有发现父节点."
+
+#: ../templates/schema/schema.php:366
 msgid "Parent to"
 msgstr "继承于"
 
@@ -7078,41 +7096,44 @@ msgstr "解析错误"
 #: ../templates/lists/changePassword.php:315
 #: ../templates/login.php:301
 #: ../templates/selfService/selfServiceLogin.php:256
-#: ../lib/selfService.inc:348
-#: ../lib/modules/selfRegistration.inc:339
-#: ../lib/modules/selfRegistration.inc:411
-#: ../lib/modules/selfRegistration.inc:414
-#: ../lib/modules/selfRegistration.inc:417
+#: ../lib/selfService.inc:373
+#: ../lib/modules/selfRegistration.inc:349
+#: ../lib/modules/selfRegistration.inc:421
+#: ../lib/modules/selfRegistration.inc:424
+#: ../lib/modules/selfRegistration.inc:427
 #: ../lib/modules/asteriskAccount.inc:106
 #: ../lib/modules/asteriskAccount.inc:387
-#: ../lib/modules/posixGroup.inc:204
-#: ../lib/modules/posixGroup.inc:484
-#: ../lib/modules/sambaSamAccount.inc:400
-#: ../lib/modules/posixAccount.inc:83
-#: ../lib/modules/posixAccount.inc:84
-#: ../lib/modules/posixAccount.inc:148
-#: ../lib/modules/posixAccount.inc:251
-#: ../lib/modules/posixAccount.inc:322
-#: ../lib/modules/posixAccount.inc:387
-#: ../lib/modules/posixAccount.inc:1177
-#: ../lib/modules/posixAccount.inc:1513
-#: ../lib/modules/posixAccount.inc:1516
-#: ../lib/modules/inetOrgPerson.inc:1779
+#: ../lib/modules/posixGroup.inc:206
+#: ../lib/modules/posixGroup.inc:495
+#: ../lib/modules/sambaSamAccount.inc:98
+#: ../lib/modules/sambaSamAccount.inc:99
+#: ../lib/modules/sambaSamAccount.inc:236
+#: ../lib/modules/sambaSamAccount.inc:405
+#: ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:158
+#: ../lib/modules/posixAccount.inc:265
+#: ../lib/modules/posixAccount.inc:336
+#: ../lib/modules/posixAccount.inc:405
+#: ../lib/modules/posixAccount.inc:1197
+#: ../lib/modules/posixAccount.inc:1533
+#: ../lib/modules/posixAccount.inc:1536
+#: ../lib/modules/inetOrgPerson.inc:1783
 #: ../lib/modules/asteriskVoicemail.inc:90
 #: ../lib/modules/asteriskVoicemail.inc:156
-#: ../lib/modules/customFields.inc:830
+#: ../lib/modules/customFields.inc:882
 #: ../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:986
+#: ../lib/modules.inc:992
 #: ../help/help.inc:166
 msgid "Password"
 msgstr "密码"
 
-#: ../lib/modules/sambaSamAccount.inc:272
-#: ../lib/modules/sambaSamAccount.inc:1112
+#: ../lib/modules/sambaSamAccount.inc:277
+#: ../lib/modules/sambaSamAccount.inc:1117
 msgid "Password change at next login"
 msgstr "下次登录时修改密码"
 
@@ -7134,10 +7155,10 @@ msgid "Password change required"
 msgstr "需要修改密码"
 
 #: ../lib/types/ppolicyType.inc:91
-#: ../lib/modules/ppolicy.inc:128
-#: ../lib/modules/ppolicy.inc:148
-#: ../lib/modules/ppolicy.inc:292
-#: ../lib/modules/ppolicy.inc:502
+#: ../lib/modules/ppolicy.inc:129
+#: ../lib/modules/ppolicy.inc:149
+#: ../lib/modules/ppolicy.inc:293
+#: ../lib/modules/ppolicy.inc:503
 msgid "Password change requires old password"
 msgstr "修改密码时需要旧密码"
 
@@ -7150,19 +7171,20 @@ msgstr "密码修改服务"
 msgid "Password check"
 msgstr "密码检查"
 
-#: ../lib/modules/selfRegistration.inc:414
-#: ../lib/modules/posixGroup.inc:484
-#: ../lib/modules/sambaSamAccount.inc:97
-#: ../lib/modules/posixAccount.inc:84
-#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/selfRegistration.inc:424
+#: ../lib/modules/posixGroup.inc:495
+#: ../lib/modules/sambaSamAccount.inc:99
+#: ../lib/modules/sambaSamAccount.inc:100
+#: ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:95
 msgid "Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!%&/|?{[()]}=@$ !"
 msgstr "密码包括无效字符,合法字符为a-z, A-Z, 0-9 和 #*,.;:_-+!%&/|?{[()]}=@$ !"
 
-#: ../lib/modules/sambaSamAccount.inc:257
-#: ../lib/modules/sambaSamAccount.inc:260
-#: ../lib/modules/sambaSamAccount.inc:422
-#: ../lib/modules/sambaSamAccount.inc:1102
-#: ../lib/modules/sambaSamAccount.inc:1521
+#: ../lib/modules/sambaSamAccount.inc:262
+#: ../lib/modules/sambaSamAccount.inc:265
+#: ../lib/modules/sambaSamAccount.inc:427
+#: ../lib/modules/sambaSamAccount.inc:1107
+#: ../lib/modules/sambaSamAccount.inc:1526
 msgid "Password does not expire"
 msgstr "密码永不过期"
 
@@ -7186,24 +7208,24 @@ msgstr "密码超期必须是自然数或-1."
 msgid "Password for voicemail mailbox."
 msgstr "语音邮箱的密码."
 
-#: ../lib/modules/posixGroup.inc:420
-#: ../lib/modules/posixGroup.inc:448
-#: ../lib/modules/posixAccount.inc:152
-#: ../lib/modules/posixAccount.inc:186
-#: ../lib/modules/posixAccount.inc:342
-#: ../lib/modules/inetOrgPerson.inc:289
-#: ../lib/modules/inetOrgPerson.inc:769
+#: ../lib/modules/posixGroup.inc:423
+#: ../lib/modules/posixGroup.inc:455
+#: ../lib/modules/posixAccount.inc:164
+#: ../lib/modules/posixAccount.inc:200
+#: ../lib/modules/posixAccount.inc:356
+#: ../lib/modules/inetOrgPerson.inc:293
+#: ../lib/modules/inetOrgPerson.inc:773
 #: ../lib/modules/customFields.inc:108
-#: ../lib/modules/customFields.inc:841
+#: ../lib/modules/customFields.inc:893
 msgid "Password hash type"
 msgstr "密码哈希类型"
 
 #: ../lib/types/ppolicyType.inc:80
-#: ../lib/modules/ppolicy.inc:84
-#: ../lib/modules/ppolicy.inc:137
-#: ../lib/modules/ppolicy.inc:161
-#: ../lib/modules/ppolicy.inc:222
-#: ../lib/modules/ppolicy.inc:466
+#: ../lib/modules/ppolicy.inc:85
+#: ../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
@@ -7217,7 +7239,7 @@ msgstr "密码邮件设置"
 
 #: ../lib/modules/shadowAccount.inc:59
 #: ../lib/modules/shadowAccount.inc:60
-#: ../lib/modules/ppolicy.inc:159
+#: ../lib/modules/ppolicy.inc:160
 #: ../lib/modules/sambaDomain.inc:215
 msgid "Password maximum age must be are natural number."
 msgstr "密码最长生命期必须是自然数."
@@ -7227,20 +7249,20 @@ msgid "Password maximum age must be bigger as password minimum age."
 msgstr "密码最长生命期必须小于最短生命期."
 
 #: ../lib/modules/shadowAccount.inc:65
-#: ../lib/modules/ppolicy.inc:160
+#: ../lib/modules/ppolicy.inc:161
 #: ../lib/modules/sambaDomain.inc:213
 msgid "Password maximum age must be bigger than password minimum age."
 msgstr "密码最长生命期必须大于最短生命期."
 
 #: ../lib/modules/shadowAccount.inc:57
 #: ../lib/modules/shadowAccount.inc:58
-#: ../lib/modules/ppolicy.inc:158
+#: ../lib/modules/ppolicy.inc:159
 #: ../lib/modules/sambaDomain.inc:214
 msgid "Password minimum age must be are natural number."
 msgstr "密码最短生命期必须是自然数."
 
-#: ../lib/modules/imapAccess.inc:84
-#: ../lib/modules/imapAccess.inc:264
+#: ../lib/modules/imapAccess.inc:85
+#: ../lib/modules/imapAccess.inc:265
 msgid "Password of IMAP admin user"
 msgstr "IMAP管理员用户的密码"
 
@@ -7254,7 +7276,7 @@ msgstr "密码策略"
 
 #: ../templates/config/mainmanage.php:209
 #: ../lib/types/user.inc:261
-#: ../lib/types/user.inc:758
+#: ../lib/types/user.inc:769
 #: ../lib/modules/ppolicyUser.inc:38
 #: ../lib/modules/ppolicyUser.inc:48
 #: ../lib/modules/ppolicyUser.inc:60
@@ -7262,35 +7284,35 @@ msgstr "密码策略"
 #: ../lib/modules/ppolicyUser.inc:112
 #: ../lib/modules/ppolicyUser.inc:227
 #: ../lib/modules/ppolicyUser.inc:261
-#: ../lib/modules/ppolicy.inc:54
+#: ../lib/modules/ppolicy.inc:55
 #: ../lib/modules/sambaDomain.inc:259
 #: ../help/help.inc:148
 msgid "Password policy"
 msgstr "密码策略"
 
 #: ../lib/types/ppolicyType.inc:81
-#: ../lib/modules/ppolicy.inc:88
-#: ../lib/modules/ppolicy.inc:138
-#: ../lib/modules/ppolicy.inc:234
-#: ../lib/modules/ppolicy.inc:476
+#: ../lib/modules/ppolicy.inc:89
+#: ../lib/modules/ppolicy.inc:139
+#: ../lib/modules/ppolicy.inc:235
+#: ../lib/modules/ppolicy.inc:477
 msgid "Password quality check"
 msgstr "密码质量检查"
 
-#: ../lib/modules/passwordSelfReset.inc:208
+#: ../lib/modules/passwordSelfReset.inc:209
 msgid "Password reset confirmation"
 msgstr "密码重置确认"
 
-#: ../lib/modules/passwordSelfReset.inc:192
+#: ../lib/modules/passwordSelfReset.inc:193
 msgid "Password reset notification"
 msgstr "密码重置提示"
 
-#: ../lib/modules/passwordSelfReset.inc:51
-#: ../lib/modules/passwordSelfReset.inc:679
-#: ../lib/modules/passwordSelfReset.inc:830
+#: ../lib/modules/passwordSelfReset.inc:52
+#: ../lib/modules/passwordSelfReset.inc:683
+#: ../lib/modules/passwordSelfReset.inc:834
 msgid "Password self reset"
 msgstr "密码复位"
 
-#: ../lib/modules/passwordSelfReset.inc:1199
+#: ../lib/modules/passwordSelfReset.inc:1203
 msgid "Password successfully reset."
 msgstr "密码被成功复位."
 
@@ -7311,8 +7333,8 @@ msgstr "密码提醒日期必须是自然数."
 
 #: ../templates/config/confmain.php:557
 #: ../templates/3rdParty/pla/htdocs/password_checker.php:61
-#: ../lib/modules/passwordSelfReset.inc:876
-#: ../lib/modules.inc:1060
+#: ../lib/modules/passwordSelfReset.inc:880
+#: ../lib/modules.inc:1066
 msgid "Passwords are different!"
 msgstr "密码不同!"
 
@@ -7324,11 +7346,11 @@ msgstr "密码匹配"
 msgid "Path"
 msgstr "路径"
 
-#: ../lib/modules/sambaSamAccount.inc:336
+#: ../lib/modules/sambaSamAccount.inc:341
 msgid "Path of the user profile."
 msgstr "用户配置文件所在路径。"
 
-#: ../lib/modules/sambaSamAccount.inc:287
+#: ../lib/modules/sambaSamAccount.inc:292
 msgid "Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $user and $group are replaced with user and group name."
 msgstr "用户配置文件路径. 可以是本地绝对路径或UNC路径(\\\\server\\share).$user和$group会被用户名和组名代替."
 
@@ -7355,23 +7377,23 @@ msgstr "也要永久删除所有子集?"
 msgid "Permit"
 msgstr "允许"
 
-#: ../lib/modules/inetOrgPerson.inc:99
+#: ../lib/modules/inetOrgPerson.inc:100
 msgid "Personal"
 msgstr "个人信息"
 
-#: ../lib/selfService.inc:344
+#: ../lib/selfService.inc:369
 msgid "Personal data"
 msgstr "个人数据"
 
 #: ../lib/types/user.inc:102
-#: ../lib/types/user.inc:552
-#: ../lib/modules/inetOrgPerson.inc:125
-#: ../lib/modules/inetOrgPerson.inc:2676
-#: ../lib/modules/inetOrgPerson.inc:2683
+#: ../lib/types/user.inc:563
+#: ../lib/modules/inetOrgPerson.inc:126
+#: ../lib/modules/inetOrgPerson.inc:2759
+#: ../lib/modules/inetOrgPerson.inc:2766
 msgid "Photo"
 msgstr "照片"
 
-#: ../lib/modules/inetOrgPerson.inc:1839
+#: ../lib/modules/inetOrgPerson.inc:1843
 msgid "Photo file (JPG format)"
 msgstr "照片文件(JPG格式)"
 
@@ -7392,15 +7414,15 @@ msgstr "您的公钥列表,以逗号分隔."
 msgid "Please activate this option if your scripts may generate HTML output. Otherwise, the output is treated as plain text."
 msgstr "如果你的脚本中会生成HTML输出,请激活这个选项.如果不激活,输出为文本文件."
 
-#: ../lib/modules/asteriskExtension.inc:185
+#: ../lib/modules/asteriskExtension.inc:186
 msgid "Please add at least one extension owner."
 msgstr "至少需要增加一个扩展属主."
 
-#: ../lib/modules/sambaSamAccount.inc:1050
+#: ../lib/modules/sambaSamAccount.inc:1055
 msgid "Please check your settings on the Unix page!"
 msgstr "请在UNIX中检查设置"
 
-#: ../lib/modules/imapAccess.inc:94
+#: ../lib/modules/imapAccess.inc:95
 msgid "Please choose the attribute to get the IMAP user name. The default is \"mail\" but you can also use \"uid\"."
 msgstr "请选择IMAP用户属性。缺省值为\"mail\",也可以使用\"uid\"."
 
@@ -7408,7 +7430,7 @@ msgstr "请选择IMAP用户属性。缺省值为\"mail\",也可以使用\"uid\".
 msgid "Please click to lock/unlock this account."
 msgstr "点击以锁定/解锁此账号."
 
-#: ../lib/modules/sambaSamAccount.inc:98
+#: ../lib/modules/sambaSamAccount.inc:101
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "请输入RID或特殊账号名!"
 
@@ -7416,20 +7438,20 @@ msgstr "请输入RID或特殊账号名!"
 msgid "Please enter a caller ID."
 msgstr "请输入一个拨号ID."
 
-#: ../lib/modules/imapAccess.inc:91
+#: ../lib/modules/imapAccess.inc:92
 msgid "Please enter a comma separated list of domain names (e.g. \"company.com,example.com\"). LAM will only manage mailboxes from these domains."
 msgstr "请输入域名列表，用逗号分隔(比如:\"company.com,example.com\").LAM只为这些域名管理邮箱。"
 
-#: ../lib/modules/sambaSamAccount.inc:95
 #: ../lib/modules/sambaSamAccount.inc:96
+#: ../lib/modules/sambaSamAccount.inc:97
 msgid "Please enter a comma separated list of host names!"
 msgstr "请输入以逗号分隔的主机名!"
 
-#: ../lib/modules/asteriskExtension.inc:177
+#: ../lib/modules/asteriskExtension.inc:178
 msgid "Please enter a common name."
 msgstr "请输入一个一般命名!"
 
-#: ../lib/modules/imapAccess.inc:153
+#: ../lib/modules/imapAccess.inc:154
 msgid "Please enter a correct list of valid mail domains."
 msgstr "请输入正确有效的邮箱域列表"
 
@@ -7438,7 +7460,7 @@ msgid "Please enter a descriptive label for this field."
 msgstr "输入此域的描述标签."
 
 #: ../lib/modules/nisObject.inc:55
-#: ../lib/modules/automount.inc:55
+#: ../lib/modules/automount.inc:58
 #: ../lib/modules/sudoRole.inc:56
 msgid "Please enter a descriptive name for this entry."
 msgstr "输入此条目的描述"
@@ -7459,60 +7481,60 @@ msgstr "请输入一个邮箱."
 msgid "Please enter a name for this device."
 msgstr "请输入设备名"
 
-#: ../lib/modules/ppolicy.inc:157
+#: ../lib/modules/ppolicy.inc:158
 msgid "Please enter a name for this policy."
 msgstr "请为这个密码策略输入一个名字."
 
-#: ../lib/modules/customFields.inc:982
+#: ../lib/modules/customFields.inc:1036
 msgid "Please enter a natural number for column count."
 msgstr "请为列的数量输入一个自然数。"
 
-#: ../lib/modules/customFields.inc:992
+#: ../lib/modules/customFields.inc:1046
 msgid "Please enter a natural number for row count."
 msgstr "请为行的数量输入一个自然数."
 
 #: ../templates/lib/141_jquery-validationEngine-lang.php:38
-#: ../lib/modules/zarafaUser.inc:409
-#: ../lib/modules/zarafaUser.inc:410
 #: ../lib/modules/zarafaUser.inc:411
 #: ../lib/modules/zarafaUser.inc:412
 #: ../lib/modules/zarafaUser.inc:413
 #: ../lib/modules/zarafaUser.inc:414
+#: ../lib/modules/zarafaUser.inc:415
 #: ../lib/modules/zarafaUser.inc:416
-#: ../lib/modules/zarafaUser.inc:417
+#: ../lib/modules/zarafaUser.inc:418
+#: ../lib/modules/zarafaUser.inc:419
 msgid "Please enter a number."
 msgstr "请输入一个数字"
 
-#: ../lib/modules/ppolicy.inc:166
+#: ../lib/modules/ppolicy.inc:167
 msgid "Please enter a numeric value for the expire warning."
 msgstr "请为过期告警输入一个数值。"
 
-#: ../lib/modules/ppolicy.inc:165
+#: ../lib/modules/ppolicy.inc:166
 msgid "Please enter a numeric value for the failure count interval."
 msgstr "请失败记录间隔输入一个数值。"
 
-#: ../lib/modules/ppolicy.inc:162
+#: ../lib/modules/ppolicy.inc:163
 msgid "Please enter a numeric value for the grace authentication limit."
 msgstr "请为缓期认证限制次数提供一个数值"
 
-#: ../lib/modules/freeRadius.inc:251
 #: ../lib/modules/freeRadius.inc:252
+#: ../lib/modules/freeRadius.inc:253
 msgid "Please enter a numeric value for the idle timeout."
 msgstr "请为空闲超时长输入一个数值。"
 
-#: ../lib/modules/ppolicy.inc:163
+#: ../lib/modules/ppolicy.inc:164
 msgid "Please enter a numeric value for the lockout duration."
 msgstr "请为锁定周期输入一个数值。"
 
-#: ../lib/modules/ppolicy.inc:164
+#: ../lib/modules/ppolicy.inc:165
 msgid "Please enter a numeric value for the maximum failure count."
 msgstr "请为最大失败次数记录输入一个数值"
 
-#: ../lib/modules/ppolicy.inc:167
+#: ../lib/modules/ppolicy.inc:168
 msgid "Please enter a numeric value for the minimum password length."
 msgstr "请为密码最小长度输入一个数值"
 
-#: ../lib/modules/ppolicy.inc:161
+#: ../lib/modules/ppolicy.inc:162
 msgid "Please enter a numeric value for the password history length."
 msgstr "请为密码历史长度输入一个数值"
 
@@ -7520,7 +7542,7 @@ msgstr "请为密码历史长度输入一个数值"
 msgid "Please enter a role name."
 msgstr "请输入角色名."
 
-#: ../lib/modules/passwordSelfReset.inc:897
+#: ../lib/modules/passwordSelfReset.inc:901
 msgid "Please enter a security answer."
 msgstr "请输入安全问题."
 
@@ -7536,24 +7558,24 @@ msgstr "请为含建立链接的确认邮件输入文本."
 msgid "Please enter a unique name for this field."
 msgstr "请这个域输入一个唯一的名字."
 
-#: ../lib/modules/ppolicy.inc:73
+#: ../lib/modules/ppolicy.inc:74
 msgid "Please enter a unique name for this password policy."
 msgstr "请为这个密码策略输入一个唯一的名字"
 
-#: ../lib/modules/kolabUser.inc:258
-#: ../lib/modules/kolabUser.inc:264
+#: ../lib/modules/kolabUser.inc:201
+#: ../lib/modules/kolabUser.inc:207
 msgid "Please enter a user password."
 msgstr "请输入用户密码."
 
 #: ../lib/modules/zarafaDynamicGroup.inc:172
-#: ../lib/modules/eduPerson.inc:217
-#: ../lib/modules/eduPerson.inc:219
+#: ../lib/modules/eduPerson.inc:218
+#: ../lib/modules/eduPerson.inc:220
 #: ../lib/modules/zarafaAddressList.inc:144
 msgid "Please enter a valid DN in the field:"
 msgstr "请输入有效的DN!"
 
-#: ../lib/modules/customFields.inc:372
-#: ../lib/modules/customFields.inc:643
+#: ../lib/modules/customFields.inc:396
+#: ../lib/modules/customFields.inc:699
 msgid "Please enter a valid LDAP attribute name. Allowed characters are a-z, 0-9, _ and -."
 msgstr "请输入合法的LDAP属性名,只能使用 a-z,0-9,_和-."
 
@@ -7561,19 +7583,19 @@ msgstr "请输入合法的LDAP属性名,只能使用 a-z,0-9,_和-."
 msgid "Please enter a valid bind user."
 msgstr "请输入有效的绑定账号."
 
-#: ../lib/modules/inetOrgPerson.inc:81
 #: ../lib/modules/inetOrgPerson.inc:82
+#: ../lib/modules/inetOrgPerson.inc:83
 msgid "Please enter a valid business category!"
 msgstr "请输入有效的商业种类!"
 
-#: ../lib/modules/posixAccount.inc:103
-#: ../lib/modules/posixAccount.inc:104
-#: ../lib/modules/inetOrgPerson.inc:74
+#: ../lib/modules/posixAccount.inc:113
+#: ../lib/modules/posixAccount.inc:114
 #: ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/inetOrgPerson.inc:76
 msgid "Please enter a valid common name!"
 msgstr "请输入有效的全名!"
 
-#: ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/sambaSamAccount.inc:109
 #: ../lib/modules/heimdalKerberos.inc:239
 #: ../lib/modules/heimdalKerberos.inc:240
 msgid "Please enter a valid date in format DD-MM-YYYY."
@@ -7584,24 +7606,24 @@ msgstr "请输入日期,格式为(DD-MM-YYYY)."
 msgid "Please enter a valid default user."
 msgstr "请输入有效的缺省用户."
 
-#: ../lib/modules/sambaSamAccount.inc:100
-#: ../lib/modules/sambaSamAccount.inc:101
+#: ../lib/modules/sambaSamAccount.inc:103
+#: ../lib/modules/sambaSamAccount.inc:104
 msgid "Please enter a valid display name!"
 msgstr "请输入有效的显示名!"
 
-#: ../lib/modules/sambaSamAccount.inc:107
+#: ../lib/modules/sambaSamAccount.inc:110
 msgid "Please enter a valid drive letter."
 msgstr "请输入有效的盘符."
 
-#: ../lib/modules/selfRegistration.inc:407
+#: ../lib/modules/selfRegistration.inc:417
 #: ../lib/modules/zarafaDynamicGroup.inc:174
 #: ../lib/modules/zarafaDynamicGroup.inc:175
 #: ../lib/modules/zarafaGroup.inc:187
 #: ../lib/modules/zarafaGroup.inc:188
-#: ../lib/modules/inetOrgPerson.inc:60
 #: ../lib/modules/inetOrgPerson.inc:61
-#: ../lib/modules/passwordSelfReset.inc:696
-#: ../lib/modules/passwordSelfReset.inc:847
+#: ../lib/modules/inetOrgPerson.inc:62
+#: ../lib/modules/passwordSelfReset.inc:700
+#: ../lib/modules/passwordSelfReset.inc:851
 msgid "Please enter a valid email address!"
 msgstr "请输入有效的邮件地址!"
 
@@ -7612,13 +7634,13 @@ msgstr "请输入有效的邮件地址!"
 msgid "Please enter a valid email alias."
 msgstr "请输入有效的邮件地址."
 
-#: ../lib/modules/inetOrgPerson.inc:72
 #: ../lib/modules/inetOrgPerson.inc:73
+#: ../lib/modules/inetOrgPerson.inc:74
 msgid "Please enter a valid employee type!"
 msgstr "请输入有效的雇员类别!"
 
-#: ../lib/modules/inetOrgPerson.inc:58
 #: ../lib/modules/inetOrgPerson.inc:59
+#: ../lib/modules/inetOrgPerson.inc:60
 msgid "Please enter a valid fax number!"
 msgstr "请输入有效的传真号!"
 
@@ -7645,12 +7667,12 @@ msgstr "请输入有效的来自域."
 msgid "Please enter a valid from user."
 msgstr "请输入有效的来自账号!"
 
-#: ../lib/modules/sambaSamAccount.inc:111
+#: ../lib/modules/sambaSamAccount.inc:114
 msgid "Please enter a valid group name!"
 msgstr "请输入有效的组名!"
 
-#: ../lib/modules/inetOrgPerson.inc:70
 #: ../lib/modules/inetOrgPerson.inc:71
+#: ../lib/modules/inetOrgPerson.inc:72
 msgid "Please enter a valid job title!"
 msgstr "请输入有效的头衔!"
 
@@ -7659,12 +7681,12 @@ msgstr "请输入有效的头衔!"
 msgid "Please enter a valid last name."
 msgstr "请输入有效的姓!"
 
-#: ../lib/modules/eduPerson.inc:225
+#: ../lib/modules/eduPerson.inc:226
 msgid "Please enter a valid list of affiliations."
 msgstr "请输入有效的联系列表."
 
-#: ../lib/modules/freeRadius.inc:247
 #: ../lib/modules/freeRadius.inc:248
+#: ../lib/modules/freeRadius.inc:249
 msgid "Please enter a valid list of group names."
 msgstr "请输入有效的组列表名."
 
@@ -7672,12 +7694,12 @@ msgstr "请输入有效的组列表名."
 msgid "Please enter a valid list of host names."
 msgstr "请输入有效的主机列表."
 
-#: ../lib/modules/authorizedServiceObject.inc:115
+#: ../lib/modules/authorizedServiceObject.inc:123
 msgid "Please enter a valid list of service names."
 msgstr "请输入有效的服务列表名."
 
-#: ../lib/modules/inetOrgPerson.inc:56
 #: ../lib/modules/inetOrgPerson.inc:57
+#: ../lib/modules/inetOrgPerson.inc:58
 msgid "Please enter a valid mobile number!"
 msgstr "请输入有效的手机号!"
 
@@ -7695,66 +7717,66 @@ msgstr "请输入有效的路径."
 msgid "Please enter a valid port number."
 msgstr "请输入有效的端口号!"
 
-#: ../lib/modules/inetOrgPerson.inc:64
 #: ../lib/modules/inetOrgPerson.inc:65
+#: ../lib/modules/inetOrgPerson.inc:66
 msgid "Please enter a valid postal address!"
 msgstr "请输入有效的邮政地址."
 
-#: ../lib/modules/inetOrgPerson.inc:68
 #: ../lib/modules/inetOrgPerson.inc:69
+#: ../lib/modules/inetOrgPerson.inc:70
 msgid "Please enter a valid postal code!"
 msgstr "请输入有效的邮政编码!"
 
-#: ../lib/modules/eduPerson.inc:223
+#: ../lib/modules/eduPerson.inc:224
 msgid "Please enter a valid primary affiliation."
 msgstr "请输入有效的主要联系."
 
-#: ../lib/modules/freeRadius.inc:245
 #: ../lib/modules/freeRadius.inc:246
+#: ../lib/modules/freeRadius.inc:247
 msgid "Please enter a valid realm."
 msgstr "请输入有效的域."
 
-#: ../lib/modules/inetOrgPerson.inc:66
 #: ../lib/modules/inetOrgPerson.inc:67
+#: ../lib/modules/inetOrgPerson.inc:68
 msgid "Please enter a valid registered address."
 msgstr "请输入有效的注册地址!"
 
-#: ../lib/modules/eduPerson.inc:224
+#: ../lib/modules/eduPerson.inc:225
 msgid "Please enter a valid scoped affiliation."
 msgstr "请输入有效的有限联系."
 
-#: ../lib/modules/imapAccess.inc:152
+#: ../lib/modules/imapAccess.inc:153
 msgid "Please enter a valid server name where the mailboxes reside."
 msgstr "输入正确的即将建立邮箱的邮件服务器."
 
-#: ../lib/modules/inetOrgPerson.inc:62
 #: ../lib/modules/inetOrgPerson.inc:63
+#: ../lib/modules/inetOrgPerson.inc:64
 msgid "Please enter a valid street name!"
 msgstr "请输入有效的街道名!"
 
-#: ../lib/modules/inetOrgPerson.inc:52
 #: ../lib/modules/inetOrgPerson.inc:53
 #: ../lib/modules/inetOrgPerson.inc:54
 #: ../lib/modules/inetOrgPerson.inc:55
+#: ../lib/modules/inetOrgPerson.inc:56
 msgid "Please enter a valid telephone number!"
 msgstr "请输入有效的电话号码!"
 
-#: ../lib/modules/posixGroup.inc:586
-#: ../lib/modules/posixAccount.inc:846
+#: ../lib/modules/posixGroup.inc:597
+#: ../lib/modules/posixAccount.inc:866
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "请输入有效值(介于%s和%s之间)!"
 
-#: ../lib/modules/customFields.inc:1092
+#: ../lib/modules/customFields.inc:1149
 msgid "Please enter a value for status \"checked\"."
 msgstr "请为状态\"选中\"输入一个值."
 
-#: ../lib/modules/customFields.inc:1099
+#: ../lib/modules/customFields.inc:1156
 msgid "Please enter a value for status \"unchecked\"."
 msgstr "请为状态\"未选中\"输入一个值."
 
-#: ../lib/modules/kolabUser.inc:270
-#: ../lib/modules/imapAccess.inc:182
+#: ../lib/modules/kolabUser.inc:213
+#: ../lib/modules/imapAccess.inc:183
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "请在本页面输入邮件地址:%s"
@@ -7794,7 +7816,7 @@ msgstr "输入序列名只能使用ASCII字符."
 msgid "Please enter only ASCII characters for the user names."
 msgstr "输入用户名只能使用ASCII字符."
 
-#: ../lib/modules/passwordSelfReset.inc:234
+#: ../lib/modules/passwordSelfReset.inc:235
 msgid "Please enter the DN and password of the administrative password self reset account."
 msgstr "请输入DN和管理员级密码自助复位的帐号的密码."
 
@@ -7810,7 +7832,7 @@ msgstr "请输入DNS服务器IP地址"
 msgid "Please enter the LDAP DN that should be used to create new users."
 msgstr "请输入用于建立新用户的LDAP DN."
 
-#: ../lib/modules/passwordSelfReset.inc:86
+#: ../lib/modules/passwordSelfReset.inc:87
 msgid "Please enter the LDAP DN that should be used to reset passwords."
 msgstr "请输入用于复位密码的LDAP DN."
 
@@ -7822,12 +7844,12 @@ msgstr "请为此域输入LDAP属性."
 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 \"%USER%\" will be replaced by the user name from the login page."
 msgstr "请输入LAM开始搜索用户的LDAP后缀.所给用户名经LDAP过滤器后需要精确匹配到一个DN.\"%USER%\"将在登录页替换为用户名."
 
-#: ../lib/modules/asteriskExtension.inc:180
+#: ../lib/modules/asteriskExtension.inc:181
 #: ../lib/modules/asteriskVoicemail.inc:204
 msgid "Please enter the account context."
 msgstr "请输入账号的语境. "
 
-#: ../lib/modules.inc:876
+#: ../lib/modules.inc:882
 msgid "Please enter the account information on the other pages first."
 msgstr "请先在另一个页面输入帐号信息."
 
@@ -7839,15 +7861,15 @@ msgstr "请输入账号的类型. "
 msgid "Please enter the account's type (e.g. \"friend\")."
 msgstr "请输入账号的类型(比如\"friend\"). "
 
-#: ../lib/modules/asteriskExtension.inc:179
+#: ../lib/modules/asteriskExtension.inc:180
 msgid "Please enter the application data."
 msgstr "请输入应用数据."
 
-#: ../lib/modules/asteriskExtension.inc:178
+#: ../lib/modules/asteriskExtension.inc:179
 msgid "Please enter the application."
 msgstr "请输入应用名."
 
-#: ../lib/modules/automount.inc:59
+#: ../lib/modules/automount.inc:62
 msgid "Please enter the automount entry (e.g. \"-fstype=nfs,rw server:/home\")."
 msgstr "请输入自动挂接条目(比如:\"-fstype=nfs,rw server:/home\")"
 
@@ -7855,11 +7877,16 @@ msgstr "请输入自动挂接条目(比如:\"-fstype=nfs,rw server:/home\")"
 msgid "Please enter the configuration password. This is NOT your LDAP password. It is stored in your .conf-file. If this is the first time you log in, enter \"lam\"."
 msgstr "请输入配置文件的密码,不是LDAP中的密码,这个密码存放在配置文件中,第一次登录的话,请输入\"lam\"."
 
+#: ../lib/modules/puppetClient.inc:74
+#: ../lib/modules/puppetClient.inc:78
+msgid "Please enter the environment name for this node (e.g. production)."
+msgstr "请为本节点输入环境名(比如:production)."
+
 #: ../lib/modules/asteriskAccount.inc:621
 msgid "Please enter the extension context."
 msgstr "请输入扩展的语境."
 
-#: ../lib/modules/asteriskExtension.inc:181
+#: ../lib/modules/asteriskExtension.inc:182
 msgid "Please enter the extension name."
 msgstr "请输入扩展的名字."
 
@@ -7900,12 +7927,12 @@ msgid "Please enter the new name of the profile. The name may contain letters, n
 msgstr "請輸入新的設定檔名稱.可以包含字母,數字和 -/_ ."
 
 #: ../lib/modules/selfRegistration.inc:105
-#: ../lib/modules/passwordSelfReset.inc:90
+#: ../lib/modules/passwordSelfReset.inc:91
 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:388
+#: ../lib/modules/posixAccount.inc:406
 msgid "Please enter the password which you want to set for this account."
 msgstr "请输入这个帐号的密码."
 
@@ -7913,7 +7940,7 @@ msgstr "请输入这个帐号的密码."
 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:359
+#: ../lib/modules/posixAccount.inc:373
 msgid "Please enter the path to the user's home directory."
 msgstr "请输入用户主目录路径."
 
@@ -7925,19 +7952,19 @@ msgstr "请输入非加密的HTTP连接端口号"
 msgid "Please enter the port number for encrypted connections."
 msgstr "请输入加密连接的端口号"
 
-#: ../lib/modules/passwordSelfReset.inc:66
+#: ../lib/modules/passwordSelfReset.inc:67
 msgid "Please enter the possible security questions for the password self reset."
 msgstr "请为密码复位设置安全提问."
 
-#: ../lib/modules/asteriskExtension.inc:183
+#: ../lib/modules/asteriskExtension.inc:184
 msgid "Please enter the priority."
 msgstr "请输入优先级."
 
-#: ../lib/modules/imapAccess.inc:100
+#: ../lib/modules/imapAccess.inc:101
 msgid "Please enter the quota limit of this mailbox in kilobytes."
 msgstr "请输入邮箱的限额(kB)"
 
-#: ../lib/modules/quota.inc:146
+#: ../lib/modules/quota.inc:147
 msgid "Please enter the quota settings for this mount point. The syntax is: {soft block limit},{hard block limit},{soft inode limit},{hard inode limit}"
 msgstr "请输入本挂接点的配额设置.语法为:(软块限制},{硬块限制},{软件节点限制},{硬节点限制}."
 
@@ -7956,20 +7983,26 @@ msgid "Please enter the regular expression (e.g. \"/^[0-9a-zA-Z]+$/\") to valida
 msgstr "请输入正则表达式 (比如:\"/^[0-9a-zA-Z]+$/\")来校验这个域 .语法的描述 <a href=\"%s\">看这里</a>."
 
 #: ../templates/lists/changePassword.php:451
-#: ../lib/modules/selfRegistration.inc:411
-#: ../lib/modules/posixAccount.inc:83
-#: ../lib/modules/customFields.inc:904
+#: ../lib/modules/selfRegistration.inc:421
+#: ../lib/modules/sambaSamAccount.inc:98
+#: ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/customFields.inc:956
 msgid "Please enter the same password in both password fields."
 msgstr "在两个密码输入框请输入相同的密码."
 
-#: ../lib/modules/passwordSelfReset.inc:62
+#: ../lib/modules/passwordSelfReset.inc:63
 msgid "Please enter the security question for the password self reset."
 msgstr "请为密码自复位输入安全提问."
 
-#: ../lib/modules/sambaSamAccount.inc:348
+#: ../lib/modules/sambaSamAccount.inc:353
 msgid "Please enter the time limit in minutes. 0 means unlimited."
 msgstr "请输入时间限制（分钟）。0代表不限制。"
 
+#: ../lib/modules/puppetClient.inc:94
+#: ../lib/modules/puppetClient.inc:98
+msgid "Please enter your Puppet variables for this node (e.g. config_exim=true)."
+msgstr "请为本节点输入您的Puppet变量(比如:config_exim=true)."
+
 #: ../templates/selfService/adminLogin.php:127
 msgid "Please enter your master configuration password to change the self service profile:"
 msgstr "改变自助服务配置文件,请输入管理密码:"
@@ -7983,7 +8016,7 @@ msgid "Please enter your public SSH key."
 msgstr "请输入您的SSH公钥."
 
 #: ../lib/modules/range.inc:394
-#: ../lib/modules/fixed_ip.inc:328
+#: ../lib/modules/fixed_ip.inc:329
 msgid "Please fill out the DHCP settings first."
 msgstr "请先填写DHCP设置"
 
@@ -7991,15 +8024,15 @@ msgstr "请先填写DHCP设置"
 msgid "Please go back and try again."
 msgstr "请返回重试."
 
-#: ../templates/masscreate.php:234
+#: ../templates/masscreate.php:239
 msgid "Please provide a CSV formated file with your account data. The cells in the first row must be filled with the column identifiers. The following rows represent one account for each row."
 msgstr "请提供帐号数据CSV格式文件.第一行必须为栏目标识,以下每行表示一个帐号."
 
-#: ../templates/massBuildAccounts.php:234
+#: ../templates/massBuildAccounts.php:237
 msgid "Please provide a file to upload."
 msgstr "请提供上传的文件。"
 
-#: ../lib/modules/inetOrgPerson.inc:710
+#: ../lib/modules/inetOrgPerson.inc:714
 msgid "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr "请选择图像文件上传,必须是JPG格式(.jpg/.jpeg)."
 
@@ -8015,7 +8048,7 @@ msgstr "请选择日志等级,在此等级以下的日志不会被记录."
 msgid "Please set the voicemail password with \"Set password\" before saving."
 msgstr "在保存前请设置语音邮件的密码."
 
-#: ../lib/modules.inc:825
+#: ../lib/modules.inc:831
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "请在页面%s上输入必须的属性."
@@ -8025,7 +8058,7 @@ msgstr "请在页面%s上输入必须的属性."
 msgid "Please set up your master configuration file (config/config.cfg) first!"
 msgstr "请先主配置文件(config/config.cfg)!"
 
-#: ../lib/modules/dhcp_settings.inc:519
+#: ../lib/modules/dhcp_settings.inc:526
 #: ../lib/modules/ddns.inc:346
 msgid "Please set your LDAP suffix to an LDAP entry with object class \"dhcpServer\"."
 msgstr "请在您的LDAP后缀中设置一个含对象类\"dhcpServer\"."
@@ -8043,7 +8076,7 @@ msgstr "请稍等"
 msgid "Policy count: %s"
 msgstr "策略总计: %s"
 
-#: ../lib/modules/kolabUser.inc:230
+#: ../lib/modules/kolabUser.inc:179
 msgid "Policy list has invalid format!"
 msgstr "策略列表含有非法格式!"
 
@@ -8060,15 +8093,15 @@ msgstr "端口"
 msgid "Port number."
 msgstr "端口号"
 
-#: ../templates/pdfedit/pdfpage.php:539
-#: ../templates/pdfedit/pdfpage.php:549
-#: ../templates/pdfedit/pdfpage.php:559
-#: ../templates/pdfedit/pdfpage.php:574
+#: ../templates/pdfedit/pdfpage.php:541
+#: ../templates/pdfedit/pdfpage.php:551
+#: ../templates/pdfedit/pdfpage.php:561
+#: ../templates/pdfedit/pdfpage.php:576
 msgid "Position"
 msgstr "位置"
 
-#: ../templates/masscreate.php:296
-#: ../templates/masscreate.php:371
+#: ../templates/masscreate.php:301
+#: ../templates/masscreate.php:376
 #: ../lib/modules/customScripts.inc:113
 #: ../lib/modules/customScripts.inc:115
 #: ../lib/modules/customScripts.inc:117
@@ -8076,108 +8109,122 @@ msgstr "位置"
 msgid "Possible values"
 msgstr "可能的值"
 
-#: ../lib/modules/inetOrgPerson.inc:125
-#: ../lib/modules/inetOrgPerson.inc:135
-#: ../lib/modules/inetOrgPerson.inc:236
-#: ../lib/modules/inetOrgPerson.inc:401
-#: ../lib/modules/inetOrgPerson.inc:522
-#: ../lib/modules/inetOrgPerson.inc:637
+#: ../lib/modules/inetOrgPerson.inc:126
+#: ../lib/modules/inetOrgPerson.inc:140
+#: ../lib/modules/inetOrgPerson.inc:241
+#: ../lib/modules/inetOrgPerson.inc:405
+#: ../lib/modules/inetOrgPerson.inc:526
 #: ../lib/modules/inetOrgPerson.inc:641
-#: ../lib/modules/inetOrgPerson.inc:1327
-#: ../lib/modules/inetOrgPerson.inc:2068
-#: ../lib/modules/inetOrgPerson.inc:2618
+#: ../lib/modules/inetOrgPerson.inc:645
+#: ../lib/modules/inetOrgPerson.inc:1331
+#: ../lib/modules/inetOrgPerson.inc:2072
+#: ../lib/modules/inetOrgPerson.inc:2675
 msgid "Post office box"
 msgstr "邮政信箱"
 
-#: ../lib/modules/inetOrgPerson.inc:64
-#: ../lib/modules/inetOrgPerson.inc:124
-#: ../lib/modules/inetOrgPerson.inc:147
-#: ../lib/modules/inetOrgPerson.inc:244
-#: ../lib/modules/inetOrgPerson.inc:385
-#: ../lib/modules/inetOrgPerson.inc:534
-#: ../lib/modules/inetOrgPerson.inc:653
-#: ../lib/modules/inetOrgPerson.inc:1433
-#: ../lib/modules/inetOrgPerson.inc:2070
-#: ../lib/modules/inetOrgPerson.inc:2597
+#: ../lib/modules/inetOrgPerson.inc:65
+#: ../lib/modules/inetOrgPerson.inc:125
+#: ../lib/modules/inetOrgPerson.inc:152
+#: ../lib/modules/inetOrgPerson.inc:249
+#: ../lib/modules/inetOrgPerson.inc:389
+#: ../lib/modules/inetOrgPerson.inc:538
+#: ../lib/modules/inetOrgPerson.inc:657
+#: ../lib/modules/inetOrgPerson.inc:1437
+#: ../lib/modules/inetOrgPerson.inc:2074
+#: ../lib/modules/inetOrgPerson.inc:2642
 msgid "Postal address"
 msgstr "邮政地址"
 
-#: ../lib/modules/inetOrgPerson.inc:654
+#: ../lib/modules/inetOrgPerson.inc:658
 msgid "Postal address, city"
 msgstr "邮政地址,城市"
 
-#: ../lib/modules/inetOrgPerson.inc:68
-#: ../lib/modules/inetOrgPerson.inc:125
-#: ../lib/modules/inetOrgPerson.inc:138
-#: ../lib/modules/inetOrgPerson.inc:238
-#: ../lib/modules/inetOrgPerson.inc:377
-#: ../lib/modules/inetOrgPerson.inc:525
-#: ../lib/modules/inetOrgPerson.inc:645
+#: ../lib/modules/inetOrgPerson.inc:69
+#: ../lib/modules/inetOrgPerson.inc:126
+#: ../lib/modules/inetOrgPerson.inc:143
+#: ../lib/modules/inetOrgPerson.inc:243
+#: ../lib/modules/inetOrgPerson.inc:381
+#: ../lib/modules/inetOrgPerson.inc:529
 #: ../lib/modules/inetOrgPerson.inc:649
-#: ../lib/modules/inetOrgPerson.inc:1353
-#: ../lib/modules/inetOrgPerson.inc:2069
-#: ../lib/modules/inetOrgPerson.inc:2611
+#: ../lib/modules/inetOrgPerson.inc:653
+#: ../lib/modules/inetOrgPerson.inc:1357
+#: ../lib/modules/inetOrgPerson.inc:2073
+#: ../lib/modules/inetOrgPerson.inc:2664
 msgid "Postal code"
 msgstr "邮政编码"
 
+#: ../lib/modules/puppetClient.inc:105
+msgid "Predefined classes"
+msgstr "预定义类"
+
+#: ../lib/modules/puppetClient.inc:109
+#: ../lib/modules/puppetClient.inc:115
+msgid "Predefined environments"
+msgstr "预定义环境"
+
+#: ../lib/modules/authorizedServiceObject.inc:86
+#: ../lib/modules/authorizedServiceObject.inc:92
+msgid "Predefined services"
+msgstr "预定义服务"
+
 #: ../help/help.inc:87
 msgid "Predefined values"
 msgstr "预订值"
 
-#: ../lib/modules/imapAccess.inc:87
-#: ../lib/modules/imapAccess.inc:117
+#: ../lib/modules/imapAccess.inc:88
+#: ../lib/modules/imapAccess.inc:118
 msgid "Prefix for mailboxes"
 msgstr "邮箱前缀"
 
-#: ../lib/modules/inetOrgPerson.inc:331
+#: ../lib/modules/inetOrgPerson.inc:335
 msgid "President"
 msgstr "总裁"
 
-#: ../lib/modules/eduPerson.inc:80
-#: ../lib/modules/eduPerson.inc:147
-#: ../lib/modules/eduPerson.inc:202
-#: ../lib/modules/eduPerson.inc:259
-#: ../lib/modules/eduPerson.inc:663
+#: ../lib/modules/eduPerson.inc:81
+#: ../lib/modules/eduPerson.inc:148
+#: ../lib/modules/eduPerson.inc:203
+#: ../lib/modules/eduPerson.inc:260
+#: ../lib/modules/eduPerson.inc:664
 msgid "Primary affiliation"
 msgstr "主要联系"
 
-#: ../lib/modules/posixAccount.inc:216
-#: ../lib/modules/posixAccount.inc:298
-#: ../lib/modules/posixAccount.inc:317
-#: ../lib/modules/posixAccount.inc:350
-#: ../lib/modules/posixAccount.inc:379
-#: ../lib/modules/posixAccount.inc:417
-#: ../lib/modules/posixAccount.inc:1130
-#: ../lib/modules/posixAccount.inc:1391
-#: ../lib/modules/posixAccount.inc:1437
-#: ../lib/modules/posixAccount.inc:1494
+#: ../lib/modules/posixAccount.inc:230
+#: ../lib/modules/posixAccount.inc:312
+#: ../lib/modules/posixAccount.inc:331
+#: ../lib/modules/posixAccount.inc:364
+#: ../lib/modules/posixAccount.inc:397
+#: ../lib/modules/posixAccount.inc:435
+#: ../lib/modules/posixAccount.inc:1150
+#: ../lib/modules/posixAccount.inc:1411
+#: ../lib/modules/posixAccount.inc:1457
+#: ../lib/modules/posixAccount.inc:1514
 msgid "Primary group"
 msgstr "主要组"
 
-#: ../lib/modules/eduPerson.inc:117
-#: ../lib/modules/eduPerson.inc:185
-#: ../lib/modules/eduPerson.inc:205
-#: ../lib/modules/eduPerson.inc:219
-#: ../lib/modules/eduPerson.inc:361
-#: ../lib/modules/eduPerson.inc:687
+#: ../lib/modules/eduPerson.inc:118
+#: ../lib/modules/eduPerson.inc:186
+#: ../lib/modules/eduPerson.inc:206
+#: ../lib/modules/eduPerson.inc:220
+#: ../lib/modules/eduPerson.inc:362
+#: ../lib/modules/eduPerson.inc:688
 msgid "Primary organisational unit"
 msgstr "主要组织单元"
 
-#: ../lib/modules/eduPerson.inc:101
-#: ../lib/modules/eduPerson.inc:140
-#: ../lib/modules/eduPerson.inc:203
-#: ../lib/modules/eduPerson.inc:253
-#: ../lib/modules/eduPerson.inc:669
+#: ../lib/modules/eduPerson.inc:102
+#: ../lib/modules/eduPerson.inc:141
+#: ../lib/modules/eduPerson.inc:204
+#: ../lib/modules/eduPerson.inc:254
+#: ../lib/modules/eduPerson.inc:670
 msgid "Principal name"
 msgstr "主要的名字"
 
-#: ../lib/modules/eduPerson.inc:215
 #: ../lib/modules/eduPerson.inc:216
+#: ../lib/modules/eduPerson.inc:217
 msgid "Principal name is invalid!"
 msgstr "主要的名字非法!"
 
-#: ../lib/modules/asteriskExtension.inc:98
-#: ../lib/modules/asteriskExtension.inc:815
+#: ../lib/modules/asteriskExtension.inc:99
+#: ../lib/modules/asteriskExtension.inc:824
 msgid "Priority"
 msgstr "优先级"
 
@@ -8192,8 +8239,8 @@ msgstr "处理完毕"
 msgid "Profile deleted."
 msgstr "配置文件被删除."
 
-#: ../templates/profedit/profilepage.php:171
-#: ../templates/profedit/profilemain.php:89
+#: ../templates/profedit/profilepage.php:177
+#: ../templates/profedit/profilemain.php:91
 #: ../lib/tools/profileEditor.inc:44
 msgid "Profile editor"
 msgstr "配置文件编辑器"
@@ -8218,8 +8265,8 @@ msgstr "配置文件管理"
 #: ../templates/selfService/profManage.php:204
 #: ../templates/selfService/profManage.php:218
 #: ../templates/selfService/profManage.php:234
-#: ../templates/profedit/profilepage.php:175
-#: ../templates/profedit/profilemain.php:174
+#: ../templates/profedit/profilepage.php:181
+#: ../templates/profedit/profilemain.php:176
 #: ../help/help.inc:156
 msgid "Profile name"
 msgstr "配置文件名"
@@ -8243,28 +8290,28 @@ msgstr "配置文件密码"
 msgid "Profile passwords are different or empty!"
 msgstr "配置文件密码不同或为空!"
 
-#: ../lib/modules/sambaSamAccount.inc:89
 #: ../lib/modules/sambaSamAccount.inc:90
-#: ../lib/modules/sambaSamAccount.inc:202
-#: ../lib/modules/sambaSamAccount.inc:214
-#: ../lib/modules/sambaSamAccount.inc:286
-#: ../lib/modules/sambaSamAccount.inc:335
-#: ../lib/modules/sambaSamAccount.inc:477
-#: ../lib/modules/sambaSamAccount.inc:573
-#: ../lib/modules/sambaSamAccount.inc:1165
-#: ../lib/modules/sambaSamAccount.inc:1441
-#: ../lib/modules/sambaSamAccount.inc:1542
-#: ../lib/modules/sambaSamAccount.inc:1696
-#: ../lib/modules/sambaSamAccount.inc:1718
+#: ../lib/modules/sambaSamAccount.inc:91
+#: ../lib/modules/sambaSamAccount.inc:206
+#: ../lib/modules/sambaSamAccount.inc:218
+#: ../lib/modules/sambaSamAccount.inc:291
+#: ../lib/modules/sambaSamAccount.inc:340
+#: ../lib/modules/sambaSamAccount.inc:482
+#: ../lib/modules/sambaSamAccount.inc:578
+#: ../lib/modules/sambaSamAccount.inc:1170
+#: ../lib/modules/sambaSamAccount.inc:1446
+#: ../lib/modules/sambaSamAccount.inc:1547
+#: ../lib/modules/sambaSamAccount.inc:1701
+#: ../lib/modules/sambaSamAccount.inc:1723
 msgid "Profile path"
 msgstr "配置文件路径"
 
-#: ../lib/modules/sambaSamAccount.inc:89
-#: ../lib/modules/sambaSamAccount.inc:91
+#: ../lib/modules/sambaSamAccount.inc:90
+#: ../lib/modules/sambaSamAccount.inc:92
 msgid "Profile path is invalid!"
 msgstr "配置文件路径非法!"
 
-#: ../templates/profedit/profilemain.php:113
+#: ../templates/profedit/profilemain.php:115
 msgid "Profile was saved."
 msgstr "配置文件已保存."
 
@@ -8285,6 +8332,10 @@ msgstr "代理URL"
 msgid "Public store"
 msgstr "公用存储"
 
+#: ../lib/modules/puppetClient.inc:63
+msgid "Puppet"
+msgstr "Puppet"
+
 #: ../lib/modules/asteriskAccount.inc:174
 #: ../lib/modules/asteriskAccount.inc:277
 #: ../lib/modules/asteriskAccount.inc:346
@@ -8294,33 +8345,33 @@ msgstr "公用存储"
 msgid "Qualify"
 msgstr "合格"
 
-#: ../lib/modules/passwordSelfReset.inc:61
-#: ../lib/modules/passwordSelfReset.inc:131
-#: ../lib/modules/passwordSelfReset.inc:138
-#: ../lib/modules/passwordSelfReset.inc:151
-#: ../lib/modules/passwordSelfReset.inc:222
-#: ../lib/modules/passwordSelfReset.inc:258
-#: ../lib/modules/passwordSelfReset.inc:368
-#: ../lib/modules/passwordSelfReset.inc:511
-#: ../lib/modules/passwordSelfReset.inc:790
+#: ../lib/modules/passwordSelfReset.inc:62
+#: ../lib/modules/passwordSelfReset.inc:132
+#: ../lib/modules/passwordSelfReset.inc:139
+#: ../lib/modules/passwordSelfReset.inc:152
+#: ../lib/modules/passwordSelfReset.inc:223
+#: ../lib/modules/passwordSelfReset.inc:259
+#: ../lib/modules/passwordSelfReset.inc:369
+#: ../lib/modules/passwordSelfReset.inc:514
+#: ../lib/modules/passwordSelfReset.inc:794
 msgid "Question"
 msgstr "提问"
 
-#: ../lib/modules/quota.inc:79
-#: ../lib/modules/quota.inc:92
-#: ../lib/modules/quota.inc:145
-#: ../lib/modules/zarafaUser.inc:482
+#: ../lib/modules/quota.inc:80
+#: ../lib/modules/quota.inc:93
+#: ../lib/modules/quota.inc:146
+#: ../lib/modules/zarafaUser.inc:484
 #: ../lib/modules/systemQuotas.inc:51
 #: ../lib/modules/systemQuotas.inc:61
 #: ../lib/modules/systemQuotas.inc:68
 #: ../lib/modules/systemQuotas.inc:74
 #: ../lib/modules/systemQuotas.inc:81
-#: ../lib/modules/imapAccess.inc:99
-#: ../lib/modules/imapAccess.inc:139
+#: ../lib/modules/imapAccess.inc:100
+#: ../lib/modules/imapAccess.inc:140
 msgid "Quota"
 msgstr "配额"
 
-#: ../lib/modules/quota.inc:687
+#: ../lib/modules/quota.inc:690
 #, php-format
 msgid "Quota for %s on %s"
 msgstr "%s 在 %s 的硬盘配额:"
@@ -8329,19 +8380,19 @@ msgstr "%s 在 %s 的硬盘配额:"
 #: ../lib/modules/zarafaUser.inc:170
 #: ../lib/modules/zarafaUser.inc:249
 #: ../lib/modules/zarafaUser.inc:371
-#: ../lib/modules/zarafaUser.inc:413
-#: ../lib/modules/zarafaUser.inc:517
-#: ../lib/modules/zarafaUser.inc:1286
-#: ../lib/modules/zarafaUser.inc:1388
+#: ../lib/modules/zarafaUser.inc:415
+#: ../lib/modules/zarafaUser.inc:519
+#: ../lib/modules/zarafaUser.inc:1288
+#: ../lib/modules/zarafaUser.inc:1390
 msgid "Quota hard limit"
 msgstr "硬限额."
 
-#: ../lib/modules/quota.inc:62
+#: ../lib/modules/quota.inc:63
 msgid "Quota has wrong format!"
 msgstr "磁盘配额格式错误!"
 
-#: ../lib/modules/imapAccess.inc:292
-#: ../lib/modules/imapAccess.inc:301
+#: ../lib/modules/imapAccess.inc:294
+#: ../lib/modules/imapAccess.inc:303
 msgid "Quota limit (kB)"
 msgstr "限额(kB)."
 
@@ -8349,9 +8400,9 @@ msgstr "限额(kB)."
 #: ../lib/modules/zarafaUser.inc:164
 #: ../lib/modules/zarafaUser.inc:223
 #: ../lib/modules/zarafaUser.inc:362
-#: ../lib/modules/zarafaUser.inc:489
-#: ../lib/modules/zarafaUser.inc:1268
-#: ../lib/modules/zarafaUser.inc:1379
+#: ../lib/modules/zarafaUser.inc:491
+#: ../lib/modules/zarafaUser.inc:1270
+#: ../lib/modules/zarafaUser.inc:1381
 msgid "Quota override"
 msgstr "限制覆盖"
 
@@ -8359,10 +8410,10 @@ msgstr "限制覆盖"
 #: ../lib/modules/zarafaUser.inc:168
 #: ../lib/modules/zarafaUser.inc:241
 #: ../lib/modules/zarafaUser.inc:368
-#: ../lib/modules/zarafaUser.inc:411
-#: ../lib/modules/zarafaUser.inc:507
-#: ../lib/modules/zarafaUser.inc:1280
-#: ../lib/modules/zarafaUser.inc:1385
+#: ../lib/modules/zarafaUser.inc:413
+#: ../lib/modules/zarafaUser.inc:509
+#: ../lib/modules/zarafaUser.inc:1282
+#: ../lib/modules/zarafaUser.inc:1387
 msgid "Quota soft limit"
 msgstr "软限额"
 
@@ -8370,16 +8421,16 @@ msgstr "软限额"
 #: ../lib/modules/zarafaUser.inc:166
 #: ../lib/modules/zarafaUser.inc:233
 #: ../lib/modules/zarafaUser.inc:365
-#: ../lib/modules/zarafaUser.inc:409
-#: ../lib/modules/zarafaUser.inc:497
-#: ../lib/modules/zarafaUser.inc:1274
-#: ../lib/modules/zarafaUser.inc:1382
+#: ../lib/modules/zarafaUser.inc:411
+#: ../lib/modules/zarafaUser.inc:499
+#: ../lib/modules/zarafaUser.inc:1276
+#: ../lib/modules/zarafaUser.inc:1384
 msgid "Quota warning limit"
 msgstr "限制告警点."
 
-#: ../templates/masscreate.php:320
-#: ../templates/profedit/profilepage.php:202
-#: ../lib/modules.inc:941
+#: ../templates/masscreate.php:325
+#: ../templates/profedit/profilepage.php:208
+#: ../lib/modules.inc:947
 #: ../help/help.inc:154
 msgid "RDN identifier"
 msgstr "RDN标志"
@@ -8419,7 +8470,7 @@ msgstr "RTP保持超时"
 msgid "RTP timeout"
 msgstr "RTP超时"
 
-#: ../lib/modules/customFields.inc:1198
+#: ../lib/modules/customFields.inc:1255
 msgid "Radio buttons"
 msgstr "单选按钮"
 
@@ -8446,7 +8497,6 @@ msgstr "读"
 
 #: ../templates/config/confmain.php:249
 #: ../lib/modules/customFields.inc:76
-#: ../lib/modules/customFields.inc:620
 msgid "Read-only"
 msgstr "只读"
 
@@ -8458,13 +8508,13 @@ msgstr "用户不能更改的只读域.用此来显示不能更改的选项."
 msgid "Really delete value from this attribute?"
 msgstr "确定删除这些属性的值?"
 
-#: ../lib/modules/freeRadius.inc:84
-#: ../lib/modules/freeRadius.inc:118
-#: ../lib/modules/freeRadius.inc:138
-#: ../lib/modules/freeRadius.inc:169
-#: ../lib/modules/freeRadius.inc:223
-#: ../lib/modules/freeRadius.inc:269
-#: ../lib/modules/freeRadius.inc:622
+#: ../lib/modules/freeRadius.inc:85
+#: ../lib/modules/freeRadius.inc:119
+#: ../lib/modules/freeRadius.inc:139
+#: ../lib/modules/freeRadius.inc:170
+#: ../lib/modules/freeRadius.inc:224
+#: ../lib/modules/freeRadius.inc:270
+#: ../lib/modules/freeRadius.inc:623
 #: ../lib/modules/heimdalKerberos.inc:91
 msgid "Realm"
 msgstr "域"
@@ -8487,10 +8537,10 @@ msgstr "接收者非法!"
 msgid "Recipient list"
 msgstr "收件人列表"
 
-#: ../lib/modules/sambaSamAccount.inc:226
-#: ../lib/modules/sambaSamAccount.inc:365
-#: ../lib/modules/sambaSamAccount.inc:1490
-#: ../lib/modules/sambaSamAccount.inc:1770
+#: ../lib/modules/sambaSamAccount.inc:230
+#: ../lib/modules/sambaSamAccount.inc:370
+#: ../lib/modules/sambaSamAccount.inc:1495
+#: ../lib/modules/sambaSamAccount.inc:1775
 msgid "Reconnect if disconnected"
 msgstr "如果中断重新连接"
 
@@ -8514,12 +8564,13 @@ msgstr "此对象的所有子集递归拷贝完毕"
 #: ../templates/config/profmanage.php:273
 #: ../templates/config/mainmanage.php:242
 #: ../templates/config/confmain.php:416
-#: ../lib/modules/selfRegistration.inc:347
-#: ../lib/modules/posixAccount.inc:2110
+#: ../lib/modules/selfRegistration.inc:357
+#: ../lib/modules/sambaSamAccount.inc:2123
+#: ../lib/modules/posixAccount.inc:2128
 msgid "Reenter password"
 msgstr "再次输入密码"
 
-#: ../templates/serverInfo.php:185
+#: ../templates/serverInfo.php:187
 msgid "Referrals"
 msgstr "转交"
 
@@ -8528,10 +8579,10 @@ msgstr "转交"
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1054
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1055
 #: ../templates/3rdParty/pla/lib/HTMLTree.php:249
-#: ../lib/types/automountType.inc:244
-#: ../lib/types/dhcp.inc:287
-#: ../lib/modules/asteriskExtension.inc:439
-#: ../lib/lists.inc:730
+#: ../lib/types/automountType.inc:278
+#: ../lib/types/dhcp.inc:290
+#: ../lib/modules/asteriskExtension.inc:447
+#: ../lib/lists.inc:731
 msgid "Refresh"
 msgstr "刷新"
 
@@ -8544,24 +8595,24 @@ msgstr "刷新本条目"
 msgid "Refreshing tree"
 msgstr "树刷新中"
 
-#: ../lib/modules/selfRegistration.inc:272
+#: ../lib/modules/selfRegistration.inc:282
 msgid "Register new account"
 msgstr "注册新帐号"
 
-#: ../lib/modules/inetOrgPerson.inc:66
-#: ../lib/modules/inetOrgPerson.inc:124
-#: ../lib/modules/inetOrgPerson.inc:150
-#: ../lib/modules/inetOrgPerson.inc:246
-#: ../lib/modules/inetOrgPerson.inc:393
-#: ../lib/modules/inetOrgPerson.inc:537
-#: ../lib/modules/inetOrgPerson.inc:657
-#: ../lib/modules/inetOrgPerson.inc:1461
-#: ../lib/modules/inetOrgPerson.inc:2071
-#: ../lib/modules/inetOrgPerson.inc:2604
+#: ../lib/modules/inetOrgPerson.inc:67
+#: ../lib/modules/inetOrgPerson.inc:125
+#: ../lib/modules/inetOrgPerson.inc:155
+#: ../lib/modules/inetOrgPerson.inc:251
+#: ../lib/modules/inetOrgPerson.inc:397
+#: ../lib/modules/inetOrgPerson.inc:541
+#: ../lib/modules/inetOrgPerson.inc:661
+#: ../lib/modules/inetOrgPerson.inc:1465
+#: ../lib/modules/inetOrgPerson.inc:2075
+#: ../lib/modules/inetOrgPerson.inc:2653
 msgid "Registered address"
 msgstr "注册地址"
 
-#: ../lib/modules/inetOrgPerson.inc:658
+#: ../lib/modules/inetOrgPerson.inc:662
 msgid "Registered address, city"
 msgstr "注册地址,城市"
 
@@ -8601,11 +8652,11 @@ msgid "Reloading"
 msgstr "重新载入"
 
 #: ../templates/config/confmodules.php:291
-#: ../templates/pdfedit/pdfpage.php:461
-#: ../lib/modules/sambaSamAccount.inc:1409
-#: ../lib/modules/kolabUser.inc:904
+#: ../templates/pdfedit/pdfpage.php:463
+#: ../lib/modules/sambaSamAccount.inc:1414
+#: ../lib/modules/kolabUser.inc:752
 #: ../lib/modules/shadowAccount.inc:443
-#: ../lib/modules/freeRadius.inc:475
+#: ../lib/modules/freeRadius.inc:476
 #: ../lib/modules/sudoRole.inc:266
 #: ../lib/modules/sudoRole.inc:293
 #: ../lib/modules/sudoRole.inc:320
@@ -8620,15 +8671,15 @@ msgstr "删除"
 msgid "Remove Asterisk voicemail extension"
 msgstr "删除Asterisk语音邮件扩展"
 
-#: ../lib/modules/authorizedServiceObject.inc:176
+#: ../lib/modules/authorizedServiceObject.inc:190
 msgid "Remove Authorized Service extension"
 msgstr "删除授权服务扩展"
 
-#: ../lib/modules/eduPerson.inc:393
+#: ../lib/modules/eduPerson.inc:394
 msgid "Remove EDU person extension"
 msgstr "删除EDU用户扩展"
 
-#: ../lib/modules/freeRadius.inc:339
+#: ../lib/modules/freeRadius.inc:340
 msgid "Remove FreeRadius extension"
 msgstr "删除FreeRadius扩展"
 
@@ -8640,7 +8691,11 @@ msgstr "删除 IP 地址扩展"
 msgid "Remove Kerberos extension"
 msgstr "删除Kerberos扩展"
 
-#: ../lib/modules/sambaSamAccount.inc:1242
+#: ../lib/modules/puppetClient.inc:273
+msgid "Remove Puppet extension"
+msgstr "删除Puppet扩展"
+
+#: ../lib/modules/sambaSamAccount.inc:1247
 msgid "Remove Samba 3 extension"
 msgstr "删除 Samba 3 扩展"
 
@@ -8650,16 +8705,16 @@ msgstr "删除 Shadow 帐号扩展"
 
 #: ../lib/modules/zarafaContact.inc:228
 #: ../lib/modules/zarafaGroup.inc:275
-#: ../lib/modules/zarafaUser.inc:656
+#: ../lib/modules/zarafaUser.inc:658
 #: ../lib/modules/zarafaServer.inc:209
 msgid "Remove Zarafa extension"
 msgstr "删除Zarafa扩展"
 
-#: ../lib/types/user.inc:339
+#: ../lib/types/user.inc:350
 msgid "Remove from all Unix groups"
 msgstr "从所有的Unix组中删除"
 
-#: ../lib/types/user.inc:344
+#: ../lib/types/user.inc:355
 msgid "Remove from all group of (unique) names"
 msgstr "从所有的(唯一)名字组中删除."
 
@@ -8667,13 +8722,13 @@ msgstr "从所有的(唯一)名字组中删除."
 msgid "Remove host extension"
 msgstr "删除主机扩展"
 
-#: ../lib/modules/posixGroup.inc:212
-#: ../lib/modules/posixAccount.inc:1185
-#: ../lib/modules/inetOrgPerson.inc:1787
+#: ../lib/modules/posixGroup.inc:214
+#: ../lib/modules/posixAccount.inc:1205
+#: ../lib/modules/inetOrgPerson.inc:1791
 msgid "Remove password"
 msgstr "删除密码"
 
-#: ../lib/modules/passwordSelfReset.inc:276
+#: ../lib/modules/passwordSelfReset.inc:277
 msgid "Remove password self reset extension"
 msgstr "删除密码自助复位扩展"
 
@@ -8681,8 +8736,8 @@ msgstr "删除密码自助复位扩展"
 #: ../lib/modules/zarafaContact.inc:386
 #: ../lib/modules/zarafaGroup.inc:442
 #: ../lib/modules/device.inc:278
-#: ../lib/modules/zarafaUser.inc:903
-#: ../lib/modules/inetOrgPerson.inc:1910
+#: ../lib/modules/zarafaUser.inc:905
+#: ../lib/modules/inetOrgPerson.inc:1914
 #: ../lib/modules/groupOfNames.inc:300
 #: ../lib/modules/groupOfNames.inc:412
 msgid "Remove selected entries"
@@ -8692,7 +8747,7 @@ msgstr "删除所选条目"
 msgid "Remove this account type"
 msgstr "删除这个帐号类型"
 
-#: ../lib/modules/inetOrgPerson.inc:2673
+#: ../lib/modules/inetOrgPerson.inc:2755
 msgid "Remove/replace photo"
 msgstr "删除/更改照片"
 
@@ -8755,13 +8810,13 @@ msgid "Renewable lifetime must be a number."
 msgstr "可重建寿命必须是数字!"
 
 #: ../templates/lists/changePassword.php:318
-#: ../lib/modules/passwordSelfReset.inc:813
-#: ../lib/modules.inc:991
+#: ../lib/modules/passwordSelfReset.inc:817
+#: ../lib/modules.inc:997
 msgid "Repeat password"
 msgstr "确认密码"
 
-#: ../lib/modules/posixAccount.inc:75
-#: ../lib/modules/posixAccount.inc:910
+#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/posixAccount.inc:930
 msgid "Replaced $user or $group in homedir."
 msgstr "在homedir中已更改$user和$group. "
 
@@ -8775,10 +8830,10 @@ msgid "Reply-to address for password mails is invalid."
 msgstr "密码邮件的回复地址非法"
 
 #: ../lib/types/ppolicyType.inc:89
-#: ../lib/modules/ppolicy.inc:120
-#: ../lib/modules/ppolicy.inc:146
-#: ../lib/modules/ppolicy.inc:280
-#: ../lib/modules/ppolicy.inc:492
+#: ../lib/modules/ppolicy.inc:121
+#: ../lib/modules/ppolicy.inc:147
+#: ../lib/modules/ppolicy.inc:281
+#: ../lib/modules/ppolicy.inc:493
 msgid "Require password change on first login"
 msgstr "第一次登录时需要修改密码"
 
@@ -8786,7 +8841,7 @@ msgstr "第一次登录时需要修改密码"
 msgid "Required attribute for object classes"
 msgstr "对象类的所需属性"
 
-#: ../templates/schema/schema.php:381
+#: ../templates/schema/schema.php:383
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1567
 msgid "Required attributes"
 msgstr "必选属性"
@@ -8796,16 +8851,16 @@ msgstr "必选属性"
 msgid "Requires preauthentication"
 msgstr "需要预认证"
 
-#: ../lib/modules/sambaSamAccount.inc:1236
+#: ../lib/modules/sambaSamAccount.inc:1241
 msgid "Reset"
 msgstr "复位"
 
-#: ../lib/modules.inc:1134
+#: ../lib/modules.inc:1140
 msgid "Reset changes"
 msgstr "复位设定"
 
-#: ../lib/modules/sambaSamAccount.inc:242
-#: ../lib/modules/sambaSamAccount.inc:1235
+#: ../lib/modules/sambaSamAccount.inc:247
+#: ../lib/modules/sambaSamAccount.inc:1240
 msgid "Reset password"
 msgstr "复位密码"
 
@@ -8821,7 +8876,7 @@ msgstr "在锁定后复位时间"
 msgid "Reset time after lockout must be are natural number."
 msgstr "锁定帐号后复位时间必须是自然数."
 
-#: ../lib/modules/zarafaUser.inc:524
+#: ../lib/modules/zarafaUser.inc:526
 msgid "Resource settings"
 msgstr "资源设置"
 
@@ -8869,19 +8924,19 @@ msgstr "个人目录的权限"
 msgid "Role name"
 msgstr "角色名"
 
-#: ../lib/modules/zarafaUser.inc:529
-#: ../lib/modules/zarafaUser.inc:1290
+#: ../lib/modules/zarafaUser.inc:531
+#: ../lib/modules/zarafaUser.inc:1292
 msgid "Room"
 msgstr "房间"
 
-#: ../lib/modules/inetOrgPerson.inc:126
-#: ../lib/modules/inetOrgPerson.inc:250
-#: ../lib/modules/inetOrgPerson.inc:457
-#: ../lib/modules/inetOrgPerson.inc:543
-#: ../lib/modules/inetOrgPerson.inc:721
-#: ../lib/modules/inetOrgPerson.inc:1508
-#: ../lib/modules/inetOrgPerson.inc:2078
-#: ../lib/modules/inetOrgPerson.inc:2625
+#: ../lib/modules/inetOrgPerson.inc:127
+#: ../lib/modules/inetOrgPerson.inc:255
+#: ../lib/modules/inetOrgPerson.inc:461
+#: ../lib/modules/inetOrgPerson.inc:547
+#: ../lib/modules/inetOrgPerson.inc:725
+#: ../lib/modules/inetOrgPerson.inc:1512
+#: ../lib/modules/inetOrgPerson.inc:2082
+#: ../lib/modules/inetOrgPerson.inc:2686
 msgid "Room number"
 msgstr "房间号"
 
@@ -8894,12 +8949,12 @@ msgid "Routing address"
 msgstr "邮寄地址"
 
 #: ../lib/modules/customFields.inc:104
-#: ../lib/modules/customFields.inc:964
+#: ../lib/modules/customFields.inc:1018
 msgid "Rows"
 msgstr "行"
 
-#: ../lib/modules/asteriskExtension.inc:131
-#: ../lib/modules/asteriskExtension.inc:303
+#: ../lib/modules/asteriskExtension.inc:132
+#: ../lib/modules/asteriskExtension.inc:304
 msgid "Rules"
 msgstr "规则"
 
@@ -8935,7 +8990,7 @@ msgstr "运行用户"
 msgid "Run users"
 msgstr "运行用户"
 
-#: ../templates/serverInfo.php:127
+#: ../templates/serverInfo.php:129
 msgid "SASL mechanisms"
 msgstr "SASL机制"
 
@@ -8947,11 +9002,11 @@ msgstr "实时端的SIP URI"
 msgid "SIP user agent identification."
 msgstr "SIP用户代理标识"
 
-#: ../templates/tests/lamdaemonTest.php:235
+#: ../templates/tests/lamdaemonTest.php:237
 msgid "SSH connection"
 msgstr "SSH连接"
 
-#: ../templates/tests/lamdaemonTest.php:248
+#: ../templates/tests/lamdaemonTest.php:250
 msgid "SSH connection could be established."
 msgstr "SSH连接可以建立."
 
@@ -8983,10 +9038,10 @@ msgid "Samba"
 msgstr "Samba"
 
 #: ../lib/types/user.inc:253
-#: ../lib/types/user.inc:329
-#: ../lib/types/user.inc:363
-#: ../lib/types/user.inc:750
-#: ../lib/modules/sambaSamAccount.inc:129
+#: ../lib/types/user.inc:340
+#: ../lib/types/user.inc:374
+#: ../lib/types/user.inc:761
+#: ../lib/modules/sambaSamAccount.inc:132
 #: ../lib/modules/sambaGroupMapping.inc:312
 msgid "Samba 3"
 msgstr "Samba 3"
@@ -9000,10 +9055,10 @@ msgstr "Samba 3 域SID非法!"
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 域条目"
 
-#: ../lib/modules/sambaSamAccount.inc:307
-#: ../lib/modules/sambaSamAccount.inc:311
-#: ../lib/modules/sambaSamAccount.inc:452
-#: ../lib/modules/sambaSamAccount.inc:518
+#: ../lib/modules/sambaSamAccount.inc:312
+#: ../lib/modules/sambaSamAccount.inc:316
+#: ../lib/modules/sambaSamAccount.inc:457
+#: ../lib/modules/sambaSamAccount.inc:523
 msgid "Samba RID"
 msgstr "Samba RID"
 
@@ -9035,23 +9090,23 @@ msgstr "Samba 域"
 msgid "Samba group type"
 msgstr "Samba 组类型"
 
-#: ../lib/modules/sambaSamAccount.inc:239
+#: ../lib/modules/sambaSamAccount.inc:244
 msgid "Samba password"
 msgstr "Samba密码"
 
-#: ../lib/modules/sambaSamAccount.inc:95
-#: ../lib/modules/sambaSamAccount.inc:208
-#: ../lib/modules/sambaSamAccount.inc:292
-#: ../lib/modules/sambaSamAccount.inc:295
-#: ../lib/modules/sambaSamAccount.inc:493
-#: ../lib/modules/sambaSamAccount.inc:577
-#: ../lib/modules/sambaSamAccount.inc:1176
-#: ../lib/modules/sambaSamAccount.inc:1550
-#: ../lib/modules/sambaSamAccount.inc:1699
+#: ../lib/modules/sambaSamAccount.inc:96
+#: ../lib/modules/sambaSamAccount.inc:212
+#: ../lib/modules/sambaSamAccount.inc:297
+#: ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/sambaSamAccount.inc:498
+#: ../lib/modules/sambaSamAccount.inc:582
+#: ../lib/modules/sambaSamAccount.inc:1181
+#: ../lib/modules/sambaSamAccount.inc:1555
+#: ../lib/modules/sambaSamAccount.inc:1704
 msgid "Samba workstations"
 msgstr "Samba工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:1312
+#: ../lib/modules/sambaSamAccount.inc:1317
 msgid "Saturday"
 msgstr "星期六"
 
@@ -9059,13 +9114,13 @@ msgstr "星期六"
 #: ../templates/config/confmain.php:430
 #: ../templates/config/moduleSettings.php:226
 #: ../templates/config/conftypes.php:277
-#: ../templates/selfService/selfServiceMain.php:358
-#: ../templates/selfService/adminMain.php:584
-#: ../templates/pdfedit/pdfpage.php:583
-#: ../templates/profedit/profilepage.php:227
+#: ../templates/selfService/selfServiceMain.php:362
+#: ../templates/selfService/adminMain.php:612
+#: ../templates/pdfedit/pdfpage.php:585
+#: ../templates/profedit/profilepage.php:233
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1243
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1247
-#: ../lib/modules.inc:1131
+#: ../lib/modules.inc:1137
 msgid "Save"
 msgstr "保存"
 
@@ -9091,21 +9146,21 @@ msgstr "保存更改"
 msgid "Schema browser"
 msgstr "Schema浏览器"
 
-#: ../templates/serverInfo.php:117
+#: ../templates/serverInfo.php:119
 msgid "Schema suffix"
 msgstr "Schema 后缀"
 
-#: ../templates/tests/schemaTest.php:53
-#: ../templates/tests/index.php:56
+#: ../templates/tests/schemaTest.php:55
+#: ../templates/tests/index.php:58
 #: ../lib/tools/tests.inc:116
 msgid "Schema test"
 msgstr "Schema测试"
 
-#: ../lib/modules/eduPerson.inc:84
-#: ../lib/modules/eduPerson.inc:154
-#: ../lib/modules/eduPerson.inc:206
-#: ../lib/modules/eduPerson.inc:268
-#: ../lib/modules/eduPerson.inc:666
+#: ../lib/modules/eduPerson.inc:85
+#: ../lib/modules/eduPerson.inc:155
+#: ../lib/modules/eduPerson.inc:207
+#: ../lib/modules/eduPerson.inc:269
+#: ../lib/modules/eduPerson.inc:667
 msgid "Scoped affiliation"
 msgstr "联系范围"
 
@@ -9129,8 +9184,8 @@ msgstr "脚本服务器非法!"
 msgid "Script servers"
 msgstr "脚本服务器"
 
-#: ../templates/serverInfo.php:298
-#: ../templates/serverInfo.php:378
+#: ../templates/serverInfo.php:300
+#: ../templates/serverInfo.php:380
 #: ../templates/3rdParty/pla/lib/QueryRender.php:75
 #: ../templates/3rdParty/pla/lib/QueryRender.php:180
 #: ../templates/3rdParty/pla/lib/ds_ldap_pla.php:619
@@ -9159,11 +9214,11 @@ msgstr "搜索无结果"
 msgid "Search scope"
 msgstr "搜索范围"
 
-#: ../lib/modules/asteriskExtension.inc:442
+#: ../lib/modules/asteriskExtension.inc:450
 msgid "Search tree suffix for users"
 msgstr "查询用户的树后缀"
 
-#: ../templates/pdfedit/pdfpage.php:555
+#: ../templates/pdfedit/pdfpage.php:557
 msgid "Section"
 msgstr "节"
 
@@ -9184,9 +9239,9 @@ msgstr "安全错误:正在上传的文件可能有错误."
 msgid "Security group"
 msgstr "安全组"
 
-#: ../lib/modules/passwordSelfReset.inc:65
-#: ../lib/modules/passwordSelfReset.inc:156
-#: ../lib/modules/passwordSelfReset.inc:182
+#: ../lib/modules/passwordSelfReset.inc:66
+#: ../lib/modules/passwordSelfReset.inc:157
+#: ../lib/modules/passwordSelfReset.inc:183
 msgid "Security questions"
 msgstr "安全提问"
 
@@ -9199,7 +9254,7 @@ msgstr "安全设定"
 msgid "See also"
 msgstr "同时参考"
 
-#: ../lib/account.inc:678
+#: ../lib/account.inc:714
 msgid "See the manual for instructions to solve this problem."
 msgstr "参考手册来解决本问题."
 
@@ -9219,71 +9274,71 @@ msgstr "全选"
 msgid "Select an LDIF file"
 msgstr "选择LDIF文件"
 
-#: ../lib/modules/nisnetgroup.inc:230
-#: ../lib/modules/nisnetgroup.inc:259
+#: ../lib/modules/nisnetgroup.inc:233
+#: ../lib/modules/nisnetgroup.inc:262
 msgid "Select host"
 msgstr "选择主机"
 
-#: ../lib/modules/customFields.inc:1359
+#: ../lib/modules/customFields.inc:1419
 msgid "Select list"
 msgstr "选项列表"
 
-#: ../lib/modules/nisnetgroup.inc:236
-#: ../lib/modules/nisnetgroup.inc:265
+#: ../lib/modules/nisnetgroup.inc:239
+#: ../lib/modules/nisnetgroup.inc:268
 msgid "Select user"
 msgstr "选择用户"
 
-#: ../lib/modules/posixAccount.inc:1229
-#: ../lib/modules/posixAccount.inc:1259
-#: ../lib/modules/nisnetgroup.inc:374
-#: ../lib/modules/groupOfNamesUser.inc:108
+#: ../lib/modules/posixAccount.inc:1249
+#: ../lib/modules/posixAccount.inc:1279
+#: ../lib/modules/nisnetgroup.inc:377
+#: ../lib/modules/groupOfNamesUser.inc:110
 msgid "Selected groups"
 msgstr "已选择的组"
 
-#: ../templates/masscreate.php:151
+#: ../templates/masscreate.php:156
 #: ../templates/config/confmodules.php:280
 msgid "Selected modules"
 msgstr "已选择的模块"
 
-#: ../lib/modules/posixGroup.inc:251
-#: ../lib/modules/asteriskExtension.inc:446
+#: ../lib/modules/posixGroup.inc:253
+#: ../lib/modules/asteriskExtension.inc:454
 msgid "Selected users"
 msgstr "已选择的用户"
 
-#: ../templates/selfService/adminMain.php:276
+#: ../templates/selfService/adminMain.php:290
 msgid "Self service configuration"
 msgstr "自助服务配置"
 
-#: ../templates/selfService/adminMain.php:320
+#: ../templates/selfService/adminMain.php:334
 msgid "Self service configuration editor"
 msgstr "自助服务配置编辑器"
 
-#: ../templates/selfService/adminMain.php:325
+#: ../templates/selfService/adminMain.php:339
 msgid "Self service login"
 msgstr "自助服务登录"
 
-#: ../lib/modules/passwordSelfReset.inc:111
-#: ../lib/modules/passwordSelfReset.inc:200
+#: ../lib/modules/passwordSelfReset.inc:112
+#: ../lib/modules/passwordSelfReset.inc:201
 msgid "Send confirmation mail"
 msgstr "发送确认邮件"
 
-#: ../lib/modules/passwordSelfReset.inc:93
-#: ../lib/modules/passwordSelfReset.inc:184
+#: ../lib/modules/passwordSelfReset.inc:94
+#: ../lib/modules/passwordSelfReset.inc:185
 msgid "Send notification mail"
 msgstr "发送提示邮件"
 
 #: ../templates/lists/changePassword.php:292
 #: ../templates/lists/changePassword.php:322
-#: ../lib/modules.inc:1008
+#: ../lib/modules.inc:1014
 #: ../help/help.inc:172
 msgid "Send via mail"
 msgstr "通过邮件发送"
 
-#: ../lib/modules/passwordSelfReset.inc:94
+#: ../lib/modules/passwordSelfReset.inc:95
 msgid "Sends a mail to the user to inform him about the password change."
 msgstr "发一封邮件来通知用户有关密码修改事宜."
 
-#: ../lib/modules/passwordSelfReset.inc:112
+#: ../lib/modules/passwordSelfReset.inc:113
 msgid "Sends a mail to the user to validate his email address before the password change."
 msgstr "在密码修改前,给用户发一封邮件来确认邮件地址."
 
@@ -9299,7 +9354,7 @@ msgstr "把密码通过邮件发送给用户。请编辑LAM服务器配置文件
 msgid "Serial number"
 msgstr "序列号"
 
-#: ../templates/tests/lamdaemonTest.php:70
+#: ../templates/tests/lamdaemonTest.php:72
 #: ../templates/3rdParty/pla/lib/HTMLTree.php:166
 #: ../templates/3rdParty/pla/htdocs/import.php:47
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:110
@@ -9309,19 +9364,19 @@ msgid "Server"
 msgstr "服务器"
 
 #: ../templates/config/confmain.php:226
-#: ../templates/selfService/adminMain.php:373
-#: ../lib/modules/imapAccess.inc:69
-#: ../lib/modules/imapAccess.inc:104
+#: ../templates/selfService/adminMain.php:387
+#: ../lib/modules/imapAccess.inc:70
+#: ../lib/modules/imapAccess.inc:105
 #: ../help/help.inc:58
 msgid "Server address"
 msgstr "服务器地址"
 
 #: ../templates/config/confmain.php:463
-#: ../templates/selfService/adminMain.php:108
+#: ../templates/selfService/adminMain.php:122
 msgid "Server address is invalid!"
 msgstr "服务器地址非法!"
 
-#: ../templates/serverInfo.php:101
+#: ../templates/serverInfo.php:103
 #: ../lib/tools/serverInfo.inc:44
 msgid "Server information"
 msgstr "服务器信息"
@@ -9335,16 +9390,16 @@ msgid "Server profile"
 msgstr "服务器设置文件"
 
 #: ../templates/config/confmain.php:255
-#: ../templates/selfService/adminMain.php:393
+#: ../templates/selfService/adminMain.php:407
 msgid "Server settings"
 msgstr "服务器设置"
 
-#: ../templates/serverInfo.php:178
+#: ../templates/serverInfo.php:180
 msgid "Server statistics"
 msgstr "服务器统计"
 
-#: ../templates/serverInfo.php:203
-#: ../templates/serverInfo.php:209
+#: ../templates/serverInfo.php:205
+#: ../templates/serverInfo.php:211
 msgid "Server time"
 msgstr "服务器时间"
 
@@ -9365,7 +9420,7 @@ msgstr "会话超时"
 msgid "Set"
 msgstr "设置"
 
-#: ../lib/modules/sambaSamAccount.inc:1403
+#: ../lib/modules/sambaSamAccount.inc:1408
 #: ../lib/modules/shadowAccount.inc:437
 msgid "Set also for Kerberos"
 msgstr "同时也为Kerberos设置"
@@ -9375,18 +9430,18 @@ msgstr "同时也为Kerberos设置"
 msgid "Set also for Samba 3"
 msgstr "同时也为Samba 3设置"
 
-#: ../lib/modules/sambaSamAccount.inc:1400
+#: ../lib/modules/sambaSamAccount.inc:1405
 #: ../lib/modules/heimdalKerberos.inc:579
 msgid "Set also for Shadow"
 msgstr "同时也为Shadow设置"
 
-#: ../lib/modules.inc:1138
-#: ../lib/modules.inc:1139
+#: ../lib/modules.inc:1144
+#: ../lib/modules.inc:1145
 msgid "Set password"
 msgstr "设置密码"
 
-#: ../lib/modules/posixAccount.inc:187
-#: ../lib/modules/posixAccount.inc:330
+#: ../lib/modules/posixAccount.inc:201
+#: ../lib/modules/posixAccount.inc:344
 msgid "Set primary group as memberUid"
 msgstr "为主组设置memberUid"
 
@@ -9397,7 +9452,7 @@ msgstr "为主组设置memberUid"
 msgid "Set profile password"
 msgstr "设置文件密码"
 
-#: ../lib/modules.inc:1139
+#: ../lib/modules.inc:1145
 msgid "Set random password"
 msgstr "设置随机密码"
 
@@ -9409,11 +9464,15 @@ msgstr "设置特定的密码"
 msgid "Set the search results to 0 to retrieve all available records."
 msgstr "设置搜索条件为0,来获取所有的记录"
 
+#: ../templates/selfService/adminMain.php:486
+msgid "Set this field read-only."
+msgstr "将此域设为只读。"
+
 #: ../lib/modules/groupOfNames.inc:85
 msgid "Set this only if your LDAP schema allows that groups may not have any members (e.g. if you use OpenDJ)."
 msgstr "仅在LDAP模板允许组不含组员时再设置(比如使用OpenDJ)."
 
-#: ../lib/modules/posixGroup.inc:413
+#: ../lib/modules/posixGroup.inc:416
 msgid "Sets the group password."
 msgstr "设置组密码"
 
@@ -9421,10 +9480,10 @@ msgstr "设置组密码"
 msgid "Shadow"
 msgstr "Shadow"
 
-#: ../lib/modules/sambaSamAccount.inc:224
-#: ../lib/modules/sambaSamAccount.inc:359
-#: ../lib/modules/sambaSamAccount.inc:1474
-#: ../lib/modules/sambaSamAccount.inc:1754
+#: ../lib/modules/sambaSamAccount.inc:228
+#: ../lib/modules/sambaSamAccount.inc:364
+#: ../lib/modules/sambaSamAccount.inc:1479
+#: ../lib/modules/sambaSamAccount.inc:1759
 msgid "Shadowing"
 msgstr "遮蔽化(shadow)"
 
@@ -9432,8 +9491,8 @@ msgstr "遮蔽化(shadow)"
 #: ../lib/modules/zarafaUser.inc:174
 #: ../lib/modules/zarafaUser.inc:284
 #: ../lib/modules/zarafaUser.inc:377
-#: ../lib/modules/zarafaUser.inc:586
-#: ../lib/modules/zarafaUser.inc:1324
+#: ../lib/modules/zarafaUser.inc:588
+#: ../lib/modules/zarafaUser.inc:1326
 msgid "Shared store only"
 msgstr "仅共享存储"
 
@@ -9449,11 +9508,11 @@ msgstr "增加一个固定IP地址到DNS服务器吗?"
 msgid "Show"
 msgstr "显示"
 
-#: ../templates/massBuildAccounts.php:217
+#: ../templates/massBuildAccounts.php:220
 msgid "Show LDIF file"
 msgstr "显示LDIF文件"
 
-#: ../lib/types/user.inc:615
+#: ../lib/types/user.inc:626
 msgid "Show account status"
 msgstr "显示帐号状态"
 
@@ -9466,7 +9525,7 @@ msgstr "显示属性"
 msgid "Show internal attributes"
 msgstr "显示内部属性"
 
-#: ../lib/modules/asteriskExtension.inc:438
+#: ../lib/modules/asteriskExtension.inc:446
 msgid "Show only Asterisk accounts"
 msgstr "只显示 Asterisk 帐号"
 
@@ -9474,7 +9533,7 @@ msgstr "只显示 Asterisk 帐号"
 msgid "Show primary group members as normal group members"
 msgstr "主组用户显示为普通组用户"
 
-#: ../templates/schema/schema.php:192
+#: ../templates/schema/schema.php:194
 msgid "Single valued"
 msgstr "单值"
 
@@ -9483,39 +9542,39 @@ msgstr "单值"
 msgid "Skip"
 msgstr "跳过"
 
-#: ../lib/modules/quota.inc:623
+#: ../lib/modules/quota.inc:626
 #: ../lib/modules/systemQuotas.inc:376
 msgid "Soft block"
 msgstr "软块"
 
-#: ../lib/modules/quota.inc:105
-#: ../lib/modules/quota.inc:391
-#: ../lib/modules/quota.inc:496
+#: ../lib/modules/quota.inc:106
+#: ../lib/modules/quota.inc:394
+#: ../lib/modules/quota.inc:499
 #: ../lib/modules/systemQuotas.inc:117
 msgid "Soft block limit"
 msgstr "软块限制"
 
-#: ../lib/modules/quota.inc:106
+#: ../lib/modules/quota.inc:107
 msgid "Soft block limit."
 msgstr "软块限制."
 
-#: ../lib/modules/quota.inc:625
+#: ../lib/modules/quota.inc:628
 #: ../lib/modules/systemQuotas.inc:378
 msgid "Soft inode"
 msgstr "软节点"
 
-#: ../lib/modules/quota.inc:128
+#: ../lib/modules/quota.inc:129
 msgid "Soft inode (files) limit."
 msgstr "软节点限制."
 
-#: ../lib/modules/quota.inc:127
-#: ../lib/modules/quota.inc:395
-#: ../lib/modules/quota.inc:498
+#: ../lib/modules/quota.inc:128
+#: ../lib/modules/quota.inc:398
+#: ../lib/modules/quota.inc:501
 #: ../lib/modules/systemQuotas.inc:121
 msgid "Soft inode limit"
 msgstr "软节点限制."
 
-#: ../lib/modules/imapAccess.inc:88
+#: ../lib/modules/imapAccess.inc:89
 msgid "Some IMAP servers store mailboxes with a prefix (e.g. \"user\" for Cyrus which results in \"user.username\")."
 msgstr "有些IMAP服务器在存储邮件时使用前缀(比如:在Cyrus中\"user\"的邮箱是\"user.username\")."
 
@@ -9524,7 +9583,7 @@ msgstr "有些IMAP服务器在存储邮件时使用前缀(比如:在Cyrus中\"us
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "下面被选中的属性(%s)已经被修改."
 
-#: ../lib/modules.inc:824
+#: ../lib/modules.inc:830
 msgid "Some required information is missing"
 msgstr "缺少一些必要的信息"
 
@@ -9538,8 +9597,8 @@ msgstr "对不起，本模块({bold}%s{endbold}) 尚无帮助说明 (help id {bo
 msgid "Sorry this help number ({bold}%s{endbold}) is not available."
 msgstr "对不起,本帮助号({bold}%s{endbold})并不存在."
 
-#: ../lib/modules/sambaSamAccount.inc:304
-#: ../lib/modules/sambaSamAccount.inc:1213
+#: ../lib/modules/sambaSamAccount.inc:309
+#: ../lib/modules/sambaSamAccount.inc:1218
 msgid "Special user"
 msgstr "特殊用户"
 
@@ -9564,7 +9623,7 @@ msgstr "指定本组是否具备安全可能性."
 msgid "Specifies if this server contains the public store. This may be changed only for new entries."
 msgstr "指定本服务器是否公用存储.仅在新条目可更改."
 
-#: ../lib/modules/ppolicy.inc:125
+#: ../lib/modules/ppolicy.inc:126
 msgid "Specifies if users are allowed to change their own passwords or not."
 msgstr "指定用户是否允许修改自己的密码。"
 
@@ -9587,11 +9646,11 @@ msgstr "指定资源容量"
 msgid "Specifies the maximum lifetime of a ticket in days."
 msgstr "指定票证的最大生命周期天数."
 
-#: ../lib/modules/ppolicy.inc:109
+#: ../lib/modules/ppolicy.inc:110
 msgid "Specifies the maximum number of seconds before a password is due to expire that expiration warning messages will be returned to a user."
 msgstr "在密码过期前，对用户提示密码过期警告的最长时间（秒数）。"
 
-#: ../lib/modules/freeRadius.inc:101
+#: ../lib/modules/freeRadius.inc:102
 msgid "Specifies the maximum number of seconds that a connection can be idle before the session is terminated."
 msgstr "指定在会话中断前,一条连接空闲的最长时间-秒数."
 
@@ -9599,36 +9658,36 @@ msgstr "指定在会话中断前,一条连接空闲的最长时间-秒数."
 msgid "Specifies the maximum renewable lifetime of a ticket in days."
 msgstr "指定票证的最大重建生命期天数."
 
-#: ../lib/modules/ppolicy.inc:113
+#: ../lib/modules/ppolicy.inc:114
 msgid "Specifies the minimum number of characters that will be accepted in a password."
 msgstr "指定在密码中的字符的最少个数"
 
-#: ../lib/modules/ppolicy.inc:101
+#: ../lib/modules/ppolicy.inc:102
 msgid "Specifies the number of consecutive failed login attempts after which the password may not be used to login."
 msgstr "指定锁定帐号前连续登录失败的次数。"
 
-#: ../lib/modules/ppolicy.inc:85
+#: ../lib/modules/ppolicy.inc:86
 msgid "Specifies the number of previously used passwords which should be saved in the password history. New passwords can only be set if they are not in the password history."
 msgstr "指定用户旧密码的历史记录个数。新密码不能与历史记录中的旧密码相同。"
 
-#: ../lib/modules/ppolicy.inc:105
+#: ../lib/modules/ppolicy.inc:106
 msgid "Specifies the number of seconds after which old consecutive failed login attempts are purged from the failure counter, even though no successful authentication has occurred."
 msgstr "指定从失败记录器中清除原来的连续登录失败记录的最长时间（秒数）。"
 
-#: ../lib/modules/ppolicy.inc:97
+#: ../lib/modules/ppolicy.inc:98
 msgid "Specifies the number of seconds during which the password cannot be used to login due to too many consecutive failed bind attempts."
 msgstr "指定在连续登录失败后，用户不能登录的最长时间（秒数）。"
 
-#: ../lib/modules/eduPerson.inc:85
+#: ../lib/modules/eduPerson.inc:86
 msgid "Specifies the person's affiliation within a particular security domain in broad categories such as student, faculty, staff, alum, etc."
 msgstr "指定一个用户的联系,要求是公开目录中明确的安全域,比如学生,教职员工,校友等等."
 
-#: ../lib/modules/eduPerson.inc:81
+#: ../lib/modules/eduPerson.inc:82
 msgid "Specifies the person's primary relationship to the institution in broad categories such as student, faculty, staff, alum, etc."
 msgstr "指定用户的主要关系,要求是公开目录的惯例,比如学生,教职员工,校友等等"
 
-#: ../lib/modules/eduPerson.inc:93
-#: ../lib/modules/eduPerson.inc:97
+#: ../lib/modules/eduPerson.inc:94
+#: ../lib/modules/eduPerson.inc:98
 msgid "Specifies the person's relationships to the institution in broad categories such as student, faculty, staff, alum, etc."
 msgstr "指定用户的关系,要求是公开目录中的惯例,比如学生,教职员工,校友等等."
 
@@ -9640,7 +9699,7 @@ msgstr "指定用户的接听组."
 msgid "Specifies whether the user is an admin. System administrators may additionally create, modify and delete companies."
 msgstr "指定用户是否是管理员.系统管理员可以建立,修改,删除附加的伙伴."
 
-#: ../lib/modules/ppolicy.inc:129
+#: ../lib/modules/ppolicy.inc:130
 msgid "Specifies whether the user's existing password must be sent along with their new password when changing a password. Attention, LAM does not support password changes which require the old password."
 msgstr "在用户更改密码时是否需要输入旧密码。注意，LAM不支持更改密码时需要旧密码。"
 
@@ -9652,26 +9711,26 @@ msgstr "指定属性和属性值"
 msgid "Standard LDAP search filter. Example: (&(sn=Smith)(givenName=David))"
 msgstr "标准的LDAP搜索表达式,比如 (&(sn=Smith)(givenName=David))"
 
-#: ../templates/serverInfo.php:191
-#: ../templates/serverInfo.php:197
+#: ../templates/serverInfo.php:193
+#: ../templates/serverInfo.php:199
 msgid "Start time"
 msgstr "开始时间"
 
-#: ../lib/modules/inetOrgPerson.inc:127
-#: ../lib/modules/inetOrgPerson.inc:144
-#: ../lib/modules/inetOrgPerson.inc:242
-#: ../lib/modules/inetOrgPerson.inc:489
-#: ../lib/modules/inetOrgPerson.inc:531
-#: ../lib/modules/inetOrgPerson.inc:737
+#: ../lib/modules/inetOrgPerson.inc:128
+#: ../lib/modules/inetOrgPerson.inc:149
+#: ../lib/modules/inetOrgPerson.inc:247
+#: ../lib/modules/inetOrgPerson.inc:493
+#: ../lib/modules/inetOrgPerson.inc:535
 #: ../lib/modules/inetOrgPerson.inc:741
-#: ../lib/modules/inetOrgPerson.inc:1405
-#: ../lib/modules/inetOrgPerson.inc:2083
-#: ../lib/modules/inetOrgPerson.inc:2639
+#: ../lib/modules/inetOrgPerson.inc:745
+#: ../lib/modules/inetOrgPerson.inc:1409
+#: ../lib/modules/inetOrgPerson.inc:2087
+#: ../lib/modules/inetOrgPerson.inc:2708
 msgid "State"
 msgstr "地点"
 
-#: ../templates/pdfedit/pdfpage.php:505
 #: ../templates/pdfedit/pdfpage.php:507
+#: ../templates/pdfedit/pdfpage.php:509
 msgid "Static text"
 msgstr "静态文本"
 
@@ -9681,41 +9740,41 @@ msgstr "静态文本"
 msgid "Step %s of %s"
 msgstr "第 %s步,共 %s步"
 
-#: ../lib/modules/inetOrgPerson.inc:300
+#: ../lib/modules/inetOrgPerson.inc:304
 msgid "Steve"
 msgstr "Steve"
 
-#: ../lib/modules/sambaSamAccount.inc:396
-#: ../lib/modules/posixAccount.inc:206
-#: ../lib/modules/inetOrgPerson.inc:2206
+#: ../lib/modules/sambaSamAccount.inc:401
+#: ../lib/modules/posixAccount.inc:220
+#: ../lib/modules/inetOrgPerson.inc:2210
 #: ../lib/modules/asteriskVoicemail.inc:165
 msgid "Steve Miller"
 msgstr "Steve Miller"
 
-#: ../lib/modules/posixAccount.inc:267
+#: ../lib/modules/posixAccount.inc:281
 msgid "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 msgstr "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 
-#: ../lib/modules/eduPerson.inc:169
+#: ../lib/modules/eduPerson.inc:170
 msgid "Steve, Stevo"
 msgstr "Steve,Stevo"
 
-#: ../lib/modules/inetOrgPerson.inc:62
-#: ../lib/modules/inetOrgPerson.inc:124
-#: ../lib/modules/inetOrgPerson.inc:132
-#: ../lib/modules/inetOrgPerson.inc:234
-#: ../lib/modules/inetOrgPerson.inc:369
-#: ../lib/modules/inetOrgPerson.inc:519
-#: ../lib/modules/inetOrgPerson.inc:629
+#: ../lib/modules/inetOrgPerson.inc:63
+#: ../lib/modules/inetOrgPerson.inc:125
+#: ../lib/modules/inetOrgPerson.inc:137
+#: ../lib/modules/inetOrgPerson.inc:239
+#: ../lib/modules/inetOrgPerson.inc:373
+#: ../lib/modules/inetOrgPerson.inc:523
 #: ../lib/modules/inetOrgPerson.inc:633
-#: ../lib/modules/inetOrgPerson.inc:1301
-#: ../lib/modules/inetOrgPerson.inc:2067
-#: ../lib/modules/inetOrgPerson.inc:2590
+#: ../lib/modules/inetOrgPerson.inc:637
+#: ../lib/modules/inetOrgPerson.inc:1305
+#: ../lib/modules/inetOrgPerson.inc:2071
+#: ../lib/modules/inetOrgPerson.inc:2631
 msgid "Street"
 msgstr "街道"
 
-#: ../templates/pdfedit/pdfpage.php:442
-#: ../templates/pdfedit/pdfmain.php:174
+#: ../templates/pdfedit/pdfpage.php:444
+#: ../templates/pdfedit/pdfmain.php:176
 msgid "Structure name"
 msgstr "结构名"
 
@@ -9725,45 +9784,45 @@ msgid "Sub (entire subtree)"
 msgstr "Sub (条目的子树)"
 
 #: ../lib/types/netgroup.inc:93
-#: ../lib/modules/nisnetgroup.inc:81
-#: ../lib/modules/nisnetgroup.inc:116
-#: ../lib/modules/nisnetgroup.inc:131
-#: ../lib/modules/nisnetgroup.inc:199
-#: ../lib/modules/nisnetgroup.inc:373
-#: ../lib/modules/nisnetgroup.inc:577
+#: ../lib/modules/nisnetgroup.inc:84
+#: ../lib/modules/nisnetgroup.inc:119
+#: ../lib/modules/nisnetgroup.inc:134
+#: ../lib/modules/nisnetgroup.inc:202
+#: ../lib/modules/nisnetgroup.inc:376
+#: ../lib/modules/nisnetgroup.inc:580
 msgid "Subgroups"
 msgstr "分组"
 
 #: ../templates/config/confmain.php:325
 #: ../lib/modules/selfRegistration.inc:77
 #: ../lib/modules/selfRegistration.inc:135
-#: ../lib/modules/passwordSelfReset.inc:101
-#: ../lib/modules/passwordSelfReset.inc:192
-#: ../lib/modules/passwordSelfReset.inc:208
+#: ../lib/modules/passwordSelfReset.inc:102
+#: ../lib/modules/passwordSelfReset.inc:193
+#: ../lib/modules/passwordSelfReset.inc:209
 #: ../help/help.inc:200
 msgid "Subject"
 msgstr "标题"
 
 #: ../lib/types/dhcp.inc:94
-#: ../lib/modules/dhcp_settings.inc:128
-#: ../lib/modules/dhcp_settings.inc:182
-#: ../lib/modules/dhcp_settings.inc:196
-#: ../lib/modules/dhcp_settings.inc:213
-#: ../lib/modules/dhcp_settings.inc:529
-#: ../lib/modules/dhcp_settings.inc:628
+#: ../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:536
+#: ../lib/modules/dhcp_settings.inc:635
 msgid "Subnet"
 msgstr "子网"
 
-#: ../lib/modules/dhcp_settings.inc:168
-#: ../lib/modules/dhcp_settings.inc:190
-#: ../lib/modules/dhcp_settings.inc:207
-#: ../lib/modules/dhcp_settings.inc:265
-#: ../lib/modules/dhcp_settings.inc:565
-#: ../lib/modules/dhcp_settings.inc:636
+#: ../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:572
+#: ../lib/modules/dhcp_settings.inc:643
 msgid "Subnet mask"
 msgstr "子网掩码"
 
-#: ../templates/schema/schema.php:174
+#: ../templates/schema/schema.php:176
 msgid "Substring Rule"
 msgstr "子字符串规则"
 
@@ -9797,11 +9856,22 @@ msgid "Sudo roles"
 msgstr "Sudo角色"
 
 #: ../lib/lists.inc:673
-#: ../lib/modules.inc:923
+#: ../lib/modules.inc:929
 msgid "Suffix"
 msgstr "后缀"
 
-#: ../lib/modules/sambaSamAccount.inc:1312
+#: ../lib/modules/posixGroup.inc:322
+#: ../lib/modules/posixGroup.inc:435
+msgid "Suffix for GID/group name check"
+msgstr "GID/组名的后缀检查"
+
+#: ../lib/modules/posixAccount.inc:185
+#: ../lib/modules/posixAccount.inc:195
+#: ../lib/modules/posixAccount.inc:384
+msgid "Suffix for UID/user name check"
+msgstr "UID/用户名的后缀检查"
+
+#: ../lib/modules/sambaSamAccount.inc:1317
 msgid "Sunday"
 msgstr "星期日"
 
@@ -9825,35 +9895,35 @@ msgid "Sync Kerberos password with Unix password"
 msgstr "同步Asterisk和Unix的密码"
 
 #: ../templates/lists/changePassword.php:204
-#: ../lib/modules/sambaSamAccount.inc:230
+#: ../lib/modules/sambaSamAccount.inc:234
 msgid "Sync Samba LM password with Unix password"
 msgstr "同步 Samba LM 密码和Unix的密码"
 
 #: ../templates/lists/changePassword.php:202
-#: ../lib/modules/sambaSamAccount.inc:229
+#: ../lib/modules/sambaSamAccount.inc:233
 msgid "Sync Samba NT password with Unix password"
 msgstr "同步Samba NT的密码和 Unix的密码"
 
-#: ../lib/modules/customFields.inc:318
+#: ../lib/modules/customFields.inc:327
 msgid "Sync fields with page layout"
 msgstr "页面布局的同步域"
 
-#: ../templates/schema/schema.php:179
+#: ../templates/schema/schema.php:181
 #: ../templates/3rdParty/pla/htdocs/add_value_form.php:142
 msgid "Syntax"
 msgstr "语法"
 
-#: ../templates/schema/schema.php:87
+#: ../templates/schema/schema.php:89
 msgid "Syntax OID"
 msgstr "OID语法"
 
-#: ../templates/schema/schema.php:71
-#: ../templates/schema/schema.php:72
+#: ../templates/schema/schema.php:73
+#: ../templates/schema/schema.php:74
 msgid "Syntaxes"
 msgstr "语法"
 
-#: ../lib/modules/zarafaUser.inc:603
-#: ../lib/modules/zarafaUser.inc:1315
+#: ../lib/modules/zarafaUser.inc:605
+#: ../lib/modules/zarafaUser.inc:1317
 msgid "System administrator"
 msgstr "系统管理员"
 
@@ -9865,36 +9935,36 @@ msgstr "系统日志"
 msgid "TLS cannot be combined with ldaps://."
 msgstr "TLS不能与ldaps://结合"
 
-#: ../lib/modules/kolabUser.inc:229
+#: ../lib/modules/kolabUser.inc:178
 msgid "Target of invitation policy is invalid!"
 msgstr "邀请策略的目标非法 !"
 
 #: ../templates/help.php:89
-#: ../lib/modules.inc:614
+#: ../lib/modules.inc:620
 msgid "Technical name"
 msgstr "技术名字"
 
 #: ../templates/lists/changePassword.php:258
 #: ../lib/types/user.inc:186
-#: ../lib/modules/inetOrgPerson.inc:52
-#: ../lib/modules/inetOrgPerson.inc:123
-#: ../lib/modules/inetOrgPerson.inc:153
-#: ../lib/modules/inetOrgPerson.inc:252
-#: ../lib/modules/inetOrgPerson.inc:409
-#: ../lib/modules/inetOrgPerson.inc:546
-#: ../lib/modules/inetOrgPerson.inc:661
+#: ../lib/modules/inetOrgPerson.inc:53
+#: ../lib/modules/inetOrgPerson.inc:124
+#: ../lib/modules/inetOrgPerson.inc:158
+#: ../lib/modules/inetOrgPerson.inc:257
+#: ../lib/modules/inetOrgPerson.inc:413
+#: ../lib/modules/inetOrgPerson.inc:550
 #: ../lib/modules/inetOrgPerson.inc:665
-#: ../lib/modules/inetOrgPerson.inc:1525
-#: ../lib/modules/inetOrgPerson.inc:2072
-#: ../lib/modules/inetOrgPerson.inc:2562
+#: ../lib/modules/inetOrgPerson.inc:669
+#: ../lib/modules/inetOrgPerson.inc:1529
+#: ../lib/modules/inetOrgPerson.inc:2076
+#: ../lib/modules/inetOrgPerson.inc:2587
 msgid "Telephone number"
 msgstr "电话号码"
 
-#: ../lib/modules/inetOrgPerson.inc:347
+#: ../lib/modules/inetOrgPerson.inc:351
 msgid "Temp"
 msgstr "临时"
 
-#: ../lib/modules/inetOrgPerson.inc:323
+#: ../lib/modules/inetOrgPerson.inc:327
 msgid "Temp, contract until december"
 msgstr "临时,合同到年底"
 
@@ -9906,9 +9976,9 @@ msgstr "模板"
 msgid "Templates"
 msgstr "模板"
 
-#: ../lib/modules/sambaSamAccount.inc:368
-#: ../lib/modules/sambaSamAccount.inc:581
-#: ../lib/modules/sambaSamAccount.inc:1225
+#: ../lib/modules/sambaSamAccount.inc:373
+#: ../lib/modules/sambaSamAccount.inc:586
+#: ../lib/modules/sambaSamAccount.inc:1230
 msgid "Terminal server options"
 msgstr "终端服务选项"
 
@@ -9919,49 +9989,45 @@ msgstr "测试"
 #: ../templates/config/confmain.php:334
 #: ../lib/modules/selfRegistration.inc:84
 #: ../lib/modules/selfRegistration.inc:108
-#: ../lib/modules/passwordSelfReset.inc:105
-#: ../lib/modules/passwordSelfReset.inc:115
-#: ../lib/modules/passwordSelfReset.inc:196
-#: ../lib/modules/passwordSelfReset.inc:212
+#: ../lib/modules/passwordSelfReset.inc:106
+#: ../lib/modules/passwordSelfReset.inc:116
+#: ../lib/modules/passwordSelfReset.inc:197
+#: ../lib/modules/passwordSelfReset.inc:213
 #: ../help/help.inc:202
 msgid "Text"
 msgstr "文本"
 
-#: ../lib/modules/customFields.inc:947
+#: ../lib/modules/customFields.inc:1001
 msgid "Text area"
 msgstr "文本区"
 
-#: ../templates/pdfedit/pdfpage.php:564
-#: ../lib/modules/customFields.inc:696
+#: ../templates/pdfedit/pdfpage.php:566
+#: ../lib/modules/customFields.inc:745
 msgid "Text field"
 msgstr "输入框"
 
-#: ../lib/modules/eduPerson.inc:102
+#: ../lib/modules/eduPerson.inc:103
 msgid "The \"NetID\" of the person for the purposes of inter-institutional authentication. It should be represented in the form \"user@scope\" where scope defines a local security domain."
 msgstr "用户用来进行机构间认证的\"NetID\".格式是\"user@scope\",其中scope是本地安全域."
 
-#: ../lib/modules/kolabUser.inc:160
-msgid "The Cyrus mail quota for users in MBytes, leave blank for unlimited space."
-msgstr "用户Cyrus邮件限制(MB),留空意味着不限制."
-
-#: ../lib/modules/dhcp_settings.inc:300
+#: ../lib/modules/dhcp_settings.inc:307
 msgid "The DHCP ranges were changed to fit for the new subnet."
 msgstr "为适应新子网的变化,DHCP范围已经更改."
 
-#: ../lib/modules/eduPerson.inc:114
+#: ../lib/modules/eduPerson.inc:115
 msgid "The DN of the directory entry representing the institution with which the person is associated."
 msgstr "代表用户的机构的目录条目的DN."
 
-#: ../lib/modules/eduPerson.inc:118
+#: ../lib/modules/eduPerson.inc:119
 msgid "The DN of the directory entry representing the person's primary organisational unit."
 msgstr "代表用户主要组织单元的目录条目的DN."
 
-#: ../lib/modules/eduPerson.inc:122
-#: ../lib/modules/eduPerson.inc:126
+#: ../lib/modules/eduPerson.inc:123
+#: ../lib/modules/eduPerson.inc:127
 msgid "The DNs of the directory entries representing the person's organisational units."
 msgstr "代表用户组织单元的目录条目的DN."
 
-#: ../lib/modules/posixGroup.inc:429
+#: ../lib/modules/posixGroup.inc:432
 msgid "The ID of this group was changed. You can update all user and host entries to the new group ID."
 msgstr "组ID已经改变.你可以更新所有的用户和主机条目到新的组ID."
 
@@ -9970,11 +10036,11 @@ msgstr "组ID已经改变.你可以更新所有的用户和主机条目到新的
 msgid "The IP address %s is invalid!"
 msgstr "IP地址 %s非法 !"
 
-#: ../lib/modules/fixed_ip.inc:393
+#: ../lib/modules/fixed_ip.inc:394
 msgid "The IP address does not match the subnet."
 msgstr "IP地址与子网不匹配."
 
-#: ../lib/modules/fixed_ip.inc:396
+#: ../lib/modules/fixed_ip.inc:397
 msgid "The IP address is already in use."
 msgstr "IP地址已被使用: "
 
@@ -9985,21 +10051,21 @@ msgstr "IP地址已被使用: "
 #: ../lib/modules/ppolicyUser.inc:85
 #: ../lib/modules/range.inc:408
 #: ../lib/modules/range.inc:424
-#: ../lib/modules/freeRadius.inc:241
 #: ../lib/modules/freeRadius.inc:242
-#: ../lib/modules/fixed_ip.inc:388
+#: ../lib/modules/freeRadius.inc:243
+#: ../lib/modules/fixed_ip.inc:389
 msgid "The IP address is invalid."
 msgstr "IP地址非法 !"
 
-#: ../lib/modules/fixed_ip.inc:94
+#: ../lib/modules/fixed_ip.inc:95
 msgid "The IP address of the PC."
 msgstr "PC机的IP地址."
 
-#: ../lib/modules/dhcp_settings.inc:141
+#: ../lib/modules/dhcp_settings.inc:148
 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:149
+#: ../lib/modules/dhcp_settings.inc:156
 msgid "The IP addresses of the Netbios name servers (e.g. \"123.123.123.123, 123.123.123.124\")."
 msgstr "Netbios命名服务器的IP地址(比如: \"123.123.123.123, 123.123.123.124\")."
 
@@ -10012,24 +10078,24 @@ msgstr "IP与子网掩码不匹配."
 msgid "The Kerberos realm of this user."
 msgstr "此帐号的Kerberos域"
 
-#: ../lib/modules/fixed_ip.inc:91
+#: ../lib/modules/fixed_ip.inc:92
 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:293
-#: ../lib/modules/dhcp_settings.inc:294
+#: ../lib/modules/dhcp_settings.inc:300
+#: ../lib/modules/dhcp_settings.inc:301
 msgid "The Netbios server is invalid."
 msgstr "Netbios服务器非法."
 
-#: ../lib/modules/fixed_ip.inc:360
+#: ../lib/modules/fixed_ip.inc:361
 msgid "The PC name may not be longer than 20 characters."
 msgstr "PC机器名的长度不能超过20个字符."
 
-#: ../lib/modules/fixed_ip.inc:369
+#: ../lib/modules/fixed_ip.inc:370
 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:363
+#: ../lib/modules/fixed_ip.inc:364
 msgid "The PC name needs to be at least 2 characters long."
 msgstr "PC机器名的长度最短需要两个字符."
 
@@ -10042,7 +10108,7 @@ msgstr "PDF结构定义了输出到PDF文件的信息和页面的结构.可以
 msgid "The RDN field is empty."
 msgstr "RDN域是空的."
 
-#: ../lib/modules/freeRadius.inc:85
+#: ../lib/modules/freeRadius.inc:86
 msgid "The Radius realm of this account."
 msgstr "此帐号的Radius域"
 
@@ -10051,11 +10117,11 @@ msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "您的Samba服务器的SID,可以通过使用\"net getlocalsid\"命令获取."
 
 #: ../templates/selfService/selfServiceLogin.php:90
-#: ../templates/selfService/selfServiceMain.php:139
+#: ../templates/selfService/selfServiceMain.php:143
 msgid "The TLS encryption could not be started."
 msgstr "TLS加密失败."
 
-#: ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:83
 msgid "The UID ranges for users and hosts overlap! This is a problem because LAM uses the highest UID in use + 1 for new accounts. Please set the minimum UID to equal values or use independent ranges."
 msgstr "用户UID范围与主机帐号重叠,因为LAM用户使用最高UID+1做为新帐号的UID.请将最小的UID设为相等或使用独立的范围."
 
@@ -10069,7 +10135,7 @@ msgid "The account context is invalid."
 msgstr "账号语境非法."
 
 #: ../lib/modules/asteriskAccount.inc:103
-#: ../lib/modules/asteriskExtension.inc:91
+#: ../lib/modules/asteriskExtension.inc:92
 #: ../lib/modules/asteriskVoicemail.inc:83
 msgid "The account context stores information about the dial plan."
 msgstr "帐号的语境存储有关拨号模板的信息"
@@ -10079,7 +10145,7 @@ msgstr "帐号的语境存储有关拨号模板的信息"
 msgid "The account type is invalid."
 msgstr "账号类型非法."
 
-#: ../lib/modules/freeRadius.inc:97
+#: ../lib/modules/freeRadius.inc:98
 msgid "The account will be locked after this date."
 msgstr "帐号将在这一天之后锁定."
 
@@ -10087,16 +10153,16 @@ msgstr "帐号将在这一天之后锁定."
 msgid "The account will be saved under this LDAP suffix."
 msgstr "帐号将会保存在此后缀下."
 
-#: ../lib/modules/passwordSelfReset.inc:233
+#: ../lib/modules/passwordSelfReset.inc:234
 #, php-format
 msgid "The answer needs to be at least %s characters long."
 msgstr "答案的最短长度为%s个字符."
 
-#: ../lib/modules/passwordSelfReset.inc:905
+#: ../lib/modules/passwordSelfReset.inc:909
 msgid "The answer to the security question is wrong."
 msgstr "安全问题的答案是错误的."
 
-#: ../templates/tests/schemaTest.php:126
+#: ../templates/tests/schemaTest.php:128
 #, php-format
 msgid "The attribute %s is not supported for the object class %s by your LDAP server."
 msgstr "在你的LDAP服务器中%s属性(属于%s对象类)不被支持。"
@@ -10115,8 +10181,13 @@ msgstr "属性值不存在"
 msgid "The caller ID format is invalid."
 msgstr "拨号ID格式不合法."
 
+#: ../lib/modules/puppetClient.inc:179
+#: ../lib/modules/puppetClient.inc:180
+msgid "The class names may only contain ASCII characters."
+msgstr "类名仅包含ASCII字符."
+
 #: ../templates/config/confmain.php:164
-#: ../templates/selfService/adminMain.php:331
+#: ../templates/selfService/adminMain.php:345
 msgid "The config file is not writable."
 msgstr "配置文件不可写."
 
@@ -10127,12 +10198,8 @@ msgstr "配置文件不可写."
 msgid "The container you specified (%s) does not exist. Please try again."
 msgstr "您指定的容器%s不存在,请重试."
 
-#: ../lib/modules/kolabUser.inc:148
-msgid "The country name of the user."
-msgstr "用户国籍."
-
-#: ../lib/modules/dhcp_settings.inc:291
-#: ../lib/modules/dhcp_settings.inc:292
+#: ../lib/modules/dhcp_settings.inc:298
+#: ../lib/modules/dhcp_settings.inc:299
 msgid "The default gateway is invalid."
 msgstr "缺省网关非法."
 
@@ -10141,17 +10208,17 @@ msgstr "缺省网关非法."
 msgid "The destination entry (%s) already exists."
 msgstr "目标条目(%s)已经存在."
 
-#: ../lib/modules/dhcp_settings.inc:303
-#: ../lib/modules/dhcp_settings.inc:305
+#: ../lib/modules/dhcp_settings.inc:310
+#: ../lib/modules/dhcp_settings.inc:312
 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:302
-#: ../lib/modules/dhcp_settings.inc:304
+#: ../lib/modules/dhcp_settings.inc:309
+#: ../lib/modules/dhcp_settings.inc:311
 msgid "The domain name needs to have at least 3 characters."
 msgstr "域名最少需要3个字符."
 
-#: ../lib/modules/dhcp_settings.inc:125
+#: ../lib/modules/dhcp_settings.inc:132
 msgid "The domain name of the subnet."
 msgstr "域名的子网掩码."
 
@@ -10163,7 +10230,7 @@ msgstr "邮件地址非法 !"
 msgid "The ending IP address of the range."
 msgstr "范围的最高IP地址."
 
-#: ../lib/modules/dhcp_settings.inc:295
+#: ../lib/modules/dhcp_settings.inc:302
 msgid "The entered Netbios node type does not exist."
 msgstr "输入的Netbios节点类型不存在."
 
@@ -10186,12 +10253,17 @@ msgstr "条目(%s)不存在."
 msgid "The entry does not exist and will be ignored"
 msgstr "条目不存在,被忽略"
 
+#: ../lib/modules/puppetClient.inc:177
+#: ../lib/modules/puppetClient.inc:178
+msgid "The environment name may only contain ASCII characters."
+msgstr "环境名仅包含ASCII字符."
+
 #: ../lib/modules/shadowAccount.inc:67
 msgid "The expiration date is invalid."
 msgstr "过期日期非法."
 
-#: ../lib/modules/freeRadius.inc:249
 #: ../lib/modules/freeRadius.inc:250
+#: ../lib/modules/freeRadius.inc:251
 msgid "The expiration date must be in format DD.MM.YYYY HH:MM."
 msgstr "过期日期的格式为 DD.MM.YYYY HH:MM."
 
@@ -10220,8 +10292,8 @@ msgstr "您上传的文件太大,请检查PHP.INI文件中upload_max_size的设
 msgid "The following suffixes are missing in LDAP. LAM can create them for you."
 msgstr "LDAP中没有下列后缀,LAM会自动建立."
 
-#: ../lib/modules/sambaSamAccount.inc:109
-#: ../lib/modules/sambaSamAccount.inc:110
+#: ../lib/modules/sambaSamAccount.inc:112
+#: ../lib/modules/sambaSamAccount.inc:113
 msgid "The format of the logon hours field is invalid!"
 msgstr "登录时间列的格式非法!"
 
@@ -10245,20 +10317,20 @@ msgstr "全名非法."
 msgid "The given user name matches multiple LDAP entries."
 msgstr "给定的用户名匹配了多条LDAP条目."
 
-#: ../lib/modules/ppolicy.inc:93
+#: ../lib/modules/ppolicy.inc:94
 msgid "The grace authentication limit specifies the number of times that an expired password may be used to login."
 msgstr "缓期认证限量指定了密码过期后还能认证的次数。"
 
-#: ../lib/modules/freeRadius.inc:89
-#: ../lib/modules/freeRadius.inc:93
+#: ../lib/modules/freeRadius.inc:90
+#: ../lib/modules/freeRadius.inc:94
 msgid "The group names for this account."
 msgstr "此帐号的组名"
 
-#: ../templates/pdfedit/pdfpage.php:119
+#: ../templates/pdfedit/pdfpage.php:121
 msgid "The headline for a new section must contain at least one character."
 msgstr "新段的标题最少要有一个字符."
 
-#: ../lib/modules/sambaSamAccount.inc:281
+#: ../lib/modules/sambaSamAccount.inc:286
 msgid "The home directory will be connected under this drive letter."
 msgstr "将会从这个驱动器号上连接用户目录。"
 
@@ -10267,7 +10339,7 @@ msgstr "将会从这个驱动器号上连接用户目录。"
 msgid "The host name is invalid."
 msgstr "主机名非法"
 
-#: ../lib/modules/inetOrgPerson.inc:786
+#: ../lib/modules/inetOrgPerson.inc:790
 msgid "The initials of the user's first names."
 msgstr "用户名字的初始化值"
 
@@ -10275,12 +10347,12 @@ msgstr "用户名字的初始化值"
 msgid "The key enables the DHCP server to perform DNS updates. The key is generated with \"genDDNSkey\"."
 msgstr "使DHCP服务器能够进行DNS更新的KEY. 产生KEY的命令是 \"genDDNSkey\"."
 
-#: ../lib/modules/dhcp_settings.inc:289
-#: ../lib/modules/dhcp_settings.inc:290
+#: ../lib/modules/dhcp_settings.inc:296
+#: ../lib/modules/dhcp_settings.inc:297
 msgid "The lease time is invalid."
 msgstr "释放时间非法."
 
-#: ../lib/modules/dhcp_settings.inc:133
+#: ../lib/modules/dhcp_settings.inc:140
 msgid "The lease time specifies after how many seconds the client should request a new IP address."
 msgstr "指定客户端必须重新申请新IP地址的释放时间(秒数)."
 
@@ -10289,12 +10361,17 @@ msgstr "指定客户端必须重新申请新IP地址的释放时间(秒数)."
 msgid "The list of commands which may be run."
 msgstr "可以运行的命令列表"
 
+#: ../lib/modules/puppetClient.inc:86
+#: ../lib/modules/puppetClient.inc:90
+msgid "The list of configured Puppet classes for this node (e.g. ntp)."
+msgstr "这个节点的配置好的Puppet类列表(比如：ntp)."
+
 #: ../lib/modules/sudoRole.inc:68
 #: ../lib/modules/sudoRole.inc:93
 msgid "The list of hosts from which the user may run the commands."
 msgstr "用户可以运行命令的主机列表."
 
-#: ../lib/modules/customFields.inc:1277
+#: ../lib/modules/customFields.inc:1334
 msgid "The list of labels contains duplicates."
 msgstr "这个标签列表包含重复值."
 
@@ -10303,7 +10380,7 @@ msgstr "这个标签列表包含重复值."
 msgid "The list of users who own this sudo role and may run the commands."
 msgstr "具备sudo角色并可以运行命令的用户列表."
 
-#: ../lib/modules/customFields.inc:1274
+#: ../lib/modules/customFields.inc:1331
 msgid "The list of values contains duplicates."
 msgstr "这个值列表包含重复值."
 
@@ -10311,7 +10388,7 @@ msgstr "这个值列表包含重复值."
 msgid "The log file is empty or contains invalid characters! Valid characters are: a-z, A-Z, 0-9, /, \\, ., :, _ and -."
 msgstr "日志文件为空或包含非法字符.合法字符为a-z, A-Z, 0-9, /, \\, ., :, _和-."
 
-#: ../lib/modules/imapAccess.inc:79
+#: ../lib/modules/imapAccess.inc:80
 msgid "The login name of your IMAP user who has rights to create/delete mailboxes."
 msgstr "有权限来建立或删除邮箱的IMAP登录名."
 
@@ -10323,8 +10400,8 @@ msgstr "密码邮寄时的邮件文本"
 msgid "The mail text of the confirmation mail."
 msgstr "确认邮件的文本"
 
-#: ../lib/modules/passwordSelfReset.inc:106
-#: ../lib/modules/passwordSelfReset.inc:116
+#: ../lib/modules/passwordSelfReset.inc:107
+#: ../lib/modules/passwordSelfReset.inc:117
 msgid "The mail text of the mails."
 msgstr "邮件文本"
 
@@ -10332,41 +10409,41 @@ msgstr "邮件文本"
 msgid "The mailbox format is invalid."
 msgstr "邮箱格式不合法."
 
-#: ../lib/modules/dhcp_settings.inc:296
-#: ../lib/modules/dhcp_settings.inc:297
+#: ../lib/modules/dhcp_settings.inc:303
+#: ../lib/modules/dhcp_settings.inc:304
 msgid "The maximum lease time is invalid."
 msgstr "最长释放时间非法."
 
-#: ../lib/modules/dhcp_settings.inc:137
+#: ../lib/modules/dhcp_settings.inc:144
 msgid "The maximum lease time specifies after how many seconds the client must request a new IP address."
 msgstr "指定客户端必须重新申请新IP地址的最长释放时间."
 
-#: ../lib/modules.inc:875
+#: ../lib/modules.inc:881
 #, php-format
 msgid "The module %s is not yet ready."
 msgstr "%s模块未启动."
 
-#: ../templates/pdfedit/pdfpage.php:90
+#: ../templates/pdfedit/pdfpage.php:92
 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','_','-'."
 msgstr "您提供的PDF架构名非法,一个合法的命令由下列字符组成: 'a-z','A-Z','0-9','_','-'."
 
-#: ../lib/modules/asteriskExtension.inc:103
+#: ../lib/modules/asteriskExtension.inc:104
 msgid "The name of a command to execute. The available commands may be listed at the Asterisk command line by executing \"core show applications\"."
 msgstr "将要运行的命令的名字.在Asterisk 命令行运行\"core show applications\"将列出所有有效的命令"
 
-#: ../lib/modules/fixed_ip.inc:88
+#: ../lib/modules/fixed_ip.inc:89
 msgid "The name of the PC."
 msgstr "PC机器名."
 
-#: ../lib/modules/asteriskExtension.inc:95
+#: ../lib/modules/asteriskExtension.inc:96
 msgid "The name of the extension (e.g. voicemail or sip)."
 msgstr "扩展的名字(比如:voicemail 或 sip)."
 
-#: ../lib/modules/kolabUser.inc:152
+#: ../lib/modules/kolabUser.inc:130
 msgid "The name of the server where the mailbox is located."
 msgstr "邮箱所在服务器名."
 
-#: ../lib/modules/dhcp_settings.inc:129
+#: ../lib/modules/dhcp_settings.inc:136
 msgid "The name of the subnet. Example: 192.168.10.0"
 msgstr "子网名称.比如: 192.168.10.0"
 
@@ -10374,20 +10451,20 @@ msgstr "子网名称.比如: 192.168.10.0"
 msgid "The name of your Windows domain or workgroup."
 msgstr "WINDOWS域名或工作组名."
 
-#: ../lib/modules/freeRadius.inc:81
+#: ../lib/modules/freeRadius.inc:82
 msgid "The net mask for the IP address."
 msgstr "IP地址的网络掩码."
 
-#: ../lib/modules/dhcp_settings.inc:173
+#: ../lib/modules/dhcp_settings.inc:180
 msgid "The net mask is derived from the subnet mask. LAM will calculate it automatically."
 msgstr "网络掩码与子网掩码密切相关,LAM将会计算得出."
 
-#: ../lib/modules/freeRadius.inc:243
 #: ../lib/modules/freeRadius.inc:244
+#: ../lib/modules/freeRadius.inc:245
 msgid "The net mask is invalid."
 msgstr "子网掩码非法."
 
-#: ../lib/modules.inc:1118
+#: ../lib/modules.inc:1124
 msgid "The new password will be stored in the directory after you save this account."
 msgstr "保存帐号后新密码同时保存到目录服务器."
 
@@ -10399,18 +10476,18 @@ msgstr "上一次合格的微秒数"
 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 given user name."
 msgstr "可以登录LAM的用户数量受限,或是DN的固定列表数量受限,还可能是LAM在LDAP中搜索给定用户名的DN数量受限."
 
-#: ../templates/tests/schemaTest.php:112
+#: ../templates/tests/schemaTest.php:114
 #, php-format
 msgid "The object class %s is not supported by your LDAP server."
 msgstr "在你的LDAP服务器中对象类%s不被支持。"
 
-#: ../lib/modules/inetOrgPerson.inc:750
 #: ../lib/modules/inetOrgPerson.inc:754
+#: ../lib/modules/inetOrgPerson.inc:758
 msgid "The office name of the user (e.g. YourCompany, Human Resources)."
 msgstr "用户的办公室名(比如:某某公司,人力资源部)"
 
-#: ../templates/selfService/selfServiceMain.php:278
-#: ../lib/modules.inc:1705
+#: ../templates/selfService/selfServiceMain.php:282
+#: ../lib/modules.inc:1717
 msgid "The operation was stopped because of the above errors."
 msgstr "由于发生了以上错误，操作中止."
 
@@ -10478,38 +10555,38 @@ msgstr "密码强度不够.最少需要%s个标点符号字符."
 msgid "The password is too weak. You have to enter at least %s upper case characters."
 msgstr "密码强度不够.最少需要%s个大写字母字符."
 
-#: ../lib/modules/imapAccess.inc:85
+#: ../lib/modules/imapAccess.inc:86
 msgid "The password of your IMAP admin user. The login name for the IMAP admin user is stored in the LAM server profile."
 msgstr "IMAP管理员用户的密码.IMAP管理员用户登录名保存在LAM服务器的配置中."
 
 #: ../templates/lists/changePassword.php:504
-#: ../lib/modules.inc:1055
+#: ../lib/modules.inc:1061
 msgid "The password was set to:"
 msgstr "密码被设置为:"
 
-#: ../lib/modules/inetOrgPerson.inc:638
 #: ../lib/modules/inetOrgPerson.inc:642
+#: ../lib/modules/inetOrgPerson.inc:646
 msgid "The post office box of the user's address."
 msgstr "用户地址的邮箱."
 
-#: ../lib/modules/inetOrgPerson.inc:646
 #: ../lib/modules/inetOrgPerson.inc:650
+#: ../lib/modules/inetOrgPerson.inc:654
 msgid "The postal code of the user's address."
 msgstr "用户地址的邮政编码"
 
-#: ../lib/modules/posixAccount.inc:351
+#: ../lib/modules/posixAccount.inc:365
 msgid "The primary group for this account. You can insert a GID number or a group name."
 msgstr "本帐号的主组名,您可以输入一个GID号或组名."
 
-#: ../lib/modules/posixAccount.inc:418
+#: ../lib/modules/posixAccount.inc:436
 msgid "The primary group the host should be member of."
 msgstr "该主机所属的主组名."
 
-#: ../lib/modules/posixAccount.inc:380
+#: ../lib/modules/posixAccount.inc:398
 msgid "The primary group the user should be member of."
 msgstr "该用户所属的主组名."
 
-#: ../lib/modules/asteriskExtension.inc:99
+#: ../lib/modules/asteriskExtension.inc:100
 msgid "The priority is a sequence number used to order the execution of commands. Commands are executed beginning with the lowest sequence number."
 msgstr "优先级是一个序号,用来表示运行命令的顺序.最小的序号代表的命令会最先运行."
 
@@ -10521,7 +10598,7 @@ msgstr "此范围与其它范围冲突."
 msgid "The range end needs to be greater than the range start."
 msgstr "范围的终止地址需要大于起始地址."
 
-#: ../lib/modules/inetOrgPerson.inc:722
+#: ../lib/modules/inetOrgPerson.inc:726
 msgid "The room number of the employee's office."
 msgstr "雇员办公室房间号码"
 
@@ -10540,10 +10617,10 @@ msgstr "第二个选项是LDAP属性名,第三个选项是描述标签."
 
 #: ../lib/modules/asteriskAccount.inc:235
 #: ../lib/modules/zarafaGroup.inc:99
-#: ../lib/modules/sambaSamAccount.inc:375
+#: ../lib/modules/sambaSamAccount.inc:380
 #: ../lib/modules/zarafaUser.inc:118
-#: ../lib/modules/inetOrgPerson.inc:766
-#: ../lib/modules/freeRadius.inc:105
+#: ../lib/modules/inetOrgPerson.inc:770
+#: ../lib/modules/freeRadius.inc:106
 #: ../lib/modules/zarafaServer.inc:82
 msgid "The selected options will not be managed inside LAM. You can use this to reduce the number of displayed input fields."
 msgstr "选中项将不被LAM所管理,可以用此来减少所显示的输入框个数."
@@ -10556,17 +10633,17 @@ msgstr "源DN与目标DN相同"
 msgid "The starting IP address of the range."
 msgstr "范围的起始IP地址."
 
-#: ../lib/modules/inetOrgPerson.inc:738
 #: ../lib/modules/inetOrgPerson.inc:742
+#: ../lib/modules/inetOrgPerson.inc:746
 msgid "The state where the user resides or works."
 msgstr "用户居住或工作地点."
 
-#: ../templates/pdfedit/pdfpage.php:107
+#: ../templates/pdfedit/pdfpage.php:109
 msgid "The static text must contain at least one character."
 msgstr "静态文本至少包含一个字符."
 
-#: ../lib/modules/inetOrgPerson.inc:630
 #: ../lib/modules/inetOrgPerson.inc:634
+#: ../lib/modules/inetOrgPerson.inc:638
 msgid "The street name of the user's address."
 msgstr "用户地址的街道名"
 
@@ -10575,25 +10652,25 @@ msgid "The subject of all password mails."
 msgstr "密码邮件的主题."
 
 #: ../lib/modules/selfRegistration.inc:136
-#: ../lib/modules/passwordSelfReset.inc:102
+#: ../lib/modules/passwordSelfReset.inc:103
 msgid "The subject of the mails."
 msgstr "邮件主题."
 
-#: ../lib/modules/dhcp_settings.inc:284
+#: ../lib/modules/dhcp_settings.inc:291
 msgid "The subnet is already in use."
 msgstr "子网掩码已经被占用."
 
-#: ../lib/modules/dhcp_settings.inc:285
-#: ../lib/modules/dhcp_settings.inc:286
+#: ../lib/modules/dhcp_settings.inc:292
+#: ../lib/modules/dhcp_settings.inc:293
 msgid "The subnet is invalid."
 msgstr "子网非法"
 
-#: ../lib/modules/dhcp_settings.inc:298
-#: ../lib/modules/dhcp_settings.inc:299
+#: ../lib/modules/dhcp_settings.inc:305
+#: ../lib/modules/dhcp_settings.inc:306
 msgid "The subnet mask is invalid."
 msgstr "子网掩码非法"
 
-#: ../lib/modules/dhcp_settings.inc:169
+#: ../lib/modules/dhcp_settings.inc:176
 msgid "The subnet mask of the network."
 msgstr "网络的子网掩码."
 
@@ -10623,49 +10700,54 @@ msgstr "当邮箱到达这个权限值时,用户会收到告警."
 msgid "The user's call groups."
 msgstr "用户呼叫组"
 
-#: ../lib/modules/inetOrgPerson.inc:686
 #: ../lib/modules/inetOrgPerson.inc:690
+#: ../lib/modules/inetOrgPerson.inc:694
 msgid "The user's email address."
 msgstr "用户邮件的地址."
 
-#: ../lib/modules/inetOrgPerson.inc:678
 #: ../lib/modules/inetOrgPerson.inc:682
+#: ../lib/modules/inetOrgPerson.inc:686
 msgid "The user's fax number."
 msgstr "用户的传真号."
 
-#: ../lib/modules/inetOrgPerson.inc:670
 #: ../lib/modules/inetOrgPerson.inc:674
+#: ../lib/modules/inetOrgPerson.inc:678
 msgid "The user's mobile number."
 msgstr "用户的手机号."
 
-#: ../lib/modules/inetOrgPerson.inc:774
 #: ../lib/modules/inetOrgPerson.inc:778
+#: ../lib/modules/inetOrgPerson.inc:782
 msgid "The user's organisation name."
 msgstr "用户的组织名."
 
-#: ../lib/modules/inetOrgPerson.inc:714
 #: ../lib/modules/inetOrgPerson.inc:718
+#: ../lib/modules/inetOrgPerson.inc:722
 msgid "The user's private telephone number."
 msgstr "用户的个人电话号码."
 
-#: ../lib/modules/inetOrgPerson.inc:662
 #: ../lib/modules/inetOrgPerson.inc:666
+#: ../lib/modules/inetOrgPerson.inc:670
 msgid "The user's telephone number."
 msgstr "用户的电话"
 
-#: ../lib/modules/inetOrgPerson.inc:782
+#: ../lib/modules/inetOrgPerson.inc:786
 msgid "The user's unique employee number."
 msgstr "用户的唯一雇员号"
 
-#: ../lib/modules/inetOrgPerson.inc:694
 #: ../lib/modules/inetOrgPerson.inc:698
+#: ../lib/modules/inetOrgPerson.inc:702
 msgid "The user's web site (e.g. http://www.company.com)."
 msgstr "用户的web网站(比如,http://www.company.com)."
 
-#: ../lib/modules/sambaSamAccount.inc:112
+#: ../lib/modules/sambaSamAccount.inc:115
 msgid "The value for the Samba 3 field \"User can/must change password\" needs to be a number."
 msgstr "Samba 3 的 \"用户可以/必须修改密码\" 的取值必须是一个数字."
 
+#: ../lib/modules/puppetClient.inc:181
+#: ../lib/modules/puppetClient.inc:182
+msgid "The variables may only contain ASCII characters."
+msgstr "变量仅能包含ASCII字符."
+
 #: ../lib/modules/asteriskVoicemail.inc:213
 #: ../lib/modules/asteriskVoicemail.inc:214
 msgid "The voicemail context name is invalid."
@@ -10680,12 +10762,12 @@ msgstr "没有被标记为RDN的属性"
 msgid "The wildcard for the account creation link is @@creationLink@@."
 msgstr "账号建立连接的通配符 @@resetLink@@."
 
-#: ../lib/modules/passwordSelfReset.inc:108
+#: ../lib/modules/passwordSelfReset.inc:109
 #: ../help/help.inc:206
 msgid "The wildcard for the new password is @@newPassword@@."
 msgstr "新密码的通配符为@@newPassword@@."
 
-#: ../lib/modules/passwordSelfReset.inc:118
+#: ../lib/modules/passwordSelfReset.inc:119
 msgid "The wildcard for the reset link is @@resetLink@@."
 msgstr "复位连接的通配符 @@resetLink@@."
 
@@ -10694,7 +10776,7 @@ 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:498
+#: ../lib/modules/posixGroup.inc:509
 msgid "There are still users who have this group as their primary group."
 msgstr "仍有用户的主组为本组."
 
@@ -10710,7 +10792,7 @@ msgstr "已经有其他的帐号使用这个拨号ID."
 msgid "There is already another user with this mailbox name."
 msgstr "已经有其他的帐号使用这个邮箱名."
 
-#: ../templates/massDoUpload.php:227
+#: ../templates/massDoUpload.php:230
 msgid "There were errors while uploading:"
 msgstr "上传时发生错误."
 
@@ -10719,28 +10801,40 @@ msgstr "上传时发生错误."
 msgid "There will be %s updates done with this mass update"
 msgstr "在这次批量更新中将有%s个更新"
 
-#: ../lib/modules/posixGroup.inc:417
+#: ../lib/modules/posixGroup.inc:420
 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:339
+#: ../lib/modules/posixAccount.inc:353
 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 users. New host accounts will always get the highest number in use plus one."
 msgstr "这是为主机新建账号时机器ID号的最小值和最大值.这个范围不同于用户数量.新主机帐号的ID总是得到当前最高值加1."
 
-#: ../lib/modules/posixAccount.inc:335
+#: ../lib/modules/posixAccount.inc:349
 msgid "These are the minimum and maximum numbers to use for user IDs when creating new user accounts. The range should be different from that of machines. New user accounts will always get the highest number in use plus one."
 msgstr "建立新用户帐号时所使用的最大和最小UID号,UID范围不能与机器ID号一致.新帐号使用已用最大号加1."
 
-#: ../lib/modules/nisnetgroup.inc:86
-#: ../lib/modules/nisnetgroup.inc:90
+#: ../lib/modules/puppetClient.inc:106
+msgid "These classes will be available as autocompletion hints when adding new classes."
+msgstr "在增加类时，这些类是自动完成的提示选项。"
+
+#: ../lib/modules/nisnetgroup.inc:89
+#: ../lib/modules/nisnetgroup.inc:93
 msgid "These entries specify the members of the netgroup. You can limit the set to a host name, a user name, a domain name or any combination of them."
 msgstr "这些条目指定了网络组的成员.您可以指定一个主机名集,或一个用户名集,或一个域名集,或上述的任意组合."
 
-#: ../lib/modules/asteriskExtension.inc:115
+#: ../lib/modules/puppetClient.inc:110
+msgid "These environments will be available as autocompletion hints when setting the environment."
+msgstr "在设置变量时，这些变量是自动完成的提示选项。"
+
+#: ../lib/modules/asteriskExtension.inc:116
 msgid "These options change the list of potential extension owners below. You can select to show Asterisk accounts or all users. It is also possible to search the tree suffix if you have users which are not in the standard user suffix."
 msgstr "这个选项改变以下其它的扩展属主列表。你可以选择来显示 Asterisk 帐号或所有用户。在标准用户后缀树以外的后缀树中，查询用户也是可以的。"
 
-#: ../lib/modules/posixAccount.inc:98
+#: ../lib/modules/authorizedServiceObject.inc:87
+msgid "These services will show up as hint if you enter a new service."
+msgstr "在输入新服务时，这个列表会被提示。"
+
+#: ../lib/modules/posixAccount.inc:108
 msgid "This GID number is invalid! Please provide either a number or a group name."
 msgstr "GID号非法!请提供新号或组名."
 
@@ -10748,15 +10842,15 @@ msgstr "GID号非法!请提供新号或组名."
 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."
 msgstr "这些HTML代码将显示在自助服务主页的上端,比如可以在此放在贵公司标志,可以输入任何HTML代码."
 
-#: ../lib/modules/fixed_ip.inc:366
+#: ../lib/modules/fixed_ip.inc:367
 msgid "This PC name already exists."
 msgstr "PC机器名已经存在!"
 
-#: ../lib/modules/kolabUser.inc:276
+#: ../lib/modules/kolabUser.inc:219
 msgid "This account is marked for deletion."
 msgstr "本帐号标记为删除."
 
-#: ../lib/modules/sambaSamAccount.inc:305
+#: ../lib/modules/sambaSamAccount.inc:310
 msgid "This allows you to define this account as a special user like administrator or guest."
 msgstr "您可以指定本帐号为特殊帐号,比如管理员或来宾."
 
@@ -10772,7 +10866,7 @@ msgstr "必要的属性"
 msgid "This attribute is required for the RDN."
 msgstr "RDN的必要的属性."
 
-#: ../lib/modules/inetOrgPerson.inc:746
+#: ../lib/modules/inetOrgPerson.inc:750
 msgid "This can be used to specify if the user has a car license."
 msgstr "用来指定用户是否拥有汽车执照."
 
@@ -10788,7 +10882,7 @@ msgstr "改变设置文件的密码."
 msgid "This changes the profile which is selected by default at login."
 msgstr "改变缺省登录使用的配置文件."
 
-#: ../templates/massBuildAccounts.php:154
+#: ../templates/massBuildAccounts.php:157
 msgid "This column is defined to include unique entries but duplicates were found:"
 msgstr "本列不能有重复的条目,但发现了下列重复条目:"
 
@@ -10813,7 +10907,7 @@ msgstr "设置登录语言和默认语言.用户可以在登录时更改."
 msgid "This defines the rights for the home directories which are created by lamdaemon."
 msgstr "设置lamdaemon建立的用户目录的权限."
 
-#: ../lib/modules/asteriskExtension.inc:87
+#: ../lib/modules/asteriskExtension.inc:88
 msgid "This defines what application Asterisk has to start for this user (e.g. SIP/user1)."
 msgstr "定义为这个用户启动的Asterisk 应用(比如:SIP/user1)."
 
@@ -10830,8 +10924,8 @@ msgstr "描述设备所在地点."
 msgid "This describes the location of the host."
 msgstr "描述主机所在地点."
 
-#: ../lib/modules/inetOrgPerson.inc:730
 #: ../lib/modules/inetOrgPerson.inc:734
+#: ../lib/modules/inetOrgPerson.inc:738
 msgid "This describes the location of the user."
 msgstr "描述用户所在地点."
 
@@ -10848,11 +10942,11 @@ msgid "This email address will be set as sender address of all password mails. I
 msgstr "这个邮件地址会被设定为密码邮件的发件人地址.如果为空,刚使用phi.ini指定的缺省值."
 
 #: ../lib/modules/selfRegistration.inc:132
-#: ../lib/modules/passwordSelfReset.inc:98
+#: ../lib/modules/passwordSelfReset.inc:99
 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:78
+#: ../lib/modules/passwordSelfReset.inc:79
 msgid "This enables the password self reset function."
 msgstr "打开密码自助复位功能."
 
@@ -10870,11 +10964,11 @@ msgid "This entry is the root of a sub-tree containing %s entries."
 msgstr "本条目是一个包含%s 子条目的子树的根."
 
 #: ../templates/lib/141_jquery-validationEngine-lang.php:34
-#: ../lib/modules/selfRegistration.inc:445
+#: ../lib/modules/selfRegistration.inc:455
 msgid "This field is required."
 msgstr "必要的属性"
 
-#: ../lib/modules/posixAccount.inc:100
+#: ../lib/modules/posixAccount.inc:110
 msgid "This gecos value is invalid!"
 msgstr "备注值非法!"
 
@@ -10886,15 +10980,15 @@ msgstr "这是以逗号分隔的IP地址列表."
 msgid "This is a comma separated list of MAC addresses."
 msgstr "这是以逗号分隔的MAC地址列表."
 
-#: ../lib/modules/kolabUser.inc:136
+#: ../lib/modules/kolabUser.inc:118
 msgid "This is a comma separated list of delegates."
 msgstr "这是以逗号分隔的代表列表."
 
-#: ../lib/modules/kolabUser.inc:144
+#: ../lib/modules/kolabUser.inc:126
 msgid "This is a comma separated list of eMail aliases."
 msgstr "这是以逗号分隔的电子邮件别名列表."
 
-#: ../lib/modules/kolabUser.inc:128
+#: ../lib/modules/kolabUser.inc:110
 msgid "This is a comma separated list of invitation policies."
 msgstr "这是逗号分隔的约会策略列表."
 
@@ -10922,7 +11016,7 @@ msgstr "这是该组用户列表."
 msgid "This is a list of members of this group. Multiple members are separated by semicolons."
 msgstr "这是以分号分隔的本组用户列表."
 
-#: ../lib/modules/eduPerson.inc:89
+#: ../lib/modules/eduPerson.inc:90
 msgid "This is a list of nick names for this user."
 msgstr "这是该用户的昵称列表."
 
@@ -10943,7 +11037,7 @@ msgid "This is a structural ObjectClass and cannot be removed."
 msgstr "这是一个不能被删除的结构化对象类"
 
 #: ../lib/modules/nisObject.inc:67
-#: ../lib/modules/automount.inc:63
+#: ../lib/modules/automount.inc:66
 msgid "This is an optional description for this entry."
 msgstr "可以输入此条目的描述(可选)"
 
@@ -10954,15 +11048,15 @@ msgstr "用于搜索用户帐号的LDAP DN.比如您输入\"uid\" 而用户输
 #: ../lib/modules/zarafaDynamicGroup.inc:173
 #: ../lib/modules/ipHost.inc:110
 #: ../lib/modules/device.inc:128
-#: ../lib/modules/eduPerson.inc:218
-#: ../lib/modules/eduPerson.inc:220
+#: ../lib/modules/eduPerson.inc:219
+#: ../lib/modules/eduPerson.inc:221
 #: ../lib/modules/zarafaAddressList.inc:145
-#: ../lib/modules/inetOrgPerson.inc:79
+#: ../lib/modules/inetOrgPerson.inc:80
 #: ../lib/modules/aliasEntry.inc:79
 msgid "This is not a valid DN!"
 msgstr "不是一个有效的DN!"
 
-#: ../lib/modules/sambaSamAccount.inc:99
+#: ../lib/modules/sambaSamAccount.inc:102
 msgid "This is not a valid RID number!"
 msgstr "不是一个有效的RID号!"
 
@@ -10970,7 +11064,7 @@ msgstr "不是一个有效的RID号!"
 msgid "This is not a valid Samba 3 group type!"
 msgstr "不是一个有效的Samba 3 组类型!"
 
-#: ../lib/modules/eduPerson.inc:222
+#: ../lib/modules/eduPerson.inc:223
 msgid "This is not a valid list of DNs!"
 msgstr "这不是一个有效的DN列表!"
 
@@ -10986,7 +11080,7 @@ msgstr "这个别名的一个收件人."
 msgid "This is the ID of the user in the Asterisk database. It may contain digits and letters (e.g. user1 or 200134)."
 msgstr "这是在Asterisk数据库中的用户ID,可以包含数字或字母(比如:user1 或 200134)."
 
-#: ../lib/modules/freeRadius.inc:77
+#: ../lib/modules/freeRadius.inc:78
 msgid "This is the IP address for the user (e.g. 123.123.123.123)."
 msgstr "用户的IP地址(比如:123.123.123.123)."
 
@@ -10998,8 +11092,8 @@ msgstr "设备的网卡的IP地址(比如:123.123.123.123)."
 msgid "This is the LDAP DN of the host's manager."
 msgstr "主机管理员的LDAP DB"
 
-#: ../lib/modules/inetOrgPerson.inc:622
 #: ../lib/modules/inetOrgPerson.inc:626
+#: ../lib/modules/inetOrgPerson.inc:630
 msgid "This is the LDAP DN of the user's manager. Use this property to represent hierarchies in your company."
 msgstr "用户管理员的LDAP DN.显示您在公司的阶层."
 
@@ -11015,7 +11109,7 @@ msgstr "这个令复选框处于非激活状态的LDAP的属性值.这个值是
 msgid "This is the MAC address of the network card of the device (e.g. 00:01:02:DE:EF:18)."
 msgstr "网卡的MAC地址(比如:00:01:02:DE:EF:18)."
 
-#: ../lib/modules/sambaSamAccount.inc:302
+#: ../lib/modules/sambaSamAccount.inc:307
 msgid "This is the SID of the user's primary Windows group."
 msgstr "用户Windows主组的SID."
 
@@ -11027,11 +11121,11 @@ msgstr "这是设置硬盘配额和建立主目录的外部脚本所在的绝对
 msgid "This is the account's Kerberos password."
 msgstr "帐号在Kerberos中的密码."
 
-#: ../lib/modules/sambaSamAccount.inc:240
+#: ../lib/modules/sambaSamAccount.inc:245
 msgid "This is the account's Windows password."
 msgstr "帐号在Windows中的密码."
 
-#: ../lib/modules/sambaSamAccount.inc:237
+#: ../lib/modules/sambaSamAccount.inc:242
 msgid "This is the account's full name on Windows systems."
 msgstr "用户在Windows系统中的全名."
 
@@ -11039,7 +11133,7 @@ msgstr "用户在Windows系统中的全名."
 msgid "This is the active password policy for this account."
 msgstr "本帐号正在使用的帐号策略。"
 
-#: ../lib/modules/passwordSelfReset.inc:70
+#: ../lib/modules/passwordSelfReset.inc:71
 msgid "This is the answer to the security question. It allows users to reset their password."
 msgstr "用户的安全提问,用于用户复位密码."
 
@@ -11047,7 +11141,7 @@ msgstr "用户的安全提问,用于用户复位密码."
 msgid "This is the date when the account will expire."
 msgstr "这是帐号过期日期"
 
-#: ../lib/modules/sambaSamAccount.inc:324
+#: ../lib/modules/sambaSamAccount.inc:329
 #: ../lib/modules/shadowAccount.inc:185
 msgid "This is the date when the account will expire. Format: DD-MM-YYYY"
 msgstr "帐号过期日期: DD-MM-YYYY"
@@ -11064,7 +11158,7 @@ msgstr "显示在Windows系统中的组名."
 msgid "This is the identifier for the relative DN value. It must be one of the given allowed LDAP attributes (e.g. user accounts usually use \"uid\" while groups use \"cn\")."
 msgstr "RDN值的标志.必须是您LDAP属性中的一个值(比如,用户帐号经常使用\"uid\",而组名经常使用\"cn\"))"
 
-#: ../lib/modules/passwordSelfReset.inc:82
+#: ../lib/modules/passwordSelfReset.inc:83
 msgid "This is the label for the link to the password self reset. If empty \"Forgot password?\" will be used."
 msgstr "连接到密码自助复位的标志.留空使用\"密码遗忘?\"."
 
@@ -11084,24 +11178,24 @@ msgstr "这是用户可以拨打或接听的机器ID(比如:IP地址或主机名
 msgid "This is the mail server for the user."
 msgstr "用户的邮件服务器."
 
-#: ../lib/modules/passwordSelfReset.inc:74
+#: ../lib/modules/passwordSelfReset.inc:75
 msgid "This is the minimum length for answers to the security question."
 msgstr "安全问题的答案的最小长度."
 
-#: ../lib/modules/nisnetgroup.inc:74
+#: ../lib/modules/nisnetgroup.inc:77
 #: ../lib/modules/groupOfNames.inc:61
 msgid "This is the name of this group."
 msgstr "组名."
 
-#: ../lib/modules/posixAccount.inc:426
+#: ../lib/modules/posixAccount.inc:444
 msgid "This is the natural name of the host. If empty, the host name will be used."
 msgstr "主机帐号的自然名(natural name).留空使用主机名."
 
-#: ../lib/modules/inetOrgPerson.inc:702
+#: ../lib/modules/inetOrgPerson.inc:706
 msgid "This is the natural name of the user. If empty, the first and last name is used."
 msgstr "用户自然名,留空会使用姓名."
 
-#: ../lib/modules/posixAccount.inc:404
+#: ../lib/modules/posixAccount.inc:422
 msgid "This is the natural name of the user. If empty, the first and last name or user name is used."
 msgstr "用户的自然名.留空会使用姓名."
 
@@ -11117,7 +11211,7 @@ msgstr "为防止用户使用旧的密码而保存的历史密码数量."
 msgid "This is the number of rows to show in the account list. If more entries are found the list will be split into several pages."
 msgstr "显示帐号中的行数，如果搜索到更多的行数会分页显示."
 
-#: ../lib/modules/sambaSamAccount.inc:333
+#: ../lib/modules/sambaSamAccount.inc:338
 msgid "This is the path to the user's home directory."
 msgstr "这是用户的主目录路径."
 
@@ -11125,11 +11219,11 @@ msgstr "这是用户的主目录路径."
 msgid "This is the relative ID (similar to UID on Unix) for Windows accounts. If you leave this empty LAM will calculate the RID from the UID. This can be either a number or the name of a special group:"
 msgstr "Windows帐号的关联ID(有点象Unix中的UID).留空系统会从UID计算RID.可以是一个数字或一个特殊组名."
 
-#: ../lib/modules/sambaSamAccount.inc:308
+#: ../lib/modules/sambaSamAccount.inc:313
 msgid "This is the relative ID number for your Windows account. You can either enter a number or one of these special accounts: "
 msgstr "Windows帐号的关联ID.可以输入一个数字或以下特殊帐号:"
 
-#: ../lib/modules/sambaSamAccount.inc:312
+#: ../lib/modules/sambaSamAccount.inc:317
 msgid "This is the relative ID number for your host account. If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr "主机帐号的关联ID号.留空系统使用:uidNumber*2 + sambaAlgorithmicRidBase."
 
@@ -11167,18 +11261,18 @@ msgstr "在自动退出前,用户不活动时间(分钟)."
 msgid "This is the time in minutes which LAM caches its LDAP searches. Shorter times will stress LDAP more but decrease the possibility that changes are not identified."
 msgstr "LAM缓存有效时间(分钟),较短的时间会增加LDAP压力,但减少了数据不一致的可能."
 
-#: ../lib/modules/kolabUser.inc:156
-msgid "This is the time limit (in days) for other users who want to check future appointments. If you leave this blank the default (60 days) will be set."
-msgstr "其它用户检查未来约会的天数.如果留空,默认值为60天."
-
-#: ../lib/modules/sambaSamAccount.inc:327
+#: ../lib/modules/sambaSamAccount.inc:332
 msgid "This is the time zone of your Samba server. LAM needs this information to display the logon hours correctly."
 msgstr "这是Samba服务器的时区.LAM用此信息显示正确的登录时间."
 
-#: ../lib/modules/sambaSamAccount.inc:299
+#: ../lib/modules/sambaSamAccount.inc:304
 msgid "This is the user's primary Windows group."
 msgstr "用户的Windows主要组."
 
+#: ../lib/modules/puppetClient.inc:82
+msgid "This is this node's parent. All classes and variables are inherited from this node."
+msgstr "这是该节点的父节点，所有的类和变量都是从此节点继承。"
+
 #: ../lib/modules/asteriskAccount.inc:147
 msgid "This is typically used to allow incoming calls (e.g. from FWD) while having a type=friend entry defined with username and password."
 msgstr "当使用账号和密码定义type=friend时,此项设置用来允许呼入."
@@ -11187,7 +11281,7 @@ msgstr "当使用账号和密码定义type=friend时,此项设置用来允许呼
 msgid "This is used to mark this account as resource."
 msgstr "用来标识此账号是一个资源"
 
-#: ../lib/modules/posixAccount.inc:101
+#: ../lib/modules/posixAccount.inc:111
 msgid "This login shell is invalid!"
 msgstr "登录shell非法!"
 
@@ -11195,7 +11289,7 @@ msgstr "登录shell非法!"
 msgid "This mail address is already in use:"
 msgstr "邮件地址已被使用: "
 
-#: ../lib/modules/imapAccess.inc:97
+#: ../lib/modules/imapAccess.inc:98
 msgid "This mailbox will be created/deleted."
 msgstr "这个邮箱将会被建立或删除."
 
@@ -11203,35 +11297,35 @@ msgstr "这个邮箱将会被建立或删除."
 msgid "This message is shown when the field value does not match the validation expression."
 msgstr "域值与检验表达式不匹配时显示这条消息."
 
-#: ../templates/schema/schema.php:348
+#: ../templates/schema/schema.php:350
 msgid "This object class is obsolete."
 msgstr "这个对象类是陈旧的."
 
-#: ../lib/modules/imapAccess.inc:76
+#: ../lib/modules/imapAccess.inc:77
 msgid "This option allows you to disable the certificate check of your IMAP server certificate. Disabling the certificate check is not recommended."
 msgstr "这个选项允许你关闭IMAP服务器数字证书检查功能.不建议关闭数字证书检查功能."
 
-#: ../lib/modules/sambaSamAccount.inc:318
+#: ../lib/modules/sambaSamAccount.inc:323
 msgid "This option defines the allowed logon hours for this account."
 msgstr "允许帐号登录的时间."
 
-#: ../lib/modules/sambaSamAccount.inc:321
+#: ../lib/modules/sambaSamAccount.inc:326
 msgid "This option defines the allowed logon hours for this account. The format is the same as for the LDAP attribute. The 24*7 hours are represented as 168 bit which are saved as 21 hex (21*8 = 168) values. The first bit represents Sunday 0:00 - 0:59 in GMT."
 msgstr "帐号可以登录的时间.格式与LDAP属性一致.使用168位代理24*7,168位以21个16进制字节表示.第一位代表GMT时间星期天0:00-0.59."
 
-#: ../lib/modules/asteriskExtension.inc:184
+#: ../lib/modules/asteriskExtension.inc:185
 msgid "This pair of extension name and priority already exists."
 msgstr "扩展名和优先级的配对已经存在!"
 
-#: ../lib/modules/sambaSamAccount.inc:342
+#: ../lib/modules/sambaSamAccount.inc:347
 msgid "This program is run after the login."
 msgstr "登录后运行的程序。"
 
-#: ../lib/modules/sambaSamAccount.inc:366
+#: ../lib/modules/sambaSamAccount.inc:371
 msgid "This specifies the reconnect policy."
 msgstr "这里指定断开连接的策略。"
 
-#: ../lib/modules/sambaSamAccount.inc:363
+#: ../lib/modules/sambaSamAccount.inc:368
 msgid "This specifies what to do when the client connection is broken."
 msgstr "这里指定客户连接中断的动作。"
 
@@ -11256,7 +11350,7 @@ msgstr "本工具可以让用户自定义PDF页面."
 msgid "This user was not found!"
 msgstr "用户未找到!"
 
-#: ../lib/modules/zarafaUser.inc:415
+#: ../lib/modules/zarafaUser.inc:417
 msgid "This value can only be \"Room\" or \"Equipment\"."
 msgstr "此值只能设为 \"Room\" 或 \"Equipment\"."
 
@@ -11269,27 +11363,27 @@ msgstr "此值只能设为 \"Room\" 或 \"Equipment\"."
 #: ../lib/modules/zarafaGroup.inc:193
 #: ../lib/modules/zarafaAddressList.inc:146
 #: ../lib/modules/zarafaAddressList.inc:147
-#: ../lib/modules/sambaSamAccount.inc:102
-#: ../lib/modules/sambaSamAccount.inc:103
-#: ../lib/modules/sambaSamAccount.inc:104
 #: ../lib/modules/sambaSamAccount.inc:105
-#: ../lib/modules/posixAccount.inc:102
-#: ../lib/modules/zarafaUser.inc:422
+#: ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/sambaSamAccount.inc:107
+#: ../lib/modules/sambaSamAccount.inc:108
+#: ../lib/modules/posixAccount.inc:112
 #: ../lib/modules/zarafaUser.inc:424
-#: ../lib/modules/zarafaUser.inc:425
 #: ../lib/modules/zarafaUser.inc:426
 #: ../lib/modules/zarafaUser.inc:427
 #: ../lib/modules/zarafaUser.inc:428
+#: ../lib/modules/zarafaUser.inc:429
+#: ../lib/modules/zarafaUser.inc:430
 #: ../lib/modules/ppolicyUser.inc:86
 #: ../lib/modules/zarafaServer.inc:156
 msgid "This value can only be \"true\" or \"false\"."
 msgstr "此值只能设为 \"true\" 或 \"false\"."
 
-#: ../lib/modules/zarafaUser.inc:423
+#: ../lib/modules/zarafaUser.inc:425
 msgid "This value can only be \"true\", \"false\" or \"system\"."
 msgstr "此值只能设为\"true\", \"false\" or \"system\"."
 
-#: ../lib/modules/posixGroup.inc:497
+#: ../lib/modules/posixGroup.inc:508
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "此值必须是用分号分开的用户名列表."
 
@@ -11297,7 +11391,7 @@ msgstr "此值必须是用分号分开的用户名列表."
 msgid "This will create a new organisational unit under the selected one."
 msgstr "在所选的节点下建立新的组织单元."
 
-#: ../lib/modules/posixAccount.inc:367
+#: ../lib/modules/posixAccount.inc:381
 msgid "This will create the user's home directory on the specified server."
 msgstr "将在指定的服务器上建立用户的主目录."
 
@@ -11309,9 +11403,10 @@ msgstr "将删除所选的组织单元.组织单元必须为空."
 msgid "This will delete the selected profile."
 msgstr "将删除所选的配置文件."
 
+#: ../lib/modules/puppetClient.inc:102
 #: ../lib/modules/zarafaContact.inc:78
-#: ../lib/modules/eduPerson.inc:130
-#: ../lib/modules/sambaSamAccount.inc:378
+#: ../lib/modules/eduPerson.inc:131
+#: ../lib/modules/sambaSamAccount.inc:383
 #: ../lib/modules/zarafaUser.inc:122
 #: ../lib/modules/shadowAccount.inc:189
 #: ../lib/modules/authorizedServiceObject.inc:83
@@ -11319,7 +11414,7 @@ msgstr "将删除所选的配置文件."
 msgid "This will enable the extension automatically if this profile is loaded."
 msgstr "在配置文件调入时，将自动打开扩展项。"
 
-#: ../lib/modules/sambaSamAccount.inc:243
+#: ../lib/modules/sambaSamAccount.inc:248
 msgid "This will reset the host's password to a default value."
 msgstr "将主机密码复位到缺省值."
 
@@ -11331,11 +11426,11 @@ msgstr "将会生成一个随机的密码并在屏幕上显示或通过邮件发
 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 settings."
 msgstr "将会生成一个随机的密码并在屏幕上显示或通过邮件发送给用户。请编辑LAM服务器配置文件来设定邮件的配置."
 
-#: ../lib/modules/kolabUser.inc:164
+#: ../lib/modules/kolabUser.inc:134
 msgid "This will set a special flag on the account which tells Kolabd to remove it. Use this to cleanly delete Kolab accounts (e.g. this removes mail boxes)."
 msgstr "将为用户设定特殊的标记,以通知Kolabd删除帐号.用来完全删除Kolab帐号(比如删除邮箱)."
 
-#: ../lib/modules/sambaSamAccount.inc:1311
+#: ../lib/modules/sambaSamAccount.inc:1316
 msgid "Thursday"
 msgstr "星期四"
 
@@ -11353,16 +11448,16 @@ msgstr "票证寿命"
 msgid "Ticket lifetime must be a number."
 msgstr "票证寿命必须是数字!"
 
-#: ../lib/modules/sambaSamAccount.inc:1333
+#: ../lib/modules/sambaSamAccount.inc:1338
 msgid "Time"
 msgstr "时间"
 
-#: ../lib/modules/sambaSamAccount.inc:347
+#: ../lib/modules/sambaSamAccount.inc:352
 msgid "Time limit"
 msgstr "时间限制"
 
-#: ../lib/modules/sambaSamAccount.inc:326
-#: ../lib/modules/sambaSamAccount.inc:554
+#: ../lib/modules/sambaSamAccount.inc:331
+#: ../lib/modules/sambaSamAccount.inc:559
 msgid "Time zone"
 msgstr "时区"
 
@@ -11370,11 +11465,11 @@ msgstr "时区"
 msgid "To"
 msgstr "到"
 
-#: ../lib/modules/posixAccount.inc:396
+#: ../lib/modules/posixAccount.inc:414
 msgid "To disable login use /bin/false. The list of shells is read from lam/config/shells"
 msgstr "使用/bin/false来禁止用户登录.shells列表来自/lam/config/shells."
 
-#: ../lib/modules/sambaSamAccount.inc:548
+#: ../lib/modules/sambaSamAccount.inc:553
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "东京,首尔,大孤,雅库茨克"
 
@@ -11383,16 +11478,16 @@ msgid "Tool settings"
 msgstr "工具设置"
 
 #: ../templates/tools.php:63
-#: ../templates/main_header.php:136
+#: ../templates/main_header.php:137
 msgid "Tools"
 msgstr "工具"
 
-#: ../templates/serverInfo.php:355
+#: ../templates/serverInfo.php:357
 msgid "Total"
 msgstr "共"
 
-#: ../templates/serverInfo.php:240
-#: ../templates/serverInfo.php:245
+#: ../templates/serverInfo.php:242
+#: ../templates/serverInfo.php:247
 msgid "Total connections"
 msgstr "所有连接数"
 
@@ -11400,7 +11495,7 @@ msgstr "所有连接数"
 msgid "Total entries"
 msgstr "所有条目"
 
-#: ../lib/types/user.inc:614
+#: ../lib/types/user.inc:625
 msgid "Translate GID number to group name"
 msgstr "将GID号改为组名"
 
@@ -11409,7 +11504,7 @@ msgstr "将GID号改为组名"
 msgid "Tree suffix"
 msgstr "树状结构后缀"
 
-#: ../templates/main_header.php:166
+#: ../templates/main_header.php:168
 msgid "Tree view"
 msgstr "树状结构"
 
@@ -11417,65 +11512,65 @@ msgstr "树状结构"
 msgid "TreeSuffix is invalid!"
 msgstr "树状结构后缀非法!"
 
-#: ../lib/modules/sambaSamAccount.inc:1311
+#: ../lib/modules/sambaSamAccount.inc:1316
 msgid "Tuesday"
 msgstr "星期二"
 
 #: ../templates/selfService/profManage.php:207
-#: ../templates/schema/schema.php:346
+#: ../templates/schema/schema.php:348
 #: ../lib/modules/zarafaUser.inc:101
 #: ../lib/modules/zarafaUser.inc:176
 #: ../lib/modules/zarafaUser.inc:257
 #: ../lib/modules/zarafaUser.inc:380
-#: ../lib/modules/zarafaUser.inc:536
-#: ../lib/modules/zarafaUser.inc:1295
+#: ../lib/modules/zarafaUser.inc:538
+#: ../lib/modules/zarafaUser.inc:1297
 #: ../lib/modules/customFields.inc:72
-#: ../lib/modules/customFields.inc:287
-#: ../lib/modules/customFields.inc:606
+#: ../lib/modules/customFields.inc:296
+#: ../lib/modules/customFields.inc:669
 msgid "Type"
 msgstr "类型"
 
-#: ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixAccount.inc:96
 msgid "UID"
 msgstr "UID"
 
-#: ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixAccount.inc:96
 msgid "UID has changed. Do you want to change home directory?"
 msgstr "UID已经改变,想改变主目录吗?"
 
-#: ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:91
 msgid "UID must be a number. It has to be inside the UID range which is defined in your configuration profile."
 msgstr "UID必须是一个数字,必须在配置文件中所定的UID范围内."
 
 #: ../lib/types/host.inc:95
 #: ../lib/types/user.inc:92
-#: ../lib/modules/posixAccount.inc:82
-#: ../lib/modules/posixAccount.inc:210
-#: ../lib/modules/posixAccount.inc:292
-#: ../lib/modules/posixAccount.inc:314
-#: ../lib/modules/posixAccount.inc:334
-#: ../lib/modules/posixAccount.inc:338
-#: ../lib/modules/posixAccount.inc:346
-#: ../lib/modules/posixAccount.inc:1119
-#: ../lib/modules/posixAccount.inc:1492
+#: ../lib/modules/posixAccount.inc:92
+#: ../lib/modules/posixAccount.inc:224
+#: ../lib/modules/posixAccount.inc:306
+#: ../lib/modules/posixAccount.inc:328
+#: ../lib/modules/posixAccount.inc:348
+#: ../lib/modules/posixAccount.inc:352
+#: ../lib/modules/posixAccount.inc:360
+#: ../lib/modules/posixAccount.inc:1139
+#: ../lib/modules/posixAccount.inc:1512
 msgid "UID number"
 msgstr "UID编号"
 
-#: ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixAccount.inc:92
 #, php-format
 msgid "UID number has changed. To keep file ownership you have to run the following command as root: 'find / -uid %s -exec chown %s {} \\;'"
 msgstr "UID号已经改变.为保持文件属主,必须用root身份运行如下命令: 'find / -uid %s -exec chown %s {} \\;'"
 
-#: ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:83
 msgid "UID ranges for Unix accounts"
 msgstr "Unix帐号的UID范围"
 
-#: ../lib/modules/sambaSamAccount.inc:284
+#: ../lib/modules/sambaSamAccount.inc:289
 msgid "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced with user and group name."
 msgstr "用户主目录(\\\\server\\share).$user和$group会使用用户和组名来替代."
 
-#: ../lib/modules/eduPerson.inc:106
-#: ../lib/modules/eduPerson.inc:110
+#: ../lib/modules/eduPerson.inc:107
+#: ../lib/modules/eduPerson.inc:111
 msgid "URI (either URN or URL) that indicates a set of rights to specific resources."
 msgstr "表示指定资源的权限集的URI(或是URN,或是URL)"
 
@@ -11483,42 +11578,42 @@ msgstr "表示指定资源的权限集的URI(或是URN,或是URL)"
 msgid "URL"
 msgstr "URL"
 
-#: ../lib/modules/imapAccess.inc:154
+#: ../lib/modules/imapAccess.inc:155
 msgid "Unable to change ACL on IMAP server for mailbox deletion."
 msgstr "在邮箱删除时无法改变IMAP服务器的ACL."
 
-#: ../lib/modules/heimdalKerberos.inc:1020
+#: ../lib/modules/heimdalKerberos.inc:1021
 msgid "Unable to change Kerberos password."
 msgstr "无法修改kerberos密码"
 
-#: ../templates/selfService/selfServiceMain.php:281
+#: ../templates/selfService/selfServiceMain.php:285
 msgid "Unable to change your account. Maybe you do not have enough rights to change the settings."
 msgstr "无法改变您的帐号,可以没有足够的权限改变设置."
 
-#: ../templates/tests/lamdaemonTest.php:253
+#: ../templates/tests/lamdaemonTest.php:255
 #: ../lib/lamdaemon.inc:76
 #: ../lib/lamdaemon.inc:81
 msgid "Unable to connect to remote server!"
 msgstr "无法连接远端服务器 !"
 
-#: ../templates/massDoUpload.php:162
+#: ../templates/massDoUpload.php:165
 msgid "Unable to create ZIP file for PDF export."
 msgstr "无法为PDF导出工作建立ZIP文件."
 
-#: ../lib/modules/selfRegistration.inc:577
-#: ../lib/modules/selfRegistration.inc:581
+#: ../lib/modules/selfRegistration.inc:588
+#: ../lib/modules/selfRegistration.inc:592
 msgid "Unable to create account."
 msgstr "无法建立新账号."
 
-#: ../lib/modules/imapAccess.inc:156
+#: ../lib/modules/imapAccess.inc:157
 msgid "Unable to create mailbox on IMAP server."
 msgstr "无法在IMAP服务器上建立邮箱."
 
-#: ../templates/ou_edit.php:78
+#: ../templates/ou_edit.php:80
 msgid "Unable to create new OU!"
 msgstr "无法建立新OU!"
 
-#: ../lib/types/automountType.inc:283
+#: ../lib/types/automountType.inc:317
 msgid "Unable to create new automount map."
 msgstr "无法建立新的自动映射"
 
@@ -11527,11 +11622,11 @@ msgstr "无法建立新的自动映射"
 msgid "Unable to create new profile!"
 msgstr "无法建立新的配置文件!"
 
-#: ../templates/ou_edit.php:95
+#: ../templates/ou_edit.php:97
 msgid "Unable to delete OU!"
 msgstr "无法删除OU!"
 
-#: ../templates/pdfedit/pdfmain.php:89
+#: ../templates/pdfedit/pdfmain.php:91
 msgid "Unable to delete PDF structure!"
 msgstr "无法删除PDF结构!"
 
@@ -11540,26 +11635,26 @@ msgstr "无法删除PDF结构!"
 msgid "Unable to delete entry, it does not exist"
 msgstr "删除条目失败,它不存在!"
 
-#: ../lib/modules/imapAccess.inc:155
+#: ../lib/modules/imapAccess.inc:156
 msgid "Unable to delete mailbox from IMAP server."
 msgstr "无法在IMAP服务器上删除邮箱."
 
 #: ../templates/config/profmanage.php:108
 #: ../templates/selfService/profManage.php:87
-#: ../templates/profedit/profilemain.php:99
+#: ../templates/profedit/profilemain.php:101
 msgid "Unable to delete profile!"
 msgstr "无法删除配置文件!"
 
-#: ../lib/modules/posixAccount.inc:1701
-#: ../lib/modules/posixAccount.inc:1710
-#: ../lib/modules/posixAccount.inc:1965
-#: ../lib/modules/nisnetgroup.inc:535
-#: ../lib/modules/groupOfNamesUser.inc:313
+#: ../lib/modules/posixAccount.inc:1718
+#: ../lib/modules/posixAccount.inc:1727
+#: ../lib/modules/posixAccount.inc:1982
+#: ../lib/modules/nisnetgroup.inc:538
+#: ../lib/modules/groupOfNamesUser.inc:317
 msgid "Unable to find group in LDAP."
 msgstr "LDAP中找不到组."
 
-#: ../lib/modules/passwordSelfReset.inc:715
-#: ../lib/modules/passwordSelfReset.inc:863
+#: ../lib/modules/passwordSelfReset.inc:719
+#: ../lib/modules/passwordSelfReset.inc:867
 msgid "Unable to find password security question for this account."
 msgstr "找不到这个帐号的密码安全提问."
 
@@ -11568,24 +11663,24 @@ msgstr "找不到这个帐号的密码安全提问."
 msgid "Unable to find the user name in LDAP."
 msgstr "LDAP中找不到用户名."
 
-#: ../lib/modules/passwordSelfReset.inc:706
-#: ../lib/modules/passwordSelfReset.inc:937
+#: ../lib/modules/passwordSelfReset.inc:710
+#: ../lib/modules/passwordSelfReset.inc:941
 msgid "Unable to find user account."
 msgstr "找不到用户账号."
 
-#: ../lib/modules.inc:1449
-#: ../lib/modules.inc:1453
+#: ../lib/modules.inc:1455
+#: ../lib/modules.inc:1459
 msgid "Unable to load LDAP entry:"
 msgstr "无法调入LDAP条目:"
 
 #: ../lib/profiles.inc:91
 #: ../lib/profiles.inc:95
-#: ../lib/selfService.inc:180
-#: ../lib/selfService.inc:184
+#: ../lib/selfService.inc:196
+#: ../lib/selfService.inc:200
 msgid "Unable to load profile!"
 msgstr "无法调入配置文件!"
 
-#: ../lib/modules/imapAccess.inc:157
+#: ../lib/modules/imapAccess.inc:158
 msgid "Unable to locate mailbox on IMAP."
 msgstr "无法在IMAP服务器上找到邮箱."
 
@@ -11598,9 +11693,9 @@ msgstr "无法读入文件"
 msgid "Unable to read sambaSID attribute."
 msgstr "读取sambaSID属性失败."
 
-#: ../lib/modules/passwordSelfReset.inc:1060
 #: ../lib/modules/passwordSelfReset.inc:1064
-#: ../lib/modules/passwordSelfReset.inc:1073
+#: ../lib/modules/passwordSelfReset.inc:1068
+#: ../lib/modules/passwordSelfReset.inc:1077
 msgid "Unable to reset password."
 msgstr "不能复位密码"
 
@@ -11608,20 +11703,20 @@ msgstr "不能复位密码"
 msgid "Unable to retrieve image"
 msgstr "无法获取图像"
 
-#: ../templates/tests/schemaTest.php:59
-#: ../templates/schema/schema.php:91
-#: ../templates/schema/schema.php:109
-#: ../templates/schema/schema.php:270
-#: ../templates/schema/schema.php:304
+#: ../templates/tests/schemaTest.php:61
+#: ../templates/schema/schema.php:93
+#: ../templates/schema/schema.php:111
+#: ../templates/schema/schema.php:272
+#: ../templates/schema/schema.php:306
 msgid "Unable to retrieve schema!"
 msgstr "无法获取schema!"
 
-#: ../templates/selfService/adminMain.php:166
-#: ../templates/profedit/profilepage.php:113
+#: ../templates/selfService/adminMain.php:180
+#: ../templates/profedit/profilepage.php:119
 msgid "Unable to save profile!"
 msgstr "无法存储配置文件!"
 
-#: ../lib/account.inc:904
+#: ../lib/account.inc:941
 msgid "Unable to send mail!"
 msgstr "无法发送邮件!"
 
@@ -11630,39 +11725,39 @@ msgstr "无法发送邮件!"
 msgid "Unable to sync the time when the user can/must change his password because no domain was found."
 msgstr "用户可以/必须修改密码时,因域名未发现而不能同步时间."
 
-#: ../lib/modules/passwordSelfReset.inc:765
-#: ../lib/modules/passwordSelfReset.inc:948
+#: ../lib/modules/passwordSelfReset.inc:769
+#: ../lib/modules/passwordSelfReset.inc:952
 msgid "Unable to verify your password reset request. Please try again."
 msgstr "无法确认您的密码复位请求,请重试."
 
-#: ../lib/modules/selfRegistration.inc:589
+#: ../lib/modules/selfRegistration.inc:600
 msgid "Unable to verify your user creation request. Please try again."
 msgstr "无法确认您的用户建立请求,请重试."
 
-#: ../templates/serverInfo.php:291
+#: ../templates/serverInfo.php:293
 msgid "Unbind"
 msgstr "解除绑定"
 
 #: ../templates/lists/changePassword.php:346
 #: ../templates/lists/changePassword.php:372
 #: ../lib/types/user.inc:245
-#: ../lib/types/user.inc:324
-#: ../lib/types/user.inc:358
-#: ../lib/types/user.inc:742
-#: ../lib/modules/posixGroup.inc:300
-#: ../lib/modules/posixAccount.inc:134
+#: ../lib/types/user.inc:335
+#: ../lib/types/user.inc:369
+#: ../lib/types/user.inc:753
+#: ../lib/modules/posixGroup.inc:302
+#: ../lib/modules/posixAccount.inc:144
 msgid "Unix"
 msgstr "unix"
 
-#: ../templates/tests/lamdaemonTest.php:206
+#: ../templates/tests/lamdaemonTest.php:208
 msgid "Unix account"
 msgstr "Unix帐号"
 
-#: ../lib/modules/posixAccount.inc:1228
+#: ../lib/modules/posixAccount.inc:1248
 msgid "Unix groups"
 msgstr "Unix组"
 
-#: ../lib/modules/kolabUser.inc:238
+#: ../lib/modules/kolabUser.inc:185
 #, php-format
 msgid "Unknown delegate address: %s"
 msgstr "不明的代表地址:%s"
@@ -11671,7 +11766,8 @@ msgstr "不明的代表地址:%s"
 msgid "Unkown change type"
 msgstr "未知的改变类型"
 
-#: ../lib/types/user.inc:316
+#: ../lib/types/user.inc:317
+#: ../lib/types/user.inc:325
 msgid "Unlock"
 msgstr "解锁"
 
@@ -11687,18 +11783,18 @@ msgstr "解锁账号."
 msgid "Unlock account?"
 msgstr "解锁账号?"
 
-#: ../lib/modules/posixGroup.inc:210
-#: ../lib/modules/posixAccount.inc:1183
-#: ../lib/modules/inetOrgPerson.inc:1785
+#: ../lib/modules/posixGroup.inc:212
+#: ../lib/modules/posixAccount.inc:1203
+#: ../lib/modules/inetOrgPerson.inc:1789
 msgid "Unlock password"
 msgstr "解除密码锁定"
 
-#: ../templates/masscreate.php:100
+#: ../templates/masscreate.php:105
 #: ../templates/config/confmodules.php:367
 msgid "Unsolved dependency:"
 msgstr "未解决的依赖性问题:"
 
-#: ../templates/pdfedit/pdfpage.php:457
+#: ../templates/pdfedit/pdfpage.php:459
 msgid "Up"
 msgstr "向上"
 
@@ -11706,7 +11802,7 @@ msgstr "向上"
 msgid "Update Samba password timestamps"
 msgstr "修改 Samba 密码时间戳."
 
-#: ../lib/modules/sambaSamAccount.inc:231
+#: ../lib/modules/sambaSamAccount.inc:235
 msgid "Update attribute \"sambaPwdLastSet\" on password change"
 msgstr "在密码修改时修改 \"sambaPwdLastSet\"属性"
 
@@ -11715,8 +11811,8 @@ msgstr "在密码修改时修改 \"sambaPwdLastSet\"属性"
 msgid "Update object"
 msgstr "修改对象"
 
-#: ../lib/modules/imapAccess.inc:295
-#: ../lib/modules/imapAccess.inc:304
+#: ../lib/modules/imapAccess.inc:297
+#: ../lib/modules/imapAccess.inc:306
 msgid "Update quota"
 msgstr "修改配额"
 
@@ -11730,29 +11826,29 @@ msgstr "修改值"
 msgid "Updating object"
 msgstr "对象升级中"
 
-#: ../templates/massBuildAccounts.php:215
+#: ../templates/massBuildAccounts.php:218
 msgid "Upload accounts to LDAP"
 msgstr "上传帐号到LDAP"
 
-#: ../templates/masscreate.php:265
+#: ../templates/masscreate.php:270
 msgid "Upload file and create accounts"
 msgstr "开始上传,建立帐号"
 
-#: ../templates/massDoUpload.php:223
-#: ../lib/lists.inc:970
+#: ../templates/massDoUpload.php:226
+#: ../lib/lists.inc:971
 msgid "Upload has finished"
 msgstr "上传完毕"
 
-#: ../lib/modules.inc:476
+#: ../lib/modules.inc:482
 #, php-format
 msgid "Upload was stopped after errors in %s module!"
 msgstr "因为在%s模块中有错,上传停止."
 
-#: ../templates/serverInfo.php:220
+#: ../templates/serverInfo.php:222
 msgid "Uptime"
 msgstr "运行时间"
 
-#: ../templates/schema/schema.php:207
+#: ../templates/schema/schema.php:209
 msgid "Usage"
 msgstr "用法"
 
@@ -11761,17 +11857,17 @@ msgstr "用法"
 msgid "Use * for all services."
 msgstr "为所有的服务使用*."
 
-#: ../lib/modules/sambaSamAccount.inc:245
-#: ../lib/modules/sambaSamAccount.inc:248
-#: ../lib/modules/sambaSamAccount.inc:406
+#: ../lib/modules/sambaSamAccount.inc:250
+#: ../lib/modules/sambaSamAccount.inc:253
+#: ../lib/modules/sambaSamAccount.inc:411
 msgid "Use Unix password"
 msgstr "使用unix的密码"
 
-#: ../lib/modules/sambaSamAccount.inc:251
-#: ../lib/modules/sambaSamAccount.inc:254
-#: ../lib/modules/sambaSamAccount.inc:414
-#: ../lib/modules/sambaSamAccount.inc:1100
-#: ../lib/modules/sambaSamAccount.inc:1517
+#: ../lib/modules/sambaSamAccount.inc:256
+#: ../lib/modules/sambaSamAccount.inc:259
+#: ../lib/modules/sambaSamAccount.inc:419
+#: ../lib/modules/sambaSamAccount.inc:1105
+#: ../lib/modules/sambaSamAccount.inc:1522
 msgid "Use no password"
 msgstr "无需密码"
 
@@ -11787,20 +11883,20 @@ msgstr "使用此项来隐藏呼叫者ID."
 msgid "Use this to hide this entry from the address book."
 msgstr "使用此项来隐藏地址簿的条目"
 
-#: ../lib/modules/quota.inc:101
-#: ../lib/modules/quota.inc:390
+#: ../lib/modules/quota.inc:102
+#: ../lib/modules/quota.inc:393
 msgid "Used blocks"
 msgstr "已使用的块数"
 
-#: ../lib/modules/quota.inc:102
+#: ../lib/modules/quota.inc:103
 msgid "Used blocks. 1000 blocks are usually 1MB"
 msgstr "已经使用的块数,1000块约等于1MB"
 
-#: ../templates/schema/schema.php:266
+#: ../templates/schema/schema.php:268
 msgid "Used by attributes"
 msgstr "被属性使用"
 
-#: ../templates/schema/schema.php:235
+#: ../templates/schema/schema.php:237
 msgid "Used by object classes"
 msgstr "被对象类使用"
 
@@ -11812,12 +11908,12 @@ msgstr "用来从UID/GID计算RID,不确定的话请不用修改."
 msgid "Used for registration context."
 msgstr "在注册语境中使用"
 
-#: ../lib/modules/quota.inc:123
-#: ../lib/modules/quota.inc:394
+#: ../lib/modules/quota.inc:124
+#: ../lib/modules/quota.inc:397
 msgid "Used inodes"
 msgstr "已经使用的节点"
 
-#: ../lib/modules/quota.inc:124
+#: ../lib/modules/quota.inc:125
 msgid "Used inodes (files)"
 msgstr "已经使用的节点(文件)"
 
@@ -11836,8 +11932,8 @@ msgstr "用来定期检查一个设备是否在线"
 
 #: ../lib/types/sudo.inc:78
 #: ../lib/modules/sambaGroupMapping.inc:69
-#: ../lib/modules/nisnetgroup.inc:210
-#: ../lib/modules/nisnetgroup.inc:583
+#: ../lib/modules/nisnetgroup.inc:213
+#: ../lib/modules/nisnetgroup.inc:586
 msgid "User"
 msgstr "用户"
 
@@ -11858,21 +11954,21 @@ msgstr "用户帐号(例如 Unix, Samba和Kolab)"
 msgid "User agent"
 msgstr "用户代理"
 
-#: ../lib/modules/sambaSamAccount.inc:275
-#: ../lib/modules/sambaSamAccount.inc:1114
+#: ../lib/modules/sambaSamAccount.inc:280
+#: ../lib/modules/sambaSamAccount.inc:1119
 msgid "User can change password"
 msgstr "用户可以修改密码"
 
-#: ../lib/types/user.inc:463
+#: ../lib/types/user.inc:474
 #, php-format
 msgid "User count: %s"
 msgstr "帐号总计: %s"
 
-#: ../lib/modules/posixAccount.inc:376
+#: ../lib/modules/posixAccount.inc:394
 msgid "User description. If left empty first and last name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名."
 
-#: ../lib/modules/inetOrgPerson.inc:602
+#: ../lib/modules/inetOrgPerson.inc:606
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名"
 
@@ -11880,12 +11976,12 @@ msgstr "用户描述,如果留空将会使用用户姓名"
 msgid "User description. If left empty user name will be used."
 msgstr "用户的描述,如果留空将会使用用户名."
 
-#: ../templates/schema/schema.php:202
+#: ../templates/schema/schema.php:204
 msgid "User modification"
 msgstr "用户修改"
 
-#: ../lib/modules/sambaSamAccount.inc:277
-#: ../lib/modules/sambaSamAccount.inc:1120
+#: ../lib/modules/sambaSamAccount.inc:282
+#: ../lib/modules/sambaSamAccount.inc:1125
 #: ../lib/modules/heimdalKerberos.inc:99
 #: ../lib/modules/heimdalKerberos.inc:181
 #: ../lib/modules/heimdalKerberos.inc:208
@@ -11899,10 +11995,10 @@ msgstr "用户必须修改密码"
 #: ../templates/login.php:272
 #: ../lib/types/alias.inc:91
 #: ../lib/types/user.inc:94
-#: ../lib/selfService.inc:341
-#: ../lib/modules/selfRegistration.inc:325
-#: ../lib/modules/selfRegistration.inc:393
-#: ../lib/modules/selfRegistration.inc:401
+#: ../lib/selfService.inc:366
+#: ../lib/modules/selfRegistration.inc:335
+#: ../lib/modules/selfRegistration.inc:403
+#: ../lib/modules/selfRegistration.inc:411
 #: ../lib/modules/account.inc:78
 #: ../lib/modules/account.inc:94
 #: ../lib/modules/account.inc:117
@@ -11917,24 +12013,24 @@ msgstr "用户必须修改密码"
 #: ../lib/modules/uidObject.inc:78
 #: ../lib/modules/uidObject.inc:93
 #: ../lib/modules/uidObject.inc:155
-#: ../lib/modules/posixAccount.inc:87
-#: ../lib/modules/posixAccount.inc:88
-#: ../lib/modules/posixAccount.inc:91
-#: ../lib/modules/posixAccount.inc:196
-#: ../lib/modules/posixAccount.inc:313
-#: ../lib/modules/posixAccount.inc:371
-#: ../lib/modules/posixAccount.inc:1110
-#: ../lib/modules/posixAccount.inc:1490
-#: ../lib/modules/nisnetgroup.inc:142
-#: ../lib/modules/nisnetgroup.inc:472
-#: ../lib/modules/inetOrgPerson.inc:76
-#: ../lib/modules/inetOrgPerson.inc:594
-#: ../lib/modules/inetOrgPerson.inc:705
-#: ../lib/modules/inetOrgPerson.inc:1235
-#: ../lib/modules/inetOrgPerson.inc:2080
-#: ../lib/modules/inetOrgPerson.inc:2211
-#: ../lib/modules/passwordSelfReset.inc:669
-#: ../lib/modules/passwordSelfReset.inc:780
+#: ../lib/modules/posixAccount.inc:97
+#: ../lib/modules/posixAccount.inc:98
+#: ../lib/modules/posixAccount.inc:101
+#: ../lib/modules/posixAccount.inc:210
+#: ../lib/modules/posixAccount.inc:327
+#: ../lib/modules/posixAccount.inc:389
+#: ../lib/modules/posixAccount.inc:1130
+#: ../lib/modules/posixAccount.inc:1510
+#: ../lib/modules/nisnetgroup.inc:145
+#: ../lib/modules/nisnetgroup.inc:475
+#: ../lib/modules/inetOrgPerson.inc:77
+#: ../lib/modules/inetOrgPerson.inc:598
+#: ../lib/modules/inetOrgPerson.inc:709
+#: ../lib/modules/inetOrgPerson.inc:1239
+#: ../lib/modules/inetOrgPerson.inc:2084
+#: ../lib/modules/inetOrgPerson.inc:2215
+#: ../lib/modules/passwordSelfReset.inc:673
+#: ../lib/modules/passwordSelfReset.inc:784
 #: ../lib/modules/heimdalKerberos.inc:87
 #: ../lib/modules/heimdalKerberos.inc:168
 #: ../lib/modules/heimdalKerberos.inc:206
@@ -11943,18 +12039,18 @@ msgstr "用户必须修改密码"
 msgid "User name"
 msgstr "用户名"
 
-#: ../lib/modules/selfRegistration.inc:401
-#: ../lib/modules/posixAccount.inc:95
-#: ../lib/modules/inetOrgPerson.inc:78
+#: ../lib/modules/selfRegistration.inc:411
+#: ../lib/modules/posixAccount.inc:105
+#: ../lib/modules/inetOrgPerson.inc:79
 msgid "User name already exists!"
 msgstr "用户名已经存在!"
 
-#: ../lib/modules/imapAccess.inc:93
-#: ../lib/modules/imapAccess.inc:121
+#: ../lib/modules/imapAccess.inc:94
+#: ../lib/modules/imapAccess.inc:122
 msgid "User name attribute"
 msgstr "用户名属性"
 
-#: ../lib/modules/selfRegistration.inc:393
+#: ../lib/modules/selfRegistration.inc:403
 #: ../lib/modules/account.inc:117
 #: ../lib/modules/account.inc:118
 #: ../lib/modules/account.inc:120
@@ -11963,31 +12059,31 @@ msgstr "用户名属性"
 #: ../lib/modules/uidObject.inc:78
 #: ../lib/modules/zarafaGroup.inc:194
 #: ../lib/modules/zarafaGroup.inc:195
-#: ../lib/modules/posixAccount.inc:88
-#: ../lib/modules/posixAccount.inc:93
-#: ../lib/modules/zarafaUser.inc:420
-#: ../lib/modules/zarafaUser.inc:421
-#: ../lib/modules/nisnetgroup.inc:142
-#: ../lib/modules/inetOrgPerson.inc:76
+#: ../lib/modules/posixAccount.inc:98
+#: ../lib/modules/posixAccount.inc:103
+#: ../lib/modules/zarafaUser.inc:422
+#: ../lib/modules/zarafaUser.inc:423
+#: ../lib/modules/nisnetgroup.inc:145
 #: ../lib/modules/inetOrgPerson.inc:77
-#: ../lib/modules/passwordSelfReset.inc:692
-#: ../lib/modules/passwordSelfReset.inc:843
+#: ../lib/modules/inetOrgPerson.inc:78
+#: ../lib/modules/passwordSelfReset.inc:696
+#: ../lib/modules/passwordSelfReset.inc:847
 #: ../lib/modules/heimdalKerberos.inc:237
 #: ../lib/modules/heimdalKerberos.inc:238
 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:91
+#: ../lib/modules/posixAccount.inc:101
 msgid "User name in use. Selected next free user name."
 msgstr "用户名存在,请选择其他的用户名."
 
 #: ../lib/modules/account.inc:95
-#: ../lib/modules/inetOrgPerson.inc:706
+#: ../lib/modules/inetOrgPerson.inc:710
 #: ../lib/modules/heimdalKerberos.inc:88
 msgid "User name of the user who should be created. Valid characters are: a-z,A-Z,0-9, @.-_."
 msgstr "将要建立的用户名,可用字符为: a-z,A-Z,0-9, @.-_."
 
-#: ../lib/modules/posixAccount.inc:372
+#: ../lib/modules/posixAccount.inc:390
 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 number. The next free number will be used."
 msgstr "将要建立的用户名,可用字符为:a-z,A-Z,0-9, @.-_..如果该组名存在,会在组名末尾增加下一个可以使用的数字。"
 
@@ -11999,17 +12095,17 @@ msgstr "用户自注册"
 #: ../lib/modules/zarafaUser.inc:184
 #: ../lib/modules/zarafaUser.inc:294
 #: ../lib/modules/zarafaUser.inc:392
-#: ../lib/modules/zarafaUser.inc:615
-#: ../lib/modules/zarafaUser.inc:1307
-#: ../lib/modules/zarafaUser.inc:1396
+#: ../lib/modules/zarafaUser.inc:617
+#: ../lib/modules/zarafaUser.inc:1309
+#: ../lib/modules/zarafaUser.inc:1398
 msgid "User server"
 msgstr "用户服务器"
 
 #: ../lib/types/user.inc:53
-#: ../lib/modules/posixAccount.inc:67
-#: ../lib/modules/posixAccount.inc:68
-#: ../lib/modules/posixAccount.inc:71
-#: ../lib/modules/posixAccount.inc:166
+#: ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:178
 #: ../lib/modules/zarafaUser.inc:158
 #: ../lib/modules/sudoRole.inc:63
 #: ../lib/modules/sudoRole.inc:87
@@ -12027,25 +12123,25 @@ msgstr "用户"
 msgid "Users or groups that may directly send email as this user."
 msgstr "可以用这个用户直接发送邮件的用户或组."
 
-#: ../lib/modules/posixGroup.inc:405
+#: ../lib/modules/posixGroup.inc:408
 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:409
+#: ../lib/modules/posixGroup.inc:412
 msgid "Users who will become member of the current group. User names are separated by semicolons."
 msgstr "属于当前组的用户,以分号隔开."
 
-#: ../templates/tests/lamdaemonTest.php:199
+#: ../templates/tests/lamdaemonTest.php:201
 #, php-format
 msgid "Using %s as lamdaemon remote server."
 msgstr "使用%s做为lamdeamon的远程服务器."
 
-#: ../templates/tests/lamdaemonTest.php:221
+#: ../templates/tests/lamdaemonTest.php:223
 #, php-format
 msgid "Using %s to connect to remote server."
 msgstr "使用%s连接远程服务器."
 
-#: ../lib/modules/posixAccount.inc:331
+#: ../lib/modules/posixAccount.inc:345
 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 select this option to override this behaviour."
 msgstr "通常,用户不作为memberUid加入主组.如果你的应用程序不支持主组,你可以选择此项修改原来的选项."
 
@@ -12057,37 +12153,37 @@ msgstr "VCARD 2.1 导出"
 msgid "Valid users"
 msgstr "合法用户"
 
-#: ../lib/modules/imapAccess.inc:75
-#: ../lib/modules/imapAccess.inc:108
+#: ../lib/modules/imapAccess.inc:76
+#: ../lib/modules/imapAccess.inc:109
 msgid "Validate server certificate"
 msgstr "校验服务器数字证书."
 
 #: ../lib/modules/customFields.inc:80
-#: ../lib/modules/customFields.inc:707
+#: ../lib/modules/customFields.inc:756
 msgid "Validation expression"
 msgstr "合法性检查表达式"
 
 #: ../lib/modules/customFields.inc:84
-#: ../lib/modules/customFields.inc:712
+#: ../lib/modules/customFields.inc:761
 msgid "Validation message"
 msgstr "合法性检查消息"
 
-#: ../lib/modules/customFields.inc:1226
+#: ../lib/modules/customFields.inc:1283
 msgid "Value"
 msgstr "值"
 
 #: ../lib/modules/customFields.inc:88
-#: ../lib/modules/customFields.inc:1062
+#: ../lib/modules/customFields.inc:1119
 msgid "Value for \"checked\""
 msgstr "\"选定\"时的值"
 
 #: ../lib/modules/customFields.inc:92
-#: ../lib/modules/customFields.inc:1068
+#: ../lib/modules/customFields.inc:1125
 msgid "Value for \"unchecked\""
 msgstr "\"未选定\"时的值"
 
 #: ../lib/modules/customFields.inc:112
-#: ../lib/modules/customFields.inc:1222
+#: ../lib/modules/customFields.inc:1279
 msgid "Value mapping"
 msgstr "值映射"
 
@@ -12095,11 +12191,21 @@ msgstr "值映射"
 msgid "Value to delete does not exist in DN"
 msgstr "DN中被删除值不存在"
 
-#: ../templates/serverInfo.php:132
+#: ../lib/modules/puppetClient.inc:93
+#: ../lib/modules/puppetClient.inc:97
+#: ../lib/modules/puppetClient.inc:139
+#: ../lib/modules/puppetClient.inc:149
+#: ../lib/modules/puppetClient.inc:162
+#: ../lib/modules/puppetClient.inc:270
+#: ../lib/modules/puppetClient.inc:434
+msgid "Variables"
+msgstr "变量"
+
+#: ../templates/serverInfo.php:134
 msgid "Vendor name"
 msgstr "生产商"
 
-#: ../templates/serverInfo.php:138
+#: ../templates/serverInfo.php:140
 msgid "Vendor version"
 msgstr "生产商版本"
 
@@ -12146,16 +12252,16 @@ msgid "Warning"
 msgstr "警告"
 
 #: ../templates/delete.php:226
-#: ../lib/modules/posixAccount.inc:639
 #: ../lib/modules/posixAccount.inc:659
-#: ../lib/modules/groupOfNamesUser.inc:195
-#: ../lib/modules/groupOfNamesUser.inc:215
-#: ../lib/modules.inc:1774
+#: ../lib/modules/posixAccount.inc:679
+#: ../lib/modules/groupOfNamesUser.inc:199
+#: ../lib/modules/groupOfNamesUser.inc:219
+#: ../lib/modules.inc:1786
 #, php-format
 msgid "Was unable to add attributes to DN: %s."
 msgstr "无法为DN: %s增加属性."
 
-#: ../lib/modules.inc:1739
+#: ../lib/modules.inc:1751
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "无法创建DN: %s."
@@ -12166,57 +12272,57 @@ msgstr "无法创建DN: %s."
 msgid "Was unable to delete DN: %s."
 msgstr "无法删除DN: %s."
 
-#: ../templates/lists/changePassword.php:660
-#: ../templates/lists/changePassword.php:701
-#: ../templates/lists/changePassword.php:741
+#: ../templates/lists/changePassword.php:666
+#: ../templates/lists/changePassword.php:707
+#: ../templates/lists/changePassword.php:747
 #: ../templates/delete.php:217
-#: ../lib/modules.inc:1757
+#: ../lib/modules.inc:1769
 #, php-format
 msgid "Was unable to modify attributes from DN: %s."
 msgstr "无法修改DN: %s的属性"
 
 #: ../templates/delete.php:235
-#: ../lib/modules/posixAccount.inc:644
-#: ../lib/modules/posixAccount.inc:673
-#: ../lib/modules/groupOfNamesUser.inc:200
-#: ../lib/modules/groupOfNamesUser.inc:229
-#: ../lib/modules.inc:1786
+#: ../lib/modules/posixAccount.inc:664
+#: ../lib/modules/posixAccount.inc:693
+#: ../lib/modules/groupOfNamesUser.inc:204
+#: ../lib/modules/groupOfNamesUser.inc:233
+#: ../lib/modules.inc:1798
 #, php-format
 msgid "Was unable to remove attributes from DN: %s."
 msgstr "无法删除DN: %s的属性."
 
-#: ../lib/modules/asteriskExtension.inc:900
-#: ../lib/modules.inc:1720
+#: ../lib/modules/asteriskExtension.inc:910
+#: ../lib/modules.inc:1732
 #, php-format
 msgid "Was unable to rename DN: %s."
 msgstr "无法重命名DN: %s."
 
-#: ../lib/modules/inetOrgPerson.inc:128
-#: ../lib/modules/inetOrgPerson.inc:162
-#: ../lib/modules/inetOrgPerson.inc:280
-#: ../lib/modules/inetOrgPerson.inc:449
-#: ../lib/modules/inetOrgPerson.inc:561
-#: ../lib/modules/inetOrgPerson.inc:693
+#: ../lib/modules/inetOrgPerson.inc:129
+#: ../lib/modules/inetOrgPerson.inc:167
+#: ../lib/modules/inetOrgPerson.inc:285
+#: ../lib/modules/inetOrgPerson.inc:453
+#: ../lib/modules/inetOrgPerson.inc:565
 #: ../lib/modules/inetOrgPerson.inc:697
-#: ../lib/modules/inetOrgPerson.inc:1655
-#: ../lib/modules/inetOrgPerson.inc:2088
-#: ../lib/modules/inetOrgPerson.inc:2555
+#: ../lib/modules/inetOrgPerson.inc:701
+#: ../lib/modules/inetOrgPerson.inc:1659
+#: ../lib/modules/inetOrgPerson.inc:2092
+#: ../lib/modules/inetOrgPerson.inc:2576
 msgid "Web site"
 msgstr "网站"
 
-#: ../lib/modules/sambaSamAccount.inc:1311
+#: ../lib/modules/sambaSamAccount.inc:1316
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../lib/selfService.inc:340
+#: ../lib/selfService.inc:365
 msgid "Welcome to LAM self service. Please enter your user name and password."
 msgstr "欢迎来到LAM自助服务.请输入用户名和密码."
 
-#: ../lib/modules/sambaSamAccount.inc:539
+#: ../lib/modules/sambaSamAccount.inc:544
 msgid "Western Europe Time, London, Lisbon"
 msgstr "西欧时间,伦敦,里斯本"
 
-#: ../lib/modules/passwordSelfReset.inc:140
+#: ../lib/modules/passwordSelfReset.inc:141
 msgid "What is the name of your favourite pet?"
 msgstr "你最喜欢的宠物名字?"
 
@@ -12232,15 +12338,15 @@ msgstr "如果达到硬限额,用户再也收不到邮件."
 msgid "When using ldaps:// or TLS be sure to use exactly the same IP/domain name as in your certificate!"
 msgstr "当使用ldaps://或TLS协议时确认在证书中使用相同的ip/domain!"
 
-#: ../lib/modules/sambaSamAccount.inc:315
+#: ../lib/modules/sambaSamAccount.inc:320
 msgid "Windows domain name of account."
 msgstr "帐号所属的windows域"
 
-#: ../lib/modules/sambaSamAccount.inc:193
-#: ../lib/modules/sambaSamAccount.inc:445
-#: ../lib/modules/sambaSamAccount.inc:1197
-#: ../lib/modules/sambaSamAccount.inc:1565
-#: ../lib/modules/sambaSamAccount.inc:1705
+#: ../lib/modules/sambaSamAccount.inc:197
+#: ../lib/modules/sambaSamAccount.inc:450
+#: ../lib/modules/sambaSamAccount.inc:1202
+#: ../lib/modules/sambaSamAccount.inc:1570
+#: ../lib/modules/sambaSamAccount.inc:1710
 #: ../lib/modules/sambaGroupMapping.inc:278
 #: ../lib/modules/sambaGroupMapping.inc:322
 #: ../lib/modules/sambaGroupMapping.inc:391
@@ -12255,15 +12361,15 @@ msgstr "Windows组名"
 msgid "Windows group type."
 msgstr "Windows组类型"
 
-#: ../lib/modules/sambaSamAccount.inc:372
+#: ../lib/modules/sambaSamAccount.inc:377
 msgid "Windows password hashes are saved by default as NT and LM hashes. LM hashes are insecure and only needed for old versions of Windows. You should disable them unless you really need them."
 msgstr "windows密码的哈希方法缺少设置为NT和LM方法.LM哈希方法是不安全的,只用于旧版本的Windows系统.除非必要,一般需要屏蔽之."
 
-#: ../lib/modules/sambaSamAccount.inc:298
+#: ../lib/modules/sambaSamAccount.inc:303
 msgid "Windows primary group"
 msgstr "Windows主组"
 
-#: ../lib/modules/sambaSamAccount.inc:301
+#: ../lib/modules/sambaSamAccount.inc:306
 msgid "Windows primary group SID"
 msgstr "Windows主组的SID"
 
@@ -12271,7 +12377,7 @@ msgstr "Windows主组的SID"
 msgid "Windows-Domain name of group."
 msgstr "组的windows域名."
 
-#: ../lib/modules/inetOrgPerson.inc:1677
+#: ../lib/modules/inetOrgPerson.inc:1681
 msgid "Work details"
 msgstr "工作详细信息"
 
@@ -12279,14 +12385,14 @@ msgstr "工作详细信息"
 msgid "Workgroup"
 msgstr "工作组"
 
-#: ../lib/modules/sambaSamAccount.inc:217
-#: ../lib/modules/sambaSamAccount.inc:344
-#: ../lib/modules/sambaSamAccount.inc:1447
-#: ../lib/modules/sambaSamAccount.inc:1725
+#: ../lib/modules/sambaSamAccount.inc:221
+#: ../lib/modules/sambaSamAccount.inc:349
+#: ../lib/modules/sambaSamAccount.inc:1452
+#: ../lib/modules/sambaSamAccount.inc:1730
 msgid "Working directory"
 msgstr "工作目录"
 
-#: ../lib/modules/sambaSamAccount.inc:345
+#: ../lib/modules/sambaSamAccount.inc:350
 msgid "Working directory of initial program."
 msgstr "初始化程序的工作目录。"
 
@@ -12305,19 +12411,19 @@ msgstr "写权限"
 msgid "Wrong password/user name combination. Please try again."
 msgstr "错误的密码和用户组合,请重试!"
 
-#: ../lib/modules/imapAccess.inc:162
+#: ../lib/modules/imapAccess.inc:163
 msgid "Wrong quota format. Quota must be numeric."
 msgstr "错误的配额类型.配额必须为数字."
 
-#: ../templates/schema/schema.php:151
-#: ../templates/schema/schema.php:193
-#: ../templates/schema/schema.php:198
-#: ../templates/schema/schema.php:203
-#: ../lib/modules/imapAccess.inc:108
+#: ../templates/schema/schema.php:153
+#: ../templates/schema/schema.php:195
+#: ../templates/schema/schema.php:200
+#: ../templates/schema/schema.php:205
+#: ../lib/modules/imapAccess.inc:109
 msgid "Yes"
 msgstr "是"
 
-#: ../lib/modules/posixGroup.inc:493
+#: ../lib/modules/posixGroup.inc:504
 msgid "You are using a capital letters. This can cause problems because Windows isn't case-sensitive."
 msgstr "您使用了大写字符,这会造成一些问题,因为windows大小写不敏感."
 
@@ -12325,12 +12431,12 @@ msgstr "您使用了大写字符,这会造成一些问题,因为windows大小写
 msgid "You are using a capital letters. This can cause problems because windows isn't case-sensitive."
 msgstr "您使用了大写字符,这会造成一些问题,因为windows大小写不敏感."
 
-#: ../lib/modules/posixAccount.inc:87
-#: ../lib/modules/posixAccount.inc:89
+#: ../lib/modules/posixAccount.inc:97
+#: ../lib/modules/posixAccount.inc:99
 msgid "You are using capital letters. This can cause problems because Windows is not case-sensitive."
 msgstr "您正在使用大写字符,这会造成一些问题,因为windows大小写不敏感."
 
-#: ../lib/lists.inc:972
+#: ../lib/lists.inc:973
 #, php-format
 msgid "You can download your PDF files {link=%s}{color=#d2131a}here{endcolor}{endlink}."
 msgstr "你可以下载你的PDF文件 {link=%s}{color=#d2131a}这里{endcolor}{endlink}."
@@ -12347,8 +12453,8 @@ msgstr "您可以指定LAM是否允许全部权限,只能更改密码,或是只
 msgid "You can use this to temporarily deactivate the Zarafa extension."
 msgstr "可以使用它来临时解除Zarafa扩展项"
 
-#: ../lib/modules/passwordSelfReset.inc:107
-#: ../lib/modules/passwordSelfReset.inc:117
+#: ../lib/modules/passwordSelfReset.inc:108
+#: ../lib/modules/passwordSelfReset.inc:118
 #: ../help/help.inc:205
 msgid "You can use wildcards for LDAP attributes in the form @@attribute@@ (e.g. @@uid@@ for the user name)."
 msgstr "您可以用@@attribute@@的通配符形式代表LDAP属性（比如@@uid@@代表用户名）。"
@@ -12378,12 +12484,12 @@ msgstr "不能同时使用SSL和TLS加密.请使用\"ldaps://\" 或 TLS."
 msgid "You did not change the RDN"
 msgstr "您没有对RDN做任何修改."
 
-#: ../templates/tests/schemaTest.php:59
+#: ../templates/tests/schemaTest.php:61
 msgid "You do not have the required access rights or the LDAP schema is not published by your server."
 msgstr "您无权访问或LDAP架构未发布到LDAP服务器。"
 
-#: ../lib/modules/dhcp_settings.inc:287
-#: ../lib/modules/dhcp_settings.inc:288
+#: ../lib/modules/dhcp_settings.inc:294
+#: ../lib/modules/dhcp_settings.inc:295
 msgid "You entered one or more invalid DNS servers."
 msgstr "您输入了一个或多个非常的DNS服务器."
 
@@ -12413,7 +12519,7 @@ msgstr "在文本框中必须上传一个文件或提供一种导入方式."
 msgid "You need to add at least one member to this group."
 msgstr "您至少需要为这个组增加一个成员."
 
-#: ../lib/modules/passwordSelfReset.inc:232
+#: ../lib/modules/passwordSelfReset.inc:233
 msgid "You specified an answer but no security question."
 msgstr "您指定了一个没有安全问题的答案."
 
@@ -12422,11 +12528,11 @@ msgstr "您指定了一个没有安全问题的答案."
 msgid "You will be prompted to confirm this decision"
 msgstr "您将会提示来确认这个操作"
 
-#: ../lib/modules/imapAccess.inc:158
+#: ../lib/modules/imapAccess.inc:159
 msgid "Your IMAP domains and email address domain do not match."
 msgstr "您的IMAP域名与邮箱域名不匹配. "
 
-#: ../templates/tests/lamdaemonTest.php:226
+#: ../templates/tests/lamdaemonTest.php:228
 #, php-format
 msgid "Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"
 msgstr "系统管理者(%s)必须有一个合法的UNIX帐号才能运行lamdaemon !"
@@ -12436,7 +12542,7 @@ msgstr "系统管理者(%s)必须有一个合法的UNIX帐号才能运行lamdaem
 msgid "Your LAM admin user must be a valid Unix account to work with lamdaemon!"
 msgstr "系统管理者必须有一个合法的UNIX帐号才能运行lamdaemon !"
 
-#: ../lib/modules/imapAccess.inc:160
+#: ../lib/modules/imapAccess.inc:161
 msgid "Your LAM login password was not accepted by the IMAP server."
 msgstr "你的LAM登录密码不被IMAP服务器接受"
 
@@ -12449,11 +12555,11 @@ msgid "Your PHP.INI does not have file_uploads = ON. Please enable file uploads
 msgstr "您的PHP.INI没有file_uploads = on,在PHP中打开文件上传."
 
 #: ../templates/config/confmain.php:164
-#: ../templates/selfService/adminMain.php:331
+#: ../templates/selfService/adminMain.php:345
 msgid "Your changes cannot be saved until you make the file writable for the webserver user."
 msgstr "你的修改只能在web服务器有权写文件的条件下保存."
 
-#: ../lib/modules/selfRegistration.inc:585
+#: ../lib/modules/selfRegistration.inc:596
 msgid "Your new account was successfully created. Please return to login to change your user data."
 msgstr "你的新账号已经成功建立.请返回后登录并修改用户数据."
 
@@ -12471,8 +12577,8 @@ msgstr "超时,请重新登录."
 msgid "Your settings were successfully saved."
 msgstr "设置保存成功."
 
-#: ../lib/modules/inetOrgPerson.inc:475
-#: ../lib/modules/inetOrgPerson.inc:507
+#: ../lib/modules/inetOrgPerson.inc:479
+#: ../lib/modules/inetOrgPerson.inc:511
 msgid "YourCompany"
 msgstr "您的公司"
 
@@ -12521,11 +12627,11 @@ msgstr "区域名"
 msgid "Zone names for the DNS server (e.g. company.local)."
 msgstr "DNS服务器的区域名(比如: company.local)."
 
-#: ../lib/modules/sambaSamAccount.inc:471
+#: ../lib/modules/sambaSamAccount.inc:476
 msgid "\\\\server\\homes\\smiller"
 msgstr "\\\\server\\homes\\smiller"
 
-#: ../lib/modules/sambaSamAccount.inc:479
+#: ../lib/modules/sambaSamAccount.inc:484
 msgid "\\\\server\\profiles\\smiller"
 msgstr "\\\\server\\profiles\\smiller"
 
@@ -12537,9 +12643,9 @@ msgid "add value"
 msgstr "增加值"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:107
-#: ../lib/modules/posixGroup.inc:377
+#: ../lib/modules/posixGroup.inc:380
 #: ../lib/modules/zarafaAddressList.inc:95
-#: ../lib/modules/nisnetgroup.inc:104
+#: ../lib/modules/nisnetgroup.inc:107
 #: ../lib/modules/groupOfNames.inc:94
 msgid "adminstrators"
 msgstr "管理员"
@@ -12562,15 +12668,15 @@ msgstr "浏览"
 msgid "bytes"
 msgstr "子节"
 
-#: ../templates/schema/schema.php:218
+#: ../templates/schema/schema.php:220
 msgid "character"
 msgstr "字符"
 
-#: ../templates/schema/schema.php:217
+#: ../templates/schema/schema.php:219
 msgid "characters"
 msgstr "字符"
 
-#: ../lib/modules/freeRadius.inc:171
+#: ../lib/modules/freeRadius.inc:172
 msgid "company.com"
 msgstr "company.com"
 
@@ -12595,16 +12701,16 @@ msgstr "删除"
 msgid "delete attribute"
 msgstr "删除属性"
 
-#: ../lib/modules/sambaSamAccount.inc:1468
-#: ../lib/modules/sambaSamAccount.inc:1745
-#: ../lib/modules/zarafaUser.inc:620
-#: ../lib/modules/zarafaUser.inc:1353
-#: ../lib/modules/zarafaUser.inc:1400
+#: ../lib/modules/sambaSamAccount.inc:1473
+#: ../lib/modules/sambaSamAccount.inc:1750
+#: ../lib/modules/zarafaUser.inc:622
+#: ../lib/modules/zarafaUser.inc:1355
+#: ../lib/modules/zarafaUser.inc:1402
 msgid "disabled"
 msgstr "关闭"
 
-#: ../lib/modules/sambaSamAccount.inc:1479
-#: ../lib/modules/sambaSamAccount.inc:1756
+#: ../lib/modules/sambaSamAccount.inc:1484
+#: ../lib/modules/sambaSamAccount.inc:1761
 msgid "disconnect"
 msgstr "中断连接"
 
@@ -12616,9 +12722,9 @@ msgstr "下载值"
 msgid "edit"
 msgstr "编辑"
 
-#: ../lib/modules/zarafaUser.inc:620
-#: ../lib/modules/zarafaUser.inc:1348
-#: ../lib/modules/zarafaUser.inc:1400
+#: ../lib/modules/zarafaUser.inc:622
+#: ../lib/modules/zarafaUser.inc:1350
+#: ../lib/modules/zarafaUser.inc:1402
 msgid "enabled"
 msgstr "使能"
 
@@ -12631,28 +12737,28 @@ msgstr "导出"
 msgid "false"
 msgstr "失败"
 
-#: ../lib/modules/ppolicy.inc:36
+#: ../lib/modules/ppolicy.inc:37
 msgid "force"
 msgstr "强制"
 
-#: ../lib/modules/sambaSamAccount.inc:1487
-#: ../lib/modules/sambaSamAccount.inc:1764
+#: ../lib/modules/sambaSamAccount.inc:1492
+#: ../lib/modules/sambaSamAccount.inc:1769
 msgid "from any client"
 msgstr "从任何客户端"
 
-#: ../lib/modules/sambaSamAccount.inc:1488
-#: ../lib/modules/sambaSamAccount.inc:1765
+#: ../lib/modules/sambaSamAccount.inc:1493
+#: ../lib/modules/sambaSamAccount.inc:1770
 msgid "from previous client only"
 msgstr "仅从以前的客户端"
 
-#: ../lib/modules/posixAccount.inc:225
-#: ../lib/modules/posixAccount.inc:275
-#: ../lib/modules/nisnetgroup.inc:118
-#: ../lib/modules/groupOfNamesUser.inc:64
+#: ../lib/modules/posixAccount.inc:239
+#: ../lib/modules/posixAccount.inc:289
+#: ../lib/modules/nisnetgroup.inc:121
+#: ../lib/modules/groupOfNamesUser.inc:66
 msgid "group01,group02"
 msgstr "group01,group02"
 
-#: ../lib/modules/freeRadius.inc:179
+#: ../lib/modules/freeRadius.inc:180
 msgid "group01;group02"
 msgstr "group01;group02"
 
@@ -12670,12 +12776,12 @@ msgstr "groupr@company.com"
 msgid "hint"
 msgstr "提示"
 
-#: ../lib/modules/quota.inc:190
-#: ../lib/modules/quota.inc:192
+#: ../lib/modules/quota.inc:191
+#: ../lib/modules/quota.inc:193
 msgid "hours"
 msgstr "小时"
 
-#: ../lib/modules/inetOrgPerson.inc:451
+#: ../lib/modules/inetOrgPerson.inc:455
 msgid "http://www.company.com"
 msgstr "http://www.company.com"
 
@@ -12683,23 +12789,23 @@ msgstr "http://www.company.com"
 msgid "import"
 msgstr "导入"
 
-#: ../lib/modules/sambaSamAccount.inc:1472
-#: ../lib/modules/sambaSamAccount.inc:1749
+#: ../lib/modules/sambaSamAccount.inc:1477
+#: ../lib/modules/sambaSamAccount.inc:1754
 msgid "input off, notify off"
 msgstr "输入关，提醒关"
 
-#: ../lib/modules/sambaSamAccount.inc:1471
-#: ../lib/modules/sambaSamAccount.inc:1748
+#: ../lib/modules/sambaSamAccount.inc:1476
+#: ../lib/modules/sambaSamAccount.inc:1753
 msgid "input off, notify on"
 msgstr "输入关，提醒开"
 
-#: ../lib/modules/sambaSamAccount.inc:1470
-#: ../lib/modules/sambaSamAccount.inc:1747
+#: ../lib/modules/sambaSamAccount.inc:1475
+#: ../lib/modules/sambaSamAccount.inc:1752
 msgid "input on, notify off"
 msgstr "输入开，提醒关"
 
-#: ../lib/modules/sambaSamAccount.inc:1469
-#: ../lib/modules/sambaSamAccount.inc:1746
+#: ../lib/modules/sambaSamAccount.inc:1474
+#: ../lib/modules/sambaSamAccount.inc:1751
 msgid "input on, notify on"
 msgstr "输入开，提醒开"
 
@@ -12721,7 +12827,7 @@ msgstr "列表"
 msgid "login"
 msgstr "登录"
 
-#: ../lib/modules/posixAccount.inc:300
+#: ../lib/modules/posixAccount.inc:314
 msgid "machines"
 msgstr "机器"
 
@@ -12729,12 +12835,12 @@ msgstr "机器"
 msgid "mail.yourdomain.org"
 msgstr "mail.yourdomain.org"
 
-#: ../lib/modules/sambaSamAccount.inc:390
-#: ../lib/modules/sambaSamAccount.inc:514
+#: ../lib/modules/sambaSamAccount.inc:395
+#: ../lib/modules/sambaSamAccount.inc:519
 msgid "mydomain"
 msgstr "我的域"
 
-#: ../lib/modules/sambaSamAccount.inc:447
+#: ../lib/modules/sambaSamAccount.inc:452
 msgid "mygroup"
 msgstr "我的组"
 
@@ -12751,23 +12857,23 @@ msgstr "新"
 #: ../lib/modules/zarafaGroup.inc:642
 #: ../lib/modules/zarafaAddressList.inc:328
 #: ../lib/modules/zarafaAddressList.inc:331
-#: ../lib/modules/sambaSamAccount.inc:558
-#: ../lib/modules/sambaSamAccount.inc:1713
-#: ../lib/modules/sambaSamAccount.inc:1721
-#: ../lib/modules/sambaSamAccount.inc:1731
+#: ../lib/modules/sambaSamAccount.inc:563
+#: ../lib/modules/sambaSamAccount.inc:1718
+#: ../lib/modules/sambaSamAccount.inc:1726
 #: ../lib/modules/sambaSamAccount.inc:1736
 #: ../lib/modules/sambaSamAccount.inc:1741
-#: ../lib/modules/zarafaUser.inc:603
-#: ../lib/modules/zarafaUser.inc:1264
-#: ../lib/modules/zarafaUser.inc:1309
-#: ../lib/modules/zarafaUser.inc:1320
-#: ../lib/modules/zarafaUser.inc:1326
-#: ../lib/modules/ppolicy.inc:34
-#: ../lib/modules/ppolicy.inc:467
-#: ../lib/modules/ppolicy.inc:483
-#: ../lib/modules/ppolicy.inc:488
-#: ../lib/modules/ppolicy.inc:495
-#: ../lib/modules/ppolicy.inc:498
+#: ../lib/modules/sambaSamAccount.inc:1746
+#: ../lib/modules/zarafaUser.inc:605
+#: ../lib/modules/zarafaUser.inc:1266
+#: ../lib/modules/zarafaUser.inc:1311
+#: ../lib/modules/zarafaUser.inc:1322
+#: ../lib/modules/zarafaUser.inc:1328
+#: ../lib/modules/ppolicy.inc:35
+#: ../lib/modules/ppolicy.inc:468
+#: ../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:371
 msgid "no"
@@ -12789,14 +12895,14 @@ msgstr "本条目没有新的可用属性"
 msgid "no new binary attributes available for this entry"
 msgstr "本条目没有新的可用二进制属性"
 
-#: ../templates/schema/schema.php:158
-#: ../templates/schema/schema.php:227
-#: ../templates/schema/schema.php:238
-#: ../templates/schema/schema.php:287
-#: ../templates/schema/schema.php:353
-#: ../templates/schema/schema.php:368
-#: ../templates/schema/schema.php:402
-#: ../templates/schema/schema.php:424
+#: ../templates/schema/schema.php:160
+#: ../templates/schema/schema.php:229
+#: ../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/TemplateRender.php:1573
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1581
@@ -12807,14 +12913,14 @@ msgstr "空"
 msgid "none, remove value"
 msgstr "空,删除值"
 
-#: ../templates/schema/schema.php:214
+#: ../templates/schema/schema.php:216
 msgid "not applicable"
 msgstr "不可用"
 
-#: ../templates/schema/schema.php:165
-#: ../templates/schema/schema.php:170
-#: ../templates/schema/schema.php:175
-#: ../templates/schema/schema.php:208
+#: ../templates/schema/schema.php:167
+#: ../templates/schema/schema.php:172
+#: ../templates/schema/schema.php:177
+#: ../templates/schema/schema.php:210
 msgid "not specified"
 msgstr "未指定"
 
@@ -12822,17 +12928,17 @@ msgstr "未指定"
 msgid "ou=People,dc=yourcompany,dc=com will read and store all accounts in this subtree."
 msgstr "ou=People,dc=yourcompany,dc=com 表示将会在此子树下读取和保存所有帐号"
 
-#: ../lib/modules/eduPerson.inc:181
-#: ../lib/modules/eduPerson.inc:187
-#: ../lib/modules/eduPerson.inc:193
+#: ../lib/modules/eduPerson.inc:182
+#: ../lib/modules/eduPerson.inc:188
+#: ../lib/modules/eduPerson.inc:194
 msgid "ou=accounts,dc=yourdomain,dc=org"
 msgstr "ou=accounts,dc=yourdomain,dc=org"
 
-#: ../lib/modules/posixAccount.inc:286
+#: ../lib/modules/posixAccount.inc:300
 msgid "pc01$"
 msgstr "pc01$"
 
-#: ../lib/modules/posixAccount.inc:307
+#: ../lib/modules/posixAccount.inc:321
 msgid "pc01,Room 2.34"
 msgstr "pc01,Room 2.34"
 
@@ -12857,14 +12963,14 @@ msgid "rename"
 msgstr "重命名"
 
 #: ../templates/3rdParty/pla/lib/PageRender.php:445
-#: ../lib/html.inc:568
-#: ../lib/html.inc:1333
-#: ../lib/html.inc:1845
+#: ../lib/html.inc:600
+#: ../lib/html.inc:1365
+#: ../lib/html.inc:1877
 msgid "required"
 msgstr "必选项"
 
-#: ../lib/modules/sambaSamAccount.inc:1480
-#: ../lib/modules/sambaSamAccount.inc:1757
+#: ../lib/modules/sambaSamAccount.inc:1485
+#: ../lib/modules/sambaSamAccount.inc:1762
 msgid "reset"
 msgstr "复位"
 
@@ -12877,9 +12983,9 @@ msgid "seconds"
 msgstr "秒"
 
 #: ../lib/modules/asteriskAccount.inc:389
-#: ../lib/modules/posixGroup.inc:368
-#: ../lib/modules/sambaSamAccount.inc:402
-#: ../lib/modules/posixAccount.inc:253
+#: ../lib/modules/posixGroup.inc:371
+#: ../lib/modules/sambaSamAccount.inc:407
+#: ../lib/modules/posixAccount.inc:267
 #: ../lib/modules/asteriskVoicemail.inc:158
 #: ../lib/modules/heimdalKerberos.inc:201
 msgid "secret"
@@ -12890,8 +12996,8 @@ msgid "select the rdn attribute"
 msgstr "选择RDN属性"
 
 #: ../lib/modules/uidObject.inc:62
-#: ../lib/modules/posixAccount.inc:198
-#: ../lib/modules/inetOrgPerson.inc:2213
+#: ../lib/modules/posixAccount.inc:212
+#: ../lib/modules/inetOrgPerson.inc:2217
 #: ../lib/modules/heimdalKerberos.inc:170
 #: ../lib/modules/nisMailAlias.inc:91
 msgid "smiller"
@@ -12917,11 +13023,11 @@ msgstr "结构"
 msgid "table"
 msgstr "表格"
 
-#: ../lib/modules/asteriskExtension.inc:146
+#: ../lib/modules/asteriskExtension.inc:147
 msgid "test"
 msgstr "测试"
 
-#: ../lib/modules/asteriskExtension.inc:166
+#: ../lib/modules/asteriskExtension.inc:167
 msgid "test-start"
 msgstr "测试-开始"
 
@@ -12930,22 +13036,22 @@ msgid "true"
 msgstr "true"
 
 #: ../lib/modules/ipHost.inc:92
-#: ../lib/modules/inetOrgPerson.inc:355
+#: ../lib/modules/inetOrgPerson.inc:359
 #: ../lib/modules/aliasEntry.inc:64
 msgid "uid=smiller,ou=People,dc=company,dc=com"
 msgstr "uid=smiller,ou=People,dc=company,dc=com"
 
-#: ../lib/modules/posixGroup.inc:362
+#: ../lib/modules/posixGroup.inc:365
 msgid "user01,user02,user03"
 msgstr "user01,user02,user03"
 
-#: ../lib/modules/eduPerson.inc:142
-#: ../lib/modules/inetOrgPerson.inc:443
+#: ../lib/modules/eduPerson.inc:143
+#: ../lib/modules/inetOrgPerson.inc:447
 #: ../lib/modules/asteriskVoicemail.inc:171
 msgid "user@company.com"
 msgstr "user@company.com"
 
-#: ../lib/modules/posixAccount.inc:218
+#: ../lib/modules/posixAccount.inc:232
 msgid "users"
 msgstr "用户"
 
@@ -12966,28 +13072,51 @@ msgstr "和"
 #: ../lib/modules/zarafaGroup.inc:644
 #: ../lib/modules/zarafaAddressList.inc:326
 #: ../lib/modules/zarafaAddressList.inc:333
-#: ../lib/modules/sambaSamAccount.inc:558
-#: ../lib/modules/sambaSamAccount.inc:1711
-#: ../lib/modules/sambaSamAccount.inc:1719
-#: ../lib/modules/sambaSamAccount.inc:1729
+#: ../lib/modules/sambaSamAccount.inc:563
+#: ../lib/modules/sambaSamAccount.inc:1716
+#: ../lib/modules/sambaSamAccount.inc:1724
 #: ../lib/modules/sambaSamAccount.inc:1734
 #: ../lib/modules/sambaSamAccount.inc:1739
-#: ../lib/modules/zarafaUser.inc:603
-#: ../lib/modules/zarafaUser.inc:1266
-#: ../lib/modules/zarafaUser.inc:1312
-#: ../lib/modules/zarafaUser.inc:1322
-#: ../lib/modules/zarafaUser.inc:1328
-#: ../lib/modules/ppolicy.inc:35
-#: ../lib/modules/ppolicy.inc:485
-#: ../lib/modules/ppolicy.inc:490
-#: ../lib/modules/ppolicy.inc:493
-#: ../lib/modules/ppolicy.inc:500
-#: ../lib/modules/inetOrgPerson.inc:499
+#: ../lib/modules/sambaSamAccount.inc:1744
+#: ../lib/modules/zarafaUser.inc:605
+#: ../lib/modules/zarafaUser.inc:1268
+#: ../lib/modules/zarafaUser.inc:1314
+#: ../lib/modules/zarafaUser.inc:1324
+#: ../lib/modules/zarafaUser.inc:1330
+#: ../lib/modules/ppolicy.inc:36
+#: ../lib/modules/ppolicy.inc:486
+#: ../lib/modules/ppolicy.inc:491
+#: ../lib/modules/ppolicy.inc:494
+#: ../lib/modules/ppolicy.inc:501
+#: ../lib/modules/inetOrgPerson.inc:503
 #: ../lib/modules/generalInformation.inc:95
 #: ../lib/modules/zarafaServer.inc:373
 msgid "yes"
 msgstr "是"
 
+#~ msgid "Country"
+#~ msgstr "国家"
+#~ msgid "Country name is invalid!"
+#~ msgstr "国家名称非法!"
+#~ msgid "Free/Busy interval"
+#~ msgstr "空闲/忙碌 间隔"
+#~ msgid "Free/Busy interval must be a number!"
+#~ msgstr "空闲/忙碌间隔必须是一个数字!"
+#~ msgid "Germany"
+#~ msgstr "德国"
+#~ msgid "Mail quota"
+#~ msgstr "邮件限额"
+#~ msgid "Mail quota must be a number!"
+#~ msgstr "邮件限额必须是数字!"
+#~ msgid ""
+#~ "The Cyrus mail quota for users in MBytes, leave blank for unlimited space."
+#~ msgstr "用户Cyrus邮件限制(MB),留空意味着不限制."
+#~ msgid "The country name of the user."
+#~ msgstr "用户国籍."
+#~ msgid ""
+#~ "This is the time limit (in days) for other users who want to check future "
+#~ "appointments. If you leave this blank the default (60 days) will be set."
+#~ msgstr "其它用户检查未来约会的天数.如果留空,默认值为60天."
 #~ msgid "YourCompany, Human Resources"
 #~ msgstr "某某公司,人力资源部"
 #~ msgid "%s DHCP(s) found"
@@ -13241,8 +13370,6 @@ msgstr "是"
 #~ msgstr ""
 #~ "请输入允许用户登录的主机名(以逗号分隔).如果已经启用主机限制,\"*\"号代表所"
 #~ "有主机,留空意味没有主机."
-#~ msgid "Please enter the mount point for this entry (e.g. /home)."
-#~ msgstr "请输入本条目的mount点(比如:/home)."
 #~ msgid ""
 #~ "Please install the SSH2 module for PHP and activate it in your php.ini!"
 #~ msgstr "请在PHP中安装SSH2模块并在php.ini中启用!"